diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-03 16:37:47 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-03 16:37:47 -0400 |
| commit | 9878f01e29b1443d6c894c1332cbf381fa12646e (patch) | |
| tree | 8e763ca94f2b90faaa470416055c320dbdb89cbf /audio | |
| parent | Make suggested edits: (diff) | |
| download | pokeyellow-9878f01e29b1443d6c894c1332cbf381fa12646e.tar.gz pokeyellow-9878f01e29b1443d6c894c1332cbf381fa12646e.tar.xz pokeyellow-9878f01e29b1443d6c894c1332cbf381fa12646e.zip | |
Organize macros/ like pokecrystal
While doing so I replaced the StopAllMusic macro with a SFX_STOP_ALL_MUSIC constant and applied it throughout the code.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/play_battle_music.asm | 4 | ||||
| -rw-r--r-- | audio/pokedex_rating_sfx.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm index 35dd19ad..f8bfcd19 100644 --- a/audio/play_battle_music.asm +++ b/audio/play_battle_music.asm @@ -2,9 +2,9 @@ PlayBattleMusic:: xor a ld [wAudioFadeOutControl], a ld [wLowHealthAlarm], a - dec a + dec a ; SFX_STOP_ALL_MUSIC ld [wNewSoundID], a - call PlaySound ; stop music + call PlaySound call DelayFrame ld c, BANK(Music_GymLeaderBattle) ld a, [wGymLeaderNo] diff --git a/audio/pokedex_rating_sfx.asm b/audio/pokedex_rating_sfx.asm index a218d5e6..f3aace8a 100644 --- a/audio/pokedex_rating_sfx.asm +++ b/audio/pokedex_rating_sfx.asm @@ -10,7 +10,7 @@ PlayPokedexRatingSfx:: jr .getSfxPointer .gotSfxPointer push bc - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySoundWaitForCurrent pop bc |