diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-23 15:57:48 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-23 15:57:48 -0400 |
| commit | 9da88a19beed6b713317bb446d21cbd493ab8009 (patch) | |
| tree | d8d6cc4df3c3dcb00541b5bda9cae842584a7009 /engine/overworld/npc_movement.asm | |
| parent | e63bfa7741d503fa2710792898ac4a2b5b859acf (diff) | |
| parent | 5b53dbe15d0f24c0ebcb537d7e11c106abd99867 (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
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 58eb6a47..07abd44f 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -1,4 +1,4 @@ -PlayerStepOutFromDoor: ; 1a3e0 (6:63e0) +PlayerStepOutFromDoor: ; 1a4ea (6:64ea) ld hl, wd730 res 1, [hl] call IsPlayerStandingOnDoorTile @@ -258,7 +258,7 @@ RLEList_PewterGymPlayer: ; 1a6cb (6:66cb) db D_LEFT, $0F db $FF -RLEList_PewterGymGuy: ; 1a6cd8(6:66d8) +RLEList_PewterGymGuy: ; 1a6cd8 (6:66d8) db NPC_MOVEMENT_DOWN, $02 db NPC_MOVEMENT_LEFT, $0F db NPC_MOVEMENT_UP, $05 |