Changing order of city maps

This is purely to make the order in the fly menu make sense.
This commit is contained in:
MementoMartha 2023-04-19 10:31:09 +01:00
parent 8ce4472f7d
commit 74ae2431b2
8 changed files with 26 additions and 26 deletions

View file

@ -20,15 +20,15 @@ ENDM
mapconst VIRIDIAN_CITY, 18, 20 ; $01 mapconst VIRIDIAN_CITY, 18, 20 ; $01
mapconst PEWTER_CITY, 18, 20 ; $02 mapconst PEWTER_CITY, 18, 20 ; $02
mapconst CERULEAN_CITY, 18, 20 ; $03 mapconst CERULEAN_CITY, 18, 20 ; $03
mapconst LAVENDER_TOWN, 9, 10 ; $04 mapconst VERMILION_CITY, 18, 20 ; $04
mapconst VERMILION_CITY, 18, 20 ; $05 mapconst LAVENDER_TOWN, 9, 10 ; $05
mapconst CELADON_CITY, 18, 25 ; $06 mapconst CELADON_CITY, 18, 25 ; $06
mapconst FUCHSIA_CITY, 18, 20 ; $07 mapconst CELADON_UNIVERSITY_OUTSIDE, 20, 21 ; $07
mapconst CINNABAR_ISLAND, 15, 14 ; $08 mapconst FUCHSIA_CITY, 18, 20 ; $08
mapconst INDIGO_PLATEAU, 9, 10 ; $09
mapconst SAFFRON_CITY, 18, 20 ; $0A mapconst SAFFRON_CITY, 18, 20 ; $0A
mapconst CITRINE_CITY, 18, 20 ; $0B mapconst CINNABAR_ISLAND, 15, 14 ; $0A
mapconst CELADON_UNIVERSITY_OUTSIDE, 20, 21 ; $0C mapconst INDIGO_PLATEAU, 9, 10 ; $0B
mapconst CITRINE_CITY, 18, 20 ; $0C
DEF NUM_CITY_MAPS EQU const_value DEF NUM_CITY_MAPS EQU const_value
DEF FIRST_ROUTE_MAP EQU const_value DEF FIRST_ROUTE_MAP EQU const_value
mapconst ROUTE_1, 18, 10 ; $0D mapconst ROUTE_1, 18, 10 ; $0D

View file

@ -12,10 +12,10 @@ MapHSPointers:
dw NoHS dw NoHS
dw NoHS dw NoHS
dw NoHS dw NoHS
dw NoHS
dw SaffronCityHS dw SaffronCityHS
dw NoHS dw NoHS
dw NoHS dw NoHS
dw NoHS
dw Route1HS dw Route1HS
dw Route2HS dw Route2HS
dw NoHS dw NoHS

View file

@ -5,15 +5,15 @@ MapHeaderBanks::
db BANK(ViridianCity_h) db BANK(ViridianCity_h)
db BANK(PewterCity_h) db BANK(PewterCity_h)
db BANK(CeruleanCity_h) db BANK(CeruleanCity_h)
db BANK(LavenderTown_h)
db BANK(VermilionCity_h) db BANK(VermilionCity_h)
db BANK(LavenderTown_h)
db BANK(CeladonCity_h) db BANK(CeladonCity_h)
db BANK(CeladonUniversityOutside_h)
db BANK(FuchsiaCity_h) db BANK(FuchsiaCity_h)
db BANK(SaffronCity_h)
db BANK(CinnabarIsland_h) db BANK(CinnabarIsland_h)
db BANK(IndigoPlateau_h) db BANK(IndigoPlateau_h)
db BANK(SaffronCity_h)
db BANK(CitrineCity_h) db BANK(CitrineCity_h)
db BANK(CeladonUniversityOutside_h)
db BANK(Route1_h) db BANK(Route1_h)
db BANK(Route2_h) db BANK(Route2_h)
db BANK(Route3_h) db BANK(Route3_h)

View file

@ -5,15 +5,15 @@ MapHeaderPointers::
dw ViridianCity_h dw ViridianCity_h
dw PewterCity_h dw PewterCity_h
dw CeruleanCity_h dw CeruleanCity_h
dw LavenderTown_h
dw VermilionCity_h dw VermilionCity_h
dw LavenderTown_h
dw CeladonCity_h dw CeladonCity_h
dw CeladonUniversityOutside_h
dw FuchsiaCity_h dw FuchsiaCity_h
dw SaffronCity_h
dw CinnabarIsland_h dw CinnabarIsland_h
dw IndigoPlateau_h dw IndigoPlateau_h
dw SaffronCity_h
dw CitrineCity_h dw CitrineCity_h
dw CeladonUniversityOutside_h
dw Route1_h dw Route1_h
dw Route2_h dw Route2_h
dw Route3_h dw Route3_h

View file

