Polish scripts pt 3 (P-R) (#1209)

2026-08-28 04:15:44 -05:00 · 2026-06-18 06:43:46 +02:00
parent 88243422de
commit 8b6fa50408
99 changed files with 539 additions and 539 deletions
--- a/generated/vars_flags.txt
+++ b/generated/vars_flags.txt
@@ -291,7 +291,7 @@ FLAG_CAUGHT_GIRATINA
 FLAG_UNK_0x0122
 FLAG_CAUGHT_SHAYMIN
 FLAG_TALKED_TO_CELESTIC_TOWN_CAVE_CYNTHIA
-FLAG_CAUGHT_MESPRIT
+FLAG_TALKED_TO_BATTLEGROUND_BUCK
 FLAG_CAUGHT_AZELF
 FLAG_CAUGHT_UXIE
 FLAG_RECEIVED_PASTORIA_CITY_ACCESSORY_STARTER_MASK
@@ -4298,7 +4298,7 @@ VAR_SPEAR_PILLAR_DISTORTED_STATE
 VAR_SPEAR_PILLAR_DIALGA_STATE
 VAR_SPEAR_PILLAR_PALKIA_STATE
 VAR_PAL_PARK_LOBBY_STATE
-VAR_PASTORIA_CITY_TRY_CROAGUNK_SCENE_STATE
+VAR_PASTORIA_CITY_CROAGUNK_SCENE_STATE
 VAR_RESORT_AREA_STATE
 VAR_UNK_0x40C9
 VAR_FOLLOWER_RIVAL_TIMES_TALKED
--- a/res/field/events/events_pastoria_city.json
+++ b/res/field/events/events_pastoria_city.json
@@ -572,7 +572,7 @@
            "y": 0,
            "width": 1,
            "length": 1,
-            "var": "VAR_PASTORIA_CITY_TRY_CROAGUNK_SCENE_STATE",
+            "var": "VAR_PASTORIA_CITY_CROAGUNK_SCENE_STATE",
            "value": 0
        }
    ]
