diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 12:10:49 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 12:10:49 -0400 |
| commit | 4353422326e112b1a2ae8234f5b6871720bca4ea (patch) | |
| tree | e64e006d013f845f54e5cd30bf1dcfd5a6e29aed /main.asm | |
| parent | Vermilion Fan Club (diff) | |
| download | pokeyellow-4353422326e112b1a2ae8234f5b6871720bca4ea.tar.gz pokeyellow-4353422326e112b1a2ae8234f5b6871720bca4ea.tar.xz pokeyellow-4353422326e112b1a2ae8234f5b6871720bca4ea.zip | |
Vermilion Mart
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -322,7 +322,6 @@ INCLUDE "data/mapHeaders/viridianmart.asm" INCLUDE "scripts/viridianmart.asm" INCLUDE "data/mapObjects/viridianmart.asm" ViridianMartBlocks: -VermilionMartBlocks: LavenderMartBlocks: CeladonMartBlocks: SaffronMartBlocks: @@ -1213,6 +1212,7 @@ INCLUDE "engine/overworld/saffron_guards.asm" SECTION "bank17",ROMX,BANK[$17] CeruleanMartBlocks: +VermilionMartBlocks: INCBIN "maps/ceruleanmart.blk" RedsHouse2FBlocks: INCBIN "maps/redshouse2f.blk" @@ -1283,7 +1283,11 @@ INCLUDE "data/mapObjects/ceruleanmart.asm" INCLUDE "data/mapHeaders/vermilionpokecenter.asm" INCLUDE "scripts/vermilionpokecenter.asm" INCLUDE "data/mapObjects/vermilionpokecenter.asm" - dr $5c8cb,$5d485 + +INCLUDE "data/mapHeaders/vermilionmart.asm" +INCLUDE "scripts/vermilionmart.asm" +INCLUDE "data/mapObjects/vermilionmart.asm" + dr $5c910,$5d485 INCLUDE "data/mapHeaders/viridianforestexit.asm" INCLUDE "scripts/viridianforestexit.asm" |