summaryrefslogtreecommitdiff
path: root/home/overworld.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2019-07-27 23:21:39 -0500
committerdannye <33dannye@gmail.com>2019-07-27 23:21:39 -0500
commit20c4116788d4d29b14c85ffce77e65faf89716b7 (patch)
tree7dcc36a1b3568ebe5b98b3cc7ddb8344a2162cc9 /home/overworld.asm
parent36597a7917144bbf5d9ae63a0f9d537f6f58eb74 (diff)
Update audio macro names
change audio channel numbers from 0-7 back to 1-8 change all note macros back to single note macro todo: fix comments with old macro names, update noise macros/instrument names
Diffstat (limited to 'home/overworld.asm')
-rw-r--r--home/overworld.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/home/overworld.asm b/home/overworld.asm
index 9404a713..b96efcb4 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -1244,7 +1244,7 @@ CollisionCheckOnLand::
call CheckTilePassable
jr nc, .noCollision
.collision
- ld a, [wChannelSoundIDs + Ch4]
+ ld a, [wChannelSoundIDs + Ch5]
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 + Ch5]
cp SFX_COLLISION ; check if collision sound is already playing
jr z, .setCarry
ld a, SFX_COLLISION