Redo audio header macro

This commit is contained in:
dannye 2016-07-27 22:08:13 -05:00
parent dbe2a3b168
commit 5207a14af3
21 changed files with 528 additions and 564 deletions

View file

@ -148,10 +148,10 @@ PlaySound::
and a
jr z, .next
xor a
ld [wChannelSoundIDs + CH4], a
ld [wChannelSoundIDs + CH5], a
ld [wChannelSoundIDs + CH6], a
ld [wChannelSoundIDs + CH7], a
ld [wChannelSoundIDs + Ch4], a
ld [wChannelSoundIDs + Ch5], a
ld [wChannelSoundIDs + Ch6], a
ld [wChannelSoundIDs + Ch7], a
.next
ld a, [wAudioFadeOutControl]
and a ; has a fade-out length been specified?

View file

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