From 9312a95ad51a3a6f174f31ac907912b464498582 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Tue, 22 Feb 2022 19:56:05 -0600
Subject: [PATCH] Fixed issue with mirror portal deleting after mirror bonk in
 Crossed OW

---
 Rom.py                |   2 +-
 asm/owrando.asm       |   7 +++++++
 data/base2current.bps | Bin 91653 -> 91673 bytes
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Rom.py b/Rom.py
index 25b5e6e2..1455f498 100644
--- a/Rom.py
+++ b/Rom.py
@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'b46e08bfb572876dd51dc3108e7b9292'
+RANDOMIZERBASEHASH = 'a30bdf1086fa4304d3b422eef2587f5b'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index 065cbfd8..06647861 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -166,6 +166,13 @@ OWMirrorSpriteMove:
         lda $1acf : eor #$80 : sta $1acf
     + lda #$2c : jml.l $07A985 ; what we wrote over
 }
+OWMirrorSpriteRestore:
+{
+    lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq +
+        lda $1acf : and #$0f : sta $1acf
+    + rep #$30 : lda.w $04AC ; what we wrote over
+    rtl
+}
 
 OWFluteCancel:
 {
diff --git a/data/base2current.bps b/data/base2current.bps
index b1c892c64de471dd24da8364acc172f3914a3e78..5c83c8341c8ab95b8596f6a6152f6eff74da1bfe 100644
GIT binary patch
delta 218
zcmV<0044v0%mtau1+YZ{1hZ01t+Po1Y6A)=@sT2zh^p#%jI*@_LIVNuv-k&B1Ofqx
zlTi$>0nL*E4Hp5evl$KW`ZT!+t<M@sfQ`=@sVrQDsRygJu_+IY&l<uot*iuVuLY9>
zfVBl8o#_H=uLe+m$pP>Lk4l#=2mvPnW0zJ40VM)^wU>Pe0YU*tx4;MiodN;bmtG42
z7c`$VDjk5a1*QcchLfcQg^I#3V2?$B)z8ZFe(-0H%JY870Pq5-0nbW+FwhF0K7fIM
Ur@yzX3jtAD2-V$01vFl7kG<+we*gdg

delta 239
zcmV<L01*F~%msza1+YZ{1dm&Aq_ar@Y6Ai||FgXWLIVNYvItiM1?z~aT#J)m3?P$y
z42&7Kh^p#9h@B$0n4lse$)uJYN1E#uR+5RAvmp)e`X#{#t<M@sfQ`=@sVrQDsRyqG
zlee`6BAw|1Yp(`Sf5`#x1dkq<MF;^W0XLUz2mvJmQ?{3s2mwL?9Jkj90i6O*-MtV7
z7-IpQ5C&-CFu53r7-a+sDSwRs2cs$}9e}9?Acm8r1%-;jFkp|p`OnJpe(-0H%JY87
p0Pq5-0nbW+FwhFE&l)KYjn5i@rx1X*zzYFUS_qLkALV9X#cj(IU^)N*