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/saffrongym.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/saffrongym.asm') diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 567f79d8..cae60f45 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -36,7 +36,7 @@ SaffronGymScriptPointers: ; 5d053 (17:5053) dw SaffronGymScript3 SaffronGymScript3: ; 5d05b (17:505b) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SaffronGymText_5d048 ld a, $f0 @@ -177,7 +177,7 @@ SaffronGymText1: ; 5d118 (17:5118) call EngageMapTrainer call InitBattleEnemyParameters ld a, $6 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a ld a, $3 ld [W_SAFFRONGYMCURSCRIPT], a .asm_5d15f -- cgit v1.2.3