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 512a6dc9..10f67fd0 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