From b580c4c90f243df34042803260161459a1bf4e6e Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 19:36:09 -0400
Subject: Route 12

---
 data/map_header_banks.asm    |  2 +-
 data/map_header_pointers.asm |  2 +-
 main.asm                     | 13 ++++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index fa275804..b4e65ab5 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -24,7 +24,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db $16 ; db BANK(Route10_h) ; ROUTE_10
 	db $16 ; db BANK(Route11_h) ; ROUTE_11
 	db $16 ; db BANK(Route12_h) ; ROUTE_12
-	db $15 ; db BANK(Route13_h) ; ROUTE_13
+	db BANK(Route13_h) ; ROUTE_13
 	db BANK(Route14_h) ; ROUTE_14
 	db BANK(Route15_h) ; ROUTE_15
 	db BANK(Route16_h) ; ROUTE_16
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 0d36b121..be5c8127 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -24,7 +24,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw $42d4 ; dw Route10_h
 	dw $44be ; dw Route11_h
 	dw $466d ; dw Route12_h
-	dw $4814 ; dw Route13_h
+	dw Route13_h
 	dw Route14_h
 	dw Route15_h
 	dw Route16_h
diff --git a/main.asm b/main.asm
index 37a4dd21..f227a168 100755
--- a/main.asm
+++ b/main.asm
@@ -854,7 +854,8 @@ INCBIN "maps/route5.blk"
 Route9Blocks: ; 54706
 INCBIN "maps/route9.blk"
 
-	dr $54814,$54893
+INCLUDE "data/mapHeaders/route13.asm"
+INCLUDE "data/mapObjects/route13.asm"
 Route13Blocks:
 INCBIN "maps/route13.blk"
 
@@ -884,7 +885,8 @@ INCLUDE "scripts/route2.asm"
 INCLUDE "scripts/route3.asm"
 INCLUDE "scripts/route4.asm"
 INCLUDE "scripts/route5.asm"
-	dr $556d0,$559e7
+	dr $556d0,$55832
+INCLUDE "scripts/route13.asm"
 INCLUDE "scripts/route14.asm"
 INCLUDE "scripts/route17.asm"
 INCLUDE "scripts/route19.asm"
@@ -902,13 +904,18 @@ INCLUDE "data/mapHeaders/route6.asm"
 INCLUDE "data/mapObjects/route6.asm"
 Route6Blocks: ; 58079
 INCBIN "maps/route6.blk"
+
 	dr $5812d,$581c6
 Route8Blocks: ; 581c6
 INCBIN "maps/route8.blk"
+
 	dr $582d4,$5855f
 Route11Blocks: ; 5854f
 INCBIN "maps/route11.blk"
-	dr $5866d,$5892c
+
+	dr $5866d,$58710
+Route12Blocks:
+INCBIN "maps/route12.blk"
 
 INCLUDE "data/mapHeaders/route15.asm"
 INCLUDE "data/mapObjects/route15.asm"
-- 
cgit v1.3.1-sl0p