summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-28 20:17:56 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-28 20:17:56 -0400
commit2ce8f80044038d906ca4c0e09587de1a2f0d4c8f (patch)
tree5a51b4c596734200e196c30eec3170f7897b55aa /main.asm
parentba224a0430f829aa3bc7648f3bc7412fd3a0cea1 (diff)
Viridian house
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 fa68ed90..c2146a37 100755
--- a/main.asm
+++ b/main.asm
@@ -292,7 +292,8 @@ INCBIN "maps/route1.blk"
dr $1c1b0,$1c1c0 ; headers, objects, blocks
OaksLabBlocks:
INCBIN "maps/oakslab.blk"
- dr $1c1de,$1c1ee ; headers, objects, blocks
+ViridianHouseBlocks:
+INCBIN "maps/viridianhouse.blk"
SchoolBlocks:
INCBIN "maps/school.blk"
dr $1c1fe,$1c21e ; headers, objects, blocks
@@ -325,7 +326,10 @@ INCLUDE "data/mapHeaders/school.asm"
INCLUDE "scripts/school.asm"
INCLUDE "data/mapObjects/school.asm"
- dr $1cdc6,$1e2ae ; map scripts
+INCLUDE "data/mapHeaders/viridianhouse.asm"
+INCLUDE "scripts/viridianhouse.asm"
+INCLUDE "data/mapObjects/viridianhouse.asm"
+ dr $1ce30,$1e2ae ; map scripts
INCLUDE "engine/menu/oaks_pc.asm"