From a4aae63a38867c65473756a265b7808e497812cb Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 3 Jun 2016 19:31:07 -0400
Subject: Remaining map in bank 15

---
 data/map_header_banks.asm    | 2 +-
 data/map_header_pointers.asm | 2 +-
 main.asm                     | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 3f4e1298..d0379b37 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -213,7 +213,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(SilphCo5_h)
 	db BANK(SilphCo6_h)
 	db BANK(SilphCo7_h)
-	db $15 ; db BANK(SilphCo8_h)
+	db BANK(SilphCo8_h)
 	db BANK(Mansion2_h)
 	db BANK(Mansion3_h)
 	db BANK(Mansion4_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index fde48bbc..54e7dc96 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -213,7 +213,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw SilphCo5_h ;210
 	dw SilphCo6_h
 	dw SilphCo7_h
-	dw $652a ; dw SilphCo8_h
+	dw SilphCo8_h
 	dw Mansion2_h
 	dw Mansion3_h
 	dw Mansion4_h
diff --git a/main.asm b/main.asm
index d9d4089e..fb68b65a 100755
--- a/main.asm
+++ b/main.asm
@@ -1357,7 +1357,11 @@ INCLUDE "data/mapObjects/daycarem.asm"
 INCLUDE "data/mapHeaders/route12house.asm"
 INCLUDE "scripts/route12house.asm"
 INCLUDE "data/mapObjects/route12house.asm"
-	dr $5652a,$56714
+
+INCLUDE "data/mapHeaders/silphco8.asm"
+INCLUDE "scripts/silphco8.asm"
+INCLUDE "data/mapObjects/silphco8.asm"
+SilphCo8Blocks: INCBIN "maps/silphco8.blk"
 
 INCLUDE "engine/menu/diploma_1.asm"
 
-- 
cgit v1.2.3