From 02fc3889b255aece1c02a673f7239a03e7a2396f Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 19:29:01 -0400 Subject: Route 15 --- main.asm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index df796ab0..a4d8ec02 100755 --- a/main.asm +++ b/main.asm @@ -854,7 +854,9 @@ INCBIN "maps/route5.blk" Route9Blocks: ; 54706 INCBIN "maps/route9.blk" - dr $54814,$54b28 + dr $54814,$54a1a +Route14Blocks: +INCBIN "maps/route14.blk" INCLUDE "data/mapHeaders/route17.asm" INCLUDE "data/mapObjects/route17.asm" @@ -900,7 +902,10 @@ INCBIN "maps/route8.blk" dr $582d4,$5855f Route11Blocks: ; 5854f INCBIN "maps/route11.blk" - dr $5866d,$589cc + dr $5866d,$5892c + +INCLUDE "data/mapHeaders/route15.asm" +INCLUDE "data/mapObjects/route15.asm" Route15Blocks: INCBIN "maps/route15.blk" @@ -922,7 +927,8 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/route6.asm" - dr $59052,$597cf + dr $59052,$5964a +INCLUDE "scripts/route15.asm" INCLUDE "scripts/route16.asm" INCLUDE "scripts/route18.asm" dr $59a00,$5a53a -- cgit v1.3.1-sl0p