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/lorelei.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/lorelei.asm')

diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm
index 43eee966..d50fc1dc 100755
--- a/scripts/lorelei.asm
+++ b/scripts/lorelei.asm
@@ -105,7 +105,7 @@ LoreleiScript3: ; 7622c (1d:622c)
 	ret
 LoreleiScript2: ; 7623f (1d:623f)
 	call EndTrainerBattle
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, LoreleiScript_761b6
 	ld a, $1
-- 
cgit v1.2.3