From 838ada0a0bde94007b1c4149c11ed00bdbe56896 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Mon, 6 Dec 2021 07:43:38 -0600
Subject: [PATCH] Fixed mirror portals showing up in DW

---
 Rom.py                |   2 +-
 asm/owrando.asm       |   9 +++++++++
 data/base2current.bps | Bin 141365 -> 141395 bytes
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Rom.py b/Rom.py
index 30729de4..2fe1bdfa 100644
--- a/Rom.py
+++ b/Rom.py
@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '383fbac5f195f82d2b74b62113229fac'
+RANDOMIZERBASEHASH = '607ec23701b1099fdeb64a0caff190b6'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index f0465953..f239b436 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -148,6 +148,7 @@ OWPreserveMirrorSprite:
 {
     lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq .vanilla
         rtl ; if OW Crossed, skip world check and continue
+    
     .vanilla
     lda InvertedMode : beq +
         lda $7ef3ca : beq .deleteMirror
@@ -410,6 +411,14 @@ OWWorldUpdate: ; x = owid of destination screen
 {
     lda.l OWTileWorldAssoc,x : cmp.l $7ef3ca : beq .return
         sta.l $7ef3ca ; change world
+
+        ; moving mirror portal off screen when in DW
+        cmp #0 : beq + : lda #1
+        + cmp.l InvertedMode : bne +
+            lda $1acf : and #$0f : sta $1acf : bra .playSfx ; bring portal back into position
+        + lda $1acf : eor #$80 : sta $1acf ; move portal off screen
+        
+        .playSfx
         lda #$38 : sta $012f ; play sfx - #$3b is an alternative
 
         ; toggle bunny mode
diff --git a/data/base2current.bps b/data/base2current.bps
index db61bf4dc810344f4da2cd6d315433687ca0d576..022ded6aaf463776b1c65a008fadf21a177ec305 100644
GIT binary patch
delta 183
zcmdmbf#dQ8jt!oSEDJxx@i+T2ZuezmT*Ydc+rX;OHhC#)Yu6!zg#8S=R-Hffx$Z-H
zKaf1h@PTP1<9V+Jg9}`1&r50Y_nwz(-~h5b8-T3og6xdq%3A!()_OXebhseAH1;IR
z2bR^+mCNQf@B%sF7ntUAH^|?Q+3wBG*kG<c+1<;rVJ-Xr|KI-s;U6HJX5P5+zdjJY
gw_jhszP@kDWS6SN+dtbeTD{~rVBTG{;*sZb06bw=5C8xG

delta 153
zcmcb7fn)0hjt!oSEE#{NGd24%ZuezmT*WH&l~ti_@>15;u0sY1`x$nvI)CbO-3QNp
zAUWNDol#slk8jypPluBZ7lfC_o@DvJvO2zE+1v(RAV>TH(|qm*@dpaqv)CCM%rz#(
zTdi5k{{R2?e?a&L2&c(etXcVA9|+&uudiQU-#2A)rJqd0c0qeatCt*p7P;?43N*9;
D{-a15