From 676cfc329e40d6c9233933bae82f86cc09f5b1c2 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Tue, 31 May 2016 18:31:40 -0400
Subject: Celadon Mart 2F

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

diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index e3a1a10a..dfec41e4 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -123,7 +123,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(Gary_h)
 	db BANK(UndergroundPathWE_h)
 	db BANK(CeladonMart1_h)
-	db $15 ; db BANK(CeladonMart2_h)
+	db BANK(CeladonMart2_h)
 	db $12 ; db BANK(CeladonMart3_h)
 	db $12 ; db BANK(CeladonMart4_h)
 	db $12 ; db BANK(CeladonMartRoof_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 4f7b8fdd..62a1f30b 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -123,7 +123,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw Gary_h ;id=120
 	dw UndergroundPathWE_h
 	dw CeladonMart1_h
-	dw $60d9 ; dw CeladonMart2_h
+	dw CeladonMart2_h
 	dw $4157 ; dw CeladonMart3_h
 	dw $4251 ; dw CeladonMart4_h
 	dw $42d0 ; dw CeladonMartRoof_h
diff --git a/main.asm b/main.asm
index 1de4969d..5b84e777 100755
--- a/main.asm
+++ b/main.asm
@@ -1155,7 +1155,14 @@ INCLUDE "scripts/route19.asm"
 INCLUDE "scripts/route21.asm"
 
 ; vermilion house 2
-	dr $56054,$56233
+	dr $56054,$560d9
+
+INCLUDE "data/mapHeaders/celadonmart2.asm"
+INCLUDE "scripts/celadonmart2.asm"
+INCLUDE "data/mapObjects/celadonmart2.asm"
+CeladonMart2Blocks:
+INCBIN "maps/celadonmart2.blk"
+	dr $56160,$56233
 
 INCLUDE "data/mapHeaders/daycarem.asm"
 INCLUDE "scripts/daycarem.asm"
-- 
cgit v1.3.1-sl0p