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/silphco11.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/silphco11.asm') diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 4c83c20d..6cb2e7ed 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -205,7 +205,7 @@ SilphCo11Script_6221a: ; 6221a (18:621a) jp SetSpriteFacingDirectionAndDelay SilphCo11Script5: ; 62227 (18:6227) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SilphCo11Script_621c4 ld a, [wcf0d] -- cgit v1.2.3