From 50895c1ac2f9132bc1b25f1526020c068c0be03b Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sun, 21 Apr 2024 00:50:38 -0500
Subject: [PATCH] Potential fix for weird bonk item dupe onto other standing
 items

---
 heartpieces.asm | 14 ++++++--------
 inventory.asm   | 14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/heartpieces.asm b/heartpieces.asm
index f68cf89..861c938 100644
--- a/heartpieces.asm
+++ b/heartpieces.asm
@@ -132,17 +132,15 @@ HeartPieceSpritePrep:
 
     INC.w SkipBeeTrapDisguise
     JSL HeartPieceGetPlayer : STA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
-    LDA.w SprSourceItemId, X : BNE +
-        JSL LoadHeartPieceRoomValue
-        STA.w SprSourceItemId, X
-    + JML RequestStandingItemVRAMSlot
+    JSL LoadHeartPieceRoomValue
+    STA.w SprSourceItemId, X
+    JML RequestStandingItemVRAMSlot
 ;--------------------------------------------------------------------------------
 HeartContainerSpritePrep:
     JSL HeartPieceGetPlayer : STA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
-    LDA.w SprSourceItemId, X : BNE +
-        JSL LoadHeartContainerRoomValue ; load item type
-        STA.w SprSourceItemId, X
-    + JML RequestStandingItemVRAMSlot
+    JSL LoadHeartContainerRoomValue ; load item type
+    STA.w SprSourceItemId, X
+    JML RequestStandingItemVRAMSlot
 ;--------------------------------------------------------------------------------
 LoadHeartPieceRoomValue:
     LDA.b IndoorsFlag : BEQ .outdoors ; check if we're indoors or outdoors
diff --git a/inventory.asm b/inventory.asm
index e74f7c6..1babe23 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -563,10 +563,9 @@ LoadPowder:
     JSL Sprite_SpawnDynamically ; thing we wrote over
     .justGFX
     LDA.l WitchItem_Player : STA.w SprItemMWPlayer, Y : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
-    LDA.w SprSourceItemId, Y : BNE +
-        %GetPossiblyEncryptedItem(WitchItem, SpriteItemValues)
-        STA.w SprSourceItemId, Y
-    + JSL AttemptItemSubstitution
+    %GetPossiblyEncryptedItem(WitchItem, SpriteItemValues)
+    STA.w SprSourceItemId, Y
+    JSL AttemptItemSubstitution
     JSL ResolveLootIDLong
     STA.l PowderFlag
     PHX : TYX : PLY
@@ -617,10 +616,9 @@ LoadMushroom:
 	PHA
 		INC.w SkipBeeTrapDisguise
 		LDA.l MushroomItem_Player : STA.w SprItemMWPlayer : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
-		LDA.w SprSourceItemId, X : BNE +
-			%GetPossiblyEncryptedItem(MushroomItem, SpriteItemValues)
-			STA.w SprSourceItemId, X
-		+ JSL RequestStandingItemVRAMSlot
+		%GetPossiblyEncryptedItem(MushroomItem, SpriteItemValues)
+		STA.w SprSourceItemId, X
+		JSL RequestStandingItemVRAMSlot
 	PLA
 RTL
 ;--------------------------------------------------------------------------------