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

Ported libmks4agb from pokeruby (#12)

Browse Source 
* Port agb_flash from pokeruby

* use ramscrgen

* formatting

* delete ewram_syms.txt and iwram_syms.txt

* Finish port of agb_flash

* Ported libmks4agb from pokeruby

* Reordered declarations to match pokeruby
This commit is contained in:
Diegoisawesome
2016-11-01 22:03:16 -05:00
committed by YamaArashi
parent 2db94cf5eb
commit 69c734c9a8
35 changed files with 4735 additions and 5571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/berry_blender.s
+10 -10
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_807F738
sub_807F738: @ 807F738
push {lr}
ldr r0, =gUnknown_03007630
ldr r0, =gMPlay_SE2
ldr r1, =0x0000ffff
ldr r2, =gUnknown_020322A4
ldr r2, [r2]
@@ -18,7 +18,7 @@ sub_807F738: @ 807F738
subs r2, 0x80
lsls r2, 17
asrs r2, 16
bl MPlayPitchControl
bl m4aMPlayPitchControl
pop {r0}
bx r0
.pool
@@ -3564,15 +3564,15 @@ _08081678:
adds r1, r0
lsls r1, 16
lsrs r1, 16
ldr r0, =gUnknown_03007420
bl MPlayTempoControl
ldr r0, =gMPlay_BGM
bl m4aMPlayTempoControl
b _080816D2
.pool
_080816C8:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
movs r1, 0x80
lsls r1, 1
bl MPlayTempoControl
bl m4aMPlayTempoControl
_080816D2:
ldr r1, [sp]
adds r1, 0x2
@@ -4768,10 +4768,10 @@ _08082004:
.4byte _08082430
.4byte _0808246C
_08082038:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
movs r1, 0x80
lsls r1, 1
bl MPlayTempoControl
bl m4aMPlayTempoControl
movs r4, 0
b _08082064
.pool
@@ -4829,8 +4829,8 @@ _080820B6:
ldr r1, [r0]
movs r0, 0
strb r0, [r1]
ldr r0, =gUnknown_03007630
bl MPlayStop_rev01
ldr r0, =gMPlay_SE2
bl m4aMPlayStop
_080820C6:
bl sub_807F738
b _0808249E
asm/contest.s
+2 -2
View File
@@ -8891,7 +8891,7 @@ _080DC226:
ble _080DC284
movs r0, 0x60
bl audio_play
ldr r4, =gUnknown_030075F0
ldr r4, =gMPlay_SE1
adds r0, r4, 0
bl m4aMPlayImmInit
ldr r1, =0x0000ffff
@@ -8899,7 +8899,7 @@ _080DC226:
lsls r2, r0, 24
asrs r2, 16
adds r0, r4, 0
bl MPlayPitchControl
bl m4aMPlayPitchControl
b _080DC28A
.pool
_080DC284:
asm/egg_hatch.s
+1 -1
View File
@@ -602,7 +602,7 @@ _080717EC:
bl ResetAllObjectData
bl ResetTasks
bl remove_some_task
bl SoundVSyncOn_rev01
bl m4aSoundVSyncOn
b _080719A6
.pool
_080718B8:
asm/intro.s
+1 -1
View File
@@ -326,7 +326,7 @@ _0816CEE2:
ldrb r0, [r0, 0x15]
lsls r0, 31
lsrs r0, 31
bl sub_82E1810
bl SetPokemonCryStereo
ldr r0, =0x02000000
movs r1, 0xE0
lsls r1, 9
asm/libmks4agb.s
-5292
View File
File diff suppressed because it is too large Load Diff
asm/link.s
+7 -7
View File
@@ -3342,12 +3342,12 @@ c2_800ACD4: @ 800AF30
movs r0, 0
movs r1, 0
bl SetGpuReg
ldr r0, =gUnknown_030075F0
bl MPlayStop_rev01
ldr r0, =gUnknown_03007630
bl MPlayStop_rev01
ldr r0, =gUnknown_03007800
bl MPlayStop_rev01
ldr r0, =gMPlay_SE1
bl m4aMPlayStop
ldr r0, =gMPlay_SE2
bl m4aMPlayStop
ldr r0, =gMPlay_SE3
bl m4aMPlayStop
ldr r0, =0x02000000
movs r1, 0xE0
lsls r1, 9
@@ -32621,7 +32621,7 @@ sub_801A43C: @ 801A43C
bl ResetAllObjectData
bl ResetTasks
bl remove_some_task
bl SoundVSyncOn_rev01
bl m4aSoundVSyncOn
ldr r0, =sub_801A418
bl SetVBlankCallback
ldr r0, =sub_801A6C0
asm/m4a_1.s
+1909
View File
File diff suppressed because it is too large Load Diff
asm/m4a_3.s
+574
View File
@@ -0,0 +1,574 @@
.include "asm/macros.inc"
.include "constants/gba_constants.inc"
.include "constants/m4a_constants.inc"
.syntax unified
.text
thumb_func_start CgbSound
CgbSound: @ 81DEA70
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x1C
ldr r0, =SOUND_INFO_PTR
ldr r0, [r0]
str r0, [sp, 0x4]
ldrb r0, [r0, 0xA]
cmp r0, 0
beq _081DEA94
subs r0, 0x1
ldr r1, [sp, 0x4]
strb r0, [r1, 0xA]
b _081DEA9A
.pool
_081DEA94:
movs r0, 0xE
ldr r2, [sp, 0x4]
strb r0, [r2, 0xA]
_081DEA9A:
movs r6, 0x1
ldr r0, [sp, 0x4]
ldr r4, [r0, 0x1C]
_081DEAA0:
ldrb r1, [r4]
movs r0, 0xC7
ands r0, r1
adds r2, r6, 0x1
mov r10, r2
movs r2, 0x40
adds r2, r4
mov r9, r2
cmp r0, 0
bne _081DEAB6
b _081DEEA0
_081DEAB6:
cmp r6, 0x2
beq _081DEAE8
cmp r6, 0x2
bgt _081DEAC4
cmp r6, 0x1
beq _081DEACA
b _081DEB20
_081DEAC4:
cmp r6, 0x3
beq _081DEB00
b _081DEB20
_081DEACA:
ldr r0, =REG_NR10
str r0, [sp, 0x8]
ldr r7, =REG_NR11
ldr r2, =REG_NR12
str r2, [sp, 0xC]
adds r0, 0x4
str r0, [sp, 0x10]
adds r2, 0x2
b _081DEB30
.pool
_081DEAE8:
ldr r0, =REG_NR10 + 1
str r0, [sp, 0x8]
ldr r7, =REG_NR21
ldr r2, =REG_NR22
b _081DEB28
.pool
_081DEB00:
ldr r0, =REG_NR30
str r0, [sp, 0x8]
ldr r7, =REG_NR31
ldr r2, =REG_NR32
str r2, [sp, 0xC]
adds r0, 0x4
str r0, [sp, 0x10]
adds r2, 0x2
b _081DEB30
.pool
_081DEB20:
ldr r0, =REG_NR30 + 1
str r0, [sp, 0x8]
ldr r7, =REG_NR41
ldr r2, =REG_NR42
_081DEB28:
str r2, [sp, 0xC]
adds r0, 0xB
str r0, [sp, 0x10]
adds r2, 0x4
_081DEB30:
str r2, [sp, 0x14]
ldr r0, [sp, 0x4]
ldrb r0, [r0, 0xA]
str r0, [sp]
ldr r2, [sp, 0xC]
ldrb r0, [r2]
mov r8, r0
adds r2, r1, 0
movs r0, 0x80
ands r0, r2
cmp r0, 0
beq _081DEC26
movs r3, 0x40
adds r0, r3, 0
ands r0, r2
lsls r0, 24
lsrs r5, r0, 24
adds r0, r6, 0x1
mov r10, r0
movs r1, 0x40
adds r1, r4
mov r9, r1
cmp r5, 0
bne _081DEC4A
movs r0, 0x3
strb r0, [r4]
strb r0, [r4, 0x1D]
adds r0, r4, 0
str r3, [sp, 0x18]
bl CgbModVol
ldr r3, [sp, 0x18]
cmp r6, 0x2
beq _081DEB98
cmp r6, 0x2
bgt _081DEB8C
cmp r6, 0x1
beq _081DEB92
b _081DEBEC
.pool
_081DEB8C:
cmp r6, 0x3
beq _081DEBA4
b _081DEBEC
_081DEB92:
ldrb r0, [r4, 0x1F]
ldr r2, [sp, 0x8]
strb r0, [r2]
_081DEB98:
ldr r0, [r4, 0x24]
lsls r0, 6
ldrb r1, [r4, 0x1E]
adds r0, r1, r0
strb r0, [r7]
b _081DEBF8
_081DEBA4:
ldr r1, [r4, 0x24]
ldr r0, [r4, 0x28]
cmp r1, r0
beq _081DEBCC
ldr r2, [sp, 0x8]
strb r3, [r2]
ldr r1, =REG_WAVE_RAM
ldr r2, [r4, 0x24]
ldr r0, [r2]
str r0, [r1]
adds r1, 0x4
ldr r0, [r2, 0x4]
str r0, [r1]
adds r1, 0x4
ldr r0, [r2, 0x8]
str r0, [r1]
adds r1, 0x4
ldr r0, [r2, 0xC]
str r0, [r1]
str r2, [r4, 0x28]
_081DEBCC:
ldr r0, [sp, 0x8]
strb r5, [r0]
ldrb r0, [r4, 0x1E]
strb r0, [r7]
ldrb r0, [r4, 0x1E]
cmp r0, 0
beq _081DEBE4
movs r0, 0xC0
b _081DEC06
.pool
_081DEBE4:
movs r1, 0x80
negs r1, r1
strb r1, [r4, 0x1A]
b _081DEC08
_081DEBEC:
ldrb r0, [r4, 0x1E]
strb r0, [r7]
ldr r0, [r4, 0x24]
lsls r0, 3
ldr r2, [sp, 0x10]
strb r0, [r2]
_081DEBF8:
ldrb r0, [r4, 0x4]
adds r0, 0x8
mov r8, r0
ldrb r0, [r4, 0x1E]
cmp r0, 0
beq _081DEC06
movs r0, 0x40
_081DEC06:
strb r0, [r4, 0x1A]
_081DEC08:
ldrb r1, [r4, 0x4]
movs r2, 0
strb r1, [r4, 0xB]
movs r0, 0xFF
ands r0, r1
adds r1, r6, 0x1
mov r10, r1
movs r1, 0x40
adds r1, r4
mov r9, r1
cmp r0, 0
bne _081DEC22
b _081DED5E
_081DEC22:
strb r2, [r4, 0x9]
b _081DED8C
_081DEC26:
movs r0, 0x4
ands r0, r2
cmp r0, 0
beq _081DEC58
ldrb r0, [r4, 0xD]
subs r0, 0x1
strb r0, [r4, 0xD]
movs r2, 0xFF
ands r0, r2
lsls r0, 24
adds r1, r6, 0x1
mov r10, r1
movs r2, 0x40
adds r2, r4
mov r9, r2
cmp r0, 0
ble _081DEC4A
b _081DED9E
_081DEC4A:
lsls r0, r6, 24
lsrs r0, 24
bl CgbOscOff
movs r0, 0
strb r0, [r4]
b _081DEE9C
_081DEC58:
movs r0, 0x40
ands r0, r1
adds r2, r6, 0x1
mov r10, r2
movs r2, 0x40
adds r2, r4
mov r9, r2
cmp r0, 0
beq _081DEC98
movs r0, 0x3
ands r0, r1
cmp r0, 0
beq _081DEC98
movs r0, 0xFC
ands r0, r1
movs r2, 0
strb r0, [r4]
ldrb r1, [r4, 0x7]
strb r1, [r4, 0xB]
movs r0, 0xFF
ands r0, r1
cmp r0, 0
beq _081DECCA
movs r0, 0x1
ldrb r1, [r4, 0x1D]
orrs r0, r1
strb r0, [r4, 0x1D]
cmp r6, 0x3
beq _081DED8C
ldrb r2, [r4, 0x7]
mov r8, r2
b _081DED8C
_081DEC98:
ldrb r0, [r4, 0xB]
cmp r0, 0
bne _081DED8C
cmp r6, 0x3
bne _081DECAA
movs r0, 0x1
ldrb r1, [r4, 0x1D]
orrs r0, r1
strb r0, [r4, 0x1D]
_081DECAA:
adds r0, r4, 0
bl CgbModVol
movs r0, 0x3
ldrb r2, [r4]
ands r0, r2
cmp r0, 0
bne _081DECFE
ldrb r0, [r4, 0x9]
subs r0, 0x1
strb r0, [r4, 0x9]
movs r1, 0xFF
ands r0, r1
lsls r0, 24
cmp r0, 0
bgt _081DECFA
_081DECCA:
ldrb r2, [r4, 0xC]
ldrb r1, [r4, 0xA]
adds r0, r2, 0
muls r0, r1
adds r0, 0xFF
asrs r0, 8
movs r1, 0
strb r0, [r4, 0x9]
lsls r0, 24
cmp r0, 0
beq _081DEC4A
movs r0, 0x4
ldrb r2, [r4]
orrs r0, r2
strb r0, [r4]
movs r0, 0x1
ldrb r1, [r4, 0x1D]
orrs r0, r1
strb r0, [r4, 0x1D]
cmp r6, 0x3
beq _081DED9E
movs r2, 0x8
mov r8, r2
b _081DED9E
_081DECFA:
ldrb r0, [r4, 0x7]
b _081DED8A
_081DECFE:
cmp r0, 0x1
bne _081DED0A
_081DED02:
ldrb r0, [r4, 0x19]
strb r0, [r4, 0x9]
movs r0, 0x7
b _081DED8A
_081DED0A:
cmp r0, 0x2
bne _081DED4E
ldrb r0, [r4, 0x9]
subs r0, 0x1
strb r0, [r4, 0x9]
movs r1, 0xFF
ands r0, r1
lsls r0, 24
ldrb r2, [r4, 0x19]
lsls r1, r2, 24
cmp r0, r1
bgt _081DED4A
_081DED22:
ldrb r0, [r4, 0x6]
cmp r0, 0
bne _081DED32
movs r0, 0xFC
ldrb r1, [r4]
ands r0, r1
strb r0, [r4]
b _081DECCA
_081DED32:
ldrb r0, [r4]
subs r0, 0x1
strb r0, [r4]
movs r0, 0x1
ldrb r2, [r4, 0x1D]
orrs r0, r2
strb r0, [r4, 0x1D]
cmp r6, 0x3
beq _081DED02
movs r0, 0x8
mov r8, r0
b _081DED02
_081DED4A:
ldrb r0, [r4, 0x5]
b _081DED8A
_081DED4E:
ldrb r0, [r4, 0x9]
adds r0, 0x1
strb r0, [r4, 0x9]
movs r1, 0xFF
ands r0, r1
ldrb r2, [r4, 0xA]
cmp r0, r2
bcc _081DED88
_081DED5E:
ldrb r0, [r4]
subs r0, 0x1
movs r2, 0
strb r0, [r4]
ldrb r1, [r4, 0x5]
strb r1, [r4, 0xB]
movs r0, 0xFF
ands r0, r1
cmp r0, 0
beq _081DED22
movs r0, 0x1
ldrb r1, [r4, 0x1D]
orrs r0, r1
strb r0, [r4, 0x1D]
ldrb r0, [r4, 0xA]
strb r0, [r4, 0x9]
cmp r6, 0x3
beq _081DED8C
ldrb r2, [r4, 0x5]
mov r8, r2
b _081DED8C
_081DED88:
ldrb r0, [r4, 0x4]
_081DED8A:
strb r0, [r4, 0xB]
_081DED8C:
ldrb r0, [r4, 0xB]
subs r0, 0x1
strb r0, [r4, 0xB]
ldr r0, [sp]
cmp r0, 0
bne _081DED9E
subs r0, 0x1
str r0, [sp]
b _081DEC98
_081DED9E:
movs r0, 0x2
ldrb r1, [r4, 0x1D]
ands r0, r1
cmp r0, 0
beq _081DEE16
cmp r6, 0x3
bgt _081DEDDE
movs r0, 0x8
ldrb r2, [r4, 0x1]
ands r0, r2
cmp r0, 0
beq _081DEDDE
ldr r0, =REG_SOUNDBIAS + 1
ldrb r0, [r0]
cmp r0, 0x3F
bgt _081DEDD0
ldr r0, [r4, 0x20]
adds r0, 0x2
ldr r1, =0x000007fc
b _081DEDDA
.pool
_081DEDD0:
cmp r0, 0x7F
bgt _081DEDDE
ldr r0, [r4, 0x20]
adds r0, 0x1
ldr r1, =0x000007fe
_081DEDDA:
ands r0, r1
str r0, [r4, 0x20]
_081DEDDE:
cmp r6, 0x4
beq _081DEDF0
ldr r0, [r4, 0x20]
ldr r1, [sp, 0x10]
strb r0, [r1]
b _081DEDFE
.pool
_081DEDF0:
ldr r2, [sp, 0x10]
ldrb r0, [r2]
movs r1, 0x8
ands r1, r0
ldr r0, [r4, 0x20]
orrs r0, r1
strb r0, [r2]
_081DEDFE:
movs r0, 0xC0
ldrb r1, [r4, 0x1A]
ands r0, r1
adds r1, r4, 0
adds r1, 0x21
ldrb r1, [r1]
adds r0, r1, r0
strb r0, [r4, 0x1A]
movs r2, 0xFF
ands r0, r2
ldr r1, [sp, 0x14]
strb r0, [r1]
_081DEE16:
movs r0, 0x1
ldrb r2, [r4, 0x1D]
ands r0, r2
cmp r0, 0
beq _081DEE9C
ldr r1, =REG_NR51
ldrb r0, [r1]
ldrb r2, [r4, 0x1C]
bics r0, r2
ldrb r2, [r4, 0x1B]
orrs r0, r2
strb r0, [r1]
cmp r6, 0x3
bne _081DEE68
ldr r0, =gCgb3Vol
ldrb r1, [r4, 0x9]
adds r0, r1, r0
ldrb r0, [r0]
ldr r2, [sp, 0xC]
strb r0, [r2]
movs r1, 0x80
adds r0, r1, 0
ldrb r2, [r4, 0x1A]
ands r0, r2
cmp r0, 0
beq _081DEE9C
ldr r0, [sp, 0x8]
strb r1, [r0]
ldrb r0, [r4, 0x1A]
ldr r1, [sp, 0x14]
strb r0, [r1]
movs r0, 0x7F
ldrb r2, [r4, 0x1A]
ands r0, r2
strb r0, [r4, 0x1A]
b _081DEE9C
.pool
_081DEE68:
movs r0, 0xF
mov r1, r8
ands r1, r0
mov r8, r1
ldrb r2, [r4, 0x9]
lsls r0, r2, 4
add r0, r8
ldr r1, [sp, 0xC]
strb r0, [r1]
movs r2, 0x80
ldrb r0, [r4, 0x1A]
orrs r0, r2
ldr r1, [sp, 0x14]
strb r0, [r1]
cmp r6, 0x1
bne _081DEE9C
ldr r0, [sp, 0x8]
ldrb r1, [r0]
movs r0, 0x8
ands r0, r1
cmp r0, 0
bne _081DEE9C
ldrb r0, [r4, 0x1A]
orrs r0, r2
ldr r1, [sp, 0x14]
strb r0, [r1]
_081DEE9C:
movs r0, 0
strb r0, [r4, 0x1D]
_081DEEA0:
mov r6, r10
mov r4, r9
cmp r6, 0x4
bgt _081DEEAA
b _081DEAA0
_081DEEAA:
add sp, 0x1C
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end CgbSound
.align 2, 0 @ Don't pad with nop.
asm/main.s
+4 -4
View File
@@ -477,7 +477,7 @@ _08000782:
bl CopyBufferedValuesToGpuRegs
bl ProcessDma3Requests
ldr r1, =gUnknown_03002F50
ldr r0, =gUnknown_03006380
ldr r0, =gSoundInfo
ldrb r0, [r0, 0x4]
strb r0, [r1]
bl m4aSoundMain
@@ -562,7 +562,7 @@ VCountIntr: @ 8000844
beq _08000852
bl _call_via_r0
_08000852:
bl SoundVSync_rev01
bl m4aSoundVSync
ldr r2, =gUnknown_03007FF8
ldrh r0, [r2]
movs r1, 0x4
@@ -661,7 +661,7 @@ Reset: @ 80008F4
ldr r1, =0x04000208
movs r0, 0
strh r0, [r1]
bl SoundVSyncOff_rev01
bl m4aSoundVSyncOff
bl remove_some_task
ldr r1, =0x040000bc
ldrh r2, [r1, 0xA]
@@ -709,7 +709,7 @@ sub_8000964: @ 8000964
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_03007330
ldr r1, =gPokemonCrySongs
ldr r2, =0x01000034
mov r0, sp
bl CpuSet
asm/mauville_old_man.s
+10 -10
View File
@@ -965,12 +965,12 @@ _08120850:
lsls r1, 1
adds r0, r1
strh r0, [r6, 0x6]
ldr r4, =gUnknown_03007630
ldr r4, =gMPlay_SE2
ldr r5, =0x0000ffff
ldrh r2, [r6, 0x6]
adds r0, r4, 0
adds r1, r5, 0
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
ldrb r1, [r6, 0x1]
lsls r1, 2
adds r1, r6, r1
@@ -984,7 +984,7 @@ _08120850:
ldrsh r2, [r6, r3]
adds r0, r4, 0
adds r1, r5, 0
bl MPlayPitchControl
bl m4aMPlayPitchControl
b _08120938
.pool
_081208A0:
@@ -1008,17 +1008,17 @@ _081208BC:
subs r0, 0x40
_081208C0:
strh r0, [r6, 0x8]
ldr r4, =gUnknown_03007630
ldr r4, =gMPlay_SE2
ldr r5, =0x0000ffff
ldrh r2, [r6, 0x6]
adds r0, r4, 0
adds r1, r5, 0
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
movs r0, 0x8
ldrsh r2, [r6, r0]
adds r0, r4, 0
adds r1, r5, 0
bl MPlayPitchControl
bl m4aMPlayPitchControl
ldrh r0, [r6, 0xA]
adds r0, 0x1
strh r0, [r6, 0xA]
@@ -1059,8 +1059,8 @@ _08120922:
lsls r0, 24
cmp r0, 0
bne _08120938
ldr r0, =gUnknown_03007630
bl MPlayStop_rev01
ldr r0, =gMPlay_SE2
bl m4aMPlayStop
movs r0, 0x4
_08120936:
strb r0, [r6, 0x3]
@@ -1228,9 +1228,9 @@ _08120A7E:
bne _08120AB0
movs r0, 0x6
bl sub_80A3228
ldr r0, =gUnknown_03007630
ldr r0, =gMPlay_SE2
movs r1, 0x2
bl sub_82E0308
bl m4aMPlayFadeOutTemporarily
bl script_env_2_enable_and_set_ctx_running
adds r0, r6, 0
bl DestroyTask
asm/option_menu.s
+1 -1
View File
@@ -1101,7 +1101,7 @@ sub_80BADD8: @ 80BADD8
movs r4, 0x1
eors r5, r4
adds r0, r5, 0
bl sub_82E1810
bl SetPokemonCryStereo
ldr r0, =gUnknown_02039B48
strb r4, [r0]
_080BADF8:
asm/pokedex.s
+9 -9
View File
@@ -497,10 +497,10 @@ _080BB71C:
adds r1, r2
ldrb r1, [r1]
bl sub_80BC8D4
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
_080BB74C:
add sp, 0x8
pop {r3}
@@ -1246,11 +1246,11 @@ _080BBE18:
bl DestroyTask
ldr r0, =sub_8086194
bl SetMainCallback2
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
ldr r0, [r5]
bl Free
_080BBE4A:
@@ -7228,8 +7228,8 @@ _080BF2A8:
beq _080BF2B6
b _080BF5B2
_080BF2B6:
ldr r0, =gUnknown_03007420
bl MPlayStop_rev01
ldr r0, =gMPlay_BGM
bl m4aMPlayStop
ldr r5, =gUnknown_02039B4C
ldr r0, [r5]
ldr r3, =0x0000064a
@@ -7592,7 +7592,7 @@ _080BF636:
movs r2, 0
movs r3, 0x10
bl pal_fade_maybe
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
bl m4aMPlayContinue
ldr r0, =gUnknown_02039B4C
ldr r0, [r0]
@@ -7634,7 +7634,7 @@ _080BF6B0:
movs r2, 0
movs r3, 0x10
bl pal_fade_maybe
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
bl m4aMPlayContinue
ldr r0, =gUnknown_02039B4C
ldr r0, [r0]
@@ -7689,7 +7689,7 @@ _080BF73C:
movs r2, 0
movs r3, 0x10
bl pal_fade_maybe
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
bl m4aMPlayContinue
ldr r0, =gUnknown_02039B4C
ldr r0, [r0]
asm/pokedex_cry_screen.s
+3 -3
View File
@@ -239,7 +239,7 @@ sub_8145534: @ 8145534
lsls r0, 16
lsrs r4, r0, 16
adds r5, r4, 0
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r0, [r0, 0x4]
cmp r0, 0
bge _08145582
@@ -300,11 +300,11 @@ sub_81455A8: @ 81455A8
ldrsb r0, [r3, r0]
cmp r0, 0x1
bgt _081455C0
ldr r0, =gUnknown_030066D0
ldr r0, =gSoundInfo + 0x350
b _081455D8
.pool
_081455C0:
ldr r2, =gUnknown_03006380
ldr r2, =gSoundInfo
ldrb r1, [r2, 0xB]
movs r0, 0
ldrsb r0, [r3, r0]
asm/rom_8034C54.s
+29 -29
View File
@@ -6299,10 +6299,10 @@ sub_80384E4: @ 80384E4
ands r0, r1
cmp r0, 0
bne _08038512
ldr r0, =gUnknown_030075F0
bl MPlayStop_rev01
ldr r0, =gUnknown_03007630
bl MPlayStop_rev01
ldr r0, =gMPlay_SE1
bl m4aMPlayStop
ldr r0, =gMPlay_SE2
bl m4aMPlayStop
bl sub_803849C
bl FreeAllWindowBuffers
ldr r0, =gUnknown_030022C0
@@ -48662,18 +48662,18 @@ _0804FCA2:
b _0804FD70
.pool
_0804FCC4:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x55
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
b _0804FD70
.pool
_0804FCD8:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
b _0804FD70
.pool
_0804FCF0:
@@ -65202,16 +65202,16 @@ _08058C82:
ands r0, r1
cmp r0, 0x42
bne _08058D08
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
bl m4aMPlayContinue
b _08058D14
.pool
_08058D08:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
_08058D14:
ldr r0, =gUnknown_020244D0
ldr r2, [r0]
@@ -65528,11 +65528,11 @@ sub_8058FC0: @ 8058FC0
lsls r0, 24
cmp r0, 0
bne _0805900E
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
ldr r2, =gUnknown_0202406E
ldrb r1, [r4]
lsls r0, r1, 1
@@ -65648,11 +65648,11 @@ c3_0802FDF4: @ 8059100
lsls r0, 24
cmp r0, 0
bne _08059122
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
adds r0, r4, 0
bl DestroyTask
_08059122:
@@ -74118,10 +74118,10 @@ mplay_80342A4: @ 805DB90
ldrb r0, [r0, 0x8]
cmp r0, 0x1D
bls _0805DBDC
ldr r0, =gUnknown_030075F0
bl MPlayStop_rev01
ldr r0, =gUnknown_03007630
bl MPlayStop_rev01
ldr r0, =gMPlay_SE1
bl m4aMPlayStop
ldr r0, =gMPlay_SE2
bl m4aMPlayStop
_0805DBD8:
cmp r5, 0
beq _0805DBF0
@@ -77341,16 +77341,16 @@ _0805F6D0:
lsrs r0, 24
cmp r0, 0x1
bne _0805F774
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
bl m4aMPlayContinue
b _0805F774
.pool
_0805F768:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
_0805F774:
ldr r0, =gUnknown_020244D0
ldr r2, [r0]
@@ -77957,11 +77957,11 @@ bx_803AEDC: @ 805FC80
cmp r1, r0
bne _0805FCDA
_0805FCCA:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
bl dp01_tbl7_exec_completed
_0805FCDA:
pop {r4}
@@ -86796,16 +86796,16 @@ _08064898:
lsrs r0, 24
cmp r0, 0x1
bne _0806493C
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
bl m4aMPlayContinue
b _0806493C
.pool
_08064930:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
_0806493C:
ldr r0, =gUnknown_020244D0
ldr r2, [r0]
@@ -87368,11 +87368,11 @@ sub_8064DD0: @ 8064DD0
cmp r1, r0
bne _08064E2A
_08064E1A:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
bl sub_8065068
_08064E2A:
pop {r4}
asm/rom_8072304.s
+4 -4
View File
@@ -7165,15 +7165,15 @@ _08075E00:
lsls r0, 24
cmp r0, 0
beq _08075E56
ldr r0, =gUnknown_03007420
bl MPlayStop_rev01
ldr r0, =gMPlay_BGM
bl m4aMPlayStop
b _08075E56
.pool
_08075E4C:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
_08075E56:
bl battle_type_is_double
lsls r0, 24
asm/rom_80A3934.s
+16 -16
View File
@@ -260,9 +260,9 @@ _080A3BAA:
beq _080A3BC2
cmp r8, r0
bne _080A3BA8
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
movs r2, 0x80
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
_080A3BC2:
ldr r0, =gUnknown_02022E24
movs r1, 0
@@ -804,10 +804,10 @@ _080A401E:
b _080A40A2
.pool
_080A4030:
ldr r0, =gUnknown_030075F0
bl MPlayStop_rev01
ldr r0, =gUnknown_03007630
bl MPlayStop_rev01
ldr r0, =gMPlay_SE1
bl m4aMPlayStop
ldr r0, =gMPlay_SE2
bl m4aMPlayStop
_080A403C:
ldr r1, =gUnknown_0203842E
movs r0, 0
@@ -841,11 +841,11 @@ _080A406E:
mov r1, r8
cmp r1, 0
bne _080A40A2
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
bl sub_80A4DF0
lsls r0, 24
cmp r0, 0
@@ -3737,10 +3737,10 @@ ma20_wait_for_something: @ 80A586C
lsrs r0, 16
cmp r0, 0x5A
bls _080A58BA
ldr r0, =gUnknown_030075F0
bl MPlayStop_rev01
ldr r0, =gUnknown_03007630
bl MPlayStop_rev01
ldr r0, =gMPlay_SE1
bl m4aMPlayStop
ldr r0, =gMPlay_SE2
bl m4aMPlayStop
strh r5, [r4]
b _080A58DE
.pool
@@ -4189,10 +4189,10 @@ _080A5C38:
thumb_func_start ma2F_stop_music
ma2F_stop_music: @ 80A5C44
push {lr}
ldr r0, =gUnknown_030075F0
bl MPlayStop_rev01
ldr r0, =gUnknown_03007630
bl MPlayStop_rev01
ldr r0, =gMPlay_SE1
bl m4aMPlayStop
ldr r0, =gMPlay_SE2
bl m4aMPlayStop
ldr r1, =gUnknown_020383F0
ldr r0, [r1]
adds r0, 0x1
asm/rom_816F318.s
+5 -5
View File
@@ -1828,7 +1828,7 @@ _0817014C:
ldrb r0, [r0, 0x15]
lsls r0, 31
lsrs r0, 31
bl sub_82E1810
bl SetPokemonCryStereo
ldr r0, =0x02000000
movs r1, 0xE0
lsls r1, 9
@@ -10091,11 +10091,11 @@ _081747B8:
cmp r0, 0
beq _081747D2
bl sub_80A369C
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
_081747D2:
ldr r0, =sub_8174898
str r0, [r4]
@@ -10111,11 +10111,11 @@ _081747E4:
cmp r0, 0
beq _08174806
bl sub_80A369C
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
_08174806:
ldr r0, =gTasks
lsls r1, r6, 2
asm/rom_81795E8.s
+2 -2
View File
@@ -1402,11 +1402,11 @@ sub_817A2C0: @ 817A2C0
bne _0817A304
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
ldr r0, =gUnknown_030022C0
ldr r0, [r0, 0x8]
bl SetMainCallback2
asm/rom_8184DA4.s
+10 -10
View File
@@ -3369,16 +3369,16 @@ _081869AE:
lsrs r0, 24
cmp r0, 0x1
bne _08186A4C
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
bl m4aMPlayContinue
b _08186A4C
.pool
_08186A40:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
_08186A4C:
ldr r0, =gUnknown_020244D0
ldr r2, [r0]
@@ -3956,11 +3956,11 @@ sub_8186F14: @ 8186F14
cmp r1, r0
bne _08186F6E
_08186F5E:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
bl sub_81871AC
_08186F6E:
pop {r4}
@@ -9392,16 +9392,16 @@ _08189EA2:
lsls r0, 24
cmp r0, 0
bne _08189F44
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
bl m4aMPlayContinue
b _08189F44
.pool
_08189F38:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
_08189F44:
ldr r0, =gUnknown_020244D0
ldr r2, [r0]
@@ -61438,11 +61438,11 @@ _081A54D4:
bl sub_8056A3C
movs r0, 0
bl CopyBgTilemapBufferToVram
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
ldr r0, =0x7fffff1c
movs r1, 0
str r1, [sp]
asm/rom_81BAD84.s
+3 -3
View File
@@ -7976,7 +7976,7 @@ sub_81BF384: @ 81BF384
bl DisableInterrupts
movs r0, 0x1
bl EnableInterrupts
bl SoundVSyncOff_rev01
bl m4aSoundVSyncOff
movs r0, 0
bl SetVBlankCallback
bl ResetAllObjectData
@@ -9827,11 +9827,11 @@ sub_81C0484: @ 81C0484
bl ResetAllObjectData
bl ResetObjectPaletteAllocator
bl sub_80A369C
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
ldr r0, =gUnknown_020244D4
ldr r0, [r0]
cmp r0, 0
asm/roulette.s
+8 -8
View File
@@ -6815,19 +6815,19 @@ _08143BEA:
lsls r0, 24
cmp r0, 0
beq _08143C74
ldr r0, =gUnknown_030075F0
ldr r0, =gMPlay_SE1
ldr r4, =0x0000ffff
ldrh r2, [r7, 0x24]
lsls r2, 24
asrs r2, 24
adds r1, r4, 0
bl MPlayPanpotControl
ldr r0, =gUnknown_03007630
bl m4aMPlayPanpotControl
ldr r0, =gMPlay_SE2
ldrh r2, [r7, 0x24]
lsls r2, 24
asrs r2, 24
adds r1, r4, 0
bl MPlayPanpotControl
bl m4aMPlayPanpotControl
_08143C74:
pop {r3}
mov r8, r3
@@ -9294,17 +9294,17 @@ sub_81450D8: @ 81450D8
adds r4, r0
asrs r4, 1
negs r4, r4
ldr r0, =gUnknown_030075F0
ldr r0, =gMPlay_SE1
ldr r5, =0x0000ffff
lsls r4, 24
asrs r4, 24
adds r1, r5, 0
adds r2, r4, 0
bl MPlayPanpotControl
ldr r0, =gUnknown_03007630
bl m4aMPlayPanpotControl
ldr r0, =gMPlay_SE2
adds r1, r5, 0
adds r2, r4, 0
bl MPlayPanpotControl
bl m4aMPlayPanpotControl
b _08145208
.pool
_0814516C:
asm/sound.s
+57 -57
View File
@@ -297,8 +297,8 @@ pause_music_for_sound_maybe: @ 80A3060
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_03007420
bl MPlayStop_rev01
ldr r0, =gMPlay_BGM
bl m4aMPlayStop
ldr r0, =gUnknown_085248BC
lsls r4, 2
adds r4, r0
@@ -330,7 +330,7 @@ ducking_tick: @ 80A3094
_080A30B0:
cmp r1, 0
bne _080A30C0
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
bl m4aMPlayContinue
b _080A30C6
.pool
@@ -422,7 +422,7 @@ task50_overworld_fanfare: @ 80A3140
b _080A3164
.pool
_080A3158:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
bl m4aMPlayContinue
adds r0, r4, 0
bl DestroyTask
@@ -474,18 +474,18 @@ _080A31A8:
_080A31B0:
adds r0, r5, 0
bl m4aSongNumStart
ldr r4, =gUnknown_03007420
ldr r4, =gMPlay_BGM
adds r0, r4, 0
bl m4aMPlayImmInit
adds r0, r4, 0
adds r1, r6, 0
movs r2, 0
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
adds r0, r5, 0
bl m4aSongNumStop
adds r0, r4, 0
adds r1, r7, 0
bl sub_82E0328
bl m4aMPlayFadeIn
pop {r4-r7}
pop {r0}
bx r0
@@ -498,8 +498,8 @@ sub_80A31E8: @ 80A31E8
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r0, =gUnknown_03007420
bl sub_82E0308
ldr r0, =gMPlay_BGM
bl m4aMPlayFadeOutTemporarily
pop {r0}
bx r0
.pool
@@ -508,7 +508,7 @@ sub_80A31E8: @ 80A31E8
thumb_func_start sub_80A3200
sub_80A3200: @ 80A3200
push {lr}
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, [r0, 0x4]
cmp r1, 0
blt _080A3220
@@ -532,8 +532,8 @@ sub_80A3228: @ 80A3228
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r0, =gUnknown_03007420
bl sub_82E0328
ldr r0, =gMPlay_BGM
bl m4aMPlayFadeIn
pop {r0}
bx r0
.pool
@@ -546,7 +546,7 @@ play_sound_effect: @ 80A3240
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
bl m4aMPlayFadeOut
pop {r0}
bx r0
@@ -556,7 +556,7 @@ play_sound_effect: @ 80A3240
thumb_func_start sub_80A3258
sub_80A3258: @ 80A3258
push {lr}
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldrh r0, [r0, 0x4]
cmp r0, 0
beq _080A326C
@@ -580,10 +580,10 @@ cry_related: @ 80A3274
lsrs r5, 16
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x55
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
lsls r4, 24
asrs r4, 24
movs r0, 0
@@ -646,10 +646,10 @@ sub_80A32E4: @ 80A32E4
bl sub_80A344C
b _080A332E
_080A330A:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x55
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
lsls r1, r5, 24
asrs r1, 24
str r4, [sp]
@@ -698,10 +698,10 @@ _080A336E:
ands r0, r1
cmp r0, 0
bne _080A3384
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x55
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
_080A3384:
lsls r1, r5, 24
asrs r1, 24
@@ -739,10 +739,10 @@ play_cry_maybe: @ 80A33A8
bl sub_80A344C
b _080A33EE
_080A33CE:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x55
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
lsls r1, r5, 24
asrs r1, 24
str r4, [sp]
@@ -771,10 +771,10 @@ sub_80A3404: @ 80A3404
lsrs r5, 16
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x55
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
str r4, [sp]
adds r0, r5, 0
movs r1, 0
@@ -922,25 +922,25 @@ _080A3560:
ldr r4, =0x00003a98
_080A3562:
adds r0, r2, 0
bl sub_82E1744
bl SetPokemonCryVolume
mov r1, r10
lsls r0, r1, 24
asrs r0, 24
bl sub_82E1758
bl SetPokemonCryPanpot
adds r0, r4, 0
bl sub_82E1770
bl SetPokemonCryPitch
adds r0, r6, 0
bl sub_82E17A8
bl SetPokemonCryLength
movs r0, 0
bl sub_82E17C0
bl SetPokemonCryProgress
adds r0, r5, 0
bl sub_82E17B4
bl SetPokemonCryRelease
mov r3, r8
lsls r0, r3, 24
asrs r0, 24
bl sub_82E17E4
bl SetPokemonCryChorus
ldr r0, [sp]
bl sub_82E1850
bl SetPokemonCryPriority
adds r0, r7, 0
bl speciesid_conv
adds r7, r0, 0
@@ -1032,7 +1032,7 @@ _080A364C:
ldr r1, =gUnknown_0869EEF4
_080A3654:
adds r0, r1
bl sub_82E1674
bl SetPokemonCryTone
ldr r1, =gUnknown_020383E8
str r0, [r1]
_080A365E:
@@ -1072,7 +1072,7 @@ sub_80A369C: @ 80A369C
push {lr}
ldr r0, =gUnknown_020383E8
ldr r0, [r0]
bl MPlayStop_rev01
bl m4aMPlayStop
bl sub_8000964
pop {r0}
bx r0
@@ -1084,7 +1084,7 @@ sub_80A36B4: @ 80A36B4
push {lr}
ldr r0, =gUnknown_020383E8
ldr r0, [r0]
bl MPlayStop_rev01
bl m4aMPlayStop
pop {r0}
bx r0
.pool
@@ -1095,7 +1095,7 @@ sub_80A36C8: @ 80A36C8
push {lr}
ldr r0, =gUnknown_020383E8
ldr r0, [r0]
bl sub_82E17CC
bl IsPokemonCryPlaying
cmp r0, 0
bne _080A36E4
bl sub_8000964
@@ -1114,7 +1114,7 @@ sub_80A36EC: @ 80A36EC
push {lr}
ldr r0, =gUnknown_020383E8
ldr r0, [r0]
bl sub_82E17CC
bl IsPokemonCryPlaying
cmp r0, 0
bne _080A3704
movs r0, 0
@@ -1143,14 +1143,14 @@ sub_80A370C: @ 80A370C
_080A3724:
ldr r0, =gUnknown_020383E8
ldr r0, [r0]
bl sub_82E17CC
bl IsPokemonCryPlaying
cmp r0, 0
bne _080A3742
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
movs r2, 0x80
lsls r2, 1
bl MPlayVolumeControl
bl m4aMPlayVolumeControl
adds r0, r4, 0
bl DestroyTask
_080A3742:
@@ -1224,10 +1224,10 @@ audio_play_and_stuff: @ 80A37B4
lsls r4, 24
lsrs r4, 24
bl m4aSongNumStart
ldr r6, =gUnknown_030075F0
ldr r6, =gMPlay_SE1
adds r0, r6, 0
bl m4aMPlayImmInit
ldr r0, =gUnknown_03007630
ldr r0, =gMPlay_SE2
mov r8, r0
bl m4aMPlayImmInit
ldr r5, =0x0000ffff
@@ -1236,11 +1236,11 @@ audio_play_and_stuff: @ 80A37B4
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
bl MPlayPanpotControl
bl m4aMPlayPanpotControl
mov r0, r8
adds r1, r5, 0
adds r2, r4, 0
bl MPlayPanpotControl
bl m4aMPlayPanpotControl
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -1258,7 +1258,7 @@ sub_80A3808: @ 80A3808
lsls r4, 24
lsrs r4, 24
bl m4aSongNumStart
ldr r5, =gUnknown_030075F0
ldr r5, =gMPlay_SE1
adds r0, r5, 0
bl m4aMPlayImmInit
ldr r1, =0x0000ffff
@@ -1266,7 +1266,7 @@ sub_80A3808: @ 80A3808
asrs r4, 24
adds r0, r5, 0
adds r2, r4, 0
bl MPlayPanpotControl
bl m4aMPlayPanpotControl
pop {r4,r5}
pop {r0}
bx r0
@@ -1282,7 +1282,7 @@ sub_80A383C: @ 80A383C
lsls r4, 24
lsrs r4, 24
bl m4aSongNumStart
ldr r5, =gUnknown_03007630
ldr r5, =gMPlay_SE2
adds r0, r5, 0
bl m4aMPlayImmInit
ldr r1, =0x0000ffff
@@ -1290,7 +1290,7 @@ sub_80A383C: @ 80A383C
asrs r4, 24
adds r0, r5, 0
adds r2, r4, 0
bl MPlayPanpotControl
bl m4aMPlayPanpotControl
pop {r4,r5}
pop {r0}
bx r0
@@ -1301,17 +1301,17 @@ sub_80A383C: @ 80A383C
sub_80A3870: @ 80A3870
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, =gUnknown_030075F0
ldr r0, =gMPlay_SE1
ldr r5, =0x0000ffff
lsls r4, 24
asrs r4, 24
adds r1, r5, 0
adds r2, r4, 0
bl MPlayPanpotControl
ldr r0, =gUnknown_03007630
bl m4aMPlayPanpotControl
ldr r0, =gMPlay_SE2
adds r1, r5, 0
adds r2, r4, 0
bl MPlayPanpotControl
bl m4aMPlayPanpotControl
pop {r4,r5}
pop {r0}
bx r0
@@ -1321,14 +1321,14 @@ sub_80A3870: @ 80A3870
thumb_func_start mplay_has_finished_maybe
mplay_has_finished_maybe: @ 80A38A0
push {lr}
ldr r0, =gUnknown_030075F0
ldr r0, =gMPlay_SE1
ldr r1, [r0, 0x4]
movs r2, 0x80
lsls r2, 24
adds r3, r0, 0
cmp r1, 0
bge _080A38BA
ldr r0, =gUnknown_03007630
ldr r0, =gMPlay_SE2
ldr r0, [r0, 0x4]
ands r0, r2
cmp r0, 0
@@ -1338,7 +1338,7 @@ _080A38BA:
ldrh r0, [r3, 0x4]
cmp r0, 0
bne _080A38DC
ldr r0, =gUnknown_03007630
ldr r0, =gMPlay_SE2
ldr r0, [r0, 0x4]
ands r0, r1
cmp r0, 0
@@ -1357,7 +1357,7 @@ _080A38DE:
thumb_func_start sub_80A38E4
sub_80A38E4: @ 80A38E4
push {lr}
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, [r0, 0x4]
cmp r1, 0
blt _080A3904
@@ -1378,7 +1378,7 @@ _080A3906:
thumb_func_start sub_80A390C
sub_80A390C: @ 80A390C
push {lr}
ldr r0, =gUnknown_03007800
ldr r0, =gMPlay_SE3
ldr r1, [r0, 0x4]
cmp r1, 0
blt _080A392C
asm/text.s
+3 -3
View File
@@ -2796,12 +2796,12 @@ _08005ABA:
strb r0, [r6, 0x9]
b _08005A0A
_08005ABE:
ldr r0, =gUnknown_03007420
bl MPlayStop_rev01
ldr r0, =gMPlay_BGM
bl m4aMPlayStop
b _08005A0A
.pool
_08005ACC:
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
bl m4aMPlayContinue
b _08005A0A
.pool
asm/title_screen.s
+1 -1
View File
@@ -1169,7 +1169,7 @@ _080AAE30:
_080AAE72:
ldrb r0, [r3, 0x8]
bl title_screen_update_rayquaza_ring_palette
ldr r0, =gUnknown_03007420
ldr r0, =gMPlay_BGM
ldr r1, =0x0000ffff
ldrh r0, [r0, 0x4]
cmp r0, 0