summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-27 09:38:27 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-27 09:38:27 -0400
commit4878c118567df8a97e2a796c1c755f2311d955a7 (patch)
tree9ba526dc9150d6aad2f0fcf6cefb277963b870af /main.asm
parent40f0dba6c17116c61ce4935663bf1a79485edee9 (diff)
Route 25 scripts
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm9
1 files changed, 4 insertions, 5 deletions
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