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

---
 Rom.py                |   2 +-
 asm/owrando.asm       |  12 ++++++++++--
 data/base2current.bps | Bin 91675 -> 91686 bytes
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Rom.py b/Rom.py
index 0237a0e8..7a88275e 100644
--- a/Rom.py
+++ b/Rom.py
@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '0b849317ee6817b9e9b21a9b53fb0744'
+RANDOMIZERBASEHASH = '02fd6794fe7ffec6999f98d6a021d3b8'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index 06647861..99141495 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -48,11 +48,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 ()
@@ -173,6 +175,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:
 {
diff --git a/data/base2current.bps b/data/base2current.bps
index af2a8d59701b0c06f023e325aae418215612d48e..d8a00082629ac0be8d48d20d8fceef304dc9c531 100644
GIT binary patch
delta 232
zcmV<E02lw8%mt>*1+YZ{1RP4^wWCP^0RgSEN&<`l1%)CmpAoaz11AIm0g1B#2#Ns^
zH)Mb$gpDHa-Jn2)-y%ekvzrOL0tFF?s$7ecUko6Vd<={k-H58{K!}|px0s+JBFUtd
z9Y>n$6;_goy^|pgDG@7}iNUa-;Ef`|u%L8+n^K#zT@6(M0}BkOleG?N19Tv$vmy@x
z`7EU=4~@?n!Z59@1fQ9y1E~OOA})xkYp(^9`?Uoko#_H=uLe+m$pP>Lk7}1i2mvPo
i14ox`2mvGkJC~CP0Yd?3x7P>(JY5JfBj|i}>Z(8CL|F^~

delta 213
zcmV;`04o2c%mtgw1+YZ{1lLa}u%k%<0Rb+vN&<`l0;d(T+XE*A0`Z8m1PF=&5D_AR
zB!rD3@7<t4h2MMul(U`*yaE9MlUoe18O?~Q>OhE{BDa{JA|lD8mK{f$>lId#iLH|)
z4Ji|6QJ;yyu%O_LBEhhrbby-<RiCq74OIaHPf~}Iwhn3oIA@2mBM$-jBC#nCjn5jw
zFs-ZvYp(^91Aw&!BAw|1Yp(`Sf5`#x1dmFWPzV7h0%Jy(c?ba{0ehF82mwO@NVnn$
P0X$s@QJ|U4$Z#-ZpNdh$