From bbe79f23e3109e9a91fc927466c869102aa9b6b3 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Mon, 2 Dec 2024 13:03:43 -0500
Subject: [PATCH] Kirby consume player attack improvement

---
 Sprites/Enemies/anti_kirby.asm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Sprites/Enemies/anti_kirby.asm b/Sprites/Enemies/anti_kirby.asm
index 82c1c72..b49450e 100644
--- a/Sprites/Enemies/anti_kirby.asm
+++ b/Sprites/Enemies/anti_kirby.asm
@@ -120,8 +120,6 @@ Sprite_AntiKirby_Main:
     %DoDamageToPlayerSameLayerOnContact()
     %MoveTowardPlayer(8)
     JSL Sprite_BounceFromTileCollision
-    JSL Sprite_PlayerCantPassThrough
-
     RTS
   }
 
@@ -176,6 +174,9 @@ Sprite_AntiKirby_Main:
     JSL Sprite_DirectionToFacePlayer
     LDA.b $0E : CMP.b #$10 : BCS .NotDone
       LDA.b $0F : CMP.b #$10 : BCS .NotDone
+          LDA POSX : STA.w SprMiscB, X
+          LDA POSY : STA.w SprMiscA, X
+          LDA.b #$0C : STA.b $4B
           %SetTimerA($80)
           LDA.b #$0A : STA.w SprFrame, X
           INC.w SprAction, X
@@ -190,10 +191,13 @@ Sprite_AntiKirby_Main:
   AntiKirby_Full:
   {
     %PlayAnimation(10, 10, 10)
+    LDA.w SprMiscA, X : STA.b POSY
+    LDA.w SprMiscB, X : STA.b POSX
     LDA.w SprTimerA, X : BNE +
       INC.w SprAction, X
       %SetTimerA($60)
       STZ.w SprMiscG, X
+      STZ.b $4B
       RTS
     +
     RTS
@@ -205,7 +209,6 @@ Sprite_AntiKirby_Main:
     %DoDamageToPlayerSameLayerOnContact()
     %MoveTowardPlayer(8)
     JSL Sprite_BounceFromTileCollision
-    JSL Sprite_PlayerCantPassThrough
     JSL Sprite_CheckDamageFromPlayer : BCC .NoDamage
       LDA #!RecoilTime : STA.w SprTimerA, X
       %GotoAction(6) ; Hurt