From 0dba58c1945a0d4fdb38ff55551fc9cc4955d4c6 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@sirsidynix.com>
Date: Fri, 30 Oct 2020 16:26:28 -0600
Subject: [PATCH] Support for Mirror Scroll DR Hud Additions

---
 darkworldspawn.asm |  8 ++------
 drhooks.asm        | 12 ++++++------
 events.asm         |  3 +--
 overrides.asm      |  5 +++--
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index 3053e47..70e177c 100644
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -12,9 +12,7 @@ DoWorldFix:
 		JMP DoWorldFix_Inverted
 	+
 	LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check
-	.doors_mirror_override
-	print "MirrorCheckOverride2: ", pc
-		LDA $7EF353 : BEQ .noMirror ; check if we have the mirror
+		LDA $7EF353 : AND #$02 : BEQ .noMirror ; check if we have the mirror
 	.skip_mirror_check ; alt entrance point
 	LDA $7EF3C5 : CMP.b #$03 : !BLT .aga1Alive ; check if agahnim 1 is alive
 	BRA .done
@@ -50,9 +48,7 @@ RTL
 ;================================================================================
 DoWorldFix_Inverted:
 	LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check
-	.doors_mirror_override
-	print "MirrorCheckOverride2: ", pc
-		LDA $7EF353 : BEQ .noMirror ; check if we have the mirror
+		LDA $7EF353 : AND #$02  : BEQ .noMirror ; check if we have the mirror
 	.skip_mirror_check ; alt entrance point
 	LDA $7EF3C5 : CMP.b #$03 : !BLT .aga1Alive ; check if agahnim 1 is alive
 	BRA .done
diff --git a/drhooks.asm b/drhooks.asm
index 66d283a..0abbb93 100644
--- a/drhooks.asm
+++ b/drhooks.asm
@@ -105,11 +105,11 @@ nop : stz $0dd0, X : rts
 
 
 ;org $208206
-org $20820E
-jsl MirrorCheckOverride2
+;org $20820E
+;jsl MirrorCheckOverride2
 ;org $208270
-org $20827C
-jsl MirrorCheckOverride2
+;org $20827C
+;jsl MirrorCheckOverride2
 org $07a955 ; <- Bank07.asm : around 6564 (JP is a bit different) (STZ $05FC : STZ $05FD)
 jsl BlockEraseFix
 nop #2
@@ -134,8 +134,8 @@ jsl SuctionOverworldFix
 ; also rando's hooks.asm line 1360
 ; 106e4e -> goes to  a0ee4e
 ;org $a0ee8a ; <- 6FC4C - headsup_display.asm : 836 (LDA $7EF36E : AND.w #$00FF : ADD.w #$0007 : AND.w #$FFF8 : TAX)
-org $a0eeab
-jsl DrHudOverride
+;org $a0eeab
+;jsl DrHudOverride
 org $0ded04 ; <- rando's hooks.asm line 2192 - 6ED04 - equipment.asm : 1963 (REP #$30)
 jsl DrHudDungeonItemsAdditions
 ;org $098638 ; rando's hooks.asm line 2192
diff --git a/events.asm b/events.asm
index dfda530..c5cfdc4 100644
--- a/events.asm
+++ b/events.asm
@@ -16,8 +16,7 @@ RTL
 ;--------------------------------------------------------------------------------
 OnDrawHud:
 	JSL.l DrawChallengeTimer ; this has to come before NewDrawHud because the timer overwrites the compass counter
-	.DrHudOverride
-	print "DrHudOverride: ", pc
+	JSL.l DrHudOverride
 	JSL.l NewDrawHud
 	JSL.l SwapSpriteIfNecissary
 	JSL.l PollService
diff --git a/overrides.asm b/overrides.asm
index 07bb83e..a7830f1 100644
--- a/overrides.asm
+++ b/overrides.asm
@@ -49,8 +49,9 @@ MirrorCheckOverride:
     rtl
     + lda.l DRScroll : rtl
 
-MirrorCheckOverride2:
-    lda $7ef353 : and #$02 : rtl
+;moved to base rom
+;MirrorCheckOverride2:
+;    lda $7ef353 : and #$02 : rtl
 
 
 BlockEraseFix: