summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-27 19:46:10 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-27 19:46:10 -0400
commit117c154f56d932ef5fefdce7ed50ad081c5a4f6a (patch)
tree93712e54c3e8f742bf53ddfd739179f187161568 /main.asm
parent8de636993d6d26f2b8a9557a55ce1a96fc29e01b (diff)
Lavender Town; all city overworld maps done
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm12
1 files changed, 9 insertions, 3 deletions
diff --git a/main.asm b/main.asm
index 5ababcd8..cfd855ca 100755
--- a/main.asm
+++ b/main.asm
@@ -679,10 +679,14 @@ INCLUDE "engine/menu/options.asm"
SECTION "bank11",ROMX,BANK[$11]
- dr $44000,$44085
+INCLUDE "data/mapHeaders/lavendertown.asm"
+INCLUDE "data/mapObjects/lavendertown.asm"
LavenderTownBlocks:
INCBIN "maps/lavendertown.blk"
- dr $440df,$44169
+ dr $440df,$4410b
+
+INCLUDE "scripts/lavendertown.asm"
+ ; dr $440df,$44169
INCLUDE "engine/pokedex_rating.asm"
@@ -912,7 +916,9 @@ INCBIN "maps/route6.blk"
Route8Blocks: ; 581c6
INCBIN "maps/route8.blk"
- dr $582d4,$584be
+ dr $582d4,$58356
+Route10Blocks:
+INCBIN "maps/route10.blk"
INCLUDE "data/mapHeaders/route11.asm"
INCLUDE "data/mapObjects/route11.asm"