summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-27 19:43:06 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-27 19:43:06 -0400
commit8de636993d6d26f2b8a9557a55ce1a96fc29e01b (patch)
treeed7f11eda2fcd6cfdac2db68ca9c26e339c2280d /main.asm
parent807323ed1cc2231d3df93edfaab22dde5de191ea (diff)
Route 11
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm10
1 files changed, 7 insertions, 3 deletions
diff --git a/main.asm b/main.asm
index 29151bc4..5ababcd8 100755
--- a/main.asm
+++ b/main.asm
@@ -912,8 +912,11 @@ INCBIN "maps/route6.blk"
Route8Blocks: ; 581c6
INCBIN "maps/route8.blk"
- dr $582d4,$5855f
-Route11Blocks: ; 5854f
+ dr $582d4,$584be
+
+INCLUDE "data/mapHeaders/route11.asm"
+INCLUDE "data/mapObjects/route11.asm"
+Route11Blocks: ; 5855f
INCBIN "maps/route11.blk"
INCLUDE "data/mapHeaders/route12.asm"
@@ -944,7 +947,8 @@ INCLUDE "engine/status_ailments.asm"
INCLUDE "engine/overworld/oaks_aide.asm"
INCLUDE "scripts/route6.asm"
- dr $59052,$5948f
+ dr $59052,$592e8
+INCLUDE "scripts/route11.asm"
INCLUDE "scripts/route12.asm"
INCLUDE "scripts/route15.asm"
INCLUDE "scripts/route16.asm"