thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix pokeflute in battle sfx

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

7
engine/items/item_effects.asm
View file

@ -1735,11 +1735,16 @@ ItemUsePokeflute:
and $80
jr nz, .skipMusic
call WaitForSoundToFinish ; wait for sound to end
;farcall Music_PokeFluteInBattle ; play in-battle pokeflute music ; XXX
ld a, SFX_POKEFLUTE_IN_BATTLE
call PlaySound
call WaitForSoundToFinish
; farcall Music_PokeFluteInBattle ; play in-battle pokeflute music
;.musicWaitLoop ; wait for music to finish playing
; ld a, [wChannelSoundIDs + Ch7]
; and a ; music off?
; jr nz, .musicWaitLoop
.skipMusic
ld hl, FluteWokeUpText
jp PrintText