From 3eae968b305cbc80fa7d09447046001aa0bd39f6 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Mon, 30 May 2016 13:59:23 -0400
Subject: Daycare

---
 main.asm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 34547349..dcdba3e0 100755
--- a/main.asm
+++ b/main.asm
@@ -1041,7 +1041,10 @@ INCLUDE "data/mapHeaders/route21.asm"
 INCLUDE "data/mapObjects/route21.asm"
 Route21Blocks: ; 5507d
 INCBIN "maps/route21.blk"
-	dr $5523f,$5525f
+
+DayCareMBlocks:
+INCBIN "maps/daycarem.blk"
+	dr $5524f,$5525f
 
 INCLUDE "engine/battle/experience.asm"
 
@@ -1057,7 +1060,12 @@ INCLUDE "scripts/route19.asm"
 INCLUDE "scripts/route21.asm"
 
 ; vermilion house 2
-	dr $56054,$56714
+	dr $56054,$56233
+
+INCLUDE "data/mapHeaders/daycarem.asm"
+INCLUDE "scripts/daycarem.asm"
+INCLUDE "data/mapObjects/daycarem.asm"
+	dr $564a5,$56714
 
 INCLUDE "engine/menu/diploma_1.asm"
 
-- 
cgit v1.3.1-sl0p