aboutsummaryrefslogtreecommitdiff
path: root/map
diff options
context:
space:
mode:
authorAstatin <[email protected]>2025-02-27 17:06:33 +0900
committerAstatin <[email protected]>2025-02-27 17:06:33 +0900
commit398c9d42b691bc633d22dff85bc2ac29ed635efa (patch)
tree21de30112ea1a49f2f064b4d8322cfba4015cfcb /map
parentb21954eb05d9285ed7542a1f42ed755a147782a8 (diff)
Fix entities and objects spawning on top of each other
Diffstat (limited to 'map')
-rw-r--r--map/objects.gbasm9
1 files changed, 9 insertions, 0 deletions
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)