From 25cadbde5bcbdc39ee294bb419fb0e30de3b1411 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Thu, 26 May 2016 15:25:28 -0400
Subject: Route 2

---
 data/mapObjects/route2.asm |  7 +++++--
 main.asm                   | 12 +++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm
index 0e6784b2..9731f450 100755
--- a/data/mapObjects/route2.asm
+++ b/data/mapObjects/route2.asm
@@ -1,13 +1,14 @@
 Route2Object: ; 0x54022 (size=72)
 	db $f ; border block
 
-	db $6 ; warps
+	db $7 ; warps
 	db $9, $c, $0, DIGLETTS_CAVE_EXIT
 	db $b, $3, $1, VIRIDIAN_FOREST_EXIT
 	db $13, $f, $0, ROUTE_2_HOUSE
 	db $23, $10, $1, ROUTE_2_GATE
 	db $27, $f, $2, ROUTE_2_GATE
 	db $2b, $3, $2, VIRIDIAN_FOREST_ENTRANCE
+	db $23, $11, $1, ROUTE_2_GATE
 
 	db $2 ; signs
 	db $41, $5, $3 ; Route2Text3
@@ -24,10 +25,12 @@ Route2Object: ; 0x54022 (size=72)
 	EVENT_DISP ROUTE_2_WIDTH, $23, $10 ; ROUTE_2_GATE
 	EVENT_DISP ROUTE_2_WIDTH, $27, $f ; ROUTE_2_GATE
 	EVENT_DISP ROUTE_2_WIDTH, $2b, $3 ; VIRIDIAN_FOREST_ENTRANCE
+	EVENT_DISP ROUTE_2_WIDTH, $23, $11 ; ROUTE_2_GATE
 
 	; unused
 	EVENT_DISP $4, $7, $2
-	db   $12, $c7, $9, $7
+	dw      $c712
+	db             $9, $7
 	EVENT_DISP $4, $7, $2
 	EVENT_DISP $4, $7, $2
 	EVENT_DISP $4, $7, $2
diff --git a/main.asm b/main.asm
index 330ac0af..276f8e98 100755
--- a/main.asm
+++ b/main.asm
@@ -236,14 +236,14 @@ INCLUDE "data/mapHeaders/celadoncity.asm"
 INCLUDE "data/mapObjects/celadoncity.asm"
 CeladonCityBlocks: INCBIN "maps/celadoncity.blk"
 
-	dr $182a1,$1855a ; headers, objects, blocks
+	dr $182a1,$183f2 ; headers, objects, blocks
 ; INCLUDE "data/mapHeaders/pallettown.asm"
 ; INCLUDE "data/mapObjects/pallettown.asm"
 ; PalletTownBlocks: INCBIN "maps/pallettown.blk"
 
 ; INCLUDE "data/mapHeaders/viridiancity.asm"
 ; INCLUDE "data/mapObjects/viridiancity.asm"
-; ViridianCityBlocks: INCBIN "maps/viridiancity.blk"
+ViridianCityBlocks: INCBIN "maps/viridiancity.blk"
 
 INCLUDE "data/mapHeaders/pewtercity.asm"
 INCLUDE "data/mapObjects/pewtercity.asm"
@@ -799,10 +799,8 @@ INCLUDE "engine/menu/prize_menu.asm"
 INCLUDE "engine/hidden_object_functions14.asm"
 
 SECTION "bank15",ROMX,BANK[$15]
-
-	dr $54000,$54086
-; INCLUDE "data/mapHeaders/route2.asm"
-; INCLUDE "data/mapObjects/route2.asm"
+INCLUDE "data/mapHeaders/route2.asm"
+INCLUDE "data/mapObjects/route2.asm"
 Route2Blocks: ; 54086
 INCBIN "maps/route2.blk"
 
@@ -828,7 +826,7 @@ INCBIN "maps/route9.blk"
 
 INCLUDE "engine/battle/experience.asm"
 
-	dr $554f7,$5550c
+INCLUDE "scripts/route2.asm"
 INCLUDE "scripts/route3.asm"
 INCLUDE "scripts/route4.asm"
 INCLUDE "scripts/route5.asm"
-- 
cgit v1.2.3