summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-31 21:58:46 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-31 21:58:46 -0400
commit6d80537563abb145d48c1f3cde003e50e482e1dd (patch)
tree5e75a462bd05d0a03e42815654ed925134812da3 /main.asm
parent7607ab4ff452ea7387e7faf931a9a35ff515c5b0 (diff)
Celadon Pokecenter
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm8
1 files changed, 6 insertions, 2 deletions
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"