From 319aba5e4d752c3da5c8dfb9958c92b4c15d6de7 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@sirsidynix.com>
Date: Tue, 5 Oct 2021 14:15:38 -0600
Subject: [PATCH] EG disarmament on mirror

---
 drhooks.asm   | 5 +++++
 normal.asm    | 5 +++--
 overrides.asm | 6 ++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/drhooks.asm b/drhooks.asm
index 86ae1ff..1d3b485 100644
--- a/drhooks.asm
+++ b/drhooks.asm
@@ -125,6 +125,11 @@ org $07a955 ; <- Bank07.asm : around 6564 (JP is a bit different) (STZ $05FC : S
 jsl BlockEraseFix
 nop #2
 
+org $02A0A8
+Mirror_SaveRoomData:
+org $07A95B ; < bank_07.asm ; #_07A95B: JSL Mirror_SaveRoomData
+jsl EGFixOnMirror
+
 org $02b82a
 jsl FixShopCode
 
diff --git a/normal.asm b/normal.asm
index aabb24d..3bdf962 100644
--- a/normal.asm
+++ b/normal.asm
@@ -73,8 +73,9 @@ TrapDoorFixer:
     rts
 
 Cleanup:
-    stz $047a
-	inc $11
+	lda.l DRFlags : and #$10 : beq +
+    	stz $047a
+	+ inc $11
 	lda $ef
 	rts
 
diff --git a/overrides.asm b/overrides.asm
index a041ae3..91029a8 100644
--- a/overrides.asm
+++ b/overrides.asm
@@ -47,6 +47,12 @@ MirrorCheckOverride:
     rtl
     + lda.l DRScroll : rtl
 
+EGFixOnMirror:
+	lda.l DRFlags : and #$10 : beq +
+		stz $047a
+	+ jsl Mirror_SaveRoomData
+	rtl
+
 BlockEraseFix:
     lda $7ef353 : and #$02 : beq +
         stz $05fc : stz $05fd