From 20c4116788d4d29b14c85ffce77e65faf89716b7 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Sat, 27 Jul 2019 23:21:39 -0500
Subject: 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

---
 home/audio.asm     | 2 +-
 home/overworld.asm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'home')

diff --git a/home/audio.asm b/home/audio.asm
index c982d9d6..242f038b 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -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 + Ch8], a
 .next
 	ld a, [wAudioFadeOutControl]
 	and a ; has a fade-out length been specified?
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
-- 
cgit v1.3.1-sl0p