dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Label remaining m4a functions

Browse Source
This commit is contained in:
GriffinR
2021-11-06 11:42:34 -04:00
parent 7940f121f6
commit abab6cef09
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/m4a_1.s
+17 -15
View File
@@ -302,7 +302,7 @@ _081DD044:
ldrb r0, [r4, o_SoundChannel_type] ldrb r0, [r4, o_SoundChannel_type]
tst r0, TONEDATA_TYPE_CMP | TONEDATA_TYPE_REV tst r0, TONEDATA_TYPE_CMP | TONEDATA_TYPE_REV
beq _081DD068 beq _081DD068
bl sub_82DF49C bl SoundMainRAM_Unk1
b _081DD228 b _081DD228
_081DD068: _081DD068:
mov r10, r10, lsl 16 mov r10, r10, lsl 16
@@ -465,8 +465,9 @@ _081DD25E:
.pool .pool
thumb_func_end SoundMainRAM thumb_func_end SoundMainRAM
arm_func_start sub_82DF49C @ Not present in GBA SDK 3.0
sub_82DF49C: arm_func_start SoundMainRAM_Unk1
SoundMainRAM_Unk1:
ldr r6, [r4, o_SoundChannel_wav] ldr r6, [r4, o_SoundChannel_wav]
ldrb r0, [r4, o_SoundChannel_statusFlags] ldrb r0, [r4, o_SoundChannel_statusFlags]
tst r0, SOUND_CHANNEL_SF_SPECIAL tst r0, SOUND_CHANNEL_SF_SPECIAL
@@ -505,10 +506,10 @@ _081DD2B4:
ldrb r0, [r4, o_SoundChannel_type] ldrb r0, [r4, o_SoundChannel_type]
tst r0, TONEDATA_TYPE_REV tst r0, TONEDATA_TYPE_REV
bne _081DD3C0 bne _081DD3C0
bl sub_82DF758 bl SoundMainRAM_Unk2
mov r0, r1 mov r0, r1
add r3, r3, 0x1 add r3, r3, 0x1
bl sub_82DF758 bl SoundMainRAM_Unk2
sub r1, r1, r0 sub r1, r1, r0
_081DD308: _081DD308:
ldr r6, [r5] ldr r6, [r5]
@@ -534,11 +535,11 @@ _081DD310:
b _081DD364 b _081DD364
_081DD358: _081DD358:
add r3, r3, lr add r3, r3, lr
bl sub_82DF758 bl SoundMainRAM_Unk2
mov r0, r1 mov r0, r1
_081DD364: _081DD364:
add r3, r3, 0x1 add r3, r3, 0x1
bl sub_82DF758 bl SoundMainRAM_Unk2
sub r1, r1, r0 sub r1, r1, r0
_081DD370: _081DD370:
adds r5, r5, 0x40000000 adds r5, r5, 0x40000000
@@ -565,10 +566,10 @@ _081DD3B0:
b _081DD3B0 b _081DD3B0
_081DD3C0: _081DD3C0:
sub r3, r3, 0x1 sub r3, r3, 0x1
bl sub_82DF758 bl SoundMainRAM_Unk2
mov r0, r1 mov r0, r1
sub r3, r3, 0x1 sub r3, r3, 0x1
bl sub_82DF758 bl SoundMainRAM_Unk2
sub r1, r1, r0 sub r1, r1, r0
_081DD3D8: _081DD3D8:
ldr r6, [r5] ldr r6, [r5]
@@ -594,11 +595,11 @@ _081DD3E0:
b _081DD434 b _081DD434
_081DD428: _081DD428:
sub r3, r3, lr sub r3, r3, lr
bl sub_82DF758 bl SoundMainRAM_Unk2
mov r0, r1 mov r0, r1
_081DD434: _081DD434:
sub r3, r3, 0x1 sub r3, r3, 0x1
bl sub_82DF758 bl SoundMainRAM_Unk2
sub r1, r1, r0 sub r1, r1, r0
_081DD440: _081DD440:
adds r5, r5, 0x40000000 adds r5, r5, 0x40000000
@@ -663,10 +664,11 @@ _081DD4F4:
str r7, [r5, 0x630] str r7, [r5, 0x630]
str r6, [r5], 0x4 str r6, [r5], 0x4
pop {r8,r12,pc} pop {r8,r12,pc}
arm_func_end sub_82DF49C arm_func_end SoundMainRAM_Unk1
arm_func_start sub_82DF758 @ Not present in GBA SDK 3.0
sub_82DF758: arm_func_start SoundMainRAM_Unk2
SoundMainRAM_Unk2:
push {r0,r2,r5-r7,lr} push {r0,r2,r5-r7,lr}
mov r0, r3, lsr 6 mov r0, r3, lsr 6
ldr r1, [r4, o_SoundChannel_xpi] ldr r1, [r4, o_SoundChannel_xpi]
@@ -704,7 +706,7 @@ _081DD594:
ldrsb r1, [r5, r0] ldrsb r1, [r5, r0]
pop {r0,r2,r5-r7,pc} pop {r0,r2,r5-r7,pc}
.pool .pool
arm_func_end sub_82DF758 arm_func_end SoundMainRAM_Unk2
thumb_func_start SoundMainBTM thumb_func_start SoundMainBTM
SoundMainBTM: SoundMainBTM: