From 94a987f23fede5e2fc48486502743d89440ca36f Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Thu, 19 Aug 2021 18:47:29 -0500
Subject: [PATCH] Fixed missing OW flag check changes

---
 entrances.asm    | 2 +-
 flute.asm        | 2 +-
 invertedmaps.asm | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/entrances.asm b/entrances.asm
index 72c6d24..33afb05 100644
--- a/entrances.asm
+++ b/entrances.asm
@@ -204,7 +204,7 @@ RTL
 AnimatedEntranceFix: ;when an entrance animation tries to start
 	PHA : PHX
 	LDA.l InvertedMode : BEQ + ;If we are in inverted mode
-	LDA.l OWMode+1 : CMP #$01 : BEQ + ;If we are in Mixed OW shuffle mode
+	LDA.l OWMode+1 : CMP #$04 : BEQ + ;If we are in Mixed OW shuffle mode
 	LDA $8A : AND #$40 : BNE + ;and in the light world
 		PLX : PLA
 		STZ $04C6 ; skip it.
diff --git a/flute.asm b/flute.asm
index ac4bea9..79f2a2f 100644
--- a/flute.asm
+++ b/flute.asm
@@ -61,7 +61,7 @@ FluteBoy:
 JML.l FluteBoy_Continue
 ;--------------------------------------------------------------------------------
 FreeDuckCheck:
-	LDA.l OWMode+1 : CMP.b #$01 : BEQ .skipInvertedCheck
+	LDA.l OWMode+1 : CMP.b #$04 : BEQ .skipInvertedCheck
 	LDA.l InvertedMode : BEQ .done
 	.skipInvertedCheck
 	
diff --git a/invertedmaps.asm b/invertedmaps.asm
index 1a89e3f..683b87d 100644
--- a/invertedmaps.asm
+++ b/invertedmaps.asm
@@ -93,8 +93,8 @@ LDA.l OWTileMapAlt+3 : AND #$0001 : BEQ .notInverted
     LDA #$0034 : STA $2BE0
 .notInverted
 LDA.l OWTileMapAlt+3 : AND #$0002 : BEQ .return
-LDA.l OWMode : AND #$00FF : BEQ .return
-    LDA $2BE0 : STA $38B4 ;adding convenient WDM portal in OW Shuffle
+    LDA.l OWMode : AND #$00FF : BEQ .return
+        LDA $2BE0 : STA $38B4 ;adding convenient WDM portal in OW Shuffle
 .return
 RTS
 }
@@ -969,8 +969,8 @@ LDA.l OWTileMapAlt+$43 : AND #$0001 : BEQ .owshuffle
     LDA #$0212 : STA $2BE0 ; portal
 .owshuffle
 LDA.l OWTileMapAlt+$43 : AND #$0002 : BEQ .return
-LDA.l OWMode : AND #$00FF : BEQ .return
-    LDA $2BE0 : STA $38B4 ; adding convenient WDM portal in OW Shuffle
+    LDA.l OWMode : AND #$00FF : BEQ .return
+        LDA $2BE0 : STA $38B4 ; adding convenient WDM portal in OW Shuffle
 .return
 RTS
 }