summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-30 18:25:34 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-30 18:25:34 -0400
commitfaaf1c434677274e5e607a6e369eb8d4ff58442c (patch)
tree64a27dec53ed653708010ffb99772c1a1bcbcaaf /main.asm
parentd00b70b33ee909ad163f2cb1c639ce799db118d0 (diff)
Routes 11 and 12 gates
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm25
1 files changed, 23 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index a7b573cb..029f7d62 100755
--- a/main.asm
+++ b/main.asm
@@ -839,7 +839,11 @@ INCBIN "maps/route7.blk"
MtMoonPokecenterBlocks:
RockTunnelPokecenterBlocks:
INCBIN "maps/mtmoonpokecenter.blk"
- dr $480c7,$480eb
+Route11GateBlocks:
+INCBIN "maps/route11gate.blk"
+Route11GateUpstairsBlocks:
+Route12GateUpstairsBlocks:
+INCBIN "maps/route11gateupstairs.blk"
INCLUDE "scripts/route7.asm"
INCLUDE "data/mapHeaders/redshouse1f.asm"
@@ -857,7 +861,24 @@ INCLUDE "data/mapHeaders/rocktunnelpokecenter.asm"
INCLUDE "scripts/rocktunnelpokecenter.asm"
INCLUDE "data/mapObjects/rocktunnelpokecenter.asm"
- dr $49396,$49953
+INCLUDE "data/mapHeaders/route11gate.asm"
+INCLUDE "scripts/route11gate.asm"
+INCLUDE "data/mapObjects/route11gate.asm"
+
+INCLUDE "data/mapHeaders/route11gateupstairs.asm"
+INCLUDE "scripts/route11gateupstairs.asm"
+INCLUDE "data/mapObjects/route11gateupstairs.asm"
+
+INCLUDE "data/mapHeaders/route12gate.asm"
+INCLUDE "scripts/route12gate.asm"
+INCLUDE "data/mapObjects/route12gate.asm"
+Route12GateBlocks:
+INCBIN "maps/route12gate.blk"
+
+INCLUDE "data/mapHeaders/route12gateupstairs.asm"
+INCLUDE "scripts/route12gateupstairs.asm"
+INCLUDE "data/mapObjects/route12gateupstairs.asm"
+ dr $4958d,$49953
INCLUDE "data/mapHeaders/mtmoon1.asm"
INCLUDE "scripts/mtmoon1.asm"