From cb414f1480e9117e5d6ee0ab5cb81903e83cde9a Mon Sep 17 00:00:00 2001
From: luckytyphlosion <alan.rj.huang@gmail.com>
Date: Thu, 29 Oct 2015 14:23:30 -0400
Subject: overworld item & movement code, cable club code, remove more
 instances of W_, add PIKAHAPPY_TRADE

Also make replace.sh take args
---
 audio.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'audio.asm')

diff --git a/audio.asm b/audio.asm
index 5ab39d7d..6669df6c 100644
--- a/audio.asm
+++ b/audio.asm
@@ -361,13 +361,13 @@ PlayBattleMusic:: ; 9064 (2:5064)
 	call StopAllMusic
 	call DelayFrame
 	ld c, $8 ; BANK(Music_GymLeaderBattle)
-	ld a, [W_GYMLEADERNO]
+	ld a, [wGymLeaderNo]
 	and a
 	jr z, .notGymLeaderBattle
 	ld a, $ea ; MUSIC_GYM_LEADER_BATTLE
 	jr .playSong
 .notGymLeaderBattle
-	ld a, [W_CUROPPONENT]
+	ld a, [wCurOpponent]
 	cp 200
 	jr c, .wildBattle
 	cp OPP_SONY3
-- 
cgit v1.3.1-sl0p