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

1 files changed, 153 insertions, 153 deletions

diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index b777e4ca..9d85eaae 100755
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -11,7 +11,7 @@ MapHeaderPointers::
 	dw CinnabarIsland_h
 	dw IndigoPlateau_h
 	dw SaffronCity_h
-	dw SaffronCity_h
+	dw SaffronCity_h ; UNUSED_MAP_0B
 	dw Route1_h
 	dw Route2_h
 	dw Route3_h
@@ -40,211 +40,211 @@ MapHeaderPointers::
 	dw RedsHouse1F_h
 	dw RedsHouse2F_h
 	dw BluesHouse_h
-	dw OaksLab_h ;id=40
+	dw OaksLab_h
 	dw ViridianPokecenter_h
 	dw ViridianMart_h
-	dw School_h
-	dw ViridianHouse_h
+	dw ViridianSchoolHouse_h
+	dw ViridianNicknameHouse_h
 	dw ViridianGym_h
 	dw DiglettsCaveRoute2_h
-	dw ViridianForestExit_h
-	dw Route2House_h
+	dw ViridianForestNorthGate_h
+	dw Route2TradeHouse_h
 	dw Route2Gate_h
-	dw ViridianForestEntrance_h ;id=50
+	dw ViridianForestSouthGate_h
 	dw ViridianForest_h
 	dw Museum1F_h
 	dw Museum2F_h
 	dw PewterGym_h
-	dw PewterHouse1_h
+	dw PewterNidoranHouse_h
 	dw PewterMart_h
-	dw PewterHouse2_h
+	dw PewterSpeechHouse_h
 	dw PewterPokecenter_h
-	dw MtMoon1_h
-	dw MtMoon2_h ;id=60
-	dw MtMoon3_h
-	dw CeruleanHouseTrashed_h
-	dw CeruleanHouse1_h
+	dw MtMoon1F_h
+	dw MtMoonB1F_h
+	dw MtMoonB2F_h
+	dw CeruleanTrashedHouse_h
+	dw CeruleanTradeHouse_h
 	dw CeruleanPokecenter_h
 	dw CeruleanGym_h
 	dw BikeShop_h
 	dw CeruleanMart_h
 	dw MtMoonPokecenter_h
-	dw CeruleanHouseTrashed_h ; copy
+	dw CeruleanTrashedHouse_h ; CERULEAN_TRASHED_HOUSE_COPY
 	dw Route5Gate_h
-	dw UndergroundPathEntranceRoute5_h
-	dw DayCareM_h
+	dw UndergroundPathRoute5_h
+	dw Daycare_h
 	dw Route6Gate_h
-	dw UndergroundPathEntranceRoute6_h
-	dw UndergroundPathEntranceRoute6_h ; unused
+	dw UndergroundPathRoute6_h
+	dw UndergroundPathRoute6_h ; UNDERGROUND_PATH_ROUTE_6_COPY
 	dw Route7Gate_h
-	dw UndergroundPathEntranceRoute7_h
-	dw UndergroundPathEntranceRoute7Copy_h
+	dw UndergroundPathRoute7_h
+	dw UndergroundPathRoute7Copy_h
 	dw Route8Gate_h
-	dw UndergroundPathEntranceRoute8_h ;id=80
+	dw UndergroundPathRoute8_h
 	dw RockTunnelPokecenter_h
-	dw RockTunnel1_h
+	dw RockTunnel1F_h
 	dw PowerPlant_h
-	dw Route11Gate_h
-	dw DiglettsCaveEntranceRoute11_h
-	dw Route11GateUpstairs_h
-	dw Route12Gate_h
+	dw Route11Gate1F_h
+	dw DiglettsCaveRoute11_h
+	dw Route11Gate2F_h
+	dw Route12Gate1F_h
 	dw BillsHouse_h
 	dw VermilionPokecenter_h
