From bae81b58ce691769b44b7c8e5098e227934402c9 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Thu, 19 Aug 2021 20:02:12 -0500
Subject: [PATCH] Moved OW flag checks to global variable

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

diff --git a/Rom.py b/Rom.py
index 2214c15b..eb8b6e6e 100644
--- a/Rom.py
+++ b/Rom.py
@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '0a8d3886c789945bd64c4c3f16a6194f'
+RANDOMIZERBASEHASH = '3f7cd4772ea4a3f503691ef8807f5d84'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index 98be93c0..63107a0e 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -341,7 +341,7 @@ OWNewDestination:
     sep #$30 : lda OWOppSlotOffset,y : !add $04 : asl : and #$7f : sta $700
     
     ; crossed OW shuffle
-    lda.l OWMode+1 : and.b #$02 : beq .return
+    LDA.l OWMode+1 : AND.b #!FLAG_OW_CROSSED : beq .return
         ldx $05 : lda.l OWTileWorldAssoc,x : sta.l $7ef3ca ; change world
 
         ; toggle bunny mode
diff --git a/data/base2current.bps b/data/base2current.bps
index fa7152f57bb8c20c79c0c3e79787fa7d1dca50e6..08be9f59afac55702b9c3e60f5a4916cab14174c 100644
GIT binary patch
delta 39
xcmV+?0NDTR&Is(z2(U>31ivsq&$CSd5OD!1gI;pCUUC5jwFuxu&hR#(_Y_L;5Rd=>

delta 39
xcmV+?0NDTR&Is(z2(U>31b;7p(6dbe5OD#?gI;pCUUC5jwFo}g>LjJ7f4ozA5f%Ud