From e9b3a4905487073dcf3acdbcd92adfa16dbf5d35 Mon Sep 17 00:00:00 2001
From: Forest Belton <65484+forestbelton@users.noreply.github.com>
Date: Sat, 17 Jul 2021 01:00:35 -0400
Subject: [PATCH] Spawn player at map spawn

---
 src/map.s | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/map.s b/src/map.s
index 3857bb6..ac2afb1 100644
--- a/src/map.s
+++ b/src/map.s
@@ -47,6 +47,25 @@ Map_Load::
     ld d, CURRENT_DATA_END - CURRENT_DATA_START
     call memcpy
 
+    ; Move player to spawn point
+    ld a, [CURRENT_CAMERA_X]
+    ld b, a
+    ld a, [CURRENT_SPAWN_X]
+    sub b
+    sla a
+    sla a
+    sla a
+    ld [PLAYER_X], a
+
+    ld a, [CURRENT_CAMERA_Y]
+    ld b, a
+    ld a, [CURRENT_SPAWN_Y]
+    sub b
+    sla a
+    sla a
+    sla a
+    ld [PLAYER_Y], a
+
     ; Write tiles to VRAM
     ld hl, CURRENT_TILE_PTR
     ld a, [hl+]