From ba080ef5564a97efa59012972d9eb0566c7825e7 Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Sat, 19 Aug 2023 21:41:58 -0400
Subject: [PATCH] Fix HC/Sewers keys and inverted castle hole

---
 invertedmaps.asm |  7 +++++--
 newitems.asm     | 13 +++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/invertedmaps.asm b/invertedmaps.asm
index dae36d9..e12ec64 100644
--- a/invertedmaps.asm
+++ b/invertedmaps.asm
@@ -783,7 +783,7 @@ dw $0000      ; 7F
 	dw !OWW_END
 
 .map1B_check_aga
-	LDA.w OverworldEventDataWRAM+$2B
+	LDA.l OverworldEventDataWRAM+$5B
 	AND.w #$0020
 	BNE ++
 
@@ -1533,6 +1533,8 @@ dw $0000      ; 7F
 	dw !OWW_END
 
 .map5B_pick_warp_tile
+        LDA.w #$3BBE
+        STA.b Scrap03
 	LDX.w #$0034
 
 	LDA.l ProgressIndicator
@@ -1542,7 +1544,8 @@ dw $0000      ; 7F
 
 	LDX.w #$0212
 
-++	STX.w $3BBE
+++      TXA
+        STA.b [Scrap03]
 
 	RTS
 
diff --git a/newitems.asm b/newitems.asm
index 45a03dc..ff67b88 100644
--- a/newitems.asm
+++ b/newitems.asm
@@ -531,18 +531,23 @@ ItemBehavior:
         LSR
         AND.w #$000F : TAX
         ASL : CMP.w DungeonID : BEQ .same_dungeon
-                LSR : TAX
                 LDA.l DungeonKeys,X : INC : STA.l DungeonKeys,X
                 RTS
         .same_dungeon
         SEP #$20
         LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys
-        LSR : TAX
-        LDA.l DungeonKeys,X : INC : STA.l DungeonKeys,X ; Update menu key count too
+        LDA.l DungeonKeys,X : INC : STA.l DungeonKeys,X
+        RTS
+
+        .same_dungeon_hc
+        SEP #$20
+        LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys
+        LDA.l SewerKeys : INC
+        STA.l SewerKeys : STA.l HyruleCastleKeys
         RTS
 
         .hc_smallkey
-        LDA.w DungeonID : CMP.b #$03 : BCC .same_dungeon
+        LDA.w DungeonID : CMP.b #$03 : BCC .same_dungeon_hc
                 LDA.l HyruleCastleKeys : INC : STA.l HyruleCastleKeys
                 LDA.l SewerKeys : INC : STA.l SewerKeys
                 RTS