Rename map files, labels, and constants to be consistent and work with Polished Map

1 files changed, 215 insertions, 212 deletions

diff --git a/text.asm b/text.asm
index 51355e33..5a760a8e 100644
--- a/text.asm
+++ b/text.asm
@@ -1,5 +1,7 @@
 INCLUDE "charmap.asm"
+
 INCLUDE "constants/text_constants.asm"
+
 TEXT_1  EQU $20
 TEXT_2  EQU TEXT_1 + 1
 TEXT_3  EQU TEXT_2 + 1
@@ -16,6 +18,7 @@ POKEDEX_TEXT EQU TEXT_11 + 1
 MOVE_NAMES   EQU POKEDEX_TEXT + 1
 
 INCLUDE "macros.asm"
+
 INCLUDE "hram.asm"
 
 
@@ -167,67 +170,67 @@ _OaksAideNoRoomText::
 	text "."
 	done
 
-INCLUDE "text/maps/viridian_forest.asm"
-INCLUDE "text/maps/mt_moon_1f.asm"
-INCLUDE "text/maps/mt_moon_b1f.asm"
-INCLUDE "text/maps/mt_moon_b2f.asm"
-INCLUDE "text/maps/ss_anne_1.asm"
-INCLUDE "text/maps/ss_anne_2.asm"
-INCLUDE "text/maps/ss_anne_3.asm"
-INCLUDE "text/maps/ss_anne_5.asm"
-INCLUDE "text/maps/ss_anne_6.asm"
-INCLUDE "text/maps/ss_anne_7.asm"
-INCLUDE "text/maps/ss_anne_8.asm"
-INCLUDE "text/maps/ss_anne_9.asm"
-INCLUDE "text/maps/ss_anne_10.asm"
-INCLUDE "text/maps/victory_road_3f.asm"
-INCLUDE "text/maps/rocket_hideout_b1f.asm"
-INCLUDE "text/maps/rocket_hideout_b2f.asm"
-INCLUDE "text/maps/rocket_hideout_b3f.asm"
-INCLUDE "text/maps/rocket_hideout_b4f.asm"
-INCLUDE "text/maps/rocket_hideout_elevator.asm"
-INCLUDE "text/maps/silph_co_2f.asm"
-INCLUDE "text/maps/silph_co_3f.asm"
-INCLUDE "text/maps/silph_co_4f.asm"
-INCLUDE "text/maps/silph_co_5f_1.asm"
+INCLUDE "text/maps/ViridianForest.asm"
+INCLUDE "text/maps/MtMoon1F.asm"
+INCLUDE "text/maps/MtMoonB1F.asm"
+INCLUDE "text/maps/MtMoonB2F.asm"
+INCLUDE "text/maps/SSAnne1F.asm"
+INCLUDE "text/maps/SSAnne2F.asm"
+INCLUDE "text/maps/SSAnne3F.asm"
+INCLUDE "text/maps/SSAnneBow.asm"
+INCLUDE "text/maps/SSAnneKitchen.asm"
+INCLUDE "text/maps/SSAnneCaptainsRoom.asm"
+INCLUDE "text/maps/SSAnne1FRooms.asm"
+INCLUDE "text/maps/SSAnne2FRooms.asm"
+INCLUDE "text/maps/SSAnneB1FRooms.asm"
+INCLUDE "text/maps/VictoryRoad3F.asm"
+INCLUDE "text/maps/RocketHideoutB1F.asm"
+INCLUDE "text/maps/RocketHideoutB2F.asm"
+INCLUDE "text/maps/RocketHideoutB3F.asm"
+INCLUDE "text/maps/RocketHideoutB4F.asm"
+INCLUDE "text/maps/RocketHideoutElevator.asm"
+INCLUDE "text/maps/SilphCo2F.asm"
+INCLUDE "text/maps/SilphCo3F.asm"
+INCLUDE "text/maps/SilphCo4F.asm"
+INCLUDE "text/maps/SilphCo5F.asm"
 
 
 SECTION "Text 2", ROMX ; BANK $21
 
