From faaf1c434677274e5e607a6e369eb8d4ff58442c Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 18:25:34 -0400 Subject: Routes 11 and 12 gates --- main.asm | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'main.asm') 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" -- cgit v1.3.1-sl0p