Fix pokeflute in battle sfx

and other small improvements
This commit is contained in:
dannye 2021-03-28 23:23:45 -05:00
parent 5f87413b23
commit c1278c478e
28 changed files with 108 additions and 131 deletions

View file

@ -58,6 +58,9 @@ AnimateHealingMachine:
ld a, [wChannel1MusicID]
and a
jr nz, .waitLoop2
; ld a, [wChannelSoundIDs]
; cp MUSIC_PKMN_HEALED ; is the healed music still playing?
; jr z, .waitLoop2 ; if so, check gain
ld c, 32
call DelayFrames

View file

@ -122,6 +122,7 @@ _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