Did a bunch of things I honestly don't remember everything but now basic attack is broken

7 files changed, 51 insertions, 11 deletions

diff --git a/entity/actions.gbasm b/entity/actions.gbasm
index d6977e9..11951e6 100644
--- a/entity/actions.gbasm
+++ b/entity/actions.gbasm
@@ -55,6 +55,13 @@ Entity_Action:
 	RET
 
 Update_Animation_Steps:
+	LD A, $mem_blinking_animation_counter
+	DEC A
+	CP $ff
+	JR Z, =.Skip_blinking_update
+	LD $mem_blinking_animation_counter, A
+	.Skip_blinking_update:
+
 	LD A, $mem_map_loading_flags
 	BIT 3, A
 	JR Z, =.update_mode
@@ -112,7 +119,7 @@ Turn_Jump_table:
 	NOP
 
 	; 03
-	JP =Frog_Turn
+	JP =Cat_Turn
 	NOP
 
 	; 04
@@ -202,5 +209,10 @@ Enemy_Interaction:
 	LD A, (HL)
 	DEC A
 	DAA
-	LD (HL), A
+	LD (HL+), A
+
+	SET 3, (HL)
+	LD A, $24
+	LD $mem_blinking_animation_counter, A
+
 	RET
diff --git a/entity/bunny.gbasm b/entity/bunny.gbasm
index 4b9bba7..f8e07ac 100644
--- a/entity/bunny.gbasm
+++ b/entity/bunny.gbasm
@@ -51,6 +51,10 @@ Move_Bunny:
 		LD A, $mem_map_loading_flags
 		SET 3, A
 		LD $mem_map_loading_flags, A
+
+		LD A, $mem_bunny_flags
+		RES 3, A
+		LD $mem_bunny_flags, A
 		RET
 
 	.no_skip:
@@ -72,6 +76,10 @@ Move_Bunny:
 		SET 3, A
 		LD $mem_map_loading_flags, A
 
+		LD A, $mem_bunny_flags
+		RES 3, A
+		LD $mem_bunny_flags, A
+
 		LD A, $mem_button_action
 		BIT 1, A
 		JR NZ, =.Start_action_or_movement.cancel_movement
diff --git a/entity/frog.gbasm b/entity/cat.gbasm
index 428e88a..35d0b0c 100644
--- a/entity/frog.gbasm
+++ b/entity/cat.gbasm
@@ -1,4 +1,4 @@
-Frog_Turn:
+Cat_Turn:
 	LD A, $mem_map_loading_flags
 	BIT 3, A
 	RET Z
@@ -80,6 +80,12 @@ Frog_Turn:
 		CP $00
 		JP NZ, =.Start_action_or_movement.end
 
+		LD A, L
+		AND $f0
+		OR $07
+		LD L, A
+		RES 3, (HL)
+
 		.Try_Basic_Attack:
 		CALL =Check_player_next_to
 		LD A, E
@@ -97,6 +103,7 @@ Frog_Turn:
 		LD A, $mem_moving_animation_step
 		CP $0f
 		JP NZ, =.End_movement.end
+
 		LD A, D
 		AND $07
 		BIT 3, D
diff --git a/entity/display.gbasm b/entity/display.gbasm
index 69da0ab..75b1e29 100644
--- a/entity/display.gbasm
+++ b/entity/display.gbasm
@@ -103,21 +103,22 @@ Display_Entity:
 	.Moving_Animation.end:
 
 	.Blinking_Animation:
-		LD A, D
+		LD A, L
 		AND $f0
-		CP $50
-		JR NZ, =.Blinking_Animation.end
+		OR $07
+		LD L, A
+		BIT 3, (HL)
+		JR Z, =.Blinking_Animation.end
 
-		LD A, $mem_moving_animation_step
+		LD A, $mem_blinking_animation_counter
 		PUSH DE
 		LD E, A
 		LD A, $mem_loading_step
 		XOR E
 		POP DE
 		AND $02
-		CP $00
+		CP $02
 		JP Z, =.skip
-
 	.Blinking_Animation.end:
 
 
diff --git a/entity/fox.gbasm b/entity/fox.gbasm
index d82cc66..5e225ec 100644
--- a/entity/fox.gbasm
+++ b/entity/fox.gbasm
@@ -82,6 +82,12 @@ Fox_Turn:
 
 		LD A, L
 		AND $f0
+		OR $07
+		LD L, A
+		RES 3, (HL)
+
+		LD A, L
+		AND $f0
 		ADD $09
 		LD L, A
 		XOR A
diff --git a/entity/list.gbasm b/entity/list.gbasm
index 054a563..acbe12d 100644
--- a/entity/list.gbasm
+++ b/entity/list.gbasm
@@ -10,7 +10,7 @@ Entity_list:
 		.DB $01
 
 		; Starting health
-		.DB $04
+		.DB $02
 
 		; Starting mana
 		.DB $05
@@ -64,7 +64,7 @@ Entity_list:
 		.DB $01
 
 		; Starting health
-		.DB $05
+		.DB $01
 
 		; Starting mana
 		.DB $03
diff --git a/entity/penguin.gbasm b/entity/penguin.gbasm
index 363516b..0078fb9 100644
--- a/entity/penguin.gbasm
+++ b/entity/penguin.gbasm
@@ -80,6 +80,12 @@ Penguin_Turn:
 		CP $00
 		JP NZ, =.Start_action_or_movement.end
 
+		LD A, L
+		AND $f0
+		OR $07
+		LD L, A
+		RES 3, (HL)
+
 		LD A, $mem_bunny_status
 		CP $01
 		JR NZ, =.Try_Freeze_Attack