From 4878c118567df8a97e2a796c1c755f2311d955a7 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 09:38:27 -0400 Subject: Route 25 scripts --- main.asm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index a7e4908e..cfcfa6c0 100755 --- a/main.asm +++ b/main.asm @@ -788,13 +788,12 @@ INCLUDE "data/mapObjects/route24.asm" Route24Blocks: ; 506ed (14:46ed) INCBIN "maps/route24.blk" -; INCLUDE "data/mapHeaders/route25.asm" -; INCLUDE "data/mapObjects/route25.asm" - dr $507a1,$50816 +INCLUDE "data/mapHeaders/route25.asm" +INCLUDE "data/mapObjects/route25.asm" Route25Blocks: ; 50816 (14:4816) INCBIN "maps/route25.blk" - +; victoryroad2 dr $50924,$509aa INCLUDE "data/mapHeaders/saffroncity.asm" @@ -805,7 +804,7 @@ INCLUDE "scripts/saffroncity.asm" dr $50ca9,$51366 INCLUDE "scripts/route24.asm" - dr $515f3,$517cc +INCLUDE "scripts/route25.asm" ; victoryroad2 dr $517cc,$52060 -- cgit v1.3.1-sl0p