diff options
| author | mid-kid <esteve.varela@gmail.com> | 2020-04-30 17:54:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 17:54:56 +0000 |
| commit | d47c5603674414e6afeb34693d6255cfb9dece65 (patch) | |
| tree | fe6a45af47293264d55fb36e08c5065d73f43abe /engine | |
| parent | 38cdad798dbae4a2820f4d4e61bc5b782e70ef47 (diff) | |
| parent | 20464d1bfbc9934ccf7e98f3d2cb6ebe1c310480 (diff) | |
Merge pull request #715 from Rangi42/master
Miscellaneous updates
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/gfx/sgb_layouts.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/player_movement.asm | 13 | ||||
| -rw-r--r-- | engine/overworld/player_object.asm | 2 |
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 |