diff options
| -rw-r--r-- | data/map_header_banks.asm | 4 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 4 | ||||
| -rwxr-xr-x | main.asm | 12 |
3 files changed, 12 insertions, 8 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 1473990c..e2eefc08 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -172,8 +172,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Lab3_h) db BANK(Lab4_h) db BANK(CinnabarPokecenter_h) - db $1d ; db BANK(CinnabarMart_h) - db $1d ; db BANK(CinnabarMart_h) + db BANK(CinnabarMart_h) + db BANK(CinnabarMart_h) db $06 ; db BANK(IndigoPlateauLobby_h) db $1d ; db BANK(CopycatsHouse1F_h) db $17 ; db BANK(CopycatsHouse2F_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index ccc63377..dc1588c6 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -172,8 +172,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Lab3_h dw Lab4_h ;id=170 dw CinnabarPokecenter_h - dw $5701 ; dw CinnabarMart_h - dw $5701 ; dw CinnabarMart_h ; unused + dw CinnabarMart_h + dw CinnabarMart_h ; unused dw $5d45 ; dw IndigoPlateauLobby_h dw $5746 ; dw CopycatsHouse1F_h dw $4b5b ; dw CopycatsHouse2F_h @@ -318,8 +318,7 @@ INCLUDE "scripts/viridianmart.asm" INCLUDE "data/mapObjects/viridianmart.asm" ViridianMartBlocks: CeladonMartBlocks: -SaffronMartBlocks: -CinnabarMartBlocks: INCBIN "maps/viridianmart.blk" +SaffronMartBlocks: INCBIN "maps/viridianmart.blk" INCLUDE "data/mapHeaders/school.asm" INCLUDE "scripts/school.asm" @@ -1599,7 +1598,8 @@ SECTION "bank1D",ROMX,BANK[$1D] dr $74000,$74010 -PewterMartBlocks: INCBIN "maps/pewtermart.blk" +PewterMartBlocks: +CinnabarMartBlocks: INCBIN "maps/pewtermart.blk" FuchsiaHouse1Blocks: INCBIN "maps/fuchsiahouse1.blk" FuchsiaPokecenterBlocks: CinnabarPokecenterBlocks: INCBIN "maps/fuchsiapokecenter.blk" @@ -1696,7 +1696,11 @@ Lab4Blocks: INCBIN "maps/lab4.blk" INCLUDE "data/mapHeaders/cinnabarpokecenter.asm" INCLUDE "scripts/cinnabarpokecenter.asm" INCLUDE "data/mapObjects/cinnabarpokecenter.asm" - dr $75701,$757a0 + +INCLUDE "data/mapHeaders/cinnabarmart.asm" +INCLUDE "scripts/cinnabarmart.asm" +INCLUDE "data/mapObjects/cinnabarmart.asm" + dr $75746,$757a0 INCLUDE "data/mapHeaders/gary.asm" INCLUDE "scripts/gary.asm" |