From 09a173d2f1123b6ac203c247094c312473705802 Mon Sep 17 00:00:00 2001
From: Astatin <git@astatin.live>
Date: Wed, 27 Aug 2025 17:04:54 +0200
Subject: Fix health not updated on death, fix penguin freeze not working on
 bunny blink, fix entity initial spawn

---
 entity/init.gbasm | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'entity')

diff --git a/entity/init.gbasm b/entity/init.gbasm
index c67d782..173bf32 100644
--- a/entity/init.gbasm
+++ b/entity/init.gbasm
@@ -32,11 +32,11 @@ Initialize_Entities:
 
 	LD A, $00
 	LD $tmp_var_3, A
-	CALL =Initialize_Enemy
-	CALL =Initialize_Enemy
-	CALL =Initialize_Enemy
-	CALL =Initialize_Enemy
-	CALL =Initialize_Enemy
+	CALL =Spawn_Entity
+	CALL =Spawn_Entity
+	CALL =Spawn_Entity
+	CALL =Spawn_Entity
+	CALL =Spawn_Entity
 	LD A, $tmp_var_1
 	LD $mem_bunny_current_room_idx, A
 
@@ -137,8 +137,6 @@ Initialize_Entity: ; HL => pointer to entity struct, A => entity loaded index, 1
 
 	CALL =Carve_Entity_Collision_Map
 
-	POP BC
-
 	; Direction
 	LD A, $33
 	LD (HL+), A
@@ -213,27 +211,28 @@ FindFreeEntity:
 		JR NZ, =FindFreeEntity.loop
 	RET
 
-Respawn_Entities:
-	LD A, $mem_dungeon_flags
-	BIT 2, A
-	RET Z
-
+Maybe_Respawn_Entity:
 	LD A, $mem_moving_animation_step
 	CP $04
 	RET NZ
 
+	CALL =RNG_Step
+	AND $07
+	CP $00
+	RET NZ
+
 	LD A, $mem_enemies_alive_count
 	CP $05
 	RET NC
 
+Spawn_Entity:
+	LD A, $mem_dungeon_flags
+	BIT 2, A
+	RET Z
+
 	LD A, $00
 	LD $tmp_var_3, A
 
-	CALL =RNG_Step
-	AND $07
-	CP $00
-	RET NZ
-
 	CALL =FindFreeEntity
 
 	CALL =Initialize_Enemy
-- 
cgit v1.2.3-70-g09d2