summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/gfx/sgb_layouts.asm2
-rw-r--r--engine/overworld/player_movement.asm13
-rw-r--r--engine/overworld/player_object.asm2
3 files changed, 10 insertions, 7 deletions
diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm
index a0727c939..8b6c218f4 100644
--- a/engine/gfx/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@@ -547,7 +547,7 @@ endr
ret
.route
- ld a, PREDEFPAL_00
+ ld a, PREDEFPAL_ROUTES
ret
.cave
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