Moved OW flag checks to global variable

2021-08-19 20:02:12 -05:00
parent 4e8758c647
commit bae81b58ce
3 changed files with 2 additions and 2 deletions
--- 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):
--- 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
--- a/data/base2current.bps
+++ b/data/base2current.bps