diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index a8a34e4..214543d 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -557,6 +557,9 @@ Overworld_MemorizeMap16Change:
 org $05A51D
 Sprite_SpawnFallingItem:
 
+org $05AFF1
+Sprite_6C_MirrorPortal_dont_do_warp:
+
 org $05DF6C ; 02DF6C - Bank05.asm : 2445
 Sprite_DrawMultiple:
 
@@ -617,6 +620,9 @@ Player_HaltDashAttackLong:
 org $07999D
 Link_ReceiveItem:
 
+org $07A985
+SetGameModeLikeMirror:
+
 org $07E68F
 Unknown_Method_0: ; In US version disassembly simply called "$3E6A6 IN ROM"
 
diff --git a/owrando.asm b/owrando.asm
index 08d35ab..76f4dc0 100644
--- a/owrando.asm
+++ b/owrando.asm
@@ -220,14 +220,14 @@ OWPreserveMirrorSprite:
         rtl
 
     .deleteMirror
-    pla : lda #$de : pha ; in vanilla, if in dark world, jump to $05afdf
     rtl
+    + pla : pla : pla : jml Sprite_6C_MirrorPortal_missing_mirror
 }
 OWMirrorSpriteMove:
 {
     lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq +
         lda $1acf : ora #$40 : sta $1acf
-    + lda #$2c : jml.l $07A985 ; what we wrote over
+    lda.b #$2c : jml SetGameModeLikeMirror ; what we wrote over
 }
 OWMirrorSpriteRestore:
 {