summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-27 10:08:04 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-27 10:08:04 -0400
commit7a649c27baca781e4cc3e8e70bc41b66530dd5b5 (patch)
tree0024d4705ed18ab99f1877c2f79b313118050688 /main.asm
parent4878c118567df8a97e2a796c1c755f2311d955a7 (diff)
Route 22
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm11
1 files changed, 8 insertions, 3 deletions
diff --git a/main.asm b/main.asm
index cfcfa6c0..803dc68c 100755
--- a/main.asm
+++ b/main.asm
@@ -778,10 +778,13 @@ INCBIN "maps/colosseum.blk"
SECTION "bank14",ROMX,BANK[$14]
- dr $50000,$5003d
+INCLUDE "data/mapHeaders/route22.asm"
+INCLUDE "data/mapObjects/route22.asm"
Route22Blocks:
INCBIN "maps/route22.blk"
- dr $500f1,$50682
+ dr $500f1,$503b2
+Route23Blocks:
+INCBIN "maps/route23.blk"
INCLUDE "data/mapHeaders/route24.asm"
INCLUDE "data/mapObjects/route24.asm"
@@ -802,7 +805,9 @@ SaffronCityBlocks: ; 50a98 (14:4a98)
INCBIN "maps/saffroncity.blk"
INCLUDE "scripts/saffroncity.asm"
- dr $50ca9,$51366
+ dr $50ca9,$50eb2
+INCLUDE "scripts/route22.asm"
+ dr $51193,$51366
INCLUDE "scripts/route24.asm"
INCLUDE "scripts/route25.asm"