From 151506d130cd66f022d0b1beb48c5169090b11e3 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Wed, 25 Aug 2021 02:22:21 -0500
Subject: [PATCH] Play SFX on crossworld transition in Crossed OW

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

diff --git a/Rom.py b/Rom.py
index 47bf48c1..d27a0f04 100644
--- a/Rom.py
+++ b/Rom.py
@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '261aa02eb4ee7e56e626361f170de5f4'
+RANDOMIZERBASEHASH = 'df12af8b5970ecc392b29b45595d9351'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index 07173255..2ad5e8cc 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -342,10 +342,12 @@ OWNewDestination:
     
     ; crossed OW shuffle
     LDA.l OWMode+1 : AND.b #!FLAG_OW_CROSSED : beq .return
-        ldx $05 : lda.l OWTileWorldAssoc,x : sta.l $7ef3ca ; change world
+        ldx $05 : lda.l OWTileWorldAssoc,x : cmp.l $7ef3ca : beq +
+            sta.l $7ef3ca ; change world
+            lda #$38 : sta $012f ; play sfx - #$3b is an alternative
 
         ; toggle bunny mode
-        lda $7ef357 : bne .nobunny
+        + lda $7ef357 : bne .nobunny
         lda.l InvertedMode : bne .inverted
             lda $7ef3ca : and.b #$40 : bra +
             .inverted lda $7ef3ca : and.b #$40 : eor #$40
diff --git a/data/base2current.bps b/data/base2current.bps
index 512a6dc9d18d1f1cfd322a5900c2cf095832b4e8..10f67fd0a1e0181683d24b54a8b6ce7779b974b7 100644
GIT binary patch
delta 149
zcmV;G0BZm2&ItX^2(U>31l%bj)`Lv}w@m>7@B{%-mp%poAXinU1-}5gs?W;ve((v8
z%JY7yIE^m>k|na4Ew4&|Fwh8>5JdKYfSVu@rmaap$w1H(rCrGc@C2(%c&43z4W(Vl
z7tjKm3xJuW1%-;jFkqu2O7sKZJh!9<0nShYc{P`GR{=8tSGTBF0ld!$5HG=y*vne_
Du>U|u

delta 132
zcmV-~0DJ%a&Is(z2(U>31c)zp(1T3@w@m>7@B{$`mp%poAVx~21)pML^^zsBfi064
zhk*!}D(8WKn+g%8tw})1K+qGVUC9LS1gkZ8rk#KdrCrGv&;pwafSIKQg^I#3V51{S
m^e^Bhx3vZV&QJmmHkXB00W$$Xx4BmVyw3=kE9FaYHnYmQ!!^JF