diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-05 23:21:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 23:21:03 -0500 |
| commit | 2cb551cf0df29e2602d6a80c16f8bac0a136b134 (patch) | |
| tree | ed6f6f0faa3a88b86d1332a70ee8b1a64778cd25 /asm/battle_gfx_sfx_util.s | |
| parent | 0659d53c27fcb85b70c6f5a5065967fdc3da115d (diff) | |
| parent | 4fafb81b2f2e04e910ac05eaee038ff12889d846 (diff) | |
Merge pull request #13 from ProjectRevoTPP/sound
decompile sound.c
Diffstat (limited to 'asm/battle_gfx_sfx_util.s')
| -rw-r--r-- | asm/battle_gfx_sfx_util.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s index c280b1ffd..e56df1923 100644 --- a/asm/battle_gfx_sfx_util.s +++ b/asm/battle_gfx_sfx_util.s @@ -676,9 +676,9 @@ mplay_80342A4: @ 80342A4 ldrb r0, [r0, 0x8] cmp r0, 0x1D bls _080342F0 - ldr r0, _080342FC @ =gMPlay_SE1 + ldr r0, _080342FC @ =gMPlayInfo_SE1 bl m4aMPlayStop - ldr r0, _08034300 @ =gMPlay_SE2 + ldr r0, _08034300 @ =gMPlayInfo_SE2 bl m4aMPlayStop _080342EC: cmp r5, 0 @@ -689,8 +689,8 @@ _080342F0: .align 2, 0 _080342F4: .4byte gUnknown_2024018 _080342F8: .4byte gActiveBattler -_080342FC: .4byte gMPlay_SE1 -_08034300: .4byte gMPlay_SE2 +_080342FC: .4byte gMPlayInfo_SE1 +_08034300: .4byte gMPlayInfo_SE2 _08034304: ldr r0, _0803431C @ =gUnknown_2024018 ldr r0, [r0] |