From ab45947d3fdc9885c497d9fc3dd124c7986f6ea4 Mon Sep 17 00:00:00 2001
From: Astatin <git@astatin.live>
Date: Tue, 11 Mar 2025 18:46:42 +0900
Subject: Add invincible friendly bunny you can talk to

---
 playerattacks/earcoptr.gbasm | 38 +++++++++++++++++++++-----------------
 playerattacks/freeze.gbasm   | 14 ++++++++++----
 2 files changed, 31 insertions(+), 21 deletions(-)

(limited to 'playerattacks')

diff --git a/playerattacks/earcoptr.gbasm b/playerattacks/earcoptr.gbasm
index fa174d3..d17d88b 100644
--- a/playerattacks/earcoptr.gbasm
+++ b/playerattacks/earcoptr.gbasm
@@ -22,15 +22,15 @@ Earcoptr_Attack_Loading_Regular:
 	RET C
 
 	SUB $10
-	LD BC, $mem_entities_list
+	LD HL, $mem_entities_list
 	SLA A
 	SLA A
 	SLA A
 	SLA A
 	INC A
-	LD C, A
+	LD L, A
 
-	LD A, (BC)
+	LD A, (HL+)
 	LD E, A
 
 	LD A, $mem_bunny_x
@@ -39,9 +39,7 @@ Earcoptr_Attack_Loading_Regular:
 	CP $02
 	RET NC
 
-	INC C
-
-	LD A, (BC)
+	LD A, (HL)
 	LD E, A
 
 	LD A, $mem_bunny_y
@@ -50,18 +48,19 @@ Earcoptr_Attack_Loading_Regular:
 	CP $02
 	RET NC
 
-	LD A, C
-	ADD $04
-	LD C, A
-	LD A, (BC)
-	SUB $01
-	RET C
-	LD (BC), A
-	
-	INC C
-	LD A, (BC)
+	LD A, L
+	ADD $06
+	LD L, A
+
+	LD A, $02
+	CP (HL)
+	RET Z
+
+	DEC HL
+
+	LD A, (HL)
 	SET 3, A
-	LD (BC), A
+	LD (HL-), A
 
 	LD A, $mem_moving_animation_step
 	LD B, A
@@ -69,6 +68,11 @@ Earcoptr_Attack_Loading_Regular:
 	SUB B
 	LD $mem_blinking_animation_counter, A
 
+	LD A, (HL)
+	SUB $01
+	RET C
+	LD (HL), A
+
 	RET
 
 Earcoptr_Attack:
diff --git a/playerattacks/freeze.gbasm b/playerattacks/freeze.gbasm
index 936bf47..e7aefa7 100644
--- a/playerattacks/freeze.gbasm
+++ b/playerattacks/freeze.gbasm
@@ -82,15 +82,21 @@ Freeze_Attack_Loading_Regular:
 	RET C
 
 	LD A, C
-	ADD $05
+	ADD $06
 	LD C, A
+
 	LD A, (BC)
-	SET 1, A
-	LD (BC), A
+	CP $02
+	RET Z
 
-	INC C
 	LD A, $01
 	LD (BC), A
+
+	DEC C
+
+	LD A, (BC)
+	SET 1, A
+	LD (BC), A
 	RET
 
 Freeze_Attack:
-- 
cgit v1.2.3-70-g09d2