summaryrefslogtreecommitdiff
path: root/engine/overworld/pathfinding.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-05 19:58:21 -0400
committerGitHub <noreply@github.com>2020-07-05 19:58:21 -0400
commitc57c93d2b2fb06cadafefda37c0974ba1ec9e6c0 (patch)
tree531d6b30d5a606ae963024825ed6e614843000a6 /engine/overworld/pathfinding.asm
parent2718c36065e7eb201a149938bcdd51987c4e56b6 (diff)
parent5fe8aab3445cb76d8e1c4be954c0392f40798950 (diff)
Merge pull request #259 from Rangi42/master
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'engine/overworld/pathfinding.asm')
-rw-r--r--engine/overworld/pathfinding.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/pathfinding.asm b/engine/overworld/pathfinding.asm
index ba052d38..7251759c 100644
--- a/engine/overworld/pathfinding.asm
+++ b/engine/overworld/pathfinding.asm
@@ -77,14 +77,14 @@ FindPathToPlayer:
CalcPositionOfPlayerRelativeToNPC:
xor a
ld [hNPCPlayerRelativePosFlags], a
- ld a, [wSpriteStateData1 + 4] ; player's sprite screen Y position in pixels
+ ld a, [wSpritePlayerStateData1YPixels]
ld d, a
- ld a, [wSpriteStateData1 + 6] ; player's sprite screen X position in pixels
+ ld a, [wSpritePlayerStateData1XPixels]
ld e, a
ld hl, wSpriteStateData1
ld a, [hNPCSpriteOffset]
add l
- add $4
+ add wSpritePlayerStateData1YPixels - wSpritePlayerStateData1
ld l, a
jr nc, .noCarry
inc h