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

(limited to 'scripts/bruno.asm')

diff --git a/scripts/bruno.asm b/scripts/bruno.asm
index bdfd7e24..5318ecba 100755
--- a/scripts/bruno.asm
+++ b/scripts/bruno.asm
@@ -105,7 +105,7 @@ BrunoScript3: ; 76383 (1d:6383)
 
 BrunoScript2: ; 76396 (1d:6396)
 	call EndTrainerBattle
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, BrunoScript_7630d
 	ld a, $1
-- 
cgit v1.2.3