From 2b8e9d86020a35b3046c4004b8be3aa4b1797baf Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Wed, 22 Dec 2021 10:49:52 -0600
Subject: [PATCH] Move mirror portal off screen during mirror bonk in Crossed
 OW

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

diff --git a/Rom.py b/Rom.py
index 6c57d091..8ff75fbd 100644
--- a/Rom.py
+++ b/Rom.py
@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'c5903112ffe302d1e9a3878ee720d1b3'
+RANDOMIZERBASEHASH = 'c1a00c60144c6cc5a6ef5f00617a9b38'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index f239b436..6b3e4200 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -160,6 +160,13 @@ OWPreserveMirrorSprite:
     pla : lda #$de : pha ; in vanilla, if in dark world, jump to $05afdf
     rtl
 }
+OWMirrorSpriteMove:
+{
+    lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq .return
+        lda $1acf : eor #$80 : sta $1acf
+    .return
+    lda #$2c : jml.l $07A985 ; what we wrote over
+}
 
 OWFluteCancel:
 {
diff --git a/data/base2current.bps b/data/base2current.bps
index e229d170797f13706d1ad802e3f48d116ebf9321..bac70e1308719dda4ec7fba9a0618d359f79191c 100644
GIT binary patch
delta 231
zcmV<D02u%7&<Oj`2(U>31W32HNV81=tOfzwv-$_c0SEwqja-3<s@$`|33~zo>yteU
zw;8vHs_H<9og$u?pdxU`q?R2=n(Gx-l8KkI4Gp38Rf(zINS|ynrNIcT&l*X9jn5jX
zEL?@D2d@Q_x3vW#o#_H=uLe+m$pP>Lj~;-TsQ`}#P=9NdKnRGT&;(q)w+ik60+*Sk
z@C>E$$w1HssR5I!uW6U{0|6xhQ?{2J1OY+;Ft=X>0lNYLHJ2L)0WTD%+>JPmF9DJz
hvY9QfN`NrX2$yk(Wd{MbWd{NQAqWjuo_fb+mU}JEU)TTu

delta 230
zcmV<C02%-L&<O6(2(U>31mwUQKeJ5%tOfzav-$_c0RnJ<v&RX00tMBGs$7ecPz)NA
zUJMD7Y7CGWp@^#LK!}|po|vE_aL1&U9Y>n$6;_gofwL10q4q}&fT`X{Yp(@>swn}`
z1tOj40&A}ZP=Cn*@B|{A=>n+$j|NbGYnDI=h@sE~T)npn?f?RpGBc&6@C>E$$w1Hs
zsR5I!uRWIu1OX)iE4P<01OY+;1h;bp0lNYLZI>?x0WTW}t<M@sfQ`=@sW^=<0g@%M
gnJuqMfH2SqmjQ=z2LZQo2Lb^h2+vg{t6?NbtLJlBi2wiq