From 18d7d064daf704193f8dff6b2ef3ae68b7fc3aac Mon Sep 17 00:00:00 2001
From: Astatin <git@astatin.live>
Date: Tue, 18 Feb 2025 19:03:42 +0900
Subject: Did a bunch of things I honestly don't remember everything but now
 basic attack is broken

---
 playerattacks/earcoptr.gbasm | 19 +++++++++++++++----
 playerattacks/heal.gbasm     |  3 +++
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'playerattacks')

diff --git a/playerattacks/earcoptr.gbasm b/playerattacks/earcoptr.gbasm
index 123ec86..cc47672 100644
--- a/playerattacks/earcoptr.gbasm
+++ b/playerattacks/earcoptr.gbasm
@@ -51,10 +51,6 @@ Earcoptr_Attack_Loading_Regular:
 	RET NC
 
 	INC C
-	LD A, (BC)
-	AND $0f
-	OR $50
-	LD (BC), A
 
 	LD A, C
 	ADD $03
@@ -63,6 +59,18 @@ Earcoptr_Attack_Loading_Regular:
 	SUB $01
 	RET C
 	LD (BC), A
+	
+	INC C
+	LD A, (BC)
+	SET 3, A
+	LD (BC), A
+
+	LD A, $mem_moving_animation_step
+	LD B, A
+	LD A, $1f
+	SUB B
+	LD $mem_blinking_animation_counter, A
+
 	RET
 
 Earcoptr_Attack:
@@ -72,8 +80,11 @@ Earcoptr_Attack:
 	LD A, $mem_bunny_y
 	LD C, A
 	LD A, $02
+	PUSH DE
 	LD E, $30
+	LD D, $00
 	CALL =Try_Launch_Animation
+	POP DE
 	POP BC
 
 	LD BC, =Earcoptr_Attack_Loading_VBlank
diff --git a/playerattacks/heal.gbasm b/playerattacks/heal.gbasm
index 789afac..72f83fe 100644
--- a/playerattacks/heal.gbasm
+++ b/playerattacks/heal.gbasm
@@ -14,8 +14,11 @@ Heal_Attack:
 	LD A, $mem_bunny_y
 	LD C, A
 	LD A, $01
+	PUSH DE
 	LD E, $20
+	LD D, $00
 	CALL =Try_Launch_Animation
+	POP DE
 	POP BC
 
 	LD A, $enum_dungeon_mode
-- 
cgit v1.2.3-70-g09d2