From 0d51959c83aa0f361e53bf93d184c9d31543d953 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sun, 30 Mar 2014 16:56:42 -0700
Subject: Use labels instead of static addresses in sound pointers.

Static address substraction would wreak havoc in other memory configurations.
---
 audio.asm | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'audio.asm')

diff --git a/audio.asm b/audio.asm
index 160ae6cc..c18bc041 100644
--- a/audio.asm
+++ b/audio.asm
@@ -521,7 +521,7 @@ INCLUDE "audio/engine_2.asm"
 
 
 Music_PokeFluteInBattle:: ; 22306 (8:6306)
-	ld a, (SFX_08_46 - $4000) / 3 ; PokeFlute outside of battle
+	ld a, (SFX_08_46 - SFX_Headers_08) / 3 ; PokeFlute outside of battle
 	call PlaySoundWaitForCurrent
 	ld hl, $c00e
 	ld de, SFX_08_PokeFlute_Ch1
@@ -566,20 +566,13 @@ Func_7d13b:: ; 7d13b (1f:513b)
 	jp Func_2307
 
 PokedexRatingSfxPointers: ; 7d162 (1f:5162)
-	db (SFX_1f_51 - $4000) / 3
-	db BANK(SFX_1f_51)
-	db (SFX_02_41 - $4000) / 3
-	db BANK(SFX_02_41)
-	db (SFX_02_3a - $4000) / 3
-	db BANK(SFX_02_3a)
-	db (SFX_08_46 - $4000) / 3
-	db BANK(SFX_08_46)
-	db (SFX_08_3a - $4000) / 3
-	db BANK(SFX_08_3a)
-	db (SFX_02_42 - $4000) / 3
-	db BANK(SFX_02_42)
-	db (SFX_02_3b - $4000) / 3
-	db BANK(SFX_02_3b)
+	db (SFX_1f_51 - SFX_Headers_1f) / 3, BANK(SFX_1f_51)
+	db (SFX_02_41 - SFX_Headers_02) / 3, BANK(SFX_02_41)
+	db (SFX_02_3a - SFX_Headers_02) / 3, BANK(SFX_02_3a)
+	db (SFX_08_46 - SFX_Headers_08) / 3, BANK(SFX_08_46)
+	db (SFX_08_3a - SFX_Headers_08) / 3, BANK(SFX_08_3a)
+	db (SFX_02_42 - SFX_Headers_02) / 3, BANK(SFX_02_42)
+	db (SFX_02_3b - SFX_Headers_02) / 3, BANK(SFX_02_3b)
 
 OwnedMonValues: ; 7d170 (1f:5170)
 	db 10, 40, 60, 90, 120, 150, $ff
-- 
cgit v1.3.1-sl0p