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
---
 scripts/silphco7.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts/silphco7.asm')

diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm
index 5333e07f..d535c04b 100755
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -184,7 +184,7 @@ SilphCo7Script3: ; 51c82 (14:5c82)
 	ld de, SilphCo7Text_51ecd
 	call SaveEndBattleTextPointers
 	ld a, OPP_SONY2
-	ld [W_CUROPPONENT], a
+	ld [wCurOpponent], a
 	ld a, [W_RIVALSTARTER]
 	cp STARTER2
 	jr nz, .asm_51cb6
@@ -203,7 +203,7 @@ SilphCo7Script3: ; 51c82 (14:5c82)
 	jp SilphCo7Text_51c10
 
 SilphCo7Script4: ; 51cc8 (14:5cc8)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, SilphCo7Text_51c0c
 	ld a, $f0
-- 
cgit v1.3.1-sl0p