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 | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index e181c2a3..a8e9e179 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -9,7 +9,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeladonCity_h) ; CELADON_CITY db $06 ; db BANK(FuchsiaCity_h) ; FUCHSIA_CITY db $07 ; db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND - db $14 ; db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU + db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU db BANK(SaffronCity_h) ; SAFFRON_CITY db $01 ; unused db BANK(Route1_h) ; ROUTE_1 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 9909b09f..0658d880 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -9,7 +9,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeladonCity_h dw $4bb3 ; dw FuchsiaCity_h dw $4000 ; dw CinnabarIsland_h - dw $4924 ; dw IndigoPlateau_h + dw IndigoPlateau_h dw SaffronCity_h dw SaffronCity_h dw Route1_h @@ -800,7 +800,9 @@ Route25Blocks: ; 50816 (14:4816) INCBIN "maps/route25.blk" ; indigoplateau - dr $50924,$50950 +INCLUDE "data/mapHeaders/indigoplateau.asm" +INCLUDE "scripts/indigoplateau.asm" +INCLUDE "data/mapObjects/indigoplateau.asm" IndigoPlateauBlocks: ; 50950 (14:4950) INCBIN "maps/indigoplateau.blk" @@ -809,7 +811,6 @@ INCLUDE "data/mapObjects/saffroncity.asm" SaffronCityBlocks: ; 50a98 (14:4a98) INCBIN "maps/saffroncity.blk" INCLUDE "scripts/saffroncity.asm" - dr $50ca9,$50eb2 INCLUDE "scripts/route22.asm" INCLUDE "scripts/route23.asm" |