From bd8b79ae5c87696b5310e1797b4c89d6712bcbaa Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Mon, 7 Mar 2022 19:03:52 -0600
Subject: [PATCH] Fixed issue with mirror portal not spawning when entering OW
 from the DW in Crossed OWR

---
 owrando.asm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/owrando.asm b/owrando.asm
index 74ff3ad..800d680 100644
--- a/owrando.asm
+++ b/owrando.asm
@@ -46,11 +46,13 @@ jsl OWOldManSpeed
 ;org $09c957 ; <- 4c957
 ;dw #$cb5f ; matches value on Central Bonk Rocks screen
 
+; override world check when spawning mirror portal sprite in Crossed OWR
+org $0283dc
+jsl.l OWLightWorldOrCrossed
+
 ;(replacing -> LDA $8A : AND.b #$40)
 org $00d8c4  ; < ? - Bank00.asm:4068 ()
 jsl.l OWWorldCheck
-org $0283dc  ; < ? - Bank02.asm:816 ()
-jsl.l OWWorldCheck
 org $02aa36  ; < ? - Bank02.asm:6559 ()
 jsl.l OWWorldCheck
 org $02aeca  ; < ? - Bank02.asm:7257 ()
@@ -171,6 +173,12 @@ OWMirrorSpriteRestore:
     + rep #$30 : lda.w $04AC ; what we wrote over
     rtl
 }
+OWLightWorldOrCrossed:
+{
+    lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq +
+        lda #$00 : rtl
+    + jsl OWWorldCheck : rtl
+}
 
 OWFluteCancel:
 {