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/celadongym.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/celadongym.asm') diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 459ba4b5..6588b25e 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -36,7 +36,7 @@ CeladonGymScriptPointers: ; 4894e (12:494e) dw CeladonGymScript3 CeladonGymScript3: ; 48956 (12:4956) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CeladonGymText_48943 ld a, $f0 @@ -176,7 +176,7 @@ CeladonGymText1: ; 48a11 (12:4a11) call EngageMapTrainer call InitBattleEnemyParameters ld a, $4 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a ld a, $3 ld [W_CELADONGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a -- cgit v1.3.1-sl0p