From fe21110e6f2f56927f8393c54a985021305ec7a0 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Tue, 31 May 2016 12:50:18 -0400
Subject: Vermilion House 1

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

diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 98849126..5ba6b07f 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -93,7 +93,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(FanClub_h)
 	db BANK(VermilionMart_h)
 	db BANK(VermilionGym_h)
-	db $07 ; db BANK(VermilionHouse1_h)
+	db BANK(VermilionHouse1_h)
 	db $07 ; db BANK(VermilionDock_h)
 	db $18 ; db BANK(SSAnne1_h)
 	db $18 ; db BANK(SSAnne2_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index b5cfc4d8..7f54aecc 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -93,7 +93,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw FanClub_h ;id=90
 	dw VermilionMart_h
 	dw VermilionGym_h
-	dw $53f8 ; dw VermilionHouse1_h
+	dw VermilionHouse1_h
 	dw $544e ; dw VermilionDock_h
 	dw $52a4 ; dw SSAnne1_h
 	dw $53de ; dw SSAnne2_h
diff --git a/main.asm b/main.asm
index 6c10fe37..17e86532 100755
--- a/main.asm
+++ b/main.asm
@@ -299,6 +299,7 @@ Route2HouseBlocks:
 PewterHouse1Blocks:
 PewterHouse2Blocks:
 CeruleanHouse1Blocks:
+VermilionHouse1Blocks:
 INCBIN "maps/viridianhouse.blk"
 SchoolBlocks:
 INCBIN "maps/school.blk"
@@ -358,7 +359,12 @@ INCLUDE "scripts/bikeshop.asm"
 INCLUDE "data/mapObjects/bikeshop.asm"
 BikeShopBlocks:
 INCBIN "maps/bikeshop.blk"
-	dr $1d1a4,$1d7ae ; map scripts
+	dr $1d1a4,$1d3f8 ; map scripts
+
+INCLUDE "data/mapHeaders/vermilionhouse1.asm"
+INCLUDE "scripts/vermilionhouse1.asm"
+INCLUDE "data/mapObjects/vermilionhouse1.asm"
+	dr $1d44e,$1d7ae ; map scripts
 
 INCLUDE "data/mapHeaders/diglettscaveroute2.asm"
 INCLUDE "scripts/diglettscaveroute2.asm"
-- 
cgit v1.3.1-sl0p