diff --git a/entrances.asm b/entrances.asm
index 1af2514..7abc797 100644
--- a/entrances.asm
+++ b/entrances.asm
@@ -15,7 +15,7 @@ LockAgahnimDoors:
 		LDA $7EF37A : AND.w #$007F : CMP.w #$007F : BEQ .crystalOrUnlock
 			LDA #$0001 : RTL
 		.crystalOrUnlock
-		LDA InvertedMode : BEQ .unlock
+		LDA InvertedMode : AND.w #$00FF : BEQ .unlock
 
 		LDA $7EF2C3 : AND.w #$0020 : BNE .unlock ; Check if GT overlay is already on or not
 		SEP #$30
diff --git a/inverted.asm b/inverted.asm
index f047a9c..6957702 100644
--- a/inverted.asm
+++ b/inverted.asm
@@ -80,7 +80,7 @@ Overworld_CreatePyramidHoleModified:
 RTL
 ;------------------------------------------------------------------------------
 Draw_PyramidOverlay:
-	LDA.l InvertedMode : BNE .done
+	LDA.l InvertedMode : AND.w #$00FF : BNE .done
 .normal
 	LDA.w #$0E39 : STA $23BC
 	INC A        : STA $23BE
@@ -174,7 +174,7 @@ GanonTowerInvertedCheck:
 ;Hard coded rock removed in LW for Inverted mode
 HardcodedRocks:
 
-    LDA InvertedMode : BEQ .normalrocks
+    LDA InvertedMode : AND.w #$00FF : BEQ .normalrocks
         BRA .noRock2
     .normalrocks
         LDA.w #$020F : LDX $8A : CPX.w #$0033 : BNE .noRock
@@ -186,7 +186,7 @@ HardcodedRocks:
 RTL
 
 TurtleRockPegSolved:
-	LDA.l InvertedMode : BNE +
+	LDA.l InvertedMode : AND.w #$00FF : BNE +
 		LDA.l $7ef287 ; What we wrote over (reading flags for this screen)
 		RTL
 	+