From b50e74d0d93cef3298f095bafa1522217a6966c2 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Wed, 1 Jun 2016 10:04:20 -0400
Subject: Celadon House

---
 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 bd83e957..2574a12f 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -139,7 +139,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(CeladonMart5_h)
 	db BANK(CeladonPrizeRoom_h)
 	db BANK(CeladonDiner_h)
-	db $12 ; db BANK(CeladonHouse_h)
+	db BANK(CeladonHouse_h)
 	db $12 ; db BANK(CeladonHotel_h)
 	db $17 ; db BANK(LavenderPokecenter_h)
 	db $18 ; db BANK(PokemonTower1_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 9a774a51..cbd1e821 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -139,7 +139,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw CeladonMart5_h
 	dw CeladonPrizeRoom_h
 	dw CeladonDiner_h
-	dw $51e8 ; dw CeladonHouse_h
+	dw CeladonHouse_h
 	dw $5243 ; dw CeladonHotel_h ;id=140
 	dw $479c ; dw LavenderPokecenter_h
 	dw $4420 ; dw PokemonTower1_h
diff --git a/main.asm b/main.asm
index 595bc821..2ec12a88 100755
--- a/main.asm
+++ b/main.asm
@@ -967,7 +967,13 @@ INCLUDE "scripts/celadondiner.asm"
 INCLUDE "data/mapObjects/celadondiner.asm"
 CeladonDinerBlocks:
 INCBIN "maps/celadondiner.blk"
-	dr $491e8,$492a9
+
+INCLUDE "data/mapHeaders/celadonhouse.asm"
+INCLUDE "scripts/celadonhouse.asm"
+INCLUDE "data/mapObjects/celadonhouse.asm"
+CeladonHouseBlocks:
+INCBIN "maps/celadonhouse.blk"
+	dr $49243,$492a9
 
 INCLUDE "data/mapHeaders/mtmoonpokecenter.asm"
 INCLUDE "scripts/mtmoonpokecenter.asm"
-- 
cgit v1.2.3