diff options
| author | YamaArashi <shadow962@live.com> | 2017-02-03 16:44:06 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-02-03 16:44:06 -0800 |
| commit | e2b834d21d96332c5bcf788b390a09e285c7a5cb (patch) | |
| tree | 03034791bdc8e08ccbeeec1bce4777305c46e486 /asm/sound.s | |
| parent | ae1f731e60360437044c724675627c56bf404f25 (diff) | |
begin decompiling main.s
Diffstat (limited to 'asm/sound.s')
| -rw-r--r-- | asm/sound.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/sound.s b/asm/sound.s index 4686eaa7b..05331f698 100644 --- a/asm/sound.s +++ b/asm/sound.s @@ -5,8 +5,8 @@ .text - thumb_func_start sound_sources_off -sound_sources_off: @ 80A2DD4 + thumb_func_start InitMapMusic +InitMapMusic: @ 80A2DD4 push {lr} ldr r1, =gUnknown_03005DF8 movs r0, 0 @@ -15,10 +15,10 @@ sound_sources_off: @ 80A2DD4 pop {r0} bx r0 .pool - thumb_func_end sound_sources_off + thumb_func_end InitMapMusic - thumb_func_start sound_something -sound_something: @ 80A2DE8 + thumb_func_start MapMusicMain +MapMusicMain: @ 80A2DE8 push {r4,r5,lr} ldr r0, =gUnknown_03000F4C ldrb r1, [r0] @@ -111,7 +111,7 @@ _080A2ECA: pop {r0} bx r0 .pool - thumb_func_end sound_something + thumb_func_end MapMusicMain thumb_func_start map_music_set_to_zero map_music_set_to_zero: @ 80A2EE0 @@ -1056,7 +1056,7 @@ sub_80A3678: @ 80A3678 lsrs r0, 24 cmp r0, 0x1 beq _080A3694 - bl sub_8000964 + bl ClearPokemonCrySongs movs r0, 0x1 b _080A3696 .pool @@ -1073,7 +1073,7 @@ sub_80A369C: @ 80A369C ldr r0, =gUnknown_020383E8 ldr r0, [r0] bl m4aMPlayStop - bl sub_8000964 + bl ClearPokemonCrySongs pop {r0} bx r0 .pool @@ -1098,7 +1098,7 @@ sub_80A36C8: @ 80A36C8 bl IsPokemonCryPlaying cmp r0, 0 bne _080A36E4 - bl sub_8000964 + bl ClearPokemonCrySongs movs r0, 0 b _080A36E6 .pool |