-	dw FanClub_h ;id=90
+	dw PokemonFanClub_h
 	dw VermilionMart_h
 	dw VermilionGym_h
-	dw VermilionHouse1_h
+	dw VermilionPidgeyHouse_h
 	dw VermilionDock_h
-	dw SSAnne1_h
-	dw SSAnne2_h
-	dw SSAnne3_h
-	dw SSAnne4_h
-	dw SSAnne5_h
-	dw SSAnne6_h ;id=100
-	dw SSAnne7_h
-	dw SSAnne8_h
-	dw SSAnne9_h
-	dw SSAnne10_h
-	dw Lance_h ; unused
-	dw Lance_h ; unused
-	dw Lance_h ; unused
-	dw VictoryRoad1_h
-	dw Lance_h ; unused
-	dw Lance_h ; unused ;id=110
-	dw Lance_h ; unused
-	dw Lance_h ; unused
-	dw Lance_h
-	dw Lance_h ; unused
-	dw Lance_h ; unused
-	dw Lance_h ; unused
-	dw Lance_h ; unused
-	dw HallofFameRoom_h
-	dw UndergroundPathNS_h
-	dw Gary_h ;id=120
-	dw UndergroundPathWE_h
-	dw CeladonMart1_h
-	dw CeladonMart2_h
-	dw CeladonMart3_h
-	dw CeladonMart4_h
+	dw SSAnne1F_h
+	dw SSAnne2F_h
+	dw SSAnne3F_h
+	dw SSAnneB1F_h
+	dw SSAnneBow_h
+	dw SSAnneKitchen_h
+	dw SSAnneCaptainsRoom_h
+	dw SSAnne1FRooms_h
+	dw SSAnne2FRooms_h
+	dw SSAnneB1FRooms_h
+	dw LancesRoom_h ; UNUSED_MAP_69
+	dw LancesRoom_h ; UNUSED_MAP_6A
+	dw LancesRoom_h ; UNUSED_MAP_6B
+	dw VictoryRoad1F_h
+	dw LancesRoom_h ; UNUSED_MAP_6D
+	dw LancesRoom_h ; UNUSED_MAP_6E
+	dw LancesRoom_h ; UNUSED_MAP_6F
+	dw LancesRoom_h ; UNUSED_MAP_70
+	dw LancesRoom_h
+	dw LancesRoom_h ; UNUSED_MAP_72
+	dw LancesRoom_h ; UNUSED_MAP_73
+	dw LancesRoom_h ; UNUSED_MAP_74
+	dw LancesRoom_h ; UNUSED_MAP_75
+	dw HallOfFame_h
+	dw UndergroundPathNorthSouth_h
+	dw ChampionsRoom_h
+	dw UndergroundPathWestEast_h
+	dw CeladonMart1F_h
+	dw CeladonMart2F_h
+	dw CeladonMart3F_h
+	dw CeladonMart4F_h
 	dw CeladonMartRoof_h
 	dw CeladonMartElevator_h
-	dw CeladonMansion1_h
-	dw CeladonMansion2_h
-	dw CeladonMansion3_h ;id=130
-	dw CeladonMansion4_h
-	dw CeladonMansion5_h
+	dw CeladonMansion1F_h
+	dw CeladonMansion2F_h
+	dw CeladonMansion3F_h
+	dw CeladonMansionRoof_h
+	dw CeladonMansionRoofHouse_h
 	dw CeladonPokecenter_h
 	dw CeladonGym_h
-	dw CeladonGameCorner_h
-	dw CeladonMart5_h
-	dw CeladonPrizeRoom_h
+	dw GameCorner_h
+	dw CeladonMart5F_h
+	dw GameCornerPrizeRoom_h
 	dw CeladonDiner_h
-	dw CeladonHouse_h
-	dw CeladonHotel_h ;id=140
+	dw CeladonChiefHouse_h
+	dw CeladonHotel_h
 	dw LavenderPokecenter_h
