diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-12-16 14:19:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 14:19:06 -0500 |
| commit | 83ff516c8280e4c196053e347a5802375a7066f9 (patch) | |
| tree | 856e63dd64373abc8f240f1b3dcb34b3c945ec7b /engine | |
| parent | e025ab9db0b85cadb42e9b72ac408a58f8133672 (diff) | |
| parent | e51339f01a52603820749249b625d2093b611a8e (diff) | |
Merge pull request #579 from Rangi42/master
Miscellaneous
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/overworld/map_objects.asm | 1 | ||||
| -rw-r--r-- | engine/overworld/player_movement.asm | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index db10c917e..02b9cbdda 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -1822,6 +1822,7 @@ UpdateJumpPosition: .y db -4, -6, -8, -10, -11, -12, -12, -12 db -11, -10, -9, -8, -6, -4, 0, 0 + Function5000: ; unscripted? ; copy [wPlayerNextMovement] to [wPlayerMovement] ld a, [wPlayerNextMovement] diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index 26c11a522..e8f45d913 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -469,6 +469,7 @@ DoPlayerMovement:: ret .Steps: +; entries correspond to STEP_* constants dw .SlowStep dw .NormalStep dw .FastStep @@ -514,10 +515,10 @@ DoPlayerMovement:: turn_step LEFT turn_step RIGHT .FinishFacing: - db $80 + DOWN - db $80 + UP - db $80 + LEFT - db $80 + RIGHT + db $80 | DOWN + db $80 | UP + db $80 | LEFT + db $80 | RIGHT .StandInPlace: ld a, 0 |