From 6d80537563abb145d48c1f3cde003e50e482e1dd Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 31 May 2016 21:58:46 -0400 Subject: Celadon Pokecenter --- main.asm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index b82b8220..3ef6cb47 100755 --- a/main.asm +++ b/main.asm @@ -823,7 +823,6 @@ INCBIN "maps/lavendertown.blk" ViridianPokecenterBlocks: SaffronPokecenterBlocks: LavenderPokecenterBlocks: -CeladonPokecenterBlocks: FuchsiaPokecenterBlocks: CinnabarPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk" @@ -872,6 +871,7 @@ Route7Blocks: ; 48051 INCBIN "maps/route7.blk" MtMoonPokecenterBlocks: RockTunnelPokecenterBlocks: +CeladonPokecenterBlocks: INCBIN "maps/mtmoonpokecenter.blk" Route11GateBlocks: INCBIN "maps/route11gate.blk" @@ -933,7 +933,11 @@ INCLUDE "scripts/celadonmansion4.asm" INCLUDE "data/mapObjects/celadonmansion4.asm" CeladonMansion4Blocks: INCBIN "maps/celadonmansion4.blk" - dr $488af,$492a9 + +INCLUDE "data/mapHeaders/celadonpokecenter.asm" +INCLUDE "scripts/celadonpokecenter.asm" +INCLUDE "data/mapObjects/celadonpokecenter.asm" + dr $48915,$492a9 INCLUDE "data/mapHeaders/mtmoonpokecenter.asm" INCLUDE "scripts/mtmoonpokecenter.asm" -- cgit v1.3.1-sl0p