Use the same music headers as pokecrystal (#382)

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

View file

@ -1244,7 +1244,7 @@ CollisionCheckOnLand::
call CheckTilePassable
jr nc, .noCollision
.collision
ld a, [wChannelSoundIDs + Ch5]
ld a, [wChannelSoundIDs + CHAN5]
cp SFX_COLLISION ; check if collision sound is already playing
jr z, .setCarry
ld a, SFX_COLLISION
@ -1925,7 +1925,7 @@ CollisionCheckOnWater::
jr z, .stopSurfing ; stop surfing if the tile is passable
jr .loop
.collision
ld a, [wChannelSoundIDs + Ch5]
ld a, [wChannelSoundIDs + CHAN5]
cp SFX_COLLISION ; check if collision sound is already playing
jr z, .setCarry
ld a, SFX_COLLISION