From ba9f0c75553f80d87d39d636672c5312882e914b Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Wed, 7 Jan 2026 20:21:20 -0600
Subject: [PATCH] Fix incorrect dungeon reminder appearing briefly out of map

---
 doorrando/hudadditions.asm     | 24 ++++++++++++++++--------
 dungeon_map/dungeon_switch.asm |  8 ++++----
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/doorrando/hudadditions.asm b/doorrando/hudadditions.asm
index 1c0bc1f..2c06602 100644
--- a/doorrando/hudadditions.asm
+++ b/doorrando/hudadditions.asm
@@ -45,10 +45,10 @@ DRHUD_BossIndicator:
 	LDA.w CompassField : AND.l DungeonMask, x
 	SEP #$20
 	BEQ .draw_indicator
-    LDA.l CompassBossIndicator, x : CMP.b RoomIndex : BNE .draw_indicator
-    LDY.w #!RedSquare
+	LDA.l CompassBossIndicator, x : CMP.b RoomIndex : BNE .draw_indicator
+	LDY.w #!RedSquare
 .draw_indicator
-    STY.w HUDMultiIndicator
+	STY.w HUDMultiIndicator
 	BRA DRHUD_DrawCurrentDungeonIndicator
 
 DRHUD_EnemyDropIndicator:
@@ -59,12 +59,20 @@ DRHUD_EnemyDropIndicator:
 	SEP #$10 : TAX : REP #$10
 
 DRHUD_DrawCurrentDungeonIndicator: ; mX
-    LDA.l DRMode : BIT.b #$02 : BEQ DRHUD_Finished
-    LDY.w #!BlankTile
-    LDA.w CurrentHealth : BEQ .draw_indicator
+	LDA.l DRMode : BIT.b #$02 : BNE + : JMP DRHUD_Finished : +
+	LDY.w #!BlankTile
+	LDA.w CurrentHealth : BEQ .draw_indicator
 
-    REP #$20 : LDA.l DungeonReminderTable,X : TAY
-    SEP #$20
+	LDA.b GameMode
+	CMP.b #$0E : BNE .get_indicator
+	LDA.b GameSubMode
+	CMP.b #$03 : BNE .get_indicator
+	LDA.w SubModuleInterface
+	CMP.b #$06 : BEQ .draw_indicator
+
+.get_indicator
+	REP #$20 : LDA.l DungeonReminderTable,X : TAY
+	SEP #$20
 .draw_indicator
 	STY.w HUDCurrentDungeonWorld
 
diff --git a/dungeon_map/dungeon_switch.asm b/dungeon_map/dungeon_switch.asm
index 317c65b..bf88de3 100644
--- a/dungeon_map/dungeon_switch.asm
+++ b/dungeon_map/dungeon_switch.asm
@@ -23,7 +23,7 @@ CheckSwitchMap:
 	STA.w DungeonID
 
 	LDA.b #$04
-	STA.w $0200
+	STA.w SubModuleInterface
 	REP #$20
 	LDA.w #$0000
 	RTL
@@ -37,7 +37,7 @@ DungeonMapSwitch_Submodule:
 	STA.w $0710
 
 	LDA.b #$01
-	STA.w $0200
+	STA.w SubModuleInterface
 	STA.w $020D
 	STZ.w $0213
 	STZ.w $021B
@@ -78,7 +78,7 @@ SkipMapSprites:
 
 	LDA.l DRMode
 	BNE +
-	LDA.w $0200
+	LDA.w SubModuleInterface
 	CMP.b #$04
 	BEQ +
 	JSL DrawEntrances
@@ -91,7 +91,7 @@ SkipMapSprites:
 	STZ.b $0E
 	STZ.b $0F
 
-	LDA.w $0200
+	LDA.w SubModuleInterface
 	CMP.b #$04
 	BNE +
 		JML $8AEAFC