Move mirror portal off screen during mirror bonk in Crossed OW

2021-12-22 10:49:12 -06:00
parent 9c3d85e360
commit 0a4c624f2f
2 changed files with 8 additions and 0 deletions
--- a/hooks.asm
+++ b/hooks.asm
@@ -2377,6 +2377,7 @@ JML.l MirrorBonk
 MirrorBonk_NormalReturn:
 org $07A9D1 ; <- 3A9D1 - Bank07.asm:6649 (BRANCH_GAMMA:)
 MirrorBonk_BranchGamma:
+JML.l OWMirrorSpriteMove
 ;================================================================================

 ;================================================================================
--- a/owrando.asm
+++ b/owrando.asm
@@ -158,6 +158,13 @@ OWPreserveMirrorSprite:
    pla : lda #$de : pha ; in vanilla, if in dark world, jump to $05afdf
    rtl
 }
+OWMirrorSpriteMove:
+{
+    lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq .return
+        lda $1acf : eor #$80 : sta $1acf
+    .return
+    lda #$2c : jml.l $07A985 ; what we wrote over
+}

 OWFluteCancel:
 {