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

@ -17,17 +17,13 @@ AnimateHealingMachine:
call CopyHealingMachineOAM
ld a, 4
call StopMusic
call WaitForSongToFinish
; ld a, 4
; ld [wAudioFadeOutControl], a
; ld a, SFX_STOP_ALL_MUSIC
; ld [wNewSoundID], a
; call PlaySound
;.waitLoop
; ld a, [wAudioFadeOutControl]
; and a ; is fade-out finished?
; jr nz, .waitLoop ; if not, check again
ld [wMusicFade], a
xor a
ld [wMusicFadeID], a
.waitLoop
ld a, [wMusicFade]
and a ; is fade-out finished?
jr nz, .waitLoop ; if not, check again
ld a, [wPartyCount]
ld b, a

View file

@ -122,7 +122,6 @@ _LeaveMapAnim::
.playerNotStandingOnWarpPadOrHole
ld a, $4
call StopMusic
call WaitForSongToFinish
ld a, [wd732]
bit 6, a ; is the last used pokemon center the destination?
jr z, .flyAnimation