-	dw PokemonTower1_h
-	dw PokemonTower2_h
-	dw PokemonTower3_h
-	dw PokemonTower4_h
-	dw PokemonTower5_h
-	dw PokemonTower6_h
-	dw PokemonTower7_h
-	dw LavenderHouse1_h
-	dw LavenderMart_h ;id=150
-	dw LavenderHouse2_h
+	dw PokemonTower1F_h
+	dw PokemonTower2F_h
+	dw PokemonTower3F_h
+	dw PokemonTower4F_h
+	dw PokemonTower5F_h
+	dw PokemonTower6F_h
+	dw PokemonTower7F_h
+	dw MrFujisHouse_h
+	dw LavenderMart_h
+	dw LavenderCuboneHouse_h
 	dw FuchsiaMart_h
-	dw FuchsiaHouse1_h
+	dw FuchsiaBillsGrandpasHouse_h
 	dw FuchsiaPokecenter_h
-	dw FuchsiaHouse2_h
-	dw SafariZoneEntrance_h
+	dw WardensHouse_h
+	dw SafariZoneGate_h
 	dw FuchsiaGym_h
 	dw FuchsiaMeetingRoom_h
-	dw SeafoamIslands2_h
-	dw SeafoamIslands3_h ;id=160
-	dw SeafoamIslands4_h
-	dw SeafoamIslands5_h
-	dw VermilionHouse2_h
-	dw FuchsiaHouse3_h
-	dw Mansion1_h
+	dw SeafoamIslandsB1F_h
+	dw SeafoamIslandsB2F_h
+	dw SeafoamIslandsB3F_h
+	dw SeafoamIslandsB4F_h
+	dw VermilionOldRodHouse_h
+	dw FuchsiaGoodRodHouse_h
+	dw PokemonMansion1F_h
 	dw CinnabarGym_h
-	dw Lab1_h
-	dw Lab2_h
-	dw Lab3_h
-	dw Lab4_h ;id=170
+	dw CinnabarLab_h
+	dw CinnabarLabTradeRoom_h
+	dw CinnabarLabMetronomeRoom_h
+	dw CinnabarLabFossilRoom_h
 	dw CinnabarPokecenter_h
 	dw CinnabarMart_h
-	dw CinnabarMart_h ; unused
+	dw CinnabarMart_h ; CINNABAR_MART_COPY
 	dw IndigoPlateauLobby_h
 	dw CopycatsHouse1F_h
 	dw CopycatsHouse2F_h
 	dw FightingDojo_h
 	dw SaffronGym_h
-	dw SaffronHouse1_h
-	dw SaffronMart_h ;id=180
-	dw SilphCo1_h
+	dw SaffronPidgeyHouse_h
+	dw SaffronMart_h
+	dw SilphCo1F_h
 	dw SaffronPokecenter_h
-	dw SaffronHouse2_h
-	dw Route15Gate_h
-	dw Route15GateUpstairs_h
-	dw Route16Gate_h
-	dw Route16GateUpstairs_h
-	dw Route16House_h
-	dw Route12House_h
-	dw Route18Gate_h ;id=190
-	dw Route18GateUpstairs_h
-	dw SeafoamIslands1_h
+	dw MrPsychicsHouse_h
+	dw Route15Gate1F_h
+	dw Route15Gate2F_h
+	dw Route16Gate1F_h
+	dw Route16Gate2F_h
+	dw Route16FlyHouse_h
+	dw Route12SuperRodHouse_h
+	dw Route18Gate1F_h
+	dw Route18Gate2F_h
+	dw SeafoamIslands1F_h
 	dw Route22Gate_h
-	dw VictoryRoad2_h
-	dw Route12GateUpstairs_h
-	dw VermilionHouse3_h
+	dw VictoryRoad2F_h
+	dw Route12Gate2F_h
+	dw VermilionTradeHouse_h
 	dw DiglettsCave_h