-INCLUDE "text/maps/silph_co_5f_2.asm"
-INCLUDE "text/maps/silph_co_6f.asm"
-INCLUDE "text/maps/silph_co_7f.asm"
-INCLUDE "text/maps/silph_co_8f.asm"
-INCLUDE "text/maps/silph_co_9f.asm"
-INCLUDE "text/maps/silph_co_10f.asm"
-INCLUDE "text/maps/silph_co_11f.asm"
-INCLUDE "text/maps/mansion_2f.asm"
-INCLUDE "text/maps/mansion_3f.asm"
-INCLUDE "text/maps/mansion_b1f.asm"
-INCLUDE "text/maps/safari_zone_east.asm"
-INCLUDE "text/maps/safari_zone_north.asm"
-INCLUDE "text/maps/safari_zone_west.asm"
-INCLUDE "text/maps/safari_zone_center.asm"
-INCLUDE "text/maps/safari_zone_rest_house_1.asm"
-INCLUDE "text/maps/safari_zone_secret_house.asm"
-INCLUDE "text/maps/safari_zone_rest_house_2.asm"
-INCLUDE "text/maps/safari_zone_rest_house_3.asm"
-INCLUDE "text/maps/safari_zone_rest_house_4.asm"
-INCLUDE "text/maps/unknown_dungeon_b1f.asm"
-INCLUDE "text/maps/victory_road_1f.asm"
-INCLUDE "text/maps/lance.asm"
-INCLUDE "text/maps/hall_of_fame.asm"
-INCLUDE "text/maps/champion.asm"
-INCLUDE "text/maps/lorelei.asm"
-INCLUDE "text/maps/bruno.asm"
-INCLUDE "text/maps/agatha.asm"
-INCLUDE "text/maps/rock_tunnel_b2f_1.asm"
+INCLUDE "text/maps/SilphCo5F_2.asm"
+INCLUDE "text/maps/SilphCo6F.asm"
+INCLUDE "text/maps/SilphCo7F.asm"
+INCLUDE "text/maps/SilphCo8F.asm"
+INCLUDE "text/maps/SilphCo9F.asm"
+INCLUDE "text/maps/SilphCo10F.asm"
+INCLUDE "text/maps/SilphCo11F.asm"
+INCLUDE "text/maps/PokemonMansion2F.asm"
+INCLUDE "text/maps/PokemonMansion3F.asm"
+INCLUDE "text/maps/PokemonMansionB1F.asm"
+INCLUDE "text/maps/SafariZoneEast.asm"
+INCLUDE "text/maps/SafariZoneNorth.asm"
+INCLUDE "text/maps/SafariZoneWest.asm"
+INCLUDE "text/maps/SafariZoneCenter.asm"
+INCLUDE "text/maps/SafariZoneCenterRestHouse.asm"
+INCLUDE "text/maps/SafariZoneSecretHouse.asm"
+INCLUDE "text/maps/SafariZoneWestRestHouse.asm"
+INCLUDE "text/maps/SafariZoneEastRestHouse.asm"
+INCLUDE "text/maps/SafariZoneNorthRestHouse.asm"
+INCLUDE "text/maps/CeruleanCaveB1F.asm"
+INCLUDE "text/maps/VictoryRoad1F.asm"
+INCLUDE "text/maps/LancesRoom.asm"
+INCLUDE "text/maps/HallOfFame.asm"
+INCLUDE "text/maps/ChampionsRoom.asm"
+INCLUDE "text/maps/LoreleisRoom.asm"
+INCLUDE "text/maps/BrunosRoom.asm"
+INCLUDE "text/maps/AgathasRoom.asm"
+INCLUDE "text/maps/RockTunnelB1F.asm"
 
 
 SECTION "Text 3", ROMX ; BANK $22
 
-INCLUDE "text/maps/rock_tunnel_b2f_2.asm"
-INCLUDE "text/maps/seafoam_islands_b4f.asm"
+INCLUDE "text/maps/RockTunnelB1F_2.asm"
+INCLUDE "text/maps/SeafoamIslandsB4F.asm"
 
 _AIBattleWithdrawText::
 	TX_RAM wTrainerName
@@ -1531,14 +1534,14 @@ _NotVeryEffectiveText::
 _SafariZoneEatingText::
 	text "Wild @"
 	TX_RAM wEnemyMonNick
-	db $0
+	text ""
 	line "is eating!"
 	prompt
 
 _SafariZoneAngryText::
 	text "Wild @"
 	TX_RAM wEnemyMonNick
