From cb414f1480e9117e5d6ee0ab5cb81903e83cde9a Mon Sep 17 00:00:00 2001 From: luckytyphlosion 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/lance.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/lance.asm') diff --git a/scripts/lance.asm b/scripts/lance.asm index e2c43614..4d9d393c 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -85,7 +85,7 @@ CoordsData_5a33e: ; 5a33e (16:633e) LanceScript2: ; 5a349 (16:6349) call EndTrainerBattle - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, LanceScript_5a2f5 ld a, $1 -- cgit v1.2.3