-	dw VictoryRoad3_h
-	dw RocketHideout1_h
-	dw RocketHideout2_h ;200
-	dw RocketHideout3_h
-	dw RocketHideout4_h
+	dw VictoryRoad3F_h
+	dw RocketHideoutB1F_h
+	dw RocketHideoutB2F_h
+	dw RocketHideoutB3F_h
+	dw RocketHideoutB4F_h
 	dw RocketHideoutElevator_h
-	dw RocketHideoutElevator_h ; unused
-	dw RocketHideoutElevator_h ; unused
-	dw RocketHideoutElevator_h ; unused
-	dw SilphCo2_h
-	dw SilphCo3_h
-	dw SilphCo4_h
-	dw SilphCo5_h ;210
-	dw SilphCo6_h
-	dw SilphCo7_h
-	dw SilphCo8_h
-	dw Mansion2_h
-	dw Mansion3_h
-	dw Mansion4_h
+	dw RocketHideoutElevator_h ; UNUSED_MAP_CC
+	dw RocketHideoutElevator_h ; UNUSED_MAP_CD
+	dw RocketHideoutElevator_h ; UNUSED_MAP_CE
+	dw SilphCo2F_h
+	dw SilphCo3F_h
+	dw SilphCo4F_h
+	dw SilphCo5F_h
+	dw SilphCo6F_h
+	dw SilphCo7F_h
+	dw SilphCo8F_h
+	dw PokemonMansion2F_h
+	dw PokemonMansion3F_h
+	dw PokemonMansionB1F_h
 	dw SafariZoneEast_h
 	dw SafariZoneNorth_h
 	dw SafariZoneWest_h
-	dw SafariZoneCenter_h ;220
-	dw SafariZoneRestHouse1_h
+	dw SafariZoneCenter_h
+	dw SafariZoneCenterRestHouse_h
 	dw SafariZoneSecretHouse_h
-	dw SafariZoneRestHouse2_h
-	dw SafariZoneRestHouse3_h
-	dw SafariZoneRestHouse4_h
-	dw UnknownDungeon2_h
-	dw UnknownDungeon3_h
-	dw UnknownDungeon1_h
-	dw NameRater_h
-	dw CeruleanHouse2_h
-	dw Route16Gate_h ; unused
-	dw RockTunnel2_h
-	dw SilphCo9_h
-	dw SilphCo10_h
-	dw SilphCo11_h
+	dw SafariZoneWestRestHouse_h
+	dw SafariZoneEastRestHouse_h
+	dw SafariZoneNorthRestHouse_h
+	dw CeruleanCave2F_h
+	dw CeruleanCaveB1F_h
+	dw CeruleanCave1F_h
+	dw NameRatersHouse_h
+	dw CeruleanBadgeHouse_h
+	dw Route16Gate1F_h ; UNUSED_MAP_E7
+	dw RockTunnelB1F_h
+	dw SilphCo9F_h
+	dw SilphCo10F_h
+	dw SilphCo11F_h
 	dw SilphCoElevator_h
-	dw SilphCo2_h ; unused
-	dw SilphCo2_h ; unused
+	dw SilphCo2F_h ; UNUSED_MAP_ED
+	dw SilphCo2F_h ; UNUSED_MAP_EE
 	dw TradeCenter_h
 	dw Colosseum_h
-	dw SilphCo2_h ; unused
-	dw SilphCo2_h ; unused
-	dw SilphCo2_h ; unused
-	dw SilphCo2_h ; unused
-	dw Lorelei_h
-	dw Bruno_h
-	dw Agatha_h ;247
+	dw SilphCo2F_h ; UNUSED_MAP_F1
+	dw SilphCo2F_h ; UNUSED_MAP_F2
+	dw SilphCo2F_h ; UNUSED_MAP_F3
+	dw SilphCo2F_h ; UNUSED_MAP_F4
+	dw LoreleisRoom_h
+	dw BrunosRoom_h
+	dw AgathasRoom_h ;247