summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-27 19:15:16 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-27 19:15:16 -0400
commit78c0b78c55efb97739b060801aea89bf1ac3adc0 (patch)
treebe0b5c9969344ace993058b51f5a7768282dbc8c /main.asm
parentf0125912eaf67644a7c32c18a0ba6940469ee1bb (diff)
Route 17... that was easy
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm8
1 files changed, 6 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index 2a6fac02..0779c8cd 100755
--- a/main.asm
+++ b/main.asm
@@ -854,7 +854,10 @@ INCBIN "maps/route5.blk"
Route9Blocks: ; 54706
INCBIN "maps/route9.blk"
- dr $54814,$54bb0
+ dr $54814,$54b28
+
+INCLUDE "data/mapHeaders/route17.asm"
+INCLUDE "data/mapObjects/route17.asm"
Route17Blocks:
INCBIN "maps/route17.blk"
@@ -874,7 +877,8 @@ INCLUDE "scripts/route2.asm"
INCLUDE "scripts/route3.asm"
INCLUDE "scripts/route4.asm"
INCLUDE "scripts/route5.asm"
- dr $556d0,$55d58
+ dr $556d0,$55b8e
+INCLUDE "scripts/route17.asm"
INCLUDE "scripts/route19.asm"
INCLUDE "scripts/route21.asm"
dr $56054,$56714