From 16ee2ad31bccd9b4d9492b5a8e261bfcf87287c6 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 21 Dec 2024 11:56:06 -0500 Subject: [PATCH] Fix magic bean collision detection bug --- Sprites/NPCs/bean_vendor.asm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Sprites/NPCs/bean_vendor.asm b/Sprites/NPCs/bean_vendor.asm index b109d50..5a7e340 100644 --- a/Sprites/NPCs/bean_vendor.asm +++ b/Sprites/NPCs/bean_vendor.asm @@ -113,10 +113,11 @@ Sprite_BeanVendor_Main: RTS .not_lifting - LDA.b #Sprite_BeanVendor - JSL Sprite_CheckCollisionWithSprite - LDA.w SprMiscF, X : BEQ ++ - STZ.w SprState, X + LDA.b $8A : CMP.b #$00 : BNE ++ + LDA.b #Sprite_BeanVendor + JSL Sprite_CheckCollisionWithSprite + LDA.w SprMiscF, X : BEQ ++ + STZ.w SprState, X ++ JSL Sprite_CheckIfLifted JSL ThrownSprite_TileAndSpriteInteraction_long