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/vermiliongym.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/vermiliongym.asm') diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 6dae0751..d672a419 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -55,7 +55,7 @@ VermilionGymScriptPointers: ; 5ca95 (17:4a95) dw VermilionGymScript3 VermilionGymScript3: ; 5ca9d (17:4a9d) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, VermilionGymScript_5ca8a ld a, $f0 @@ -156,7 +156,7 @@ VermilionGymText1: ; 5cb1d (17:4b1d) call EngageMapTrainer call InitBattleEnemyParameters ld a, $3 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a xor a ld [hJoyHeld], a ld a, $3 -- cgit v1.3.1-sl0p