diff options
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/events.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/player_object.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index bdac21c94..7c79d41df 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -813,7 +813,7 @@ PlayerMovement: CheckMenuOW: xor a ldh [hMenuReturn], a - ldh [hMenuReturn + 1], a + ldh [hUnusedFFA1], a ldh a, [hJoyPressed] bit SELECT_F, a diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 75d1de594..6905c83f0 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -20,10 +20,10 @@ SpawnPlayer: ld a, -1 ld [wObjectFollow_Leader], a ld [wObjectFollow_Follower], a - ld a, $0 + ld a, PLAYER ld hl, PlayerObjectTemplate call CopyPlayerObjectTemplate - ld b, $0 + ld b, PLAYER call PlayerSpawn_ConvertCoords ld a, PLAYER_OBJECT call GetMapObject |