--- a/res/field/events/events_pokemon_league_north_pokecenter_1f.json
+++ b/res/field/events/events_pokemon_league_north_pokecenter_1f.json
@@ -2,7 +2,7 @@
    "bg_events": [],
    "object_events": [
        {
-            "id": "LOCALID_LEAGUE_NORTH_ACE_TRAINER_M",
+            "id": "LOCALID_LEAGUE_NORTH_DOOR_GUARD",
            "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M",
            "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
            "trainer_type": "TRAINER_TYPE_NONE",
--- a/res/field/scripts/scripts_battleground.s
+++ b/res/field/scripts/scripts_battleground.s
@@ -112,7 +112,7 @@ Battleground_Buck:
    PlaySE SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    SetFlag FLAG_CAUGHT_MESPRIT
+    SetFlag FLAG_TALKED_TO_BATTLEGROUND_BUCK
    Message Battleground_Text_OpenToToughestTrainers
    CloseMessage
    GetPlayerMapPos VAR_0x8004, VAR_0x8005
--- a/res/field/scripts/scripts_iron_island_b2f_left_room.s
+++ b/res/field/scripts/scripts_iron_island_b2f_left_room.s
@@ -6,7 +6,7 @@

    ScriptEntry IronIslandB2FLeftRoom_OnTransition
    ScriptEntry IronIslandB2FLeftRoom_CoordEvent_PlatformLift
-    ScriptEntry IronIslandB2FLeftRoom_CoordEvent_StartFollowingRiley
+    ScriptEntry IronIslandB2FLeftRoom_CoordEvent_RileyStartFollowing
    ScriptEntry IronIslandB2FLeftRoom_CoordEvent_PlayerLeaveRiley
    ScriptEntry IronIslandB2FLeftRoom_Dummy5
    ScriptEntry IronIslandB2FLeftRoom_Dummy6
@@ -35,7 +35,7 @@ IronIslandB2FLeftRoom_CoordEvent_PlatformLift:
    TriggerPlatformLift
    End

-IronIslandB2FLeftRoom_CoordEvent_StartFollowingRiley:
+IronIslandB2FLeftRoom_CoordEvent_RileyStartFollowing:
    LockAll
    SetPlayerBike FALSE
    GetPlayerMapPos VAR_0x8004, VAR_0x8005
--- a/res/field/scripts/scripts_pastoria_city.s
+++ b/res/field/scripts/scripts_pastoria_city.s
@@ -29,7 +29,7 @@
    ScriptEntryEnd

 PastoriaCity_OnTransition:
-    SetVar VAR_PASTORIA_CITY_TRY_CROAGUNK_SCENE_STATE, 0
+    SetVar VAR_PASTORIA_CITY_CROAGUNK_SCENE_STATE, 0
    SetFlag FLAG_HIDE_ROUTE_212_BLOCKADE
    CallIfEq VAR_PASTORIA_STATE, 5, PastoriaCity_SetRivalPositionAfterExplosion
    CallIfEq VAR_PASTORIA_STATE, 4, PastoriaCity_SetRivalPositionAfterGym
@@ -941,7 +941,7 @@ PastoriaCity_Movement_RivalPushBackPlayer:
 PastoriaCity_CoordEvent_FaceBoard:
    LockAll
    GoToIfSet FLAG_BLOCK_PASTORIA_CITY_CROAGUNK_EVENT, PastoriaCity_FaceBoardEnd
-    SetVar VAR_PASTORIA_CITY_TRY_CROAGUNK_SCENE_STATE, 1
+    SetVar VAR_PASTORIA_CITY_CROAGUNK_SCENE_STATE, 1
    GetRandom VAR_RESULT, 100
    GoToIfGe VAR_RESULT, 90, PastoriaCity_CroagunkScene
    GoTo PastoriaCity_FaceBoardEnd
--- a/res/field/scripts/scripts_pastoria_city_gym.s
+++ b/res/field/scripts/scripts_pastoria_city_gym.s
@@ -68,13 +68,13 @@ PastoriaGym_Wake:
    SetFlag FLAG_BLOCK_PASTORIA_CITY_CROAGUNK_EVENT
    CreateJournalEvent LOCATION_EVENT_BEAT_GYM_LEADER, MAP_HEADER_PASTORIA_CITY_GYM, TRAINER_LEADER_WAKE
    Message PastoriaGym_Text_WakeExplainFenBadge
-    GoTo PastoriaGym_WakeTryGiveTm55
+    GoTo PastoriaGym_WakeTryGiveTM55
    End

-PastoriaGym_WakeTryGiveTm55:
+PastoriaGym_WakeTryGiveTM55:
    SetVar VAR_0x8004, ITEM_TM55
    SetVar VAR_0x8005, 1
-    GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, PastoriaGym_WakeCannotGiveTm55
+    GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, PastoriaGym_WakeCannotGiveTM55
    Common_GiveItemQuantity
    SetFlag FLAG_OBTAINED_WAKE_TM55
    BufferItemName 0, VAR_0x8004
@@ -85,14 +85,14 @@ PastoriaGym_WakeTryGiveTm55:
    ReleaseAll
    End

-PastoriaGym_WakeCannotGiveTm55:
+PastoriaGym_WakeCannotGiveTM55:
    Common_MessageBagIsFull
    CloseMessage
    ReleaseAll
    End

 PastoriaGym_WakeAlreadyHaveFenBadge:
-    GoToIfUnset FLAG_OBTAINED_WAKE_TM55, PastoriaGym_WakeTryGiveTm55
+    GoToIfUnset FLAG_OBTAINED_WAKE_TM55, PastoriaGym_WakeTryGiveTM55
    Message PastoriaGym_Text_WakeAfterbadge
    WaitButton
    CloseMessage
--- a/res/field/scripts/scripts_poffin_house.s
+++ b/res/field/scripts/scripts_poffin_house.s
@@ -37,7 +37,7 @@ PoffinHouse_AddReporter:
    End

 PoffinHouse_Idol:
-    NPCMessage PoffinHouse_Text_HeresMyAdviceOnCookingPoffins
+    NPCMessage PoffinHouse_Text_AdviceOnCookingPoffins
    End

 PoffinHouse_OldMan:
@@ -45,9 +45,9 @@ PoffinHouse_OldMan:
    End

 PoffinHouse_OldWoman:
-    NPCMessage PoffinHouse_Text_EatingMakesPeopleAndPokemonHappy
+    NPCMessage PoffinHouse_Text_EatingMakesPeopleHappy
    End

 PoffinHouse_SchoolKidF:
-    NPCMessage PoffinHouse_Text_AtTheWiFiClubICanCookWithFriends
+    NPCMessage PoffinHouse_Text_ICanCookWithFriends
    End
--- a/res/field/scripts/scripts_pokemon_league.s
+++ b/res/field/scripts/scripts_pokemon_league.s
@@ -16,7 +16,7 @@ PokemonLeague_SignboardVictoryRoad:
    End

 PokemonLeague_Statue:
-    EventMessage PokemonLeague_Text_PokemonLeagueThePinnacleOfTrainerdom
+    EventMessage PokemonLeague_Text_PinnacleOfTrainerdom
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_pokemon_league_aaron_room.s
+++ b/res/field/scripts/scripts_pokemon_league_aaron_room.s
@@ -4,7 +4,7 @@


    ScriptEntry PokemonLeagueAaronRoom_Aaron
-    ScriptEntry PokemonLeagueAaronRoom_OnFrame
+    ScriptEntry PokemonLeagueAaronRoom_OnFrame_EnterRoom
    ScriptEntryEnd

 PokemonLeagueAaronRoom_Aaron:
@@ -58,7 +58,7 @@ PokemonLeagueAaronRoom_AaronPostBattle:
    ReleaseAll
    End

-PokemonLeagueAaronRoom_OnFrame:
+PokemonLeagueAaronRoom_OnFrame_EnterRoom:
    LockAll
    ApplyMovement LOCALID_PLAYER, PokemonLeagueAaronRoom_Movement_PlayerEnterRoom
    WaitMovement
--- a/res/field/scripts/scripts_pokemon_league_bertha_room.s
+++ b/res/field/scripts/scripts_pokemon_league_bertha_room.s
@@ -4,7 +4,7 @@


    ScriptEntry PokemonLeagueBerthaRoom_Bertha
-    ScriptEntry PokemonLeagueBerthaRoom_OnFrame
+    ScriptEntry PokemonLeagueBerthaRoom_OnFrame_EnterRoom
    ScriptEntryEnd

 PokemonLeagueBerthaRoom_Bertha:
@@ -58,7 +58,7 @@ PokemonLeagueBerthaRoom_BerthaPostBattle:
    ReleaseAll
    End

-PokemonLeagueBerthaRoom_OnFrame:
+PokemonLeagueBerthaRoom_OnFrame_EnterRoom:
    LockAll
    ApplyMovement LOCALID_PLAYER, PokemonLeagueBerthaRoom_Movement_PlayerEnterRoom
    WaitMovement
--- a/res/field/scripts/scripts_pokemon_league_champion_room.s
+++ b/res/field/scripts/scripts_pokemon_league_champion_room.s
@@ -4,14 +4,14 @@


    ScriptEntry PokemonLeagueChampionRoom_OnTransition
-    ScriptEntry PokemonLeagueChampionRoom_OnFrame
+    ScriptEntry PokemonLeagueChampionRoom_OnFrame_EnterRoom
    ScriptEntryEnd

 PokemonLeagueChampionRoom_OnTransition:
    InitPersistedMapFeaturesForPlatformLift
    End

-PokemonLeagueChampionRoom_OnFrame:
+PokemonLeagueChampionRoom_OnFrame_EnterRoom:
    ApplyMovement LOCALID_PLAYER, PokemonLeagueChampionRoom_Movement_PlayerApproachCynthia
    WaitMovement
    PlayTrainerEncounterBGM TRAINER_CHAMPION_CYNTHIA
@@ -29,18 +29,18 @@ PokemonLeagueChampionRoom_OnFrame:
    CallIfSet FLAG_ARRESTED_CHARON_STARK_MOUNTAIN, PokemonLeagueChampionRoom_CreateJournalEventDefeatedRematchCynthia
    Message PokemonLeagueChampionRoom_Text_ComeWithMe
    CloseMessage
-    ApplyMovement LOCALID_CYNTHIA, PokemonLeagueChampionRoom_CynthiaMoveAwayFromElevator
+    ApplyMovement LOCALID_CYNTHIA, PokemonLeagueChampionRoom_Movement_CynthiaWalkAwayFromElevator
    WaitMovement
-    ApplyMovement LOCALID_PLAYER, PokemonLeagueChampionRoom_PlayerEnterElevator
+    ApplyMovement LOCALID_PLAYER, PokemonLeagueChampionRoom_Movement_PlayerEnterElevator
    WaitMovement
-    ApplyMovement LOCALID_CYNTHIA, PokemonLeagueChampionRoom_CynthiaFacePlayer
+    ApplyMovement LOCALID_CYNTHIA, PokemonLeagueChampionRoom_Movement_CynthiaFacePlayer
    WaitMovement
    WaitTime 30, VAR_RESULT
    TriggerPlatformLift
    WaitTime 30, VAR_RESULT
    SetFlag FLAG_HIDE_POKEMON_LEAGUE_HALLWAY_TO_HALL_OF_FAME_CYNTHIA
    SetFlag FLAG_HIDE_POKEMON_LEAGUE_HALLWAY_TO_HALL_OF_FAME_PROF_ROWAN
-    ApplyMovement LOCALID_PLAYER, PokemonLeagueChampionRoom_EnterHallwayToHallOfFame
+    ApplyMovement LOCALID_PLAYER, PokemonLeagueChampionRoom_Movement_PlayerEnterHallwayToHallOfFame
    WaitMovement
    PlaySE SEQ_SE_DP_KAIDAN2
    FadeScreenOut
@@ -87,22 +87,22 @@ PokemonLeagueChampionRoom_Movement_PlayerApproachCynthia:
    EndMovement

    .balign 4, 0
-PokemonLeagueChampionRoom_PlayerEnterElevator:
+PokemonLeagueChampionRoom_Movement_PlayerEnterElevator:
    WalkNormalNorth 6
    EndMovement

    .balign 4, 0
-PokemonLeagueChampionRoom_EnterHallwayToHallOfFame:
+PokemonLeagueChampionRoom_Movement_PlayerEnterHallwayToHallOfFame:
    WalkNormalNorth 6
    EndMovement

    .balign 4, 0
-PokemonLeagueChampionRoom_CynthiaMoveAwayFromElevator:
+PokemonLeagueChampionRoom_Movement_CynthiaWalkAwayFromElevator:
    WalkNormalWest
    WalkOnSpotNormalSouth
    EndMovement

    .balign 4, 0
-PokemonLeagueChampionRoom_CynthiaFacePlayer:
+PokemonLeagueChampionRoom_Movement_CynthiaFacePlayer:
    WalkOnSpotNormalNorth
    EndMovement
--- a/res/field/scripts/scripts_pokemon_league_flint_room.s
+++ b/res/field/scripts/scripts_pokemon_league_flint_room.s
@@ -4,7 +4,7 @@


    ScriptEntry PokemonLeagueFlintRoom_Flint
-    ScriptEntry PokemonLeagueFlintRoom_OnFrame
+    ScriptEntry PokemonLeagueFlintRoom_OnFrame_EnterRoom
    ScriptEntryEnd

 PokemonLeagueFlintRoom_Flint:
@@ -98,7 +98,7 @@ PokemonLeagueFlintRoom_Movement_WalkFastInPlace:
    UnlockDir
    EndMovement

-PokemonLeagueFlintRoom_OnFrame:
+PokemonLeagueFlintRoom_OnFrame_EnterRoom:
    LockAll
    ApplyMovement LOCALID_PLAYER, PokemonLeagueFlintRoom_Movement_PlayerEnterRoom
    WaitMovement
--- a/res/field/scripts/scripts_pokemon_league_hall_of_fame.s
+++ b/res/field/scripts/scripts_pokemon_league_hall_of_fame.s
@@ -4,10 +4,10 @@
 #include "res/field/events/events_pokemon_league_hall_of_fame.h"


-    ScriptEntry PokemonLeagueHallOfFame_OnFrame
+    ScriptEntry PokemonLeagueHallOfFame_OnFrame_EnterHallOfFame
    ScriptEntryEnd

-PokemonLeagueHallOfFame_OnFrame:
+PokemonLeagueHallOfFame_OnFrame_EnterHallOfFame:
    LockAll
    ApplyMovement LOCALID_PLAYER, PokemonLeague_HallOfFame_Movement_WalkUp
    WaitMovement
@@ -42,7 +42,7 @@ PokemonLeagueHallOfFame_EnterHallOfFame:
    ApplyMovement LOCALID_PROF_ROWAN, PokemonLeagueHallOfFame_Movement_RowanFaceMachine
    ApplyMovement LOCALID_CYNTHIA, PokemonLeagueHallOfFame_Movement_CynthiaFaceMachine
    WaitMovement
-    Message PokemonLeagueHallOfFame_Text_TimeToRecordYourNameAndYourPokemon
+    Message PokemonLeagueHallOfFame_Text_RecordYourNameAndPokemon
    CloseMessage
    SetFlag FLAG_UNLOCKED_VS_SEEKER_LVL_4
    GetNationalDexEnabled VAR_RESULT
@@ -76,7 +76,7 @@ PokemonLeagueHallOfFame_FirstVictoryMessages:

 PokemonLeagueHallOfFame_RepeatVictoryMessages:
    Message PokemonLeagueHallOfFame_Text_AlwaysStraighterThanUsual
-    Message PokemonLeagueHallOfFame_Text_ThisRoomIsALegacyToPokemonAndTrainers
+    Message PokemonLeagueHallOfFame_Text_LegacyToPokemonAndTrainers
    Return

    .balign 4, 0
@@ -156,7 +156,7 @@ PokemonLeagueHallOfFame_ResetSpearPillarPalkiaState:
    Return

 PokemonLeagueHallOfFame_TryShowStarkMountainHeatran:
-    GoToIfUnset FLAG_CAUGHT_MESPRIT, PokemonLeagueHallOfFame_DontShowStarkMountainHeatran
+    GoToIfUnset FLAG_TALKED_TO_BATTLEGROUND_BUCK, PokemonLeagueHallOfFame_DontShowStarkMountainHeatran
    ClearFlag FLAG_HIDE_STARK_MOUNTAIN_ROOM_3_HEATRAN
    SetVar VAR_STARK_MOUNTAIN_ROOM_3_STATE, 1
 PokemonLeagueHallOfFame_DontShowStarkMountainHeatran:
--- a/res/field/scripts/scripts_pokemon_league_hallway_to_hall_of_fame.s
+++ b/res/field/scripts/scripts_pokemon_league_hallway_to_hall_of_fame.s
@@ -3,11 +3,11 @@
 #include "res/field/events/events_pokemon_league_hallway_to_hall_of_fame.h"


-    ScriptEntry PokemonLeagueHallwayToHallOfFame_OnFrame
-    ScriptEntry PokemonLeagueHallwayToHallOfFame_OnFrame
+    ScriptEntry PokemonLeagueHallwayToHallOfFame_OnFrame_EnterHallOfFame
+    ScriptEntry PokemonLeagueHallwayToHallOfFame_OnFrame_EnterHallOfFame
    ScriptEntryEnd

-PokemonLeagueHallwayToHallOfFame_OnFrame:
+PokemonLeagueHallwayToHallOfFame_OnFrame_EnterHallOfFame:
    LockAll
    ApplyMovement LOCALID_PLAYER, PokemonLeagueHallwayToHallOfFame_Movement_PlayerEnterHallway
    WaitMovement
@@ -18,7 +18,7 @@ PokemonLeagueHallwayToHallOfFame_OnFrame:
    ApplyMovement LOCALID_CYNTHIA, PokemonLeagueHallwayToHallOfFame_Movement_CynthiaApproachPlayer
    ApplyMovement LOCALID_PLAYER, PokemonLeagueHallwayToHallOfFame_Movement_PlayerFaceCynthia
    WaitMovement
-    Message PokemonLeagueHallwayToHallOfFame_Text_TheRoomAheadIsTheHallOfFame
+    Message PokemonLeagueHallwayToHallOfFame_Text_RoomAheadIsHallOfFame
    CloseMessage
    SetObjectEventPos LOCALID_PROF_ROWAN, 4, 14
    ClearFlag FLAG_HIDE_POKEMON_LEAGUE_HALLWAY_TO_HALL_OF_FAME_PROF_ROWAN
@@ -35,10 +35,10 @@ PokemonLeagueHallwayToHallOfFame_OnFrame:
    WaitMovement
    Message PokemonLeagueHallwayToHallOfFame_Text_HelloProfessorRowan
    BufferPlayerName 0
-    Message PokemonLeagueHallwayToHallOfFame_Text_YouveGrownIntoARealChampion
+    Message PokemonLeagueHallwayToHallOfFame_Text_GrownIntoRealChampion
    ApplyMovement LOCALID_CYNTHIA, PokemonLeagueHallwayToHallOfFame_Movement_WalkInPlaceWest
    WaitMovement
-    Message PokemonLeagueHallwayToHallOfFame_Text_ProfessorYouStillEnjoyEnthusiasm
+    Message PokemonLeagueHallwayToHallOfFame_Text_YouStillEnjoyEnthusiasm
    GetPlayerGender VAR_RESULT
    GoToIfEq VAR_RESULT, GENDER_MALE, PokemonLeagueHallwayToHallOfFame_StepThisWayPleaseMale
    GoToIfEq VAR_RESULT, GENDER_FEMALE, PokemonLeagueHallwayToHallOfFame_StepThisWayPleaseFemale
@@ -55,7 +55,7 @@ PokemonLeagueHallwayToHallOfFame_StepThisWayPleaseFemale:
    GoTo PokemonLeagueHallwayToHallOfFame_EnterHallOfFameRoom

 PokemonLeagueHallwayToHallOfFame_EnterHallOfFameRoom:
-    Message PokemonLeagueHallwayToHallOfFame_Text_ProfessorRowanPleaseJoinUs
+    Message PokemonLeagueHallwayToHallOfFame_Text_ProfessorPleaseJoinUs
    CloseMessage
    ApplyMovement LOCALID_CYNTHIA, PokemonLeagueHallwayToHallOfFame_Movement_CynthiaEnterHallOfFameRoom
    ApplyMovement LOCALID_PROF_ROWAN, PokemonLeagueHallwayToHallOfFame_Movement_RowanEnterHallOfFameRoom
--- a/res/field/scripts/scripts_pokemon_league_lucian_room.s
+++ b/res/field/scripts/scripts_pokemon_league_lucian_room.s
@@ -4,7 +4,7 @@


    ScriptEntry PokemonLeagueLucianRoom_Lucian
-    ScriptEntry PokemonLeagueLucianRoom_OnFrame
+    ScriptEntry PokemonLeagueLucianRoom_OnFrame_EnterRoom
    ScriptEntryEnd

 PokemonLeagueLucianRoom_Lucian:
@@ -58,7 +58,7 @@ PokemonLeagueLucianRoom_LucianPostBattle:
    ReleaseAll
    End

-PokemonLeagueLucianRoom_OnFrame:
+PokemonLeagueLucianRoom_OnFrame_EnterRoom:
    LockAll
    ApplyMovement LOCALID_PLAYER, PokemonLeagueLucianRoom_Movement_PlayerEnterRoom
    WaitMovement
--- a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s
+++ b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s
@@ -27,11 +27,11 @@ PokemonLeagueNorthPokecenter1F_OnTransition:
    ClearFlag FLAG_DEFEATED_BERTHA
    ClearFlag FLAG_DEFEATED_FLINT
    ClearFlag FLAG_DEFEATED_LUCIAN
-    GoToIfSet FLAG_POKEMON_LEAGUE_DOOR_GUARD_MOVED_AWAY, PokemonLeagueNorthPokecenter1F_MoveDoorGuardAwayFromDoor
+    GoToIfSet FLAG_POKEMON_LEAGUE_DOOR_GUARD_MOVED_AWAY, PokemonLeagueNorthPokecenter1F_SetPositionDoorGuardAwayFromDoor
    End

-PokemonLeagueNorthPokecenter1F_MoveDoorGuardAwayFromDoor:
-    SetObjectEventPos 0, 12, 3
+PokemonLeagueNorthPokecenter1F_SetPositionDoorGuardAwayFromDoor:
+    SetObjectEventPos LOCALID_LEAGUE_NORTH_DOOR_GUARD, 12, 3
    End

 PokemonLeagueNorthPokecenter1F_DoorGuard:
@@ -39,7 +39,7 @@ PokemonLeagueNorthPokecenter1F_DoorGuard:
    LockAll
    FacePlayer
    GoToIfSet FLAG_POKEMON_LEAGUE_DOOR_GUARD_MOVED_AWAY, PokemonLeagueNorthPokecenter1F_DoorGuardAfterMovingAway
-    Message PokemonLeagueNorthPokecenter1F_Text_LetUsExamineYourGymBadges
+    Message PokemonLeagueNorthPokecenter1F_Text_ExamineGymBadges
    CloseMessage
    PlayFanfare SEQ_BADGE
    WaitFanfare
@@ -50,30 +50,30 @@ PokemonLeagueNorthPokecenter1F_DoorGuard:
    End

 PokemonLeagueNorthPokecenter1F_DoorGuardMoveAwayEastSouth:
-    ApplyMovement LOCALID_LEAGUE_NORTH_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayEastSouth
+    ApplyMovement LOCALID_LEAGUE_NORTH_DOOR_GUARD, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayEastSouth
    WaitMovement
    GoTo PokemonLeagueNorthPokecenter1F_DoorGuardMovedAway

 PokemonLeagueNorthPokecenter1F_DoorGuardMoveAwayWest:
-    ApplyMovement LOCALID_LEAGUE_NORTH_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayWest
+    ApplyMovement LOCALID_LEAGUE_NORTH_DOOR_GUARD, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayWest
    WaitMovement
    GoTo PokemonLeagueNorthPokecenter1F_DoorGuardMovedAway

 PokemonLeagueNorthPokecenter1F_DoorGuardMoveAwayEastWest:
-    ApplyMovement LOCALID_LEAGUE_NORTH_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayEastWest
+    ApplyMovement LOCALID_LEAGUE_NORTH_DOOR_GUARD, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayEastWest
    WaitMovement
    GoTo PokemonLeagueNorthPokecenter1F_DoorGuardMovedAway

 PokemonLeagueNorthPokecenter1F_DoorGuardMovedAway:
    SetFlag FLAG_POKEMON_LEAGUE_DOOR_GUARD_MOVED_AWAY
-    Message PokemonLeagueNorthPokecenter1F_Text_YouveCollectedAllGymBadges
+    Message PokemonLeagueNorthPokecenter1F_Text_CollectedAllGymBadges
    WaitButton
    CloseMessage
    ReleaseAll
    End

 PokemonLeagueNorthPokecenter1F_DoorGuardAfterMovingAway:
-    Message PokemonLeagueNorthPokecenter1F_Text_YouWillBeFacingTheEliteFour
+    Message PokemonLeagueNorthPokecenter1F_Text_YouWillFaceTheEliteFour
    WaitButton
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s
+++ b/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s
@@ -28,7 +28,7 @@ PokemonLeagueSouthPokecenter1F_VendorSpecial_Unused:
    End

 PokemonLeagueSouthPokecenter1F_Pokefan:
-    NPCMessage PokemonLeagueSouthPokecenter1F_Text_TheObjectiveIsToReachThePokemonLeague
+    NPCMessage PokemonLeagueSouthPokecenter1F_Text_ReachThePokemonLeague
    End

 PokemonLeagueSouthPokecenter1F_AceTrainer:
--- a/res/field/scripts/scripts_poketch_co_1f.s
+++ b/res/field/scripts/scripts_poketch_co_1f.s
@@ -25,9 +25,9 @@ PoketchCo1F_PoketchCoPresident:
    PlaySE SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message PoketchCo1F_Text_ImThePresidentOfThePoketchCompany
+    Message PoketchCo1F_Text_PresidentOfPoketchCompany
    CountBadgesAcquired VAR_0x8000
-    GoToIfEq VAR_0x8000, 0, PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetAGymBadge
+    GoToIfEq VAR_0x8000, 0, PoketchCo1F_NewAppWhenYouGetAGymBadge
    CheckPoketchAppRegistered POKETCH_APPID_MEMOPAD, VAR_RESULT
    GoToIfEq VAR_RESULT, FALSE, PoketchCo1F_CheckBadgesForMemoPadApp
    CheckPoketchAppRegistered POKETCH_APPID_MARKINGMAP, VAR_RESULT
@@ -37,31 +37,31 @@ PoketchCo1F_PoketchCoPresident:
    CheckPoketchAppRegistered POKETCH_APPID_MOVETESTER, VAR_RESULT
    GoToIfEq VAR_RESULT, FALSE, PoketchCo1F_CheckBadgesForMoveTesterApp
    CheckItem ITEM_POKE_RADAR, 1, VAR_RESULT
-    GoToIfEq VAR_RESULT, TRUE, PoketchCo1F_DoYouThinkIShouldSolicitNewPoketchIdeas
-    GoTo PoketchCo1F_YupAllSortsOfPeopleWillGiveYouPoketchApps
+    GoToIfEq VAR_RESULT, TRUE, PoketchCo1F_ShouldISolicitNewPoketchIdeas
+    GoTo PoketchCo1F_AllSortsOfPeopleGivePoketchApps

 PoketchCo1F_CheckBadgesForMemoPadApp:
    CountBadgesAcquired VAR_RESULT
    GoToIfGe VAR_RESULT, 1, PoketchCo1F_GiveMemoPadApp
-    GoTo PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetAGymBadge
+    GoTo PoketchCo1F_NewAppWhenYouGetAGymBadge

 PoketchCo1F_CheckBadgesForMarkingMapApp:
    CountBadgesAcquired VAR_RESULT
    GoToIfGe VAR_RESULT, 3, PoketchCo1F_GiveMarkingMapApp
-    GoTo PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetThreeGymBadges
+    GoTo PoketchCo1F_NewAppWhenYouGetThreeBadges

 PoketchCo1F_CheckBadgesForLinkSearcherApp:
    CountBadgesAcquired VAR_RESULT
    GoToIfGe VAR_RESULT, 5, PoketchCo1F_GiveLinkSearcherApp
-    GoTo PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetFiveGymBadges
+    GoTo PoketchCo1F_NewAppWhenYouGetFiveBadges

 PoketchCo1F_CheckBadgesForMoveTesterApp:
    CountBadgesAcquired VAR_RESULT
    GoToIfGe VAR_RESULT, 7, PoketchCo1F_GiveMoveTesterApp
-    GoTo PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetSevenGymBadges
+    GoTo PoketchCo1F_NewAppWhenYouGetSevenBadges

 PoketchCo1F_GiveMemoPadApp:
-    Message PoketchCo1F_Text_IveDevelopedANewPoketchApp
+    Message PoketchCo1F_Text_IveDevelopedANewApp
    SetVar VAR_0x8004, POKETCH_APPID_MEMOPAD
    Common_GivePoketchApp
    Message PoketchCo1F_Text_ThatsTheMemoPad
@@ -71,79 +71,79 @@ PoketchCo1F_GiveMemoPadApp:
    End

 PoketchCo1F_GiveMarkingMapApp:
-    Message PoketchCo1F_Text_IveDevelopedAnotherNewPoketchApp
+    Message PoketchCo1F_Text_IveDevelopedAnotherApp
    SetVar VAR_0x8004, POKETCH_APPID_MARKINGMAP
    Common_GivePoketchApp
-    Message PoketchCo1F_Text_HavingAMapConstantlyDisplayedIsConvenientNo
+    Message PoketchCo1F_Text_MapDisplayedIsConvenient
    WaitButton
    CloseMessage
    ReleaseAll
    End

 PoketchCo1F_GiveLinkSearcherApp:
-    Message PoketchCo1F_Text_IveDevelopedYetAnotherNewPoketchApp
+    Message PoketchCo1F_Text_IveDevelopedYetAnotherApp
    SetVar VAR_0x8004, POKETCH_APPID_LINKSEARCHER
    Common_GivePoketchApp
-    Message PoketchCo1F_Text_IThinkItWillBeUsefulToKnowHowManyPeopleAreCommunicating
+    Message PoketchCo1F_Text_KnowHowManyPeopleAreCommunicating
    WaitButton
    CloseMessage
    ReleaseAll
    End

 PoketchCo1F_GiveMoveTesterApp:
-    Message PoketchCo1F_Text_IveDevelopedStillYetAnotherNewPoketchApp
+    Message PoketchCo1F_Text_IveDevelopedStillYetAnotherApp
    SetVar VAR_0x8004, POKETCH_APPID_MOVETESTER
    Common_GivePoketchApp
-    Message PoketchCo1F_Text_CheckTypeMatchupsSoYouCanMakeAllYourAttackSuperEffective
+    Message PoketchCo1F_Text_CheckTypeMatchups
    WaitButton
    CloseMessage
    ReleaseAll
    End

-PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetAGymBadge:
-    Message PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetAGymBadge
+PoketchCo1F_NewAppWhenYouGetAGymBadge:
+    Message PoketchCo1F_Text_NewAppWhenYouGetAGymBadge
    WaitButton
    CloseMessage
    ReleaseAll
    End

-PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetThreeGymBadges:
-    Message PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetThreeGymBadges
+PoketchCo1F_NewAppWhenYouGetThreeBadges:
+    Message PoketchCo1F_Text_NewAppWhenYouGetThreeBadges
    WaitButton
    CloseMessage
    ReleaseAll
    End

-PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetFiveGymBadges:
-    Message PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetFiveGymBadges
+PoketchCo1F_NewAppWhenYouGetFiveBadges:
+    Message PoketchCo1F_Text_NewAppWhenYouGetFiveBadges
    WaitButton
    CloseMessage
    ReleaseAll
    End

-PoketchCo1F_NewPoketchAppWillBeReadyWhenYouGetSevenGymBadges:
-    Message PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetSevenGymBadges
+PoketchCo1F_NewAppWhenYouGetSevenBadges:
+    Message PoketchCo1F_Text_NewAppWhenYouGetSevenBadges
    WaitButton
    CloseMessage
    ReleaseAll
    End

-PoketchCo1F_YupAllSortsOfPeopleWillGiveYouPoketchApps:
-    Message PoketchCo1F_Text_YupAllSortsOfPeopleWillGiveYouPoketchApps
+PoketchCo1F_AllSortsOfPeopleGivePoketchApps:
+    Message PoketchCo1F_Text_AllSortsOfPeopleGivePoketchApps
    WaitButton
    CloseMessage
    ReleaseAll
    End

-PoketchCo1F_DoYouThinkIShouldSolicitNewPoketchIdeas:
-    Message PoketchCo1F_Text_DoYouThinkIShouldSolicitNewPoketchIdeas
+PoketchCo1F_ShouldISolicitNewPoketchIdeas:
+    Message PoketchCo1F_Text_ShouldISolicitNewPoketchIdeas
    WaitButton
    CloseMessage
    ReleaseAll
    End

 PoketchCo1F_ScientistM:
-    NPCMessage PoketchCo1F_Text_OhYouCanBeSureIWillKeepDevelopingPoketchApps
+    NPCMessage PoketchCo1F_Text_IWillKeepDeveloping
    End

 PoketchCo1F_Receptionist:
--- a/res/field/scripts/scripts_poketch_co_2f.s
+++ b/res/field/scripts/scripts_poketch_co_2f.s
@@ -9,19 +9,19 @@
    ScriptEntryEnd

 PoketchCo2F_PokefanM:
-    NPCMessage PoketchCo2F_Text_WellTryToThinkLikeATrainerAndFindWhatPoketchAppsWouldBeGood
+    NPCMessage PoketchCo2F_Text_WellThinkLikeATrainer
    End

 PoketchCo2F_OldMan:
-    NPCMessage PoketchCo2F_Text_PokemonWatchThatsPoketchForShort
+    NPCMessage PoketchCo2F_Text_PoketchForShort
    End

 PoketchCo2F_Clefairy:
-    PokemonCryAndMessage SPECIES_CLEFAIRY, PoketchCo2F_Text_ClefairyCleffy
+    PokemonCryAndMessage SPECIES_CLEFAIRY, PoketchCo2F_Text_ClefairyCry
    End

 PoketchCo2F_Pachirisu:
-    PokemonCryAndMessage SPECIES_PACHIRISU, PoketchCo2F_Text_PachirisuPatchii
+    PokemonCryAndMessage SPECIES_PACHIRISU, PoketchCo2F_Text_PachirisuCry
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_poketch_co_3f.s
+++ b/res/field/scripts/scripts_poketch_co_3f.s
@@ -13,7 +13,7 @@
    ScriptEntryEnd

 PoketchCo3F_NinjaBoy:
-    NPCMessage PoketchCo3F_Text_TheresAGirlsModelAndABoysModel
+    NPCMessage PoketchCo3F_Text_TheresGenderedModels
    End

 PoketchCo3F_PokefanF:
@@ -21,16 +21,16 @@ PoketchCo3F_PokefanF:
    End

 PoketchCo3F_ExpertF:
-    NPCMessage PoketchCo3F_Text_PeopleEverywhereMakePoketchApps
+    NPCMessage PoketchCo3F_Text_PeopleEverywhereMakeApps
    End

 PoketchCo3F_PCSouthWest:
    PlaySE SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps1
+    Message PoketchCo3F_Text_DescriptionsOfPoketchApps1
 PoketchCo3F_PCSouthWestAddMenuEntries:
-    Message PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout1
+    Message PoketchCo3F_Text_ReadAboutWhichPoketchApp1
    InitGlobalTextMenu 1, 1, 0, VAR_0x8004
    CheckPoketchEnabled VAR_RESULT
    GoToIfEq VAR_RESULT, 0, PoketchCo3F_PCSouthWestShowMenu
@@ -120,9 +120,9 @@ PoketchCo3F_PCSouthMiddle:
    PlaySE SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps2
+    Message PoketchCo3F_Text_DescriptionsOfPoketchApps2
 PoketchCo3F_PCSouthMiddleAddMenuEntries:
-    Message PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout2
+    Message PoketchCo3F_Text_ReadAboutWhichPoketchApp2
    InitGlobalTextMenu 1, 1, 0, VAR_0x8004
    CheckPoketchEnabled VAR_RESULT
    GoToIfEq VAR_RESULT, 0, PoketchCo3F_PCSouthMiddleShowMenu
@@ -224,9 +224,9 @@ PoketchCo3F_PCSouthEast:
    PlaySE SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps3
+    Message PoketchCo3F_Text_DescriptionsOfPoketchApps3
 PoketchCo3F_PCSouthEastAddMenuEntries:
-    Message PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout3
+    Message PoketchCo3F_Text_ReadAboutWhichPoketchApp3
    InitGlobalTextMenu 1, 1, 0, VAR_0x8004
    CheckPoketchEnabled VAR_RESULT
    GoToIfEq VAR_RESULT, 0, PoketchCo3F_PCSouthEastShowMenu
@@ -316,9 +316,9 @@ PoketchCo3F_PCNorthWest:
    PlaySE SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps4
+    Message PoketchCo3F_Text_DescriptionsOfPoketchApps4
 PoketchCo3F_PCNorthWestAddMenuEntries:
-    Message PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout4
+    Message PoketchCo3F_Text_ReadAboutWhichPoketchApp4
    InitGlobalTextMenu 1, 1, 0, VAR_0x8004
    CheckPoketchEnabled VAR_RESULT
    GoToIfEq VAR_RESULT, 0, PoketchCo3F_PCNorthWestShowMenu
--- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s
+++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s
@@ -4,10 +4,10 @@
 #include "res/field/events/events_resort_area_ribbon_syndicate_elevator.h"


-    ScriptEntry ResortAreaRibbonSyndicateElevator_TalkElevatorOperator
+    ScriptEntry ResortAreaRibbonSyndicateElevator_Receptionist
    ScriptEntryEnd

-ResortAreaRibbonSyndicateElevator_TalkElevatorOperator:
+ResortAreaRibbonSyndicateElevator_Receptionist:
    PlaySE SEQ_SE_CONFIRM
    LockAll
    FacePlayer
--- a/res/field/scripts/scripts_rock_peak_ruins.s
+++ b/res/field/scripts/scripts_rock_peak_ruins.s
@@ -27,11 +27,11 @@ RockPeakRuins_Statue:
    FacePlayer
    GoToIfEq VAR_ROCK_PEAK_RUINS_STATE, RUINS_STATE_CAUGHT_REGI, RockPeakRuins_CaughtRegirockStatueStoppedEmanatingPower
    GoToIfEq VAR_ROCK_PEAK_RUINS_STATE, RUINS_STATE_DID_NOT_CATCH_REGI, RockPeakRuins_DidNotCatchRegirockStatueStoppedEmanatingPower
-    GoToIfUnset FLAG_GAME_COMPLETED, RockPeakRuins_ItsAStatueOfAPokemonItSeemsToExudePower
+    GoToIfUnset FLAG_GAME_COMPLETED, RockPeakRuins_SeemsToExudePower
    CheckPartyHasFatefulEncounterRegigigas VAR_RESULT
-    GoToIfEq VAR_RESULT, 0, RockPeakRuins_ItsAStatueOfAPokemonFromSomewhereSomethingSpokeOut
+    GoToIfEq VAR_RESULT, 0, RockPeakRuins_FromSomewhereSomethingSpokeOut
    GoToIfEq VAR_ROCK_PEAK_RUINS_STATE, RUINS_STATE_ACTIVATED_STATUE, RockPeakRuins_EncounterRegirock
-    GoToIfLt VAR_ROCK_PEAK_RUINS_STATE, RUINS_STATE_ACTIVATED_ALL_DOTS, RockPeakRuins_ItsAStatueOfAPokemonFromSomewhereSomethingSpokeOut
+    GoToIfLt VAR_ROCK_PEAK_RUINS_STATE, RUINS_STATE_ACTIVATED_ALL_DOTS, RockPeakRuins_FromSomewhereSomethingSpokeOut
    WaitSE SEQ_SE_CONFIRM
    ScrCmd_29F 1
    SetVar VAR_ROCK_PEAK_RUINS_STATE, RUINS_STATE_ACTIVATED_STATUE
@@ -69,13 +69,13 @@ RockPeakRuins_BlackOut:
    ReleaseAll
    End

-RockPeakRuins_ItsAStatueOfAPokemonItSeemsToExudePower:
-    Message RockPeakRuins_Text_ItsAStatueOfAPokemonItSeemsToExudePower
+RockPeakRuins_SeemsToExudePower:
+    Message RockPeakRuins_Text_SeemsToExudePower
    GoTo RockPeakRuins_StatueEnd
    End

-RockPeakRuins_ItsAStatueOfAPokemonFromSomewhereSomethingSpokeOut:
-    Message RockPeakRuins_Text_ItsAStatueOfAPokemonFromSomewhereSomethingSpokeOut
+RockPeakRuins_FromSomewhereSomethingSpokeOut:
+    Message RockPeakRuins_Text_FromSomewhereSomethingSpokeOut
    GoTo RockPeakRuins_StatueEnd
    End

--- a/res/field/scripts/scripts_route_201.s
+++ b/res/field/scripts/scripts_route_201.s
@@ -17,7 +17,7 @@
    ScriptEntry Route201_Briefcase
    ScriptEntry Route201_CoordEvent_FollowingRivalStopPlayerEast
    ScriptEntry Route201_ProfRowan
-    ScriptEntry Route201_CoordEvent_LetsCatchThatLegendary
+    ScriptEntry Route201_CoordEvent_RivalStartFollowing
    ScriptEntryEnd

 Route201_OnTransition:
@@ -41,17 +41,17 @@ Route201_CoordEvent_ChooseStarterScene:
    Message Route201_Text_TooSlow
    CloseMessage
    GetPlayerMapPos VAR_0x8004, VAR_0x8005
-    GoToIfEq VAR_0x8004, 110, Route201_LetsGetMovingToProfRowansLabX110
-    GoToIfEq VAR_0x8004, 111, Route201_LetsGetMovingToProfRowansLabX111
-    GoToIfEq VAR_0x8004, 112, Route201_LetsGetMovingToProfRowansLabX112
-    GoToIfEq VAR_0x8004, 113, Route201_LetsGetMovingToProfRowansLabX113
+    GoToIfEq VAR_0x8004, 110, Route201_LetsGetMovingX110
+    GoToIfEq VAR_0x8004, 111, Route201_LetsGetMovingX111
+    GoToIfEq VAR_0x8004, 112, Route201_LetsGetMovingX112
+    GoToIfEq VAR_0x8004, 113, Route201_LetsGetMovingX113
    End

-Route201_LetsGetMovingToProfRowansLabX110:
+Route201_LetsGetMovingX110:
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalRunToPlayerX110
    WaitMovement
    BufferRivalName 0
-    Message Route201_Text_LetsGetMovingToProfRowansLab
+    Message Route201_Text_LetsGetMoving
    CloseMessage
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalWalkToGrassX110
    ApplyMovement LOCALID_PLAYER, Route201_Movement_PlayerWalkToGrassX110
@@ -59,11 +59,11 @@ Route201_LetsGetMovingToProfRowansLabX110:
    GoTo Route201_GoIntoTallGrass
    End

-Route201_LetsGetMovingToProfRowansLabX111:
+Route201_LetsGetMovingX111:
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalRunToPlayerX111
    WaitMovement
    BufferRivalName 0
-    Message Route201_Text_LetsGetMovingToProfRowansLab
+    Message Route201_Text_LetsGetMoving
    CloseMessage
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalWalkToGrassX111
    ApplyMovement LOCALID_PLAYER, Route201_Movement_PlayerWalkToGrassX111
@@ -71,11 +71,11 @@ Route201_LetsGetMovingToProfRowansLabX111:
    GoTo Route201_GoIntoTallGrass
    End

-Route201_LetsGetMovingToProfRowansLabX112:
+Route201_LetsGetMovingX112:
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalRunToPlayerX112
    WaitMovement
    BufferRivalName 0
-    Message Route201_Text_LetsGetMovingToProfRowansLab
+    Message Route201_Text_LetsGetMoving
    CloseMessage
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalWalkToGrassX112
    ApplyMovement LOCALID_PLAYER, Route201_Movement_PlayerWalkToGrassX112
@@ -83,11 +83,11 @@ Route201_LetsGetMovingToProfRowansLabX112:
    GoTo Route201_GoIntoTallGrass
    End

-Route201_LetsGetMovingToProfRowansLabX113:
+Route201_LetsGetMovingX113:
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalRunToPlayerX113
    WaitMovement
    BufferRivalName 0
-    Message Route201_Text_LetsGetMovingToProfRowansLab
+    Message Route201_Text_LetsGetMoving
    CloseMessage
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalWalkToGrassX113
    ApplyMovement LOCALID_PLAYER, Route201_Movement_PlayerWalkToGrassX113
@@ -97,12 +97,12 @@ Route201_LetsGetMovingToProfRowansLabX113:

 Route201_GoIntoTallGrass:
    BufferRivalName 0
-    Message Route201_Text_TrustMeIveGotAnIdea
+    Message Route201_Text_IveGotAnIdea
    CloseMessage
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalWalkToPlayer
    ApplyMovement LOCALID_PLAYER, Route201_Movement_PlayerWatchRivalWalkUp
    WaitMovement
-    Message Route201_Text_ScootOverBeforeWildPokemonCanAppear
+    Message Route201_Text_JustKeepDashing
    CloseMessage
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalWalkBackToRun
    ApplyMovement LOCALID_PLAYER, Route201_Movement_PlayerWatchRivalWalkBackToRun
@@ -124,7 +124,7 @@ Route201_GoIntoTallGrass:
    LockObject LOCALID_PROF_ROWAN
    ApplyMovement LOCALID_PROF_ROWAN, Route201_Movement_ProfRowanEnter
    WaitMovement
-    Message Route201_Text_YouTwoDontHaveAnyPokemon
+    Message Route201_Text_YouHaveNoPokemon
    BufferRivalName 0
    Message Route201_Text_RivalEllipsis
    Message Route201_Text_ProfessorEllipsis
@@ -132,7 +132,7 @@ Route201_GoIntoTallGrass:
    WaitMovement
    BufferRivalName 0
    BufferPlayerName 1
-    Message Route201_Text_ThisIsProfRowanIsntIt
+    Message Route201_Text_ThisIsProfRowan
    CloseMessage
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalFaceProfRowanThisIsProfRowan
    ApplyMovement LOCALID_PROF_ROWAN, Route201_Movement_ProfRowanWalkAway
@@ -142,7 +142,7 @@ Route201_GoIntoTallGrass:
    WaitTime 20, VAR_RESULT
    ApplyMovement LOCALID_PROF_ROWAN, Route201_Movement_ProfRowanWalkBack
    WaitMovement
-    Message Route201_Text_YouTrulyLovePokemonDoYou
+    Message Route201_Text_YouLovePokemonDoYou
    ShowYesNoMenu VAR_RESULT
    GoToIfEq VAR_RESULT, MENU_YES, Route201_WeLovePokemon
    GoToIfEq VAR_RESULT, MENU_NO, Route201_WeDontLovePokemon
@@ -152,11 +152,11 @@ Route201_WeDontLovePokemon:
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalFacePlayerDontLovePokemon
    WaitMovement
    BufferRivalName 0
-    Message Route201_Text_YoureNotMakingAnySense
+    Message Route201_Text_YoureNotMakingSense
    CloseMessage
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalWalkOnSpotNormalLeft
    WaitMovement
-    Message Route201_Text_IDidntQuiteCatchThat
+    Message Route201_Text_IDidntCatchThat
    ShowYesNoMenu VAR_RESULT
    GoToIfEq VAR_RESULT, MENU_YES, Route201_WeLovePokemon
    GoToIfEq VAR_RESULT, MENU_NO, Route201_WeDontLovePokemon
@@ -194,13 +194,13 @@ Route201_ThatJokesGettingOld:
    End

 Route201_WeStillLovePokemon:
-    Message Route201_Text_ItWorriesMeWhatPeopleWouldDo
+    Message Route201_Text_ItWorriesMe
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalWalkOnSpotFastLeft
    ApplyMovement LOCALID_PLAYER, Route201_Movement_PlayerFaceProfRowanWest
    WaitMovement
    BufferRivalName 0
-    Message Route201_Text_GiveAPokemonToMyFriendHere
-    Message Route201_Text_IWillEntrustYouWithPokemon
+    Message Route201_Text_GiveAPokemonToMyFriend
+    Message Route201_Text_EntrustYouWithPokemon
    CloseMessage
    ApplyMovement LOCALID_PROF_ROWAN, Route201_Movement_ProfRowanLookAround
    WaitMovement
@@ -217,31 +217,31 @@ Route201_WeStillLovePokemon:
    End

 Route201_DawnBringBriefcase:
-    Message Route201_Text_DawnYouLeftYourBriefcaseAtTheLake
+    Message Route201_Text_DawnYouLeftYourBriefcase
    CloseMessage
    ApplyMovement LOCALID_PROF_ROWAN, Route201_Movement_ProfRowanFaceCounterpart
    WaitMovement
    ClearFlag FLAG_HIDE_ROUTE_201_BRIEFCASE
    AddObject LOCALID_BRIEFCASE
    WaitTime 15, VAR_RESULT
-    Message Route201_Text_OhIsSomethingWrongHere
-    Message Route201_Text_ThereItIsNiceWorkDawn
+    Message Route201_Text_OhIsSomethingWrong
+    Message Route201_Text_NiceWorkDawn
    ApplyMovement LOCALID_COUNTERPART, Route201_Movement_CounterpartWalkOnSpotEast
    WaitMovement
-    Message Route201_Text_DawnThosePokemonAreHardToReplace
+    Message Route201_Text_DawnPokemonHardToReplace
    GoTo Route201_GoOnChoosePokemon
    End

 Route201_LucasBringBriefcase:
-    Message Route201_Text_LucasYouLeftYourBriefcaseAtTheLake
+    Message Route201_Text_LucasYouLeftYourBriefcase
    CloseMessage
    ApplyMovement LOCALID_PROF_ROWAN, Route201_Movement_ProfRowanFaceCounterpart
    WaitMovement
    ClearFlag FLAG_HIDE_ROUTE_201_BRIEFCASE
    AddObject LOCALID_BRIEFCASE
    WaitTime 15, VAR_RESULT
-    Message Route201_Text_IsSomethingWrongHere
-    Message Route201_Text_ThereItIsNiceWorkLucas
+    Message Route201_Text_IsSomethingWrong
+    Message Route201_Text_NiceWorkLucas
    ApplyMovement LOCALID_COUNTERPART, Route201_Movement_CounterpartWalkOnSpotEast
    WaitMovement
    Message Route201_Text_LucasThosePokemonAreCrucial
@@ -291,7 +291,7 @@ Route201_Briefcase:
    BufferRivalName 0
    BufferRivalStarterSpeciesName 2
    Message Route201_Text_ImPickingThisStarter
-    Message Route201_Text_IHopeYoullDoWellTogether
+    Message Route201_Text_IHopeYoullDoWell
    Message Route201_Text_ComeSeeMeInSandgemTown
    CloseMessage
    ApplyMovement LOCALID_PROF_ROWAN, Route201_Movement_ProfRowanLeave
@@ -1133,7 +1133,7 @@ _0DDC:
    EndMovement

 Route201_BreederM:
-    NPCMessage Route201_Text_WildPokemonLurkInTallGrass
+    NPCMessage Route201_Text_PokemonLurkInGrass
    End

 Route201_SchoolKidM:
@@ -1144,8 +1144,8 @@ Route201_Lass:
    PlaySE SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GoToIfSet FLAG_HAS_POKEDEX, Route201_IfYourPokemonsHPIsLowGoToAPokemonCenter
-    Message Route201_Text_IfYourPokemonsHPIsLowGoHome
+    GoToIfSet FLAG_HAS_POKEDEX, Route201_IfHPIsLowGoToAPokemonCenter
+    Message Route201_Text_IfHPIsLowGoHome
    GoTo Route201_LassCloseMessage

 Route201_LassCloseMessage:
@@ -1154,16 +1154,16 @@ Route201_LassCloseMessage:
    ReleaseAll
    End

-Route201_IfYourPokemonsHPIsLowGoToAPokemonCenter:
-    Message Route201_Text_IfYourPokemonsHPIsLowGoToAPokemonCenter
+Route201_IfHPIsLowGoToAPokemonCenter:
+    Message Route201_Text_IfHPIsLowGoToAPokemonCenter
    GoTo Route201_LassCloseMessage

 Route201_Cashier:
    PlaySE SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GoToIfSet FLAG_GOT_POTION_FROM_ROUTE_201_CASHIER, Route201_YouCanFindMartsInCitiesAndMajorTowns
-    Message Route201_Text_HereAPotionAsAFreeSample
+    GoToIfSet FLAG_GOT_POTION_FROM_ROUTE_201_CASHIER, Route201_FindMartsInCitiesAndTowns
+    Message Route201_Text_PotionAsFreeSample
    SetVar VAR_0x8004, ITEM_POTION
    SetVar VAR_0x8005, 1
    GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, Route201_BagIsFull
@@ -1173,8 +1173,8 @@ Route201_Cashier:
    ReleaseAll
    End

-Route201_YouCanFindMartsInCitiesAndMajorTowns:
-    Message Route201_Text_YouCanFindMartsInCitiesAndMajorTowns
+Route201_FindMartsInCitiesAndTowns:
+    Message Route201_Text_FindMartsInCitiesAndTowns
    WaitButton
    CloseMessage
    ReleaseAll
@@ -1190,7 +1190,7 @@ Route201_ProfRowan:
    NPCMessage Route201_Text_RowanGoOnChooseAPokemon
    End

-Route201_CoordEvent_LetsCatchThatLegendary:
+Route201_CoordEvent_RivalStartFollowing:
    LockAll
    ApplyMovement LOCALID_RIVAL, Route201_Movement_RivalNoticePlayer
    WaitMovement
@@ -1231,7 +1231,7 @@ Route201_RivalRunToPlayerX113:

 Route201_SetRivalPartner:
    BufferRivalName 0
-    Message Route201_Text_TogetherWeveGotNothingToFear
+    Message Route201_Text_NothingToFear
    WaitButton
    CloseMessage
    SetVar VAR_FOLLOWER_RIVAL_STATE, 3
@@ -1244,11 +1244,11 @@ Route201_SetRivalPartner:
    End

 Route201_ArrowSignpostTwinleafTown:
-    ShowArrowSign Route201_Text_Rt201TwinleafTown
+    ShowArrowSign Route201_Text_SignTwinleafTown
    End

 Route201_ArrowSignpostSandgemTown:
-    ShowArrowSign Route201_Text_Rt201SandgemTown
+    ShowArrowSign Route201_Text_SignSandgemTown
    End

 Route201_TrainerTipsSignpost:
--- a/res/field/scripts/scripts_route_202.s
+++ b/res/field/scripts/scripts_route_202.s
@@ -34,19 +34,19 @@ Route202_SetCounterpartPokeRadarPosition:
    Return

 Route202_Youngster:
-    NPCMessage Route202_Text_SomePokemonOnlyAppearInTheMorning
+    NPCMessage Route202_Text_SomePokemonOnlyInTheMorning
    End

 Route202_ArrowSignpostSandgemTown:
-    ShowArrowSign Route202_Text_Rt202SandgemTown
+    ShowArrowSign Route202_Text_SignSandgemTown
    End

 Route202_ArrowSignpostJubilifeCity:
-    ShowArrowSign Route202_Text_Rt202JubilifeCity
+    ShowArrowSign Route202_Text_SignJubilifeCity
    End

 Route202_TrainerTipsSignpost:
-    ShowScrollingSign Route202_Text_TrainerTipsPokemonInvolvedInBattleEarnExpPoints
+    ShowScrollingSign Route202_Text_TrainerTipsEarnExpPoints
    End

 Route202_CoordEvent_CatchingTutorial:
@@ -90,22 +90,22 @@ Route202_CounterpartWalkToPlayerZ829:
 Route202_CheckStartCatchingTutorial:
    GoToIfUnset FLAG_RECEIVED_PARCEL, Route202_TellYourFamily
    GetPlayerGender VAR_RESULT
-    GoToIfEq VAR_RESULT, GENDER_MALE, Route202_DawnIHaventShownYouHowToCatchAPokemon
-    GoToIfEq VAR_RESULT, GENDER_FEMALE, Route202_LucasDoYouKnowHowToCatchAPokemon
+    GoToIfEq VAR_RESULT, GENDER_MALE, Route202_DawnIllDemonstrateHowToCatch
+    GoToIfEq VAR_RESULT, GENDER_FEMALE, Route202_LucasIllDemonstrateHowToCatch
    End

-Route202_DawnIHaventShownYouHowToCatchAPokemon:
+Route202_DawnIllDemonstrateHowToCatch:
    Common_SetCounterpartBGM
    BufferCounterpartName 0
    BufferPlayerName 1
-    Message Route202_Text_DawnIHaventShownYouHowToCatchAPokemon
+    Message Route202_Text_DawnIllDemonstrateHowToCatch
    GoTo Route202_DoCatchingTutorial

-Route202_LucasDoYouKnowHowToCatchAPokemon:
+Route202_LucasIllDemonstrateHowToCatch:
    Common_SetCounterpartBGM
    BufferCounterpartName 0
    BufferPlayerName 1
-    Message Route202_Text_LucasDoYouKnowHowToCatchAPokemon
+    Message Route202_Text_LucasIllDemonstrateHowToCatch
    GoTo Route202_DoCatchingTutorial

 Route202_DoCatchingTutorial:
@@ -117,18 +117,18 @@ Route202_DoCatchingTutorial:
    ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkOnSpotEastAfterCatchingTutorial
    WaitMovement
    GetPlayerGender VAR_RESULT
-    GoToIfEq VAR_RESULT, GENDER_MALE, Route202_DawnToGetYouStartedIllGiveYouFivePokeBalls
-    GoToIfEq VAR_RESULT, GENDER_FEMALE, Route202_LucasHereIllGiveYouFivePokeballsToGetYouStarted
+    GoToIfEq VAR_RESULT, GENDER_MALE, Route202_DawnIllGiveYouFivePokeBalls
+    GoToIfEq VAR_RESULT, GENDER_FEMALE, Route202_LucasIllGiveYouFivePokeBalls
    End

-Route202_DawnToGetYouStartedIllGiveYouFivePokeBalls:
+Route202_DawnIllGiveYouFivePokeBalls:
    BufferPlayerName 0
-    Message Route202_Text_DawnToGetYouStartedIllGiveYouFivePokeBalls
+    Message Route202_Text_DawnIllGiveYouFivePokeBalls
    GoTo Route202_GivePokeballs

-Route202_LucasHereIllGiveYouFivePokeballsToGetYouStarted:
+Route202_LucasIllGiveYouFivePokeBalls:
    BufferPlayerName 0
-    Message Route202_Text_LucasHereIllGiveYouFivePokeballsToGetYouStarted
+    Message Route202_Text_LucasIllGiveYouFivePokeBalls
    GoTo Route202_GivePokeballs

 Route202_GivePokeballs:
@@ -168,30 +168,30 @@ Route202_DawnTellYourFamily:
    BufferCounterpartName 0
    BufferPlayerName 1
    CallIfUnset FLAG_TALKED_TO_ROUTE_202_COUNTERPART, Route202_DawnDidYouTellYourFamily
-    CallIfSet FLAG_TALKED_TO_ROUTE_202_COUNTERPART, Route202_DawnYouShouldGoTellYourFamily
+    CallIfSet FLAG_TALKED_TO_ROUTE_202_COUNTERPART, Route202_DawnGoTellYourFamily
    GoTo Route202_CloseMessageTellYourFamily

 Route202_DawnDidYouTellYourFamily:
    Message Route202_Text_DawnDidYouTellYourFamily
    Return

-Route202_DawnYouShouldGoTellYourFamily:
-    Message Route202_Text_DawnYouShouldGoTellYourFamily
+Route202_DawnGoTellYourFamily:
+    Message Route202_Text_DawnGoTellYourFamily
    Return

 Route202_LucasTellYourFamily:
    BufferCounterpartName 0
    BufferPlayerName 1
    CallIfUnset FLAG_TALKED_TO_ROUTE_202_COUNTERPART, Route202_LucasDidYouTellYourFamily
-    CallIfSet FLAG_TALKED_TO_ROUTE_202_COUNTERPART, Route202_LucasWhyDontYouGoTellYourFamily
+    CallIfSet FLAG_TALKED_TO_ROUTE_202_COUNTERPART, Route202_LucasGoTellYourFamily
    GoTo Route202_CloseMessageTellYourFamily

 Route202_LucasDidYouTellYourFamily:
    Message Route202_Text_LucasDidYouTellYourFamily
    Return

-Route202_LucasWhyDontYouGoTellYourFamily:
-    Message Route202_Text_LucasWhyDontYouGoTellYourFamily
+Route202_LucasGoTellYourFamily:
+    Message Route202_Text_LucasGoTellYourFamily
    Return

 Route202_CloseMessageTellYourFamily:
@@ -365,8 +365,8 @@ Route202_Counterpart:
    BufferPlayerName 0
    GetPlayerDir VAR_0x8002
    GetPlayerGender VAR_0x8000
-    CallIfEq VAR_0x8000, GENDER_MALE, Route202_DawnLetMeShowYouHowThePokeRadarWorks
-    CallIfEq VAR_0x8000, GENDER_FEMALE, Route202_LucasLetMeExplainHowThePokeRadarWorks
+    CallIfEq VAR_0x8000, GENDER_MALE, Route202_DawnLetMeShowPokeRadar
+    CallIfEq VAR_0x8000, GENDER_FEMALE, Route202_LucasLetMeExplainPokeRadar
    CloseMessage
    PlayMusic SEQ_POKERADAR
    AddCameraOverrideObject 189, 818
@@ -377,8 +377,8 @@ Route202_Counterpart:
    ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerFaceGrassPatchEast
    WaitMovement
    WaitTime 15, VAR_RESULT
-    CallIfEq VAR_0x8000, 0, Route202_DawnTheresAPokemonInThatPatchOfTallGrass
-    CallIfEq VAR_0x8000, 1, Route202_LucasTheresAPokemonInThatPatchOfTallGrass
+    CallIfEq VAR_0x8000, 0, Route202_DawnPokemonInPatchOfGrass
+    CallIfEq VAR_0x8000, 1, Route202_LucasPokemonInPatchOfGrass
    CloseMessage
    WaitTime 15, VAR_RESULT
    PlayDefaultMusic
@@ -386,8 +386,8 @@ Route202_Counterpart:
    CallIfEq VAR_0x8002, DIR_SOUTH, Route202_PlayerCounterpartFaceEachOtherSouth
    CallIfEq VAR_0x8002, DIR_WEST, Route202_PlayerCounterpartFaceEachOtherWest
    CallIfEq VAR_0x8002, DIR_EAST, Route202_PlayerCounterpartFaceEachOtherEast
-    CallIfEq VAR_0x8000, GENDER_MALE, Route202_DawnNowThisIsWhereItGetsInteresting
-    CallIfEq VAR_0x8000, GENDER_FEMALE, Route202_LucasNowHeresTheStrangePart
+    CallIfEq VAR_0x8000, GENDER_MALE, Route202_DawnItGetsInteresting
+    CallIfEq VAR_0x8000, GENDER_FEMALE, Route202_LucasHeresTheStrangePart
    CloseMessage
    CallIfEq VAR_0x8002, DIR_NORTH, Route202_CounterpartLeavePokeRadarNorth
    CallIfEq VAR_0x8002, DIR_SOUTH, Route202_CounterpartLeavePokeRadarSouth
@@ -397,24 +397,24 @@ Route202_Counterpart:
    End

 Route202_PlayerCounterpartFaceEachOtherNorth:
-    ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkOnSpotSouthToFacePlayer
-    ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerWalkOnSpotNorthToFaceCounterpart
+    ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkOnSpotSouth
+    ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerWalkOnSpotNorth
    WaitMovement
    Return

 Route202_PlayerCounterpartFaceEachOtherSouth:
-    ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkOnSpotNorthToFacePlayer
-    ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerWalkOnSpotSouthToFaceCounterpart
+    ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkOnSpotNorth
+    ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerWalkOnSpotSouth
    WaitMovement
    Return

 Route202_PlayerCounterpartFaceEachOtherWest:
-    ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerWalkOnSpotWestToFaceCounterpart
+    ApplyMovement LOCALID_PLAYER, Route202_Movement_PlayerWalkOnSpotWest
    WaitMovement
    Return

 Route202_PlayerCounterpartFaceEachOtherEast:
-    ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkOnSpotWestToFacePlayer
+    ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartWalkOnSpotWest
    WaitMovement
    Return

@@ -445,28 +445,28 @@ Route202_CounterpartPokeRadarEnd:
    ReleaseAll
    End

-Route202_DawnLetMeShowYouHowThePokeRadarWorks:
-    Message Route202_Text_DawnLetMeShowYouHowThePokeRadarWorks
+Route202_DawnLetMeShowPokeRadar:
+    Message Route202_Text_DawnLetMeShowPokeRadar
    Return

-Route202_LucasLetMeExplainHowThePokeRadarWorks:
-    Message Route202_Text_LucasLetMeExplainHowThePokeRadarWorks
+Route202_LucasLetMeExplainPokeRadar:
+    Message Route202_Text_LucasLetMeExplainPokeRadar
    Return

-Route202_DawnTheresAPokemonInThatPatchOfTallGrass:
-    Message Route202_Text_DawnTheresAPokemonInThatPatchOfTallGrass
+Route202_DawnPokemonInPatchOfGrass:
+    Message Route202_Text_DawnPokemonInPatchOfGrass
    Return

-Route202_LucasTheresAPokemonInThatPatchOfTallGrass:
-    Message Route202_Text_LucasTheresAPokemonInThatPatchOfTallGrass
+Route202_LucasPokemonInPatchOfGrass:
+    Message Route202_Text_LucasPokemonInPatchOfGrass
    Return

-Route202_DawnNowThisIsWhereItGetsInteresting:
-    Message Route202_Text_DawnNowThisIsWhereItGetsInteresting
+Route202_DawnItGetsInteresting:
+    Message Route202_Text_DawnItGetsInteresting
    Return

-Route202_LucasNowHeresTheStrangePart:
-    Message Route202_Text_LucasNowHeresTheStrangePart
+Route202_LucasHeresTheStrangePart:
+    Message Route202_Text_LucasHeresTheStrangePart
    Return

    .balign 4, 0
@@ -488,12 +488,12 @@ Route202_Movement_CounterpartFaceGrassPatchEast:
    EndMovement

    .balign 4, 0
-Route202_Movement_CounterpartWalkOnSpotSouthToFacePlayer:
+Route202_Movement_CounterpartWalkOnSpotSouth:
    WalkOnSpotNormalSouth
    EndMovement

    .balign 4, 0
-Route202_Movement_CounterpartWalkOnSpotNorthToFacePlayer:
+Route202_Movement_CounterpartWalkOnSpotNorth:
    WalkOnSpotNormalNorth
    EndMovement

@@ -502,7 +502,7 @@ Route202_Movement_Unused:
    EndMovement

    .balign 4, 0
-Route202_Movement_CounterpartWalkOnSpotWestToFacePlayer:
+Route202_Movement_CounterpartWalkOnSpotWest:
    WalkOnSpotNormalWest
    EndMovement

@@ -522,17 +522,17 @@ Route202_Movement_PlayerFaceGrassPatchEast:
    EndMovement

    .balign 4, 0
-Route202_Movement_PlayerWalkOnSpotNorthToFaceCounterpart:
+Route202_Movement_PlayerWalkOnSpotNorth:
    WalkOnSpotNormalNorth
    EndMovement

    .balign 4, 0
-Route202_Movement_PlayerWalkOnSpotSouthToFaceCounterpart:
+Route202_Movement_PlayerWalkOnSpotSouth:
    WalkOnSpotNormalSouth
    EndMovement

    .balign 4, 0
-Route202_Movement_PlayerWalkOnSpotWestToFaceCounterpart:
+Route202_Movement_PlayerWalkOnSpotWest:
    WalkOnSpotNormalWest
    EndMovement

--- a/res/field/scripts/scripts_route_203.s
+++ b/res/field/scripts/scripts_route_203.s
@@ -12,23 +12,23 @@
    ScriptEntryEnd

 Route203_Lass:
-    NPCMessage Route203_Text_YourFavoritePokemonShouldBePlacedAtTheTop
+    NPCMessage Route203_Text_FavoritePokemonAtTheTop
    End

 Route203_ArrowSignpostJubilifeCity:
-    ShowArrowSign Route203_Text_Rt203JubilifeCity
+    ShowArrowSign Route203_Text_SignJubilifeCity
    End

 Route203_ArrowSignpostOreburghCity:
-    ShowArrowSign Route203_Text_Rt203OreburghCity
+    ShowArrowSign Route203_Text_SignOreburghCity
    End

 Route203_TrainerTipsSignpostEast:
-    ShowScrollingSign Route203_Text_TrainerTipsIfAPokemonIsAboutToEvolveItCanBeInstantlyStopped
+    ShowScrollingSign Route203_Text_TrainerTipsEvolveCanBeStopped
    End

 Route203_TrainerTipsSignpostWest:
-    ShowScrollingSign Route203_Text_TrainerTipsPokemonMovesUseEnergyCalledPowerPoints
+    ShowScrollingSign Route203_Text_TrainerTipsMovesUsePowerPoints
    End

 Route203_CoordEvent_Rival:
@@ -66,7 +66,7 @@ Route203_RivalWalkToPlayerZ760:
 Route203_RivalIntro:
    BufferRivalName 0
    BufferPlayerName 1
-    Message Route203_Text_OfCourseIGotTougherIllDemonstrateItToYou
+    Message Route203_Text_IGotTougher
    CloseMessage
    GetPlayerStarterSpecies VAR_RESULT
    GoToIfEq VAR_RESULT, SPECIES_TURTWIG, Route203_StartRivalBattleTurtwig
--- a/res/field/scripts/scripts_route_204_north.s
+++ b/res/field/scripts/scripts_route_204_north.s
@@ -8,24 +8,24 @@
    ScriptEntryEnd

 Route204North_Youngster:
-    NPCMessage Route204North_Text_AreYouRaisingDifferentKindsOfPokemon
+    NPCMessage Route204North_Text_RaisingDifferentPokemon
    End

 Route204North_AceTrainerF:
    PlaySE SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GoToIfSet FLAG_RECEIVED_ROUTE_204_NORTH_TM78, Route204North_CaptivateOnlyWorksAgainstTheOppositeGender
-    Message Route204North_Text_IdLikeYouToHaveThisTM
+    GoToIfSet FLAG_RECEIVED_ROUTE_204_NORTH_TM78, Route204North_CaptivateOppositeGender
+    Message Route204North_Text_HaveThisTM
    SetVar VAR_0x8004, ITEM_TM78
    SetVar VAR_0x8005, 1
    GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, Route204North_BagIsFull
    Common_GiveItemQuantity
    SetFlag FLAG_RECEIVED_ROUTE_204_NORTH_TM78
-    GoTo Route204North_CaptivateOnlyWorksAgainstTheOppositeGender
+    GoTo Route204North_CaptivateOppositeGender

-Route204North_CaptivateOnlyWorksAgainstTheOppositeGender:
-    Message Route204North_Text_CaptivateOnlyWorksAgainstTheOppositeGender
+Route204North_CaptivateOppositeGender:
+    Message Route204North_Text_CaptivateOppositeGender
    WaitButton
    CloseMessage
    ReleaseAll
@@ -38,7 +38,7 @@ Route204North_BagIsFull:
    End

 Route204North_ArrowSignpostFloaromaTown:
-    ShowArrowSign Route204North_Text_Rt204FloaromaTown
+    ShowArrowSign Route204North_Text_SignFloaromaTown
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_route_204_south.s
+++ b/res/field/scripts/scripts_route_204_south.s
@@ -8,15 +8,15 @@
    ScriptEntryEnd

 Route204South_Youngster:
-    NPCMessage Route204South_Text_ThereAreBouldersBlockingTheWayInsideTheCavern
+    NPCMessage Route204South_Text_BouldersBlockingInsideCavern
    End

 Route204South_ArrowSignpostJubilifeCity:
-    ShowArrowSign Route204South_Text_Rt204JubilifeCity
+    ShowArrowSign Route204South_Text_SignJubilifeCity
    End

 Route204South_SignboardRavagedPath:
-    ShowLandmarkSign Route204South_Text_RavagedPath
+    ShowLandmarkSign Route204South_Text_SignRavagedPath
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_route_205_north.s
+++ b/res/field/scripts/scripts_route_205_north.s
@@ -8,15 +8,15 @@
    ScriptEntryEnd

 Route205North_Fisherman:
-    NPCMessage Route205North_Text_ToSitBackAndFishCasually
+    NPCMessage Route205North_Text_FishCasually
    End

 Route205North_ArrowSignpostEternaForest:
-    ShowArrowSign Route205North_Text_Rt205EternaForest
+    ShowArrowSign Route205North_Text_SignEternaForest
    End

 Route205North_ArrowSignpostEternaCity:
-    ShowArrowSign Route205North_Text_Rt205EternaCity
+    ShowArrowSign Route205North_Text_SignEternaCity
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_route_205_south.s
+++ b/res/field/scripts/scripts_route_205_south.s
@@ -24,12 +24,12 @@ Route205South_Grunts:
    FacePlayer
    ApplyMovement LOCALID_GRUNT_M_WEST, Route205South_Movement_GruntMWestWalkOnSpotSouth
    WaitMovement
-    Message Route205South_Text_WeTeamGalacticAreConductingResearchInTheEternaForest
+    Message Route205South_Text_TeamGalacticConductingResearch
    CloseMessage
    ApplyMovement LOCALID_GRUNT_M_EAST, Route205South_Movement_GruntMEastWalkOnSpotSouth
    WaitMovement
    Call _00B6
-    Message Route205South_Text_OurResearchInvolvesCatchingPokemonInTheFloweryMeadowsOfFloaroma2
+    Message Route205South_Text_ResearchInvolvesCatchingPokemon2
    WaitButton
    CloseMessage
    ReleaseAll
@@ -49,11 +49,11 @@ Route205South_CoordEvent_Grunts:
    LockAll
    ApplyMovement LOCALID_GRUNT_M_WEST, Route205South_Movement_GruntMWestWalkOnSpotEast
    WaitMovement
-    Message Route205South_Text_WeTeamGalacticAreConductingResearchInTheEternaForest
+    Message Route205South_Text_TeamGalacticConductingResearch
    CloseMessage
    ApplyMovement LOCALID_GRUNT_M_EAST, Route205South_Movement_GruntMEastWalkOnSpotWest
    WaitMovement
-    Message Route205South_Text_OurResearchInvolvesCatchingPokemonInTheFloweryMeadowsOfFloaroma1
+    Message Route205South_Text_ResearchInvolvesCatchingPokemon1
    CloseMessage
    ApplyMovement LOCALID_GRUNT_M_WEST, Route205South_Movement_GruntMWestPushBackPlayer
    ApplyMovement LOCALID_PLAYER, Route205South_Movement_PlayerGetPushedBack
@@ -99,27 +99,27 @@ Route205South_Movement_PlayerGetPushedBack:
    EndMovement

 Route205South_BugCatcher:
-    NPCMessage Route205South_Text_ManyPoisonTypePokemonMakeTheEternaForestTheirHome
+    NPCMessage Route205South_Text_ManyPoisonTypePokemon
    End

 Route205South_Youngster:
-    NPCMessage Route205South_Text_IfYouSlatherSweetHoneyOnASweetSmellingTree
+    NPCMessage Route205South_Text_SlatherHoneyOnATree
    End

 Route205South_LittleGirl:
    PlaySE SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GoToIfSet FLAG_TALKED_TO_ROUTE_205_SOUTH_LITTLE_GIRL, Route205South_IWantToSeeMyPapaHesAtTheValleyWindworks
+    GoToIfSet FLAG_TALKED_TO_ROUTE_205_SOUTH_LITTLE_GIRL, Route205South_IWantToSeeMyPapa
    Call Route205South_HideFloaromaTownGrunts
-    Message Route205South_Text_HelpHelpTrainerPleaseIWantToSeeMyPapa
+    Message Route205South_Text_HelpIWantToSeeMyPapa
    WaitButton
    CloseMessage
    ReleaseAll
    End

-Route205South_IWantToSeeMyPapaHesAtTheValleyWindworks:
-    Message Route205South_Text_IWantToSeeMyPapaHesAtTheValleyWindworks
+Route205South_IWantToSeeMyPapa:
+    Message Route205South_Text_IWantToSeeMyPapa
    WaitButton
    CloseMessage
    ReleaseAll
@@ -146,35 +146,35 @@ Route205South_LittleGirlNoticePlayerZ659:
    WaitMovement
    ApplyMovement LOCALID_PLAYER, Route205South_Movement_PlayerWalkOnSpotSouth
    WaitMovement
-    GoTo Route205South_HelpHelpTrainerPleaseIWantToSeeMyPapa
+    GoTo Route205South_HelpIWantToSeeMyPapa

 Route205South_LittleGirlNoticePlayerZ660:
    ApplyMovement LOCALID_LITTLE_GIRL, Route205South_Movement_TwinNoticePlayerZ660
    WaitMovement
    ApplyMovement LOCALID_PLAYER, Route205South_Movement_PlayerWalkOnSpotSouth
    WaitMovement
-    GoTo Route205South_HelpHelpTrainerPleaseIWantToSeeMyPapa
+    GoTo Route205South_HelpIWantToSeeMyPapa

 Route205South_DummyZ661:
-    GoTo Route205South_HelpHelpTrainerPleaseIWantToSeeMyPapa
+    GoTo Route205South_HelpIWantToSeeMyPapa

 Route205South_LittleGirlNoticePlayerZ662:
    ApplyMovement LOCALID_LITTLE_GIRL, Route205South_Movement_TwinNoticePlayerZ662
    WaitMovement
    ApplyMovement LOCALID_PLAYER, Route205South_Movement_PlayerWalkOnSpotNorth
    WaitMovement
-    GoTo Route205South_HelpHelpTrainerPleaseIWantToSeeMyPapa
+    GoTo Route205South_HelpIWantToSeeMyPapa

 Route205South_LittleGirlNoticePlayerZ663:
    ApplyMovement LOCALID_LITTLE_GIRL, Route205South_Movement_TwinNoticePlayerZ663
    WaitMovement
    ApplyMovement LOCALID_PLAYER, Route205South_Movement_PlayerWalkOnSpotNorth
    WaitMovement
-    GoTo Route205South_HelpHelpTrainerPleaseIWantToSeeMyPapa
+    GoTo Route205South_HelpIWantToSeeMyPapa

-Route205South_HelpHelpTrainerPleaseIWantToSeeMyPapa:
+Route205South_HelpIWantToSeeMyPapa:
    Call Route205South_HideFloaromaTownGrunts
-    Message Route205South_Text_HelpHelpTrainerPleaseIWantToSeeMyPapa
+    Message Route205South_Text_HelpIWantToSeeMyPapa
    WaitButton
    CloseMessage
    ReleaseAll
@@ -221,15 +221,15 @@ Route205South_Movement_TwinNoticePlayerZ663:
    EndMovement

 Route205South_ArrowSignpostFloaromaTown:
-    ShowArrowSign Route205South_Text_Rt205FloaromaTown
+    ShowArrowSign Route205South_Text_SignFloaromaTown
    End

 Route205South_ArrowSignpostEternaForest:
-    ShowArrowSign Route205South_Text_Rt205EternaForest
+    ShowArrowSign Route205South_Text_SignEternaForest
    End

 Route205South_TrainerTipsSignpost:
-    ShowScrollingSign Route205South_Text_TrainerTipsTheItemsPlacedInYourBagAreAutomaticallySorted
+    ShowScrollingSign Route205South_Text_TrainerTipsItemsAutomaticallySorted
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_route_206.s
+++ b/res/field/scripts/scripts_route_206.s
@@ -44,15 +44,15 @@ Route206_ForceBicycling:
    Return

 Route206_Hiker:
-    NPCMessage Route206_Text_IHeardThereWereTwoCavesOnRoute206
+    NPCMessage Route206_Text_TwoCavesOnRoute206
    End

 Route206_ArrowSignpostEternaCity:
-    ShowArrowSign Route206_Text_Rt206EternaCity
+    ShowArrowSign Route206_Text_SignEternaCity
    End

 Route206_ArrowSignpostOreburghCity:
-    ShowArrowSign Route206_Text_Rt206OreburghCity
+    ShowArrowSign Route206_Text_SignOreburghCity
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_route_206_cycling_road_north_gate.s
+++ b/res/field/scripts/scripts_route_206_cycling_road_north_gate.s
@@ -30,7 +30,7 @@ Route206CyclingRoadNorthGate_HideScientistM:
    Return

 Route206CyclingRoadNorthGate_CashierM:
-    NPCMessage Route206CyclingRoadNorthGate_Text_LearnHowToShiftGearsAndYoullBeAbleToRideAnywhere
+    NPCMessage Route206CyclingRoadNorthGate_Text_LearnHowToShiftGears
    End

 Route206CyclingRoadNorthGate_CoordEvent_OnlyBicycles:
@@ -39,7 +39,7 @@ Route206CyclingRoadNorthGate_CoordEvent_OnlyBicycles:
    GoToIfEq VAR_RESULT, TRUE, Route206CyclingRoadNorthGate_ForceBikingInGateCoordEvent
    ApplyMovement LOCALID_CASHIER_M_WEST, Route206CyclingRoadNorthGate_Movement_CashierMExclamationMark
    WaitMovement
-    Message Route206CyclingRoadNorthGate_Text_CyclingRoadIsOnlyForBicycles
+    Message Route206CyclingRoadNorthGate_Text_OnlyForBicycles
    CloseMessage
    ApplyMovement LOCALID_PLAYER, Route206CyclingRoadNorthGate_Movement_PlayerWalkNorth
    WaitMovement
@@ -73,26 +73,26 @@ Route206CyclingRoadNorthGate_ScientistM:
    PlaySE SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GoToIfSet FLAG_RECEIVED_ROUTE_206_CYCLING_ROAD_NORTH_GATE_EXP_SHARE, Route206CyclingRoadNorthGate_APokemonHoldingAnExpShareWillGetSomeOfTheExpPointsFromBattle
+    GoToIfSet FLAG_RECEIVED_ROUTE_206_CYCLING_ROAD_NORTH_GATE_EXP_SHARE, Route206CyclingRoadNorthGate_HoldingExpShareGetExpPoints
    BufferPlayerName 0
    BufferCounterpartName 1
    GetPlayerGender VAR_MAP_LOCAL_0
-    GoToIfEq VAR_MAP_LOCAL_0, GENDER_MALE, Route206CyclingRoadNorthGate_PlayerMaleLetMeAskYouHowManyPokemonHaveYouMet
-    GoTo Route206CyclingRoadNorthGate_PlayerFemaleLetMeAskYouHowManyPokemonHaveYouMet
+    GoToIfEq VAR_MAP_LOCAL_0, GENDER_MALE, Route206CyclingRoadNorthGate_MetHowManyPokemonMale
+    GoTo Route206CyclingRoadNorthGate_MetHowManyPokemonFemale

-Route206CyclingRoadNorthGate_PlayerMaleLetMeAskYouHowManyPokemonHaveYouMet:
-    Message Route206CyclingRoadNorthGate_Text_PlayerLetMeAskYouHowManyPokemonHaveYouMet
+Route206CyclingRoadNorthGate_MetHowManyPokemonMale:
+    Message Route206CyclingRoadNorthGate_Text_PlayerMetHowManyPokemon
    GoTo Route206CyclingRoadNorthGate_CheckAmountPokemonSeen

-Route206CyclingRoadNorthGate_PlayerFemaleLetMeAskYouHowManyPokemonHaveYouMet:
-    Message Route206CyclingRoadNorthGate_Text_PlayerLetMeAskYouHowManyPokemonHaveYouMet2
+Route206CyclingRoadNorthGate_MetHowManyPokemonFemale:
+    Message Route206CyclingRoadNorthGate_Text_PlayerMetHowManyPokemon2
    GoTo Route206CyclingRoadNorthGate_CheckAmountPokemonSeen

 Route206CyclingRoadNorthGate_CheckAmountPokemonSeen:
    GetNationalDexSeenCount VAR_0x8004
    BufferNumber 1, VAR_0x8004
-    GoToIfLt VAR_0x8004, 35, Route206CyclingRoadNorthGate_YouveGotToFindAtLeast35
-    Message Route206CyclingRoadNorthGate_Text_ProfessorRowanShouldBeDelightedHereIsSomethingForYou
+    GoToIfLt VAR_0x8004, 35, Route206CyclingRoadNorthGate_FindAtLeast35
+    Message Route206CyclingRoadNorthGate_Text_SomethingForYou
    SetVar VAR_0x8004, ITEM_EXP_SHARE
    SetVar VAR_0x8005, 1
    GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, Route206CyclingRoadNorthGate_BagIsFull
@@ -108,15 +108,15 @@ Route206CyclingRoadNorthGate_BagIsFull:
    ReleaseAll
    End

-Route206CyclingRoadNorthGate_APokemonHoldingAnExpShareWillGetSomeOfTheExpPointsFromBattle:
-    Message Route206CyclingRoadNorthGate_Text_APokemonHoldingAnExpShareWillGetSomeOfTheExpPointsFromBattle
+Route206CyclingRoadNorthGate_HoldingExpShareGetExpPoints:
+    Message Route206CyclingRoadNorthGate_Text_HoldingExpShareGetExpPoints
    WaitButton
    CloseMessage
    ReleaseAll
    End

-Route206CyclingRoadNorthGate_YouveGotToFindAtLeast35:
-    Message Route206CyclingRoadNorthGate_Text_YouveGotToFindAtLeast35
+Route206CyclingRoadNorthGate_FindAtLeast35:
+    Message Route206CyclingRoadNorthGate_Text_FindAtLeast35
    WaitButton
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_route_206_cycling_road_south_gate.s
+++ b/res/field/scripts/scripts_route_206_cycling_road_south_gate.s
@@ -25,7 +25,7 @@ Route206CyclingRoadSouthGate_ForceBikingInGateOnFrame:
    Return

 Route206CyclingRoadSouthGate_CashierM:
-    NPCMessage Route206CyclingRoadSouthGate_Text_LearnHowToShiftGearsAndYoullBeAbleToRideAnywhere
+    NPCMessage Route206CyclingRoadSouthGate_Text_LearnHowToShiftGears
    End

 Route206CyclingRoadSouthGate_CoordEvent_OnlyCyclists:
@@ -34,7 +34,7 @@ Route206CyclingRoadSouthGate_CoordEvent_OnlyCyclists:
    GoToIfEq VAR_RESULT, TRUE, Route206CyclingRoadSouthGate_ForceBikingInGateCoordEvent
    ApplyMovement LOCALID_CASHIER_M_WEST, Route206CyclingRoadSouthGate_Movement_CashierMExclamationMark
    WaitMovement
-    Message Route206CyclingRoadSouthGate_Text_CyclingRoadIsOpenOnlyToCyclists
+    Message Route206CyclingRoadSouthGate_Text_OpenOnlyToCyclists
    CloseMessage
    ApplyMovement LOCALID_PLAYER, Route206CyclingRoadSouthGate_Movement_PlayerWalkSouth
    WaitMovement
@@ -68,10 +68,10 @@ Route206CyclingRoadSouthGate_BattleGirl:
    PlaySE SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GoToIfSet FLAG_RECEIVED_ROUTE_206_CYCLING_ROAD_SOUTH_GATE_ACCESSORY_FLAG, Route206CyclingRoadSouthGate_GoThroughMtCoronetFromHereAndYouCanGetToHearthomeCity
+    GoToIfSet FLAG_RECEIVED_ROUTE_206_CYCLING_ROAD_SOUTH_GATE_ACCESSORY_FLAG, Route206CyclingRoadSouthGate_GoThroughMtCoronet
    SetVar VAR_0x8004, ACCESSORY_FLAG
    BufferAccessoryName 0, VAR_0x8004
-    Message Route206CyclingRoadSouthGate_Text_WhatsABicycleWithoutThisYouveGotToHaveAFlag
+    Message Route206CyclingRoadSouthGate_Text_HaveAFlag
    SetVar VAR_0x8005, 1
    Common_GiveAccessoryWaitForConfirm
    SetFlag FLAG_RECEIVED_ROUTE_206_CYCLING_ROAD_SOUTH_GATE_ACCESSORY_FLAG
@@ -79,8 +79,8 @@ Route206CyclingRoadSouthGate_BattleGirl:
    ReleaseAll
    End

-Route206CyclingRoadSouthGate_GoThroughMtCoronetFromHereAndYouCanGetToHearthomeCity:
-    Message Route206CyclingRoadSouthGate_Text_GoThroughMtCoronetFromHereAndYouCanGetToHearthomeCity
+Route206CyclingRoadSouthGate_GoThroughMtCoronet:
+    Message Route206CyclingRoadSouthGate_Text_GoThroughMtCoronet
    WaitButton
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_route_207.s
+++ b/res/field/scripts/scripts_route_207.s
@@ -55,32 +55,32 @@ Route207_Counterpart:

 Route207_Dawn:
    BufferPlayerName 0
-    Message Route207_Text_DawnPlayerChooseWhichHandYouWant
+    Message Route207_Text_DawnChooseWhichHand
    InitGlobalTextListMenu 30, 13, 0, VAR_RESULT, NO_EXIT_ON_B
    SetMenuXOriginToRight
    AddListMenuEntry MenuEntries_Text_CounterpartHand_Right, 0
    AddListMenuEntry MenuEntries_Text_CounterpartHand_Left, 1
    ShowListMenu
-    Message Route207_Text_DawnISeeYouWantTheVsSeeker
+    Message Route207_Text_DawnYouWantTheVsSeeker
    Call Route207_GiveVsSeeker
-    Message Route207_Text_DawnYouCanHaveThisTooThen
+    Message Route207_Text_DawnHaveThisTooThen
    Call Route207_GivePoketchAppDowsingMachine
-    Message Route207_Text_DawnTheDowsingMachineIsSomethingYouShouldTouchOften
+    Message Route207_Text_DawnUseDowsingMachineOften
    GoTo Route207_CounterpartLeave

 Route207_Lucas:
    BufferPlayerName 0
-    Message Route207_Text_LucasPlayerIllShareWithYouChooseAHand
+    Message Route207_Text_LucasChooseAHand
    InitGlobalTextListMenu 30, 13, 0, VAR_RESULT, NO_EXIT_ON_B
    SetMenuXOriginToRight
    AddListMenuEntry MenuEntries_Text_CounterpartHand_Right, 0
    AddListMenuEntry MenuEntries_Text_CounterpartHand_Left, 1
    ShowListMenu
-    Message Route207_Text_LucasOhYeahYouWantTheVsSeeker
+    Message Route207_Text_LucasYouWantTheVsSeeker
    Call Route207_GiveVsSeeker
-    Message Route207_Text_LucasYouCanHaveThisTooThen
+    Message Route207_Text_LucasHaveThisTooThen
    Call Route207_GivePoketchAppDowsingMachine
-    Message Route207_Text_LucasTheDowsingMachineIsJustTryTouchingIt
+    Message Route207_Text_LucasTryTouchingDowsingMachine
    GoTo Route207_CounterpartLeave

 Route207_GiveVsSeeker:
@@ -145,30 +145,30 @@ Route207_CyclistM:
    PlaySE SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GoToIfSet FLAG_RECEIVED_BICYCLE, Route207_ChangeToThe4thGearAndTakeARun
+    GoToIfSet FLAG_RECEIVED_BICYCLE, Route207_ChangeGearTakeARun
    Message Route207_Text_ThatSlopesTooSlippery
    WaitButton
    CloseMessage
    ReleaseAll
    End

-Route207_ChangeToThe4thGearAndTakeARun:
-    Message Route207_Text_ChangeToThe4thGearAndTakeARun
+Route207_ChangeGearTakeARun:
+    Message Route207_Text_ChangeGearTakeARun
    WaitButton
    CloseMessage
    ReleaseAll
    End

 Route207_ArrowSignpostMtCoronet:
-    ShowArrowSign Route207_Text_Rt207MtCoronet
+    ShowArrowSign Route207_Text_SignMtCoronet
    End

 Route207_ArrowSignpostOreburghCity:
-    ShowArrowSign Route207_Text_Rt207OreburghCity
+    ShowArrowSign Route207_Text_SignOreburghCity
    End

 Route207_TrainerTipsSignpost:
-    ShowScrollingSign Route207_Text_TrainerTipsPokemonMayBecomeImmobilizedIfTheyAreAsleepOrParalyzed
+    ShowScrollingSign Route207_Text_TrainerTipsImmobilizedIfAsleepOrParalyzed
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_route_208.s
+++ b/res/field/scripts/scripts_route_208.s
@@ -10,11 +10,11 @@
    ScriptEntryEnd

 Route208_ArrowSignpostMtCoronet:
-    ShowArrowSign Route208_Text_SignRt208MtCoronet
+    ShowArrowSign Route208_Text_SignMtCoronet
    End

 Route208_ArrowSignpostHearthomeCity:
-    ShowArrowSign Route208_Text_SignRt208HearthomeCity
+    ShowArrowSign Route208_Text_SignHearthomeCity
    End

 Route208_SignboardBerryMastersHouse:
--- a/res/field/scripts/scripts_route_208_gate_to_hearthome_city.s
+++ b/res/field/scripts/scripts_route_208_gate_to_hearthome_city.s
@@ -8,11 +8,11 @@
    ScriptEntryEnd

 Route208GateToHearthomeCity_PokemonBreederM:
-    NPCMessage Route208GateToHearthomeCity_Text_HearthomeCityIsAGreatPlace
+    NPCMessage Route208GateToHearthomeCity_Text_HearthomeCityGreatPlace
    End

 Route208GateToHearthomeCity_MiddleAgedWoman:
-    NPCMessage Route208GateToHearthomeCity_Text_IfYouSayHearthomeISayContests
+    NPCMessage Route208GateToHearthomeCity_Text_YouSayHearthomeISayContests
    End

 Route208GateToHearthomeCity_Clefairy:
--- a/res/field/scripts/scripts_route_208_house.s
+++ b/res/field/scripts/scripts_route_208_house.s
@@ -19,7 +19,7 @@ Route208House_OldMan:
    LockAll
    FacePlayer
    GoToIfSet FLAG_RECEIVED_ROUTE_208_HOUSE_RANDOM_BERRY, Route208House_FeedBerriesToPokemon
-    Message Route208House_Text_YoureDeservingOfABerry
+    Message Route208House_Text_YouDeserveABerry
    GetRandom VAR_0x8004, 26
    AddVar VAR_0x8004, ITEM_CHERI_BERRY /* Random berry from Cheri to Tamato */
    SetVar VAR_0x8005, 1
@@ -50,14 +50,14 @@ Route208House_Twin:
    GoToIfEq VAR_MAP_LOCAL_0, 1, Route208House_ExplainBerrySearcher
    CheckPoketchAppRegistered POKETCH_APPID_BERRYSEARCHER, VAR_RESULT
    GoToIfEq VAR_RESULT, TRUE, Route208House_CertainBerriesNeedLotsOfWater
-    Message Route208House_Text_DoYouForgetWhereBerriesArePlanted
+    Message Route208House_Text_DoYouForgetWherePlanted
    ShowYesNoMenu VAR_RESULT
    GoToIfEq VAR_RESULT, MENU_YES, Route208House_GiveBerrySearcherApp
-    GoToIfEq VAR_RESULT, MENU_NO, Route208House_ThenYoureOKWithoutThisNiceThing
+    GoToIfEq VAR_RESULT, MENU_NO, Route208House_OKWithoutThis
    End

 Route208House_GiveBerrySearcherApp:
-    Message Route208House_Text_YouCanHaveThisPoketchApp
+    Message Route208House_Text_HaveThisPoketchApp
    SetVar VAR_MAP_LOCAL_0, 1
    SetVar VAR_0x8004, POKETCH_APPID_BERRYSEARCHER
    Common_GivePoketchApp
@@ -66,8 +66,8 @@ Route208House_GiveBerrySearcherApp:
    ReleaseAll
    End

-Route208House_ThenYoureOKWithoutThisNiceThing:
-    Message Route208House_Text_ThenYoureOKWithoutThisNiceThing
+Route208House_OKWithoutThis:
+    Message Route208House_Text_OKWithoutThis
    WaitButton
    CloseMessage
    ReleaseAll
@@ -75,7 +75,7 @@ Route208House_ThenYoureOKWithoutThisNiceThing:

 Route208House_ExplainBerrySearcher:
    BufferPoketchAppName 0, POKETCH_APPID_BERRYSEARCHER
-    Message Route208House_Text_TheBerrySearcherShowsRipeBerryLocations
+    Message Route208House_Text_BerrySearcherShowsRipeLocations
    WaitButton
    CloseMessage
    ReleaseAll
@@ -126,7 +126,7 @@ Route208House_TryBuyMulch:
    AddItem VAR_0x8001, 1, VAR_RESULT
    BufferItemName 0, VAR_0x8001
    Message Route208House_Text_YouBoughtSomeMulch
-    Message Route208House_Text_ThatMulchWillPromoteBerryGrowth
+    Message Route208House_Text_MulchWillPromoteBerryGrowth
    GoTo Route208House_PokemonBreederFEnd

 Route208House_PokemonBreederFEnd:
--- a/res/field/scripts/scripts_route_209.s
+++ b/res/field/scripts/scripts_route_209.s
@@ -43,7 +43,7 @@ Route209_HallowedTower:
    GoToIfEq VAR_HALLOWED_TOWER_STATE, 1, Route209_CheckSpiritombCounter
    CheckItem ITEM_ODD_KEYSTONE, 1, VAR_RESULT
    GoToIfEq VAR_RESULT, FALSE, Route209_ThereIsABrokenTower
-    Message Route209_Text_WouldYouLikeToUseTheOddKeystone
+    Message Route209_Text_UseTheOddKeystone
    ShowYesNoMenu VAR_RESULT
    GoToIfEq VAR_RESULT, MENU_YES, Route209_UseOddKeystone
    CloseMessage
@@ -63,11 +63,11 @@ Route209_UseOddKeystone:
 Route209_CheckSpiritombCounter:
    GetSpiritombCounter VAR_RESULT
    GoToIfGe VAR_RESULT, 32, Route209_EncounterSpiritomb
-    GoToIfGe VAR_RESULT, 29, Route209_ThereIsSomeSortOfPresence
+    GoToIfGe VAR_RESULT, 29, Route209_SomeSortOfPresence
    GoToIfGe VAR_RESULT, 22, Route209_IsThatTowerShaking
-    GoToIfGe VAR_RESULT, 15, Route209_IsThatCryingComingFromInside
-    GoToIfGe VAR_RESULT, 8, Route209_ItsStonesAppearToHaveShifted
-    GoTo Route209_ItWasBuiltManyYearsAgo
+    GoToIfGe VAR_RESULT, 15, Route209_CryingComingFromInside
+    GoToIfGe VAR_RESULT, 8, Route209_StonesAppearToHaveShifted
+    GoTo Route209_BuiltManyYearsAgo

 Route209_EncounterSpiritomb:
    WaitSE SEQ_SE_CONFIRM
@@ -87,22 +87,22 @@ Route209_BlackOut:
    ReleaseAll
    End

-Route209_ItWasBuiltManyYearsAgo:
-    Message Route209_Text_ItWasBuiltManyYearsAgo
+Route209_BuiltManyYearsAgo:
+    Message Route209_Text_BuiltManyYearsAgo
    WaitButton
    CloseMessage
    ReleaseAll
    End

-Route209_ItsStonesAppearToHaveShifted:
-    Message Route209_Text_ItsStonesAppearToHaveShifted
+Route209_StonesAppearToHaveShifted:
+    Message Route209_Text_StonesAppearToHaveShifted
    WaitButton
    CloseMessage
    ReleaseAll
    End

-Route209_IsThatCryingComingFromInside:
-    Message Route209_Text_IsThatCryingComingFromInside
+Route209_CryingComingFromInside:
+    Message Route209_Text_CryingComingFromInside
    WaitButton
    CloseMessage
    ReleaseAll
@@ -115,8 +115,8 @@ Route209_IsThatTowerShaking:
    ReleaseAll
    End

-Route209_ThereIsSomeSortOfPresence:
-    Message Route209_Text_ThereIsSomeSortOfPresence
+Route209_SomeSortOfPresence:
+    Message Route209_Text_SomeSortOfPresence
    WaitButton
    CloseMessage
    ReleaseAll
@@ -137,7 +137,7 @@ Route209_Fisherman:
    BufferItemNameWithArticle 0, VAR_0x8004
    CapitalizeFirstLetter 0
    GoToIfSet FLAG_GOOD_ROD_OBTAINED, Route209_AskExplainHowToFish
-    Message Route209_Text_GoodRodIsReallyGoodWouldntYouAgree
+    Message Route209_Text_GoodRodIsReallyGood
    ShowYesNoMenu VAR_RESULT
    GoToIfEq VAR_RESULT, MENU_YES, Route209_AcceptGoodRod
    GoToIfEq VAR_RESULT, MENU_NO, Route209_RefuseGoodRod
@@ -145,10 +145,10 @@ Route209_Fisherman:

 Route209_AskExplainHowToFish:
    BufferItemName 0, VAR_0x8004
-    Message Route209_Text_DoINeedToExplainHowToFish
+    Message Route209_Text_DoINeedToExplain
    ShowYesNoMenu VAR_RESULT
    GoToIfEq VAR_RESULT, MENU_YES, Route209_ExplainHowToFish
-    GoToIfEq VAR_RESULT, MENU_NO, Route209_WhenYouReelPokemonYouBattleIt
+    GoToIfEq VAR_RESULT, MENU_NO, Route209_WhenYouReelYouBattle
    End

 Route209_ExplainHowToFish:
@@ -158,8 +158,8 @@ Route209_ExplainHowToFish:
    ReleaseAll
    End

-Route209_WhenYouReelPokemonYouBattleIt:
-    Message Route209_Text_WhenYouReelPokemonYouBattleIt
+Route209_WhenYouReelYouBattle:
+    Message Route209_Text_WhenYouReelYouBattle
    WaitButton
    CloseMessage
    ReleaseAll
@@ -181,11 +181,11 @@ Route209_AcceptGoodRod:
    GoTo Route209_AskExplainHowToFish

 Route209_ArrowSignpostHearthomeCity:
-    ShowArrowSign Route209_Text_SignRt209HearthomeCity
+    ShowArrowSign Route209_Text_SignHearthomeCity
    End

 Route209_ArrowSignpostSolaceonTown:
-    ShowArrowSign Route209_Text_Rt209SolaceonTown
+    ShowArrowSign Route209_Text_SignSolaceonTown
    End

 Route209_TrainerTipsSignpost:
@@ -197,7 +197,7 @@ Route209_JoggerRichard:
    End

 Route209_JoggerRaul:
-    NPCMessage Route209_Text_AWildPokemonChasedAfterMe
+    NPCMessage Route209_Text_PokemonChasedAfterMe
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s
+++ b/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s
@@ -8,7 +8,7 @@
    ScriptEntryEnd

 Route209GateToHearthomeCity_BattleGirl:
-    NPCMessage Route209GateToHearthomeCity_Text_TheresAWreckedStonePillar
+    NPCMessage Route209GateToHearthomeCity_Text_WreckedStonePillar
    End

 Route209GateToHearthomeCity_CoordEvent_Rival:
@@ -52,7 +52,7 @@ Route209GateToHearthomeCity_PostRivalBattle:
    GoToIfEq VAR_RESULT, FALSE, Route209GateToHearthomeCity_BlackOut
    BufferRivalName 0
    BufferPlayerName 1
-    Message Route209GateToHearthomeCity_Text_MySurefireWinningStrategyDoesntWork
+    Message Route209GateToHearthomeCity_Text_MyStrategyDoesntWork
    CloseMessage
    GetPlayerMapPos VAR_0x8004, VAR_0x8005
    CallIfEq VAR_0x8005, 5, Route209GateToHearthomeCity_RivalLeaveZ5
--- a/res/field/scripts/scripts_route_209_lost_tower_5f.s
+++ b/res/field/scripts/scripts_route_209_lost_tower_5f.s
@@ -40,18 +40,18 @@ Route209LostTower5F_OldWoman2:
    LockAll
    FacePlayer
    GoToIfUnset FLAG_USED_DEFOG_IN_ROUTE_209_LOST_TOWER_5F, Route209LostTower5F_ThisFogObscuresEverything2
-    GoToIfSet FLAG_RECEIVED_ROUTE_209_LOST_TOWER_5F_CLEANSE_TAG, Route209LostTower5F_AllDepartedPokemonFindSolaceHere
+    GoToIfSet FLAG_RECEIVED_ROUTE_209_LOST_TOWER_5F_CLEANSE_TAG, Route209LostTower5F_PokemonFindSolaceHere
    Message Route209LostTower5F_Text_TakeThis
    SetVar VAR_0x8004, ITEM_CLEANSE_TAG
    SetVar VAR_0x8005, 1
    GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, Route209LostTower5F_BagIsFull
    Common_GiveItemQuantity
    SetFlag FLAG_RECEIVED_ROUTE_209_LOST_TOWER_5F_CLEANSE_TAG
-    GoTo Route209LostTower5F_AllDepartedPokemonFindSolaceHere
+    GoTo Route209LostTower5F_PokemonFindSolaceHere
    End

-Route209LostTower5F_AllDepartedPokemonFindSolaceHere:
-    Message Route209LostTower5F_Text_AllDepartedPokemonFindSolaceHere
+Route209LostTower5F_PokemonFindSolaceHere:
+    Message Route209LostTower5F_Text_PokemonFindSolaceHere
    WaitButton
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_route_210_grandma_wilma_house.s
+++ b/res/field/scripts/scripts_route_210_grandma_wilma_house.s
@@ -107,7 +107,7 @@ Route210GrandmaWilmaHouse_PickPokemonToTeach:
    CheckPartyMonHasMove VAR_RESULT, MOVE_DRACO_METEOR, VAR_0x8000
    GoToIfEq VAR_RESULT, TRUE, Route210GrandmaWilmaHouse_AlreadyKnowsDracoMeteor
    GetPartyMonFriendship VAR_RESULT, VAR_0x8000
-    GoToIfLt VAR_RESULT, 255, Route210GrandmaWilmaHouse_DoesntFullyTrustYou
+    GoToIfLt VAR_RESULT, MAX_FRIENDSHIP_VALUE, Route210GrandmaWilmaHouse_DoesntFullyTrustYou
    SetVar VAR_0x8003, MOVE_DRACO_METEOR
    GoTo Route210GrandmaWilmaHouse_TryTeachDracoMeteor

--- a/res/field/scripts/scripts_route_210_south.s
+++ b/res/field/scripts/scripts_route_210_south.s
@@ -251,7 +251,7 @@ Route210South_SignboardCafeCabin:
    End

 Route210South_ArrowSignpostSolaceonTown:
-    ShowArrowSign Route210South_Text_SignRt210SolaceonTown
+    ShowArrowSign Route210South_Text_SignSolaceonTown
    End

 Route210South_JoggerWyatt:
--- a/res/field/scripts/scripts_route_211_west.s
+++ b/res/field/scripts/scripts_route_211_west.s
@@ -12,11 +12,11 @@ Route211West_Dummy1:
    End

 Route211West_ArrowSignpostMtCoronet:
-    ShowArrowSign Route211West_Text_Rt211MtCoronet
+    ShowArrowSign Route211West_Text_SignMtCoronet
    End

 Route211West_ArrowSignpostEternaCity:
-    ShowArrowSign Route211West_Text_Rt211EternaCity
+    ShowArrowSign Route211West_Text_SignEternaCity
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_route_213.s
+++ b/res/field/scripts/scripts_route_213.s
@@ -327,7 +327,7 @@ Route213_Fisherman:
    End

 Route213_ArrowSignpostPastoriaCity:
-    ShowArrowSign Route213_Text_SignRt213PastoriaCity
+    ShowArrowSign Route213_Text_SignPastoriaCity
    End

 Route213_SignboardHotelGrandLake:
--- a/res/field/scripts/scripts_route_215.s
+++ b/res/field/scripts/scripts_route_215.s
@@ -67,7 +67,7 @@ Route215_ArrowSignpostWest:
    End

 Route215_ArrowSignpostVeilstoneCity:
-    ShowArrowSign Route215_Text_SignRt215VeilstoneCity
+    ShowArrowSign Route215_Text_SignVeilstoneCity
    End

 Route215_TrainerTipsSignpost:
--- a/res/field/scripts/scripts_route_216.s
+++ b/res/field/scripts/scripts_route_216.s
@@ -12,7 +12,7 @@ Route216_CantRideBike_Unused:
    End

 Route216_ArrowSignpostMtCoronet:
-    ShowArrowSign Route216_Text_SignRt216MtCoronet
+    ShowArrowSign Route216_Text_SignMtCoronet
    End

 Route216_SignboardSnowboundLodge:
--- a/res/field/scripts/scripts_route_217.s
+++ b/res/field/scripts/scripts_route_217.s
@@ -14,7 +14,7 @@ Route217_IceRock:
    End

 Route217_ArrowSignpostLakeAcuity:
-    ShowArrowSign Route217_Text_SignRt217LakeAcuity
+    ShowArrowSign Route217_Text_SignLakeAcuity
    End

 Route217_SnowpointNPCF:
--- a/res/field/scripts/scripts_route_218_gate_to_canalave_city.s
+++ b/res/field/scripts/scripts_route_218_gate_to_canalave_city.s
@@ -13,17 +13,17 @@ Route218GateToCanalaveCity_CoordEvent_ScientistM:
    BufferPlayerName 0
    BufferCounterpartName 1
    GetPlayerGender VAR_RESULT
-    GoToIfEq VAR_RESULT, GENDER_MALE, Route218GateToCanalaveCity_UpgradeyourPokedexMale
-    GoTo Route218GateToCanalaveCity_UpgradeyourPokedexFemale
+    GoToIfEq VAR_RESULT, GENDER_MALE, Route218GateToCanalaveCity_UpgradeYourPokedexMale
+    GoTo Route218GateToCanalaveCity_UpgradeYourPokedexFemale
    End

-Route218GateToCanalaveCity_UpgradeyourPokedexMale:
-    Message Route218GateToCanalaveCity_Text_UpgradeyourPokedexMale
+Route218GateToCanalaveCity_UpgradeYourPokedexMale:
+    Message Route218GateToCanalaveCity_Text_UpgradeYourPokedexMale
    GoTo Route218GateToCanalaveCity_UpgradePokdex
    End

-Route218GateToCanalaveCity_UpgradeyourPokedexFemale:
-    Message Route218GateToCanalaveCity_Text_UpgradeyourPokedexFemale
+Route218GateToCanalaveCity_UpgradeYourPokedexFemale:
+    Message Route218GateToCanalaveCity_Text_UpgradeYourPokedexFemale
    GoTo Route218GateToCanalaveCity_UpgradePokdex
    End

--- a/res/field/scripts/scripts_route_222.s
+++ b/res/field/scripts/scripts_route_222.s
@@ -59,11 +59,11 @@ Route222_Fisherman:
    End

 Route222_ArrowSignpostHotelGrandLake:
-    ShowArrowSign Route222_Text_SignRt222HotelGrandLake
+    ShowArrowSign Route222_Text_SignHotelGrandLake
    End

 Route222_ArrowSignpostSunyshoreCity:
-    ShowArrowSign Route222_Text_SignRt222SunyshoreCity
+    ShowArrowSign Route222_Text_SignSunyshoreCity
    End

 Route222_SignboardPikachuFanClub:
--- a/res/field/scripts/scripts_route_225.s
+++ b/res/field/scripts/scripts_route_225.s
@@ -7,9 +7,9 @@
    ScriptEntryEnd

 Route225_ArrowSignpostFightArea:
-    ShowArrowSign Route225_Text_SignRt225FightArea
+    ShowArrowSign Route225_Text_SignFightArea
    End

 Route225_ArrowSignpostSurvivalArea:
-    ShowArrowSign Route225_Text_SignRt225SurvivalArea
+    ShowArrowSign Route225_Text_SignSurvivalArea
    End
--- a/res/field/scripts/scripts_route_226.s
+++ b/res/field/scripts/scripts_route_226.s
@@ -7,7 +7,7 @@
    ScriptEntryEnd

 Route226_ArrowSignpostSurvivalArea:
-    ShowArrowSign Route226_Text_SignRt226SurvivalArea
+    ShowArrowSign Route226_Text_SignSurvivalArea
    End

 Route226_ArrowSignpostRt227Rt228:
--- a/res/field/scripts/scripts_route_227.s
+++ b/res/field/scripts/scripts_route_227.s
@@ -171,7 +171,7 @@ Route227_Movement_Unused6:
    EndMovement

 Route227_ArrowSignpostStarkMountain:
-    ShowArrowSign Route227_Text_SignRt227StarkMountain
+    ShowArrowSign Route227_Text_SignStarkMountain
    End

 Route227_Buck:
--- a/res/field/scripts/scripts_route_228.s
+++ b/res/field/scripts/scripts_route_228.s
@@ -34,11 +34,11 @@ Route228_RemoveWarpRockPeakRuinsWithoutRegirock:
    End

 Route228_ArrowSignpostRt226:
-    ShowArrowSign Route228_Text_SignRt228Rt226
+    ShowArrowSign Route228_Text_SignRt226
    End

 Route228_ArrowSignpostRt229:
-    ShowArrowSign Route228_Text_SignRt228Rt229
+    ShowArrowSign Route228_Text_SignRt229
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_route_228_north_house.s
+++ b/res/field/scripts/scripts_route_228_north_house.s
@@ -42,7 +42,7 @@ Route228NorthHouse_TryTeachUltimateMove:
    Call Route228NorthHouse_CheckHasUltimateMove
    GoToIfEq VAR_RESULT, TRUE, Route228NorthHouse_AlreadyKnowsMove
    GetPartyMonFriendship VAR_RESULT, VAR_0x8000
-    GoToIfLt VAR_RESULT, 255, Route228NorthHouse_NotBondedEnough
+    GoToIfLt VAR_RESULT, MAX_FRIENDSHIP_VALUE, Route228NorthHouse_NotBondedEnough
    BufferPartyMonSpecies 0, VAR_0x8000
    GoToIfEq VAR_0x8002, 1, Route228NorthHouse_AskTeachBlastBurn
    GoToIfEq VAR_0x8002, 2, Route228NorthHouse_AskTeachHydroCannon
--- a/res/field/scripts/scripts_route_229.s
+++ b/res/field/scripts/scripts_route_229.s
@@ -39,7 +39,7 @@ Route229_BagIsFull:
    End

 Route229_ArrowSignpostResortArea:
-    ShowArrowSign Route229_Text_SignRt229ResortArea
+    ShowArrowSign Route229_Text_SignResortArea
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_route_230.s
+++ b/res/field/scripts/scripts_route_230.s
@@ -8,7 +8,7 @@
    ScriptEntryEnd

 Route230_ArrowSignpostFightArea:
-    ShowArrowSign Route230_Text_SignRt230FightArea
+    ShowArrowSign Route230_Text_SignFightArea
    End

 Route230_Fisherman:
--- a/res/field/scripts/scripts_stark_mountain_room_3.s
+++ b/res/field/scripts/scripts_stark_mountain_room_3.s
@@ -26,7 +26,7 @@ StarkMountainRoom3_TryHideHeatran:
    GoToIfEq VAR_MAP_LOCAL_0, FALSE, StarkMountainRoom3_HideHeatran
    GetNationalDexEnabled VAR_MAP_LOCAL_0
    GoToIfEq VAR_MAP_LOCAL_0, FALSE, StarkMountainRoom3_HideHeatran
-    GoToIfUnset FLAG_CAUGHT_MESPRIT, StarkMountainRoom3_HideHeatran
+    GoToIfUnset FLAG_TALKED_TO_BATTLEGROUND_BUCK, StarkMountainRoom3_HideHeatran
    GoToIfNe VAR_STARK_MOUNTAIN_ROOM_3_STATE, 1, StarkMountainRoom3_HideHeatran
    ClearFlag FLAG_HIDE_STARK_MOUNTAIN_ROOM_3_HEATRAN
    Return
--- a/res/field/scripts/scripts_victory_road_1f_room_2.s
+++ b/res/field/scripts/scripts_victory_road_1f_room_2.s
@@ -3,7 +3,7 @@
 #include "res/field/events/events_victory_road_1f_room_2.h"


-    ScriptEntry VictoryRoad1FRoom2_CoordEvent_StartFollowingMarley
+    ScriptEntry VictoryRoad1FRoom2_CoordEvent_MarleyStartFollowing
    ScriptEntry VictoryRoad1FRoom2_CoordEvent_PlayerLeaveMarley
    ScriptEntry VictoryRoad1FRoom2_CoordEvent_MarleyLeavePlayer
    ScriptEntry VictoryRoad1FRoom2_OnTransition
@@ -17,7 +17,7 @@ VictoryRoad1FRoom2_ResetFollowerMarleyState:
    SetVar VAR_VICTORY_ROAD_1F_ROOM_2_FOLLOWER_MARLEY_STATE, 0
    End

-VictoryRoad1FRoom2_CoordEvent_StartFollowingMarley:
+VictoryRoad1FRoom2_CoordEvent_MarleyStartFollowing:
    LockAll
    SetPlayerBike FALSE
    ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyNoticePlayer
@@ -34,34 +34,34 @@ VictoryRoad1FRoom2_CoordEvent_StartFollowingMarley:
 VictoryRoad1FRoom2_MarleyWalkToPlayerZ55:
    ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ55
    WaitMovement
-    GoTo VictoryRoad1FRoom2_StartFollowingMarley
+    GoTo VictoryRoad1FRoom2_MarleyStartFollowing

 VictoryRoad1FRoom2_MarleyWalkToPlayerZ56:
    ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ56
    WaitMovement
-    GoTo VictoryRoad1FRoom2_StartFollowingMarley
+    GoTo VictoryRoad1FRoom2_MarleyStartFollowing

 VictoryRoad1FRoom2_MarleyWalkToPlayerZ57:
    ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ57
    WaitMovement
-    GoTo VictoryRoad1FRoom2_StartFollowingMarley
+    GoTo VictoryRoad1FRoom2_MarleyStartFollowing

 VictoryRoad1FRoom2_MarleyWalkToPlayerZ58:
    ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ58
    WaitMovement
-    GoTo VictoryRoad1FRoom2_StartFollowingMarley
+    GoTo VictoryRoad1FRoom2_MarleyStartFollowing

 VictoryRoad1FRoom2_MarleyWalkToPlayerZ59:
    ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ59
    WaitMovement
-    GoTo VictoryRoad1FRoom2_StartFollowingMarley
+    GoTo VictoryRoad1FRoom2_MarleyStartFollowing

 VictoryRoad1FRoom2_MarleyWalkToPlayerZ60:
    ApplyMovement LOCALID_MARLEY, VictoryRoad1FRoom2_Movement_MarleyWalkToPlayerZ60
    WaitMovement
-    GoTo VictoryRoad1FRoom2_StartFollowingMarley
+    GoTo VictoryRoad1FRoom2_MarleyStartFollowing

-VictoryRoad1FRoom2_StartFollowingMarley:
+VictoryRoad1FRoom2_MarleyStartFollowing:
    BufferPlayerName 0
    CallIfUnset FLAG_TALKED_TO_VICTORY_ROAD_1F_ROOM_2_MARLEY, VictoryRoad1FRoom2_LetMeGoWithYou
    CallIfSet FLAG_TALKED_TO_VICTORY_ROAD_1F_ROOM_2_MARLEY, VictoryRoad1FRoom2_YouTookSoLong
--- a/res/text/poffin_house.json
+++ b/res/text/poffin_house.json
@@ -2,7 +2,7 @@
  "key": 3083,
  "messages": [
    {
-      "id": "PoffinHouse_Text_HeresMyAdviceOnCookingPoffins",
+      "id": "PoffinHouse_Text_AdviceOnCookingPoffins",
      "en_US": [
        "Hi!\n",
        "Let’s get cooking!\r",
@@ -28,7 +28,7 @@
      ]
    },
    {
-      "id": "PoffinHouse_Text_EatingMakesPeopleAndPokemonHappy",
+      "id": "PoffinHouse_Text_EatingMakesPeopleHappy",
      "en_US": [
        "Eating good food makes people and\n",
        "Pokémon more energetic and happy.\r",
@@ -36,7 +36,7 @@
      ]
    },
    {
-      "id": "PoffinHouse_Text_AtTheWiFiClubICanCookWithFriends",
+      "id": "PoffinHouse_Text_ICanCookWithFriends",
      "en_US": [
        "At the Wi-Fi Club, I can cook up Poffins\n",
        "with my friends!"
--- a/res/text/pokemon_league.json
+++ b/res/text/pokemon_league.json
@@ -2,7 +2,7 @@
  "key": 17303,
  "messages": [
    {
-      "id": "PokemonLeague_Text_PokemonLeagueThePinnacleOfTrainerdom",
+      "id": "PokemonLeague_Text_PinnacleOfTrainerdom",
      "en_US": [
        "Pokémon League\n",
        "The Pinnacle of Trainerdom!"
--- a/res/text/pokemon_league_hall_of_fame.json
+++ b/res/text/pokemon_league_hall_of_fame.json
@@ -25,7 +25,7 @@
      ]
    },
    {
-      "id": "PokemonLeagueHallOfFame_Text_ThisRoomIsALegacyToPokemonAndTrainers",
+      "id": "PokemonLeagueHallOfFame_Text_LegacyToPokemonAndTrainers",
      "en_US": [
        "Cynthia: It’s a natural reaction,\n",
        "Professor.\r",
@@ -49,7 +49,7 @@
      ]
    },
    {
-      "id": "PokemonLeagueHallOfFame_Text_TimeToRecordYourNameAndYourPokemon",
+      "id": "PokemonLeagueHallOfFame_Text_RecordYourNameAndPokemon",
      "en_US": [
        "Your names will be recorded for\n",
        "posterity here.\r",
--- a/res/text/pokemon_league_hallway_to_hall_of_fame.json
+++ b/res/text/pokemon_league_hallway_to_hall_of_fame.json
@@ -2,7 +2,7 @@
  "key": 53294,
  "messages": [
    {
-      "id": "PokemonLeagueHallwayToHallOfFame_Text_TheRoomAheadIsTheHallOfFame",
+      "id": "PokemonLeagueHallwayToHallOfFame_Text_RoomAheadIsHallOfFame",
      "en_US": [
        "Cynthia: The room ahead is the Hall\n",
        "of Fame...\r"
@@ -20,7 +20,7 @@
      "en_US": "Cynthia: Oh, hello, Professor Rowan.\r"
    },
    {
-      "id": "PokemonLeagueHallwayToHallOfFame_Text_YouveGrownIntoARealChampion",
+      "id": "PokemonLeagueHallwayToHallOfFame_Text_GrownIntoRealChampion",
      "en_US": [
        "Rowan: Hm!\r",
        "A child I enlisted for my Pokédex\n",
@@ -33,7 +33,7 @@
      ]
    },
    {
-      "id": "PokemonLeagueHallwayToHallOfFame_Text_ProfessorYouStillEnjoyEnthusiasm",
+      "id": "PokemonLeagueHallwayToHallOfFame_Text_YouStillEnjoyEnthusiasm",
      "en_US": [
        "Cynthia: Professor, you still enjoy\n",
        "the enthusiasm kids bring to your\f",
@@ -55,7 +55,7 @@
      ]
    },
    {
-      "id": "PokemonLeagueHallwayToHallOfFame_Text_ProfessorRowanPleaseJoinUs",
+      "id": "PokemonLeagueHallwayToHallOfFame_Text_ProfessorPleaseJoinUs",
      "en_US": "Professor Rowan, please join us.\r"
    },
    {
--- a/res/text/pokemon_league_north_pokecenter_1f.json
+++ b/res/text/pokemon_league_north_pokecenter_1f.json
@@ -30,7 +30,7 @@
      ]
    },
    {
-      "id": "PokemonLeagueNorthPokecenter1F_Text_LetUsExamineYourGymBadges",
+      "id": "PokemonLeagueNorthPokecenter1F_Text_ExamineGymBadges",
      "en_US": [
        "Let me confirm that you are qualified\n",
        "to challenge the Pokémon League.\r",
@@ -48,7 +48,7 @@
      ]
    },
    {
-      "id": "PokemonLeagueNorthPokecenter1F_Text_YouveCollectedAllGymBadges",
+      "id": "PokemonLeagueNorthPokecenter1F_Text_CollectedAllGymBadges",
      "en_US": [
        "Very well!\r",
        "Trainer, you’ve indeed collected\n",
@@ -58,7 +58,7 @@
      ]
    },
    {
-      "id": "PokemonLeagueNorthPokecenter1F_Text_YouWillBeFacingTheEliteFour",
+      "id": "PokemonLeagueNorthPokecenter1F_Text_YouWillFaceTheEliteFour",
      "en_US": [
        "You will be facing the Elite Four\n",
        "of the Pokémon League.\r",
--- a/res/text/pokemon_league_south_pokecenter_1f.json
+++ b/res/text/pokemon_league_south_pokecenter_1f.json
@@ -2,7 +2,7 @@
  "key": 2963,
  "messages": [
    {
-      "id": "PokemonLeagueSouthPokecenter1F_Text_TheObjectiveIsToReachThePokemonLeague",
+      "id": "PokemonLeagueSouthPokecenter1F_Text_ReachThePokemonLeague",
      "en_US": [
        "The objective is to reach the Pokémon\n",
        "League.\r",
--- a/res/text/poketch_co_1f.json
+++ b/res/text/poketch_co_1f.json
@@ -2,7 +2,7 @@
  "key": 17411,
  "messages": [
    {
-      "id": "PoketchCo1F_Text_ImThePresidentOfThePoketchCompany",
+      "id": "PoketchCo1F_Text_PresidentOfPoketchCompany",
      "en_US": [
        "Hi, hi!\r",
        "I’m the president of the Pokétch\n",
@@ -10,7 +10,7 @@
      ]
    },
    {
-      "id": "PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetAGymBadge",
+      "id": "PoketchCo1F_Text_NewAppWhenYouGetAGymBadge",
      "en_US": [
        "I’m developing a new Pokétch app,\n",
        "but it’s not quite done.\r",
@@ -19,7 +19,7 @@
      ]
    },
    {
-      "id": "PoketchCo1F_Text_IveDevelopedANewPoketchApp",
+      "id": "PoketchCo1F_Text_IveDevelopedANewApp",
      "en_US": [
        "Hi, hi!\n",
        "Your patience is rewarded!\r",
@@ -34,7 +34,7 @@
      ]
    },
    {
-      "id": "PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetThreeGymBadges",
+      "id": "PoketchCo1F_Text_NewAppWhenYouGetThreeBadges",
      "en_US": [
        "I’m developing a new Pokétch app,\n",
        "but it’s not quite done.\r",
@@ -43,7 +43,7 @@
      ]
    },
    {
-      "id": "PoketchCo1F_Text_IveDevelopedAnotherNewPoketchApp",
+      "id": "PoketchCo1F_Text_IveDevelopedAnotherApp",
      "en_US": [
        "Hi, hi!\n",
        "Your patience is rewarded!\r",
@@ -52,7 +52,7 @@
      ]
    },
    {
-      "id": "PoketchCo1F_Text_HavingAMapConstantlyDisplayedIsConvenientNo",
+      "id": "PoketchCo1F_Text_MapDisplayedIsConvenient",
      "en_US": [
        "Having a map constantly displayed\n",
        "is convenient, no?\r",
@@ -61,7 +61,7 @@
      ]
    },
    {
-      "id": "PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetFiveGymBadges",
+      "id": "PoketchCo1F_Text_NewAppWhenYouGetFiveBadges",
      "en_US": [
        "I’m developing a new Pokétch app,\n",
        "but it’s not quite done.\r",
@@ -70,7 +70,7 @@
      ]
    },
    {
-      "id": "PoketchCo1F_Text_IveDevelopedYetAnotherNewPoketchApp",
+      "id": "PoketchCo1F_Text_IveDevelopedYetAnotherApp",
      "en_US": [
        "Hi, hi!\n",
        "Your patience is rewarded!\r",
@@ -79,7 +79,7 @@
      ]
    },
    {
-      "id": "PoketchCo1F_Text_IThinkItWillBeUsefulToKnowHowManyPeopleAreCommunicating",
+      "id": "PoketchCo1F_Text_KnowHowManyPeopleAreCommunicating",
      "en_US": [
        "I think it will be useful to know how\n",
        "many people are communicating, like\f",
@@ -87,7 +87,7 @@
      ]
    },
    {
-      "id": "PoketchCo1F_Text_NewPoketchAppWillBeReadyWhenYouGetSevenGymBadges",
+      "id": "PoketchCo1F_Text_NewAppWhenYouGetSevenBadges",
      "en_US": [
        "I’m developing a new Pokétch app,\n",
        "but it’s not quite done.\r",
@@ -96,7 +96,7 @@
      ]
    },
    {
-      "id": "PoketchCo1F_Text_IveDevelopedStillYetAnotherNewPoketchApp",
+      "id": "PoketchCo1F_Text_IveDevelopedStillYetAnotherApp",
      "en_US": [
        "Hi, hi!\n",
        "Your patience is rewarded!\r",
@@ -105,7 +105,7 @@
      ]
    },
    {
-      "id": "PoketchCo1F_Text_CheckTypeMatchupsSoYouCanMakeAllYourAttackSuperEffective",
+      "id": "PoketchCo1F_Text_CheckTypeMatchups",
      "en_US": [
        "Check type matchups so you can make\n",
        "all your attacks super effective!\r",
@@ -113,7 +113,7 @@
      ]
    },
    {
-      "id": "PoketchCo1F_Text_YupAllSortsOfPeopleWillGiveYouPoketchApps",
+      "id": "PoketchCo1F_Text_AllSortsOfPeopleGivePoketchApps",
      "en_US": [
        "Yup, all sorts of people will give\n",
        "you Pokétch apps.\r",
@@ -121,7 +121,7 @@
      ]
    },
    {
-      "id": "PoketchCo1F_Text_DoYouThinkIShouldSolicitNewPoketchIdeas",
+      "id": "PoketchCo1F_Text_ShouldISolicitNewPoketchIdeas",
      "en_US": [
        "So, yup, what to do?\r",
        "Do you think I should solicit new\n",
@@ -129,7 +129,7 @@
      ]
    },
    {
-      "id": "PoketchCo1F_Text_OhYouCanBeSureIWillKeepDevelopingPoketchApps",
+      "id": "PoketchCo1F_Text_IWillKeepDeveloping",
      "en_US": [
        "Oh, you can be sure I will keep\n",
        "developing Pokétch apps.\r",
--- a/res/text/poketch_co_2f.json
+++ b/res/text/poketch_co_2f.json
@@ -2,14 +2,14 @@
  "key": 17423,
  "messages": [
    {
-      "id": "PoketchCo2F_Text_WellTryToThinkLikeATrainerAndFindWhatPoketchAppsWouldBeGood",
+      "id": "PoketchCo2F_Text_WellThinkLikeATrainer",
      "en_US": [
        "We’ll try to think like a Trainer and find\n",
        "what Pokétch apps would be good."
      ]
    },
    {
-      "id": "PoketchCo2F_Text_PokemonWatchThatsPoketchForShort",
+      "id": "PoketchCo2F_Text_PoketchForShort",
      "en_US": [
        "Pokémon Watch!\n",
        "That’s Pokétch for short.\r",
@@ -20,11 +20,11 @@
      ]
    },
    {
-      "id": "PoketchCo2F_Text_ClefairyCleffy",
+      "id": "PoketchCo2F_Text_ClefairyCry",
      "en_US": "CLEFAIRY: Cleffy?"
    },
    {
-      "id": "PoketchCo2F_Text_PachirisuPatchii",
+      "id": "PoketchCo2F_Text_PachirisuCry",
      "en_US": "PACHIRISU: Patchii?"
    }
  ]
--- a/res/text/poketch_co_3f.json
+++ b/res/text/poketch_co_3f.json
@@ -2,7 +2,7 @@
  "key": 17419,
  "messages": [
    {
-      "id": "PoketchCo3F_Text_TheresAGirlsModelAndABoysModel",
+      "id": "PoketchCo3F_Text_TheresGenderedModels",
      "en_US": [
        "Do you have a Pokétch?\r",
        "There’s a girl’s model and a boy’s\n",
@@ -20,7 +20,7 @@
      ]
    },
    {
-      "id": "PoketchCo3F_Text_PeopleEverywhereMakePoketchApps",
+      "id": "PoketchCo3F_Text_PeopleEverywhereMakeApps",
      "en_US": [
        "People everywhere make Pokétch apps.\r",
        "You’ll be able to get new apps from\n",
@@ -30,56 +30,56 @@
      ]
    },
    {
-      "id": "PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps1",
+      "id": "PoketchCo3F_Text_DescriptionsOfPoketchApps1",
      "en_US": [
        "There are descriptions of Pokétch\n",
        "apps.\r"
      ]
    },
    {
-      "id": "PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout1",
+      "id": "PoketchCo3F_Text_ReadAboutWhichPoketchApp1",
      "en_US": [
        "Which Pokétch app would\n",
        "you like to read about?"
      ]
    },
    {
-      "id": "PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps2",
+      "id": "PoketchCo3F_Text_DescriptionsOfPoketchApps2",
      "en_US": [
        "There are descriptions of Pokétch\n",
        "apps.\r"
      ]
    },
    {
-      "id": "PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout2",
+      "id": "PoketchCo3F_Text_ReadAboutWhichPoketchApp2",
      "en_US": [
        "Which Pokétch app would\n",
        "you like to read about?"
      ]
    },
    {
-      "id": "PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps3",
+      "id": "PoketchCo3F_Text_DescriptionsOfPoketchApps3",
      "en_US": [
        "There are descriptions of Pokétch\n",
        "apps.\r"
      ]
    },
    {
-      "id": "PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout3",
+      "id": "PoketchCo3F_Text_ReadAboutWhichPoketchApp3",
      "en_US": [
        "Which Pokétch app would you like\n",
        "to read about?"
      ]
    },
    {
-      "id": "PoketchCo3F_Text_ThereAreDescriptionsOfPoketchApps4",
+      "id": "PoketchCo3F_Text_DescriptionsOfPoketchApps4",
      "en_US": [
        "There are descriptions of Pokétch\n",
        "apps.\r"
      ]
    },
    {
-      "id": "PoketchCo3F_Text_WhichPoketchAppWouldYouLikeToReadAbout4",
+      "id": "PoketchCo3F_Text_ReadAboutWhichPoketchApp4",
      "en_US": [
        "Which Pokétch app would you like\n",
        "to read about?"
--- a/res/text/rock_peak_ruins.json
+++ b/res/text/rock_peak_ruins.json
@@ -2,7 +2,7 @@
  "key": 25726,
  "messages": [
    {
-      "id": "RockPeakRuins_Text_ItsAStatueOfAPokemonFromSomewhereSomethingSpokeOut",
+      "id": "RockPeakRuins_Text_FromSomewhereSomethingSpokeOut",
      "en_US": [
        "It’s a statue of a Pokémon.\n",
        "It seems to exude power...\r",
@@ -31,7 +31,7 @@
      ]
    },
    {
-      "id": "RockPeakRuins_Text_ItsAStatueOfAPokemonItSeemsToExudePower",
+      "id": "RockPeakRuins_Text_SeemsToExudePower",
      "en_US": [
        "It’s a statue of a Pokémon.\n",
        "It seems to exude power..."
--- a/res/text/route_201.json
+++ b/res/text/route_201.json
@@ -6,14 +6,14 @@
      "en_US": "Too slow!\r"
    },
    {
-      "id": "Route201_Text_LetsGetMovingToProfRowansLab",
+      "id": "Route201_Text_LetsGetMoving",
      "en_US": [
        "{STRVAR_1 3, 0, 0}: All right!\n",
        "Let’s get moving to Prof. Rowan’s lab.\r"
      ]
    },
    {
-      "id": "Route201_Text_TrustMeIveGotAnIdea",
+      "id": "Route201_Text_IveGotAnIdea",
      "en_US": [
        "{STRVAR_1 3, 0, 0}: ...\n",
        "...\r",
@@ -29,7 +29,7 @@
      ]
    },
    {
-      "id": "Route201_Text_ScootOverBeforeWildPokemonCanAppear",
+      "id": "Route201_Text_JustKeepDashing",
      "en_US": [
        "So, what you do is, you scoot over to\n",
        "the next patch of grass before any\f",
@@ -52,7 +52,7 @@
      "en_US": "{SIZE 200}Hold it!{SIZE 100}\r"
    },
    {
-      "id": "Route201_Text_YouTwoDontHaveAnyPokemon",
+      "id": "Route201_Text_YouHaveNoPokemon",
      "en_US": [
        "Professor: You two don’t seem to have\n",
        "any Pokémon between you?\r",
@@ -77,7 +77,7 @@
      ]
    },
    {
-      "id": "Route201_Text_ThisIsProfRowanIsntIt",
+      "id": "Route201_Text_ThisIsProfRowan",
      "en_US": [
        "{STRVAR_1 3, 0, 0}: Hey, {STRVAR_1 3, 1, 0}.\n",
        "This old guy...\r",
@@ -103,21 +103,21 @@
      ]
    },
    {
-      "id": "Route201_Text_YouTrulyLovePokemonDoYou",
+      "id": "Route201_Text_YouLovePokemonDoYou",
      "en_US": [
        "You two.\n",
        "You truly love Pokémon, do you?"
      ]
    },
    {
-      "id": "Route201_Text_YoureNotMakingAnySense",
+      "id": "Route201_Text_YoureNotMakingSense",
      "en_US": [
        "{STRVAR_1 3, 0, 0}: Whoa, hold up!\n",
        "You’re not making any sense here!\r"
      ]
    },
    {
-      "id": "Route201_Text_IDidntQuiteCatchThat",
+      "id": "Route201_Text_IDidntCatchThat",
      "en_US": [
        "Professor: Er-hem!\r",
        "I didn’t quite catch that, so I will\n",
@@ -163,7 +163,7 @@
      ]
    },
    {
-      "id": "Route201_Text_ItWorriesMeWhatPeopleWouldDo",
+      "id": "Route201_Text_ItWorriesMe",
      "en_US": [
        "Professor: ...A pair of reckless kids\n",
        "who foolishly try to enter tall grass\f",
@@ -173,7 +173,7 @@
      ]
    },
    {
-      "id": "Route201_Text_GiveAPokemonToMyFriendHere",
+      "id": "Route201_Text_GiveAPokemonToMyFriend",
      "en_US": [
        "{STRVAR_1 3, 0, 0}: ...Uh...\n",
        "Well, I, uh...\r",
@@ -186,7 +186,7 @@
      ]
    },
    {
-      "id": "Route201_Text_IWillEntrustYouWithPokemon",
+      "id": "Route201_Text_EntrustYouWithPokemon",
      "en_US": [
        "Professor: !\r",
        "How big of you...\r",
@@ -203,21 +203,21 @@
      ]
    },
    {
-      "id": "Route201_Text_DawnYouLeftYourBriefcaseAtTheLake",
+      "id": "Route201_Text_DawnYouLeftYourBriefcase",
      "en_US": [
        "Dawn: Professor Rowan.\r",
        "You left your briefcase at the lake!\r"
      ]
    },
    {
-      "id": "Route201_Text_OhIsSomethingWrongHere",
+      "id": "Route201_Text_OhIsSomethingWrong",
      "en_US": [
        "Oh?\n",
        "Is something wrong here?\r"
      ]
    },
    {
-      "id": "Route201_Text_LucasYouLeftYourBriefcaseAtTheLake",
+      "id": "Route201_Text_LucasYouLeftYourBriefcase",
      "en_US": [
        "Lucas: Professor Rowan!\r",
        "You left your briefcase behind at\n",
@@ -225,11 +225,11 @@
      ]
    },
    {
-      "id": "Route201_Text_IsSomethingWrongHere",
+      "id": "Route201_Text_IsSomethingWrong",
      "en_US": "Is something wrong here?\r"
    },
    {
-      "id": "Route201_Text_ThereItIsNiceWorkDawn",
+      "id": "Route201_Text_NiceWorkDawn",
      "en_US": [
        "Rowan: Ah! There it is!\n",
        "Dawn, nice work.\r",
@@ -238,7 +238,7 @@
      ]
    },
    {
-      "id": "Route201_Text_ThereItIsNiceWorkLucas",
+      "id": "Route201_Text_NiceWorkLucas",
      "en_US": [
        "Rowan: Ah! There it is!\n",
        "Lucas, nice work.\r",
@@ -247,7 +247,7 @@
      ]
    },
    {
-      "id": "Route201_Text_DawnThosePokemonAreHardToReplace",
+      "id": "Route201_Text_DawnPokemonHardToReplace",
      "en_US": [
        "Dawn: Pardon?!\r",
        "Those Pokémon are hard to replace.\n",
@@ -322,7 +322,7 @@
      ]
    },
    {
-      "id": "Route201_Text_IHopeYoullDoWellTogether",
+      "id": "Route201_Text_IHopeYoullDoWell",
      "en_US": [
        "Rowan: Very well! Both of you have\n",
        "chosen a good Pokémon, it seems.\r",
@@ -451,7 +451,7 @@
      ]
    },
    {
-      "id": "Route201_Text_TogetherWeveGotNothingToFear",
+      "id": "Route201_Text_NothingToFear",
      "en_US": [
        "{STRVAR_1 3, 0, 0}: Me and you together,\n",
        "we’ve got nothing to fear!"
@@ -472,7 +472,7 @@
      ]
    },
    {
-      "id": "Route201_Text_WildPokemonLurkInTallGrass",
+      "id": "Route201_Text_PokemonLurkInGrass",
      "en_US": [
        "Wild Pokémon lurk in tall grass. They\n",
        "can come bursting out at any time.\r",
@@ -483,7 +483,7 @@
      ]
    },
    {
-      "id": "Route201_Text_HereAPotionAsAFreeSample",
+      "id": "Route201_Text_PotionAsFreeSample",
      "en_US": [
        "Hi!\n",
        "I work at a Pokémon Mart.\r",
@@ -500,7 +500,7 @@
      ]
    },
    {
-      "id": "Route201_Text_YouCanFindMartsInCitiesAndMajorTowns",
+      "id": "Route201_Text_FindMartsInCitiesAndTowns",
      "en_US": [
        "You can find a Pokémon Mart in cities\n",
        "and most major towns."
@@ -514,7 +514,7 @@
      ]
    },
    {
-      "id": "Route201_Text_IfYourPokemonsHPIsLowGoHome",
+      "id": "Route201_Text_IfHPIsLowGoHome",
      "en_US": [
        "If your Pokémon’s health--that’s its\n",
        "HP--is getting low, you should go\f",
@@ -522,7 +522,7 @@
      ]
    },
    {
-      "id": "Route201_Text_IfYourPokemonsHPIsLowGoToAPokemonCenter",
+      "id": "Route201_Text_IfHPIsLowGoToAPokemonCenter",
      "en_US": [
        "If your Pokémon’s health--that’s its\n",
        "HP--is getting low, you should go\f",
@@ -530,14 +530,14 @@
      ]
    },
    {
-      "id": "Route201_Text_Rt201TwinleafTown",
+      "id": "Route201_Text_SignTwinleafTown",
      "en_US": [
        "Rt. 201\n",
        "Twinleaf Town"
      ]
    },
    {
-      "id": "Route201_Text_Rt201SandgemTown",
+      "id": "Route201_Text_SignSandgemTown",
      "en_US": [
        "Rt. 201\n",
        "Sandgem Town"
--- a/res/text/route_202.json
+++ b/res/text/route_202.json
@@ -15,7 +15,7 @@
      ]
    },
    {
-      "id": "Route202_Text_DawnYouShouldGoTellYourFamily",
+      "id": "Route202_Text_DawnGoTellYourFamily",
      "en_US": [
        "Dawn: You should go tell your family\n",
        "that you’re helping the professor.\r",
@@ -23,7 +23,7 @@
      ]
    },
    {
-      "id": "Route202_Text_DawnIHaventShownYouHowToCatchAPokemon",
+      "id": "Route202_Text_DawnIllDemonstrateHowToCatch",
      "en_US": [
        "Dawn: Oh, that’s right!\r",
        "{STRVAR_1 3, 1, 0}, I haven’t shown you\n",
@@ -33,7 +33,7 @@
      ]
    },
    {
-      "id": "Route202_Text_DawnToGetYouStartedIllGiveYouFivePokeBalls",
+      "id": "Route202_Text_DawnIllGiveYouFivePokeBalls",
      "en_US": [
        "Dawn: Giggle...\n",
        "See? Isn’t it neat?\r",
@@ -76,7 +76,7 @@
      ]
    },
    {
-      "id": "Route202_Text_LucasWhyDontYouGoTellYourFamily",
+      "id": "Route202_Text_LucasGoTellYourFamily",
      "en_US": [
        "Lucas: Why don’t you go tell your\n",
        "family that the professor asked for\f",
@@ -85,7 +85,7 @@
      ]
    },
    {
-      "id": "Route202_Text_LucasDoYouKnowHowToCatchAPokemon",
+      "id": "Route202_Text_LucasIllDemonstrateHowToCatch",
      "en_US": [
        "Lucas: {STRVAR_1 3, 1, 0}, do you know\n",
        "how to catch a Pokémon?\r",
@@ -94,7 +94,7 @@
      ]
    },
    {
-      "id": "Route202_Text_LucasHereIllGiveYouFivePokeballsToGetYouStarted",
+      "id": "Route202_Text_LucasIllGiveYouFivePokeBalls",
      "en_US": [
        "Lucas: And that’s how it’s done.\r",
        "Actually, I should have lowered the\n",
@@ -121,7 +121,7 @@
      ]
    },
    {
-      "id": "Route202_Text_SomePokemonOnlyAppearInTheMorning",
+      "id": "Route202_Text_SomePokemonOnlyInTheMorning",
      "en_US": [
        "Some Pokémon only appear in the\n",
        "morning.\r",
@@ -131,21 +131,21 @@
      ]
    },
    {
-      "id": "Route202_Text_Rt202SandgemTown",
+      "id": "Route202_Text_SignSandgemTown",
      "en_US": [
        "Rt. 202\n",
        "Sandgem Town"
      ]
    },
    {
-      "id": "Route202_Text_Rt202JubilifeCity",
+      "id": "Route202_Text_SignJubilifeCity",
      "en_US": [
        "Rt. 202\n",
        "Jubilife City"
      ]
    },
    {
-      "id": "Route202_Text_TrainerTipsPokemonInvolvedInBattleEarnExpPoints",
+      "id": "Route202_Text_TrainerTipsEarnExpPoints",
      "en_US": [
        "Trainer Tips!\r",
        "All Pokémon that are involved in\n",
@@ -155,7 +155,7 @@
      ]
    },
    {
-      "id": "Route202_Text_DawnLetMeShowYouHowThePokeRadarWorks",
+      "id": "Route202_Text_DawnLetMeShowPokeRadar",
      "en_US": [
        "Dawn: Hi, {STRVAR_1 3, 0, 0}!\n",
        "I was waiting for you.\r",
@@ -166,7 +166,7 @@
      ]
    },
    {
-      "id": "Route202_Text_DawnTheresAPokemonInThatPatchOfTallGrass",
+      "id": "Route202_Text_DawnPokemonInPatchOfGrass",
      "en_US": [
        "Dawn: See?\n",
        "Did you notice the tall grass rustling?\r",
@@ -177,7 +177,7 @@
      ]
    },
    {
-      "id": "Route202_Text_DawnNowThisIsWhereItGetsInteresting",
+      "id": "Route202_Text_DawnItGetsInteresting",
      "en_US": [
        "Now, this is where it gets interesting.\r",
        "If you see another patch of rustling\n",
@@ -190,7 +190,7 @@
      ]
    },
    {
-      "id": "Route202_Text_LucasLetMeExplainHowThePokeRadarWorks",
+      "id": "Route202_Text_LucasLetMeExplainPokeRadar",
      "en_US": [
        "Lucas: {STRVAR_1 3, 0, 0}.\r",
        "Let me explain how the Poké Radar\n",
@@ -200,7 +200,7 @@
      ]
    },
    {
-      "id": "Route202_Text_LucasTheresAPokemonInThatPatchOfTallGrass",
+      "id": "Route202_Text_LucasPokemonInPatchOfGrass",
      "en_US": [
        "Lucas: There!\n",
        "Did you see the tall grass rustling?\r",
@@ -211,7 +211,7 @@
      ]
    },
    {
-      "id": "Route202_Text_LucasNowHeresTheStrangePart",
+      "id": "Route202_Text_LucasHeresTheStrangePart",
      "en_US": [
        "Now, here’s the strange part.\r",
        "If you see another patch of rustling\n",
--- a/res/text/route_203.json
+++ b/res/text/route_203.json
@@ -2,7 +2,7 @@
  "key": 40596,
  "messages": [
    {
-      "id": "Route203_Text_OfCourseIGotTougherIllDemonstrateItToYou",
+      "id": "Route203_Text_IGotTougher",
      "en_US": [
        "{STRVAR_1 3, 0, 0}: Hey! {STRVAR_1 3, 1, 0}!\n",
        "Tell me you got a little tougher!\r",
@@ -28,7 +28,7 @@
      ]
    },
    {
-      "id": "Route203_Text_YourFavoritePokemonShouldBePlacedAtTheTop",
+      "id": "Route203_Text_FavoritePokemonAtTheTop",
      "en_US": [
        "Your favorite Pokémon should be placed\n",
        "at the top left of your party list.\r",
@@ -37,21 +37,21 @@
      ]
    },
    {
-      "id": "Route203_Text_Rt203JubilifeCity",
+      "id": "Route203_Text_SignJubilifeCity",
      "en_US": [
        "Rt. 203\n",
        "Jubilife City"
      ]
    },
    {
-      "id": "Route203_Text_Rt203OreburghCity",
+      "id": "Route203_Text_SignOreburghCity",
      "en_US": [
        "Rt. 203\n",
        "Oreburgh City"
      ]
    },
    {
-      "id": "Route203_Text_TrainerTipsIfAPokemonIsAboutToEvolveItCanBeInstantlyStopped",
+      "id": "Route203_Text_TrainerTipsEvolveCanBeStopped",
      "en_US": [
        "Trainer Tips!\r",
        "If a Pokémon is about to evolve,\n",
@@ -63,7 +63,7 @@
      ]
    },
    {
-      "id": "Route203_Text_TrainerTipsPokemonMovesUseEnergyCalledPowerPoints",
+      "id": "Route203_Text_TrainerTipsMovesUsePowerPoints",
      "en_US": [
        "Trainer Tips!\r",
        "Pokémon moves use energy called\n",
--- a/res/text/route_204_north.json
+++ b/res/text/route_204_north.json
@@ -2,7 +2,7 @@
  "key": 2418,
  "messages": [
    {
-      "id": "Route204North_Text_AreYouRaisingDifferentKindsOfPokemon",
+      "id": "Route204North_Text_RaisingDifferentPokemon",
      "en_US": [
        "Are you raising different kinds of\n",
        "Pokémon?\r",
@@ -12,7 +12,7 @@
      ]
    },
    {
-      "id": "Route204North_Text_IdLikeYouToHaveThisTM",
+      "id": "Route204North_Text_HaveThisTM",
      "en_US": [
        "Hi, are you the flirty type?\n",
        "I’m asking you this to make a point.\r",
@@ -23,7 +23,7 @@
      ]
    },
    {
-      "id": "Route204North_Text_CaptivateOnlyWorksAgainstTheOppositeGender",
+      "id": "Route204North_Text_CaptivateOppositeGender",
      "en_US": [
        "You know how Pokémon have genders?\n",
        "Like, there are males and females?\r",
@@ -40,7 +40,7 @@
      ]
    },
    {
-      "id": "Route204North_Text_Rt204FloaromaTown",
+      "id": "Route204North_Text_SignFloaromaTown",
      "en_US": [
        "Rt. 204\n",
        "Floaroma Town"
--- a/res/text/route_204_south.json
+++ b/res/text/route_204_south.json
@@ -2,7 +2,7 @@
  "key": 2430,
  "messages": [
    {
-      "id": "Route204South_Text_ThereAreBouldersBlockingTheWayInsideTheCavern",
+      "id": "Route204South_Text_BouldersBlockingInsideCavern",
      "en_US": [
        "There are boulders blocking the way\n",
        "inside the cavern...\r",
@@ -11,14 +11,14 @@
      ]
    },
    {
-      "id": "Route204South_Text_Rt204JubilifeCity",
+      "id": "Route204South_Text_SignJubilifeCity",
      "en_US": [
        "Rt. 204\n",
        "Jubilife City"
      ]
    },
    {
-      "id": "Route204South_Text_RavagedPath",
+      "id": "Route204South_Text_SignRavagedPath",
      "en_US": "Ravaged Path"
    }
  ]
--- a/res/text/route_205_north.json
+++ b/res/text/route_205_north.json
@@ -2,21 +2,21 @@
  "key": 3442,
  "messages": [
    {
-      "id": "Route205North_Text_ToSitBackAndFishCasually",
+      "id": "Route205North_Text_FishCasually",
      "en_US": [
        "To sit back and fish casually...\n",
        "It’s a grown-up’s hobby."
      ]
    },
    {
-      "id": "Route205North_Text_Rt205EternaForest",
+      "id": "Route205North_Text_SignEternaForest",
      "en_US": [
        "Rt. 205\n",
        "Eterna Forest"
      ]
    },
    {
-      "id": "Route205North_Text_Rt205EternaCity",
+      "id": "Route205North_Text_SignEternaCity",
      "en_US": [
        "Rt. 205\n",
        "Eterna City"
--- a/res/text/route_205_south.json
+++ b/res/text/route_205_south.json
@@ -2,7 +2,7 @@
  "key": 3454,
  "messages": [
    {
-      "id": "Route205South_Text_HelpHelpTrainerPleaseIWantToSeeMyPapa",
+      "id": "Route205South_Text_HelpIWantToSeeMyPapa",
      "en_US": [
        "Help, help, Trainer!\n",
        "Please, I want to see my papa.\r",
@@ -17,14 +17,14 @@
      ]
    },
    {
-      "id": "Route205South_Text_IWantToSeeMyPapaHesAtTheValleyWindworks",
+      "id": "Route205South_Text_IWantToSeeMyPapa",
      "en_US": [
        "Please, Trainer! I want to see my papa.\n",
        "He’s at the Valley Windworks..."
      ]
    },
    {
-      "id": "Route205South_Text_WeTeamGalacticAreConductingResearchInTheEternaForest",
+      "id": "Route205South_Text_TeamGalacticConductingResearch",
      "en_US": [
        "We, Team Galactic, are conducting\n",
        "research in the Eterna Forest!\r",
@@ -32,7 +32,7 @@
      ]
    },
    {
-      "id": "Route205South_Text_OurResearchInvolvesCatchingPokemonInTheFloweryMeadowsOfFloaroma1",
+      "id": "Route205South_Text_ResearchInvolvesCatchingPokemon1",
      "en_US": [
        "Our research involves catching Pokémon\n",
        "in the flowery meadows of Floaroma.\r",
@@ -42,7 +42,7 @@
      ]
    },
    {
-      "id": "Route205South_Text_OurResearchInvolvesCatchingPokemonInTheFloweryMeadowsOfFloaroma2",
+      "id": "Route205South_Text_ResearchInvolvesCatchingPokemon2",
      "en_US": [
        "Our research involves catching Pokémon\n",
        "in the flowery meadows of Floaroma.\r",
@@ -52,7 +52,7 @@
      ]
    },
    {
-      "id": "Route205South_Text_ManyPoisonTypePokemonMakeTheEternaForestTheirHome",
+      "id": "Route205South_Text_ManyPoisonTypePokemon",
      "en_US": [
        "Many Poison-type Pokémon make the\n",
        "Eterna Forest their home.\r",
@@ -62,7 +62,7 @@
      ]
    },
    {
-      "id": "Route205South_Text_IfYouSlatherSweetHoneyOnASweetSmellingTree",
+      "id": "Route205South_Text_SlatherHoneyOnATree",
      "en_US": [
        "If you slather sweet Honey on\n",
        "a sweet-smelling tree...\r",
@@ -71,21 +71,21 @@
      ]
    },
    {
-      "id": "Route205South_Text_Rt205FloaromaTown",
+      "id": "Route205South_Text_SignFloaromaTown",
      "en_US": [
        "Rt. 205\n",
        "Floaroma Town"
      ]
    },
    {
-      "id": "Route205South_Text_Rt205EternaForest",
+      "id": "Route205South_Text_SignEternaForest",
      "en_US": [
        "Rt. 205\n",
        "Eterna Forest"
      ]
    },
    {
-      "id": "Route205South_Text_TrainerTipsTheItemsPlacedInYourBagAreAutomaticallySorted",
+      "id": "Route205South_Text_TrainerTipsItemsAutomaticallySorted",
      "en_US": [
        "Trainer Tips!\r",
        "The items placed in your Bag are\n",
--- a/res/text/route_206.json
+++ b/res/text/route_206.json
@@ -2,7 +2,7 @@
  "key": 40576,
  "messages": [
    {
-      "id": "Route206_Text_IHeardThereWereTwoCavesOnRoute206",
+      "id": "Route206_Text_TwoCavesOnRoute206",
      "en_US": [
        "This is odd... I heard there were two\n",
        "caves on Route 206.\r",
@@ -10,14 +10,14 @@
      ]
    },
    {
-      "id": "Route206_Text_Rt206EternaCity",
+      "id": "Route206_Text_SignEternaCity",
      "en_US": [
        "Rt. 206\n",
        "Eterna City"
      ]
    },
    {
-      "id": "Route206_Text_Rt206OreburghCity",
+      "id": "Route206_Text_SignOreburghCity",
      "en_US": [
        "Rt. 206\n",
        "Oreburgh City"
--- a/res/text/route_206_cycling_road_north_gate.json
+++ b/res/text/route_206_cycling_road_north_gate.json
@@ -6,21 +6,21 @@
      "garbage": 46
    },
    {
-      "id": "Route206CyclingRoadNorthGate_Text_CyclingRoadIsOnlyForBicycles",
+      "id": "Route206CyclingRoadNorthGate_Text_OnlyForBicycles",
      "en_US": [
        "Cycling Road is only for Bicycles!\r",
        "Please get on your Bicycle!\r"
      ]
    },
    {
-      "id": "Route206CyclingRoadNorthGate_Text_LearnHowToShiftGearsAndYoullBeAbleToRideAnywhere",
+      "id": "Route206CyclingRoadNorthGate_Text_LearnHowToShiftGears",
      "en_US": [
        "Learn how to shift gears, and you’ll\n",
        "be able to ride anywhere."
      ]
    },
    {
-      "id": "Route206CyclingRoadNorthGate_Text_PlayerLetMeAskYouHowManyPokemonHaveYouMet",
+      "id": "Route206CyclingRoadNorthGate_Text_PlayerMetHowManyPokemon",
      "en_US": [
        "{STRVAR_1 3, 0, 0}, long time, no see!\r",
        "Oh? You look puzzled.\n",
@@ -35,7 +35,7 @@
      ]
    },
    {
-      "id": "Route206CyclingRoadNorthGate_Text_PlayerLetMeAskYouHowManyPokemonHaveYouMet2",
+      "id": "Route206CyclingRoadNorthGate_Text_PlayerMetHowManyPokemon2",
      "en_US": [
        "{STRVAR_1 3, 0, 0}, long time, no see!\r",
        "Oh? You look puzzled.\n",
@@ -50,7 +50,7 @@
      ]
    },
    {
-      "id": "Route206CyclingRoadNorthGate_Text_ProfessorRowanShouldBeDelightedHereIsSomethingForYou",
+      "id": "Route206CyclingRoadNorthGate_Text_SomethingForYou",
      "en_US": [
        "Oh, my!\n",
        "You’ve met {STRVAR_1 52, 1, 0} Pokémon!\r",
@@ -60,7 +60,7 @@
      ]
    },
    {
-      "id": "Route206CyclingRoadNorthGate_Text_APokemonHoldingAnExpShareWillGetSomeOfTheExpPointsFromBattle",
+      "id": "Route206CyclingRoadNorthGate_Text_HoldingExpShareGetExpPoints",
      "en_US": [
        "A Pokémon holding an Exp. Share will get\n",
        "some of the Exp. Points from battle.\r",
@@ -75,7 +75,7 @@
      ]
    },
    {
-      "id": "Route206CyclingRoadNorthGate_Text_YouveGotToFindAtLeast35",
+      "id": "Route206CyclingRoadNorthGate_Text_FindAtLeast35",
      "en_US": [
        "You’ve met only {STRVAR_1 52, 1, 0} Pokémon?\r",
        "Hmm...\n",
--- a/res/text/route_206_cycling_road_south_gate.json
+++ b/res/text/route_206_cycling_road_south_gate.json
@@ -6,21 +6,21 @@
      "garbage": 46
    },
    {
-      "id": "Route206CyclingRoadSouthGate_Text_CyclingRoadIsOpenOnlyToCyclists",
+      "id": "Route206CyclingRoadSouthGate_Text_OpenOnlyToCyclists",
      "en_US": [
        "Cycling Road is open only to cyclists.\n",
        "You must be on a Bicycle.\r"
      ]
    },
    {
-      "id": "Route206CyclingRoadSouthGate_Text_LearnHowToShiftGearsAndYoullBeAbleToRideAnywhere",
+      "id": "Route206CyclingRoadSouthGate_Text_LearnHowToShiftGears",
      "en_US": [
        "Learn how to shift gears, and you’ll\n",
        "be able to ride anywhere."
      ]
    },
    {
-      "id": "Route206CyclingRoadSouthGate_Text_WhatsABicycleWithoutThisYouveGotToHaveAFlag",
+      "id": "Route206CyclingRoadSouthGate_Text_HaveAFlag",
      "en_US": [
        "What’s a Bicycle without this?\r",
        "You’ve got to have a Flag!\n",
@@ -28,7 +28,7 @@
      ]
    },
    {
-      "id": "Route206CyclingRoadSouthGate_Text_GoThroughMtCoronetFromHereAndYouCanGetToHearthomeCity",
+      "id": "Route206CyclingRoadSouthGate_Text_GoThroughMtCoronet",
      "en_US": [
        "Go through Mt. Coronet from here,\n",
        "and you can get to Hearthome City.\r",
--- a/res/text/route_207.json
+++ b/res/text/route_207.json
@@ -2,7 +2,7 @@
  "key": 40580,
  "messages": [
    {
-      "id": "Route207_Text_DawnPlayerChooseWhichHandYouWant",
+      "id": "Route207_Text_DawnChooseWhichHand",
      "en_US": [
        "Dawn: Hi, {STRVAR_1 3, 0, 0}!\n",
        "How’s your Pokédex coming along?\r",
@@ -15,7 +15,7 @@
      ]
    },
    {
-      "id": "Route207_Text_DawnISeeYouWantTheVsSeeker",
+      "id": "Route207_Text_DawnYouWantTheVsSeeker",
      "en_US": [
        "Dawn: I see...\n",
        "You want the Vs. Seeker.\r",
@@ -24,7 +24,7 @@
      ]
    },
    {
-      "id": "Route207_Text_DawnYouCanHaveThisTooThen",
+      "id": "Route207_Text_DawnHaveThisTooThen",
      "en_US": [
        "Dawn: Using that Vs. Seeker, you can\n",
        "find Trainers who want a rematch\f",
@@ -38,7 +38,7 @@
      ]
    },
    {
-      "id": "Route207_Text_DawnTheDowsingMachineIsSomethingYouShouldTouchOften",
+      "id": "Route207_Text_DawnUseDowsingMachineOften",
      "en_US": [
        "Dawn: The {STRVAR_1 24, 1, 0} is\n",
        "something you should touch often.\r",
@@ -52,7 +52,7 @@
      ]
    },
    {
-      "id": "Route207_Text_LucasPlayerIllShareWithYouChooseAHand",
+      "id": "Route207_Text_LucasChooseAHand",
      "en_US": [
        "Lucas: Hey, {STRVAR_1 3, 0, 0}!\n",
        "How’s your Pokédex coming along?\r",
@@ -66,7 +66,7 @@
      ]
    },
    {
-      "id": "Route207_Text_LucasOhYeahYouWantTheVsSeeker",
+      "id": "Route207_Text_LucasYouWantTheVsSeeker",
      "en_US": [
        "Lucas: Oh yeah.\n",
        "You want the Vs. Seeker.\r",
@@ -75,7 +75,7 @@
      ]
    },
    {
-      "id": "Route207_Text_LucasYouCanHaveThisTooThen",
+      "id": "Route207_Text_LucasHaveThisTooThen",
      "en_US": [
        "Lucas: Using that Vs. Seeker, you can\n",
        "find Trainers who want to battle with\f",
@@ -89,7 +89,7 @@
      ]
    },
    {
-      "id": "Route207_Text_LucasTheDowsingMachineIsJustTryTouchingIt",
+      "id": "Route207_Text_LucasTryTouchingDowsingMachine",
      "en_US": [
        "Lucas: The {STRVAR_1 24, 1, 0} is...\n",
        "Just try touching it.\r",
@@ -115,28 +115,28 @@
      ]
    },
    {
-      "id": "Route207_Text_ChangeToThe4thGearAndTakeARun",
+      "id": "Route207_Text_ChangeGearTakeARun",
      "en_US": [
        "Change to the 4th gear and take a run.\n",
        "That’ll shoot you right up that slope."
      ]
    },
    {
-      "id": "Route207_Text_Rt207MtCoronet",
+      "id": "Route207_Text_SignMtCoronet",
      "en_US": [
        "Rt. 207\n",
        "Mt. Coronet"
      ]
    },
    {
-      "id": "Route207_Text_Rt207OreburghCity",
+      "id": "Route207_Text_SignOreburghCity",
      "en_US": [
        "Rt. 207\n",
        "Oreburgh City"
      ]
    },
    {
-      "id": "Route207_Text_TrainerTipsPokemonMayBecomeImmobilizedIfTheyAreAsleepOrParalyzed",
+      "id": "Route207_Text_TrainerTipsImmobilizedIfAsleepOrParalyzed",
      "en_US": [
        "Trainer Tips\r",
        "Pokémon may become immobilized if\n",
--- a/res/text/route_208.json
+++ b/res/text/route_208.json
@@ -18,14 +18,14 @@
      ]
    },
    {
-      "id": "Route208_Text_SignRt208MtCoronet",
+      "id": "Route208_Text_SignMtCoronet",
      "en_US": [
        "Rt. 208\n",
        "Mt. Coronet"
      ]
    },
    {
-      "id": "Route208_Text_SignRt208HearthomeCity",
+      "id": "Route208_Text_SignHearthomeCity",
      "en_US": [
        "Rt. 208\n",
        "Hearthome City"
--- a/res/text/route_208_gate_to_hearthome_city.json
+++ b/res/text/route_208_gate_to_hearthome_city.json
@@ -2,7 +2,7 @@
  "key": 33826,
  "messages": [
    {
-      "id": "Route208GateToHearthomeCity_Text_HearthomeCityIsAGreatPlace",
+      "id": "Route208GateToHearthomeCity_Text_HearthomeCityGreatPlace",
      "en_US": [
        "Hearthome City is a great place.\r",
        "Every year, it gets voted the most\n",
@@ -10,7 +10,7 @@
      ]
    },
    {
-      "id": "Route208GateToHearthomeCity_Text_IfYouSayHearthomeISayContests",
+      "id": "Route208GateToHearthomeCity_Text_YouSayHearthomeISayContests",
      "en_US": [
        "If you say Hearthome City, I only\n",
        "say this: Pokémon Contests!\r",
--- a/res/text/route_208_house.json
+++ b/res/text/route_208_house.json
@@ -2,7 +2,7 @@
  "key": 28362,
  "messages": [
    {
-      "id": "Route208House_Text_YoureDeservingOfABerry",
+      "id": "Route208House_Text_YouDeserveABerry",
      "en_US": [
        "Everyone seems to call me the Berry\n",
        "Master.\r",
@@ -26,14 +26,14 @@
      ]
    },
    {
-      "id": "Route208House_Text_DoYouForgetWhereBerriesArePlanted",
+      "id": "Route208House_Text_DoYouForgetWherePlanted",
      "en_US": [
        "Are you the forgetful type who\n",
        "forgets where Berries are planted?"
      ]
    },
    {
-      "id": "Route208House_Text_YouCanHaveThisPoketchApp",
+      "id": "Route208House_Text_HaveThisPoketchApp",
      "en_US": [
        "Yes, yes, I thought so!\n",
        "I’m the same way!\r",
@@ -42,7 +42,7 @@
      ]
    },
    {
-      "id": "Route208House_Text_ThenYoureOKWithoutThisNiceThing",
+      "id": "Route208House_Text_OKWithoutThis",
      "en_US": [
        "Oh, is that so.\r",
        "Then you’re OK even if I don’t give\n",
@@ -50,7 +50,7 @@
      ]
    },
    {
-      "id": "Route208House_Text_TheBerrySearcherShowsRipeBerryLocations",
+      "id": "Route208House_Text_BerrySearcherShowsRipeLocations",
      "en_US": [
        "The {STRVAR_1 24, 0, 0} shows you\n",
        "where there are ripe Berries\f",
@@ -73,7 +73,7 @@
      ]
    },
    {
-      "id": "Route208House_Text_ThatMulchWillPromoteBerryGrowth",
+      "id": "Route208House_Text_MulchWillPromoteBerryGrowth",
      "en_US": [
        "That {STRVAR_1 8, 0, 0}...\r",
        "I made it by mixing high-grade soil\n",
--- a/res/text/route_209.json
+++ b/res/text/route_209.json
@@ -16,7 +16,7 @@
      ]
    },
    {
-      "id": "Route209_Text_WouldYouLikeToUseTheOddKeystone",
+      "id": "Route209_Text_UseTheOddKeystone",
      "en_US": [
        "There is a broken, crumbling tower\n",
        "made of stone...\r",
@@ -36,7 +36,7 @@
      ]
    },
    {
-      "id": "Route209_Text_ItWasBuiltManyYearsAgo",
+      "id": "Route209_Text_BuiltManyYearsAgo",
      "en_US": [
        "It’s the Hallowed Tower.\r",
        "It appears to have been built\n",
@@ -44,14 +44,14 @@
      ]
    },
    {
-      "id": "Route209_Text_ItsStonesAppearToHaveShifted",
+      "id": "Route209_Text_StonesAppearToHaveShifted",
      "en_US": [
        "It’s the Hallowed Tower.\r",
        "Its stones appear to have shifted..."
      ]
    },
    {
-      "id": "Route209_Text_IsThatCryingComingFromInside",
+      "id": "Route209_Text_CryingComingFromInside",
      "en_US": [
        "It’s the Hallowed Tower.\r",
        "...Is that crying coming from inside\n",
@@ -67,7 +67,7 @@
      ]
    },
    {
-      "id": "Route209_Text_ThereIsSomeSortOfPresence",
+      "id": "Route209_Text_SomeSortOfPresence",
      "en_US": [
        "It’s the Hallowed Tower.\r",
        "There is some sort of presence...\n",
@@ -79,7 +79,7 @@
      "en_US": "Yulaaah!\r"
    },
    {
-      "id": "Route209_Text_GoodRodIsReallyGoodWouldntYouAgree",
+      "id": "Route209_Text_GoodRodIsReallyGood",
      "en_US": [
        "Hmm!\n",
        "{STRVAR_1 8, 0, 0} is really good!\r",
@@ -96,7 +96,7 @@
      ]
    },
    {
-      "id": "Route209_Text_DoINeedToExplainHowToFish",
+      "id": "Route209_Text_DoINeedToExplain",
      "en_US": [
        "Try fishing wherever there is\n",
        "a body of water.\r",
@@ -119,7 +119,7 @@
      ]
    },
    {
-      "id": "Route209_Text_WhenYouReelPokemonYouBattleIt",
+      "id": "Route209_Text_WhenYouReelYouBattle",
      "en_US": [
        "When you’re fishing for Pokémon,\n",
        "the first hurdle is getting a bite.\r",
@@ -136,7 +136,7 @@
      ]
    },
    {
-      "id": "Route209_Text_AWildPokemonChasedAfterMe",
+      "id": "Route209_Text_PokemonChasedAfterMe",
      "en_US": [
        "When I was jogging the other day,\n",
        "a wild Pokémon chased after me.\r",
@@ -145,14 +145,14 @@
      ]
    },
    {
-      "id": "Route209_Text_SignRt209HearthomeCity",
+      "id": "Route209_Text_SignHearthomeCity",
      "en_US": [
        "Rt. 209\n",
        "Hearthome City"
      ]
    },
    {
-      "id": "Route209_Text_Rt209SolaceonTown",
+      "id": "Route209_Text_SignSolaceonTown",
      "en_US": [
        "Rt. 209\n",
        "Solaceon Town"
--- a/res/text/route_209_gate_to_hearthome_city.json
+++ b/res/text/route_209_gate_to_hearthome_city.json
@@ -2,7 +2,7 @@
  "key": 33850,
  "messages": [
    {
-      "id": "Route209GateToHearthomeCity_Text_TheresAWreckedStonePillar",
+      "id": "Route209GateToHearthomeCity_Text_WreckedStonePillar",
      "en_US": [
        "There’s a wrecked stone pillar up\n",
        "ahead.\r",
@@ -24,7 +24,7 @@
      ]
    },
    {
-      "id": "Route209GateToHearthomeCity_Text_MySurefireWinningStrategyDoesntWork",
+      "id": "Route209GateToHearthomeCity_Text_MyStrategyDoesntWork",
      "en_US": [
        "{STRVAR_1 3, 0, 0}: Waaah!\r",
        "It goes to show my surefire winning\n",
--- a/res/text/route_209_lost_tower_5f.json
+++ b/res/text/route_209_lost_tower_5f.json
@@ -36,7 +36,7 @@
      ]
    },
    {
-      "id": "Route209LostTower5F_Text_AllDepartedPokemonFindSolaceHere",
+      "id": "Route209LostTower5F_Text_PokemonFindSolaceHere",
      "en_US": [
        "The Lost Tower is where the spirits\n",
        "of departed Pokémon are put to rest.\r",
--- a/res/text/route_210_south.json
+++ b/res/text/route_210_south.json
@@ -100,7 +100,7 @@
      ]
    },
    {
-      "id": "Route210South_Text_SignRt210SolaceonTown",
+      "id": "Route210South_Text_SignSolaceonTown",
      "en_US": [
        "Rt. 210\n",
        "Solaceon Town"
--- a/res/text/route_211_west.json
+++ b/res/text/route_211_west.json
@@ -6,14 +6,14 @@
      "garbage": 78
    },
    {
-      "id": "Route211West_Text_Rt211MtCoronet",
+      "id": "Route211West_Text_SignMtCoronet",
      "en_US": [
        "Rt. 211\n",
        "Mt. Coronet"
      ]
    },
    {
-      "id": "Route211West_Text_Rt211EternaCity",
+      "id": "Route211West_Text_SignEternaCity",
      "en_US": [
        "Rt. 211\n",
        "Eterna City"
--- a/res/text/route_213.json
+++ b/res/text/route_213.json
@@ -105,7 +105,7 @@
      ]
    },
    {
-      "id": "Route213_Text_SignRt213PastoriaCity",
+      "id": "Route213_Text_SignPastoriaCity",
      "en_US": [
        "Rt. 213\n",
        "Pastoria City"
--- a/res/text/route_215.json
+++ b/res/text/route_215.json
@@ -46,7 +46,7 @@
      ]
    },
    {
-      "id": "Route215_Text_SignRt215VeilstoneCity",
+      "id": "Route215_Text_SignVeilstoneCity",
      "en_US": [
        "Rt. 215\n",
        "Veilstone City"
--- a/res/text/route_216.json
+++ b/res/text/route_216.json
@@ -9,7 +9,7 @@
      ]
    },
    {
-      "id": "Route216_Text_SignRt216MtCoronet",
+      "id": "Route216_Text_SignMtCoronet",
      "en_US": [
        "Rt. 216\n",
        "Mt. Coronet"
--- a/res/text/route_217.json
+++ b/res/text/route_217.json
@@ -40,7 +40,7 @@
      ]
    },
    {
-      "id": "Route217_Text_SignRt217LakeAcuity",
+      "id": "Route217_Text_SignLakeAcuity",
      "en_US": [
        "Rt. 217\n",
        "Lake Acuity"
--- a/res/text/route_218_gate_to_canalave_city.json
+++ b/res/text/route_218_gate_to_canalave_city.json
@@ -13,7 +13,7 @@
      "garbage": 53
    },
    {
-      "id": "Route218GateToCanalaveCity_Text_UpgradeyourPokedexMale",
+      "id": "Route218GateToCanalaveCity_Text_UpgradeYourPokedexMale",
      "en_US": [
        "{STRVAR_1 3, 0, 0}, long time, no see!\r",
        "Oh? You look puzzled.\n",
@@ -29,7 +29,7 @@
      ]
    },
    {
-      "id": "Route218GateToCanalaveCity_Text_UpgradeyourPokedexFemale",
+      "id": "Route218GateToCanalaveCity_Text_UpgradeYourPokedexFemale",
      "en_US": [
        "{STRVAR_1 3, 0, 0}, long time, no see!\r",
        "Oh? You look puzzled.\n",
--- a/res/text/route_222.json
+++ b/res/text/route_222.json
@@ -41,14 +41,14 @@
      ]
    },
    {
-      "id": "Route222_Text_SignRt222HotelGrandLake",
+      "id": "Route222_Text_SignHotelGrandLake",
      "en_US": [
        "Rt. 222\n",
        "Hotel Grand Lake"
      ]
    },
    {
-      "id": "Route222_Text_SignRt222SunyshoreCity",
+      "id": "Route222_Text_SignSunyshoreCity",
      "en_US": [
        "Rt. 222\n",
        "Sunyshore City"
--- a/res/text/route_225.json
+++ b/res/text/route_225.json
@@ -2,14 +2,14 @@
  "key": 38540,
  "messages": [
    {
-      "id": "Route225_Text_SignRt225FightArea",
+      "id": "Route225_Text_SignFightArea",
      "en_US": [
        "Rt. 225\n",
        "Fight Area"
      ]
    },
    {
-      "id": "Route225_Text_SignRt225SurvivalArea",
+      "id": "Route225_Text_SignSurvivalArea",
      "en_US": [
        "Rt. 225\n",
        "Survival Area"
--- a/res/text/route_226.json
+++ b/res/text/route_226.json
@@ -2,7 +2,7 @@
  "key": 48768,
  "messages": [
    {
-      "id": "Route226_Text_SignRt226SurvivalArea",
+      "id": "Route226_Text_SignSurvivalArea",
      "en_US": [
        "Rt. 226\n",
        "Survival Area"
--- a/res/text/route_227.json
+++ b/res/text/route_227.json
@@ -129,7 +129,7 @@
      ]
    },
    {
-      "id": "Route227_Text_SignRt227StarkMountain",
+      "id": "Route227_Text_SignStarkMountain",
      "en_US": [
        "Rt. 227\n",
        "Stark Mountain"
--- a/res/text/route_228.json
+++ b/res/text/route_228.json
@@ -2,14 +2,14 @@
  "key": 38584,
  "messages": [
    {
-      "id": "Route228_Text_SignRt228Rt226",
+      "id": "Route228_Text_SignRt226",
      "en_US": [
        "Rt. 228\n",
        "Rt. 226"
      ]
    },
    {
-      "id": "Route228_Text_SignRt228Rt229",
+      "id": "Route228_Text_SignRt229",
      "en_US": [
        "Rt. 228\n",
        "Rt. 229"
--- a/res/text/route_229.json
+++ b/res/text/route_229.json
@@ -29,7 +29,7 @@
      ]
    },
    {
-      "id": "Route229_Text_SignRt229ResortArea",
+      "id": "Route229_Text_SignResortArea",
      "en_US": [
        "Rt. 229\n",
        "Resort Area"
--- a/res/text/route_230.json
+++ b/res/text/route_230.json
@@ -2,7 +2,7 @@
  "key": 47768,
  "messages": [
    {
-      "id": "Route230_Text_SignRt230FightArea",
+      "id": "Route230_Text_SignFightArea",
      "en_US": [
        "Rt. 230\n",
        "Fight Area"