Merge remote-tracking branch 'codemann/OWMain' into overworld_kara

2021-09-21 14:10:23 -07:00
parent fb4068a3e1 a30e459dbb
commit f6f6383913
13 changed files with 80 additions and 179 deletions
--- a/entrances.asm
+++ b/entrances.asm
@@ -216,7 +216,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 : 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.