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 /engine/overworld/npc_movement.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 'engine/overworld/npc_movement.asm')
| -rwxr-xr-x | engine/overworld/npc_movement.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 098be875..a609fb60 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -52,7 +52,7 @@ PalletMovementScriptPointerTable: ; 1a442 (6:6442) dw PalletMovementScript_Done PalletMovementScript_OakMoveLeft: ; 1a44c (6:644c) - ld a, [W_XCOORD] + ld a, [wXCoord] sub $a ld [wNumStepsToTake], a jr z, .playerOnLeftTile @@ -267,7 +267,7 @@ RLEList_PewterGymGuy: ; 1a5da (6:65da) db $FF FreezeEnemyTrainerSprite: ; 1a5e7 (6:65e7) - ld a, [W_CURMAP] + ld a, [wCurMap] cp POKEMONTOWER_7 ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them ld hl, RivalIDs |