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

Use the same music headers as pokecrystal (#382)

Browse source
This commit is contained in:
Rangi 2022-08-11 21:23:08 -04:00 • committed by GitHub
parent ac7263b1ad
commit bbb0e7e82d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 1313 additions and 554 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engine/items/item_effects.asm
View file

@ -991,7 +991,7 @@ ItemUseMedicine:
.notFullHP ; if the pokemon's current HP doesn't equal its max HP
xor a
ld [wLowHealthAlarm], a ;disable low health alarm
ld [wChannelSoundIDs + Ch5], a
ld [wChannelSoundIDs + CHAN5], a
push hl
push de
ld bc, wPartyMon1MaxHP - (wPartyMon1HP + 1)
@ -1732,7 +1732,7 @@ ItemUsePokeflute:
call WaitForSoundToFinish ; wait for sound to end
farcall Music_PokeFluteInBattle ; play in-battle pokeflute music
.musicWaitLoop ; wait for music to finish playing
ld a, [wChannelSoundIDs + Ch7]
ld a, [wChannelSoundIDs + CHAN7]
and a ; music off?
jr nz, .musicWaitLoop
.skipMusic
@ -1799,7 +1799,7 @@ PlayedFluteHadEffectText:
ld c, BANK(SFX_Pokeflute)
call PlayMusic
.musicWaitLoop ; wait for music to finish playing
ld a, [wChannelSoundIDs + Ch3]
ld a, [wChannelSoundIDs + CHAN3]
cp SFX_POKEFLUTE
jr z, .musicWaitLoop
call PlayDefaultMusic ; start playing normal music again