From f0125912eaf67644a7c32c18a0ba6940469ee1bb Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 19:11:47 -0400 Subject: Route 18 scripts --- main.asm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index d5da1a30..2a6fac02 100755 --- a/main.asm +++ b/main.asm @@ -853,7 +853,11 @@ INCBIN "maps/route5.blk" dr $5468e,$54706 Route9Blocks: ; 54706 INCBIN "maps/route9.blk" - dr $54814,$54e80 + + dr $54814,$54bb0 +Route17Blocks: +INCBIN "maps/route17.blk" + INCLUDE "data/mapHeaders/route19.asm" INCLUDE "data/mapObjects/route19.asm" Route19Blocks: @@ -898,7 +902,9 @@ INCBIN "maps/route15.blk" dr $58ada,$58b84 Route16Blocks: ; 58b84 INCBIN "maps/route16.blk" - dr $58c38,$58c9c + +INCLUDE "data/mapHeaders/route18.asm" +INCLUDE "data/mapObjects/route18.asm" Route18Blocks: INCBIN "maps/route18.blk" dr $58d7d,$58d99 @@ -910,7 +916,9 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/route6.asm" - dr $59052,$5a53a + dr $59052,$59963 +INCLUDE "scripts/route18.asm" + dr $59a00,$5a53a INCLUDE "engine/overworld/saffron_guards.asm" -- cgit v1.3.1-sl0p