From dff78e01de492bd6d68e11ed976fca2373d2e44e Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Fri, 14 Jun 2024 02:15:08 -0400
Subject: [PATCH] fix wolf mask grant item bug

---
 Sprites/Bosses/wolfos.asm | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/Sprites/Bosses/wolfos.asm b/Sprites/Bosses/wolfos.asm
index 7603694..4541861 100644
--- a/Sprites/Bosses/wolfos.asm
+++ b/Sprites/Bosses/wolfos.asm
@@ -154,6 +154,7 @@ Sprite_Wolfos_Main:
   dw Wolfos_AttackLeft    ; 0x05
   dw Wolfos_Subdued       ; 0x06
   dw Wolfos_GrantMask     ; 0x07
+  dw Wolfos_Dismiss       ; 0x08
 
   Wolfos_AttackForward:
   {
@@ -277,7 +278,7 @@ Sprite_Wolfos_Main:
     .wait
     LDA   $FE : BEQ .ninguna_cancion
       STZ   $FE
-      LDA.b #$40 : STA.w SprTimerD, X
+      LDA.b #$20 : STA.w SprTimerD, X
       %GotoAction(7)
     .ninguna_cancion
     
@@ -288,17 +289,29 @@ Sprite_Wolfos_Main:
   {
     %PlayAnimation(0, 0, 10)
 
+
+    LDA SprTimerD, X : BNE .wait
+      %ShowUnconditionalMessage($01F)
+      LDA.b #$01 : STA.l $7EF358
+      %GotoAction(8)
+    .wait
+    RTS
+  }
+
+  Wolfos_Dismiss:
+  {
+    %PlayAnimation(0, 0, 10)
+    STZ.w SprXSpeed, X
+    STZ.w SprYSpeed, X
+
     JSL Sprite_PlayerCantPassThrough
 
-    LDY   #$3A : STZ $02E9     ; Give the Wolf Mask
-    JSL   Link_ReceiveItem
-    LDA.b #$01 : STA.l $7EF358
-    LDA   #$01 : STA.l $7EF303 ; Set the special flag
-
-      LDA.b #$06 : STA $0DD0, X ; kill sprite normal style
+    LDA SprTimerD, X : BNE .dismiss
+      LDA.b #$00 : STA $0DD0, X ; kill sprite normal style
       STZ.w SprAction, X
       STZ.w SprHealth, X
-
+      RTS
+    .dismiss
     RTS
   }
 }