Fix #709 miscellaneous issues

2020-04-16 09:30:50 -04:00
parent 3540578cb3
commit 58b377f25b
8 changed files with 15 additions and 14 deletions
--- 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
--- 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