-	db $0
+	text ""
 	line "is angry!"
 	prompt
 
@@ -1929,77 +1932,77 @@ _Char00Text::
 _Char55Text::
 	text $4B,"@@"
 
-INCLUDE "text/maps/digletts_cave_route_2_entrance.asm"
-INCLUDE "text/maps/viridian_forest_exit.asm"
-INCLUDE "text/maps/route_2_house.asm"
-INCLUDE "text/maps/route_2_gate.asm"
-INCLUDE "text/maps/viridian_forest_entrance.asm"
-INCLUDE "text/maps/mt_moon_pokecenter.asm"
-INCLUDE "text/maps/saffron_gates.asm"
-INCLUDE "text/maps/daycare_1.asm"
+INCLUDE "text/maps/DiglettsCaveRoute2.asm"
+INCLUDE "text/maps/ViridianForestNorthGate.asm"
+INCLUDE "text/maps/Route2TradeHouse.asm"
+INCLUDE "text/maps/Route2Gate.asm"
+INCLUDE "text/maps/ViridianForestSouthGate.asm"
+INCLUDE "text/maps/MtMoonPokecenter.asm"
+INCLUDE "text/maps/SaffronGates.asm"
+INCLUDE "text/maps/Daycare.asm"
 
 
 SECTION "Text 4", ROMX ; BANK $23
 
-INCLUDE "text/maps/daycare_2.asm"
-INCLUDE "text/maps/underground_path_route_6_entrance.asm"
-INCLUDE "text/maps/underground_path_route_7_entrance.asm"
-INCLUDE "text/maps/underground_path_route_7_entrance_unused.asm"
-INCLUDE "text/maps/underground_path_route_8_entrance.asm"
-INCLUDE "text/maps/rock_tunnel_pokecenter.asm"
-INCLUDE "text/maps/rock_tunnel_b1f.asm"
-INCLUDE "text/maps/power_plant.asm"
-INCLUDE "text/maps/route_11_gate.asm"
-INCLUDE "text/maps/route_11_gate_upstairs.asm"
-INCLUDE "text/maps/digletts_cave_route_11_entrance.asm"
-INCLUDE "text/maps/route_12_gate.asm"
-INCLUDE "text/maps/route_12_gate_upstairs.asm"
-INCLUDE "text/maps/route_12_house.asm"
-INCLUDE "text/maps/route_15_gate.asm"
-INCLUDE "text/maps/route_15_gate_upstairs.asm"
-INCLUDE "text/maps/route_16_gate.asm"
-INCLUDE "text/maps/route_16_gate_upstairs.asm"
-INCLUDE "text/maps/route_16_house.asm"
-INCLUDE "text/maps/route_18_gate.asm"
-INCLUDE "text/maps/route_18_gate_upstairs.asm"
-INCLUDE "text/maps/pokemon_league_gate.asm"
-INCLUDE "text/maps/victory_road_2f.asm"
-INCLUDE "text/maps/bills_house.asm"
-INCLUDE "text/maps/route_1.asm"
-INCLUDE "text/maps/route_2.asm"
-INCLUDE "text/maps/route_3.asm"
-INCLUDE "text/maps/route_4.asm"
-INCLUDE "text/maps/route_5.asm"
-INCLUDE "text/maps/route_6.asm"
-INCLUDE "text/maps/route_7.asm"
-INCLUDE "text/maps/route_8.asm"
-INCLUDE "text/maps/route_9.asm"
-INCLUDE "text/maps/route_10.asm"
-INCLUDE "text/maps/route_11_1.asm"
+INCLUDE "text/maps/Daycare_2.asm"
+INCLUDE "text/maps/UndergroundPathRoute6.asm"
+INCLUDE "text/maps/UndergroundPathRoute7.asm"
+INCLUDE "text/maps/UndergroundPathRoute7Copy.asm"
+INCLUDE "text/maps/UndergroundPathRoute8.asm"
+INCLUDE "text/maps/RockTunnelPokecenter.asm"
+INCLUDE "text/maps/RockTunnel1F.asm"
+INCLUDE "text/maps/PowerPlant.asm"
+INCLUDE "text/maps/Route11Gate1F.asm"
+INCLUDE "text/maps/Route11Gate2F.asm"
+INCLUDE "text/maps/DiglettsCaveRoute11.asm"
+INCLUDE "text/maps/Route12Gate1F.asm"
+INCLUDE "text/maps/Route12Gate2F.asm"
+INCLUDE "text/maps/Route12SuperRodHouse.asm"
+INCLUDE "text/maps/Route15Gate1F.asm"
+INCLUDE "text/maps/Route15Gate2F.asm"
+INCLUDE "text/maps/Route16Gate1F.asm"
+INCLUDE "text/maps/Route16Gate2F.asm"
+INCLUDE "text/maps/Route16FlyHouse.asm"
+INCLUDE "text/maps/Route18Gate1F.asm"
+INCLUDE "text/maps/Route18Gate2F.asm"
+INCLUDE "text/maps/Route22Gate.asm"
+INCLUDE "text/maps/VictoryRoad2F.asm"
+INCLUDE "text/maps/BillsHouse.asm"
+INCLUDE "text/maps/Route1.asm"
+INCLUDE "text/maps/Route2.asm"
+INCLUDE "text/maps/Route3.asm"
+INCLUDE "text/maps/Route4.asm"
+INCLUDE "text/maps/Route5.asm"
+INCLUDE "text/maps/Route6.asm"
+INCLUDE "text/maps/Route7.asm"
+INCLUDE "text/maps/Route8.asm"
+INCLUDE "text/maps/Route9.asm"
+INCLUDE "text/maps/Route10.asm"
+INCLUDE "text/maps/Route11.asm"
 
 
 SECTION "Text 5", ROMX ; BANK $24
 
