summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-02 23:45:22 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-02 23:45:22 -0400
commit8455e51b86c1e5d33e3290e30b48bde663038226 (patch)
tree3bd6baad0f664ac4cf42fd8002230404fdc2e643 /main.asm
parent41716ea20c032b59194812627d5c797f4c00d315 (diff)
Seafoam Islands 1 and Route 22 Gate
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm12
1 files changed, 10 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index a7fc7642..7196732a 100755
--- a/main.asm
+++ b/main.asm
@@ -436,7 +436,11 @@ INCLUDE "data/mapObjects/diglettscaveroute11.asm"
INCLUDE "data/mapHeaders/route16house.asm"
INCLUDE "scripts/route16house.asm"
INCLUDE "data/mapObjects/route16house.asm"
- dr $1df81,$1e06e ; map scripts
+
+INCLUDE "data/mapHeaders/route22gate.asm"
+INCLUDE "scripts/route22gate.asm"
+INCLUDE "data/mapObjects/route22gate.asm"
+Route22GateBlocks: INCBIN "maps/route22gate.blk"
INCLUDE "data/mapHeaders/billshouse.asm"
INCLUDE "scripts/billshouse.asm"
@@ -856,7 +860,11 @@ INCLUDE "data/mapHeaders/rocktunnel1.asm"
INCLUDE "scripts/rocktunnel1.asm"
INCLUDE "data/mapObjects/rocktunnel1.asm"
RockTunnel1Blocks: INCBIN "maps/rocktunnel1.blk"
- dr $4487e,$449bf
+
+INCLUDE "data/mapHeaders/seafoamislands1.asm"
+INCLUDE "scripts/seafoamislands1.asm"
+INCLUDE "data/mapObjects/seafoamislands1.asm"
+SeafoamIslands1Blocks: INCBIN "maps/seafoamislands1.blk"
INCLUDE "data/mapHeaders/ssanne3.asm"
INCLUDE "scripts/ssanne3.asm"