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/pewtergym.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/pewtergym.asm') diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 608fa4cd..1e6e5476 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -36,7 +36,7 @@ PewterGymScriptPointers: ; 5c3ca (17:43ca) dw PewterGymScript3 PewterGymScript3: ; 5c3d2 (17:43d2) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, PewterGymScript_5c3bf ld a, $f0 @@ -126,7 +126,7 @@ PewterGymText1: ; 5c44e (17:444e) call EngageMapTrainer call InitBattleEnemyParameters ld a, $1 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a xor a ld [hJoyHeld], a ld a, $3 -- cgit v1.3.1-sl0p