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/viridiancity.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/viridiancity.asm')
| -rwxr-xr-x | scripts/viridiancity.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index be7872e6..a660898b 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -23,10 +23,10 @@ ViridianCityScript_1900b: ; 1900b (6:500b) SetEvent EVENT_VIRIDIAN_GYM_OPEN ret .asm_1901e - ld a, [W_YCOORD] + ld a, [wYCoord] cp $8 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $20 ret nz ld a, $e @@ -42,10 +42,10 @@ ViridianCityScript_1900b: ; 1900b (6:500b) ViridianCityScript_1903d: ; 1903d (6:503d) CheckEvent EVENT_GOT_POKEDEX ret nz - ld a, [W_YCOORD] + ld a, [wYCoord] cp $9 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $13 ret nz ld a, $5 @@ -74,9 +74,9 @@ ViridianCityScript1: ; 19062 (6:5062) ld a, $1 ld [W_BATTLETYPE], a ld a, 5 - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, WEEDLE - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld a, $2 ld [W_VIRIDIANCITYCURSCRIPT], a ret |