diff --git a/Rom.py b/Rom.py index 30729de4..2fe1bdfa 100644 --- a/Rom.py +++ b/Rom.py @@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '383fbac5f195f82d2b74b62113229fac' +RANDOMIZERBASEHASH = '607ec23701b1099fdeb64a0caff190b6' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index f0465953..f239b436 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -148,6 +148,7 @@ OWPreserveMirrorSprite: { lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq .vanilla rtl ; if OW Crossed, skip world check and continue + .vanilla lda InvertedMode : beq + lda $7ef3ca : beq .deleteMirror @@ -410,6 +411,14 @@ OWWorldUpdate: ; x = owid of destination screen { lda.l OWTileWorldAssoc,x : cmp.l $7ef3ca : beq .return sta.l $7ef3ca ; change world + + ; moving mirror portal off screen when in DW + cmp #0 : beq + : lda #1 + + cmp.l InvertedMode : bne + + lda $1acf : and #$0f : sta $1acf : bra .playSfx ; bring portal back into position + + lda $1acf : eor #$80 : sta $1acf ; move portal off screen + + .playSfx lda #$38 : sta $012f ; play sfx - #$3b is an alternative ; toggle bunny mode diff --git a/data/base2current.bps b/data/base2current.bps index db61bf4d..022ded6a 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