diff --git a/Rom.py b/Rom.py index 25b5e6e2..1455f498 100644 --- a/Rom.py +++ b/Rom.py @@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'b46e08bfb572876dd51dc3108e7b9292' +RANDOMIZERBASEHASH = 'a30bdf1086fa4304d3b422eef2587f5b' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 065cbfd8..06647861 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -166,6 +166,13 @@ OWMirrorSpriteMove: lda $1acf : eor #$80 : sta $1acf + lda #$2c : jml.l $07A985 ; what we wrote over } +OWMirrorSpriteRestore: +{ + lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq + + lda $1acf : and #$0f : sta $1acf + + rep #$30 : lda.w $04AC ; what we wrote over + rtl +} OWFluteCancel: { diff --git a/data/base2current.bps b/data/base2current.bps index b1c892c6..5c83c834 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