summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-27 23:08:50 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-27 23:08:50 -0400
commit9835d77c286b51adbe9cd1606f7a6f06d0ebaf2d (patch)
treefffb118079c24d7686882d94a0a3d475d1fe2cf6 /main.asm
parentd04de35b9229a1891ceb03e13605f3438f5a7de0 (diff)
Blue's House
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm8
1 files changed, 7 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 8a5d2bae..60a25157 100755
--- a/main.asm
+++ b/main.asm
@@ -267,7 +267,13 @@ INCLUDE "scripts/ceruleancity.asm"
INCLUDE "scripts/vermilioncity.asm"
INCLUDE "scripts/celadoncity.asm"
INCLUDE "scripts/fuchsiacity.asm"
- dr $19c2f,$1a4ea
+
+INCLUDE "data/mapHeaders/blueshouse.asm"
+INCLUDE "scripts/blueshouse.asm"
+INCLUDE "data/mapObjects/blueshouse.asm"
+BluesHouseBlocks:
+INCBIN "maps/blueshouse.blk"
+ dr $19d05,$1a4ea
INCLUDE "engine/overworld/npc_movement.asm"
INCLUDE "engine/overworld/doors.asm"