summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--constants/map_constants.asm6
-rw-r--r--maps.asm6
-rw-r--r--maps/BetaCinnabarPokemonLabHallway.blk (renamed from maps/BetaCinnabarIslandPokemonLabHallway.blk)0
-rw-r--r--maps/BetaCinnabarPokemonLabRoom1.blk (renamed from maps/BetaCinnabarIslandPokemonLabRoom1.blk)0
-rw-r--r--maps/BetaCinnabarPokemonLabRoom2.blk (renamed from maps/BetaCinnabarIslandPokemonLabRoom2.blk)0
-rw-r--r--maps/BetaCinnabarPokemonLabRoom3.blk (renamed from maps/BetaCinnabarIslandPokemonLabRoom3.blk)0
-rw-r--r--maps/BetaEcruteakCity.blk (renamed from maps/BetaTeakCity.blk)0
-rw-r--r--maps/BetaFastShipInsideCutOut.blk (renamed from maps/BetaSSAquaInsideCutOut.blk)0
-rw-r--r--maps/CianwoodCity.asm2
-rw-r--r--maps/CianwoodPhotoStudio.asm (renamed from maps/CianwoodCityPhotoStudio.asm)6
-rw-r--r--maps/LavenderSpeechHouse.asm (renamed from maps/LavenderTownSpeechHouse.asm)20
-rw-r--r--maps/LavenderTown.asm2
-rw-r--r--maps/Route5.asm4
-rw-r--r--maps/Route5SaffronGate.asm (renamed from maps/Route5SaffronCityGate.asm)14
-rw-r--r--maps/SaffronCity.asm2
-rw-r--r--maps/blockdata.asm30
-rw-r--r--maps/map_headers.asm6
-rw-r--r--maps/second_map_headers.asm6
18 files changed, 52 insertions, 52 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index e7580dfb9..1af46ee36 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -351,7 +351,7 @@ ENDM
mapgroup LAVENDER_POKECENTER_1F, 4, 5 ; 5
mapgroup LAVENDER_POKECENTER_2F_BETA, 4, 8 ; 6
mapgroup MR_FUJIS_HOUSE, 4, 5 ; 7
- mapgroup LAVENDER_TOWN_SPEECH_HOUSE, 4, 4 ; 8
+ mapgroup LAVENDER_SPEECH_HOUSE, 4, 4 ; 8
mapgroup LAVENDER_NAME_RATER, 4, 4 ; 9
mapgroup LAVENDER_MART, 4, 6 ; 10
mapgroup SOUL_HOUSE, 4, 5 ; 11
@@ -413,7 +413,7 @@ ENDM
mapgroup CIANWOOD_GYM, 9, 5 ; 5
mapgroup CIANWOOD_POKECENTER_1F, 4, 5 ; 6
mapgroup CIANWOOD_PHARMACY, 4, 4 ; 7
- mapgroup CIANWOOD_CITY_PHOTO_STUDIO, 4, 4 ; 8
+ mapgroup CIANWOOD_PHOTO_STUDIO, 4, 4 ; 8
mapgroup CIANWOOD_LUGIA_SPEECH_HOUSE, 4, 4 ; 9
mapgroup POKE_SEERS_HOUSE, 4, 4 ; 10
mapgroup BATTLE_TOWER_1F, 5, 8 ; 11
@@ -470,7 +470,7 @@ ENDM
mapgroup COPYCATS_HOUSE_1F, 4, 4 ; 11
mapgroup COPYCATS_HOUSE_2F, 3, 5 ; 12
mapgroup ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13
- mapgroup ROUTE_5_SAFFRON_CITY_GATE, 4, 5 ; 14
+ mapgroup ROUTE_5_SAFFRON_GATE, 4, 5 ; 14
mapgroup ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 ; 15
newgroup ; 26
diff --git a/maps.asm b/maps.asm
index 4f08ab0fd..8303732c9 100644
--- a/maps.asm
+++ b/maps.asm
@@ -192,7 +192,7 @@ INCLUDE "maps/IcePathB3F.asm"
INCLUDE "maps/LavenderPokecenter1F.asm"
INCLUDE "maps/LavenderPokecenter2FBeta.asm"
INCLUDE "maps/MrFujisHouse.asm"
-INCLUDE "maps/LavenderTownSpeechHouse.asm"
+INCLUDE "maps/LavenderSpeechHouse.asm"
INCLUDE "maps/LavenderNameRater.asm"
INCLUDE "maps/LavenderMart.asm"
INCLUDE "maps/SoulHouse.asm"
@@ -240,7 +240,7 @@ INCLUDE "maps/ManiasHouse.asm"
INCLUDE "maps/CianwoodGym.asm"
INCLUDE "maps/CianwoodPokecenter1F.asm"
INCLUDE "maps/CianwoodPharmacy.asm"
-INCLUDE "maps/CianwoodCityPhotoStudio.asm"
+INCLUDE "maps/CianwoodPhotoStudio.asm"
INCLUDE "maps/CianwoodLugiaSpeechHouse.asm"
INCLUDE "maps/PokeSeersHouse.asm"
INCLUDE "maps/BattleTower1F.asm"
@@ -305,7 +305,7 @@ INCLUDE "maps/SilphCo1F.asm"
INCLUDE "maps/CopycatsHouse1F.asm"
INCLUDE "maps/CopycatsHouse2F.asm"
INCLUDE "maps/Route5UndergroundPathEntrance.asm"
-INCLUDE "maps/Route5SaffronCityGate.asm"
+INCLUDE "maps/Route5SaffronGate.asm"
INCLUDE "maps/Route5CleanseTagSpeechHouse.asm"
diff --git a/maps/BetaCinnabarIslandPokemonLabHallway.blk b/maps/BetaCinnabarPokemonLabHallway.blk
index 7a6502a26..7a6502a26 100644
--- a/maps/BetaCinnabarIslandPokemonLabHallway.blk
+++ b/maps/BetaCinnabarPokemonLabHallway.blk
diff --git a/maps/BetaCinnabarIslandPokemonLabRoom1.blk b/maps/BetaCinnabarPokemonLabRoom1.blk
index ef77b6561..ef77b6561 100644
--- a/maps/BetaCinnabarIslandPokemonLabRoom1.blk
+++ b/maps/BetaCinnabarPokemonLabRoom1.blk
diff --git a/maps/BetaCinnabarIslandPokemonLabRoom2.blk b/maps/BetaCinnabarPokemonLabRoom2.blk
index 822db175b..822db175b 100644
--- a/maps/BetaCinnabarIslandPokemonLabRoom2.blk
+++ b/maps/BetaCinnabarPokemonLabRoom2.blk
diff --git a/maps/BetaCinnabarIslandPokemonLabRoom3.blk b/maps/BetaCinnabarPokemonLabRoom3.blk
index d9a64a5da..d9a64a5da 100644
--- a/maps/BetaCinnabarIslandPokemonLabRoom3.blk
+++ b/maps/BetaCinnabarPokemonLabRoom3.blk
diff --git a/maps/BetaTeakCity.blk b/maps/BetaEcruteakCity.blk
index ce448c2ef..ce448c2ef 100644
--- a/maps/BetaTeakCity.blk
+++ b/maps/BetaEcruteakCity.blk
diff --git a/maps/BetaSSAquaInsideCutOut.blk b/maps/BetaFastShipInsideCutOut.blk
index b385b0198..b385b0198 100644
--- a/maps/BetaSSAquaInsideCutOut.blk
+++ b/maps/BetaFastShipInsideCutOut.blk
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 86c958205..75c34f6e1 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -390,7 +390,7 @@ CianwoodCity_MapEventHeader:
warp_def 8, 43, 1, CIANWOOD_GYM
warp_def 23, 43, 1, CIANWOOD_POKECENTER_1F
warp_def 15, 47, 1, CIANWOOD_PHARMACY
- warp_def 9, 31, 1, CIANWOOD_CITY_PHOTO_STUDIO
+ warp_def 9, 31, 1, CIANWOOD_PHOTO_STUDIO
warp_def 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE
warp_def 5, 17, 1, POKE_SEERS_HOUSE
diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm
index 3a20c63e6..1d8b6dbae 100644
--- a/maps/CianwoodCityPhotoStudio.asm
+++ b/maps/CianwoodPhotoStudio.asm
@@ -1,7 +1,7 @@
const_value set 2
- const CIANWOODCITYPHOTOSTUDIO_FISHING_GURU
+ const CIANWOODPHOTOSTUDIO_FISHING_GURU
-CianwoodCityPhotoStudio_MapScriptHeader:
+CianwoodPhotoStudio_MapScriptHeader:
.SceneScripts:
db 0
@@ -48,7 +48,7 @@ UnknownText_0x9e156:
line "memento…"
done
-CianwoodCityPhotoStudio_MapEventHeader:
+CianwoodPhotoStudio_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderSpeechHouse.asm
index 1cb093dda..ac9decf52 100644
--- a/maps/LavenderTownSpeechHouse.asm
+++ b/maps/LavenderSpeechHouse.asm
@@ -1,20 +1,20 @@
const_value set 2
- const LAVENDERTOWNSPEECHHOUSE_POKEFAN_F
+ const LAVENDERSPEECHHOUSE_POKEFAN_F
-LavenderTownSpeechHouse_MapScriptHeader:
+LavenderSpeechHouse_MapScriptHeader:
.SceneScripts:
db 0
.MapCallbacks:
db 0
-LavenderTownSpeechHousePokefanFScript:
- jumptextfaceplayer LavenderTownSpeechHousePokefanFText
+LavenderSpeechHousePokefanFScript:
+ jumptextfaceplayer LavenderSpeechHousePokefanFText
-LavenderTownSpeechHouseBookshelf:
+LavenderSpeechHouseBookshelf:
jumpstd picturebookshelf
-LavenderTownSpeechHousePokefanFText:
+LavenderSpeechHousePokefanFText:
text "LAVENDER is a"
line "tiny, quiet town"
@@ -28,7 +28,7 @@ LavenderTownSpeechHousePokefanFText:
line "built."
done
-LavenderTownSpeechHouse_MapEventHeader:
+LavenderSpeechHouse_MapEventHeader:
; filler
db 0, 0
@@ -42,9 +42,9 @@ LavenderTownSpeechHouse_MapEventHeader:
.BGEvents:
db 2
- bg_event 0, 1, BGEVENT_READ, LavenderTownSpeechHouseBookshelf
- bg_event 1, 1, BGEVENT_READ, LavenderTownSpeechHouseBookshelf
+ bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf
+ bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf
.ObjectEvents:
db 1
- object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownSpeechHousePokefanFScript, -1
+ object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1
diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm
index e75726abd..35bfdb12a 100644
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -113,7 +113,7 @@ LavenderTown_MapEventHeader:
db 7
warp_def 5, 5, 1, LAVENDER_POKECENTER_1F
warp_def 5, 9, 1, MR_FUJIS_HOUSE
- warp_def 3, 13, 1, LAVENDER_TOWN_SPEECH_HOUSE
+ warp_def 3, 13, 1, LAVENDER_SPEECH_HOUSE
warp_def 7, 13, 1, LAVENDER_NAME_RATER
warp_def 1, 5, 2, LAVENDER_MART
warp_def 13, 11, 1, SOUL_HOUSE
diff --git a/maps/Route5.asm b/maps/Route5.asm
index 7976fbe79..1e2ea7741 100644
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -46,8 +46,8 @@ Route5_MapEventHeader:
.Warps:
db 4
warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
- warp_def 8, 17, 1, ROUTE_5_SAFFRON_CITY_GATE
- warp_def 9, 17, 2, ROUTE_5_SAFFRON_CITY_GATE
+ warp_def 8, 17, 1, ROUTE_5_SAFFRON_GATE
+ warp_def 9, 17, 2, ROUTE_5_SAFFRON_GATE
warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE
.CoordEvents:
diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronGate.asm
index e47ce7628..cf945b7dc 100644
--- a/maps/Route5SaffronCityGate.asm
+++ b/maps/Route5SaffronGate.asm
@@ -1,17 +1,17 @@
const_value set 2
- const ROUTE5SAFFRONCITYGATE_OFFICER
+ const ROUTE5SAFFRONGATE_OFFICER
-Route5SaffronCityGate_MapScriptHeader:
+Route5SaffronGate_MapScriptHeader:
.SceneScripts:
db 0
.MapCallbacks:
db 0
-Route5SaffronCityGateOfficerScript:
- jumptextfaceplayer Route5SaffronCityGateOfficerText
+Route5SaffronGateOfficerScript:
+ jumptextfaceplayer Route5SaffronGateOfficerText
-Route5SaffronCityGateOfficerText:
+Route5SaffronGateOfficerText:
text "You're from JOHTO,"
line "aren't you?"
@@ -20,7 +20,7 @@ Route5SaffronCityGateOfficerText:
cont "don't you agree?"
done
-Route5SaffronCityGate_MapEventHeader:
+Route5SaffronGate_MapEventHeader:
; filler
db 0, 0
@@ -39,4 +39,4 @@ Route5SaffronCityGate_MapEventHeader:
.ObjectEvents:
db 1
- object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronCityGateOfficerScript, -1
+ object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1
diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
index 490a269b9..06eaf59a5 100644
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -279,7 +279,7 @@ SaffronCity_MapEventHeader:
warp_def 8, 3, 2, SAFFRON_TRAIN_STATION
warp_def 18, 21, 1, SILPH_CO_1F
warp_def 9, 11, 1, COPYCATS_HOUSE_1F
- warp_def 18, 3, 3, ROUTE_5_SAFFRON_CITY_GATE
+ warp_def 18, 3, 3, ROUTE_5_SAFFRON_GATE
warp_def 0, 24, 3, ROUTE_7_SAFFRON_GATE
warp_def 0, 25, 4, ROUTE_7_SAFFRON_GATE
warp_def 16, 33, 1, ROUTE_6_SAFFRON_GATE
diff --git a/maps/blockdata.asm b/maps/blockdata.asm
index 9e44798ad..8ee9d2aa5 100644
--- a/maps/blockdata.asm
+++ b/maps/blockdata.asm
@@ -175,7 +175,7 @@ BluesHouse_BlockData:
PewterNidoranSpeechHouse_BlockData:
PewterSnoozeSpeechHouse_BlockData:
FuchsiaBillSpeechHouse_BlockData:
-LavenderTownSpeechHouse_BlockData:
+LavenderSpeechHouse_BlockData:
LavenderNameRater_BlockData:
Route12SuperRodHouse_BlockData:
Route28FamousSpeechHouse_BlockData:
@@ -183,7 +183,7 @@ CeladonMansionRoofHouse_BlockData:
Route16FuchsiaSpeechHouse_BlockData:
ManiasHouse_BlockData:
CianwoodPharmacy_BlockData:
-CianwoodCityPhotoStudio_BlockData:
+CianwoodPhotoStudio_BlockData:
CianwoodLugiaSpeechHouse_BlockData:
PokeSeersHouse_BlockData:
ViridianNicknameSpeechHouse_BlockData:
@@ -211,11 +211,11 @@ Route6SaffronGate_BlockData:
Route40BattleTowerGate_BlockData:
Route2Gate_BlockData:
Route2946Gate_BlockData:
-Route5SaffronCityGate_BlockData:
+Route5SaffronGate_BlockData:
INCBIN "maps/NorthSouthGate.blk"
-BetaTeakCity_BlockData:
- INCBIN "maps/BetaTeakCity.blk"
+BetaEcruteakCity_BlockData:
+ INCBIN "maps/BetaEcruteakCity.blk"
BetaCherrygroveCity_BlockData:
INCBIN "maps/BetaCherrygroveCity.blk"
@@ -372,17 +372,17 @@ BetaPewterMuseumOfScience2F_BlockData:
EarlsPokemonAcademy_BlockData:
INCBIN "maps/EarlsPokemonAcademy.blk"
-BetaCinnabarIslandPokemonLabHallway_BlockData:
- INCBIN "maps/BetaCinnabarIslandPokemonLabHallway.blk"
+BetaCinnabarPokemonLabHallway_BlockData:
+ INCBIN "maps/BetaCinnabarPokemonLabHallway.blk"
-BetaCinnabarIslandPokemonLabRoom1_BlockData:
- INCBIN "maps/BetaCinnabarIslandPokemonLabRoom1.blk"
+BetaCinnabarPokemonLabRoom1_BlockData:
+ INCBIN "maps/BetaCinnabarPokemonLabRoom1.blk"
-BetaCinnabarIslandPokemonLabRoom2_BlockData:
- INCBIN "maps/BetaCinnabarIslandPokemonLabRoom2.blk"
+BetaCinnabarPokemonLabRoom2_BlockData:
+ INCBIN "maps/BetaCinnabarPokemonLabRoom2.blk"
-BetaCinnabarIslandPokemonLabRoom3_BlockData:
- INCBIN "maps/BetaCinnabarIslandPokemonLabRoom3.blk"
+BetaCinnabarPokemonLabRoom3_BlockData:
+ INCBIN "maps/BetaCinnabarPokemonLabRoom3.blk"
GoldenrodDeptStore1F_BlockData:
CeladonDeptStore1F_BlockData:
@@ -824,8 +824,8 @@ FastShip1F_BlockData:
FastShipB1F_BlockData:
INCBIN "maps/FastShipB1F.blk"
-BetaSSAquaInsideCutOut_BlockData:
- INCBIN "maps/BetaSSAquaInsideCutOut.blk"
+BetaFastShipInsideCutOut_BlockData:
+ INCBIN "maps/BetaFastShipInsideCutOut.blk"
FastShipCabins_NNW_NNE_NE_BlockData:
INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk"
diff --git a/maps/map_headers.asm b/maps/map_headers.asm
index ac4b20ece..ac0007f0d 100644
--- a/maps/map_headers.asm
+++ b/maps/map_headers.asm
@@ -373,7 +373,7 @@ MapGroup_Lavender:
map_header LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header MrFujisHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header LavenderTownSpeechHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header LavenderSpeechHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header LavenderNameRater, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header LavenderMart, TILESET_MART, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header SoulHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -435,7 +435,7 @@ MapGroup_Cianwood:
map_header CianwoodGym, TILESET_SPROUT_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CianwoodPharmacy, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header CianwoodCityPhotoStudio, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header CianwoodPhotoStudio, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CianwoodLugiaSpeechHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header PokeSeersHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, 1, PALETTE_DAY, FISHGROUP_SHORE
@@ -492,7 +492,7 @@ MapGroup_Saffron:
map_header CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header Route5SaffronCityGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route5CleanseTagSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm
index 3628babd2..6982df6d1 100644
--- a/maps/second_map_headers.asm
+++ b/maps/second_map_headers.asm
@@ -593,7 +593,7 @@ ENDM
map_header_2 LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $0, 0
map_header_2 LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $0, 0
map_header_2 MrFujisHouse, MR_FUJIS_HOUSE, $0, 0
- map_header_2 LavenderTownSpeechHouse, LAVENDER_TOWN_SPEECH_HOUSE, $0, 0
+ map_header_2 LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $0, 0
map_header_2 LavenderNameRater, LAVENDER_NAME_RATER, $0, 0
map_header_2 LavenderMart, LAVENDER_MART, $0, 0
map_header_2 SoulHouse, SOUL_HOUSE, $0, 0
@@ -634,7 +634,7 @@ ENDM
map_header_2 CianwoodGym, CIANWOOD_GYM, $0, 0
map_header_2 CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $0, 0
map_header_2 CianwoodPharmacy, CIANWOOD_PHARMACY, $0, 0
- map_header_2 CianwoodCityPhotoStudio, CIANWOOD_CITY_PHOTO_STUDIO, $0, 0
+ map_header_2 CianwoodPhotoStudio, CIANWOOD_PHOTO_STUDIO, $0, 0
map_header_2 CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $0, 0
map_header_2 PokeSeersHouse, POKE_SEERS_HOUSE, $0, 0
map_header_2 BattleTower1F, BATTLE_TOWER_1F, $0, 0
@@ -673,7 +673,7 @@ ENDM
map_header_2 CopycatsHouse1F, COPYCATS_HOUSE_1F, $0, 0
map_header_2 CopycatsHouse2F, COPYCATS_HOUSE_2F, $0, 0
map_header_2 Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $0, 0
- map_header_2 Route5SaffronCityGate, ROUTE_5_SAFFRON_CITY_GATE, $0, 0
+ map_header_2 Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $0, 0
map_header_2 Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $0, 0
map_header_2 CherrygroveMart, CHERRYGROVE_MART, $0, 0
map_header_2 CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $0, 0
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 21:12:03 +0000