diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 4fb84b7..ee2bb39 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -433,6 +433,8 @@ org $00891D
 org $00893D
 EnableForceBlank:
 
+DungeonMask = $0098C0
+
 org $00D308
 DecompSwordGfx:
 
diff --git a/inventory.asm b/inventory.asm
index 0e8b298..e7ad1ba 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -681,31 +681,11 @@ RTL
 RTS
 
 .setDungeonCompletion
-        LDA $040C
-	CMP #$FF : BEQ +
-		LSR : AND #$0F : CMP #$08 : !BGE ++
-			JSR .valueShift
-			ORA DungeonsCompleted : STA DungeonsCompleted
-			BRA +
-		++
-			!SUB #$08
-			JSR .valueShift
-			BIT.b #$C0 : BEQ +++ : LDA.b #$C0 : +++ ; Make Hyrule Castle / Sewers Count for Both
-			ORA DungeonsCompleted+1 : STA DungeonsCompleted+1
+	LDX $040C : BMI +
+		LDA.l DungeonMask, X
+		ORA DungeonsCompleted : STA DungeonsCompleted
 	+
 RTS
-
-.valueShift
-	PHX
-	TAX : LDA.b #$01
-	-
-		CPX #$00 : BEQ +
-		ASL
-		DEX
-	BRA -
-	+
-	PLX
-RTS
 ;--------------------------------------------------------------------------------
 
 ;--------------------------------------------------------------------------------