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/fuchsiagym.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/fuchsiagym.asm') diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index e10f534e..70f9fff0 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -37,7 +37,7 @@ FuchsiaGymScriptPointers: ; 75482 (1d:5482) dw FuchsiaGymScript3 FuchsiaGymScript3: ; 7548a (1d:548a) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, FuchsiaGymScript_75477 ld a, $f0 @@ -167,7 +167,7 @@ FuchsiaGymText1: ; 75534 (1d:5534) call EngageMapTrainer call InitBattleEnemyParameters ld a, $5 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a xor a ld [hJoyHeld], a ld a, $3 -- cgit v1.2.3