From d1b0b57d533b6811aa2f7369481f72d9396de3cf Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sat, 21 Aug 2021 18:19:57 -0500
Subject: [PATCH] Retain Link state on transition in Crossed OW unless bunny

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

diff --git a/Rom.py b/Rom.py
index 51a7ac10..5dc3e361 100644
--- a/Rom.py
+++ b/Rom.py
@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '363c49821f25327f10bc200c98375bde'
+RANDOMIZERBASEHASH = '261aa02eb4ee7e56e626361f170de5f4'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index 300d4da8..07173255 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -351,12 +351,15 @@ OWNewDestination:
             .inverted lda $7ef3ca : and.b #$40 : eor #$40
         + cmp #$40 : bne .nobunny
             ; turn into bunny
-            lda #$17 : sta $5d
-            lda #$01 : sta $02e0 : sta $56
+            lda $5d : cmp #$04 : beq + ; if swimming, continue
+                lda #$17 : sta $5d
+            + lda #$01 : sta $02e0 : sta $56
             bra .return
 
         .nobunny
-        stz $5d : stz $02e0 : stz $56
+        lda $5d : cmp #$17 : bne + ; retain current state unless bunny
+            stz $5d
+        + stz $02e0 : stz $56
 
     .return
     lda $05 : sta $8a
diff --git a/data/base2current.bps b/data/base2current.bps
index 17f77f5f1b222671e41c05764cdc4c3b6cecbbd4..512a6dc9d18d1f1cfd322a5900c2cf095832b4e8 100644
GIT binary patch
delta 124
zcmV-?0E7SE&Is(z2(U>31c)zp(1T3@w@m>75d}s{rUjp3WA&0HvVkp=7l(lemn!Fh
zfSU>trmaap$w1H(rCrGc@C2(hc&43z4W(Vl7tjKm3xJuW1%-;jFkqu2O7t(_CbyRc
e0nShX50_?F0W<+Yx0_c1yw3=kE9FaYHnYlZoHH>1

delta 111
zcmV-#0FeLe&IsSm2(U>31RXWv%7aY-w@m>75d}FurUjp3WA&0HvVkX)7l(lemn!Fh
zfSU>trj<!R$w1Hzt2KD0fq<V4fSIKQg^I#3V51{S^k3i(x1<IE&QJj-mvdJEGyy5M
Rs8<2J&j|5xM#sh^ol4-@Ey4f*