summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-30 11:38:46 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-30 11:38:46 -0400
commit6e3581df4b9cbc8cf14fc7948df5df70002cc062 (patch)
tree8304b3a8a196cbc4ed999e0bca065162f09d65ff /main.asm
parentb9df6fe86f1afa711727badee61a5bfa71030c35 (diff)
Mt Moon Pokemon Center
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm13
1 files changed, 10 insertions, 3 deletions
diff --git a/main.asm b/main.asm
index f4f08f0c..58846267 100755
--- a/main.asm
+++ b/main.asm
@@ -765,7 +765,6 @@ LavenderPokecenterBlocks:
CeladonPokecenterBlocks:
FuchsiaPokecenterBlocks:
CinnabarPokecenterBlocks:
-MtMoonPokecenterBlocks:
RockTunnelPokecenterBlocks:
INCBIN "maps/viridianpokecenter.blk"
dr $440fb,$4410b
@@ -790,7 +789,9 @@ INCLUDE "data/mapHeaders/route7.asm"
INCLUDE "data/mapObjects/route7.asm"
Route7Blocks: ; 48051
INCBIN "maps/route7.blk"
- dr $480ab,$480eb
+MtMoonPokecenterBlocks:
+INCBIN "maps/mtmoonpokecenter.blk"
+ dr $480c7,$480eb
INCLUDE "scripts/route7.asm"
INCLUDE "data/mapHeaders/redshouse1f.asm"
@@ -798,7 +799,13 @@ INCLUDE "scripts/redshouse1f.asm"
INCLUDE "data/mapObjects/redshouse1f.asm"
RedsHouse1FBlocks:
INCBIN "maps/redshouse1f.blk"
- dr $48157,$49953
+ dr $48157,$492a9
+
+INCLUDE "data/mapHeaders/mtmoonpokecenter.asm"
+INCLUDE "scripts/mtmoonpokecenter.asm"
+INCLUDE "data/mapObjects/mtmoonpokecenter.asm"
+
+ dr $49330,$49953
INCLUDE "data/mapHeaders/mtmoon1.asm"
INCLUDE "scripts/mtmoon1.asm"