From a8e119285ed97a982f4b8fbdb92fe2b7e3bf4881 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Thu, 19 Aug 2021 21:53:26 -0500
Subject: [PATCH] Actually fixed Mixed flag problems

---
 entrances.asm | 2 +-
 flute.asm     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/entrances.asm b/entrances.asm
index 78d77a8..b4c1b22 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 : AND.b #!FLAG_OW_MIXED : BEQ + ;If we are in Mixed OW shuffle mode
+		LDA.l OWMode+1 : AND.b #!FLAG_OW_MIXED : BNE + ;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 325d2bd..6bb0062 100644
--- a/flute.asm
+++ b/flute.asm
@@ -61,7 +61,7 @@ FluteBoy:
 JML.l FluteBoy_Continue
 ;--------------------------------------------------------------------------------
 FreeDuckCheck:
-	LDA.l OWMode+1 : AND.b #!FLAG_OW_MIXED : BEQ .skipInvertedCheck
+	LDA.l OWMode+1 : AND.w #!FLAG_OW_MIXED : BNE .skipInvertedCheck
 		LDA.l InvertedMode : BEQ .done
 	.skipInvertedCheck