thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-14 09:06:41 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix collision sfx during surfing

Browse source
This commit is contained in:
dannye 2019-04-21 15:27:10 -05:00
parent 735d5bd4c2
commit c52ab8fb90
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
home/overworld.asm
View file

@ -1967,9 +1967,15 @@ CollisionCheckOnWater::
jr z, .stopSurfing ; stop surfing if the tile is passable jr z, .stopSurfing ; stop surfing if the tile is passable
jr .loop jr .loop
.collision .collision
ld a, [wChannelSoundIDs + Ch4] ;ld a, [wChannelSoundIDs + Ch4]
cp SFX_COLLISION ; check if collision sound is already playing ;cp SFX_COLLISION ; check if collision sound is already playing
jr z, .setCarry ; curSFX is not cleared for some reason.
; ch5 on?
ld hl, wChannel5 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1
bit 0, [hl]
jr nz, .setCarry
ld a, SFX_COLLISION ld a, SFX_COLLISION
call PlaySound ; play collision sound (if it's not already playing) call PlaySound ; play collision sound (if it's not already playing)
.setCarry .setCarry