diff options
author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 10:09:42 -0400 |
---|---|---|
committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 10:09:42 -0400 |
commit | b9df6fe86f1afa711727badee61a5bfa71030c35 (patch) | |
tree | 664d8e896c1d43974167711364aa30c1ed2597dc /main.asm | |
parent | ae723a065537be412cd152e81c72e53ebe3aaac3 (diff) |
Cerulean Mart
Diffstat (limited to 'main.asm')
-rwxr-xr-x | main.asm | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -320,7 +320,6 @@ INCLUDE "data/mapHeaders/viridianmart.asm" INCLUDE "scripts/viridianmart.asm" INCLUDE "data/mapObjects/viridianmart.asm" ViridianMartBlocks: -CeruleanMartBlocks: VermilionMartBlocks: LavenderMartBlocks: CeladonMartBlocks: @@ -1114,8 +1113,8 @@ INCLUDE "engine/overworld/saffron_guards.asm" SECTION "bank17",ROMX,BANK[$17] - - dr $5c000,$5c010 +CeruleanMartBlocks: +INCBIN "maps/ceruleanmart.blk" RedsHouse2FBlocks: INCBIN "maps/redshouse2f.blk" Museum1FBlocks: @@ -1172,7 +1171,11 @@ INCLUDE "data/mapObjects/ceruleangym.asm" CeruleanGymBlocks: INCBIN "maps/ceruleangym.blk" - dr $5c757,$5d485 +INCLUDE "data/mapHeaders/ceruleanmart.asm" +INCLUDE "scripts/ceruleanmart.asm" +INCLUDE "data/mapObjects/ceruleanmart.asm" + + dr $5c79c,$5d485 INCLUDE "data/mapHeaders/viridianforestexit.asm" INCLUDE "scripts/viridianforestexit.asm" |