From 0229b95d7caf4ccaddb64de2ec8da3744c1a5d7e Mon Sep 17 00:00:00 2001
From: Gwilym Kuiper <gw@ilym.me>
Date: Wed, 4 May 2022 16:59:17 +0100
Subject: [PATCH] Move macro definition

---
 agb/src/sound/mixer/mixer.s | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/agb/src/sound/mixer/mixer.s b/agb/src/sound/mixer/mixer.s
index 89f2b42..ba4796b 100644
--- a/agb/src/sound/mixer/mixer.s
+++ b/agb/src/sound/mixer/mixer.s
@@ -151,6 +151,15 @@ agb_arm_func agb_rs__mixer_add_stereo
 
 agb_arm_end agb_rs__mixer_add_stereo
 
+agb_arm_func agb_rs__mixer_collapse
+    @ Arguments:
+    @ r0 = target buffer (i8)
+    @ r1 = input buffer (i16) of fixnums with 4 bits of precision (read in sets of i16 in an i32)
+    push {r4, r5, r6}
+
+    ldr r2, agb_rs__buffer_size @ loop counter
+    mov r4, r2
+
 .macro clamp_s8 reg:req
     cmn \reg, #128
     mvnlt \reg, #128
@@ -161,16 +170,6 @@ agb_arm_end agb_rs__mixer_add_stereo
     and \reg, \reg, #255
 .endm
 
-agb_arm_func agb_rs__mixer_collapse
-    @ Arguments:
-    @ r0 = target buffer (i8)
-    @ r1 = input buffer (i16) of fixnums with 4 bits of precision (read in sets of i16 in an i32)
-    push {r4, r5, r6}
-
-    ldr r2, agb_rs__buffer_size @ loop counter
-    mov r4, r2
-
-1:
 .macro load_sample left_reg:req right_reg:req
     @ left_reg = *r1; r1++
     ldr \left_reg, [r1], #4
@@ -183,6 +182,7 @@ agb_arm_func agb_rs__mixer_collapse
     clamp_s8 \right_reg
 .endm
 
+1:
     load_sample r3, r12
 
     load_sample r5, r6