@ -4,15 +4,15 @@ MapSongBanks::
db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY
db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY
db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_CITY db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_CITY
db MUSIC_LAVENDER, BANK(Music_Lavender) ; LAVENDER_TOWN
db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_CITY db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_CITY
db MUSIC_LAVENDER, BANK(Music_Lavender) ; LAVENDER_TOWN
db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_CITY db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_CITY
db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_UNIVERSITY_OUTSIDE
db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_CITY db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_CITY
db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_CITY
db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_ISLAND db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_ISLAND
db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU
db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_CITY
db MUSIC_CITIES1, BANK(Music_Cities1) ; CITRINE_CITY db MUSIC_CITIES1, BANK(Music_Cities1) ; CITRINE_CITY
db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_UNIVERSITY_OUTSIDE
db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_1 db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_1
db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_2 db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_2
db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_3 db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_3

View file

@ -4,15 +4,15 @@ MapSpriteSets:
db $01 ; VIRIDIAN_CITY db $01 ; VIRIDIAN_CITY
db $02 ; PEWTER_CITY db $02 ; PEWTER_CITY
db $02 ; CERULEAN_CITY db $02 ; CERULEAN_CITY
db $03 ; LAVENDER_TOWN
db $04 ; VERMILION_CITY db $04 ; VERMILION_CITY
db $03 ; LAVENDER_TOWN
db $05 ; CELADON_CITY db $05 ; CELADON_CITY
db $05 ; CELADON_UNIVERSITY_OUTSIDE
db $0a ; FUCHSIA_CITY db $0a ; FUCHSIA_CITY
db $07 ; SAFFRON_CITY
db $01 ; CINNABAR_ISLAND db $01 ; CINNABAR_ISLAND
db $06 ; INDIGO_PLATEAU db $06 ; INDIGO_PLATEAU
db $07 ; SAFFRON_CITY
db $01 ; CITRINE_CITY db $01 ; CITRINE_CITY
db $05 ; CELADON_UNIVERSITY_OUTSIDE
db $01 ; ROUTE_1 db $01 ; ROUTE_1
db $f1 ; ROUTE_2 db $f1 ; ROUTE_2
db $02 ; ROUTE_3 db $02 ; ROUTE_3

View file

@ -11,15 +11,15 @@ ExternalMapEntries:
external_map 2, 8, ViridianCityName external_map 2, 8, ViridianCityName
external_map 2, 3, PewterCityName external_map 2, 3, PewterCityName
external_map 10, 2, CeruleanCityName external_map 10, 2, CeruleanCityName
external_map 14, 5, LavenderTownName
external_map 10, 9, VermilionCityName external_map 10, 9, VermilionCityName
external_map 14, 5, LavenderTownName
external_map 7, 5, CeladonCityName external_map 7, 5, CeladonCityName
external_map 7, 4, CeladonUniversityName
external_map 8, 13, FuchsiaCityName external_map 8, 13, FuchsiaCityName
external_map 10, 5, SaffronCityName
external_map 2, 15, CinnabarIslandName external_map 2, 15, CinnabarIslandName
external_map 0, 2, IndigoPlateauName external_map 0, 2, IndigoPlateauName
external_map 10, 5, SaffronCityName
external_map 7, 9, CitrineCityName external_map 7, 9, CitrineCityName
external_map 7, 4, CeladonUniversityName
external_map 2, 10, Route1Name external_map 2, 10, Route1Name
external_map 2, 6, Route2Name external_map 2, 6, Route2Name
external_map 4, 3, Route3Name external_map 4, 3, Route3Name

View file

@ -4,15 +4,15 @@ WildDataPointers:
dw NothingWildMons ; VIRIDIAN_CITY dw NothingWildMons ; VIRIDIAN_CITY
dw NothingWildMons ; PEWTER_CITY dw NothingWildMons ; PEWTER_CITY
dw NothingWildMons ; CERULEAN_CITY dw NothingWildMons ; CERULEAN_CITY
dw NothingWildMons ; LAVENDER_TOWN
dw NothingWildMons ; VERMILION_CITY dw NothingWildMons ; VERMILION_CITY
dw NothingWildMons ; LAVENDER_TOWN
dw NothingWildMons ; CELADON_CITY dw NothingWildMons ; CELADON_CITY
dw NothingWildMons ; CELADON_UNIVERSITY_OUTSIDE
dw NothingWildMons ; FUCHSIA_CITY dw NothingWildMons ; FUCHSIA_CITY
dw NothingWildMons ; SAFFRON_CITY
dw NothingWildMons ; CINNABAR_ISLAND dw NothingWildMons ; CINNABAR_ISLAND
dw NothingWildMons ; INDIGO_PLATEAU dw NothingWildMons ; INDIGO_PLATEAU
dw NothingWildMons ; SAFFRON_CITY
dw CitrineWildMons ; CITRINE_CITY dw CitrineWildMons ; CITRINE_CITY
dw NothingWildMons ; CELADON_UNIVERSITY_OUTSIDE
dw Route1WildMons ; ROUTE_1 dw Route1WildMons ; ROUTE_1
dw Route2WildMons ; ROUTE_2 dw Route2WildMons ; ROUTE_2
dw Route3WildMons ; ROUTE_3 dw Route3WildMons ; ROUTE_3