From 117c154f56d932ef5fefdce7ed50ad081c5a4f6a Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 19:46:10 -0400
Subject: Lavender Town; all city overworld maps done

---
 main.asm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 5ababcd8..cfd855ca 100755
--- a/main.asm
+++ b/main.asm
@@ -679,10 +679,14 @@ INCLUDE "engine/menu/options.asm"
 
 SECTION "bank11",ROMX,BANK[$11]
 
-	dr $44000,$44085
+INCLUDE "data/mapHeaders/lavendertown.asm"
+INCLUDE "data/mapObjects/lavendertown.asm"
 LavenderTownBlocks:
 INCBIN "maps/lavendertown.blk"
-	dr $440df,$44169
+	dr $440df,$4410b
+
+INCLUDE "scripts/lavendertown.asm"
+	; dr $440df,$44169
 
 INCLUDE "engine/pokedex_rating.asm"
 
@@ -912,7 +916,9 @@ INCBIN "maps/route6.blk"
 Route8Blocks: ; 581c6
 INCBIN "maps/route8.blk"
 
-	dr $582d4,$584be
+	dr $582d4,$58356
+Route10Blocks:
+INCBIN "maps/route10.blk"
 
 INCLUDE "data/mapHeaders/route11.asm"
 INCLUDE "data/mapObjects/route11.asm"
-- 
cgit v1.3.1-sl0p