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/route16.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/route16.asm')

diff --git a/scripts/route16.asm b/scripts/route16.asm
index c762c999..760beb01 100755
--- a/scripts/route16.asm
+++ b/scripts/route16.asm
@@ -30,9 +30,9 @@ Route16Script0: ; 59959 (16:5959)
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, SNORLAX
-	ld [W_CUROPPONENT], a
+	ld [wCurOpponent], a
 	ld a, 30
-	ld [W_CURENEMYLVL], a
+	ld [wCurEnemyLVL], a
 	ld a, HS_ROUTE_16_SNORLAX
 	ld [wMissableObjectIndex], a
 	predef HideObject
@@ -43,7 +43,7 @@ Route16Script0: ; 59959 (16:5959)
 	ret
 
 Route16Script3: ; 5998f (16:598f)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, Route16Script_59946
 	call UpdateSprites
-- 
cgit v1.2.3