summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm19
1 files changed, 16 insertions, 3 deletions
diff --git a/main.asm b/main.asm
index 4503d4d7..a7e4908e 100755
--- a/main.asm
+++ b/main.asm
@@ -781,10 +781,21 @@ SECTION "bank14",ROMX,BANK[$14]
dr $50000,$5003d
Route22Blocks:
INCBIN "maps/route22.blk"
- dr $500f1,$506ed
+ dr $500f1,$50682
+
+INCLUDE "data/mapHeaders/route24.asm"
+INCLUDE "data/mapObjects/route24.asm"
Route24Blocks: ; 506ed (14:46ed)
INCBIN "maps/route24.blk"
- dr $507a1,$509aa
+
+; INCLUDE "data/mapHeaders/route25.asm"
+; INCLUDE "data/mapObjects/route25.asm"
+ dr $507a1,$50816
+Route25Blocks: ; 50816 (14:4816)
+INCBIN "maps/route25.blk"
+
+
+ dr $50924,$509aa
INCLUDE "data/mapHeaders/saffroncity.asm"
INCLUDE "data/mapObjects/saffroncity.asm"
@@ -792,7 +803,9 @@ SaffronCityBlocks: ; 50a98 (14:4a98)
INCBIN "maps/saffroncity.blk"
INCLUDE "scripts/saffroncity.asm"
- dr $50ca9,$517cc
+ dr $50ca9,$51366
+INCLUDE "scripts/route24.asm"
+ dr $515f3,$517cc
; victoryroad2
dr $517cc,$52060