-INCLUDE "text/maps/route_11_2.asm"
-INCLUDE "text/maps/route_12.asm"
-INCLUDE "text/maps/route_13.asm"
-INCLUDE "text/maps/route_14.asm"
-INCLUDE "text/maps/route_15.asm"
-INCLUDE "text/maps/route_16.asm"
-INCLUDE "text/maps/route_17.asm"
-INCLUDE "text/maps/route_18.asm"
-INCLUDE "text/maps/route_19.asm"
-INCLUDE "text/maps/route_20.asm"
-INCLUDE "text/maps/route_21.asm"
-INCLUDE "text/maps/route_22.asm"
-INCLUDE "text/maps/route_23.asm"
-INCLUDE "text/maps/route_24_1.asm"
+INCLUDE "text/maps/Route11_2.asm"
+INCLUDE "text/maps/Route12.asm"
+INCLUDE "text/maps/Route13.asm"
+INCLUDE "text/maps/Route14.asm"
+INCLUDE "text/maps/Route15.asm"
+INCLUDE "text/maps/Route16.asm"
+INCLUDE "text/maps/Route17.asm"
+INCLUDE "text/maps/Route18.asm"
+INCLUDE "text/maps/Route19.asm"
+INCLUDE "text/maps/Route20.asm"
+INCLUDE "text/maps/Route21.asm"
+INCLUDE "text/maps/Route22.asm"
+INCLUDE "text/maps/Route23.asm"
+INCLUDE "text/maps/Route24.asm"
 
 
 SECTION "Text 6", ROMX ; BANK $25
 
-INCLUDE "text/maps/route_24_2.asm"
-INCLUDE "text/maps/route_25.asm"
+INCLUDE "text/maps/Route24_2.asm"
+INCLUDE "text/maps/Route25.asm"
 
 _FileDataDestroyedText::
 	text "The file data is"
@@ -2326,106 +2329,106 @@ _ColosseumText1::
 	text "!"
 	done
 
