diff options
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 5804cfd5..f83ba5f7 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -91,7 +91,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(BillsHouse_h) db BANK(VermilionPokecenter_h) db BANK(FanClub_h) - db $17 ; db BANK(VermilionMart_h) + db BANK(VermilionMart_h) db $17 ; db BANK(VermilionGym_h) db $07 ; db BANK(VermilionHouse1_h) db $07 ; db BANK(VermilionDock_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 6d52f36f..68908f5f 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -91,7 +91,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw BillsHouse_h dw VermilionPokecenter_h dw FanClub_h ;id=90 - dw $48cb ; dw VermilionMart_h + dw VermilionMart_h dw $4910 ; dw VermilionGym_h dw $53f8 ; dw VermilionHouse1_h dw $544e ; dw VermilionDock_h @@ -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" |