From a1fafb72cd37eeca260e7065fe05b2c3253b5bdc Mon Sep 17 00:00:00 2001
From: Catobat <69204835+Catobat@users.noreply.github.com>
Date: Sun, 31 Oct 2021 21:16:09 +0100
Subject: [PATCH] Keep dungeon tileset after opening the map

---
 doortables.asm |  2 ++
 drhooks.asm    |  3 +++
 gfx.asm        | 10 ++++++++++
 3 files changed, 15 insertions(+)

diff --git a/doortables.asm b/doortables.asm
index eae1643..90678ca 100644
--- a/doortables.asm
+++ b/doortables.asm
@@ -681,6 +681,8 @@ db $00,$07,$20,$20,$07,$07,$07,$07,$07,$20,$20,$07,$20,$20,$20,$20
 db $07,$07,$02,$02,$02,$02,$07,$07,$07,$20,$20,$07,$20,$20,$20,$07
 
 ;27f300
+DungeonTilesets:
+db $04,$04,$05,$12,$04,$08,$07,$0C,$09,$0B,$05,$0A,$0D,$0E,$06,$06
 
 ;
 ;org $27ff00
diff --git a/drhooks.asm b/drhooks.asm
index 1d3b485..f067dad 100644
--- a/drhooks.asm
+++ b/drhooks.asm
@@ -76,6 +76,9 @@ nop : jsl OverridePaletteHeader
 org $02817e ; Bank02.asm : 414 (LDA $02811E, X)
 jsl FixAnimatedTiles
 
+org $0aef43 ; UnderworldMap_RecoverGFX
+jsl FixCloseDungeonMap
+
 org $028a06 ; Bank02.asm : 1941 Dungeon_ResetTorchBackgroundAndPlayer
 JSL FixWallmasterLamp
 
diff --git a/gfx.asm b/gfx.asm
index b22fba6..94cb884 100644
--- a/gfx.asm
+++ b/gfx.asm
@@ -45,6 +45,16 @@ FixAnimatedTiles:
 	+ LDA $02802E, X ; what we wrote over
 	RTL
 
+FixCloseDungeonMap:
+    LDA.l DRMode : CMP #$02 : BNE .vanilla
+	LDA $040C : BMI .vanilla
+        LSR : TAX
+        LDA.l DungeonTilesets,x
+        RTL
+    .vanilla
+    LDA $7EC20E
+    RTL
+
 FixWallmasterLamp:
 ORA $0458
 STY $1C : STA $1D : RTL ; what we wrote over