From 037dbda5702646ea2f4fb00442071e52f8f03ec0 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Sun, 29 May 2016 21:55:48 -0400
Subject: Trashed cerulean house

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

diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 90ca27f9..1664cb08 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -62,14 +62,14 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(MtMoon1_h)
 	db BANK(MtMoon2_h)
 	db BANK(MtMoon3_h)
-	db $07 ; db BANK(CeruleanHouseTrashed_h)
+	db BANK(CeruleanHouseTrashed_h)
 	db $07 ; db BANK(CeruleanHouse1_h)
 	db $17 ; db BANK(CeruleanPokecenter_h)
 	db $17 ; db BANK(CeruleanGym_h)
 	db $07 ; db BANK(BikeShop_h)
 	db $17 ; db BANK(CeruleanMart_h)
 	db $12 ; db BANK(MtMoonPokecenter_h)
-	db $07 ; db BANK(CeruleanHouseTrashed_h)
+	db BANK(CeruleanHouseTrashed_h)
 	db $07 ; db BANK(Route5Gate_h)
 	db $17 ; db BANK(UndergroundPathEntranceRoute5_h)
 	db $15 ; db BANK(DayCareM_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 37357204..4d6a8847 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -62,14 +62,14 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw MtMoon1_h
 	dw MtMoon2_h ;id=60
 	dw MtMoon3_h
-	dw $4ec3 ; dw CeruleanHouseTrashed_h
+	dw CeruleanHouseTrashed_h
 	dw $4f34 ; dw CeruleanHouse1_h
 	dw $44f5 ; dw CeruleanPokecenter_h
 	dw $4577 ; dw CeruleanGym_h
 	dw $5038 ; dw BikeShop_h
 	dw $4757 ; dw CeruleanMart_h
 	dw $52a9 ; dw MtMoonPokecenter_h
-	dw $4ec3 ; dw CeruleanHouseTrashed_h ; copy
+	dw CeruleanHouseTrashed_h ; copy
 	dw $5831 ; dw Route5Gate_h
 	dw $55a8 ; dw UndergroundPathEntranceRoute5_h
 	dw $6233 ; dw DayCareM_h
diff --git a/main.asm b/main.asm
index b12a6b58..91bff12e 100755
--- a/main.asm
+++ b/main.asm
@@ -344,7 +344,10 @@ INCLUDE "data/mapHeaders/pewterhouse2.asm"
 INCLUDE "scripts/pewterhouse2.asm"
 INCLUDE "data/mapObjects/pewterhouse2.asm"
 
-	dr $1cec3,$1d7ae ; map scripts
+INCLUDE "data/mapHeaders/ceruleanhousetrashed.asm"
+INCLUDE "scripts/ceruleanhousetrashed.asm"
+INCLUDE "data/mapObjects/ceruleanhousetrashed.asm"
+	dr $1cf34,$1d7ae ; map scripts
 
 INCLUDE "data/mapHeaders/diglettscaveroute2.asm"
 INCLUDE "scripts/diglettscaveroute2.asm"
-- 
cgit v1.2.3