diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
| commit | cb414f1480e9117e5d6ee0ab5cb81903e83cde9a (patch) | |
| tree | e44bd6299c61335a9a0476db57b565aadcd0b4d7 /scripts/ceruleangym.asm | |
| parent | 2ea331ebb341505df1cd8429b140c52e345a5af4 (diff) | |
overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
Diffstat (limited to 'scripts/ceruleangym.asm')
| -rwxr-xr-x | scripts/ceruleangym.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index 0507a1d4..fe0faea0 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -36,7 +36,7 @@ CeruleanGymScriptPointers: ; 5c6f8 (17:46f8) dw CeruleanGymScript3 CeruleanGymScript3: ; 5c700 (17:4700) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CeruleanGymScript_5c6ed ld a, $f0 @@ -127,7 +127,7 @@ CeruleanGymText1: ; 5c771 (17:4771) call EngageMapTrainer call InitBattleEnemyParameters ld a, $2 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a xor a ld [hJoyHeld], a ld a, $3 |