summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-01 22:00:46 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-01 22:00:46 -0400
commita2befe3463baee7a9e935b5d0caef3744f7371f3 (patch)
tree02b443f945b06393dfae94d20644e461c638dd74 /main.asm
parent14ef52bdd8202d9d595811a0ac8b6f1dbd2b8a6f (diff)
Remaining maps in Fuchsia
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm22
1 files changed, 21 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 4ccc007e..bcc972eb 100755
--- a/main.asm
+++ b/main.asm
@@ -1619,7 +1619,27 @@ INCLUDE "data/mapObjects/fuchsiahouse1.asm"
INCLUDE "data/mapHeaders/fuchsiapokecenter.asm"
INCLUDE "scripts/fuchsiapokecenter.asm"
INCLUDE "data/mapObjects/fuchsiapokecenter.asm"
- dr $74902,$757a0
+
+INCLUDE "data/mapHeaders/fuchsiahouse2.asm"
+INCLUDE "scripts/fuchsiahouse2.asm"
+INCLUDE "data/mapObjects/fuchsiahouse2.asm"
+FuchsiaHouse2Blocks: INCBIN "maps/fuchsiahouse2.blk"
+
+INCLUDE "data/mapHeaders/safarizoneentrance.asm"
+INCLUDE "data/mapObjects/safarizoneentrance.asm"
+SafariZoneEntranceBlocks: INCBIN "maps/safarizoneentrance.blk"
+INCLUDE "scripts/safarizoneentrance.asm"
+
+INCLUDE "data/mapHeaders/fuchsiagym.asm"
+INCLUDE "scripts/fuchsiagym.asm"
+INCLUDE "data/mapObjects/fuchsiagym.asm"
+FuchsiaGymBlocks: INCBIN "maps/fuchsiagym.blk"
+
+INCLUDE "data/mapHeaders/fuchsiameetingroom.asm"
+INCLUDE "scripts/fuchsiameetingroom.asm"
+INCLUDE "data/mapObjects/fuchsiameetingroom.asm"
+FuchsiaMeetingRoomBlocks: INCBIN "maps/fuchsiameetingroom.blk"
+ dr $74ee6,$757a0
INCLUDE "data/mapHeaders/gary.asm"
INCLUDE "scripts/gary.asm"