Disarm EG glitch on mirror in most modes

Added a check flag for the disarm on most transitions so if can be armed when wanted
2021-10-05 14:13:24 -06:00
parent 035621e420
commit a23315f783
6 changed files with 19 additions and 4 deletions
--- a/asm/drhooks.asm
+++ b/asm/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

--- a/asm/normal.asm
+++ b/asm/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

--- a/asm/overrides.asm
+++ b/asm/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