Include Route 5

4 files changed, 15 insertions, 10 deletions

diff --git a/data/mapHeaders/route5.asm b/data/mapHeaders/route5.asm
index d35a8dab..1b8c3ee1 100755
--- a/data/mapHeaders/route5.asm
+++ b/data/mapHeaders/route5.asm
@@ -1,4 +1,4 @@
-Route5_h: ; 0x54581 to 0x545a3 (34 bytes) (id=16)
+Route5_h: ; 0x54589 to 0x545ab (34 bytes) (id=16)
 	db OVERWORLD ; tileset
 	db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x)
 	dw Route5Blocks, Route5TextPointers, Route5Script ; blocks, texts, scripts
diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm
index d11f8417..7ace428a 100755
--- a/data/mapObjects/route5.asm
+++ b/data/mapObjects/route5.asm
@@ -1,8 +1,8 @@
-Route5Object: ; 0x545a3 (size=47)
+Route5Object: ; 0x545ab (size=47)
 	db $a ; border block
 
 	db $5 ; warps
-	db $1d, $a, $3, ROUTE_5_GATE
+	db $1d, $a, $2, ROUTE_5_GATE
 	db $1d, $9, $2, ROUTE_5_GATE
 	db $21, $a, $0, ROUTE_5_GATE
 	db $1b, $11, $0, PATH_ENTRANCE_ROUTE_5
diff --git a/main.asm b/main.asm
index 9b4fc74b..3bbf792a 100755
--- a/main.asm
+++ b/main.asm
@@ -236,7 +236,7 @@ INCLUDE "data/mapHeaders/celadoncity.asm"
 INCLUDE "data/mapObjects/celadoncity.asm"
 CeladonCityBlocks: INCBIN "maps/celadoncity.blk"
 
-	dr $182a1,$18dee ; headers, objects, blocks
+	dr $182a1,$18836 ; headers, objects, blocks
 ; INCLUDE "data/mapHeaders/pallettown.asm"
 ; INCLUDE "data/mapObjects/pallettown.asm"
 ; PalletTownBlocks: INCBIN "maps/pallettown.blk"
@@ -251,7 +251,8 @@ CeladonCityBlocks: INCBIN "maps/celadoncity.blk"
 
 ; INCLUDE "data/mapHeaders/ceruleancity.asm"
 ; INCLUDE "data/mapObjects/ceruleancity.asm"
-; CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk"
+CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk" ; 18836
+	dr $1899e,$18dee ; headers, objects, blocks
 
 ; INCLUDE "data/mapHeaders/vermilioncity.asm"
 ; INCLUDE "data/mapObjects/vermilioncity.asm"
@@ -794,14 +795,18 @@ INCLUDE "engine/hidden_object_functions14.asm"
 
 SECTION "bank15",ROMX,BANK[$15]
 
-	dr $54000,$545da
+	dr $54000,$54589
+INCLUDE "data/mapHeaders/route5.asm"
+INCLUDE "data/mapObjects/route5.asm"
 Route5Blocks: ; 545da
 INCBIN "maps/route5.blk"
 	dr $5468e,$5525f
 
 INCLUDE "engine/battle/experience.asm"
 
-	dr $554f7,$56714
+	dr $554f7,$556c6
+INCLUDE "scripts/route5.asm"
+	dr $556d0,$56714
 
 INCLUDE "engine/menu/diploma_1.asm"
 
diff --git a/scripts/route5.asm b/scripts/route5.asm
index 1fad3939..1f42bc4e 100755
--- a/scripts/route5.asm
+++ b/scripts/route5.asm
@@ -1,9 +1,9 @@
-Route5Script: ; 556b2 (15:56b2)
+Route5Script: ; 556c6 (15:56c6)
 	jp EnableAutoTextBoxDrawing
 
-Route5TextPointers: ; 556b5 (15:56b5)
+Route5TextPointers: ; 556c9 (15:56c9)
 	dw Route5Text1
 
-Route5Text1: ; 556b7 (15:56b7)
+Route5Text1: ; 556cb (15:56cb)
 	TX_FAR _Route5Text1
 	db "@"