From 311b002b95991b481409dfea552e8b38ea225394 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Wed, 26 Oct 2022 07:54:33 -0500
Subject: [PATCH] Fixed fake world handling for IB transitions

---
 Rom.py                |   2 +-
 asm/owrando.asm       |   7 ++++++-
 data/base2current.bps | Bin 104813 -> 104824 bytes
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Rom.py b/Rom.py
index 4e12827a..b229a7ac 100644
--- a/Rom.py
+++ b/Rom.py
@@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'f27719e0f1f5e61fb159f6bbc58a9afb'
+RANDOMIZERBASEHASH = 'ff9c003ee6c1277437a4480d583282fd'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index 3472bfae..a046b8da 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -631,7 +631,12 @@ OWShuffle:
     ;look up transitions in current area in table OWEdgeOffsets
     ;offset is (8bytes * OW Slot ID) + (2bytes * direction)
     asl : rep #$20 : and.w #$00ff : pha : sep #$20 ;2 bytes per direction
-    lda $8a : and #$40 : !add $700 : rep #$30 : and #$00ff : asl #3
+
+    lda $8a : tax : lda.l OWTileWorldAssoc,X : eor.l CurrentWorld : beq +
+        ; fake world, will treat this OW area as opposite world
+        txa : eor.b #$40 : tax
+    + txa : and #$40 : !add $700 : rep #$30 : and #$00ff : asl #3
+
     adc 1,S : tax
     asl $700 : pla
     ;x = offset to edgeoffsets table
diff --git a/data/base2current.bps b/data/base2current.bps
index 168d67f9f7caefb4a6eef54c1759b743c67599dd..66c714ea90eae5267ff6c92147cd0f6538ffb1f0 100644
GIT binary patch
delta 323
zcmV-J0lfb0vIh9F2C!iP1XBF11G8lTKLZ}?m8t-Pks=d>C+hr>A}@p|>Hva`B07X8
zFocaFBZI;Ox55Mgd@}*0w?8-mRRaNgmz6sKj~z0StKu+go-}}gs+VVcqnYpyzp%Ng
z&yy=?fMI}_K|BE*0i>5+JOLaRn<Qs|flr?l0i>O(iYY)CZ2$+GXCjN2hCBf+0h*Vz
zJOR1_9%`3xJpp(DbC>Bo0Z0K%moh#9jRAR=z&-&i0X~=QJ^?%dTbC+70U`mUmrXwb
zE)t}aV4GYk9e{xfpLm|p&;v|wmyJIGiVI9~rjPK67tjKmWtSpA0XGzGbEd6iUBCg*
zJEdL81n@PJ#glcHZ9oAT0cw|rKmkG@FG3T5#pV%YuxqUR2Ji&U{03{^cEJL7%|>nx
VfS*~n=s*E|SO{R)8P)uE`_D^Ye((SQ

delta 331
zcmV-R0kr=3vIgz42C!iP1VaYA`LksKKLZ}ym8t-Pks=d>C+hr>A}@p|>Hva`B07X8
zFocaF6NAD8x55Mgd@})*w?8-mRRaNQmz6sKj~ybCtKu+go-}}gs+VVcqnYpyzp%Ng
z&yy=?fB}J*K|BE*0hE_sJOLaGrHUy)7;OLtn{Y*$mytXHEdh#`zdQlD0)A<idp!Yo
z0aKUsJpo7oESEh#0gVA!m&-l@ECC*u_&xzV0Xvs9KLH{El$TgP0WK1hlwg}&D;<D=
z3ZHnM(a-}-UzeCa0g4MOa;A^)i5JiUn?;u`Kmj){PIIQMWL>}k&^x7F$pr8<lf{!&
z4GDnF4y9em7w`zF1chCkKm%af8jS-7qe_>OKmkG@4?+`w#pV%YuxqUR2Ji&U{03{^
dcEJKS&PHwyfS-A{^FRT8SO{h<eh`oQX`DIGe{KK(