From 0a98db70259d73c61e083683ab6a042fb57dbb9f Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Wed, 7 Jan 2026 06:12:43 -0600
Subject: [PATCH] Clear unseen connections in custom map mode

---
 dungeon_map/draw_rooms.asm     | 12 +++++--
 dungeon_map/hooks.asm          |  4 +++
 dungeon_map/mappable_doors.asm | 57 ++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/dungeon_map/draw_rooms.asm b/dungeon_map/draw_rooms.asm
index 7398e65..f6d6b57 100644
--- a/dungeon_map/draw_rooms.asm
+++ b/dungeon_map/draw_rooms.asm
@@ -58,6 +58,16 @@ DrawDungeonMapRoom:
 	STA.b $0A
 +
 
+	PLX
+
+	LDA.l DungeonMapMode
+	BEQ +
+	LDA.b $0A
+	CMP.w #$0003
+	BCS +
+	JSL ClearAdjacentConnections
++
+
 	LDA.b $0A : BNE + : LDA.w #$0F00 : BRA ++
 +	DEC A     : BNE + : LDA.w #$174F : BRA ++
 +	DEC A     : BNE + : LDA.w #$174F : BRA ++
@@ -67,8 +77,6 @@ DrawDungeonMapRoom:
 +	LDA.w #$0800
 ++	STA.b $0C
 
-	PLX
-
 	LDA.b $CA
 	AND.w #$00FF
 	ASL A : ASL A : ASL A
diff --git a/dungeon_map/hooks.asm b/dungeon_map/hooks.asm
index 3576e04..3afaecf 100644
--- a/dungeon_map/hooks.asm
+++ b/dungeon_map/hooks.asm
@@ -217,3 +217,7 @@ org $8AE8E4
 
 org $8AE8F9
 	LDA.b [$72], Y
+
+org $8AEBC6
+	JSL GetLocationMarkerLeft
+	NOP
diff --git a/dungeon_map/mappable_doors.asm b/dungeon_map/mappable_doors.asm
index 2ddcf84..4b4b993 100644
--- a/dungeon_map/mappable_doors.asm
+++ b/dungeon_map/mappable_doors.asm
@@ -305,6 +305,54 @@ PrepDrawRow:
 .done
 	RTL
 
+ClearAdjacentConnections:
+	; Left
+	LDA.b $02
+	BEQ +
+	LDA.b $0E
+	BIT.w #$000A
+	BNE +
+	LDA.w #$0F00
+	STA.l $7F0000-$02, X
+	STA.l $7F0040-$02, X
++
+
+	; Top
+	LDA.b $00
+	BEQ +
+	LDA.b $0E
+	BIT.w #$000C
+	BNE +
+	LDA.w #$0F00
+	STA.l $7F0000-$40, X
+	STA.l $7F0002-$40, X
++
+
+	; Right
+	LDA.b $02
+	CMP.l CustomMapDrawingData_column_wrap
+	BCS +
+	LDA.b $0E
+	BIT.w #$0005
+	BNE +
+	LDA.w #$0F00
+	STA.l $7F0000+$04, X
+	STA.l $7F0040+$04, X
++
+
+	; Bottom
+	LDA.b $00
+	CMP.l CustomMapDrawingData_row_wrap
+	BCS +
+	LDA.b $0E
+	BIT.w #$0003
+	BNE +
+	LDA.w #$0F00
+	STA.l $7F0000+$80, X
+	STA.l $7F0002+$80, X
++
+	RTL
+
 DrawRowOfRoomConnections:
 	PHB : PHK : PLB
 	PHX
@@ -415,3 +463,12 @@ DrawVerticalConnector:
 
 	PLY
 	RTS
+
+GetLocationMarkerLeft:
+	LDA.b LinkQuadrantH
+	BEQ +
+	LDA.b #$F8
++
+	CLC : ADC.w $0215
+	AND.b #$F8
+	RTL