Merge branch 'DRUnstable' into OWMain

2025-12-03 09:37:31 -06:00
parent 94efc26bf3 b583cc58ff
commit 581e45a63c
13 changed files with 232 additions and 58 deletions
--- a/inventory.asm
+++ b/inventory.asm
@@ -220,7 +220,8 @@ DungeonIncrement:
   REP #$10
   PHX
   LDA.w InventoryTable_properties,X : BIT.b #$40 : BEQ +
-   		JSL CountChestKeyLong
+	 		CPY.w #$0024 : BEQ + ; keys for this dungeon are done elsewhere
+   		JSL CountAllKey
   +
   LDA.l !MULTIWORLD_RECEIVING_ITEM : BNE .done
 	SEP #$10