From ad8c4e8e70519f636c1645dbb5ad6c616e10bec3 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Mon, 16 Aug 2021 22:52:04 -0500
Subject: [PATCH] ROM changes to support Crossed OW changes

---
 hudadditions.asm | 2 +-
 owrando.asm      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hudadditions.asm b/hudadditions.asm
index eb223e3..3927130 100644
--- a/hudadditions.asm
+++ b/hudadditions.asm
@@ -26,7 +26,7 @@ HudAdditions:
     ++
 
 	LDX $1B : BNE + ; if outdoors
-        lda.l OWMode : and #$0300 : bne ++ : rts ; Skip if vanilla ow rando
+        lda.l OWMode : and #$06ff : bne ++ : rts ; Skip if vanilla ow rando
         ++ lda $7ef36d : and #$00ff : beq ++
             lda $7ef3ca : and #$00ff : beq +++
                 lda #$2d60 : bra .owdisplay
diff --git a/owrando.asm b/owrando.asm
index b3f9af8..1b4f133 100644
--- a/owrando.asm
+++ b/owrando.asm
@@ -338,7 +338,7 @@ OWNewDestination:
     sep #$30 : lda OWOppSlotOffset,y : !add $04 : asl : and #$7f : sta $700
     
     ; crossed OW shuffle
-    lda.l OWMode+1 : and #$ff : cmp #$02 : bne .return
+    lda.l OWMode+1 : and.b #$02 : beq .return
         ldx $05 : lda.l OWTileWorldAssoc,x : sta.l $7ef3ca ; change world
 
         ; toggle bunny mode
@@ -350,7 +350,7 @@ OWNewDestination:
             ; turn into bunny
             lda $5d : cmp #$17 : beq .return
             lda #$17 : sta $5d
-            lda #$01 : sta $02e0
+            lda #$01 : sta $2e0
             bra .return
         .nobunny
         lda $5d : cmp #$17 : bne .return