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/route12.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/route12.asm')
| -rwxr-xr-x | scripts/route12.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/route12.asm b/scripts/route12.asm index 4057ce03..01a5e93c 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -30,9 +30,9 @@ Route12Script0: ; 59619 (16:5619) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld a, 30 - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, HS_ROUTE_12_SNORLAX ld [wMissableObjectIndex], a predef HideObject @@ -42,7 +42,7 @@ Route12Script0: ; 59619 (16:5619) ret Route12Script3: ; 5964c (16:564c) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jr z, Route12Script_59606 call UpdateSprites |