From 398c9d42b691bc633d22dff85bc2ac29ed635efa Mon Sep 17 00:00:00 2001
From: Astatin <git@astatin.live>
Date: Thu, 27 Feb 2025 17:06:33 +0900
Subject: Fix entities and objects spawning on top of each other

---
 map/objects.gbasm | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'map/objects.gbasm')

diff --git a/map/objects.gbasm b/map/objects.gbasm
index 6d084aa..5bedeee 100644
--- a/map/objects.gbasm
+++ b/map/objects.gbasm
@@ -14,6 +14,7 @@ Initialize_Objects:
 Spawn_object_in_random_room: ; Object tile in A, Object jump table id in E, Object pointer in HL
 	LD (HL+), A
 
+	.place_in_random_room:
 	LD A, $mem_number_of_rooms
 	CALL =RNG_Bound
 	SLA A
@@ -44,8 +45,16 @@ Spawn_object_in_random_room: ; Object tile in A, Object jump table id in E, Obje
 	ADD D
 	LD (HL), A
 
+	LD C, (HL)
+
 	DEC HL
 
+	LD B, (HL)
+
+	CALL =Is_Collisionable
+	CP $00
+	JR NZ, =.place_in_random_room
+
 	LD BC, $mem_object_list
 	Object_check_collisions.loop:
 		LD A, (BC)
-- 
cgit v1.2.3-70-g09d2