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/cinnabargym.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/cinnabargym.asm')
| -rwxr-xr-x | scripts/cinnabargym.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 73aad423..649609b3 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -92,7 +92,7 @@ CinnabarGymFlagAction: ; 757f1 (1d:57f1) predef_jump FlagActionPredef CinnabarGymScript2: ; 757f6 (1d:57f6) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CinnabarGymScript_75792 ld a, [wTrainerHeaderFlagBit] @@ -134,7 +134,7 @@ CinnabarGymScript2: ; 757f6 (1d:57f6) ret CinnabarGymScript3: ; 7584a (1d:584a) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CinnabarGymScript_75792 ld a, $f0 @@ -224,7 +224,7 @@ CinnabarGymText1: ; 758df (1d:58df) ld de, BlaineEndBattleText call SaveEndBattleTextPointers ld a, $7 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a jp CinnabarGymScript_758b7 BlaineBattleText: ; 75914 (1d:5914) |