summaryrefslogtreecommitdiff
path: root/engine/overworld
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-04-30 11:27:32 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-04-30 11:27:32 -0400
commit20464d1bfbc9934ccf7e98f3d2cb6ebe1c310480 (patch)
treefe6a45af47293264d55fb36e08c5065d73f43abe /engine/overworld
parent38cdad798dbae4a2820f4d4e61bc5b782e70ef47 (diff)
Miscellaneous updates
- `PREDEFPAL_00` -> `PREDEFPAL_ROUTES` (observed from `LoadSGBLayout.GetMapPalsIndex.route`) - `$0` -> `PLAYER` (standard person ID) - Fix some whitespace formatting
Diffstat (limited to 'engine/overworld')
-rw-r--r--engine/overworld/player_movement.asm13
-rw-r--r--engine/overworld/player_object.asm2
2 files changed, 9 insertions, 6 deletions
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index 3beec6ccb..74ca50d70 100644
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -577,11 +577,14 @@ DoPlayerMovement::
; Standing
jr .update
-.d_down add hl, de
-.d_up add hl, de
-.d_left add hl, de
-.d_right add hl, de
-
+.d_down
+ add hl, de
+.d_up
+ add hl, de
+.d_left
+ add hl, de
+.d_right
+ add hl, de
.update
ld a, [hli]
ld [wWalkingDirection], a
diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm
index 6905c83f0..3446a00c6 100644
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -124,7 +124,7 @@ RefreshPlayerCoords:
ld e, a
; the next three lines are useless
ld a, [wObjectFollow_Leader]
- cp $0
+ cp PLAYER
ret nz
ret