-INCLUDE "text/maps/reds_house_1f.asm"
-INCLUDE "text/maps/blues_house.asm"
-INCLUDE "text/maps/oaks_lab.asm"
-INCLUDE "text/maps/viridian_pokecenter.asm"
-INCLUDE "text/maps/viridian_mart.asm"
-INCLUDE "text/maps/school.asm"
-INCLUDE "text/maps/viridian_house.asm"
-INCLUDE "text/maps/viridian_gym.asm"
-INCLUDE "text/maps/museum_1f.asm"
-INCLUDE "text/maps/museum_2f.asm"
-INCLUDE "text/maps/pewter_gym_1.asm"
+INCLUDE "text/maps/RedsHouse1F.asm"
+INCLUDE "text/maps/BluesHouse.asm"
+INCLUDE "text/maps/OaksLab.asm"
+INCLUDE "text/maps/ViridianPokecenter.asm"
+INCLUDE "text/maps/ViridianMart.asm"
+INCLUDE "text/maps/ViridianSchoolHouse.asm"
+INCLUDE "text/maps/ViridianNicknameHouse.asm"
+INCLUDE "text/maps/ViridianGym.asm"
+INCLUDE "text/maps/Museum1F.asm"
+INCLUDE "text/maps/Museum2F.asm"
+INCLUDE "text/maps/PewterGym.asm"
 
 
 SECTION "Text 7", ROMX ; BANK $26
 
-INCLUDE "text/maps/pewter_gym_2.asm"
-INCLUDE "text/maps/pewter_house_1.asm"
-INCLUDE "text/maps/pewter_mart.asm"
-INCLUDE "text/maps/pewter_house_2.asm"
-INCLUDE "text/maps/pewter_pokecenter.asm"
-INCLUDE "text/maps/cerulean_trashed_house.asm"
-INCLUDE "text/maps/cerulean_trade_house.asm"
-INCLUDE "text/maps/cerulean_pokecenter.asm"
-INCLUDE "text/maps/cerulean_gym.asm"
-INCLUDE "text/maps/bike_shop.asm"
-INCLUDE "text/maps/cerulean_mart.asm"
-INCLUDE "text/maps/cerulean_badge_house.asm"
-INCLUDE "text/maps/lavender_pokecenter.asm"
-INCLUDE "text/maps/pokemon_tower_1f.asm"
-INCLUDE "text/maps/pokemon_tower_2f.asm"
-INCLUDE "text/maps/pokemon_tower_3f.asm"
-INCLUDE "text/maps/pokemon_tower_4f.asm"
-INCLUDE "text/maps/pokemon_tower_5f.asm"
-INCLUDE "text/maps/pokemon_tower_6f.asm"
-INCLUDE "text/maps/pokemon_tower_7f.asm"
-INCLUDE "text/maps/fujis_house.asm"
-INCLUDE "text/maps/lavender_mart.asm"
-INCLUDE "text/maps/lavender_house.asm"
-INCLUDE "text/maps/name_rater.asm"
-INCLUDE "text/maps/vermilion_pokecenter.asm"
-INCLUDE "text/maps/fan_club.asm"
-INCLUDE "text/maps/vermilion_mart.asm"
-INCLUDE "text/maps/vermilion_gym_1.asm"
+INCLUDE "text/maps/PewterGym_2.asm"
+INCLUDE "text/maps/PewterNidoranHouse.asm"
+INCLUDE "text/maps/PewterMart.asm"
+INCLUDE "text/maps/PewterSpeechHouse.asm"
+INCLUDE "text/maps/PewterPokecenter.asm"
+INCLUDE "text/maps/CeruleanTrashedHouse.asm"
+INCLUDE "text/maps/CeruleanTradeHouse.asm"
+INCLUDE "text/maps/CeruleanPokecenter.asm"
+INCLUDE "text/maps/CeruleanGym.asm"
+INCLUDE "text/maps/BikeShop.asm"
+INCLUDE "text/maps/CeruleanMart.asm"
+INCLUDE "text/maps/CeruleanBadgeHouse.asm"
+INCLUDE "text/maps/LavenderPokecenter.asm"
+INCLUDE "text/maps/PokemonTower1F.asm"
+INCLUDE "text/maps/PokemonTower2F.asm"
+INCLUDE "text/maps/PokemonTower3F.asm"
+INCLUDE "text/maps/PokemonTower4F.asm"
+INCLUDE "text/maps/PokemonTower5F.asm"
+INCLUDE "text/maps/PokemonTower6F.asm"
+INCLUDE "text/maps/PokemonTower7F.asm"
+INCLUDE "text/maps/MrFujisHouse.asm"
+INCLUDE "text/maps/LavenderMart.asm"
+INCLUDE "text/maps/LavenderCuboneHouse.asm"
+INCLUDE "text/maps/NameRatersHouse.asm"
+INCLUDE "text/maps/VermilionPokecenter.asm"
+INCLUDE "text/maps/PokemonFanClub.asm"
+INCLUDE "text/maps/VermilionMart.asm"
+INCLUDE "text/maps/VermilionGym.asm"
 
 
 SECTION "Text 8", ROMX ; BANK $27
 
