From febb2adef87826dbc96d118d48c1f2116ba0e0f2 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 15 Dec 2024 17:23:21 -0500
Subject: [PATCH] Dismiss magic bean item sprite when planted

---
 Sprites/NPCs/bean_vendor.asm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Sprites/NPCs/bean_vendor.asm b/Sprites/NPCs/bean_vendor.asm
index f63682a..198b60f 100644
--- a/Sprites/NPCs/bean_vendor.asm
+++ b/Sprites/NPCs/bean_vendor.asm
@@ -66,6 +66,7 @@ Sprite_BeanVendor_Prep:
   LDA.b $8A : CMP.b #$00 : BNE +
     LDA.l MagicBeanProg : BNE .in_progress
       LDA.b #$04 : STA.w SprAction, X
+      LDA.b #$01 : STA.w SprMiscD, X
       JMP +
     .in_progress
     CMP.b #$3F : BNE .not_flower
@@ -104,19 +105,23 @@ Sprite_BeanVendor_Main:
 
   MagicBean:
   {
-    %StartOnFrame(1)
-    %PlayAnimation(1,1,1)
+    %SetFrame(1)
 
     LDA.w SprMiscE, X : CMP.b #$01 : BEQ .not_lifting
       LDA.w $0309 : CMP.b #$02 : BNE .not_lifting
         LDA.b $8A : BEQ +
           JSR MagicBean_BottleLogic
         +
-        RTS
+       RTS
 
     .not_lifting
+    LDA.b #Sprite_BeanVendor
+    JSL Sprite_CheckCollisionWithSprite
+    LDA.w SprMiscF, X : BEQ ++
+      STZ.w SprState, X
+    ++
     JSL Sprite_CheckIfLifted
-
+    JSL ThrownSprite_TileAndSpriteInteraction_long
     RTS
   }
 
@@ -177,6 +182,7 @@ Sprite_BeanVendor_Main:
         LDA.l MagicBeanProg
         ORA.b #$01
         STA.l MagicBeanProg
+        STZ.w SprMiscD, X
     +
     RTS
   }
@@ -202,8 +208,6 @@ Sprite_BeanVendor_Main:
     AND.b #$3F : BEQ ++
       LDA.b #$04 : STA.w SprFrame, X
     ++
-
-    JSL ThrownSprite_TileAndSpriteInteraction_long
     RTS
   }
 }