Fix remaining uses of fade

This commit is contained in:
dannye 2021-03-30 01:06:32 -05:00
parent 37d3ba4b39
commit b2afaae7ab
14 changed files with 43 additions and 62 deletions

View file

@ -38,7 +38,9 @@ Music_RivalAlternateStartAndTempo::
; an alternate tempo for Cities1 which is used for the Hall of Fame room
Music_Cities1AlternateTempo::
ld a, 10
call StopMusic
ld [wMusicFade], a
xor a
ld [wMusicFadeID], a
ld c, 100
call DelayFrames ; wait for the fade-out to finish
ld c, 0 ; BANK(Music_Cities1)

View file

@ -1,8 +1,7 @@
PlayBattleMusic::
xor a
ld [wAudioFadeOutControl], a
ld [wLowHealthAlarm], a
ld [wMusicFade], a
ld [wLowHealthAlarm], a
dec a ; SFX_STOP_ALL_MUSIC
; ld [wNewSoundID], a
call PlayMusic