From abdf4cd2588906353118de59119117959d1ffab8 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Thu, 28 Jul 2022 16:05:00 -0500
Subject: [PATCH] ROM Fixes

- Fixed Aga2 check on Ganon vulnerability
- Fixed disappearing mirror portals in Inverted+CrossedOWR
---
 Rom.py                |   2 +-
 asm/owrando.asm       |   4 +++-
 data/base2current.bps | Bin 104312 -> 104324 bytes
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Rom.py b/Rom.py
index 9ad28cab..37962bc7 100644
--- a/Rom.py
+++ b/Rom.py
@@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'ae56110fe1228423c9d6a6cee361f7ac'
+RANDOMIZERBASEHASH = 'c80605a079983f1a9dac37273e2b377a'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index b5dc88f1..b1c1ebdf 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -271,7 +271,9 @@ OWMirrorSpriteRestore:
 OWLightWorldOrCrossed:
 {
     lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq +
-        lda #$00 : rtl
+        lda.l InvertedMode : beq +
+            lda #$40 : rtl
+        + lda #$00 : rtl
     + jsl OWWorldCheck : rtl
 }
 
diff --git a/data/base2current.bps b/data/base2current.bps
index 3bfea7f1aee535c575f86e68eed66a3a9828780c..d51dc56eb7dc07a6d5483caeaf7dc404c89f27ce 100644
GIT binary patch
delta 313
zcmV-90mlCLt_Fm!2C!iP1P0~#8na~q^#%bolUoQj0c*382#Ev%dy^au#TiG5s_H<9
zog$B$pdtd@q?R2=n(Gx-l8Gmi`VB4toU<toR=EwAe_hIr@Y;aZn^+^|lZ?l416wwl
zvdC(18i5Iy6+EUXfT=)hsQ_ytJcz1muLXdrDFM)zc{l+l5-vWbrSJ@;^2tEZ2B`s)
zs;?)Pu{Z%?0U?(YIRRDyT9;}$0YCv8m#aAeAR&5-%4o^3&;_Y^OhSvvLeK{ySgi(3
zTZ_pw&<3g57)(N!>^T9V3+9XZ@RtE0-Mviamzg>NJs4De1Av!tEtH*)Gf;o4YiMYu
z3O=DXpDCB_Isv{0p8=f}fCHDYI{_vF8v(c3I{~Kx1)ns54S<)1J^>{Gt+%W`0mN7c
LV#=p3rzIpNYR-K$

delta 301
zcmV+|0n+}2uLk(82C!iP1ij}%7_(&o^#%bflUoQj0b;X~2#Ev%a+4el#Th<{s_H<9
zog$B$pdtd@q?R2=n(Gx-l8GLZ`VB4tld~xfR=Ew9ZBLzz@Y;aZn`T6rlZ?l40|pp^
zvdC(152*vG0Ba&Vh^lL^1(V<5mxMS0ClP3YrSJ@;^2tEZ2B`s)s;?E7y*L430T`Db
zIRRDyNSAgw0YCu>m$x|qAR%#!%4o^3&;_Y^OgW3mLeK{ySgi(3Qj5tn&<3g57)&{r
z_&EWh3*C$Q@RtE0-MviRm!&!ZJs3iM1Av!bEtH*)Gf;o4YiMYu3O=D*pF5ZOIsv`~
zqkozafS0~I0VV<;1GnZo0jB~6n_z$ufC-n9J^>{Gs<*g40mN7cU4gdVpqBo^rz3mE