diff options
| author | yenatch <yenatch@gmail.com> | 2016-01-29 01:00:48 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-01-29 01:00:48 -0500 |
| commit | 11173a3807bde4e2d5b681717258b5b14f5f2d43 (patch) | |
| tree | 8e1692fe02b30ceeb2d797c001e0594175e29b78 /engine/npc_movement.asm | |
| parent | 289d3dea86b82c4ce7eb7268ef33980688306587 (diff) | |
| parent | 5322b56a8357e5e5a8847f3329b52faa3f7016d8 (diff) | |
Merge pull request #333 from PikalaxALT/master
Split base stats, rearrange wram.asm, naming screen
Diffstat (limited to 'engine/npc_movement.asm')
| -rwxr-xr-x | engine/npc_movement.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/npc_movement.asm b/engine/npc_movement.asm index bc270305b..097c62017 100755 --- a/engine/npc_movement.asm +++ b/engine/npc_movement.asm @@ -234,14 +234,14 @@ CheckFacingObject:: ; 6fd9 call CheckCounterTile jr nz, .asm_6ff1 - ld a, [PlayerNextMapX] + ld a, [PlayerStandingMapX] sub d cpl inc a add d ld d, a - ld a, [PlayerNextMapY] + ld a, [PlayerStandingMapY] sub e cpl inc a @@ -482,9 +482,9 @@ IsPersonMovingOffEdgeOfScreen: ; 70ed ; 7113 Function7113: ; unreferenced - ld a, [PlayerNextMapX] + ld a, [PlayerStandingMapX] ld d, a - ld a, [PlayerNextMapY] + ld a, [PlayerStandingMapY] ld e, a ld bc, ObjectStructs xor a |