summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-11-06 11:42:34 -0400
committerGriffinR <griffin.g.richards@gmail.com>2021-11-06 11:42:34 -0400
commitabab6cef098601c32dac909e17a8e9456b71bd81 (patch)
treeb4df9d624a067a31c3cd36af31625166b8b78065 /src
parent7940f121f66bb0ebe0932bc642c3d9b4015f79a7 (diff)
Label remaining m4a functions
Diffstat (limited to 'src')
-rw-r--r--src/m4a_1.s32
1 files changed, 17 insertions, 15 deletions
diff --git a/src/m4a_1.s b/src/m4a_1.s
index 62b913c86..f71a5546e 100644
--- a/src/m4a_1.s
+++ b/src/m4a_1.s
@@ -302,7 +302,7 @@ _081DD044:
ldrb r0, [r4, o_SoundChannel_type]
tst r0, TONEDATA_TYPE_CMP | TONEDATA_TYPE_REV
beq _081DD068
- bl sub_82DF49C
+ bl SoundMainRAM_Unk1
b _081DD228
_081DD068:
mov r10, r10, lsl 16
@@ -465,8 +465,9 @@ _081DD25E:
.pool
thumb_func_end SoundMainRAM
- arm_func_start sub_82DF49C
-sub_82DF49C:
+@ Not present in GBA SDK 3.0
+ arm_func_start SoundMainRAM_Unk1
+SoundMainRAM_Unk1:
ldr r6, [r4, o_SoundChannel_wav]
ldrb r0, [r4, o_SoundChannel_statusFlags]
tst r0, SOUND_CHANNEL_SF_SPECIAL
@@ -505,10 +506,10 @@ _081DD2B4:
ldrb r0, [r4, o_SoundChannel_type]
tst r0, TONEDATA_TYPE_REV
bne _081DD3C0
- bl sub_82DF758
+ bl SoundMainRAM_Unk2
mov r0, r1
add r3, r3, 0x1
- bl sub_82DF758
+ bl SoundMainRAM_Unk2
sub r1, r1, r0
_081DD308:
ldr r6, [r5]
@@ -534,11 +535,11 @@ _081DD310:
b _081DD364
_081DD358:
add r3, r3, lr
- bl sub_82DF758
+ bl SoundMainRAM_Unk2
mov r0, r1
_081DD364:
add r3, r3, 0x1
- bl sub_82DF758
+ bl SoundMainRAM_Unk2
sub r1, r1, r0
_081DD370:
adds r5, r5, 0x40000000
@@ -565,10 +566,10 @@ _081DD3B0:
b _081DD3B0
_081DD3C0:
sub r3, r3, 0x1
- bl sub_82DF758
+ bl SoundMainRAM_Unk2
mov r0, r1
sub r3, r3, 0x1
- bl sub_82DF758
+ bl SoundMainRAM_Unk2
sub r1, r1, r0
_081DD3D8:
ldr r6, [r5]
@@ -594,11 +595,11 @@ _081DD3E0:
b _081DD434
_081DD428:
sub r3, r3, lr
- bl sub_82DF758
+ bl SoundMainRAM_Unk2
mov r0, r1
_081DD434:
sub r3, r3, 0x1
- bl sub_82DF758
+ bl SoundMainRAM_Unk2
sub r1, r1, r0
_081DD440:
adds r5, r5, 0x40000000
@@ -663,10 +664,11 @@ _081DD4F4:
str r7, [r5, 0x630]
str r6, [r5], 0x4
pop {r8,r12,pc}
- arm_func_end sub_82DF49C
+ arm_func_end SoundMainRAM_Unk1
- arm_func_start sub_82DF758
-sub_82DF758:
+@ Not present in GBA SDK 3.0
+ arm_func_start SoundMainRAM_Unk2
+SoundMainRAM_Unk2:
push {r0,r2,r5-r7,lr}
mov r0, r3, lsr 6
ldr r1, [r4, o_SoundChannel_xpi]
@@ -704,7 +706,7 @@ _081DD594:
ldrsb r1, [r5, r0]
pop {r0,r2,r5-r7,pc}
.pool
- arm_func_end sub_82DF758
+ arm_func_end SoundMainRAM_Unk2
thumb_func_start SoundMainBTM
SoundMainBTM: