From aa3c8a232b17337500352ea3e8e6d4f0ea532709 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Mon, 17 Jun 2024 17:17:07 -0600
Subject: [PATCH] fix: hera basement cage counting multiple times, again

---
 keydrop/standing_items.asm | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/keydrop/standing_items.asm b/keydrop/standing_items.asm
index cb6441a..6ddd89a 100644
--- a/keydrop/standing_items.asm
+++ b/keydrop/standing_items.asm
@@ -664,12 +664,7 @@ KeyGet:
         + LDY.w $0E80, X
         LDA.w SprItemIndex, X : STA.w SpawnedItemIndex
         LDA.w SprItemFlags, X : STA.w SpawnedItemFlag
-        LDA.b RoomIndex : CMP.b #$87 : BNE + ;check for hera cage
-        LDA.w SpawnedItemFlag : BNE + ; if it came from a pot, it's fine
-            JSR ShouldKeyBeCountedForDungeon : BCC ++
-            JSL CountChestKeyLong
-            ++ PLA : RTL
-        + STY.b Scrap00
+        STY.b Scrap00
         LDA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_ITEM_PLAYER_ID
         STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID : BNE .receive
         PHX
@@ -695,18 +690,6 @@ KeyGet:
 KeyTable:
 db $A0, $A0, $A2, $A3, $A4, $A5, $A6, $A7, $A8, $A9, $AA, $AB, $AC, $AD
 
-; Input Y - the item type
-ShouldKeyBeCountedForDungeon:
-	PHX
-		LDA.w DungeonID : CMP.b #$FF : BEQ .done
-		LSR : TAX
-		TYA : CMP.w KeyTable, X : BNE +
-			- PLX : SEC : RTS
-		+ CMP.b #$24 : BEQ -
-	.done
-	PLX : CLC : RTS
-
-
 BigKeyGet:
 	LDY.w $0E80, X
 	CPY.b #$32 : BNE +