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/route22.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/route22.asm')
| -rwxr-xr-x | scripts/route22.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/route22.asm b/scripts/route22.asm index 1244f0ff..ff506793 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -132,7 +132,7 @@ Route22Script1: ; 50f62 (14:4f62) ld de, Route22Text_511bc call SaveEndBattleTextPointers ld a, OPP_SONY1 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld hl, StarterMons_50faf call Route22Script_50ed6 ld a, $2 @@ -146,7 +146,7 @@ StarterMons_50faf: ; 50faf (14:4faf) db STARTER1,$06 Route22Script2: ; 50fb5 (14:4fb5) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, Route22Script_50ece ld a, [wSpriteStateData1 + 9] @@ -288,7 +288,7 @@ Route22Script4: ; 51087 (14:5087) ld de, Route22Text_511d0 call SaveEndBattleTextPointers ld a, OPP_SONY2 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld hl, StarterMons_510d9 call Route22Script_50ed6 ld a, $5 @@ -301,7 +301,7 @@ StarterMons_510d9: ; 510d9 (14:50d9) db STARTER1,$0c Route22Script5: ; 510df (14:50df) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, Route22Script_50ece ld a, $2 |