-INCLUDE "text/maps/vermilion_gym_2.asm"
-INCLUDE "text/maps/vermilion_house.asm"
-INCLUDE "text/maps/vermilion_dock.asm"
-INCLUDE "text/maps/vermilion_fishing_house.asm"
-INCLUDE "text/maps/celadon_dept_store_1f.asm"
-INCLUDE "text/maps/celadon_dept_store_2f.asm"
-INCLUDE "text/maps/celadon_dept_store_3f.asm"
-INCLUDE "text/maps/celadon_dept_store_4f.asm"
-INCLUDE "text/maps/celadon_dept_store_roof.asm"
-INCLUDE "text/maps/celadon_mansion_1f.asm"
-INCLUDE "text/maps/celadon_mansion_2f.asm"
-INCLUDE "text/maps/celadon_mansion_3f.asm"
-INCLUDE "text/maps/celadon_mansion_4f_outside.asm"
-INCLUDE "text/maps/celadon_mansion_4f_inside.asm"
-INCLUDE "text/maps/celadon_pokecenter.asm"
-INCLUDE "text/maps/celadon_gym.asm"
-INCLUDE "text/maps/celadon_game_corner.asm"
-INCLUDE "text/maps/celadon_dept_store_5f.asm"
-INCLUDE "text/maps/celadon_prize_room.asm"
-INCLUDE "text/maps/celadon_diner.asm"
-INCLUDE "text/maps/celadon_house.asm"
-INCLUDE "text/maps/celadon_hotel.asm"
-INCLUDE "text/maps/fuchsia_mart.asm"
-INCLUDE "text/maps/fuchsia_house.asm"
-INCLUDE "text/maps/fuchsia_pokecenter.asm"
-INCLUDE "text/maps/wardens_house.asm"
-INCLUDE "text/maps/safari_zone_entrance.asm"
-INCLUDE "text/maps/fuchsia_gym_1.asm"
+INCLUDE "text/maps/VermilionGym_2.asm"
+INCLUDE "text/maps/VermilionPidgeyHouse.asm"
+INCLUDE "text/maps/VermilionDock.asm"
+INCLUDE "text/maps/VermilionOldRodHouse.asm"
+INCLUDE "text/maps/CeladonMart1F.asm"
+INCLUDE "text/maps/CeladonMart2F.asm"
+INCLUDE "text/maps/CeladonMart3F.asm"
+INCLUDE "text/maps/CeladonMart4F.asm"
+INCLUDE "text/maps/CeladonMartRoof.asm"
+INCLUDE "text/maps/CeladonMansion1F.asm"
+INCLUDE "text/maps/CeladonMansion2F.asm"
+INCLUDE "text/maps/CeladonMansion3F.asm"
+INCLUDE "text/maps/CeladonMansionRoof.asm"
+INCLUDE "text/maps/CeladonMansionRoofHouse.asm"
+INCLUDE "text/maps/CeladonPokecenter.asm"
+INCLUDE "text/maps/CeladonGym.asm"
+INCLUDE "text/maps/GameCorner.asm"
+INCLUDE "text/maps/CeladonMart5F.asm"
+INCLUDE "text/maps/GameCornerPrizeRoom.asm"
+INCLUDE "text/maps/CeladonDiner.asm"
+INCLUDE "text/maps/CeladonChiefHouse.asm"
+INCLUDE "text/maps/CeladonHotel.asm"
+INCLUDE "text/maps/FuchsiaMart.asm"
+INCLUDE "text/maps/FuchsiaBillsGrandpasHouse.asm"
+INCLUDE "text/maps/FuchsiaPokecenter.asm"
+INCLUDE "text/maps/WardensHouse.asm"
+INCLUDE "text/maps/SafariZoneGate.asm"
+INCLUDE "text/maps/FuchsiaGym.asm"
 
 
 SECTION "Text 9", ROMX ; BANK $28
 
