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/rockethideout4.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/rockethideout4.asm') diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index a71e444c..815f6090 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -44,7 +44,7 @@ RocketHideout4ScriptPointers: ; 454ae (11:54ae)c dw RocketHideout4Script3 RocketHideout4Script3: ; 454b6 (11:54b6) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, RocketHideout4Script_454a3 call UpdateSprites -- cgit v1.2.3