diff --git a/engine/board/next_player_turn.asm b/engine/board/next_player_turn.asm
index dd1362c9d..f2b1c7732 100755
--- a/engine/board/next_player_turn.asm
+++ b/engine/board/next_player_turn.asm
@@ -16,7 +16,9 @@ GotoNextPlayerScript::
 	ld a, [wYCoord]
 	ld [hli], a ; wPlayer*YCoord
 	ld a, [wXCoord]
-	ld [hl], a ; wPlayer*XCoord
+	ld [hli], a ; wPlayer*XCoord
+	ld a, [wCurSpace]
+	ld [hl], a ; wPlayer*CurSpace
 	ld a, [wCurTurnPlayer]
 	ld hl, wPlayer1State
 	ld c, a
diff --git a/engine/overworld/spawn_points.asm b/engine/overworld/spawn_points.asm
index 09b98c9e1..9be00a1f6 100644
--- a/engine/overworld/spawn_points.asm
+++ b/engine/overworld/spawn_points.asm
@@ -38,8 +38,10 @@ EnterMapSpawnPoint:
 	ld [wMapNumber], a
 	ld a, [hli]
 	ld [wYCoord], a
-	ld a, [hl]
+	ld a, [hli]
 	ld [wXCoord], a
+	ld a, [hl]
+	ld [wCurSpace], a
 	ld a, [wCurTurnPlayer]
 	ld hl, wPlayer1State
 	ld c, a
diff --git a/macros/ram.asm b/macros/ram.asm
index 30713e2fc..b6c53b09d 100644
--- a/macros/ram.asm
+++ b/macros/ram.asm
@@ -421,4 +421,5 @@ MACRO player_location
 \1MapNumber:: db
 \1YCoord::    db
 \1XCoord::    db
+\1CurSpace::  db
 ENDM