diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 12:50:18 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 12:50:18 -0400 |
| commit | fe21110e6f2f56927f8393c54a985021305ec7a0 (patch) | |
| tree | cdd68972c820f3d7fd310a4bec58060e1fb780a2 /main.asm | |
| parent | e4154a0075f828deb590e836fa7a520ef1db6768 (diff) | |
Vermilion House 1
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -299,6 +299,7 @@ Route2HouseBlocks: PewterHouse1Blocks: PewterHouse2Blocks: CeruleanHouse1Blocks: +VermilionHouse1Blocks: INCBIN "maps/viridianhouse.blk" SchoolBlocks: INCBIN "maps/school.blk" @@ -358,7 +359,12 @@ INCLUDE "scripts/bikeshop.asm" INCLUDE "data/mapObjects/bikeshop.asm" BikeShopBlocks: INCBIN "maps/bikeshop.blk" - dr $1d1a4,$1d7ae ; map scripts + dr $1d1a4,$1d3f8 ; map scripts + +INCLUDE "data/mapHeaders/vermilionhouse1.asm" +INCLUDE "scripts/vermilionhouse1.asm" +INCLUDE "data/mapObjects/vermilionhouse1.asm" + dr $1d44e,$1d7ae ; map scripts INCLUDE "data/mapHeaders/diglettscaveroute2.asm" INCLUDE "scripts/diglettscaveroute2.asm" |