-INCLUDE "text/maps/fuchsia_gym_2.asm"
-INCLUDE "text/maps/fuchsia_meeting_room.asm"
-INCLUDE "text/maps/fuchsia_fishing_house.asm"
-INCLUDE "text/maps/mansion_1f.asm"
-INCLUDE "text/maps/cinnabar_gym.asm"
-INCLUDE "text/maps/cinnabar_lab.asm"
-INCLUDE "text/maps/cinnabar_lab_trade_room.asm"
-INCLUDE "text/maps/cinnabar_lab_metronome_room.asm"
-INCLUDE "text/maps/cinnabar_lab_fossil_room.asm"
-INCLUDE "text/maps/cinnabar_pokecenter.asm"
-INCLUDE "text/maps/cinnabar_mart.asm"
-INCLUDE "text/maps/indigo_plateau_lobby.asm"
-INCLUDE "text/maps/copycats_house_1f.asm"
-INCLUDE "text/maps/copycats_house_2f.asm"
-INCLUDE "text/maps/fighting_dojo.asm"
-INCLUDE "text/maps/saffron_gym.asm"
-INCLUDE "text/maps/saffron_house.asm"
-INCLUDE "text/maps/saffron_mart.asm"
-INCLUDE "text/maps/silph_co_1f.asm"
-INCLUDE "text/maps/saffron_pokecenter.asm"
-INCLUDE "text/maps/mr_psychics_house.asm"
+INCLUDE "text/maps/FuchsiaGym_2.asm"
+INCLUDE "text/maps/FuchsiaMeetingRoom.asm"
+INCLUDE "text/maps/FuchsiaGoodRodHouse.asm"
+INCLUDE "text/maps/PokemonMansion1F.asm"
+INCLUDE "text/maps/CinnabarGym.asm"
+INCLUDE "text/maps/CinnabarLab.asm"
+INCLUDE "text/maps/CinnabarLabTradeRoom.asm"
+INCLUDE "text/maps/CinnabarLabMetronomeRoom.asm"
+INCLUDE "text/maps/CinnabarLabFossilRoom.asm"
+INCLUDE "text/maps/CinnabarPokecenter.asm"
+INCLUDE "text/maps/CinnabarMart.asm"
+INCLUDE "text/maps/IndigoPlateauLobby.asm"
+INCLUDE "text/maps/CopycatsHouse1F.asm"
+INCLUDE "text/maps/CopycatsHouse2F.asm"
+INCLUDE "text/maps/FightingDojo.asm"
+INCLUDE "text/maps/SaffronGym.asm"
+INCLUDE "text/maps/SaffronPidgeyHouse.asm"
+INCLUDE "text/maps/SaffronMart.asm"
+INCLUDE "text/maps/SilphCo1F.asm"
+INCLUDE "text/maps/SaffronPokecenter.asm"
+INCLUDE "text/maps/MrPsychicsHouse.asm"
 
 _PokemartGreetingText::
 	text "Hi there!"
@@ -2751,16 +2754,16 @@ _BoxIsFullText::
 	line "a #MON CENTER!"
 	done
 
-INCLUDE "text/maps/pallet_town.asm"
-INCLUDE "text/maps/viridian_city.asm"
-INCLUDE "text/maps/pewter_city.asm"
-INCLUDE "text/maps/cerulean_city.asm"
-INCLUDE "text/maps/lavender_town.asm"
-INCLUDE "text/maps/vermilion_city.asm"
-INCLUDE "text/maps/celadon_city.asm"
-INCLUDE "text/maps/fuchsia_city.asm"
-INCLUDE "text/maps/cinnabar_island.asm"
-INCLUDE "text/maps/saffron_city.asm"
+INCLUDE "text/maps/PalletTown.asm"
+INCLUDE "text/maps/ViridianCity.asm"
+INCLUDE "text/maps/PewterCity.asm"
+INCLUDE "text/maps/CeruleanCity.asm"
+INCLUDE "text/maps/LavenderTown.asm"
+INCLUDE "text/maps/VermilionCity.asm"
+INCLUDE "text/maps/CeladonCity.asm"
+INCLUDE "text/maps/FuchsiaCity.asm"
+INCLUDE "text/maps/CinnabarIsland.asm"
+INCLUDE "text/maps/SaffronCity.asm"
 
 _ItemUseBallText00::
 	text "It dodged the"