Fixed mirror bonk issue incorrectly leaving a mirror portal behind

2022-03-07 20:20:05 -06:00
parent b4c2e0df5f
commit d23a2332fe
1 changed files with 11 additions and 3 deletions
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -170,9 +170,17 @@ OWMirrorSpriteMove:
 }
 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
+    lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq .return
+        lda InvertedMode : beq +
+            lda $7ef3ca : beq .return
+            bra .restorePortal
+        + lda $7ef3ca : bne .return
+        
+    .restorePortal
+    lda $1acf : and #$0f : sta $1acf
+    
+    .return
+    rep #$30 : lda.w $04AC ; what we wrote over
    rtl
 }
 OWLightWorldOrCrossed: