summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-31 20:01:36 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-31 20:01:36 -0400
commit1ecccfcf22b004c28dbc7bfc54ccfcd21dfbbf9d (patch)
tree6ed5ac14e14cd2eb4199424a94fa5e0fd85928e4 /main.asm
parent676cfc329e40d6c9233933bae82f86cc09f5b1c2 (diff)
Celadon Mart Roof and Elevator
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm26
1 files changed, 25 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 5b84e777..e59996c5 100755
--- a/main.asm
+++ b/main.asm
@@ -880,7 +880,31 @@ INCLUDE "scripts/redshouse1f.asm"
INCLUDE "data/mapObjects/redshouse1f.asm"
RedsHouse1FBlocks:
INCBIN "maps/redshouse1f.blk"
- dr $48157,$492a9
+
+INCLUDE "data/mapHeaders/celadonmart3.asm"
+INCLUDE "scripts/celadonmart3.asm"
+INCLUDE "data/mapObjects/celadonmart3.asm"
+CeladonMart3Blocks:
+INCBIN "maps/celadonmart3.blk"
+
+INCLUDE "data/mapHeaders/celadonmart4.asm"
+INCLUDE "scripts/celadonmart4.asm"
+INCLUDE "data/mapObjects/celadonmart4.asm"
+CeladonMart4Blocks:
+INCBIN "maps/celadonmart4.blk"
+
+INCLUDE "data/mapHeaders/celadonmartroof.asm"
+INCLUDE "scripts/celadonmartroof.asm"
+INCLUDE "data/mapObjects/celadonmartroof.asm"
+CeladonMartRoofBlocks:
+INCBIN "maps/celadonmartroof.blk"
+
+INCLUDE "data/mapHeaders/celadonmartelevator.asm"
+INCLUDE "scripts/celadonmartelevator.asm"
+INCLUDE "data/mapObjects/celadonmartelevator.asm"
+CeladonMartElevatorBlocks:
+INCBIN "maps/celadonmartelevator.blk"
+ dr $48593,$492a9
INCLUDE "data/mapHeaders/mtmoonpokecenter.asm"
INCLUDE "scripts/mtmoonpokecenter.asm"