Updated baserom

- Fixes TR Pegs issue when fluting direct to TR Pegs from area with hammerpegs
- Changed Crossed OW to only affect Link state on world change

Rom.py

@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'df12af8b5970ecc392b29b45595d9351'
+RANDOMIZERBASEHASH = '712ebda1ef6818c59cde0371b5a4e4a9'
 
 
 class JsonRom(object):

asm/owrando.asm

@@ -342,26 +342,26 @@ OWNewDestination:
     
     ; crossed OW shuffle
     LDA.l OWMode+1 : AND.b #!FLAG_OW_CROSSED : beq .return
-        ldx $05 : lda.l OWTileWorldAssoc,x : cmp.l $7ef3ca : beq +
+        ldx $05 : lda.l OWTileWorldAssoc,x : cmp.l $7ef3ca : beq .return
             sta.l $7ef3ca ; change world
             lda #$38 : sta $012f ; play sfx - #$3b is an alternative
 
-        ; toggle bunny mode
+            ; toggle bunny mode
-        + lda $7ef357 : bne .nobunny
+            + lda $7ef357 : bne .nobunny
-        lda.l InvertedMode : bne .inverted
+            lda.l InvertedMode : bne .inverted
-            lda $7ef3ca : and.b #$40 : bra +
+                lda $7ef3ca : and.b #$40 : bra +
-            .inverted lda $7ef3ca : and.b #$40 : eor #$40
+                .inverted lda $7ef3ca : and.b #$40 : eor #$40
-        + cmp #$40 : bne .nobunny
+            + cmp #$40 : bne .nobunny
-            ; turn into bunny
+                ; turn into bunny
-            lda $5d : cmp #$04 : beq + ; if swimming, continue
+                lda $5d : cmp #$04 : beq + ; if swimming, continue
-                lda #$17 : sta $5d
+                    lda #$17 : sta $5d
-            + lda #$01 : sta $02e0 : sta $56
+                + lda #$01 : sta $02e0 : sta $56
-            bra .return
+                bra .return
 
-        .nobunny
+            .nobunny
-        lda $5d : cmp #$17 : bne + ; retain current state unless bunny
+            lda $5d : cmp #$17 : bne + ; retain current state unless bunny
-            stz $5d
+                stz $5d
-        + stz $02e0 : stz $56
+            + stz $02e0 : stz $56
 
     .return
     lda $05 : sta $8a