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 | 13 |
3 files changed, 15 insertions, 6 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index abd68b70..5b968c1e 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -179,11 +179,11 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CopycatsHouse2F_h) db BANK(FightingDojo_h) db BANK(SaffronGym_h) - db $07 ; db BANK(SaffronHouse1_h) + db BANK(SaffronHouse1_h) db $17 ; db BANK(SaffronMart_h) db $17 ; db BANK(SilphCo1_h) db $17 ; db BANK(SaffronPokecenter_h) - db $07 ; db BANK(SaffronHouse2_h) + db BANK(SaffronHouse2_h) db $12 ; db BANK(Route15Gate_h) db $12 ; db BANK(Route15GateUpstairs_h) db $12 ; db BANK(Route16Gate_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 0b85ed42..8b4e634c 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -179,11 +179,11 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CopycatsHouse2F_h dw FightingDojo_h dw SaffronGym_h - dw $56db ; dw SaffronHouse1_h + dw SaffronHouse1_h dw $52f3 ; dw SaffronMart_h ;id=180 dw $5338 ; dw SilphCo1_h dw $541f ; dw SaffronPokecenter_h - dw $573a ; dw SaffronHouse2_h + dw SaffronHouse2_h dw $558d ; dw Route15Gate_h dw $55d5 ; dw Route15GateUpstairs_h dw $5649 ; dw Route16Gate_h @@ -302,7 +302,9 @@ PewterHouse2Blocks: CeruleanHouse1Blocks: VermilionHouse1Blocks: LavenderHouse1Blocks: -LavenderHouse2Blocks: INCBIN "maps/viridianhouse.blk" +LavenderHouse2Blocks: +SaffronHouse1Blocks: +SaffronHouse2Blocks: INCBIN "maps/viridianhouse.blk" SchoolBlocks: CeladonMansion5Blocks: INCBIN "maps/school.blk" CeruleanHouseTrashedBlocks: INCBIN "maps/ceruleanhousetrashed.blk" @@ -381,7 +383,14 @@ INCLUDE "data/mapHeaders/fuchsiamart.asm" INCLUDE "scripts/fuchsiamart.asm" INCLUDE "data/mapObjects/fuchsiamart.asm" FuchsiaMartBlocks: INCBIN "maps/fuchsiamart.blk" - dr $1d6db,$1d7ae ; map scripts + +INCLUDE "data/mapHeaders/saffronhouse1.asm" +INCLUDE "scripts/saffronhouse1.asm" +INCLUDE "data/mapObjects/saffronhouse1.asm" + +INCLUDE "data/mapHeaders/saffronhouse2.asm" +INCLUDE "scripts/saffronhouse2.asm" +INCLUDE "data/mapObjects/saffronhouse2.asm" INCLUDE "data/mapHeaders/diglettscaveroute2.asm" INCLUDE "scripts/diglettscaveroute2.asm" |