From c13c37d5b7199388543f7ae8752db95ab67dcd48 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Mon, 2 Dec 2024 07:13:35 -0500
Subject: [PATCH] Restore custom entrance code

---
 Overworld/entrances.asm | 4 +++-
 Overworld/overworld.asm | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Overworld/entrances.asm b/Overworld/entrances.asm
index 7016f56..d34672d 100644
--- a/Overworld/entrances.asm
+++ b/Overworld/entrances.asm
@@ -1,4 +1,5 @@
-Map16Definitions = $0F8000
+;Map16Definitions = $0F8000
+Map16Definitions = $3D8000
 Overworld_DrawMap16_Persist = $1BC97C
 Overworld_DrawMap16_Anywhere = $1BC983
 Interface_PrepAndDisplayMessage = $0FFDAA
@@ -284,6 +285,7 @@ ValidDoorTypes_high:
  dw $0131, $0112, $017A, $0163 ; 09:
  dw $0172, $01BD, $0152, $0167 ; 10:
 
+pullpc
 
 
 ; 0x00 - OW
diff --git a/Overworld/overworld.asm b/Overworld/overworld.asm
index f447b1b..9134d27 100644
--- a/Overworld/overworld.asm
+++ b/Overworld/overworld.asm
@@ -85,6 +85,8 @@ print  "End of Overworld/time_system.asm  ", pc
 incsrc "Overworld/overlays.asm"
 print  "End of Overworld/overlays.asm     ", pc
 
+incsrc "Overworld/entrances.asm"
+
 incsrc "Overworld/custom_gfx.asm"
 print  "End of Overworld/custom_gfx.asm   ", pc
 pushpc