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

5
scripts/PewterPokecenter.asm
View file

@ -65,6 +65,11 @@ PewterJigglypuffText:
call IsSongPlaying
pop hl
jr c, .spinMovementLoop
; ld a, [wChannelSoundIDs]
; ld b, a
; ld a, [wChannelSoundIDs + Ch2]
; or b
; jr nz, .spinMovementLoop
ld c, 48
call DelayFrames

6
scripts/RedsHouse1F.asm
View file

@ -31,7 +31,13 @@ MomHealPokemon:
ld a, MUSIC_PKMN_HEALED
ld [wNewSoundID], a
call PlayMusic
call WaitForSongToFinish
;.next
; ld a, [wChannelSoundIDs]
; cp MUSIC_PKMN_HEALED
; jr z, .next
ld a, [wMapMusicSoundID]
ld [wNewSoundID], a
call PlayMusic

6
scripts/SSAnneCaptainsRoom.asm
View file

@ -57,7 +57,13 @@ SSAnne7RubText:
ld a, MUSIC_PKMN_HEALED
ld [wNewSoundID], a
call PlayMusic
call WaitForSongToFinish
;.asm_61910
; ld a, [wChannelSoundIDs]
; cp MUSIC_PKMN_HEALED
; jr z, .asm_61910
call PlayDefaultMusic
SetEvent EVENT_RUBBED_CAPTAINS_BACK
ld hl, wd72d