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 | 11 |
3 files changed, 9 insertions, 6 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 70558042..cbc4395c 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -67,7 +67,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeruleanPokecenter_h) db BANK(CeruleanGym_h) db BANK(BikeShop_h) - db $17 ; db BANK(CeruleanMart_h) + db BANK(CeruleanMart_h) db $12 ; db BANK(MtMoonPokecenter_h) db BANK(CeruleanHouseTrashed_h) db $07 ; db BANK(Route5Gate_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 362f9fa2..5131cf67 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -67,7 +67,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeruleanPokecenter_h dw CeruleanGym_h dw BikeShop_h - dw $4757 ; dw CeruleanMart_h + dw CeruleanMart_h dw $52a9 ; dw MtMoonPokecenter_h dw CeruleanHouseTrashed_h ; copy dw $5831 ; dw Route5Gate_h @@ -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" |