summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-31 21:47:52 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-31 21:47:52 -0400
commit7607ab4ff452ea7387e7faf931a9a35ff515c5b0 (patch)
tree599a7e3ab4438106fa524b15ea1f715d899c485d /main.asm
parent6ddc1b23e39fbebfe7548df8aa269affa08e6255 (diff)
Celadon Manion Eevee room
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm7
1 files changed, 6 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index fc0ddd8b..b82b8220 100755
--- a/main.asm
+++ b/main.asm
@@ -302,6 +302,7 @@ CeruleanHouse1Blocks:
VermilionHouse1Blocks:
INCBIN "maps/viridianhouse.blk"
SchoolBlocks:
+CeladonMansion5Blocks:
INCBIN "maps/school.blk"
CeruleanHouseTrashedBlocks:
INCBIN "maps/ceruleanhousetrashed.blk"
@@ -370,7 +371,11 @@ INCLUDE "scripts/vermiliondock.asm"
INCLUDE "data/mapObjects/vermiliondock.asm"
VermilionDockBlocks:
INCBIN "maps/vermiliondock.blk"
- dr $1d636,$1d7ae ; map scripts
+
+INCLUDE "data/mapHeaders/celadonmansion5.asm"
+INCLUDE "scripts/celadonmansion5.asm"
+INCLUDE "data/mapObjects/celadonmansion5.asm"
+ dr $1d685,$1d7ae ; map scripts
INCLUDE "data/mapHeaders/diglettscaveroute2.asm"
INCLUDE "scripts/diglettscaveroute2.asm"