Merge branch 'OWMain' of github.com:codemann8/z3randomizer into overworld_kara

2021-10-02 20:46:14 -07:00
parent 0816bb7cab a30e459dbb
commit 6d9cbc85b7
14 changed files with 394 additions and 503 deletions
--- a/entrances.asm
+++ b/entrances.asm
@@ -216,12 +216,12 @@ 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 $8A : AND #$40 : BNE + ;and in the light world
-		PLX : PLA
-		STZ $04C6 ; skip it.
-		LDA #$00
-		RTL
+		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.
+				LDA #$00
+				RTL
 	+
 	PLX : PLA
 	STA $02E4 ;what we wrote over