Polish scripts pt 4 (S-Z) (#1211)

generated/vars_flags.txt

@@ -108,7 +108,7 @@ FLAG_POKECENTER_IDENTIFIED_POKERUS
 FLAG_SUPER_ROD_OBTAINED
 FLAG_GOT_POTION_FROM_ROUTE_201_CASHIER
 FLAG_UNK_0x006D
-FLAG_UNK_0x006E
+FLAG_TALKED_TO_RIVAL_HOUSE_RIVAL_MOM_RIVAL_LEFT
 FLAG_UNK_0x006F
 FLAG_CHOSE_UNION_ROOM_APPEARANCE
 FLAG_UNK_0x0071
@@ -246,7 +246,7 @@ FLAG_TRADED_FOR_GASPAR_HAUNTER
 FLAG_TRADED_FOR_FOPPA_MAGIKARP
 FLAG_ENABLED_POKEDEX_LANGUAGE_DETECTION
 FLAG_TALKED_TO_JULIA_SUNYSHORE_CITY_NORTHEAST_HOUSE
-FLAG_UNK_0x00F8
+FLAG_MOM_WARNED_PLAYER
 FLAG_TALKED_TO_DR_FOOTSTEP
 FLAG_JOINED_RIBBON_SYNDICATE
 FLAG_SKIP_POKEMON_MANSION_OFFICE_BOOK_SEEN_MANAPHY_CHECK
@@ -4229,7 +4229,7 @@ VAR_SUNYSHORE_STATE
 VAR_SNOWPOINT_CITY_STATE
 VAR_ENTERED_WIFI_PLAZA
 VAR_FIGHT_AREA_STATE
-VAR_UNK_0x4082
+VAR_VERITY_LAKEFRONT_STATE
 VAR_UNK_0x4083
 VAR_ACUITY_LAKEFRONT_STATE
 VAR_ROUTE_224_STATE
@@ -4373,7 +4373,7 @@ VAR_BATTLE_PARK_STATE
 VAR_PLAYER_HOUSE_POSTGAME_STATE
 VAR_OLD_CHATEAU_DINING_AREA_OLD_MAN_STATE
 VAR_OLD_CHATEAU_BACK_MIDDLE_EAST_ROOM_TWIN_STATE
-VAR_UNK_0x4112
+VAR_VALOR_LAKEFRONT_BLOCK_SUNYSHORE_STATE
 VAR_BATTLE_FRONTIER_GATE_TO_FIGHT_AREA_STATE
 VAR_ETERNA_CITY_BLOCK_EXITS_STATE
 VAR_NUM_PLATES_OBTAINED

res/field/events/events_sandgem_town.json

@@ -92,7 +92,7 @@
             "y": 0
         },
         {
-            "id": "LOCALID_SIGNBOARD_COUNTERPART_MAILBOX",
+            "id": "LOCALID_SIGNBOARD_COUNTERPART_HOUSE",
             "graphics_id": "OBJ_EVENT_GFX_SIGNBOARD",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",

res/field/events/events_valor_lakefront.json

@@ -268,7 +268,7 @@
             "y": 0,
             "width": 1,
             "length": 3,
-            "var": "VAR_UNK_0x4112",
+            "var": "VAR_VALOR_LAKEFRONT_BLOCK_SUNYSHORE_STATE",
             "value": 0
         }
     ]

res/field/events/events_verity_lakefront.json

@@ -62,7 +62,7 @@
             "y": 0,
             "width": 2,
             "length": 1,
-            "var": "VAR_UNK_0x4082",
+            "var": "VAR_VERITY_LAKEFRONT_STATE",
             "value": 0
         }
     ]

res/field/scripts/scripts_route_201.s

@@ -1040,7 +1040,7 @@ _0CF1:
     ClearHasPartner
     SetFlag FLAG_HIDE_ROUTE_201_RIVAL
     SetFlag FLAG_UNK_0x0195
-    SetVar VAR_UNK_0x4082, 4
+    SetVar VAR_VERITY_LAKEFRONT_STATE, 4
     SetFlag FLAG_HIDE_LAKE_VERITY_LOW_WATER_RIVAL
     WaitTime 30, VAR_RESULT
     FadeScreenOut FADE_SCREEN_SPEED_MEDIUM

res/field/scripts/scripts_safari_game.s

@@ -344,67 +344,67 @@ SafariGame_ExitQuickTramMenu:
     End
 
 SafariGame_BoardQuickTramFromWestGoingToOddArea:
-    ApplyMovement LOCALID_PLAYER, SafariGame_BoardQuickTramFromWestGoingToOddArea_Movement
+    ApplyMovement LOCALID_PLAYER, SafariGame_Movement_BoardQuickTramFromWestGoingToOddArea
     WaitMovement
     Return
 
 SafariGame_BoardQuickTramFromWestGoingToEvenArea:
-    ApplyMovement LOCALID_PLAYER, SafariGame_BoardQuickTramFromWestGoingToEvenArea_Movement
+    ApplyMovement LOCALID_PLAYER, SafariGame_Movement_BoardQuickTramFromWestGoingToEvenArea
     WaitMovement
     Return
 
 SafariGame_BoardQuickTramFromEastGoingToEvenArea:
-    ApplyMovement LOCALID_PLAYER, SafariGame_BoardQuickTramFromEastGoingToEvenArea_Movement
+    ApplyMovement LOCALID_PLAYER, SafariGame_Movement_BoardQuickTramFromEastGoingToEvenArea
     WaitMovement
     Return
 
 SafariGame_BoardQuickTramFromEastGoingToOddArea:
-    ApplyMovement LOCALID_PLAYER, SafariGame_BoardQuickTramFromEastGoingToOddArea_Movement
+    ApplyMovement LOCALID_PLAYER, SafariGame_Movement_BoardQuickTramFromEastGoingToOddArea
     WaitMovement
     Return
 
 SafariGame_LeaveQuickTramEast:
-    ApplyMovement LOCALID_PLAYER, SafariGame_LeaveQuickTramEast_Movement
+    ApplyMovement LOCALID_PLAYER, SafariGame_Movement_LeaveQuickTramEast
     WaitMovement
     Return
 
 SafariGame_LeaveQuickTramWest:
-    ApplyMovement LOCALID_PLAYER, SafariGame_LeaveQuickTramWest_Movement
+    ApplyMovement LOCALID_PLAYER, SafariGame_Movement_LeaveQuickTramWest
     WaitMovement
     Return
 
     .balign 4, 0
-SafariGame_BoardQuickTramFromWestGoingToOddArea_Movement:
+SafariGame_Movement_BoardQuickTramFromWestGoingToOddArea:
     WalkNormalEast 3
     SetInvisible
     EndMovement
 
     .balign 4, 0
-SafariGame_BoardQuickTramFromWestGoingToEvenArea_Movement:
+SafariGame_Movement_BoardQuickTramFromWestGoingToEvenArea:
     WalkNormalEast 4
     SetInvisible
     EndMovement
 
     .balign 4, 0
-SafariGame_BoardQuickTramFromEastGoingToEvenArea_Movement:
+SafariGame_Movement_BoardQuickTramFromEastGoingToEvenArea:
     WalkNormalWest 3
     SetInvisible
     EndMovement
 
     .balign 4, 0
-SafariGame_BoardQuickTramFromEastGoingToOddArea_Movement:
+SafariGame_Movement_BoardQuickTramFromEastGoingToOddArea:
     WalkNormalWest 4
     SetInvisible
     EndMovement
 
     .balign 4, 0
-SafariGame_LeaveQuickTramEast_Movement:
+SafariGame_Movement_LeaveQuickTramEast:
     SetVisible
     WalkNormalEast 3
     EndMovement
 
     .balign 4, 0
-SafariGame_LeaveQuickTramWest_Movement:
+SafariGame_Movement_LeaveQuickTramWest:
     SetVisible
     WalkNormalWest 3
     EndMovement

res/field/scripts/scripts_sandgem_town.s

@@ -12,7 +12,7 @@
     ScriptEntry SandgemTown_RowansComeBack_Unused
     ScriptEntry SandgemTown_MapSignpost
     ScriptEntry SandgemTown_SignboardPokemonResearchLab
-    ScriptEntry SandgemTown_SignboardCounterpartMailbox
+    ScriptEntry SandgemTown_SignboardCounterpartsHouse
     ScriptEntry SandgemTown_SignboardPokeMart
     ScriptEntry SandgemTown_SignboardPokemonCenter
     ScriptEntryEnd
@@ -95,71 +95,71 @@ SandgemTown_TheProfessorIsWaiting:
 SandgemTown_DawnTheProfessorIsWaiting:
     BufferCounterpartName 0
     Message SandgemTown_Text_DawnTheProfessorIsWaiting
-    GoTo SandgemTown_WalkToPokemonResearchLab
+    GoTo SandgemTown_WalkToLab
 
 SandgemTown_LucasTheProfsWaitingToSeeYou:
     BufferCounterpartName 0
     Message SandgemTown_Text_LucasTheProfsWaitingToSeeYou
-    GoTo SandgemTown_WalkToPokemonResearchLab
+    GoTo SandgemTown_WalkToLab
 
-SandgemTown_WalkToPokemonResearchLab:
+SandgemTown_WalkToLab:
     CloseMessage
-    GoToIfEq VAR_0x8005, 843, SandgemTown_WalkToPokemonResearchLabZ843
-    GoToIfEq VAR_0x8005, 844, SandgemTown_WalkToPokemonResearchLabZ844
-    GoToIfEq VAR_0x8005, 845, SandgemTown_WalkToPokemonResearchLabZ845
-    GoToIfEq VAR_0x8005, 846, SandgemTown_WalkToPokemonResearchLabZ846
-    GoToIfEq VAR_0x8005, 847, SandgemTown_WalkToPokemonResearchLabZ847
-    GoToIfEq VAR_0x8005, 848, SandgemTown_WalkToPokemonResearchLabZ848
+    GoToIfEq VAR_0x8005, 843, SandgemTown_WalkToLabZ843
+    GoToIfEq VAR_0x8005, 844, SandgemTown_WalkToLabZ844
+    GoToIfEq VAR_0x8005, 845, SandgemTown_WalkToLabZ845
+    GoToIfEq VAR_0x8005, 846, SandgemTown_WalkToLabZ846
+    GoToIfEq VAR_0x8005, 847, SandgemTown_WalkToLabZ847
+    GoToIfEq VAR_0x8005, 848, SandgemTown_WalkToLabZ848
     End
 
-SandgemTown_WalkToPokemonResearchLabZ843:
-    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ843
-    ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ843
+SandgemTown_WalkToLabZ843:
+    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToLabZ843
+    ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToLabZ843
     WaitMovement
     GoTo SandgemTown_ThisIsOurPokemonResearchLab
 
-SandgemTown_WalkToPokemonResearchLabZ844:
-    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ844
-    ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ844
+SandgemTown_WalkToLabZ844:
+    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToLabZ844
+    ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToLabZ844
     WaitMovement
     GoTo SandgemTown_ThisIsOurPokemonResearchLab
 
-SandgemTown_WalkToPokemonResearchLabZ845:
-    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ845
-    ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ845
+SandgemTown_WalkToLabZ845:
+    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToLabZ845
+    ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToLabZ845
     WaitMovement
     GoTo SandgemTown_ThisIsOurPokemonResearchLab
 
-SandgemTown_WalkToPokemonResearchLabZ846:
-    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ846
-    ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ846
+SandgemTown_WalkToLabZ846:
+    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToLabZ846
+    ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToLabZ846
     WaitMovement
     GoTo SandgemTown_ThisIsOurPokemonResearchLab
 
-SandgemTown_WalkToPokemonResearchLabZ847:
-    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ847
-    ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ847
+SandgemTown_WalkToLabZ847:
+    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToLabZ847
+    ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToLabZ847
     WaitMovement
     GoTo SandgemTown_ThisIsOurPokemonResearchLab
 
-SandgemTown_WalkToPokemonResearchLabZ848:
-    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ848
-    ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ848
+SandgemTown_WalkToLabZ848:
+    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToLabZ848
+    ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToLabZ848
     WaitMovement
     GoTo SandgemTown_ThisIsOurPokemonResearchLab
 
 SandgemTown_ThisIsOurPokemonResearchLab:
     GetPlayerGender VAR_RESULT
-    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTown_DawnThisIsItOurPokemonResearchLab
-    GoToIfEq VAR_RESULT, GENDER_FEMALE, SandgemTown_LucasSeeThisIsIsOurPokemonResearchLab
+    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTown_DawnThisIsItOurLab
+    GoToIfEq VAR_RESULT, GENDER_FEMALE, SandgemTown_LucasThisIsItOurLab
     End
 
-SandgemTown_DawnThisIsItOurPokemonResearchLab:
-    Message SandgemTown_Text_DawnThisIsItOurPokemonResearchLab
+SandgemTown_DawnThisIsItOurLab:
+    Message SandgemTown_Text_DawnThisIsItOurLab
     GoTo SandgemTown_RivalExitLab
 
-SandgemTown_LucasSeeThisIsIsOurPokemonResearchLab:
-    Message SandgemTown_Text_LucasSeeThisIsIsOurPokemonResearchLab
+SandgemTown_LucasThisIsItOurLab:
+    Message SandgemTown_Text_LucasThisIsItOurLab
     GoTo SandgemTown_RivalExitLab
 
 SandgemTown_RivalExitLab:
@@ -263,26 +263,26 @@ SandgemTown_Movement_CounterpartWalkToPlayerZ848:
     EndMovement
 
     .balign 4, 0
-SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ843:
+SandgemTown_Movement_CounterpartWalkToLabZ843:
     WalkNormalEast 5
     WalkOnSpotNormalNorth
     EndMovement
 
     .balign 4, 0
-SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ844:
+SandgemTown_Movement_CounterpartWalkToLabZ844:
     WalkNormalEast 4
     WalkOnSpotNormalNorth
     EndMovement
 
     .balign 4, 0
-SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ845:
+SandgemTown_Movement_CounterpartWalkToLabZ845:
     WalkNormalNorth
     WalkNormalEast 4
     WalkOnSpotNormalNorth
     EndMovement
 
     .balign 4, 0
-SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ846:
+SandgemTown_Movement_CounterpartWalkToLabZ846:
     WalkNormalEast 2
     WalkNormalNorth
     WalkNormalEast 3
@@ -290,14 +290,14 @@ SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ846:
     EndMovement
 
     .balign 4, 0
-SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ847:
+SandgemTown_Movement_CounterpartWalkToLabZ847:
     WalkNormalNorth 2
     WalkNormalEast 5
     WalkOnSpotNormalNorth
     EndMovement
 
     .balign 4, 0
-SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ848:
+SandgemTown_Movement_CounterpartWalkToLabZ848:
     WalkNormalNorth 2
     WalkNormalEast 5
     WalkOnSpotNormalNorth
@@ -352,21 +352,21 @@ SandgemTown_Movement_PlayerFaceCounterpartZ848:
     EndMovement
 
     .balign 4, 0
-SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ843:
+SandgemTown_Movement_PlayerWalkToLabZ843:
     WalkNormalSouth
     WalkNormalEast 4
     WalkOnSpotNormalNorth
     EndMovement
 
     .balign 4, 0
-SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ844:
+SandgemTown_Movement_PlayerWalkToLabZ844:
     WalkNormalEast 2
     WalkNormalEast 2
     WalkOnSpotNormalNorth
     EndMovement
 
     .balign 4, 0
-SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ845:
+SandgemTown_Movement_PlayerWalkToLabZ845:
     WalkNormalEast
     WalkNormalNorth
     WalkNormalEast 3
@@ -374,7 +374,7 @@ SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ845:
     EndMovement
 
     .balign 4, 0
-SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ846:
+SandgemTown_Movement_PlayerWalkToLabZ846:
     WalkNormalNorth
     WalkNormalEast 2
     WalkNormalNorth
@@ -383,14 +383,14 @@ SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ846:
     EndMovement
 
     .balign 4, 0
-SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ847:
+SandgemTown_Movement_PlayerWalkToLabZ847:
     WalkNormalNorth 3
     WalkNormalEast 4
     WalkOnSpotNormalNorth
     EndMovement
 
     .balign 4, 0
-SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ848:
+SandgemTown_Movement_PlayerWalkToLabZ848:
     WalkNormalNorth 4
     WalkNormalEast 4
     WalkOnSpotNormalNorth
@@ -448,11 +448,11 @@ SandgemTown_OnFrame_ExitLab:
     ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerNoticeProfRowan
     ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartNoticeProfRowan
     WaitMovement
-    Message SandgemTown_Text_YouShouldTakeThisAsWell
+    Message SandgemTown_Text_TakeThisAsWell
     SetVar VAR_0x8004, ITEM_TM27
     SetVar VAR_0x8005, 1
     Common_GiveItemQuantity
-    Message SandgemTown_Text_ThatContainsTheMoveReturn
+    Message SandgemTown_Text_ContainsTheMoveReturn
     CloseMessage
     ApplyMovement LOCALID_PROF_ROWAN, SandgemTown_Movement_ProfRowanEnterLab
     WaitMovement
@@ -462,18 +462,18 @@ SandgemTown_OnFrame_ExitLab:
     RemoveObject LOCALID_PROF_ROWAN
     WaitTime 30, VAR_RESULT
     GetPlayerGender VAR_RESULT
-    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTown_DawnIDidntKnowTheProfessorHadTMs
-    GoToIfEq VAR_RESULT, GENDER_FEMALE, SandgemTown_LucasWellIllBeTheProfessorHadTMs
+    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTown_DawnIDidntKnowProfessorHadTMs
+    GoToIfEq VAR_RESULT, GENDER_FEMALE, SandgemTown_LucasWellIllBeProfessorHadTMs
     End
 
-SandgemTown_DawnIDidntKnowTheProfessorHadTMs:
-    Message SandgemTown_Text_DawnIDidntKnowTheProfessorHadTMs
+SandgemTown_DawnIDidntKnowProfessorHadTMs:
+    Message SandgemTown_Text_DawnIDidntKnowProfessorHadTMs
     CloseMessage
     GoTo SandgemTown_CounterpartWillShowYouAround
     End
 
-SandgemTown_LucasWellIllBeTheProfessorHadTMs:
-    Message SandgemTown_Text_LucasWellIllBeTheProfessorHadTMs
+SandgemTown_LucasWellIllBeProfessorHadTMs:
+    Message SandgemTown_Text_LucasWellIllBeProfessorHadTMs
     CloseMessage
     GoTo SandgemTown_CounterpartWillShowYouAround
     End
@@ -484,7 +484,7 @@ SandgemTown_CounterpartWillShowYouAround:
     WaitMovement
     GetPlayerGender VAR_RESULT
     GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTown_DawnIllActAsYourMentor
-    GoToIfEq VAR_RESULT, GENDER_FEMALE, SandgemTown_LucasIWantToShowYouAFewThings
+    GoToIfEq VAR_RESULT, GENDER_FEMALE, SandgemTown_LucasShowYouAFewThings
     End
 
 SandgemTown_DawnIllActAsYourMentor:
@@ -493,10 +493,10 @@ SandgemTown_DawnIllActAsYourMentor:
     Message SandgemTown_Text_DawnIllActAsYourMentor
     GoTo SandgemTown_WalkToPokemonCenter
 
-SandgemTown_LucasIWantToShowYouAFewThings:
+SandgemTown_LucasShowYouAFewThings:
     BufferCounterpartName 0
     BufferPlayerName 1
-    Message SandgemTown_Text_LucasIWantToShowYouAFewThings
+    Message SandgemTown_Text_LucasShowYouAFewThings
     GoTo SandgemTown_WalkToPokemonCenter
 
 SandgemTown_WalkToPokemonCenter:
@@ -535,33 +535,33 @@ SandgemTown_WalkToPokeMart:
 SandgemTown_DawnThisIsThePokeMart:
     BufferPlayerName 0
     Message SandgemTown_Text_DawnThisIsThePokeMart
-    GoTo SandgemTown_LetYourFamilyKnowYoureHelpingProfRowan
+    GoTo SandgemTown_LetYourFamilyKnow
 
 SandgemTown_LucasThisIsThePokeMart:
     BufferPlayerName 0
     Message SandgemTown_Text_LucasThisIsThePokeMart
-    GoTo SandgemTown_LetYourFamilyKnowYoureHelpingProfRowan
+    GoTo SandgemTown_LetYourFamilyKnow
 
-SandgemTown_LetYourFamilyKnowYoureHelpingProfRowan:
+SandgemTown_LetYourFamilyKnow:
     CloseMessage
-    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_CounterpartFacePlayerWest
-    ApplyMovement LOCALID_PLAYER, SandgemTown_PlayerFaceCounterpartEast
+    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartFacePlayerWest
+    ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerFaceCounterpartEast
     WaitMovement
-    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_CounterpartExclamationMark
+    ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartExclamationMark
     WaitMovement
     GetPlayerGender VAR_RESULT
-    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTown_DawnLetYourFamilyKnowYoureHelpingProfRowan
-    GoToIfEq VAR_RESULT, GENDER_FEMALE, SandgemTown_LucasLetYourFamilyKnowYoureHelpingProfRowan
+    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTown_DawnLetYourFamilyKnow
+    GoToIfEq VAR_RESULT, GENDER_FEMALE, SandgemTown_LucasLetYourFamilyKnow
     End
 
-SandgemTown_DawnLetYourFamilyKnowYoureHelpingProfRowan:
+SandgemTown_DawnLetYourFamilyKnow:
     BufferPlayerName 1
-    Message SandgemTown_Text_DawnLetYourFamilyKnowYoureHelpingProfRowan
+    Message SandgemTown_Text_DawnLetYourFamilyKnow
     GoTo SandgemTown_CounterpartLeave
 
-SandgemTown_LucasLetYourFamilyKnowYoureHelpingProfRowan:
+SandgemTown_LucasLetYourFamilyKnow:
     BufferPlayerName 1
-    Message SandgemTown_Text_LucasLetYourFamilyKnowYoureHelpingProfRowan
+    Message SandgemTown_Text_LucasLetYourFamilyKnow
     GoTo SandgemTown_CounterpartLeave
 
 SandgemTown_CounterpartLeave:
@@ -611,7 +611,7 @@ SandgemTown_Movement_PlayerWalkToPokeMart:
     EndMovement
 
     .balign 4, 0
-SandgemTown_PlayerFaceCounterpartEast:
+SandgemTown_Movement_PlayerFaceCounterpartEast:
     WalkOnSpotNormalEast
     EndMovement
 
@@ -646,12 +646,12 @@ SandgemTown_Movement_CounterpartWalkToPokeMart:
     EndMovement
 
     .balign 4, 0
-SandgemTown_CounterpartFacePlayerWest:
+SandgemTown_Movement_CounterpartFacePlayerWest:
     WalkOnSpotNormalWest
     EndMovement
 
     .balign 4, 0
-SandgemTown_CounterpartExclamationMark:
+SandgemTown_Movement_CounterpartExclamationMark:
     EmoteExclamationMark
     EndMovement
 
@@ -667,7 +667,7 @@ SandgemTown_Youngster:
     End
 
 SandgemTown_PokemonBreederM:
-    NPCMessage SandgemTown_Text_TheThingYouHaveItsAPokedexIsntIt
+    NPCMessage SandgemTown_Text_ItsAPokedexIsntIt
     End
 
 SandgemTown_PokemonBreederF:
@@ -675,7 +675,7 @@ SandgemTown_PokemonBreederF:
     End
 
 SandgemTown_RowansComeBack_Unused:
-    NPCMessage SandgemTown_Text_ProfessorRowansComeBackToTown
+    NPCMessage SandgemTown_Text_RowansComeBack
     End
 
 SandgemTown_MapSignpost:
@@ -683,20 +683,20 @@ SandgemTown_MapSignpost:
     End
 
 SandgemTown_SignboardPokemonResearchLab:
-    ShowLandmarkSign SandgemTown_Text_PokemonResearchLabSign
+    ShowLandmarkSign SandgemTown_Text_SignPokemonResearchLab
     End
 
-SandgemTown_SignboardCounterpartMailbox:
+SandgemTown_SignboardCounterpartsHouse:
     BufferCounterpartName 0
-    ShowLandmarkSign SandgemTown_Text_CounterpartMailbox
+    ShowLandmarkSign SandgemTown_Text_SignCounterpartsHouse
     End
 
 SandgemTown_SignboardPokeMart:
-    ShowLandmarkSign SandgemTown_Text_PokeMartSign
+    ShowLandmarkSign SandgemTown_Text_SignPokeMart
     End
 
 SandgemTown_SignboardPokemonCenter:
-    ShowLandmarkSign SandgemTown_Text_PokemonCenterSign
+    ShowLandmarkSign SandgemTown_Text_SignPokemonCenter
     End
 
     .balign 4, 0

res/field/scripts/scripts_sandgem_town_counterpart_house_1f.s

@@ -11,15 +11,15 @@ SandgemTownCounterpartHouse1F_ExpertM:
     LockAll
     FacePlayer
     GetNationalDexEnabled VAR_RESULT
-    GoToIfEq VAR_RESULT, TRUE, SandgemTownCounterpartHouse1F_OhMyYouveGotANationalPokedex
-    Message SandgemTownCounterpartHouse1F_Text_SoThatRowanFellowIsBack
+    GoToIfEq VAR_RESULT, TRUE, SandgemTownCounterpartHouse1F_YouveGotANationalPokedex
+    Message SandgemTownCounterpartHouse1F_Text_RowanIsBack
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-SandgemTownCounterpartHouse1F_OhMyYouveGotANationalPokedex:
-    Message SandgemTownCounterpartHouse1F_Text_OhMyYouveGotANationalPokedex
+SandgemTownCounterpartHouse1F_YouveGotANationalPokedex:
+    Message SandgemTownCounterpartHouse1F_Text_YouveGotANationalPokedex
     WaitButton
     CloseMessage
     ReleaseAll
@@ -31,37 +31,37 @@ SandgemTownCounterpartHouse1F_Twin:
     FacePlayer
     GetNationalDexEnabled VAR_RESULT
     GoToIfEq VAR_RESULT, TRUE, SandgemTownCounterpartHouse1F_TwinNationalDex
-    GoTo SandgemTownCounterpartHouse1F_WowYoureDoingTheSameAsMyBigSibling
+    GoTo SandgemTownCounterpartHouse1F_SameAsMyBigSibling
 
-SandgemTownCounterpartHouse1F_WowYoureDoingTheSameAsMyBigSibling:
+SandgemTownCounterpartHouse1F_SameAsMyBigSibling:
     GetPlayerGender VAR_RESULT
-    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTownCounterpartHouse1F_WowYoureDoingTheSameAsMyBigSister
-    GoToIfEq VAR_RESULT, GENDER_FEMALE, SandgemTownCounterpartHouse1F_WowYoureDoingTheSameAsMyBigBrother
+    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTownCounterpartHouse1F_SameAsMyBigSister
+    GoToIfEq VAR_RESULT, GENDER_FEMALE, SandgemTownCounterpartHouse1F_SameAsMyBigBrother
     End
 
-SandgemTownCounterpartHouse1F_WowYoureDoingTheSameAsMyBigSister:
+SandgemTownCounterpartHouse1F_SameAsMyBigSister:
     BufferPlayerName 0
-    Message SandgemTownCounterpartHouse1F_Text_WowYoureDoingTheSameAsMyBigSister
-    GoTo SandgemTownCounterpartHouse1F_CloseMessageWowYoureDoingTheSameAsMyBigSibling
+    Message SandgemTownCounterpartHouse1F_Text_SameAsMyBigSister
+    GoTo SandgemTownCounterpartHouse1F_CloseMessageSameAsMyBigSibling
 
-SandgemTownCounterpartHouse1F_WowYoureDoingTheSameAsMyBigBrother:
+SandgemTownCounterpartHouse1F_SameAsMyBigBrother:
     BufferPlayerName 0
-    Message SandgemTownCounterpartHouse1F_Text_WowYoureDoingTheSameAsMyBigBrother
-    GoTo SandgemTownCounterpartHouse1F_CloseMessageWowYoureDoingTheSameAsMyBigSibling
+    Message SandgemTownCounterpartHouse1F_Text_SameAsMyBigBrother
+    GoTo SandgemTownCounterpartHouse1F_CloseMessageSameAsMyBigSibling
 
-SandgemTownCounterpartHouse1F_CloseMessageWowYoureDoingTheSameAsMyBigSibling:
+SandgemTownCounterpartHouse1F_CloseMessageSameAsMyBigSibling:
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
 SandgemTownCounterpartHouse1F_TwinNationalDex:
-    GoToIfUnset FLAG_GAME_COMPLETED, SandgemTownCounterpartHouse1F_WowYoureDoingTheSameAsMyBigSibling
+    GoToIfUnset FLAG_GAME_COMPLETED, SandgemTownCounterpartHouse1F_SameAsMyBigSibling
     GoToIfSet FLAG_TALKED_TO_COUNTERPART_SISTER_WITH_NATIONAL_DEX, SandgemTownCounterpartHouse1F_BufferSwarmMapAndSpecies
     SetFlag FLAG_TALKED_TO_COUNTERPART_SISTER_WITH_NATIONAL_DEX
     EnableSwarms
     BufferPlayerName 0
-    Message SandgemTownCounterpartHouse1F_Text_ThereWasNewsSayingThereIsAMassiveOutbreakOfPokemon
+    Message SandgemTownCounterpartHouse1F_Text_MassiveOutbreakOfPokemon
     WaitButton
     CloseMessage
     ReleaseAll
@@ -73,20 +73,20 @@ SandgemTownCounterpartHouse1F_BufferSwarmMapAndSpecies:
     BufferMapName 1, VAR_MAP_LOCAL_1
     BufferSpeciesNameFromVar 2, VAR_MAP_LOCAL_0, 0, 1
     GetPlayerGender VAR_RESULT
-    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTownCounterpartHouse1F_MaleTheresABunchOfThisPokemonAtThatLocation
-    GoToIfEq VAR_RESULT, GENDER_FEMALE, SandgemTownCounterpartHouse1F_FemaleTheresABunchOfThisPokemonAtThatLocation
+    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTownCounterpartHouse1F_BunchOfPokemonAtLocationMale
+    GoToIfEq VAR_RESULT, GENDER_FEMALE, SandgemTownCounterpartHouse1F_BunchOfPokemonAtLocationFemale
     End
 
-SandgemTownCounterpartHouse1F_MaleTheresABunchOfThisPokemonAtThatLocation:
-    Message SandgemTownCounterpartHouse1F_Text_MaleTheresABunchOfThisPokemonAtThatLocation
-    GoTo SandgemTownCounterpartHouse1F_CloseMessageTheresABunchOfThisPokemonAtThatLocation
+SandgemTownCounterpartHouse1F_BunchOfPokemonAtLocationMale:
+    Message SandgemTownCounterpartHouse1F_Text_BunchOfPokemonAtLocationMale
+    GoTo SandgemTownCounterpartHouse1F_CloseMessageBunchOfPokemonAtLocation
 
-SandgemTownCounterpartHouse1F_FemaleTheresABunchOfThisPokemonAtThatLocation:
+SandgemTownCounterpartHouse1F_BunchOfPokemonAtLocationFemale:
     BufferPlayerName 0
-    Message SandgemTownCounterpartHouse1F_Text_FemaleTheresABunchOfThisPokemonAtThatLocation
-    GoTo SandgemTownCounterpartHouse1F_CloseMessageTheresABunchOfThisPokemonAtThatLocation
+    Message SandgemTownCounterpartHouse1F_Text_BunchOfPokemonAtLocationFemale
+    GoTo SandgemTownCounterpartHouse1F_CloseMessageBunchOfPokemonAtLocation
 
-SandgemTownCounterpartHouse1F_CloseMessageTheresABunchOfThisPokemonAtThatLocation:
+SandgemTownCounterpartHouse1F_CloseMessageBunchOfPokemonAtLocation:
     WaitButton
     CloseMessage
     ReleaseAll

res/field/scripts/scripts_sandgem_town_counterpart_house_2f.s

@@ -9,7 +9,7 @@ SandgemTownCounterpartHouse2F_PC:
     PlaySE SEQ_SE_CONFIRM
     LockAll
     BufferPlayerName 0
-    Message SandgemTownCounterpartHouse2F_Text_PlayerCheckedThePCScreen
+    Message SandgemTownCounterpartHouse2F_Text_PlayerCheckedPCScreen
     WaitButton
     CloseMessage
     ReleaseAll

res/field/scripts/scripts_sandgem_town_house.s

@@ -7,9 +7,9 @@
     ScriptEntryEnd
 
 SandgemTownHouse_BreederM:
-    NPCMessage SandgemTownHouse_Text_PokemonGrowStrongerFromBattlingOtherPokemon
+    NPCMessage SandgemTownHouse_Text_GrowStrongerFromBattling
     End
 
 SandgemTownHouse_BreederF:
-    NPCMessage SandgemTownHouse_Text_AGoodTrainerTakesCareToNotLetTheirPokemonFaint
+    NPCMessage SandgemTownHouse_Text_GoodTrainerTakesCare
     End

res/field/scripts/scripts_sandgem_town_pokecenter_1f.s

@@ -14,15 +14,15 @@ SandgemTownPokecenter1F_Nurse:
     End
 
 SandgemTownPokecenter1F_BreederM:
-    NPCMessage SandgemTownPokecenter1F_Text_ThatLadyAtTheCounterWillHealYourPokemon
+    NPCMessage SandgemTownPokecenter1F_Text_LadyAtCounterHealsPokemon
     End
 
 SandgemTownPokecenter1F_ExpertM:
-    NPCMessage SandgemTownPokecenter1F_Text_DoYouSeeThatPCOverThere
+    NPCMessage SandgemTownPokecenter1F_Text_PCOverThere
     End
 
 SandgemTownPokecenter1F_Lass:
-    NPCMessage SandgemTownPokecenter1F_Text_TheTopFloorIsTheCommunicationClub
+    NPCMessage SandgemTownPokecenter1F_Text_TopFloorIsCommunicationClub
     End
 
     .balign 4, 0

res/field/scripts/scripts_sandgem_town_pokecenter_2f.s

@@ -6,7 +6,7 @@
     ScriptEntryEnd
 
 SandgemTownPokecenter2F_Lass:
-    NPCMessage SandgemTownPokecenter2F_Text_WhatKindOfTrainersSignWillGetPeopleLaughing
+    NPCMessage SandgemTownPokecenter2F_Text_WhatWillGetPeopleLaughing
     End
 
     .balign 4, 0

res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s

@@ -41,7 +41,7 @@ SandgemTownLab_ProfRowan:
     LockAll
     FacePlayer
     Call SandgemTownLab_SetVarIfArrivedInSunyshoreCity
-    GoToIfEq VAR_0x8006, TRUE, SandgemTownLab_IfYouSeeCynthiaGiveHerMyBestRegards
+    GoToIfEq VAR_0x8006, TRUE, SandgemTownLab_GiveCynthiaMyBestRegards
     GoTo SandgemTownLab_ProfRowanReactToPokedex
     End
 
@@ -51,14 +51,14 @@ SandgemTownLab_IncreaseExitedDistortionWorldState:
 
 SandgemTownLab_ProfRowanReactToPokedex:
     GetNationalDexEnabled VAR_RESULT
-    GoToIfEq VAR_RESULT, TRUE, SandgemTownLab_ThereAreManyMorePokemon
+    GoToIfEq VAR_RESULT, TRUE, SandgemTownLab_ManyMorePokemon
     GoToIfUnset FLAG_FIRST_ARRIVAL_ETERNA_CITY, SandgemTownLab_CheckShouldRatePokedex
     CheckLocalDexCompleted VAR_RESULT
     GoToIfEq VAR_RESULT, TRUE, SandgemTownLab_ShowCompleteLocalDex
 SandgemTownLab_CheckShouldRatePokedex:
     GoToIfGe VAR_SANDGEM_TOWN_STATE, 2, SandgemTownLab_CheckPokedexRatings
     BufferPlayerName 0
-    Message SandgemTownLab_Text_GoOnYourGrandAdventureAwaitsYou
+    Message SandgemTownLab_Text_GrandAdventureAwaitsYou
     WaitButton
     CloseMessage
     ReleaseAll
@@ -68,9 +68,9 @@ SandgemTownLab_CheckPokedexRatings:
     CallCommonScript 0x26DE
     End
 
-SandgemTownLab_IfYouSeeCynthiaGiveHerMyBestRegards:
+SandgemTownLab_GiveCynthiaMyBestRegards:
     BufferPlayerName 0
-    Message SandgemTownLab_Text_IfYouSeeCynthiaGiveHerMyBestRegards
+    Message SandgemTownLab_Text_GiveCynthiaMyBestRegards
     WaitButton
     CloseMessage
     ReleaseAll
@@ -85,30 +85,30 @@ SandgemTownLab_OnFrame_ReturnedFromDistortionWorld:
     ApplyMovement LOCALID_COUNTERPART, SandgemTownLab_Movement_CounterpartTurnOnSpot
     WaitMovement
     GetPlayerGender VAR_RESULT
-    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTownLab_DawnImGladToSeeYouSafe
-    GoTo SandgemTownLab_LucasImGladToSeeYouBackSafe
+    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTownLab_DawnGladToSeeYouSafe
+    GoTo SandgemTownLab_LucasGladToSeeYouSafe
     End
 
-SandgemTownLab_DawnImGladToSeeYouSafe:
+SandgemTownLab_DawnGladToSeeYouSafe:
     BufferPlayerName 1
-    Message SandgemTownLab_Text_DawnImGladToSeeYouSafe
-    GoTo SandgemTownLab_WhyNotObtainSunyshoresBadge
+    Message SandgemTownLab_Text_DawnGladToSeeYouSafe
+    GoTo SandgemTownLab_ObtainSunyshoresBadge
     End
 
-SandgemTownLab_LucasImGladToSeeYouBackSafe:
+SandgemTownLab_LucasGladToSeeYouSafe:
     BufferPlayerName 1
-    Message SandgemTownLab_Text_LucasImGladToSeeYouBackSafe
-    GoTo SandgemTownLab_WhyNotObtainSunyshoresBadge
+    Message SandgemTownLab_Text_LucasGladToSeeYouSafe
+    GoTo SandgemTownLab_ObtainSunyshoresBadge
     End
 
-SandgemTownLab_WhyNotObtainSunyshoresBadge:
+SandgemTownLab_ObtainSunyshoresBadge:
     GetLocalDexSeenCount VAR_RESULT
     BufferNumber 1, VAR_RESULT
-    Message SandgemTownLab_Text_WhyNotObtainSunyshoresBadge
+    Message SandgemTownLab_Text_ObtainSunyshoresBadge
     WaitButton
     CloseMessage
     SetFlag FLAG_HIDE_VALOR_LAKEFRONT_COLLECTOR
-    SetVar VAR_UNK_0x4112, 1
+    SetVar VAR_VALOR_LAKEFRONT_BLOCK_SUNYSHORE_STATE, 1
     ClearFlag FLAG_HIDE_VERITY_CAVERN_MESPRIT
     ClearFlag FLAG_HIDE_VALOR_CAVERN_AZELF
     ClearFlag FLAG_HIDE_ACUITY_CAVERN_UXIE
@@ -132,7 +132,7 @@ SandgemTownLab_OnFrame_GetPokedex:
     ApplyMovement LOCALID_PLAYER, SandgemTownLab_Movement_PlayerWalkToProfRowan
     WaitMovement
     BufferPlayerName 0
-    Message SandgemTownLab_Text_LetsHaveALookAtYourPokemon
+    Message SandgemTownLab_Text_LookAtYourPokemon
     CloseMessage
     SetPlayerState PLAYER_TRANSITION_HEALING
     ChangePlayerState
@@ -141,30 +141,30 @@ SandgemTownLab_OnFrame_GetPokedex:
     SetVar VAR_0x8004, 0
     GetPartyMonSpecies VAR_0x8004, VAR_RESULT
     SetVar VAR_0x8008, VAR_RESULT
-    GoToIfEq VAR_0x8008, SPECIES_TURTWIG, SandgemTownLab_ThisPokemonSeemstoBeRatherHappy
-    GoToIfEq VAR_0x8008, SPECIES_CHIMCHAR, SandgemTownLab_ThisPokemonSeemstoBeRatherHappy
-    GoToIfEq VAR_0x8008, SPECIES_PIPLUP, SandgemTownLab_ThisPokemonSeemstoBeRatherHappy
-    GoTo SandgemTownLab_YouveMadeYourPokemonEvolveAlready
+    GoToIfEq VAR_0x8008, SPECIES_TURTWIG, SandgemTownLab_PokemonSeemsRatherHappy
+    GoToIfEq VAR_0x8008, SPECIES_CHIMCHAR, SandgemTownLab_PokemonSeemsRatherHappy
+    GoToIfEq VAR_0x8008, SPECIES_PIPLUP, SandgemTownLab_PokemonSeemsRatherHappy
+    GoTo SandgemTownLab_PokemonEvolvedAlready
 
-SandgemTownLab_ThisPokemonSeemstoBeRatherHappy:
-    Message SandgemTownLab_Text_ThisPokemonSeemstoBeRatherHappy
-    GoTo SandgemTownLab_WouldYouLikeToGiveItANickname
+SandgemTownLab_PokemonSeemsRatherHappy:
+    Message SandgemTownLab_Text_PokemonSeemsRatherHappy
+    GoTo SandgemTownLab_GiveItANickname
 
-SandgemTownLab_YouveMadeYourPokemonEvolveAlready:
-    Message SandgemTownLab_Text_YouveMadeYourPokemonEvolveAlready
-    GoTo SandgemTownLab_WouldYouLikeToGiveItANickname
+SandgemTownLab_PokemonEvolvedAlready:
+    Message SandgemTownLab_Text_PokemonEvolvedAlready
+    GoTo SandgemTownLab_GiveItANickname
 
-SandgemTownLab_WouldYouLikeToGiveItANickname:
+SandgemTownLab_GiveItANickname:
     CloseMessage
     ApplyMovement LOCALID_PLAYER, SandgemTownLab_Movement_PlayerReceive
     WaitMovement
     SetPlayerState PLAYER_TRANSITION_WALKING
     ChangePlayerState
     BufferPartyMonSpecies 0, 0
-    Message SandgemTownLab_Text_EntrustingYouWithThatStarterWasNoMistake
-    Message SandgemTownLab_Text_WouldYouLikeToGiveItANickname
+    Message SandgemTownLab_Text_EntrustingWasNoMistake
+    Message SandgemTownLab_Text_GiveItANickname
     ShowYesNoMenu VAR_RESULT
-    GoToIfEq VAR_RESULT, MENU_NO, SandgemTownLab_CherishThatStarterOfYours
+    GoToIfEq VAR_RESULT, MENU_NO, SandgemTownLab_CherishThatStarter
     GoTo SandgemTownLab_NicknameStarter
     End
 
@@ -177,21 +177,21 @@ SandgemTownLab_NicknameStarter:
     SetVar VAR_0x8002, VAR_RESULT
     FadeScreenIn
     WaitFadeScreen
-    Message SandgemTownLab_Text_AskAndYoureHappyWithThatNickName
+    Message SandgemTownLab_Text_YoureHappyWithNickname
     ShowYesNoMenu VAR_RESULT
     GoToIfEq VAR_RESULT, MENU_NO, SandgemTownLab_NicknameStarter
     CallIfNe VAR_0x8002, 1, SandgemTownLab_IncrementRecordPokemonNicknamed
-    GoTo SandgemTownLab_CherishThatStarterOfYours
+    GoTo SandgemTownLab_CherishThatStarter
     End
 
 SandgemTownLab_IncrementRecordPokemonNicknamed:
     IncrementGameRecord RECORD_POKEMON_NICKNAMED
     Return
 
-SandgemTownLab_CherishThatStarterOfYours:
+SandgemTownLab_CherishThatStarter:
     BufferPartyMonSpecies 0, 0
     BufferRivalName 1
-    Message SandgemTownLab_Text_CherishThatStarterOfYours
+    Message SandgemTownLab_Text_CherishThatStarter
     CloseMessage
     ApplyMovement LOCALID_COUNTERPART, SandgemTownLab_Movement_CounterpartWalkOnSpotWest
     WaitMovement
@@ -199,29 +199,29 @@ SandgemTownLab_CherishThatStarterOfYours:
     WaitMovement
     WaitTime 15, VAR_RESULT
     GetPlayerGender VAR_RESULT
-    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTownLab_DawnImSoGladThatYourKindTowardPokemon
-    GoTo SandgemTownLab_LucasBoyAmIGladYoureKindTowardPokemon
+    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTownLab_DawnImGladYourKind
+    GoTo SandgemTownLab_LucasImGladYourKind
     End
 
-SandgemTownLab_DawnImSoGladThatYourKindTowardPokemon:
+SandgemTownLab_DawnImGladYourKind:
     BufferCounterpartName 0
-    Message SandgemTownLab_Text_DawnImSoGladThatYourKindTowardPokemon
+    Message SandgemTownLab_Text_DawnImGladYourKind
     CloseMessage
     ApplyMovement LOCALID_COUNTERPART, SandgemTownLab_Movement_CounterpartWalkOnSpotWest2
     WaitMovement
-    GoTo SandgemTownLab_WillYouRecordDataOnAllPokemonInSinnoh
+    GoTo SandgemTownLab_RecordDataOnAllPokemon
     End
 
-SandgemTownLab_LucasBoyAmIGladYoureKindTowardPokemon:
+SandgemTownLab_LucasImGladYourKind:
     BufferCounterpartName 0
-    Message SandgemTownLab_Text_LucasBoyAmIGladYoureKindTowardPokemon
+    Message SandgemTownLab_Text_LucasImGladYourKind
     CloseMessage
     ApplyMovement LOCALID_COUNTERPART, SandgemTownLab_Movement_CounterpartWalkOnSpotWest2
     WaitMovement
-    GoTo SandgemTownLab_WillYouRecordDataOnAllPokemonInSinnoh
+    GoTo SandgemTownLab_RecordDataOnAllPokemon
     End
 
-SandgemTownLab_WillYouRecordDataOnAllPokemonInSinnoh:
+SandgemTownLab_RecordDataOnAllPokemon:
     FadeOutBGM 0, 40
     ApplyMovement LOCALID_PROF_ROWAN, SandgemTownLab_Movement_ProfRowanWalkOnSpotSouth
     ApplyMovement LOCALID_PLAYER, SandgemTownLab_Movement_PlayerFaceProfRowan
@@ -229,8 +229,8 @@ SandgemTownLab_WillYouRecordDataOnAllPokemonInSinnoh:
     WaitTime 35, VAR_RESULT
     SetFlag FLAG_ALT_MUSIC_ROWANS_LAB
     PlayMusic SEQ_OPENING2
-    Message SandgemTownLab_Text_ThereIsSomethingIWantYouToDo
-    Message SandgemTownLab_Text_WillYouRecordDataOnAllPokemonInSinnoh
+    Message SandgemTownLab_Text_SomethingIWantYouToDo
+    Message SandgemTownLab_Text_RecordDataOnAllPokemon
     ShowYesNoMenu VAR_RESULT
     GoToIfEq VAR_RESULT, MENU_NO, SandgemTownLab_LetMeAskYouAgain
     GoTo SandgemTownLab_ObtainPokedex
@@ -253,52 +253,52 @@ SandgemTownLab_ObtainPokedex:
     PlayFanfare SEQ_FANFA4
     WaitFanfare
     BufferPlayerName 0
-    Message SandgemTownLab_Text_MeetEveryKindOfPokemonInThisRegion
+    Message SandgemTownLab_Text_MeetEveryKindOfPokemon
     CloseMessage
     ApplyMovement LOCALID_COUNTERPART, SandgemTownLab_Movement_CounterpartWalkOnSpotWest3
     WaitMovement
     WaitTime 15, VAR_RESULT
     GetPlayerGender VAR_RESULT
     GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTownLab_DawnIveGotOneToo
-    GoTo SandgemTownLab_LucasIveGotTheSameKindOfPokedex
+    GoTo SandgemTownLab_LucasIveGotTheSamePokedex
     End
 
 SandgemTownLab_DawnIveGotOneToo:
     BufferCounterpartName 0
     Message SandgemTownLab_Text_DawnIveGotOneToo
-    GoTo SandgemTownLab_YourGrandAdventureBeginsRightNow
+    GoTo SandgemTownLab_GrandAdventureBeginsNow
     End
 
-SandgemTownLab_LucasIveGotTheSameKindOfPokedex:
+SandgemTownLab_LucasIveGotTheSamePokedex:
     BufferCounterpartName 0
-    Message SandgemTownLab_Text_LucasIveGotTheSameKindOfPokedex
-    GoTo SandgemTownLab_YourGrandAdventureBeginsRightNow
+    Message SandgemTownLab_Text_LucasIveGotTheSamePokedex
+    GoTo SandgemTownLab_GrandAdventureBeginsNow
     End
 
-SandgemTownLab_YourGrandAdventureBeginsRightNow:
+SandgemTownLab_GrandAdventureBeginsNow:
     BufferPlayerName 0
-    Message SandgemTownLab_Text_YourGrandAdventureBeginsRightNow
+    Message SandgemTownLab_Text_GrandAdventureBeginsNow
     CloseMessage
     ApplyMovement LOCALID_COUNTERPART, SandgemTownLab_Movement_CounterpartWalkOnSpotWest3
     WaitMovement
     ApplyMovement LOCALID_PLAYER, SandgemTownLab_Movement_PlayerFaceCounterpart
     WaitMovement
     GetPlayerGender VAR_RESULT
-    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTownLab_DawnIllBeHappyToTeachYouThings
-    GoTo SandgemTownLab_LucasIllTeachYouStuffLater
+    GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTownLab_DawnHappyToTeachYou
+    GoTo SandgemTownLab_LucasIllTeachYouStuff
     End
 
-SandgemTownLab_DawnIllBeHappyToTeachYouThings:
+SandgemTownLab_DawnHappyToTeachYou:
     BufferPlayerName 0
     BufferPlayerCounterpartStarterSpeciesNameWithArticle 1
-    Message SandgemTownLab_Text_DawnIllBeHappyToTeachYouThings
+    Message SandgemTownLab_Text_DawnHappyToTeachYou
     GoTo SandgemTownLab_CounterpartLeave
     End
 
-SandgemTownLab_LucasIllTeachYouStuffLater:
+SandgemTownLab_LucasIllTeachYouStuff:
     BufferPlayerName 0
     BufferRivalStarterSpeciesName 1
-    Message SandgemTownLab_Text_LucasIllTeachYouStuffLater
+    Message SandgemTownLab_Text_LucasIllTeachYouStuff
     GoTo SandgemTownLab_CounterpartLeave
     End
 
@@ -314,7 +314,7 @@ SandgemTownLab_CounterpartLeave:
     End
 
     .balign 4, 0
-SandgemTownPokemonResearchLab_Movement_Unused:
+SandgemTownLab_Movement_Unused:
     WalkOnSpotNormalSouth
     EndMovement
 
@@ -388,9 +388,9 @@ SandgemTownLab_ScientistM:
     LockAll
     FacePlayer
     Call SandgemTownLab_SetVarIfArrivedInSunyshoreCity
-    GoToIfEq VAR_0x8006, TRUE, SandgemTownLab_ImStunnedByYourGreatness
+    GoToIfEq VAR_0x8006, TRUE, SandgemTownLab_StunnedByGreatness
     GetNationalDexEnabled VAR_RESULT
-    GoToIfEq VAR_RESULT, TRUE, SandgemTownLab_YouveBeenGreatForTheProfsResearch
+    GoToIfEq VAR_RESULT, TRUE, SandgemTownLab_YouveBeenGreatForResearch
     BufferCounterpartName 0
     Message SandgemTownLab_Text_ImCounterpartsFather
     WaitButton
@@ -398,16 +398,16 @@ SandgemTownLab_ScientistM:
     ReleaseAll
     End
 
-SandgemTownLab_YouveBeenGreatForTheProfsResearch:
+SandgemTownLab_YouveBeenGreatForResearch:
     BufferCounterpartName 0
-    Message SandgemTownLab_Text_YouveBeenGreatForTheProfsResearch
+    Message SandgemTownLab_Text_YouveBeenGreatForResearch
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-SandgemTownLab_ImStunnedByYourGreatness:
-    Message SandgemTownLab_Text_ImStunnedByYourGreatness
+SandgemTownLab_StunnedByGreatness:
+    Message SandgemTownLab_Text_StunnedByGreatness
     WaitButton
     CloseMessage
     ReleaseAll
@@ -418,24 +418,24 @@ SandgemTownLab_ScientistF:
     LockAll
     FacePlayer
     Call SandgemTownLab_SetVarIfArrivedInSunyshoreCity
-    GoToIfEq VAR_0x8006, TRUE, SandgemTownLab_HearingWhatWasHappeningGaveMeShivers
+    GoToIfEq VAR_0x8006, TRUE, SandgemTownLab_GaveMeShivers
     GetNationalDexEnabled VAR_RESULT
-    GoToIfEq VAR_RESULT, TRUE, SandgemTownLab_ProfessorRowanHasBeenStudyingPokedexSystems
-    Message SandgemTownLab_Text_ItsAnHonorToBeAnAssistant
+    GoToIfEq VAR_RESULT, TRUE, SandgemTownLab_StudyingPokedexSystems
+    Message SandgemTownLab_Text_HonorToBeAnAssistant
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-SandgemTownLab_ProfessorRowanHasBeenStudyingPokedexSystems:
-    Message SandgemTownLab_Text_ProfessorRowanHasBeenStudyingPokedexSystems
+SandgemTownLab_StudyingPokedexSystems:
+    Message SandgemTownLab_Text_StudyingPokedexSystems
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-SandgemTownLab_HearingWhatWasHappeningGaveMeShivers:
-    Message SandgemTownLab_Text_HearingWhatWasHappeningGaveMeShivers
+SandgemTownLab_GaveMeShivers:
+    Message SandgemTownLab_Text_GaveMeShivers
     WaitButton
     CloseMessage
     ReleaseAll
@@ -453,11 +453,11 @@ SandgemTownLab_BookshelfAdventureRuleNo2:
     End
 
 SandgemTownLab_BookshelfBooks:
-    EventMessage SandgemTownLab_Text_ItsCrammedFullOfBooks
+    EventMessage SandgemTownLab_Text_CrammedFullOfBooks
     End
 
 SandgemTownLab_BookshelfReferenceMaterial:
-    EventMessage SandgemTownLab_Text_ThereALotOfReferenceMaterial
+    EventMessage SandgemTownLab_Text_ReferenceMaterial
     End
 
 SandgemTownLab_PC:
@@ -466,28 +466,28 @@ SandgemTownLab_PC:
     End
 
 SandgemTownLab_ResearchMaterials_Unused:
-    EventMessage SandgemTownLab_Text_ResearchMaterialsAreCarefullyTuckedAway
+    EventMessage SandgemTownLab_Text_ResearchMaterialsTuckedAway
     End
 
 SandgemTownLab_Refrigerator:
-    EventMessage SandgemTownLab_Text_TheRefrigeratorIsFilledWithTastySweets
+    EventMessage SandgemTownLab_Text_FilledWithTastySweets
     End
 
 SandgemTownLab_ShowCompleteLocalDex:
-    GoToIfSet FLAG_SHOWN_COMPLETE_LOCAL_DEX, SandgemTownLab_YouveMetEveryKindOfPokemonInTheSinnohRegion
-    GoTo SandgemTownLab_AskYouveComeToShowMeYourProgressOnThePokedex
+    GoToIfSet FLAG_SHOWN_COMPLETE_LOCAL_DEX, SandgemTownLab_MetEverySinnohPokemon
+    GoTo SandgemTownLab_YouveComeToShowProgress
     End
 
-SandgemTownLab_YouveMetEveryKindOfPokemonInTheSinnohRegion:
+SandgemTownLab_MetEverySinnohPokemon:
     BufferPlayerName 0
-    Message SandgemTownLab_Text_YouveMetEveryKindOfPokemonInTheSinnohRegion
+    Message SandgemTownLab_Text_MetEverySinnohPokemon
     CloseMessage
     GoTo SandgemTownLab_EnableNationalDex
     End
 
-SandgemTownLab_AskYouveComeToShowMeYourProgressOnThePokedex:
+SandgemTownLab_YouveComeToShowProgress:
     BufferPlayerName 0
-    Message SandgemTownLab_Text_AskYouveComeToShowMeYourProgressOnThePokedex
+    Message SandgemTownLab_Text_YouveComeToShowProgress
     ShowYesNoMenu VAR_RESULT
     GoToIfEq VAR_RESULT, MENU_NO, SandgemTownLab_WhatsWrong
     GoTo SandgemTownLab_SoYouveSeenAllPokemon
@@ -505,7 +505,7 @@ SandgemTownLab_SoYouveSeenAllPokemon:
     BufferNumber 0, VAR_RESULT
     Message SandgemTownLab_Text_SoYouveSeenXPokemon
     BufferPlayerName 0
-    Message SandgemTownLab_Text_ThePokemonOfTheSInnohRegionAreBeingAdded
+    Message SandgemTownLab_Text_ExcellentWork
     CloseMessage
     GoTo SandgemTownLab_EnableNationalDex
     End
@@ -523,42 +523,42 @@ SandgemTownLab_EnableNationalDex:
     ApplyMovement LOCALID_PROF_ROWAN, SandgemTownLab_Movement_ProfRowanNoticeProfOak
     WaitMovement
     Message SandgemTownLab_Text_GreetingsProfessorRowan
-    Message SandgemTownLab_Text_IfItIsntMyOldColleagueProfessorOak
+    Message SandgemTownLab_Text_OldColleagueProfessorOak
     CloseMessage
     ApplyMovement LOCALID_PROF_ROWAN, SandgemTownLab_Movement_ProfRowanTurnOnSpot
     WaitMovement
     WaitTime 15, VAR_RESULT
-    Message SandgemTownLab_Text_LetMeIntroduceYouToMyYoungAssistant
+    Message SandgemTownLab_Text_IntroduceYouToMyAssistant
     CloseMessage
     ApplyMovement LOCALID_PROF_OAK, SandgemTownLab_Movement_ProfOakWalkToPlayer
     ApplyMovement LOCALID_PLAYER, SandgemTownLab_Movement_PlayerFaceProfOak
     WaitMovement
     Message SandgemTownLab_Text_LetMeUpgradeYourPokedex
     CallIfSet FLAG_GAME_COMPLETED, SandgemTownLab_GameCompletedReturn
-    CallIfGe VAR_FIGHT_AREA_STATE, 2, _079C
+    CallIfGe VAR_FIGHT_AREA_STATE, 2, SandgemTownLab_HideFightAreaBlockade
     SetNationalDexEnabled
     BufferPlayerName 0
     PlayFanfare SEQ_FANFA4
-    Message SandgemTownLab_Text_PlayersPokedexWasUpgradedWithTheNationalMode
+    Message SandgemTownLab_Text_PokedexUpgradedWithNationalMode
     WaitFanfare
-    Message SandgemTownLab_Text_ItWontBeEasyToCompleteTheNationalPokedex
+    Message SandgemTownLab_Text_WontBeEasyToComplete
     Message SandgemTownLab_Text_PlayerWillGetTheJobDone
-    Message SandgemTownLab_Text_IveHeardThatThePalParkIsNowOpen
+    Message SandgemTownLab_Text_PalParkIsNowOpen
     BufferPlayerName 0
     GetPlayerGender VAR_0x8004
-    CallIfEq VAR_0x8004, GENDER_MALE, SandgemTownLab_MaleYouShouldVisitThePalParkToo
-    CallIfEq VAR_0x8004, GENDER_FEMALE, SandgemTownLab_FemaleYouShouldVisitThePalParkToo
+    CallIfEq VAR_0x8004, GENDER_MALE, SandgemTownLab_VisitThePalParkMale
+    CallIfEq VAR_0x8004, GENDER_FEMALE, SandgemTownLab_VisitThePalParkFemale
     CloseMessage
     ApplyMovement LOCALID_PROF_OAK, SandgemTownLab_Movement_ProfOakLeave
     WaitMovement
-    RemoveObject 4
-    Message SandgemTownLab_Text_OffHeGoesAsBusyAsEver
+    RemoveObject LOCALID_PROF_OAK
+    Message SandgemTownLab_Text_OffHeGoes
     CloseMessage
     WaitTime 15, VAR_RESULT
     ApplyMovement LOCALID_PLAYER, SandgemTownLab_Movement_PlayerWalkBackToProfRowan
     WaitMovement
     BufferPlayerName 0
-    Message SandgemTownLab_Text_IHaveAGiftForCompletingTheSinnohPokedex
+    Message SandgemTownLab_Text_GiftForCompletingSinnohPokedex
     SetVar VAR_0x8004, ITEM_POKE_RADAR
     SetVar VAR_0x8005, 1
     Common_GiveItemQuantity
@@ -568,23 +568,23 @@ SandgemTownLab_EnableNationalDex:
     ReleaseAll
     End
 
-_079C:
+SandgemTownLab_HideFightAreaBlockade:
     SetFlag FLAG_HIDE_FIGHT_AREA_BLOCKADE
     Return
 
 SandgemTownLab_GameCompletedReturn:
     Return
 
-SandgemTownLab_MaleYouShouldVisitThePalParkToo:
-    Message SandgemTownLab_Text_MaleYouShouldVisitThePalParkToo
+SandgemTownLab_VisitThePalParkMale:
+    Message SandgemTownLab_Text_VisitThePalParkMale
     Return
 
-SandgemTownLab_FemaleYouShouldVisitThePalParkToo:
-    Message SandgemTownLab_Text_FemaleYouShouldVisitThePalParkToo
+SandgemTownLab_VisitThePalParkFemale:
+    Message SandgemTownLab_Text_VisitThePalParkFemale
     Return
 
-SandgemTownLab_ThereAreManyMorePokemon:
-    Message SandgemTownLab_Text_ThereAreManyMorePokemon
+SandgemTownLab_ManyMorePokemon:
+    Message SandgemTownLab_Text_ManyMorePokemon
     WaitButton
     CloseMessage
     ReleaseAll
@@ -629,7 +629,7 @@ SandgemTownLab_Movement_ProfRowanTurnOnSpot:
     WalkOnSpotNormalSouth
     EndMovement
 
-SandgemTownPokemonResearchLab_Movement_Unused2:
+SandgemTownLab_Movement_Unused2:
     WalkOnSpotNormalWest
     EndMovement
 

res/field/scripts/scripts_snowpoint_city_mart.s

@@ -17,7 +17,7 @@ SnowpointCityMart_SpecialtyVendor:
     End
 
 SnowpointCityMart_Youngster:
-    NPCMessage SnowpointCityMart_Text_UsingTmsForEliteFour
+    NPCMessage SnowpointCityMart_Text_UsingTMsForEliteFour
     End
 
 SnowpointCityMart_SnowpointLady:

res/field/scripts/scripts_solaceon_ruins_room_2.s

@@ -14,21 +14,21 @@ SolaceonRuinsRoom2_Hiker:
     GoToIfSet FLAG_DID_NOT_LOAN_HM_DEFOG, SolaceonRuinsRoom2_AskLoanHMDefog
     CheckItem ITEM_HM05, 1, VAR_RESULT
     GoToIfEq VAR_RESULT, TRUE, SolaceonRuinsRoom2_PlayerHasHMDefog
-    Message SolaceonRuinsRoom2_Text_HMDefogIsInTheseRuins
+    Message SolaceonRuinsRoom2_Text_HMDefogInRuins
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
 SolaceonRuinsRoom2_PlayerHasHMDefog:
-    Message SolaceonRuinsRoom2_Text_HMDefogIsInTheseRuins2
+    Message SolaceonRuinsRoom2_Text_HMDefogInRuins2
     GoTo SolaceonRuinsRoom2_AskLoanHMDefog
     End
 
 SolaceonRuinsRoom2_AskLoanHMDefog:
     ApplyMovement LOCALID_HIKER, SolaceonRuinsRoom2_Movement_HikerExclamationMark
     WaitMovement
-    Message SolaceonRuinsRoom2_Text_CanYouLoanHMDefogToMe
+    Message SolaceonRuinsRoom2_Text_CanYouLoanHMDefog
     ShowYesNoMenu VAR_RESULT
     GoToIfEq VAR_RESULT, MENU_YES, SolaceonRuinsRoom2_LoanHMDefog
     GoToIfEq VAR_RESULT, MENU_NO, SolaceonRuinsRoom2_DontLoanHMDefog
@@ -53,7 +53,7 @@ SolaceonRuinsRoom2_BagIsFull:
 
 SolaceonRuinsRoom2_DontLoanHMDefog:
     SetFlag FLAG_DID_NOT_LOAN_HM_DEFOG
-    Message SolaceonRuinsRoom2_Text_ItsNotLikeItsGoingToWearOut
+    Message SolaceonRuinsRoom2_Text_ItsNotLikeItWearsOut
     WaitButton
     CloseMessage
     ReleaseAll

res/field/scripts/scripts_solaceon_town.s

@@ -37,15 +37,15 @@ SolaceonTown_Cowgirl1:
     PlaySE SEQ_SE_CONFIRM
     LockAll
     FacePlayer
-    GoToIfBadgeAcquired BADGE_ID_RELIC, SolaceonTown_TakeATourThroughTheRuins
-    Message SolaceonTown_Text_TakeItEasySlowAndCasual
+    GoToIfBadgeAcquired BADGE_ID_RELIC, SolaceonTown_TakeATour
+    Message SolaceonTown_Text_TakeItEasy
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-SolaceonTown_TakeATourThroughTheRuins:
-    Message SolaceonTown_Text_TakeATourThroughTheRuins
+SolaceonTown_TakeATour:
+    Message SolaceonTown_Text_TakeATour
     WaitButton
     CloseMessage
     ReleaseAll
@@ -56,11 +56,11 @@ SolaceonTown_Twin:
     End
 
 SolaceonTown_Cowgirl2:
-    NPCMessage SolaceonTown_Text_EverySundayIVisitTheLostTower
+    NPCMessage SolaceonTown_Text_IVisitTheLostTower
     End
 
 SolaceonTown_Rancher2:
-    NPCMessage SolaceonTown_Text_OverTimeTheTownCameToBe
+    NPCMessage SolaceonTown_Text_UsedToBeNothing
     End
 
 SolaceonTown_RuinManiac:
@@ -68,10 +68,10 @@ SolaceonTown_RuinManiac:
     LockAll
     FacePlayer
     CheckPoketchAppRegistered POKETCH_APPID_POKEMONHISTORY, VAR_RESULT
-    GoToIfEq VAR_RESULT, TRUE, SolaceonTown_EachPokemonHasItsOwnHistory
+    GoToIfEq VAR_RESULT, TRUE, SolaceonTown_EachPokemonOwnHistory
     GetLocalDexSeenCount VAR_RESULT
-    GoToIfLt VAR_RESULT, 50, SolaceonTown_IfYoureCompetentYoudHaveMetFiftyPokemon
-    Message SolaceonTown_Text_ThisHeresAPoketchAppPokemonHistory
+    GoToIfLt VAR_RESULT, 50, SolaceonTown_IfCompetentMetFiftyPokemon
+    Message SolaceonTown_Text_PoketchAppPokemonHistory
     SetVar VAR_0x8004, POKETCH_APPID_POKEMONHISTORY
     Common_GivePoketchApp
     WaitButton
@@ -79,15 +79,15 @@ SolaceonTown_RuinManiac:
     ReleaseAll
     End
 
-SolaceonTown_IfYoureCompetentYoudHaveMetFiftyPokemon:
-    Message SolaceonTown_Text_IfYoureCompetentYoudHaveMetFiftyPokemon
+SolaceonTown_IfCompetentMetFiftyPokemon:
+    Message SolaceonTown_Text_IfCompetentMetFiftyPokemon
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-SolaceonTown_EachPokemonHasItsOwnHistory:
-    Message SolaceonTown_Text_EachPokemonHasItsOwnHistory
+SolaceonTown_EachPokemonOwnHistory:
+    Message SolaceonTown_Text_EachPokemonOwnHistory
     WaitButton
     CloseMessage
     ReleaseAll
@@ -111,7 +111,7 @@ SolaceonTown_CoordEvent_Rival:
     WaitMovement
     Common_SetRivalBGM
     GetPlayerMapPos VAR_0x8004, VAR_0x8005
-    SetObjectEventPos LOCALID_RIVAL, VAR_0x8004, 0x295
+    SetObjectEventPos LOCALID_RIVAL, VAR_0x8004, 661
     ClearFlag FLAG_HIDE_SOLACEON_TOWN_RIVAL
     AddObject LOCALID_RIVAL
     LockObject LOCALID_RIVAL

res/field/scripts/scripts_solaceon_town_east_house.s

@@ -24,16 +24,16 @@ SolaceonTownEastHouse_NinjaBoy:
 SolaceonTownEastHouse_CheckUnownForm:
     FindPartySlotWithSpecies VAR_0x8004, SPECIES_UNOWN
     GetPartyMonForm VAR_0x8004, VAR_0x8006
-    GoToIfEq VAR_MAP_LOCAL_0, VAR_0x8006, SolaceonTownEastHouse_IfYouGivePokemonLikeLettersIllGiveSeals
+    GoToIfEq VAR_MAP_LOCAL_0, VAR_0x8006, SolaceonTownEastHouse_IllGiveSealsForUnown
     GoTo SolaceonTownEastHouse_TryGiveSealsForUnownForm
 
 SolaceonTownEastHouse_TryGiveSealsForUnownForm:
     SetVar VAR_0x8007, 50
     AddVar VAR_0x8007, VAR_0x8006
     CountSealOccurence VAR_0x8007, VAR_RESULT
-    GoToIfEq VAR_RESULT, 99, SolaceonTownEastHouse_IfYouGivePokemonLikeLettersIllGiveSeals
+    GoToIfEq VAR_RESULT, 99, SolaceonTownEastHouse_IllGiveSealsForUnown
     BufferPartyMonSpecies 0, VAR_0x8004
-    Message SolaceonTownEastHouse_Text_ThatPokemonLooksJustLikeMySeals
+    Message SolaceonTownEastHouse_Text_PokemonLooksLikeMySeals
     SetVar VAR_0x8000, 10
     CountSealOccurence VAR_0x8007, VAR_RESULT
     GoToIfLe VAR_RESULT, 89, SolaceonTownEastHouse_GiveSealsForUnownForm
@@ -56,7 +56,7 @@ SolaceonTownEastHouse_TheSealsWerePutAway:
     ReleaseAll
     End
 
-SolaceonTownEastHouse_IfYouGivePokemonLikeLettersIllGiveSeals:
+SolaceonTownEastHouse_IllGiveSealsForUnown:
     Message SolaceonTownEastHouse_Text_GiveUnownForSeals
     WaitButton
     CloseMessage

res/field/scripts/scripts_solaceon_town_north_house.s

@@ -7,9 +7,9 @@
     ScriptEntryEnd
 
 SolaceonTownNorthHouse_OldWoman:
-    NPCMessage SolaceonTownNorthHouse_Text_EggsFoundAtPokemonDayCare
+    NPCMessage SolaceonTownNorthHouse_Text_EggsFoundAtDayCare
     End
 
 SolaceonTownNorthHouse_Lass:
-    NPCMessage SolaceonTownNorthHouse_Text_ItHasntBeenProvenThatPokemonLayEggs
+    NPCMessage SolaceonTownNorthHouse_Text_NotProvenPokemonLayEggs
     End

res/field/scripts/scripts_solaceon_town_pokecenter_1f.s

@@ -18,7 +18,7 @@ SolaceonTownPokecenter1F_OldMan:
     End
 
 SolaceonTownPokecenter1F_Lass:
-    NPCMessage SolaceonTownPokecenter1F_Text_ItsQuiteFarToVeilstoneCity
+    NPCMessage SolaceonTownPokecenter1F_Text_QuiteFarToVeilstoneCity
     End
 
 SolaceonTownPokecenter1F_RuinManiac:

res/field/scripts/scripts_solaceon_town_pokemon_news_press.s

@@ -13,12 +13,12 @@ SolaceonTownPokemonNewsPress_GymGuide:
     LockAll
     FacePlayer
     GoToIfSet FLAG_COULD_NOT_RECEIVE_POKEMON_NEWS_PRESS_REWARD, SolaceonTownPokemonNewsPress_TryGiveReward
-    GoToIfSet FLAG_GOT_POKEMON_NEWS_PRESS_REWARD, SolaceonTownPokemonNewsPress_IllHaveAnotherAssignmentTomorrow
-    GoToIfUnset FLAG_TALKED_TO_POKEMON_NEWS_PRESS_GYM_GUIDE, SolaceonTownPokemonNewsPress_YoureTheExpertWeveBeenLookingFor
+    GoToIfSet FLAG_GOT_POKEMON_NEWS_PRESS_REWARD, SolaceonTownPokemonNewsPress_AnotherAssignmentTomorrow
+    GoToIfUnset FLAG_TALKED_TO_POKEMON_NEWS_PRESS_GYM_GUIDE, SolaceonTownPokemonNewsPress_ExpertWeveBeenLookingFor
     GoToIfEq VAR_POKEMON_NEWS_PRESS_REQUESTED_POKEMON, 0, SolaceonTownPokemonNewsPress_HeresYourAssignment
     GoTo SolaceonTownPokemonNewsPress_CheckBroughtRequestedPokemon
 
-SolaceonTownPokemonNewsPress_YoureTheExpertWeveBeenLookingFor:
+SolaceonTownPokemonNewsPress_ExpertWeveBeenLookingFor:
     SetFlag FLAG_TALKED_TO_POKEMON_NEWS_PRESS_GYM_GUIDE
     Message SolaceonTownPokemonNewsPress_Text_YoureTheExpert
     GoTo SolaceonTownPokemonNewsPress_SetNewsPressRequestedPokemon
@@ -39,9 +39,9 @@ SolaceonTownPokemonNewsPress_SetNewsPressRequestedPokemon:
     End
 
 SolaceonTownPokemonNewsPress_CheckBroughtRequestedPokemon:
-    Message SolaceonTownPokemonNewsPress_Text_DidYouBringUsThePokemon
+    Message SolaceonTownPokemonNewsPress_Text_DidYouBringThePokemon
     GetNewsPressDeadline VAR_RESULT
-    GoToIfEq VAR_RESULT, 0, SolaceonTownPokemonNewsPress_FailedToBringPokemonWithinDeadline
+    GoToIfEq VAR_RESULT, 0, SolaceonTownPokemonNewsPress_FailedAssignment
     CheckPartyHasSpecies VAR_RESULT, VAR_POKEMON_NEWS_PRESS_REQUESTED_POKEMON
     GoToIfEq VAR_RESULT, FALSE, SolaceonTownPokemonNewsPress_DidntBringPokemonYet
     GoTo SolaceonTownPokemonNewsPress_SetReward
@@ -64,7 +64,7 @@ SolaceonTownPokemonNewsPress_SetReward:
     CallIfEq VAR_RESULT, 11, SolaceonTownPokemonNewsPress_SetRewardQuickBall
     SetVar VAR_0x8005, 3
     CanFitItem ITEM_HEART_SCALE, 1, VAR_RESULT
-    GoToIfNe VAR_RESULT, FALSE, SolaceonTownPokemonNewsPress_GiveRewardIHopeYoullHelpAgainTomorrow
+    GoToIfNe VAR_RESULT, FALSE, SolaceonTownPokemonNewsPress_GiveRewardHelpAgainTomorrow
     SetFlag FLAG_GOT_POKEMON_NEWS_PRESS_REWARD
     GoToIfEq VAR_RESULT, FALSE, SolaceonTownPokemonNewsPress_CouldntGiveReward
     End
@@ -117,7 +117,7 @@ SolaceonTownPokemonNewsPress_SetRewardQuickBall:
     SetVar VAR_0x8004, ITEM_QUICK_BALL
     Return
 
-SolaceonTownPokemonNewsPress_GiveRewardIHopeYoullHelpAgainTomorrow:
+SolaceonTownPokemonNewsPress_GiveRewardHelpAgainTomorrow:
     Common_GiveItemQuantity
     SetVar VAR_0x8004, ITEM_HEART_SCALE
     SetVar VAR_0x8005, 1
@@ -125,14 +125,14 @@ SolaceonTownPokemonNewsPress_GiveRewardIHopeYoullHelpAgainTomorrow:
     ClearFlag FLAG_COULD_NOT_RECEIVE_POKEMON_NEWS_PRESS_REWARD
     SetVar VAR_POKEMON_NEWS_PRESS_REQUESTED_POKEMON, 0
     SetFlag FLAG_GOT_POKEMON_NEWS_PRESS_REWARD
-    Message SolaceonTownPokemonNewsPress_Text_IHopeYoullHelpAgainTomorrow
+    Message SolaceonTownPokemonNewsPress_Text_HelpAgainTomorrow
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
 SolaceonTownPokemonNewsPress_TryGiveReward:
-    GoToIfCannotFitItem ITEM_HEART_SCALE, 1, VAR_RESULT, SolaceonTownPokemonNewsPress_YourBagIsStuffedFull
+    GoToIfCannotFitItem ITEM_HEART_SCALE, 1, VAR_RESULT, SolaceonTownPokemonNewsPress_BagIsFull
     SetVar VAR_0x8004, VAR_POKEMON_NEWS_PRESS_POKE_BALL_REWARD
     SetVar VAR_0x8005, 3
     GoTo SolaceonTownPokemonNewsPress_GiveReward
@@ -141,11 +141,11 @@ SolaceonTownPokemonNewsPress_TryGiveReward:
 SolaceonTownPokemonNewsPress_CouldntGiveReward:
     SetVar VAR_POKEMON_NEWS_PRESS_POKE_BALL_REWARD, VAR_0x8004
     SetFlag FLAG_COULD_NOT_RECEIVE_POKEMON_NEWS_PRESS_REWARD
-    GoTo SolaceonTownPokemonNewsPress_YourBagIsStuffedFull
+    GoTo SolaceonTownPokemonNewsPress_BagIsFull
     End
 
-SolaceonTownPokemonNewsPress_YourBagIsStuffedFull:
-    Message SolaceonTownPokemonNewsPress_Text_YourBagIsStuffedFull
+SolaceonTownPokemonNewsPress_BagIsFull:
+    Message SolaceonTownPokemonNewsPress_Text_BagIsFull
     WaitButton
     CloseMessage
     ReleaseAll
@@ -167,22 +167,22 @@ SolaceonTownPokemonNewsPress_DidntBringPokemonYet:
     BufferSpeciesNameFromVar 0, VAR_POKEMON_NEWS_PRESS_REQUESTED_POKEMON, 0, 0
     GetNewsPressDeadline VAR_RESULT
     BufferNumber 1, VAR_RESULT
-    Message SolaceonTownPokemonNewsPress_Text_StillHaventCaughtThePokemon
+    Message SolaceonTownPokemonNewsPress_Text_StillHaventCaughtPokemon
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-SolaceonTownPokemonNewsPress_FailedToBringPokemonWithinDeadline:
-    Message SolaceonTownPokemonNewsPress_Text_FailedToBringThePokemon
+SolaceonTownPokemonNewsPress_FailedAssignment:
+    Message SolaceonTownPokemonNewsPress_Text_FailedToBringPokemon
     SetVar VAR_POKEMON_NEWS_PRESS_REQUESTED_POKEMON, 0
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-SolaceonTownPokemonNewsPress_IllHaveAnotherAssignmentTomorrow:
-    Message SolaceonTownPokemonNewsPress_Text_IllHaveAnotherAssignmentTomorrow
+SolaceonTownPokemonNewsPress_AnotherAssignmentTomorrow:
+    Message SolaceonTownPokemonNewsPress_Text_AnotherAssignmentTomorrow
     WaitButton
     CloseMessage
     ReleaseAll

res/field/scripts/scripts_sunyshore_city_mart.s

@@ -21,5 +21,5 @@ SunyshoreCityMart_RuinManiac:
     End
 
 SunyshoreCityMart_Sailor:
-    NPCMessage SunyshoreCityMart_Text_BuyBallSealsAtSunyshoreMarket
+    NPCMessage SunyshoreCityMart_Text_BuySealsAtMarket
     End

res/field/scripts/scripts_team_galactic_eterna_building_1f.s

@@ -17,19 +17,19 @@ TeamGalacticEternaBuilding1F_OnTransition:
     End
 
 TeamGalacticEternaBuilding1F_GruntM1:
-    NPCMessage TeamGalacticEternaBuilding1F_Text_WelcomeToTeamGalacticAreYouHereToDonateYourPokemon
+    NPCMessage TeamGalacticEternaBuilding1F_Text_WelcomeToTeamGalactic
     End
 
 TeamGalacticEternaBuilding1F_GruntM2:
-    NPCMessage TeamGalacticEternaBuilding1F_Text_AsAGroupTeamGalacticHasItsSightsSetOnTheStarsNotOnThisWorld
+    NPCMessage TeamGalacticEternaBuilding1F_Text_SightsSetOnTheStars
     End
 
 TeamGalacticEternaBuilding1F_BgSign:
-    EventMessage TeamGalacticEternaBuilding1F_Text_ThePathYouChoseLeadsToGlory
+    EventMessage TeamGalacticEternaBuilding1F_Text_PathLeadsToGlory
     End
 
 TeamGalacticEternaBuilding1F_Looker:
-    NPCMessage TeamGalacticEternaBuilding1F_Text_NowIHaveBeenConductingMyInvestigationIntoTeamGalactic
+    NPCMessage TeamGalacticEternaBuilding1F_Text_InvestigationIntoTeamGalactic
     End
 
 TeamGalacticEternaBuilding1F_OnFrame_Looker:
@@ -50,7 +50,7 @@ TeamGalacticEternaBuilding1F_OnFrame_Looker:
     SetFlag FLAG_UNK_0x0071
     SetVar VAR_TEAM_GALACTIC_ETERNA_BUILDING_1F_STATE, 1
     WaitTime 30, VAR_RESULT
-    Message TeamGalacticEternaBuilding1F_Text_IncidentallyYouAreAFirstRateTrainer
+    Message TeamGalacticEternaBuilding1F_Text_FirstRateTrainer
     ApplyMovement LOCALID_LOOKER, TeamGalacticEternaBuilding1F_Movement_LookerSpin
     WaitMovement
     ClearFlag FLAG_HIDE_TEAM_GALACTIC_ETERNA_BUILDING_1F_GRUNT_M_LOOKER
@@ -109,7 +109,7 @@ TeamGalacticEternaBuilding1F_WallBlockingRotomsRoom:
     WaitSE SEQ_SE_DP_W062
     FadeScreenIn FADE_SCREEN_SPEED_FAST, COLOR_WHITE
     WaitFadeScreen
-    Message TeamGalacticEternaBuilding1F_Text_ItsTheEntranceToASecretRoom
+    Message TeamGalacticEternaBuilding1F_Text_EntranceToASecretRoom
     WaitButton
     CloseMessage
     ReleaseAll

res/field/scripts/scripts_team_galactic_eterna_building_2f.s

@@ -8,15 +8,15 @@
     ScriptEntryEnd
 
 TeamGalacticEternaBuilding2F_GruntM:
-    NPCMessage TeamGalacticEternaBuilding2F_Text_TeamGalacticIsWorkingHardToFindNewEnergySourcesForTheFuture
+    NPCMessage TeamGalacticEternaBuilding2F_Text_WorkingToFindEnergySources
     End
 
 TeamGalacticEternaBuilding2F_GruntF:
-    NPCMessage TeamGalacticEternaBuilding2F_Text_WeAreConductingResearchOnNewFormsOfEnergy
+    NPCMessage TeamGalacticEternaBuilding2F_Text_ResearchOnFormsOfEnergy
     End
 
 TeamGalacticEternaBuilding2F_BgSign:
-    EventMessage TeamGalacticEternaBuilding2F_Text_LetUsMakeProgressTogether
+    EventMessage TeamGalacticEternaBuilding2F_Text_MakeProgressTogether
     End
 
     .balign 4, 0

res/field/scripts/scripts_team_galactic_eterna_building_3f.s

@@ -7,11 +7,11 @@
     ScriptEntryEnd
 
 TeamGalacticEternaBuilding3F_GruntM:
-    NPCMessage TeamGalacticEternaBuilding3F_Text_OrdinaryPeopleLikeYouCantUnderstandTeamGalacticGrandDesigns
+    NPCMessage TeamGalacticEternaBuilding3F_Text_OrdinaryPeopleCantUnderstand
     End
 
 TeamGalacticEternaBuilding3F_BgSign:
-    EventMessage TeamGalacticEternaBuilding3F_Text_QuestionNotAndFollowThisPathTheRoadToSuccess
+    EventMessage TeamGalacticEternaBuilding3F_Text_FollowThisPath
     End
 
     .balign 4, 0

res/field/scripts/scripts_team_galactic_eterna_building_4f.s

@@ -25,7 +25,7 @@ TeamGalacticEternaBuilding4F_Jupiter:
     FacePlayer
     ApplyMovement LOCALID_POKEFAN_M, TeamGalacticEternaBuilding4F_Movement_PokefanMWalkOnSpotNorth
     WaitMovement
-    Message TeamGalacticEternaBuilding4F_Text_IJupiterWillDealWithYou
+    Message TeamGalacticEternaBuilding4F_Text_IWillDealWithYou
     CloseMessage
     StartTrainerBattle TRAINER_COMMANDER_JUPITER_TEAM_GALACTIC_ETERNA_BUILDING
     CheckWonBattle VAR_RESULT
@@ -64,7 +64,7 @@ TeamGalacticEternaBuilding4F_PokefanMWalkToPlayerEast:
     End
 
 TeamGalacticEternaBuilding4F_HandleTeamGalacticLeftEternaBuilding:
-    Message TeamGalacticEternaBuilding4F_Text_ICantThankYouEnoughRightNowButCruiseByMyCycleShopOK
+    Message TeamGalacticEternaBuilding4F_Text_ThankYouCruiseByCycleShop
     CloseMessage
     FadeScreenOut
     WaitFadeScreen
@@ -135,26 +135,26 @@ TeamGalacticEternaBuilding4F_Movement_Unused3:
     EndMovement
 
 TeamGalacticEternaBuilding4F_Clefairy:
-    PokemonCryAndMessage SPECIES_CLEFAIRY, TeamGalacticEternaBuilding4F_Text_ClefairyPi
+    PokemonCryAndMessage SPECIES_CLEFAIRY, TeamGalacticEternaBuilding4F_Text_ClefairyCry
     End
 
 TeamGalacticEternaBuilding4F_Buneary:
-    PokemonCryAndMessage SPECIES_BUNEARY, TeamGalacticEternaBuilding4F_Text_BunearyMyun
+    PokemonCryAndMessage SPECIES_BUNEARY, TeamGalacticEternaBuilding4F_Text_BunearyCry
     End
 
 TeamGalacticEternaBuilding4F_PokefanM:
     PlaySE SEQ_SE_CONFIRM
     LockAll
     FacePlayer
-    GoToIfSet FLAG_TEAM_GALACTIC_LEFT_ETERNA_BUILDING, TeamGalacticEternaBuilding4F_ICantThankYouEnoughRightNowButCruiseByMyCycleShopOK
-    Message TeamGalacticEternaBuilding4F_Text_WhatIsItWithThisTeamGalactic
+    GoToIfSet FLAG_TEAM_GALACTIC_LEFT_ETERNA_BUILDING, TeamGalacticEternaBuilding4F_ThankYouCruiseByCycleShop
+    Message TeamGalacticEternaBuilding4F_Text_WhatsWithTeamGalactic
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-TeamGalacticEternaBuilding4F_ICantThankYouEnoughRightNowButCruiseByMyCycleShopOK:
-    Message TeamGalacticEternaBuilding4F_Text_ICantThankYouEnoughRightNowButCruiseByMyCycleShopOK
+TeamGalacticEternaBuilding4F_ThankYouCruiseByCycleShop:
+    Message TeamGalacticEternaBuilding4F_Text_ThankYouCruiseByCycleShop
     WaitButton
     CloseMessage
     ReleaseAll

res/field/scripts/scripts_twinleaf_town.s

@@ -477,7 +477,7 @@ TwinleafTown_BreederF:
     LockAll
     FacePlayer
     GoToIfSet FLAG_HAS_POKEDEX, TwinleafTown_HelpingPutTogetherPokedex
-    GoToIfGe VAR_VISITED_LAKE_VERITY_WITH_RIVAL, 1, TwinleafTown_PokemonYouLookGoodTogether
+    GoToIfGe VAR_VISITED_LAKE_VERITY_WITH_RIVAL, 1, TwinleafTown_YouLookGoodTogether
     Message TwinleafTown_Text_WildPokemonAttack
     WaitButton
     CloseMessage
@@ -491,8 +491,8 @@ TwinleafTown_HelpingPutTogetherPokedex:
     ReleaseAll
     End
 
-TwinleafTown_PokemonYouLookGoodTogether:
-    Message TwinleafTown_Text_PokemonYouLookGoodTogether
+TwinleafTown_YouLookGoodTogether:
+    Message TwinleafTown_Text_YouLookGoodTogether
     WaitButton
     CloseMessage
     ReleaseAll
@@ -504,12 +504,12 @@ TwinleafTown_MapSignpost:
 
 TwinleafTown_MailboxPlayer:
     BufferPlayerName 0
-    ShowLandmarkSign TwinleafTown_Text_PlayerMailbox
+    ShowLandmarkSign TwinleafTown_Text_PlayersHouse
     End
 
 TwinleafTown_MailboxRival:
     BufferRivalName 0
-    ShowLandmarkSign TwinleafTown_Text_RivalMailbox
+    ShowLandmarkSign TwinleafTown_Text_RivalsHouse
     End
 
     .balign 4, 0

res/field/scripts/scripts_twinleaf_town_northeast_house.s

@@ -9,19 +9,19 @@ TwinleafTownNortheastHouse_Guitarist:
     PlaySE SEQ_SE_CONFIRM
     LockAll
     FacePlayer
-    GoToIfGe VAR_VISITED_LAKE_VERITY_WITH_RIVAL, 1, TwinleafTownNortheastHouse_IWentOnAnAdventureALongTimeAgo
-    GoTo TwinleafTownNortheastHouse_YoureOffToHangWithRivalAgainRight
+    GoToIfGe VAR_VISITED_LAKE_VERITY_WITH_RIVAL, 1, TwinleafTownNortheastHouse_AdventureLongTimeAgo
+    GoTo TwinleafTownNortheastHouse_YoureOffToHangWithRival
 
-TwinleafTownNortheastHouse_YoureOffToHangWithRivalAgainRight:
+TwinleafTownNortheastHouse_YoureOffToHangWithRival:
     BufferRivalName 0
-    Message TwinleafTownNortheastHouse_Text_YoureOffToHangWithRivalAgainRight
+    Message TwinleafTownNortheastHouse_Text_YoureOffToHangWithRival
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-TwinleafTownNortheastHouse_IWentOnAnAdventureALongTimeAgo:
-    Message TwinleafTownNortheastHouse_Text_IWentOnAnAdventureALongTimeAgo
+TwinleafTownNortheastHouse_AdventureLongTimeAgo:
+    Message TwinleafTownNortheastHouse_Text_AdventureLongTimeAgo
     WaitButton
     CloseMessage
     ReleaseAll

res/field/scripts/scripts_twinleaf_town_player_house_1f.s

@@ -7,10 +7,10 @@
     ScriptEntry TwinleafTownPlayerHouse1F_OnFrame_RivalAlreadyLeft
     ScriptEntry TwinleafTownPlayerHouse1F_OnFrame_CutsceneAfterRivalBattle
     ScriptEntry TwinleafTownPlayerHouse1F_Mom
-    ScriptEntry TwinleafTownPlayerHouse1F_CoordEvent_DontGoIntoTheTallGrass
+    ScriptEntry TwinleafTownPlayerHouse1F_CoordEvent_DontGoIntoTallGrass
     ScriptEntry TwinleafTownPlayerHouse1F_RivalsMom
     ScriptEntry TwinleafTownPlayerHouse1F_TV
-    ScriptEntry TwinleafTownPlayerHouse1F_Fridge
+    ScriptEntry TwinleafTownPlayerHouse1F_Refrigerator
     ScriptEntry TwinleafTownPlayerHouse1F_KitchenSink
     ScriptEntry TwinleafTownPlayerHouse1F_KitchenCounter
     ScriptEntry TwinleafTownPlayerHouse1F_OnFrame_Postgame
@@ -125,7 +125,7 @@ TwinleafTownPlayerHouse1F_OnFrame_CutsceneAfterRivalBattle:
     WaitTime 30, VAR_RESULT
     BufferRivalName 0
     BufferPlayerName 1
-    Message TwinleafTownPlayerHouse1F_Text_WowThatsWhatHappenedToYou
+    Message TwinleafTownPlayerHouse1F_Text_WowThatHappenedToYou
     CloseMessage
     WaitTime 30, VAR_RESULT
     BufferPlayerName 0
@@ -174,9 +174,9 @@ TwinleafTownPlayerHouse1F_Mom:
     GoToIfSet FLAG_HAS_POKEDEX, TwinleafTownPlayerHouse1F_MomGiveJournal
     GoToIfGe VAR_PLAYER_HOUSE_STATE, 5, TwinleafTownPlayerHouse1F_CallTakeAQuickRest
     GoToIfGe VAR_PLAYER_HOUSE_STATE, 4, TwinleafTownPlayerHouse1F_IllReadTheInstructions
-    GoToIfSet FLAG_UNK_0x00F8, TwinleafTownPlayerHouse1F_IsntRivalWaitingForYou
+    GoToIfSet FLAG_MOM_WARNED_PLAYER, TwinleafTownPlayerHouse1F_IsntRivalWaiting
     GoToIfGe VAR_PLAYER_HOUSE_STATE, 2, TwinleafTownPlayerHouse1F_YouTakeCareNow
-    GoToIfSet FLAG_TALKED_TO_MOM, TwinleafTownPlayerHouse1F_YouKnowHowImpatientRivalIs
+    GoToIfSet FLAG_TALKED_TO_MOM, TwinleafTownPlayerHouse1F_KnowHowImpatientRivalIs
     SetFlag FLAG_TALKED_TO_MOM
     BufferPlayerName 0
     BufferRivalName 1
@@ -202,41 +202,41 @@ TwinleafTownPlayerHouse1F_DoMomMessage:
 
 TwinleafTownPlayerHouse1F_DoMomRandomMessage:
     GetRandom VAR_RESULT, 4
-    GoToIfEq VAR_RESULT, 0, TwinleafTownPlayerHouse1F_YouAndYourPokemonAreLookingGood
-    GoToIfEq VAR_RESULT, 1, TwinleafTownPlayerHouse1F_AlwaysTreatYourPokemonWithKindness
-    GoToIfEq VAR_RESULT, 2, TwinleafTownPlayerHouse1F_SeeingYouRemindsMeOfYourFather
-    GoToIfEq VAR_RESULT, 3, TwinleafTownPlayerHouse1F_WhileYoureGoneIVisitRivalsMom
+    GoToIfEq VAR_RESULT, 0, TwinleafTownPlayerHouse1F_PokemonAreLookingGood
+    GoToIfEq VAR_RESULT, 1, TwinleafTownPlayerHouse1F_TreatPokemonWithKindness
+    GoToIfEq VAR_RESULT, 2, TwinleafTownPlayerHouse1F_RemindsMeOfYourFather
+    GoToIfEq VAR_RESULT, 3, TwinleafTownPlayerHouse1F_IVisitRivalsMom
     End
 
 TwinleafTownPlayerHouse1F_IsEverythingAllRight:
     GoToIfGe VAR_EXITED_DISTORTION_WORLD_STATE, 2, TwinleafTownPlayerHouse1F_DoMomRandomMessage
     BufferPlayerName 0
-    Message TwinleafTownPlayerHouse1F_Text_AskIsEverythingAllRight
+    Message TwinleafTownPlayerHouse1F_Text_IsEverythingAllRight
     GoTo TwinleafTownPlayerHouse1F_CloseMessage
     End
 
-TwinleafTownPlayerHouse1F_YouAndYourPokemonAreLookingGood:
+TwinleafTownPlayerHouse1F_PokemonAreLookingGood:
     BufferPlayerName 0
-    Message TwinleafTownPlayerHouse1F_Text_YouAndYourPokemonAreLookingGood
+    Message TwinleafTownPlayerHouse1F_Text_PokemonAreLookingGood
     GoTo TwinleafTownPlayerHouse1F_CloseMessage
     End
 
-TwinleafTownPlayerHouse1F_AlwaysTreatYourPokemonWithKindness:
+TwinleafTownPlayerHouse1F_TreatPokemonWithKindness:
     BufferPlayerName 0
-    Message TwinleafTownPlayerHouse1F_Text_AlwaysTreatYourPokemonWithKindness
+    Message TwinleafTownPlayerHouse1F_Text_TreatPokemonWithKindness
     GoTo TwinleafTownPlayerHouse1F_CloseMessage
     End
 
-TwinleafTownPlayerHouse1F_SeeingYouRemindsMeOfYourFather:
+TwinleafTownPlayerHouse1F_RemindsMeOfYourFather:
     BufferPlayerName 0
-    Message TwinleafTownPlayerHouse1F_Text_SeeingYouRemindsMeOfYourFather
+    Message TwinleafTownPlayerHouse1F_Text_RemindsMeOfYourFather
     GoTo TwinleafTownPlayerHouse1F_CloseMessage
     End
 
-TwinleafTownPlayerHouse1F_WhileYoureGoneIVisitRivalsMom:
+TwinleafTownPlayerHouse1F_IVisitRivalsMom:
     BufferPlayerName 0
     BufferRivalName 1
-    Message TwinleafTownPlayerHouse1F_Text_WhileYoureGoneIVisitRivalsMom
+    Message TwinleafTownPlayerHouse1F_Text_IVisitRivalsMom
     GoTo TwinleafTownPlayerHouse1F_CloseMessage
     End
 
@@ -357,45 +357,45 @@ TwinleafTownPlayerHouse1F_PlayerAndRivalsMomFaceEachOtherNorth:
     ApplyMovement LOCALID_RIVAL_MOM, TwinleafTownPlayerHouse1F_Movement_RivalsMomTurnEastToPlayer
     ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerTurnWestToRivalsMom
     WaitMovement
-    GoTo TwinleafTownPlayerHouse1F_PleaseTakeThisToRivalForMe
+    GoTo TwinleafTownPlayerHouse1F_TakeThisToRival
     End
 
 TwinleafTownPlayerHouse1F_PlayerAndRivalsMomFaceEachOtherSouth:
     ApplyMovement LOCALID_RIVAL_MOM, TwinleafTownPlayerHouse1F_Movement_RivalsMomWalkNorthToPlayer
     ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerTurnWestToRivalsMomWithDelay
     WaitMovement
-    GoTo TwinleafTownPlayerHouse1F_PleaseTakeThisToRivalForMe
+    GoTo TwinleafTownPlayerHouse1F_TakeThisToRival
     End
 
 TwinleafTownPlayerHouse1F_PlayerAndRivalsMomFaceEachOtherWest:
     ApplyMovement LOCALID_RIVAL_MOM, TwinleafTownPlayerHouse1F_Movement_RivalsMomWalkEastToPlayer
     ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerTurnSouthToRivalsMomWithDelay
     WaitMovement
-    GoTo TwinleafTownPlayerHouse1F_PleaseTakeThisToRivalForMe
+    GoTo TwinleafTownPlayerHouse1F_TakeThisToRival
     End
 
 TwinleafTownPlayerHouse1F_PlayerAndRivalsMomFaceEachOtherEast:
     ApplyMovement LOCALID_RIVAL_MOM, TwinleafTownPlayerHouse1F_Movement_RivalsMomTurnNorthToPlayer
     ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerTurnSouthToRivalsMom
     WaitMovement
-    GoTo TwinleafTownPlayerHouse1F_PleaseTakeThisToRivalForMe
+    GoTo TwinleafTownPlayerHouse1F_TakeThisToRival
     End
 
-TwinleafTownPlayerHouse1F_PleaseTakeThisToRivalForMe:
+TwinleafTownPlayerHouse1F_TakeThisToRival:
     BufferPlayerName 0
     BufferRivalName 1
     GetPlayerGender VAR_RESULT
-    GoToIfEq VAR_RESULT, GENDER_MALE, TwinleafTownPlayerHouse1F_PleaseTakeThisToRivalForMeMale
-    GoTo TwinleafTownPlayerHouse1F_PleaseTakeThisToRivalForMeFemale
+    GoToIfEq VAR_RESULT, GENDER_MALE, TwinleafTownPlayerHouse1F_TakeThisToRivalMale
+    GoTo TwinleafTownPlayerHouse1F_TakeThisToRivalFemale
     End
 
-TwinleafTownPlayerHouse1F_PleaseTakeThisToRivalForMeMale:
-    Message TwinleafTownPlayerHouse1F_Text_PleaseTakeThisToRivalForMeMale
+TwinleafTownPlayerHouse1F_TakeThisToRivalMale:
+    Message TwinleafTownPlayerHouse1F_Text_TakeThisToRivalMale
     GoTo TwinleafTownPlayerHouse1F_ReceiveParcel
     End
 
-TwinleafTownPlayerHouse1F_PleaseTakeThisToRivalForMeFemale:
-    Message TwinleafTownPlayerHouse1F_Text_PleaseTakeThisToRivalForMeFemale
+TwinleafTownPlayerHouse1F_TakeThisToRivalFemale:
+    Message TwinleafTownPlayerHouse1F_Text_TakeThisToRivalFemale
     GoTo TwinleafTownPlayerHouse1F_ReceiveParcel
     End
 
@@ -406,7 +406,7 @@ TwinleafTownPlayerHouse1F_ReceiveParcel:
     SetFlag FLAG_RECEIVED_PARCEL
     Message TwinleafTownPlayerHouse1F_Text_EnjoyYourAdventure
     BufferRivalName 1
-    Message TwinleafTownPlayerHouse1F_Text_HedProbablyHeadStraightToJubilife
+    Message TwinleafTownPlayerHouse1F_Text_ProbablyStraightToJubilife
     CloseMessage
     GoToIfEq VAR_0x8007, DIR_NORTH, TwinleafTownPlayerHouse1F_RivalsMomLeaveNorth
     GoToIfEq VAR_0x8007, DIR_SOUTH, TwinleafTownPlayerHouse1F_RivalsMomLeaveSouth
@@ -470,23 +470,23 @@ TwinleafTownPlayerHouse1F_TakeAQuickRest:
     Return
 
 TwinleafTownPlayerHouse1F_MorningTakeAQuickRest:
-    Message TwinleafTownPlayerHouse1F_Text_EarlyMorningTakeAQuickRest
+    Message TwinleafTownPlayerHouse1F_Text_MorningTakeAQuickRest
     Return
 
 TwinleafTownPlayerHouse1F_DayTakeAQuickRest:
-    Message TwinleafTownPlayerHouse1F_Text_TakeAQuickRest
+    Message TwinleafTownPlayerHouse1F_Text_DayTakeAQuickRest
     Return
 
 TwinleafTownPlayerHouse1F_TwilightTakeAQuickRest:
-    Message TwinleafTownPlayerHouse1F_Text_TakeAQuickRest
+    Message TwinleafTownPlayerHouse1F_Text_DayTakeAQuickRest
     Return
 
 TwinleafTownPlayerHouse1F_NightTakeAQuickRest:
-    Message TwinleafTownPlayerHouse1F_Text_JustMadeDinnerTakeAQuickRest
+    Message TwinleafTownPlayerHouse1F_Text_NightTakeAQuickRest
     Return
 
 TwinleafTownPlayerHouse1F_LateNightTakeAQuickRest:
-    Message TwinleafTownPlayerHouse1F_Text_SoLateRightNowTakeAQuickRest
+    Message TwinleafTownPlayerHouse1F_Text_LateNightTakeAQuickRest
     Return
 
 TwinleafTownPlayerHouse1F_IllReadTheInstructions:
@@ -499,7 +499,7 @@ TwinleafTownPlayerHouse1F_IllReadTheInstructions:
 TwinleafTownPlayerHouse1F_Unused2:
     BufferRivalName 0
     BufferPlayerName 1
-    Message TwinleafTownPlayerHouse1F_Text_WowThatsWhatHappenedToYou
+    Message TwinleafTownPlayerHouse1F_Text_WowThatHappenedToYou
     CloseMessage
     WaitTime 30, VAR_RESULT
     BufferPlayerName 0
@@ -517,16 +517,16 @@ TwinleafTownPlayerHouse1F_Unused2:
     ReleaseAll
     End
 
-TwinleafTownPlayerHouse1F_IsntRivalWaitingForYou:
+TwinleafTownPlayerHouse1F_IsntRivalWaiting:
     BufferRivalName 0
-    Message TwinleafTownPlayerHouse1F_Text_IsntRivalWaitingForYou
+    Message TwinleafTownPlayerHouse1F_Text_IsntRivalWaiting
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
 TwinleafTownPlayerHouse1F_YouTakeCareNow:
-    SetFlag FLAG_UNK_0x00F8
+    SetFlag FLAG_MOM_WARNED_PLAYER
     BufferPlayerName 0
     Message TwinleafTownPlayerHouse1F_Text_YouTakeCareNow
     WaitButton
@@ -534,9 +534,9 @@ TwinleafTownPlayerHouse1F_YouTakeCareNow:
     ReleaseAll
     End
 
-TwinleafTownPlayerHouse1F_YouKnowHowImpatientRivalIs:
+TwinleafTownPlayerHouse1F_KnowHowImpatientRivalIs:
     BufferRivalName 0
-    Message TwinleafTownPlayerHouse1F_Text_YouKnowHowImpatientRivalIs
+    Message TwinleafTownPlayerHouse1F_Text_KnowHowImpatientRivalIs
     WaitButton
     CloseMessage
     ReleaseAll
@@ -733,7 +733,7 @@ TwinleafTownPlayerHouse1F_Movement_PlayerWatchRivalsMomLeaveEast:
     WalkOnSpotNormalSouth
     EndMovement
 
-TwinleafTownPlayerHouse1F_CoordEvent_DontGoIntoTheTallGrass:
+TwinleafTownPlayerHouse1F_CoordEvent_DontGoIntoTallGrass:
     LockAll
     GoTo TwinleafTownPlayerHouse1F_PlayerAndMomFaceEachOther
     End
@@ -742,13 +742,13 @@ TwinleafTownPlayerHouse1F_PlayerAndMomFaceEachOther:
     ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerAtDoorFaceMom
     ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomFacePlayerAtDoor
     WaitMovement
-    GoTo TwinleafTownPlayerHouse1F_DontGoIntoTheTallGrass
+    GoTo TwinleafTownPlayerHouse1F_DontGoIntoTallGrass
     End
 
-TwinleafTownPlayerHouse1F_DontGoIntoTheTallGrass:
+TwinleafTownPlayerHouse1F_DontGoIntoTallGrass:
     SetVar VAR_PLAYER_HOUSE_STATE, 2
     BufferPlayerName 0
-    Message TwinleafTownPlayerHouse1F_Text_DontGoIntoTheTallGrass
+    Message TwinleafTownPlayerHouse1F_Text_DontGoIntoTallGrass
     WaitButton
     CloseMessage
     ReleaseAll
@@ -778,7 +778,7 @@ TwinleafTownPlayerHouse1F_Movement_Unused4:
 
 TwinleafTownPlayerHouse1F_RivalsMom:
     BufferRivalName 1
-    NPCMessage TwinleafTownPlayerHouse1F_Text_HedProbablyHeadStraightToJubilife
+    NPCMessage TwinleafTownPlayerHouse1F_Text_ProbablyStraightToJubilife
     End
 
 TwinleafTownPlayerHouse1F_TV:
@@ -802,8 +802,8 @@ TwinleafTownPlayerHouse1F_ToughContestDigest:
     EventMessage TwinleafTownPlayerHouse1F_Text_ToughContestDigest
     End
 
-TwinleafTownPlayerHouse1F_Fridge:
-    EventMessage TwinleafTownPlayerHouse1F_Text_MomsFavoriteDessertIsInRefrigerator
+TwinleafTownPlayerHouse1F_Refrigerator:
+    EventMessage TwinleafTownPlayerHouse1F_Text_MomsFavoriteDessert
     End
 
 TwinleafTownPlayerHouse1F_KitchenSink:
@@ -811,7 +811,7 @@ TwinleafTownPlayerHouse1F_KitchenSink:
     End
 
 TwinleafTownPlayerHouse1F_KitchenCounter:
-    EventMessage TwinleafTownPlayerHouse1F_Text_ThisIsWhereMomDoesHerDeliciousCooking
+    EventMessage TwinleafTownPlayerHouse1F_Text_WhereMomDoesDeliciousCooking
     End
 
     .balign 4, 0

res/field/scripts/scripts_twinleaf_town_player_house_2f.s

@@ -26,7 +26,7 @@ TwinleafTownPlayerHouse2F_SetVolumeForTV:
 TwinleafTownPlayerHouse2F_OnFrame_ConcludeSpecialProgram:
     LockAll
     SetVar VAR_PLAYER_HOUSE_SPECIAL_PROGRAM_STATE, 1
-    Message TwinleafTownPlayerHouse2F_Text_ThatConcludesOurSpecialProgram
+    Message TwinleafTownPlayerHouse2F_Text_ConcludesSpecialProgram
     PlayFanfare SEQ_TV_END
     Message TwinleafTownPlayerHouse2F_Text_SeeYouNextWeek
     WaitFanfare
@@ -50,11 +50,11 @@ TwinleafTownPlayerHouse2F_PC:
     End
 
 TwinleafTownPlayerHouse2F_ScrollingSignpost:
-    ShowScrollingSign TwinleafTownPlayerHouse2F_Text_TheXButtonOpensTheMenu
+    ShowScrollingSign TwinleafTownPlayerHouse2F_Text_XButtonOpensMenu
     End
 
 TwinleafTownPlayerHouse2F_TV:
-    EventMessage TwinleafTownPlayerHouse2F_Text_MomBoughThisTVAsAGift
+    EventMessage TwinleafTownPlayerHouse2F_Text_MomBoughtTVAsGift
     End
 
 TwinleafTownPlayerHouse2F_CoordEvent_RivalNorth:
@@ -92,7 +92,7 @@ TwinleafTownPlayerHouse2F_Rival:
     CallIfEq VAR_MAP_LOCAL_0, 2, TwinleafTownPlayerHouse2F_RivalApproachPlayerEast
     CallIfEq VAR_MAP_LOCAL_0, 3, TwinleafTownPlayerHouse2F_RivalApproachPlayerSouth
     BufferPlayerName 1
-    Message TwinleafTownPlayerHouse2F_Text_ProfRowanWouldGiveUsPokemon
+    Message TwinleafTownPlayerHouse2F_Text_ProfRowanWouldGivePokemon
     CloseMessage
     ApplyMovement LOCALID_RIVAL, TwinleafTownPlayerHouse2F_Movement_RivalExclamationMark
     WaitMovement
@@ -114,7 +114,7 @@ TwinleafTownPlayerHouse2F_Rival:
     CallIfEq VAR_MAP_LOCAL_0, 2, TwinleafTownPlayerHouse2F_RivalWalkBackToPlayerEast
     CallIfEq VAR_MAP_LOCAL_0, 3, TwinleafTownPlayerHouse2F_RivalWalkBackToPlayerSouth
     BufferPlayerName 1
-    Message TwinleafTownPlayerHouse2F_Text_WereGoingToSeeProfRowanAndGetPokemon
+    Message TwinleafTownPlayerHouse2F_Text_SeeProfRowanAndGetPokemon
     CloseMessage
     CallIfEq VAR_MAP_LOCAL_0, 0, TwinleafTownPlayerHouse2F_RivalLeaveNorth
     CallIfEq VAR_MAP_LOCAL_0, 1, TwinleafTownPlayerHouse2F_RivalLeaveWest

res/field/scripts/scripts_twinleaf_town_rival_house_1f.s

@@ -9,25 +9,25 @@ TwinleafTownRivalHouse1F_RivalsMom:
     PlaySE SEQ_SE_CONFIRM
     LockAll
     FacePlayer
-    GoToIfSet FLAG_HAS_POKEDEX, TwinleafTownRivalHouse1F_RivalTookOffLikeARocketAsUsual
-    GoToIfGe VAR_VISITED_LAKE_VERITY_WITH_RIVAL, 1, TwinleafTownRivalHouse1F_YouveBecomeFriendsWithAPokemonToo
-    GoToIfSet FLAG_UNK_0x006E, TwinleafTownRivalHouse1F_HeShouldBeOutOnRoute201ByNow
-    GoToIfSet FLAG_RIVAL_LEFT_HOME, TwinleafTownRivalHouse1F_ThatKidRocketedOffAgainLikeUsual
+    GoToIfSet FLAG_HAS_POKEDEX, TwinleafTownRivalHouse1F_TookOffLikeUsual
+    GoToIfGe VAR_VISITED_LAKE_VERITY_WITH_RIVAL, 1, TwinleafTownRivalHouse1F_FriendsWithPokemonToo
+    GoToIfSet FLAG_TALKED_TO_RIVAL_HOUSE_RIVAL_MOM_RIVAL_LEFT, TwinleafTownRivalHouse1F_HeShouldBeOnRoute201
+    GoToIfSet FLAG_RIVAL_LEFT_HOME, TwinleafTownRivalHouse1F_RocketedOffLikeUsual
     GetPlayerGender VAR_RESULT
-    GoToIfEq VAR_RESULT, GENDER_MALE, TwinleafTownRivalHouse1F_AreYouLookingForRival
-    GoToIfEq VAR_RESULT, GENDER_FEMALE, TwinleafTownRivalHouse1F_DidYouComeCallingOnRival
+    GoToIfEq VAR_RESULT, GENDER_MALE, TwinleafTownRivalHouse1F_LookingForRival
+    GoToIfEq VAR_RESULT, GENDER_FEMALE, TwinleafTownRivalHouse1F_ComeCallingOnRival
     End
 
-TwinleafTownRivalHouse1F_AreYouLookingForRival:
+TwinleafTownRivalHouse1F_LookingForRival:
     BufferPlayerName 0
     BufferRivalName 1
-    Message TwinleafTownRivalHouse1F_Text_AreYouLookingForRival
+    Message TwinleafTownRivalHouse1F_Text_LookingForRival
     GoTo TwinleafTownRivalHouse1F_Release
 
-TwinleafTownRivalHouse1F_DidYouComeCallingOnRival:
+TwinleafTownRivalHouse1F_ComeCallingOnRival:
     BufferPlayerName 0
     BufferRivalName 1
-    Message TwinleafTownRivalHouse1F_Text_DidYouComeCallingOnRival
+    Message TwinleafTownRivalHouse1F_Text_ComeCallingOnRival
     GoTo TwinleafTownRivalHouse1F_Release
 
 TwinleafTownRivalHouse1F_Release:
@@ -36,34 +36,34 @@ TwinleafTownRivalHouse1F_Release:
     ReleaseAll
     End
 
-TwinleafTownRivalHouse1F_YouveBecomeFriendsWithAPokemonToo:
+TwinleafTownRivalHouse1F_FriendsWithPokemonToo:
     BufferRivalName 1
-    Message TwinleafTownRivalHouse1F_Text_YouveBecomeFriendsWithAPokemonToo
+    Message TwinleafTownRivalHouse1F_Text_FriendsWithPokemonToo
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-TwinleafTownRivalHouse1F_HeShouldBeOutOnRoute201ByNow:
+TwinleafTownRivalHouse1F_HeShouldBeOnRoute201:
     BufferRivalName 1
-    Message TwinleafTownRivalHouse1F_Text_HeShouldBeOutOnRoute201ByNow
+    Message TwinleafTownRivalHouse1F_Text_HeShouldBeOnRoute201
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-TwinleafTownRivalHouse1F_ThatKidRocketedOffAgainLikeUsual:
-    SetFlag FLAG_UNK_0x006E
+TwinleafTownRivalHouse1F_RocketedOffLikeUsual:
+    SetFlag FLAG_TALKED_TO_RIVAL_HOUSE_RIVAL_MOM_RIVAL_LEFT
     BufferRivalName 1
-    Message TwinleafTownRivalHouse1F_Text_ThatKidRocketedOffAgainLikeUsual
+    Message TwinleafTownRivalHouse1F_Text_RocketedOffLikeUsual
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-TwinleafTownRivalHouse1F_RivalTookOffLikeARocketAsUsual:
+TwinleafTownRivalHouse1F_TookOffLikeUsual:
     BufferRivalName 1
-    Message TwinleafTownRivalHouse1F_Text_RivalTookOffLikeARocketAsUsual
+    Message TwinleafTownRivalHouse1F_Text_TookOffLikeUsual
     WaitButton
     CloseMessage
     ReleaseAll

res/field/scripts/scripts_twinleaf_town_rival_house_2f.s

@@ -3,21 +3,21 @@
 #include "res/field/events/events_twinleaf_town_rival_house_2f.h"
 
 
-    ScriptEntry TwinleafTownRivalHouse2F_RivalNoticesPlayerAndLeaves
+    ScriptEntry TwinleafTownRivalHouse2F_OnFrame_Rival
     ScriptEntry TwinleafTownRivalHouse2F_Wii
     ScriptEntry TwinleafTownRivalHouse2F_PC
     ScriptEntryEnd
 
-TwinleafTownRivalHouse2F_RivalNoticesPlayerAndLeaves:
+TwinleafTownRivalHouse2F_OnFrame_Rival:
     LockAll
     BufferRivalName 0
-    Message TwinleafTownRivalHouse2F_Text_IdBetterTakeBagAndJournal
+    Message TwinleafTownRivalHouse2F_Text_TakeBagAndJournal
     CloseMessage
     ApplyMovement LOCALID_RIVAL, TwinleafTownRivalHouse2F_Movement_RivalNoticePlayer
     WaitMovement
     Common_SetRivalBGM
     BufferPlayerName 0
-    Message TwinleafTownRivalHouse2F_Text_IllBeWaitingOnTheRoad
+    Message TwinleafTownRivalHouse2F_Text_WaitingOnTheRoad
     CloseMessage
     ApplyMovement LOCALID_RIVAL, TwinleafTownRivalHouse2F_Movement_RivalLeave
     ApplyMovement LOCALID_PLAYER, TwinleafTownRivalHouse2F_Movement_PlayerMoveAwayFromStairs

res/field/scripts/scripts_twinleaf_town_southwest_house.s

@@ -10,15 +10,15 @@ TwinleafTownSouthwestHouse_ExpertF:
     PlaySE SEQ_SE_CONFIRM
     LockAll
     FacePlayer
-    GoToIfSet FLAG_HAS_POKEDEX, TwinleafTownSouthwestHouse_ProfRowanGaveYouAPokedexDidHe
-    Message TwinleafTownSouthwestHouse_Text_ThePokemonProfessorReturned
+    GoToIfSet FLAG_HAS_POKEDEX, TwinleafTownSouthwestHouse_ProfRowanGavePokedex
+    Message TwinleafTownSouthwestHouse_Text_PokemonProfessorReturned
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-TwinleafTownSouthwestHouse_ProfRowanGaveYouAPokedexDidHe:
-    Message TwinleafTownSouthwestHouse_Text_ProfRowanGaveYouAPokedexDidHe
+TwinleafTownSouthwestHouse_ProfRowanGavePokedex:
+    Message TwinleafTownSouthwestHouse_Text_ProfRowanGavePokedex
     WaitButton
     CloseMessage
     ReleaseAll
@@ -29,15 +29,15 @@ TwinleafTownSouthwestHouse_Twin:
     LockAll
     FacePlayer
     BufferPlayerName 0
-    GoToIfSet FLAG_HAS_POKEDEX, TwinleafTownSouthwestHouse_DoYouThinkICanBeFriendsWithPokemon
+    GoToIfSet FLAG_HAS_POKEDEX, TwinleafTownSouthwestHouse_CanIBeFriendsWithPokemon
     Message TwinleafTownSouthwestHouse_Text_IWantACutePokemon
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-TwinleafTownSouthwestHouse_DoYouThinkICanBeFriendsWithPokemon:
-    Message TwinleafTownSouthwestHouse_Text_DoYouThinkICanBeFriendsWithPokemon
+TwinleafTownSouthwestHouse_CanIBeFriendsWithPokemon:
+    Message TwinleafTownSouthwestHouse_Text_CanIBeFriendsWithPokemon
     WaitButton
     CloseMessage
     ReleaseAll

res/field/scripts/scripts_underground.s

@@ -4,15 +4,15 @@
 #include "res/field/events/events_underground.h"
 
 
-    ScriptEntry Underground_SetVendorPositions
-    ScriptEntry Underground_SetRoarkPositionIfFirstEntry
+    ScriptEntry Underground_OnTransition
+    ScriptEntry Underground_OnResume
     ScriptEntry Underground_TrapsVendor_Unused
     ScriptEntry Underground_GoodsVendor_Unused
     ScriptEntry Underground_TreasuresVendor_Unused // see UndergroundVendors_StartShopMenuTask for the actual code that handles these
-    ScriptEntry Underground_RoarkIntro
+    ScriptEntry Underground_OnFrame_RoarkIntro
     ScriptEntryEnd
 
-Underground_SetVendorPositions:
+Underground_OnTransition:
     Dummy14F
     SetObjectEventPos LOCALID_GOODS_VENDOR_1, 72, 104
     SetObjectEventPos LOCALID_GOODS_VENDOR_2, 424, 87
@@ -36,7 +36,7 @@ Underground_SetVendorPositions:
     SetObjectEventPos LOCALID_TREASURES_VENDOR_4, 40, 72
     End
 
-Underground_SetRoarkPositionIfFirstEntry:
+Underground_OnResume:
     GoToIfEq VAR_HAS_SEEN_UNDERGROUND_ROARK_INTRO, 0, Underground_PutRoarkNextToPlayer
     End
 
@@ -170,7 +170,7 @@ Underground_TreasuresVendorNeedAnythingElse_Unused:
     GoTo Underground_TreasuresVendorShopMenu_Unused
     End
 
-Underground_RoarkIntro:
+Underground_OnFrame_RoarkIntro:
     ApplyMovement LOCALID_ROARK, Underground_Movement_RoarkNoticePlayer
     WaitMovement
     SetCommPlayerDir DIR_EAST

res/field/scripts/scripts_unk_0397.s

@@ -21,7 +21,7 @@ _002E:
     ClearFlag FLAG_HIDE_ROUTE_201_PROF_ROWAN
     ClearFlag FLAG_HIDE_ROUTE_201_COUNTERPART
     SetVar VAR_VISITED_LAKE_VERITY_WITH_RIVAL, 1
-    SetVar VAR_UNK_0x4082, 2
+    SetVar VAR_VERITY_LAKEFRONT_STATE, 2
     ClearFlag FLAG_UNK_0x0195
     SetVar VAR_FOLLOWER_RIVAL_STATE, 2
     SetVar VAR_PLAYER_HOUSE_STATE, 3

res/field/scripts/scripts_valley_windworks_building.s

@@ -15,10 +15,10 @@
 
 ValleyWindworksBuilding_OnTransition:
     SetFlag FLAG_FIRST_ARRIVAL_VALLEY_WINDWORKS
-    GoToIfGe VAR_VALLEY_WINDWORKS_STATE, 2, ValleyWindworksBuilding_SetLittleGirlAndScientistPapaPositions
+    GoToIfGe VAR_VALLEY_WINDWORKS_STATE, 2, ValleyWindworksBuilding_SetGirlAndPapaPositions
     End
 
-ValleyWindworksBuilding_SetLittleGirlAndScientistPapaPositions:
+ValleyWindworksBuilding_SetGirlAndPapaPositions:
     SetObjectEventPos LOCALID_LITTLE_GIRL, 21, 5
     SetObjectEventDir LOCALID_LITTLE_GIRL, DIR_WEST
     SetObjectEventMovementType LOCALID_LITTLE_GIRL, MOVEMENT_TYPE_LOOK_WEST
@@ -31,7 +31,7 @@ ValleyWindworksBuilding_OnFrame_FirstEntry:
     LockAll
     ApplyMovement LOCALID_GALACTIC_GRUNT_1, ValleyWindworksBuilding_Movement_GalacticGrunt1NoticePlayer
     WaitMovement
-    Message ValleyWindworksBuilding_Text_YouHaveTheKeyIveGotToAlertTheCommander
+    Message ValleyWindworksBuilding_Text_GotToAlertCommander
     CloseMessage
     ApplyMovement LOCALID_GALACTIC_GRUNT_1, ValleyWindworksBuilding_Movement_GalacticGrunt1Leave
     ApplyMovement LOCALID_PLAYER, ValleyWindworksBuilding_Movement_PlayerWatchGalacticGrunt1Leave
@@ -58,7 +58,7 @@ ValleyWindworksBuilding_Movement_PlayerWatchGalacticGrunt1Leave:
     EndMovement
 
 ValleyWindworksBuilding_GruntM:
-    NPCMessage ValleyWindworksBuilding_Text_HumphJustYouWaitOurCommanderWillSmooshYou
+    NPCMessage ValleyWindworksBuilding_Text_CommanderWillSmooshYou
     End
 
 ValleyWindworksBuilding_CoordEvent_Mars:
@@ -81,23 +81,23 @@ ValleyWindworksBuilding_MarsNoticePlayer:
     End
 
 ValleyWindworksBuilding_Mars:
-    Message ValleyWindworksBuilding_Text_MyNameIsMarsLetsHaveABattleToDecideWhatWeShouldDoNext
+    Message ValleyWindworksBuilding_Text_LetsHaveABattle
     CloseMessage
     StartTrainerBattle TRAINER_COMMANDER_MARS_VALLEY_WINDWORKS
     CheckWonBattle VAR_RESULT
     GoToIfEq VAR_RESULT, FALSE, ValleyWindworksBuilding_BlackOut
-    Message ValleyWindworksBuilding_Text_OopsIMessedThatOneUp
+    Message ValleyWindworksBuilding_Text_IMessedThatOneUp
     CloseMessage
     ApplyMovement LOCALID_CHARON, ValleyWindworksBuilding_Movement_CharonWalkOnSpotSouth
     WaitMovement
     WaitTime 15, VAR_RESULT
-    Message ValleyWindworksBuilding_Text_LoseToAChildWillYouNowMarsWeShouldBeGoing
+    Message ValleyWindworksBuilding_Text_LoseToAChild
     ApplyMovement LOCALID_MARS, ValleyWindworksBuilding_Movement_MarsWalkOnSpotNorth
     WaitMovement
     Message ValleyWindworksBuilding_Text_WillYouShutIt
     ApplyMovement LOCALID_MARS, ValleyWindworksBuilding_Movement_MarsWalkOnSpotWest
     WaitMovement
-    Message ValleyWindworksBuilding_Text_IGuessItsTimeToSayGoodbyeAndLeaveForTheTimeBeing
+    Message ValleyWindworksBuilding_Text_LeaveForTheTimeBeing
     CloseMessage
     FadeScreenOut
     WaitFadeScreen
@@ -120,17 +120,17 @@ ValleyWindworksBuilding_Mars:
 ValleyWindworksBuilding_ScientistPapaWalkToPlayerZ6:
     ApplyMovement LOCALID_SCIENTIST_PAPA, ValleyWindworksBuilding_Movement_ScientistPapaWalkToPlayerZ6
     WaitMovement
-    GoTo ValleyWindworksBuilding_ICanFinallySeeMyLittleDaughterAgain
+    GoTo ValleyWindworksBuilding_FinallySeeMyDaughterAgain
     End
 
 ValleyWindworksBuilding_ScientistPapaWalkToPlayerZ7:
     ApplyMovement LOCALID_SCIENTIST_PAPA, ValleyWindworksBuilding_Movement_ScientistPapaWalkToPlayerZ7
     WaitMovement
-    GoTo ValleyWindworksBuilding_ICanFinallySeeMyLittleDaughterAgain
+    GoTo ValleyWindworksBuilding_FinallySeeMyDaughterAgain
     End
 
-ValleyWindworksBuilding_ICanFinallySeeMyLittleDaughterAgain:
-    Message ValleyWindworksBuilding_Text_ICanFinallySeeMyLittleDaughterAgain
+ValleyWindworksBuilding_FinallySeeMyDaughterAgain:
+    Message ValleyWindworksBuilding_Text_FinallySeeMyDaughterAgain
     CloseMessage
     SetFlag FLAG_HIDE_ROUTE_205_SOUTH_LITTLE_GIRL
     ClearFlag FLAG_HIDE_VALLEY_WINDWORKS_BUILDING_LITTLE_GIRL
@@ -146,18 +146,18 @@ ValleyWindworksBuilding_LittleGirlWalkToScientistPapaZ6:
     ApplyMovement LOCALID_LITTLE_GIRL, ValleyWindworksBuilding_Movement_LittleGirlWalkToScientistPapaZ6
     ApplyMovement LOCALID_SCIENTIST_PAPA, ValleyWindworksBuilding_Movement_ScientistPapaWalkOnSpotSouth
     WaitMovement
-    GoTo ValleyWindworksBuilding_YuckPapaYoureStinkyGoShowerNowStinky
+    GoTo ValleyWindworksBuilding_YuckPapaYoureStinky
     End
 
 ValleyWindworksBuilding_LittleGirlWalkToScientistPapaZ7:
     ApplyMovement LOCALID_LITTLE_GIRL, ValleyWindworksBuilding_Movement_LittleGirlWalkToScientistPapaZ7
     ApplyMovement LOCALID_SCIENTIST_PAPA, ValleyWindworksBuilding_Movement_ScientistPapaWalkOnSpotNorth
     WaitMovement
-    GoTo ValleyWindworksBuilding_YuckPapaYoureStinkyGoShowerNowStinky
+    GoTo ValleyWindworksBuilding_YuckPapaYoureStinky
     End
 
-ValleyWindworksBuilding_YuckPapaYoureStinkyGoShowerNowStinky:
-    Message ValleyWindworksBuilding_Text_YuckPapaYoureStinkyGoShowerNowStinky
+ValleyWindworksBuilding_YuckPapaYoureStinky:
+    Message ValleyWindworksBuilding_Text_YuckPapaYoureStinky
     CloseMessage
     GetPlayerMapPos VAR_0x8004, VAR_0x8005
     GoToIfEq VAR_0x8005, 6, ValleyWindworksBuilding_ScientistPapaTurnInSpotFaceSouth
@@ -167,18 +167,18 @@ ValleyWindworksBuilding_YuckPapaYoureStinkyGoShowerNowStinky:
 ValleyWindworksBuilding_ScientistPapaTurnInSpotFaceSouth:
     ApplyMovement LOCALID_SCIENTIST_PAPA, ValleyWindworksBuilding_Movement_ScientistPapaTurnInSpotFaceSouth
     WaitMovement
-    GoTo ValleyWindworksBuilding_IThinkTheBalloonPokemonWillComeVisitingAgain
+    GoTo ValleyWindworksBuilding_BalloonPokemonWillVisitAgain
     End
 
 ValleyWindworksBuilding_ScientistPapaTurnInSpotFaceNorth:
     ApplyMovement LOCALID_SCIENTIST_PAPA, ValleyWindworksBuilding_Movement_ScientistPapaTurnInSpotFaceNorth
     WaitMovement
-    GoTo ValleyWindworksBuilding_IThinkTheBalloonPokemonWillComeVisitingAgain
+    GoTo ValleyWindworksBuilding_BalloonPokemonWillVisitAgain
     End
 
-ValleyWindworksBuilding_IThinkTheBalloonPokemonWillComeVisitingAgain:
-    Message ValleyWindworksBuilding_Text_OhSorryAhahaTheyHadMeWorkingNonstop
-    Message ValleyWindworksBuilding_Text_IThinkTheBalloonPokemonWillComeVisitingAgain
+ValleyWindworksBuilding_BalloonPokemonWillVisitAgain:
+    Message ValleyWindworksBuilding_Text_SorryWorkingNonstop
+    Message ValleyWindworksBuilding_Text_BalloonPokemonWillVisitAgain
     WaitButton
     CloseMessage
     SetVar VAR_VALLEY_WINDWORKS_LOOKER_STATE, 1
@@ -283,15 +283,15 @@ ValleyWindworksBuilding_ScientistPapa:
     PlaySE SEQ_SE_CONFIRM
     LockAll
     FacePlayer
-    GoToIfGe VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 3, ValleyWindworksBuilding_TheValleyWindworksUsesTurbinesToCaptureEnergy
-    Message ValleyWindworksBuilding_Text_ABalloonPokemonAppearsInFrontOfTheWindworksItsAlwaysACertainDayOfTheWeek
+    GoToIfGe VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 3, ValleyWindworksBuilding_ValleyWindworksUsesTurbines
+    Message ValleyWindworksBuilding_Text_BalloonPokemonOnDayOfWeek
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-ValleyWindworksBuilding_TheValleyWindworksUsesTurbinesToCaptureEnergy:
-    Message ValleyWindworksBuilding_Text_TheValleyWindworksUsesTurbinesToCaptureEnergy
+ValleyWindworksBuilding_ValleyWindworksUsesTurbines:
+    Message ValleyWindworksBuilding_Text_ValleyWindworksUsesTurbines
     WaitButton
     CloseMessage
     ReleaseAll
@@ -301,15 +301,15 @@ ValleyWindworksBuilding_Twin:
     PlaySE SEQ_SE_CONFIRM
     LockAll
     FacePlayer
-    GoToIfGe VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 3, ValleyWindworksBuilding_IfTheBalloonPokemonCameTheWindWouldBlowItAway
-    Message ValleyWindworksBuilding_Text_IThinkTheBalloonPokemonWillComeVisitingAgain
+    GoToIfGe VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 3, ValleyWindworksBuilding_BlowBalloonPokemonAway
+    Message ValleyWindworksBuilding_Text_BalloonPokemonWillVisitAgain
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-ValleyWindworksBuilding_IfTheBalloonPokemonCameTheWindWouldBlowItAway:
-    Message ValleyWindworksBuilding_Text_IfTheBalloonPokemonCameTheWindWouldBlowItAway
+ValleyWindworksBuilding_BlowBalloonPokemonAway:
+    Message ValleyWindworksBuilding_Text_BlowBalloonPokemonAway
     WaitButton
     CloseMessage
     ReleaseAll
@@ -326,13 +326,13 @@ ValleyWindworksBuilding_PCEast:
 ValleyWindworksBuilding_PC:
     PlaySE SEQ_SE_CONFIRM
     LockAll
-    GoToIfGe VAR_EXITED_DISTORTION_WORLD_STATE, 2, ValleyWindworksBuilding_ThePCScreenIsFilledWithNumbersUponNumbers
+    GoToIfGe VAR_EXITED_DISTORTION_WORLD_STATE, 2, ValleyWindworksBuilding_PCScreenFilledWithNumbers
     Message ValleyWindworksBuilding_Text_BringersAndTargetsTeamGalactic
     GoTo ValleyWindworksBuilding_PCEnd
     End
 
-ValleyWindworksBuilding_ThePCScreenIsFilledWithNumbersUponNumbers:
-    Message ValleyWindworksBuilding_Text_ThePCScreenIsFilledWithNumbersUponNumbers
+ValleyWindworksBuilding_PCScreenFilledWithNumbers:
+    Message ValleyWindworksBuilding_Text_PCScreenFilledWithNumbers
     GoTo ValleyWindworksBuilding_PCEnd
     End
 

res/field/scripts/scripts_valley_windworks_outside.s

@@ -23,7 +23,7 @@ ValleyWindworksOutside_OnTransition:
     GoToIfLt VAR_VALLEY_WINDWORKS_STATE, 2, ValleyWindworksOutside_HideDrifloon
     GoToIfSet FLAG_WON_AGAINST_VALLEY_WINDWORKS_OUTSIDE_DRIFLOON, ValleyWindworksOutside_HideDrifloon
     GetDayOfWeek VAR_MAP_LOCAL_0
-    GoToIfNe VAR_MAP_LOCAL_0, 5, ValleyWindworksOutside_HideDrifloon
+    GoToIfNe VAR_MAP_LOCAL_0, DAY_OF_WEEK_FRIDAY, ValleyWindworksOutside_HideDrifloon
     GoTo ValleyWindworksOutside_ShowDrifloon
 
 ValleyWindworksOutside_ShowDrifloon:
@@ -62,12 +62,12 @@ ValleyWindworksOutside_GruntM:
     PlaySE SEQ_SE_CONFIRM
     LockAll
     FacePlayer
-    Message ValleyWindworksOutside_Text_DontYouDareGoIntoTheValleyWindworksYoullHaveToBattleMeForIt
+    Message ValleyWindworksOutside_Text_BattleMeForIt
     CloseMessage
     StartTrainerBattle TRAINER_GALACTIC_GRUNT_VALLEY_WINDWORKS_1
     CheckWonBattle VAR_RESULT
     GoToIfEq VAR_RESULT, FALSE, ValleyWindworksOutside_BlackOutGrunt
-    Message ValleyWindworksOutside_Text_IsntThatJustGreatGettingOwnedBySomeKid
+    Message ValleyWindworksOutside_Text_GettingOwnedBySomeKid
     CloseMessage
     ApplyMovement LOCALID_GRUNT_M, ValleyWindworksOutside_Movement_GruntMWalkOnSpotNorth
     WaitMovement
@@ -113,13 +113,13 @@ ValleyWindworksOutside_Door:
 
 ValleyWindworksOutside_AskOpenDoor:
     BufferItemName 0, ITEM_WORKS_KEY
-    Message ValleyWindworksOutside_Text_ItsLockedFromInsideUseTheWorksKey
+    Message ValleyWindworksOutside_Text_UseTheWorksKey
     ShowYesNoMenu VAR_RESULT
     GoToIfEq VAR_RESULT, MENU_NO, ValleyWindworksOutside_AskOpenDoorEnd
     SetFlag FLAG_UNLOCKED_VALLEY_WINDWORKS_DOOR
     Call ValleyWindworksOutside_RemoveBgEventDoor
     SetWarpEventPos 0, 243, 654
-    Message ValleyWindworksOutside_Text_KerchunkTheDoorToValleyWindworksOpened
+    Message ValleyWindworksOutside_Text_KerchunkTheDoorOpened
     WaitButton
     CloseMessage
     ReleaseAll
@@ -131,7 +131,7 @@ ValleyWindworksOutside_AskOpenDoorEnd:
     End
 
 ValleyWindworksOutside_SignboardValleyWindworks:
-    ShowLandmarkSign ValleyWindworksOutside_Text_ValleyWindworksEcologicalWindDrivenEnergy
+    ShowLandmarkSign ValleyWindworksOutside_Text_SignValleyWindworks
     End
 
 ValleyWindworksOutside_Drifloon:
@@ -139,7 +139,7 @@ ValleyWindworksOutside_Drifloon:
     LockAll
     FacePlayer
     PlayCry SPECIES_DRIFLOON
-    Message ValleyWindworksOutside_Text_Floooooon
+    Message ValleyWindworksOutside_Text_DrifloonCry
     CloseMessage
     WaitCry
     SetFlag FLAG_MAP_LOCAL
@@ -185,7 +185,7 @@ ValleyWindworksOutside_OnFrame_Looker:
     UnloadAnimation ANIMATION_TAG_DOOR_1
     ApplyMovement LOCALID_LOOKER, ValleyWindworksOutside_Movement_LookerWalkOnSpotSouth
     WaitMovement
-    Message ValleyWindworksOutside_Text_IHaveReceivedTipsThatTheTeamGalacticHideoutIsInEternaCity
+    Message ValleyWindworksOutside_Text_HideoutIsInEternaCity
     CloseMessage
     ApplyMovement LOCALID_PLAYER, ValleyWindworksOutside_Movement_PlayerWatchLookerLeave
     ApplyMovement LOCALID_LOOKER, ValleyWindworksOutside_Movement_LookerLeave

res/field/scripts/scripts_veilstone_city.s

@@ -993,30 +993,30 @@ VeilstoneCity_BattleGirl2:
 
 VeilstoneCity_CoordEvent_GruntBlockWarehouse:
     LockAll
-    ApplyMovement LOCALID_GRUNT_M_WAREHOUSE_NORTH, VeilstoneCity_Grunt_FaceSouth
-    ApplyMovement LOCALID_PLAYER, VeilstoneCity_Player_FaceNorth
+    ApplyMovement LOCALID_GRUNT_M_WAREHOUSE_NORTH, VeilstoneCity_Movement_GruntFaceSouth
+    ApplyMovement LOCALID_PLAYER, VeilstoneCity_Movement_PlayerFaceNorth
     WaitMovement
     Message VeilstoneCity_Text_ThisIsGalacticsWarehouse
     CloseMessage
-    ApplyMovement LOCALID_GRUNT_M_WAREHOUSE_NORTH, VeilstoneCity_Grunt_PushPlayerBack
-    ApplyMovement LOCALID_PLAYER, VeilstoneCity_Player_GetPushed
+    ApplyMovement LOCALID_GRUNT_M_WAREHOUSE_NORTH, VeilstoneCity_Movement_GruntPushPlayerBack
+    ApplyMovement LOCALID_PLAYER, VeilstoneCity_Movement_PlayerGetPushed
     WaitMovement
     ReleaseAll
     End
 
     .balign 4, 0
-VeilstoneCity_Player_FaceNorth:
+VeilstoneCity_Movement_PlayerFaceNorth:
     WalkOnSpotNormalNorth
     EndMovement
 
     .balign 4, 0
-VeilstoneCity_Grunt_FaceSouth:
+VeilstoneCity_Movement_GruntFaceSouth:
     WalkOnSpotNormalSouth
     EmoteExclamationMark
     EndMovement
 
     .balign 4, 0
-VeilstoneCity_Grunt_PushPlayerBack:
+VeilstoneCity_Movement_GruntPushPlayerBack:
     WalkFastSouth
     WalkOnSpotNormalWest
     Delay8 2
@@ -1025,7 +1025,7 @@ VeilstoneCity_Grunt_PushPlayerBack:
     EndMovement
 
     .balign 4, 0
-VeilstoneCity_Player_GetPushed:
+VeilstoneCity_Movement_PlayerGetPushed:
     WalkNormalWest
     EndMovement
 

res/field/scripts/scripts_veilstone_store_1f.s

@@ -63,7 +63,7 @@ VeilstoneStore1F_Socialite:
 
 VeilstoneStore1F_Socialite_AfterMaskGiven:
     BufferAccessoryName 0, VAR_VEILSTONE_STORE_MASK
-    Message VeilstoneStore1F_Text_GiveADifferentLookForContests
+    Message VeilstoneStore1F_Text_DifferentLookForContests
     WaitButton
     CloseMessage
     ReleaseAll

res/field/scripts/scripts_veilstone_store_elevator.s

@@ -4,10 +4,10 @@
 #include "res/field/events/events_veilstone_store_elevator.h"
 
 
-    ScriptEntry VeilstoneStoreElevator_TalkElevatorOperator
+    ScriptEntry VeilstoneStoreElevator_Receptionist
     ScriptEntryEnd
 
-VeilstoneStoreElevator_TalkElevatorOperator:
+VeilstoneStoreElevator_Receptionist:
     PlaySE SEQ_SE_CONFIRM
     LockAll
     FacePlayer

res/field/scripts/scripts_verity_lakefront.s

@@ -37,17 +37,17 @@ VerityLakefront_CoordEvent_WereAtTheLake:
     Message VerityLakefront_Text_WereAtTheLake
     CloseMessage
     GetPlayerMapPos VAR_0x8004, VAR_0x8005
-    GoToIfInRange VAR_0x8004, 80, 85, VerityLakefront_WalkToLakeValor
+    GoToIfInRange VAR_0x8004, 80, 85, VerityLakefront_WalkToLakeVerity
     End
 
-VerityLakefront_WalkToLakeValor:
-    ApplyMovement LOCALID_PLAYER, VerityLakefront_Movement_PlayerEnterLakeValor
-    ApplyMovement LOCALID_FOLLOWER, VerityLakefront_Movement_RivalEnterLakeValor
+VerityLakefront_WalkToLakeVerity:
+    ApplyMovement LOCALID_PLAYER, VerityLakefront_Movement_PlayerEnterLakeVerity
+    ApplyMovement LOCALID_FOLLOWER, VerityLakefront_Movement_RivalEnterLakeVerity
     WaitMovement
-    GoTo VerityLakefront_WarpToLakeValor
+    GoTo VerityLakefront_WarpToLakeVerity
 
-VerityLakefront_WarpToLakeValor:
-    SetVar VAR_UNK_0x4082, 1
+VerityLakefront_WarpToLakeVerity:
+    SetVar VAR_VERITY_LAKEFRONT_STATE, 1
     ReleaseAll
     PlaySE SEQ_SE_DP_KAIDAN2
     FadeScreenOut
@@ -63,13 +63,13 @@ VerityLakefront_Movement_RivalWalkOnSpotNorth:
     EndMovement
 
     .balign 4, 0
-VerityLakefront_Movement_RivalEnterLakeValor:
+VerityLakefront_Movement_RivalEnterLakeVerity:
     WalkNormalNorth 2
     SetInvisible
     EndMovement
 
     .balign 4, 0
-VerityLakefront_Movement_PlayerEnterLakeValor:
+VerityLakefront_Movement_PlayerEnterLakeVerity:
     WalkNormalNorth
     SetInvisible
     EndMovement

res/field/scripts/scripts_visible_items.s

@@ -2343,54 +2343,54 @@ VisibleItems_CheckPlateOrItemPocket:
 VisibleItems_BufferPocketNameItems:
     GetItemPocket VAR_0x8004, VAR_RESULT
     BufferPocketName 2, VAR_RESULT
-    GoTo VisibleItems_MessagePlayerPutTheItemInTheItemPocket
+    GoTo VisibleItems_MessagePlayerPutItemInItemPocket
     End
 
 VisibleItems_BufferPocketNameKeyItems:
     GetItemPocket VAR_0x8004, VAR_RESULT
     BufferPocketName 2, VAR_RESULT
-    GoTo VisibleItems_MessagePlayerPutTheItemInTheItemPocket
+    GoTo VisibleItems_MessagePlayerPutItemInItemPocket
     End
 
 VisibleItems_BufferPocketNameTMHMs:
     GetItemPocket VAR_0x8004, VAR_RESULT
     BufferPocketName 2, VAR_RESULT
-    GoTo VisibleItems_MessagePlayerPutTheItemInTheItemPocket
+    GoTo VisibleItems_MessagePlayerPutItemInItemPocket
     End
 
 VisibleItems_BufferPocketNameMail:
     GetItemPocket VAR_0x8004, VAR_RESULT
     BufferPocketName 2, VAR_RESULT
-    GoTo VisibleItems_MessagePlayerPutTheItemInTheItemPocket
+    GoTo VisibleItems_MessagePlayerPutItemInItemPocket
     End
 
 VisibleItems_BufferPocketNameMedicine:
     GetItemPocket VAR_0x8004, VAR_RESULT
     BufferPocketName 2, VAR_RESULT
-    GoTo VisibleItems_MessagePlayerPutTheItemInTheItemPocket
+    GoTo VisibleItems_MessagePlayerPutItemInItemPocket
     End
 
 VisibleItems_BufferPocketNameBerries:
     GetItemPocket VAR_0x8004, VAR_RESULT
     BufferPocketName 2, VAR_RESULT
-    GoTo VisibleItems_MessagePlayerPutTheItemInTheItemPocket
+    GoTo VisibleItems_MessagePlayerPutItemInItemPocket
     End
 
 VisibleItems_BufferPocketNameBalls:
     GetItemPocket VAR_0x8004, VAR_RESULT
     BufferPocketName 2, VAR_RESULT
-    GoTo VisibleItems_MessagePlayerPutTheItemInTheItemPocket
+    GoTo VisibleItems_MessagePlayerPutItemInItemPocket
     End
 
 VisibleItems_BufferPocketNameBattleItems:
     GetItemPocket VAR_0x8004, VAR_RESULT
     BufferPocketName 2, VAR_RESULT
-    GoTo VisibleItems_MessagePlayerPutTheItemInTheItemPocket
+    GoTo VisibleItems_MessagePlayerPutItemInItemPocket
     End
 
-VisibleItems_MessagePlayerPutTheItemInTheItemPocket:
+VisibleItems_MessagePlayerPutItemInItemPocket:
     CreateJournalEvent LOCATION_EVENT_ITEM_WAS_OBTAINED, VAR_0x8004
-    Message VisibleItems_Text_PlayerPutTheItemInTheItemPocket2
+    Message VisibleItems_Text_PlayerPutItemInItemPocket2
     WaitButton
     SetVar VAR_RESULT, TRUE
     GoTo VisibleItems_End
@@ -2413,7 +2413,7 @@ VisibleItems_MessagePlayerFoundItem:
 
 VisibleItems_BagIsFull:
     BufferItemName 0, VAR_0x8004
-    Message VisibleItems_Text_ObtainedTheItemTooBadTheBagIsFull
+    Message VisibleItems_Text_ObtainedItemBagIsFull
     WaitButton
     SetVar VAR_RESULT, FALSE
     GoTo VisibleItems_End

res/field/scripts/scripts_vista_lighthouse_elevator.s

@@ -1,12 +1,12 @@
 #include "macros/scrcmd.inc"
 
 
-    ScriptEntry VistaLighthouseElevator_Init
+    ScriptEntry VistaLighthouseElevator_OnFrame_Init
     ScriptEntryEnd
 
-VistaLighthouseElevator_Init:
+VistaLighthouseElevator_OnFrame_Init:
     LockAll
-    ApplyMovement LOCALID_PLAYER, VistaLighthouseElevator_WalkIn
+    ApplyMovement LOCALID_PLAYER, VistaLighthouseElevator_Movement_PlayerWalkIn
     WaitMovement
     GetFloorsAbove VAR_ELEVATOR_FLOORS_ABOVE
     SetVar VAR_0x8008, VAR_ELEVATOR_FLOORS_ABOVE
@@ -29,7 +29,7 @@ VistaLighthouseElevator_ElevatorDown:
     Call VistaLighthouseElevator_ElevatorAnimation
     FadeScreenOut
     WaitFadeScreen
-    Warp MAP_HEADER_SUNYSHORE_CITY, 0x376, 0x317, DIR_SOUTH
+    Warp MAP_HEADER_SUNYSHORE_CITY, 886, 791, DIR_SOUTH
     FadeScreenIn
     WaitFadeScreen
     End
@@ -37,19 +37,19 @@ VistaLighthouseElevator_ElevatorDown:
 VistaLighthouseElevator_ElevatorAnimation:
     WaitSE SEQ_SE_CONFIRM
     PlayElevatorAnimation VAR_0x8004, 4
-    ApplyMovement LOCALID_PLAYER, VistaLighthouseElevator_WalkOut
+    ApplyMovement LOCALID_PLAYER, VistaLighthouseElevator_Movement_PlayerWalkOut
     WaitMovement
     PlaySE SEQ_SE_DP_KAIDAN2
     Return
 
     .balign 4, 0
-VistaLighthouseElevator_WalkIn:
+VistaLighthouseElevator_Movement_PlayerWalkIn:
     WalkNormalNorth 2
     WalkOnSpotNormalSouth
     EndMovement
 
     .balign 4, 0
-VistaLighthouseElevator_WalkOut:
+VistaLighthouseElevator_Movement_PlayerWalkOut:
     WalkNormalSouth 2
     WalkOnSpotNormalSouth
     EndMovement

res/field/scripts/scripts_wayward_cave_1f.s

@@ -25,15 +25,15 @@ WaywardCave1F_Mira:
     SetPlayerBike FALSE
     GoToIfGe VAR_WAYWARD_CAVE_1F_FOLLOWER_MIRA_STATE, 1, WaywardCave1F_MiraMessage
     BufferPlayerName 0
-    CallIfUnset FLAG_TALKED_TO_WAYWARD_CAVE_1F_MIRA, WaywardCave1F_ImMiraPleaseTakeMeToTheExit
-    CallIfSet FLAG_TALKED_TO_WAYWARD_CAVE_1F_MIRA, WaywardCave1F_MyNameIsMiraILikeYourName
+    CallIfUnset FLAG_TALKED_TO_WAYWARD_CAVE_1F_MIRA, WaywardCave1F_PleaseTakeMeToTheExit
+    CallIfSet FLAG_TALKED_TO_WAYWARD_CAVE_1F_MIRA, WaywardCave1F_ILikeYourName
     BufferPlayerName 0
     PlayFanfare SEQ_GONIN
     Message WaywardCave1F_Text_PlayerDecidedToGoWithMira
     WaitFanfare
     SetFlag FLAG_TALKED_TO_WAYWARD_CAVE_1F_MIRA
     SetVar VAR_WAYWARD_CAVE_1F_FOLLOWER_MIRA_STATE, 1
-    Message WaywardCave1F_Text_IllKeepYourPokemonHealthyAllTheTime
+    Message WaywardCave1F_Text_IllKeepYourPokemonHealthy
     WaitButton
     CloseMessage
     SetVar VAR_PARTNER_TRAINER_ID, TRAINER_MIRA_WAYWARD_CAVE
@@ -42,28 +42,28 @@ WaywardCave1F_Mira:
     ReleaseAll
     End
 
-WaywardCave1F_ImMiraPleaseTakeMeToTheExit:
-    Message WaywardCave1F_Text_ImMiraPleaseTakeMeToTheExit
+WaywardCave1F_PleaseTakeMeToTheExit:
+    Message WaywardCave1F_Text_PleaseTakeMeToTheExit
     Return
 
-WaywardCave1F_MyNameIsMiraILikeYourName:
-    Message WaywardCave1F_Text_MyNameIsMiraILikeYourName
+WaywardCave1F_ILikeYourName:
+    Message WaywardCave1F_Text_ILikeYourName
     Return
 
 WaywardCave1F_MiraMessage:
-    GoToIfGe VAR_FOLLOWER_MIRA_TIMES_TALKED, 2, WaywardCave1F_PlayerDidYouGetToBeSoGoodBecauseYoureAlwaysWithPokemon
-    GoToIfEq VAR_FOLLOWER_MIRA_TIMES_TALKED, 1, WaywardCave1F_ThisCaveItsSoEasyToGetConfused
+    GoToIfGe VAR_FOLLOWER_MIRA_TIMES_TALKED, 2, WaywardCave1F_MiraWillTryLikeYou
+    GoToIfEq VAR_FOLLOWER_MIRA_TIMES_TALKED, 1, WaywardCave1F_EasyToGetConfused
     BufferPlayerName 0
-    Message WaywardCave1F_Text_ILikeHelpfulPokemonMovesLikeGrowlAndMinimize
+    Message WaywardCave1F_Text_ILikeHelpfulMoves
     GoTo WaywardCave1F_IncreaseFollowerMiraTimesTalked
 
-WaywardCave1F_ThisCaveItsSoEasyToGetConfused:
-    Message WaywardCave1F_Text_ThisCaveItsSoEasyToGetConfused
+WaywardCave1F_EasyToGetConfused:
+    Message WaywardCave1F_Text_EasyToGetConfused
     GoTo WaywardCave1F_IncreaseFollowerMiraTimesTalked
 
-WaywardCave1F_PlayerDidYouGetToBeSoGoodBecauseYoureAlwaysWithPokemon:
+WaywardCave1F_MiraWillTryLikeYou:
     BufferPlayerName 0
-    Message WaywardCave1F_Text_PlayerDidYouGetToBeSoGoodBecauseYoureAlwaysWithPokemon
+    Message WaywardCave1F_Text_MiraWillTryLikeYou
     WaitButton
     CloseMessage
     ReleaseAll
@@ -101,7 +101,7 @@ WaywardCave1F_NoticeExitSouth:
 
 WaywardCave1F_OhTheresTheExitThankYou:
     BufferPlayerName 0
-    Message WaywardCave1F_Text_OhTheresTheExitThankYou
+    Message WaywardCave1F_Text_TheresTheExit
     CloseMessage
     GetPlayerDir VAR_RESULT
     GoToIfEq VAR_RESULT, DIR_EAST, WaywardCave1F_MiraWalkWestLeave

res/text/sandgem_town.json

@@ -10,7 +10,7 @@
       ]
     },
     {
-      "id": "SandgemTown_Text_DawnThisIsItOurPokemonResearchLab",
+      "id": "SandgemTown_Text_DawnThisIsItOurLab",
       "en_US": [
         "This is it!\n",
         "Our Pokémon Research Lab!\r",
@@ -26,7 +26,7 @@
       ]
     },
     {
-      "id": "SandgemTown_Text_LucasSeeThisIsIsOurPokemonResearchLab",
+      "id": "SandgemTown_Text_LucasThisIsItOurLab",
       "en_US": [
         "See? This is our Pokémon Research\n",
         "Lab.\r",
@@ -73,14 +73,14 @@
       "en_US": "{SIZE 200}{STRVAR_1 3, 0, 0}!{SIZE 100}\r"
     },
     {
-      "id": "SandgemTown_Text_YouShouldTakeThisAsWell",
+      "id": "SandgemTown_Text_TakeThisAsWell",
       "en_US": [
         "Rowan: I have something good here.\n",
         "You should take this as well.\r"
       ]
     },
     {
-      "id": "SandgemTown_Text_ThatContainsTheMoveReturn",
+      "id": "SandgemTown_Text_ContainsTheMoveReturn",
       "en_US": [
         "Rowan: That is a Technical Machine.\n",
         "That one contains the move Return.\r",
@@ -98,7 +98,7 @@
       ]
     },
     {
-      "id": "SandgemTown_Text_DawnIDidntKnowTheProfessorHadTMs",
+      "id": "SandgemTown_Text_DawnIDidntKnowProfessorHadTMs",
       "en_US": [
         "Dawn: Oh, wow.\n",
         "I didn’t know the professor had TMs.\r",
@@ -107,7 +107,7 @@
       ]
     },
     {
-      "id": "SandgemTown_Text_LucasWellIllBeTheProfessorHadTMs",
+      "id": "SandgemTown_Text_LucasWellIllBeProfessorHadTMs",
       "en_US": [
         "Lucas: Well, I’ll be...\n",
         "The professor had TMs...?\r",
@@ -151,7 +151,7 @@
       ]
     },
     {
-      "id": "SandgemTown_Text_DawnLetYourFamilyKnowYoureHelpingProfRowan",
+      "id": "SandgemTown_Text_DawnLetYourFamilyKnow",
       "en_US": [
         "Oh, that’s right!\n",
         "{STRVAR_1 3, 0, 0}...\r",
@@ -167,7 +167,7 @@
       ]
     },
     {
-      "id": "SandgemTown_Text_LucasIWantToShowYouAFewThings",
+      "id": "SandgemTown_Text_LucasShowYouAFewThings",
       "en_US": [
         "Hey, {STRVAR_1 3, 1, 0}!\n",
         "I want to show you a few things.\f",
@@ -199,7 +199,7 @@
       ]
     },
     {
-      "id": "SandgemTown_Text_LucasLetYourFamilyKnowYoureHelpingProfRowan",
+      "id": "SandgemTown_Text_LucasLetYourFamilyKnow",
       "en_US": [
         "Oh, yeah, right!\n",
         "{STRVAR_1 3, 0, 0}...\r",
@@ -226,7 +226,7 @@
       ]
     },
     {
-      "id": "SandgemTown_Text_TheThingYouHaveItsAPokedexIsntIt",
+      "id": "SandgemTown_Text_ItsAPokedexIsntIt",
       "en_US": [
         "That thing you have!\r",
         "It’s a Pokédex, isn’t it?!\r",
@@ -244,7 +244,7 @@
       ]
     },
     {
-      "id": "SandgemTown_Text_ProfessorRowansComeBackToTown",
+      "id": "SandgemTown_Text_RowansComeBack",
       "en_US": [
         "Professor Rowan’s come back to town!\r",
         "It must be, like, four years since\n",
@@ -261,22 +261,22 @@
       ]
     },
     {
-      "id": "SandgemTown_Text_PokemonResearchLabSign",
+      "id": "SandgemTown_Text_SignPokemonResearchLab",
       "en_US": "Pokémon Research Lab"
     },
     {
-      "id": "SandgemTown_Text_CounterpartMailbox",
+      "id": "SandgemTown_Text_SignCounterpartsHouse",
       "en_US": "{STRVAR_1 3, 0, 0}’s House"
     },
     {
-      "id": "SandgemTown_Text_PokeMartSign",
+      "id": "SandgemTown_Text_SignPokeMart",
       "en_US": [
         "All Your Item Needs Fulfilled!\n",
         "Pokémon Mart"
       ]
     },
     {
-      "id": "SandgemTown_Text_PokemonCenterSign",
+      "id": "SandgemTown_Text_SignPokemonCenter",
       "en_US": [
         "Heal Your Pokémon!\n",
         "Pokémon Center"

res/text/sandgem_town_counterpart_house_1f.json

@@ -2,7 +2,7 @@
   "key": 5150,
   "messages": [
     {
-      "id": "SandgemTownCounterpartHouse1F_Text_SoThatRowanFellowIsBack",
+      "id": "SandgemTownCounterpartHouse1F_Text_RowanIsBack",
       "en_US": [
         "Ah, so that Rowan fellow is back?\n",
         "He’s quite the remarkable man.\r",
@@ -13,7 +13,7 @@
       ]
     },
     {
-      "id": "SandgemTownCounterpartHouse1F_Text_OhMyYouveGotANationalPokedex",
+      "id": "SandgemTownCounterpartHouse1F_Text_YouveGotANationalPokedex",
       "en_US": [
         "Oh, my!\n",
         "You’ve got a National Pokédex?\f",
@@ -29,7 +29,7 @@
       ]
     },
     {
-      "id": "SandgemTownCounterpartHouse1F_Text_WowYoureDoingTheSameAsMyBigSister",
+      "id": "SandgemTownCounterpartHouse1F_Text_SameAsMyBigSister",
       "en_US": [
         "Who are you?\r",
         "...\r",
@@ -42,7 +42,7 @@
       ]
     },
     {
-      "id": "SandgemTownCounterpartHouse1F_Text_WowYoureDoingTheSameAsMyBigBrother",
+      "id": "SandgemTownCounterpartHouse1F_Text_SameAsMyBigBrother",
       "en_US": [
         "Who are you?\r",
         "...\r",
@@ -55,7 +55,7 @@
       ]
     },
     {
-      "id": "SandgemTownCounterpartHouse1F_Text_ThereWasNewsSayingThereIsAMassiveOutbreakOfPokemon",
+      "id": "SandgemTownCounterpartHouse1F_Text_MassiveOutbreakOfPokemon",
       "en_US": [
         "Oh, hi, {STRVAR_1 3, 0, 0}!\r",
         "There was news on TV saying there\n",
@@ -65,7 +65,7 @@
       ]
     },
     {
-      "id": "SandgemTownCounterpartHouse1F_Text_MaleTheresABunchOfThisPokemonAtThatLocation",
+      "id": "SandgemTownCounterpartHouse1F_Text_BunchOfPokemonAtLocationMale",
       "en_US": [
         "Let me see...\n",
         "What did that news say now...?\r",
@@ -77,7 +77,7 @@
       ]
     },
     {
-      "id": "SandgemTownCounterpartHouse1F_Text_FemaleTheresABunchOfThisPokemonAtThatLocation",
+      "id": "SandgemTownCounterpartHouse1F_Text_BunchOfPokemonAtLocationFemale",
       "en_US": [
         "Let me see...\n",
         "What did that news say now...?\r",

res/text/sandgem_town_counterpart_house_2f.json

@@ -2,7 +2,7 @@
   "key": 5138,
   "messages": [
     {
-      "id": "SandgemTownCounterpartHouse2F_Text_PlayerCheckedThePCScreen",
+      "id": "SandgemTownCounterpartHouse2F_Text_PlayerCheckedPCScreen",
       "en_US": [
         "{STRVAR_1 3, 0, 0} checked the PC screen.\r",
         "Adventure Rule No. 1\n",

res/text/sandgem_town_house.json

@@ -2,7 +2,7 @@
   "key": 37911,
   "messages": [
     {
-      "id": "SandgemTownHouse_Text_PokemonGrowStrongerFromBattlingOtherPokemon",
+      "id": "SandgemTownHouse_Text_GrowStrongerFromBattling",
       "en_US": [
         "Pokémon grow steadily stronger from\n",
         "battling against other Pokémon.\r",
@@ -13,7 +13,7 @@
       ]
     },
     {
-      "id": "SandgemTownHouse_Text_AGoodTrainerTakesCareToNotLetTheirPokemonFaint",
+      "id": "SandgemTownHouse_Text_GoodTrainerTakesCare",
       "en_US": [
         "A good Trainer is one that takes care\n",
         "not to let their Pokémon faint from\f",

res/text/sandgem_town_pokecenter_1f.json

@@ -2,7 +2,7 @@
   "key": 11795,
   "messages": [
     {
-      "id": "SandgemTownPokecenter1F_Text_ThatLadyAtTheCounterWillHealYourPokemon",
+      "id": "SandgemTownPokecenter1F_Text_LadyAtCounterHealsPokemon",
       "en_US": [
         "Talk to that nice lady at the counter\n",
         "and hand her your Pokémon.\r",
@@ -11,7 +11,7 @@
       ]
     },
     {
-      "id": "SandgemTownPokecenter1F_Text_DoYouSeeThatPCOverThere",
+      "id": "SandgemTownPokecenter1F_Text_PCOverThere",
       "en_US": [
         "Do you see that PC over there?\n",
         "That fancy blue one?\r",
@@ -20,7 +20,7 @@
       ]
     },
     {
-      "id": "SandgemTownPokecenter1F_Text_TheTopFloorIsTheCommunicationClub",
+      "id": "SandgemTownPokecenter1F_Text_TopFloorIsCommunicationClub",
       "en_US": [
         "The top floor of any Pokémon Center\n",
         "is the Pokémon Communication Club.\r",

res/text/sandgem_town_pokecenter_2f.json

@@ -2,7 +2,7 @@
   "key": 11807,
   "messages": [
     {
-      "id": "SandgemTownPokecenter2F_Text_WhatKindOfTrainersSignWillGetPeopleLaughing",
+      "id": "SandgemTownPokecenter2F_Text_WhatWillGetPeopleLaughing",
       "en_US": [
         "What kind of Trainer’s sign will get\n",
         "people laughing?"

res/text/sandgem_town_pokemon_research_lab.json

@@ -2,7 +2,7 @@
   "key": 5126,
   "messages": [
     {
-      "id": "SandgemTownLab_Text_LetsHaveALookAtYourPokemon",
+      "id": "SandgemTownLab_Text_LookAtYourPokemon",
       "en_US": [
         "Professor: Well, well, look who’s here.\r",
         "{STRVAR_1 3, 0, 0}, was it?\n",
@@ -10,7 +10,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_ThisPokemonSeemstoBeRatherHappy",
+      "id": "SandgemTownLab_Text_PokemonSeemsRatherHappy",
       "en_US": [
         "...\r",
         "Hmm...\n",
@@ -20,7 +20,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_YouveMadeYourPokemonEvolveAlready",
+      "id": "SandgemTownLab_Text_PokemonEvolvedAlready",
       "en_US": [
         "Well well!\r",
         "You’ve made your Pokémon evolve\n",
@@ -28,7 +28,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_EntrustingYouWithThatStarterWasNoMistake",
+      "id": "SandgemTownLab_Text_EntrustingWasNoMistake",
       "en_US": [
         "Hm!\r",
         "Entrusting you with that {STRVAR_1 0, 0, 0}\n",
@@ -36,21 +36,21 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_WouldYouLikeToGiveItANickname",
+      "id": "SandgemTownLab_Text_GiveItANickname",
       "en_US": [
         "Professor: Well, would you like to give\n",
         "it a nickname?"
       ]
     },
     {
-      "id": "SandgemTownLab_Text_AskAndYoureHappyWithThatNickName",
+      "id": "SandgemTownLab_Text_YoureHappyWithNickname",
       "en_US": [
         "Professor: Hmm, OK, I see...\n",
         "And you’re happy with that nickname?"
       ]
     },
     {
-      "id": "SandgemTownLab_Text_CherishThatStarterOfYours",
+      "id": "SandgemTownLab_Text_CherishThatStarter",
       "en_US": [
         "Professor: When I first saw you two \n",
         "about to step into the tall grass\f",
@@ -69,7 +69,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_DawnImSoGladThatYourKindTowardPokemon",
+      "id": "SandgemTownLab_Text_DawnImGladYourKind",
       "en_US": [
         "Dawn: I’m so glad that you’re kind\n",
         "toward Pokémon!\r",
@@ -78,7 +78,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_LucasBoyAmIGladYoureKindTowardPokemon",
+      "id": "SandgemTownLab_Text_LucasImGladYourKind",
       "en_US": [
         "Lucas: Boy, am I glad you’re kind\n",
         "toward Pokémon.\r",
@@ -87,7 +87,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_ThereIsSomethingIWantYouToDo",
+      "id": "SandgemTownLab_Text_SomethingIWantYouToDo",
       "en_US": [
         "Professor: Er-hem!\n",
         "Let’s move on to the main topic.\r",
@@ -96,7 +96,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_WillYouRecordDataOnAllPokemonInSinnoh",
+      "id": "SandgemTownLab_Text_RecordDataOnAllPokemon",
       "en_US": [
         "Allow me to properly introduce myself\n",
         "first.\r",
@@ -145,7 +145,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_MeetEveryKindOfPokemonInThisRegion",
+      "id": "SandgemTownLab_Text_MeetEveryKindOfPokemon",
       "en_US": [
         "Rowan: That Pokédex is a very\n",
         "high-tech device.\r",
@@ -161,14 +161,14 @@
       "en_US": "Dawn: I’ve got one, too!\r"
     },
     {
-      "id": "SandgemTownLab_Text_LucasIveGotTheSameKindOfPokedex",
+      "id": "SandgemTownLab_Text_LucasIveGotTheSamePokedex",
       "en_US": [
         "Lucas: I’ve got the same kind of\n",
         "Pokédex as you.\r"
       ]
     },
     {
-      "id": "SandgemTownLab_Text_YourGrandAdventureBeginsRightNow",
+      "id": "SandgemTownLab_Text_GrandAdventureBeginsNow",
       "en_US": [
         "Rowan: When you walked up Route 201\n",
         "with your Pokémon, what did you feel?\r",
@@ -185,7 +185,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_GoOnYourGrandAdventureAwaitsYou",
+      "id": "SandgemTownLab_Text_GrandAdventureAwaitsYou",
       "en_US": [
         "Rowan: Go on!\r",
         "{STRVAR_1 3, 0, 0}, your grand adventure\n",
@@ -193,7 +193,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_DawnIllBeHappyToTeachYouThings",
+      "id": "SandgemTownLab_Text_DawnHappyToTeachYou",
       "en_US": [
         "Dawn: The Pokémon that I met for\n",
         "the first time was {STRVAR_1 0, 1, 0}!\r",
@@ -212,7 +212,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_LucasIllTeachYouStuffLater",
+      "id": "SandgemTownLab_Text_LucasIllTeachYouStuff",
       "en_US": [
         "Lucas: The professor asked me to help,\n",
         "so I’m filling the Pokédex pages, too.\r",
@@ -232,7 +232,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_ItsAnHonorToBeAnAssistant",
+      "id": "SandgemTownLab_Text_HonorToBeAnAssistant",
       "en_US": [
         "Professor Rowan invented a new\n",
         "Pokédex while working alongside a\f",
@@ -257,21 +257,21 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_ItsCrammedFullOfBooks",
+      "id": "SandgemTownLab_Text_CrammedFullOfBooks",
       "en_US": [
         "It’s crammed full of books with all\n",
         "sorts of Pokémon information."
       ]
     },
     {
-      "id": "SandgemTownLab_Text_ThereALotOfReferenceMaterial",
+      "id": "SandgemTownLab_Text_ReferenceMaterial",
       "en_US": [
         "There’s a lot of reference material\n",
         "and research reports on Pokémon."
       ]
     },
     {
-      "id": "SandgemTownLab_Text_AskYouveComeToShowMeYourProgressOnThePokedex",
+      "id": "SandgemTownLab_Text_YouveComeToShowProgress",
       "en_US": [
         "Rowan: Ah, {STRVAR_1 3, 0, 0}!\r",
         "You’ve come to show me your\n",
@@ -294,7 +294,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_ThePokemonOfTheSInnohRegionAreBeingAdded",
+      "id": "SandgemTownLab_Text_ExcellentWork",
       "en_US": [
         "Excellent work, {STRVAR_1 3, 0, 0}!\r",
         "The Pokémon of the Sinnoh region are\n",
@@ -304,7 +304,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_YouveMetEveryKindOfPokemonInTheSinnohRegion",
+      "id": "SandgemTownLab_Text_MetEverySinnohPokemon",
       "en_US": [
         "Rowan: Hm! {STRVAR_1 3, 0, 0}, I’ve been\n",
         "waiting to see you!\r",
@@ -327,7 +327,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_IfItIsntMyOldColleagueProfessorOak",
+      "id": "SandgemTownLab_Text_OldColleagueProfessorOak",
       "en_US": [
         "Rowan: Oh! If it isn’t my old\n",
         "colleague, Professor Oak!\r",
@@ -340,7 +340,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_LetMeIntroduceYouToMyYoungAssistant",
+      "id": "SandgemTownLab_Text_IntroduceYouToMyAssistant",
       "en_US": [
         "Professor Oak, let me introduce you\n",
         "to my young assistant.\r",
@@ -372,14 +372,14 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_PlayersPokedexWasUpgradedWithTheNationalMode",
+      "id": "SandgemTownLab_Text_PokedexUpgradedWithNationalMode",
       "en_US": [
         "{STRVAR_1 3, 0, 0}’s Pokédex was upgraded\n",
         "with the National Mode!\r"
       ]
     },
     {
-      "id": "SandgemTownLab_Text_ItWontBeEasyToCompleteTheNationalPokedex",
+      "id": "SandgemTownLab_Text_WontBeEasyToComplete",
       "en_US": [
         "Oak: I’m afraid it won’t be easy to\n",
         "complete the National Pokédex.\r",
@@ -397,7 +397,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_IveHeardThatThePalParkIsNowOpen",
+      "id": "SandgemTownLab_Text_PalParkIsNowOpen",
       "en_US": [
         "Oak: Ah, yes. I’ve heard that the\n",
         "Pal Park is now open.\r",
@@ -411,7 +411,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_MaleYouShouldVisitThePalParkToo",
+      "id": "SandgemTownLab_Text_VisitThePalParkMale",
       "en_US": [
         "{STRVAR_1 3, 0, 0}, you should make an\n",
         "effort to visit the Pal Park, too.\r",
@@ -422,7 +422,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_FemaleYouShouldVisitThePalParkToo",
+      "id": "SandgemTownLab_Text_VisitThePalParkFemale",
       "en_US": [
         "{STRVAR_1 3, 0, 0}, you should make an\n",
         "effort to visit the Pal Park, too.\r",
@@ -433,14 +433,14 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_OffHeGoesAsBusyAsEver",
+      "id": "SandgemTownLab_Text_OffHeGoes",
       "en_US": [
         "Rowan: Off he goes, as busy as\n",
         "ever...\r"
       ]
     },
     {
-      "id": "SandgemTownLab_Text_IHaveAGiftForCompletingTheSinnohPokedex",
+      "id": "SandgemTownLab_Text_GiftForCompletingSinnohPokedex",
       "en_US": [
         "Now, {STRVAR_1 3, 0, 0}...\r",
         "I have a gift here as your reward\n",
@@ -462,7 +462,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_ThereAreManyMorePokemon",
+      "id": "SandgemTownLab_Text_ManyMorePokemon",
       "en_US": [
         "Rowan: The world is immense.\n",
         "There are many more Pokémon.\r",
@@ -480,21 +480,21 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_ResearchMaterialsAreCarefullyTuckedAway",
+      "id": "SandgemTownLab_Text_ResearchMaterialsTuckedAway",
       "en_US": [
         "Research materials are carefully\n",
         "tucked away."
       ]
     },
     {
-      "id": "SandgemTownLab_Text_TheRefrigeratorIsFilledWithTastySweets",
+      "id": "SandgemTownLab_Text_FilledWithTastySweets",
       "en_US": [
         "The refrigerator is filled with\n",
         "tasty sweets! Mmm..."
       ]
     },
     {
-      "id": "SandgemTownLab_Text_YouveBeenGreatForTheProfsResearch",
+      "id": "SandgemTownLab_Text_YouveBeenGreatForResearch",
       "en_US": [
         "It’s really quite something!\r",
         "Imagine... Cataloging every kind of\n",
@@ -506,7 +506,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_ProfessorRowanHasBeenStudyingPokedexSystems",
+      "id": "SandgemTownLab_Text_StudyingPokedexSystems",
       "en_US": [
         "Yes, that’s correct.\r",
         "Professor Rowan has been studying\n",
@@ -528,7 +528,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_DawnImGladToSeeYouSafe",
+      "id": "SandgemTownLab_Text_DawnGladToSeeYouSafe",
       "en_US": [
         "Dawn: The professor did a lot of\n",
         "checking up after you left.\r",
@@ -541,7 +541,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_LucasImGladToSeeYouBackSafe",
+      "id": "SandgemTownLab_Text_LucasGladToSeeYouSafe",
       "en_US": [
         "Lucas: After you left, the professor\n",
         "did a lot of checking around.\r",
@@ -554,7 +554,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_WhyNotObtainSunyshoresBadge",
+      "id": "SandgemTownLab_Text_ObtainSunyshoresBadge",
       "en_US": [
         "Rowan: Oh, yes, there was something\n",
         "I had to tell you.\r",
@@ -578,7 +578,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_IfYouSeeCynthiaGiveHerMyBestRegards",
+      "id": "SandgemTownLab_Text_GiveCynthiaMyBestRegards",
       "en_US": [
         "Rowan: Oh, yes, {STRVAR_1 3, 0, 0}.\r",
         "If you see Cynthia, please give her \n",
@@ -598,7 +598,7 @@
       "garbage": 57
     },
     {
-      "id": "SandgemTownLab_Text_ImStunnedByYourGreatness",
+      "id": "SandgemTownLab_Text_StunnedByGreatness",
       "en_US": [
         "I... I’m stunned by your greatness!\r",
         "I feel as shaken and inspired as when\n",
@@ -607,7 +607,7 @@
       ]
     },
     {
-      "id": "SandgemTownLab_Text_HearingWhatWasHappeningGaveMeShivers",
+      "id": "SandgemTownLab_Text_GaveMeShivers",
       "en_US": [
         "Hearing what was happening from the\n",
         "professor gave me shivers.\r",

res/text/snowpoint_city_mart.json

@@ -2,7 +2,7 @@
   "key": 19377,
   "messages": [
     {
-      "id": "SnowpointCityMart_Text_UsingTmsForEliteFour",
+      "id": "SnowpointCityMart_Text_UsingTMsForEliteFour",
       "en_US": [
         "I’m using Technical Machines to teach\n",
         "moves to my Pokémon.\r",

res/text/solaceon_ruins_room_2.json

@@ -2,7 +2,7 @@
   "key": 17426,
   "messages": [
     {
-      "id": "SolaceonRuinsRoom2_Text_HMDefogIsInTheseRuins",
+      "id": "SolaceonRuinsRoom2_Text_HMDefogInRuins",
       "en_US": [
         "I’d heard the Hidden Machine Defog was\n",
         "somewhere in these ruins.\r",
@@ -13,7 +13,7 @@
       ]
     },
     {
-      "id": "SolaceonRuinsRoom2_Text_HMDefogIsInTheseRuins2",
+      "id": "SolaceonRuinsRoom2_Text_HMDefogInRuins2",
       "en_US": [
         "I’d heard the Hidden Machine Defog was\n",
         "somewhere in these ruins.\r",
@@ -24,7 +24,7 @@
       ]
     },
     {
-      "id": "SolaceonRuinsRoom2_Text_CanYouLoanHMDefogToMe",
+      "id": "SolaceonRuinsRoom2_Text_CanYouLoanHMDefog",
       "en_US": [
         "Hey!\n",
         "Now looky here!\r",
@@ -44,7 +44,7 @@
       ]
     },
     {
-      "id": "SolaceonRuinsRoom2_Text_ItsNotLikeItsGoingToWearOut",
+      "id": "SolaceonRuinsRoom2_Text_ItsNotLikeItWearsOut",
       "en_US": [
         "It’s not like it’s going to wear out!\n",
         "It’s just for a minute! Cheapskate!"

res/text/solaceon_town.json

@@ -39,14 +39,14 @@
       ]
     },
     {
-      "id": "SolaceonTown_Text_TakeItEasySlowAndCasual",
+      "id": "SolaceonTown_Text_TakeItEasy",
       "en_US": [
         "Howdy, traveling Trainer.\n",
         "Take it easy, slow, and casual."
       ]
     },
     {
-      "id": "SolaceonTown_Text_TakeATourThroughTheRuins",
+      "id": "SolaceonTown_Text_TakeATour",
       "en_US": [
         "Howdy, traveling Trainer.\n",
         "There’s nothing here.\r",
@@ -66,14 +66,14 @@
       ]
     },
     {
-      "id": "SolaceonTown_Text_EverySundayIVisitTheLostTower",
+      "id": "SolaceonTown_Text_IVisitTheLostTower",
       "en_US": [
         "Every Sunday, I visit the Lost\n",
         "Tower..."
       ]
     },
     {
-      "id": "SolaceonTown_Text_OverTimeTheTownCameToBe",
+      "id": "SolaceonTown_Text_UsedToBeNothing",
       "en_US": [
         "There used to be nothing here but\n",
         "a road that went straight through.\r",
@@ -82,7 +82,7 @@
       ]
     },
     {
-      "id": "SolaceonTown_Text_IfYoureCompetentYoudHaveMetFiftyPokemon",
+      "id": "SolaceonTown_Text_IfCompetentMetFiftyPokemon",
       "en_US": [
         "A traveling Trainer, huh?\r",
         "Tell me, how many kinds of Pokémon\n",
@@ -94,7 +94,7 @@
       ]
     },
     {
-      "id": "SolaceonTown_Text_ThisHeresAPoketchAppPokemonHistory",
+      "id": "SolaceonTown_Text_PoketchAppPokemonHistory",
       "en_US": [
         "Your encounters with Pokémon can\n",
         "be considered your shared history.\r",
@@ -105,7 +105,7 @@
       ]
     },
     {
-      "id": "SolaceonTown_Text_EachPokemonHasItsOwnHistory",
+      "id": "SolaceonTown_Text_EachPokemonOwnHistory",
       "en_US": [
         "You have your history, and each\n",
         "Pokémon has its own history.\r",

res/text/solaceon_town_east_house.json

@@ -15,7 +15,7 @@
       ]
     },
     {
-      "id": "SolaceonTownEastHouse_Text_ThatPokemonLooksJustLikeMySeals",
+      "id": "SolaceonTownEastHouse_Text_PokemonLooksLikeMySeals",
       "en_US": [
         "Oh, that {STRVAR_1 0, 0, 0} looks just like\n",
         "my Seals!\r",

res/text/solaceon_town_north_house.json

@@ -2,7 +2,7 @@
   "key": 29742,
   "messages": [
     {
-      "id": "SolaceonTownNorthHouse_Text_EggsFoundAtPokemonDayCare",
+      "id": "SolaceonTownNorthHouse_Text_EggsFoundAtDayCare",
       "en_US": [
         "Every so often, an Egg will be found\n",
         "at the Pokémon Day Care.\r",
@@ -13,7 +13,7 @@
       ]
     },
     {
-      "id": "SolaceonTownNorthHouse_Text_ItHasntBeenProvenThatPokemonLayEggs",
+      "id": "SolaceonTownNorthHouse_Text_NotProvenPokemonLayEggs",
       "en_US": [
         "They say no one has ever seen\n",
         "a Pokémon actually lay an Egg.\r",

res/text/solaceon_town_pokecenter_1f.json

@@ -9,7 +9,7 @@
       ]
     },
     {
-      "id": "SolaceonTownPokecenter1F_Text_ItsQuiteFarToVeilstoneCity",
+      "id": "SolaceonTownPokecenter1F_Text_QuiteFarToVeilstoneCity",
       "en_US": [
         "It’s quite far from Solaceon Town to\n",
         "Veilstone City.\r",

res/text/solaceon_town_pokemon_news_press.json

@@ -35,7 +35,7 @@
       ]
     },
     {
-      "id": "SolaceonTownPokemonNewsPress_Text_DidYouBringUsThePokemon",
+      "id": "SolaceonTownPokemonNewsPress_Text_DidYouBringThePokemon",
       "en_US": [
         "What’s up? Did you bring us\n",
         "the Pokémon we needed?\r"
@@ -57,14 +57,14 @@
       ]
     },
     {
-      "id": "SolaceonTownPokemonNewsPress_Text_IHopeYoullHelpAgainTomorrow",
+      "id": "SolaceonTownPokemonNewsPress_Text_HelpAgainTomorrow",
       "en_US": [
         "You really came through for us!\n",
         "I hope you’ll help us again tomorrow!"
       ]
     },
     {
-      "id": "SolaceonTownPokemonNewsPress_Text_YourBagIsStuffedFull",
+      "id": "SolaceonTownPokemonNewsPress_Text_BagIsFull",
       "en_US": [
         "Whoops! What’s all this?\n",
         "Your Bag is stuffed full.\r",
@@ -81,7 +81,7 @@
       ]
     },
     {
-      "id": "SolaceonTownPokemonNewsPress_Text_StillHaventCaughtThePokemon",
+      "id": "SolaceonTownPokemonNewsPress_Text_StillHaventCaughtPokemon",
       "en_US": [
         "What’s wrong? You still haven’t\n",
         "caught the {STRVAR_1 0, 0, 0} we need?\r",
@@ -94,7 +94,7 @@
       ]
     },
     {
-      "id": "SolaceonTownPokemonNewsPress_Text_FailedToBringThePokemon",
+      "id": "SolaceonTownPokemonNewsPress_Text_FailedToBringPokemon",
       "en_US": [
         "Now, now! You failed to bring me the\n",
         "Pokémon I asked for...\r",
@@ -103,7 +103,7 @@
       ]
     },
     {
-      "id": "SolaceonTownPokemonNewsPress_Text_IllHaveAnotherAssignmentTomorrow",
+      "id": "SolaceonTownPokemonNewsPress_Text_AnotherAssignmentTomorrow",
       "en_US": [
         "OK! I’ll crank out a riveting story\n",
         "based on this!\r",

res/text/sunyshore_city_mart.json

@@ -13,7 +13,7 @@
       ]
     },
     {
-      "id": "SunyshoreCityMart_Text_BuyBallSealsAtSunyshoreMarket",
+      "id": "SunyshoreCityMart_Text_BuySealsAtMarket",
       "en_US": [
         "I shall buy Seals for decorating Poké\n",
         "Balls at the Sunyshore Market.\r",

res/text/team_galactic_eterna_building_1f.json

@@ -13,7 +13,7 @@
       ]
     },
     {
-      "id": "TeamGalacticEternaBuilding1F_Text_IncidentallyYouAreAFirstRateTrainer",
+      "id": "TeamGalacticEternaBuilding1F_Text_FirstRateTrainer",
       "en_US": [
         "...Incidentally, you are a first-rate\n",
         "Trainer. Of that, I am very aware.\r",
@@ -29,7 +29,7 @@
       ]
     },
     {
-      "id": "TeamGalacticEternaBuilding1F_Text_NowIHaveBeenConductingMyInvestigationIntoTeamGalactic",
+      "id": "TeamGalacticEternaBuilding1F_Text_InvestigationIntoTeamGalactic",
       "en_US": [
         "Looker: Now, I have been conducting\n",
         "my investigation into Team Galactic.\r",
@@ -47,7 +47,7 @@
       ]
     },
     {
-      "id": "TeamGalacticEternaBuilding1F_Text_WelcomeToTeamGalacticAreYouHereToDonateYourPokemon",
+      "id": "TeamGalacticEternaBuilding1F_Text_WelcomeToTeamGalactic",
       "en_US": [
         "Welcome to Team Galactic. Are you\n",
         "here to donate your Pokémon?\r",
@@ -58,14 +58,14 @@
       ]
     },
     {
-      "id": "TeamGalacticEternaBuilding1F_Text_AsAGroupTeamGalacticHasItsSightsSetOnTheStarsNotOnThisWorld",
+      "id": "TeamGalacticEternaBuilding1F_Text_SightsSetOnTheStars",
       "en_US": [
         "As a group, Team Galactic has its sights\n",
         "set on the stars, not on this world!"
       ]
     },
     {
-      "id": "TeamGalacticEternaBuilding1F_Text_ThePathYouChoseLeadsToGlory",
+      "id": "TeamGalacticEternaBuilding1F_Text_PathLeadsToGlory",
       "en_US": "The path you chose leads to glory."
     },
     {
@@ -73,7 +73,7 @@
       "en_US": "{STRVAR_1 3, 0, 0} used the {STRVAR_1 8, 1, 0}!\r"
     },
     {
-      "id": "TeamGalacticEternaBuilding1F_Text_ItsTheEntranceToASecretRoom",
+      "id": "TeamGalacticEternaBuilding1F_Text_EntranceToASecretRoom",
       "en_US": "It’s the entrance to a secret room!"
     }
   ]

res/text/team_galactic_eterna_building_2f.json

@@ -2,14 +2,14 @@
   "key": 5143,
   "messages": [
     {
-      "id": "TeamGalacticEternaBuilding2F_Text_TeamGalacticIsWorkingHardToFindNewEnergySourcesForTheFuture",
+      "id": "TeamGalacticEternaBuilding2F_Text_WorkingToFindEnergySources",
       "en_US": [
         "Team Galactic is working hard to find\n",
         "new energy sources for the future!"
       ]
     },
     {
-      "id": "TeamGalacticEternaBuilding2F_Text_WeAreConductingResearchOnNewFormsOfEnergy",
+      "id": "TeamGalacticEternaBuilding2F_Text_ResearchOnFormsOfEnergy",
       "en_US": [
         "We are conducting research on new\n",
         "forms of energy!\r",
@@ -18,7 +18,7 @@
       ]
     },
     {
-      "id": "TeamGalacticEternaBuilding2F_Text_LetUsMakeProgressTogether",
+      "id": "TeamGalacticEternaBuilding2F_Text_MakeProgressTogether",
       "en_US": [
         "Let us make progress together!\n",
         "             Team Galactic"

res/text/team_galactic_eterna_building_3f.json

@@ -2,7 +2,7 @@
   "key": 5139,
   "messages": [
     {
-      "id": "TeamGalacticEternaBuilding3F_Text_OrdinaryPeopleLikeYouCantUnderstandTeamGalacticGrandDesigns",
+      "id": "TeamGalacticEternaBuilding3F_Text_OrdinaryPeopleCantUnderstand",
       "en_US": [
         "Ordinary people like you can’t\n",
         "understand Team Galactic’s grand\f",
@@ -12,7 +12,7 @@
       ]
     },
     {
-      "id": "TeamGalacticEternaBuilding3F_Text_QuestionNotAndFollowThisPathTheRoadToSuccess",
+      "id": "TeamGalacticEternaBuilding3F_Text_FollowThisPath",
       "en_US": [
         "Question not and follow this path!\n",
         "The road to success!"

res/text/team_galactic_eterna_building_4f.json

@@ -2,7 +2,7 @@
   "key": 5135,
   "messages": [
     {
-      "id": "TeamGalacticEternaBuilding4F_Text_IJupiterWillDealWithYou",
+      "id": "TeamGalacticEternaBuilding4F_Text_IWillDealWithYou",
       "en_US": [
         "Eh? Did you want something?\r",
         "How silly of me to even ask.\n",
@@ -31,11 +31,11 @@
       ]
     },
     {
-      "id": "TeamGalacticEternaBuilding4F_Text_ClefairyPi",
+      "id": "TeamGalacticEternaBuilding4F_Text_ClefairyCry",
       "en_US": "CLEFAIRY: Pi..."
     },
     {
-      "id": "TeamGalacticEternaBuilding4F_Text_WhatIsItWithThisTeamGalactic",
+      "id": "TeamGalacticEternaBuilding4F_Text_WhatsWithTeamGalactic",
       "en_US": [
         "What is it with this Team Galactic?\r",
         "Why did they take our Pokémon?\n",
@@ -43,7 +43,7 @@
       ]
     },
     {
-      "id": "TeamGalacticEternaBuilding4F_Text_ICantThankYouEnoughRightNowButCruiseByMyCycleShopOK",
+      "id": "TeamGalacticEternaBuilding4F_Text_ThankYouCruiseByCycleShop",
       "en_US": [
         "I got my CLEFAIRY back, and it’s all\n",
         "thanks to you!\r",
@@ -59,7 +59,7 @@
       ]
     },
     {
-      "id": "TeamGalacticEternaBuilding4F_Text_BunearyMyun",
+      "id": "TeamGalacticEternaBuilding4F_Text_BunearyCry",
       "en_US": "BUNEARY: Myun..."
     },
     {

res/text/twinleaf_town.json

@@ -77,7 +77,7 @@
       ]
     },
     {
-      "id": "TwinleafTown_Text_PokemonYouLookGoodTogether",
+      "id": "TwinleafTown_Text_YouLookGoodTogether",
       "en_US": [
         "Oh! A Pokémon!\n",
         "You look good together!"
@@ -110,11 +110,11 @@
       ]
     },
     {
-      "id": "TwinleafTown_Text_PlayerMailbox",
+      "id": "TwinleafTown_Text_PlayersHouse",
       "en_US": "{STRVAR_1 3, 0, 0}’s House"
     },
     {
-      "id": "TwinleafTown_Text_RivalMailbox",
+      "id": "TwinleafTown_Text_RivalsHouse",
       "en_US": "{STRVAR_1 3, 0, 0}’s House"
     }
   ]

res/text/twinleaf_town_northeast_house.json

@@ -2,14 +2,14 @@
   "key": 42007,
   "messages": [
     {
-      "id": "TwinleafTownNortheastHouse_Text_YoureOffToHangWithRivalAgainRight",
+      "id": "TwinleafTownNortheastHouse_Text_YoureOffToHangWithRival",
       "en_US": [
         "You’re off to hang with {STRVAR_1 3, 0, 0}\n",
         "again, right? You two sure are tight!"
       ]
     },
     {
-      "id": "TwinleafTownNortheastHouse_Text_IWentOnAnAdventureALongTimeAgo",
+      "id": "TwinleafTownNortheastHouse_Text_AdventureLongTimeAgo",
       "en_US": [
         "I went on an adventure with some\n",
         "Pokémon a long time ago.\r",

res/text/twinleaf_town_player_house_1f.json

@@ -11,7 +11,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_YouKnowHowImpatientRivalIs",
+      "id": "TwinleafTownPlayerHouse1F_Text_KnowHowImpatientRivalIs",
       "en_US": [
         "Mom: You know how impatient\n",
         "{STRVAR_1 3, 0, 0} is.\r",
@@ -34,7 +34,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_DontGoIntoTheTallGrass",
+      "id": "TwinleafTownPlayerHouse1F_Text_DontGoIntoTallGrass",
       "en_US": [
         "Mom: Oh, yes!\n",
         "{STRVAR_1 3, 0, 0}!\r",
@@ -46,14 +46,14 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_IsntRivalWaitingForYou",
+      "id": "TwinleafTownPlayerHouse1F_Text_IsntRivalWaiting",
       "en_US": [
         "Mom: What is it, dear?\n",
         "Isn’t {STRVAR_1 3, 0, 0} waiting for you?"
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_WowThatsWhatHappenedToYou",
+      "id": "TwinleafTownPlayerHouse1F_Text_WowThatHappenedToYou",
       "en_US": [
         "Mom: What’s the matter, dear?\r",
         "...\r",
@@ -114,7 +114,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_EarlyMorningTakeAQuickRest",
+      "id": "TwinleafTownPlayerHouse1F_Text_MorningTakeAQuickRest",
       "en_US": [
         "Mom: Welcome home, {STRVAR_1 3, 0, 0}.\n",
         "Are you and your Pokémon healthy?\r",
@@ -123,7 +123,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_TakeAQuickRest",
+      "id": "TwinleafTownPlayerHouse1F_Text_DayTakeAQuickRest",
       "en_US": [
         "Mom: Welcome home, {STRVAR_1 3, 0, 0}.\n",
         "Are you and your Pokémon healthy?\f",
@@ -131,7 +131,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_JustMadeDinnerTakeAQuickRest",
+      "id": "TwinleafTownPlayerHouse1F_Text_NightTakeAQuickRest",
       "en_US": [
         "Mom: Welcome home, {STRVAR_1 3, 0, 0}.\n",
         "Are you and your Pokémon healthy?\r",
@@ -140,7 +140,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_SoLateRightNowTakeAQuickRest",
+      "id": "TwinleafTownPlayerHouse1F_Text_LateNightTakeAQuickRest",
       "en_US": [
         "Mom: Welcome home, {STRVAR_1 3, 0, 0}.\n",
         "Are you and your Pokémon healthy?\r",
@@ -233,7 +233,7 @@
       "en_US": "Won’t you, {STRVAR_1 3, 0, 0}?\r"
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_PleaseTakeThisToRivalForMeMale",
+      "id": "TwinleafTownPlayerHouse1F_Text_TakeThisToRivalMale",
       "en_US": [
         "{STRVAR_1 3, 1, 0}’s mom: Oh, really?\n",
         "You’d do that for me?\r",
@@ -242,7 +242,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_PleaseTakeThisToRivalForMeFemale",
+      "id": "TwinleafTownPlayerHouse1F_Text_TakeThisToRivalFemale",
       "en_US": [
         "{STRVAR_1 3, 1, 0}’s mom: Oh, really?\n",
         "You’d do that for me?\r",
@@ -251,7 +251,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_HedProbablyHeadStraightToJubilife",
+      "id": "TwinleafTownPlayerHouse1F_Text_ProbablyStraightToJubilife",
       "en_US": [
         "{STRVAR_1 3, 1, 0}’s mom: Let me think...\r",
         "Knowing my boy, he would probably\n",
@@ -314,7 +314,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_MomsFavoriteDessertIsInRefrigerator",
+      "id": "TwinleafTownPlayerHouse1F_Text_MomsFavoriteDessert",
       "en_US": [
         "Mom’s favorite dessert is in\n",
         "the refrigerator."
@@ -328,7 +328,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_ThisIsWhereMomDoesHerDeliciousCooking",
+      "id": "TwinleafTownPlayerHouse1F_Text_WhereMomDoesDeliciousCooking",
       "en_US": [
         "This is where Mom does all her\n",
         "delicious cooking."
@@ -364,7 +364,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_YouAndYourPokemonAreLookingGood",
+      "id": "TwinleafTownPlayerHouse1F_Text_PokemonAreLookingGood",
       "en_US": [
         "Mom: {STRVAR_1 3, 0, 0}!\r",
         "You and your Pokémon are looking good!\n",
@@ -372,7 +372,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_AlwaysTreatYourPokemonWithKindness",
+      "id": "TwinleafTownPlayerHouse1F_Text_TreatPokemonWithKindness",
       "en_US": [
         "Mom: {STRVAR_1 3, 0, 0}.\r",
         "Listen. Always treat your Pokémon\n",
@@ -382,7 +382,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_SeeingYouRemindsMeOfYourFather",
+      "id": "TwinleafTownPlayerHouse1F_Text_RemindsMeOfYourFather",
       "en_US": [
         "Mom: {STRVAR_1 3, 0, 0}.\r",
         "Seeing you reminds me so much of your\n",
@@ -391,7 +391,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_WhileYoureGoneIVisitRivalsMom",
+      "id": "TwinleafTownPlayerHouse1F_Text_IVisitRivalsMom",
       "en_US": [
         "Mom: While you’re gone, I go and\n",
         "visit {STRVAR_1 3, 1, 0}’s mom.\r",
@@ -401,7 +401,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse1F_Text_AskIsEverythingAllRight",
+      "id": "TwinleafTownPlayerHouse1F_Text_IsEverythingAllRight",
       "en_US": [
         "Mom: {STRVAR_1 3, 0, 0}, is everything all\n",
         "right?\r",

res/text/twinleaf_town_player_house_2f.json

@@ -2,7 +2,7 @@
   "key": 9234,
   "messages": [
     {
-      "id": "TwinleafTownPlayerHouse2F_Text_ThatConcludesOurSpecialProgram",
+      "id": "TwinleafTownPlayerHouse2F_Text_ConcludesSpecialProgram",
       "en_US": [
         "That concludes our special program,\n",
         "“Let’s Ask Prof. Rowan!”\r",
@@ -18,11 +18,11 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse2F_Text_MomBoughThisTVAsAGift",
+      "id": "TwinleafTownPlayerHouse2F_Text_MomBoughtTVAsGift",
       "en_US": "Mom bought this TV as a gift."
     },
     {
-      "id": "TwinleafTownPlayerHouse2F_Text_TheXButtonOpensTheMenu",
+      "id": "TwinleafTownPlayerHouse2F_Text_XButtonOpensMenu",
       "en_US": [
         "The X Button\n",
         "opens the menu!"
@@ -51,7 +51,7 @@
       "en_US": "{STRVAR_1 3, 0, 0}: There you are!\r"
     },
     {
-      "id": "TwinleafTownPlayerHouse2F_Text_ProfRowanWouldGiveUsPokemon",
+      "id": "TwinleafTownPlayerHouse2F_Text_ProfRowanWouldGivePokemon",
       "en_US": [
         "Hey, {STRVAR_1 3, 1, 0}!\n",
         "Did you just see the TV? Sure you did!\r",
@@ -78,7 +78,7 @@
       ]
     },
     {
-      "id": "TwinleafTownPlayerHouse2F_Text_WereGoingToSeeProfRowanAndGetPokemon",
+      "id": "TwinleafTownPlayerHouse2F_Text_SeeProfRowanAndGetPokemon",
       "en_US": [
         "Oh, right, right! We’re going to go see\n",
         "Prof. Rowan and get some Pokémon.\r",

res/text/twinleaf_town_rival_house_1f.json

@@ -2,7 +2,7 @@
   "key": 9222,
   "messages": [
     {
-      "id": "TwinleafTownRivalHouse1F_Text_AreYouLookingForRival",
+      "id": "TwinleafTownRivalHouse1F_Text_LookingForRival",
       "en_US": [
         "{STRVAR_1 3, 1, 0}’s mom: Oh, hi,\n",
         "{STRVAR_1 3, 0, 0}.\r",
@@ -14,7 +14,7 @@
       ]
     },
     {
-      "id": "TwinleafTownRivalHouse1F_Text_DidYouComeCallingOnRival",
+      "id": "TwinleafTownRivalHouse1F_Text_ComeCallingOnRival",
       "en_US": [
         "{STRVAR_1 3, 1, 0}’s mom: Oh, hi,\n",
         "{STRVAR_1 3, 0, 0}.\r",
@@ -26,7 +26,7 @@
       ]
     },
     {
-      "id": "TwinleafTownRivalHouse1F_Text_ThatKidRocketedOffAgainLikeUsual",
+      "id": "TwinleafTownRivalHouse1F_Text_RocketedOffLikeUsual",
       "en_US": [
         "{STRVAR_1 3, 1, 0}’s mom: That kid rocketed\n",
         "off again like usual.\r",
@@ -37,7 +37,7 @@
       ]
     },
     {
-      "id": "TwinleafTownRivalHouse1F_Text_HeShouldBeOutOnRoute201ByNow",
+      "id": "TwinleafTownRivalHouse1F_Text_HeShouldBeOnRoute201",
       "en_US": [
         "{STRVAR_1 3, 1, 0}’s mom: My {STRVAR_1 3, 1, 0}\n",
         "should be out on Route 201 by now.\r",
@@ -46,14 +46,14 @@
       ]
     },
     {
-      "id": "TwinleafTownRivalHouse1F_Text_YouveBecomeFriendsWithAPokemonToo",
+      "id": "TwinleafTownRivalHouse1F_Text_FriendsWithPokemonToo",
       "en_US": [
         "{STRVAR_1 3, 1, 0}’s mom: Oh, you’ve\n",
         "become friends with a Pokémon, too."
       ]
     },
     {
-      "id": "TwinleafTownRivalHouse1F_Text_RivalTookOffLikeARocketAsUsual",
+      "id": "TwinleafTownRivalHouse1F_Text_TookOffLikeUsual",
       "en_US": [
         "{STRVAR_1 3, 1, 0}’s mom: My {STRVAR_1 3, 1, 0}\n",
         "took off like a rocket as usual.\r",

res/text/twinleaf_town_rival_house_2f.json

@@ -2,14 +2,14 @@
   "key": 9226,
   "messages": [
     {
-      "id": "TwinleafTownRivalHouse2F_Text_IdBetterTakeBagAndJournal",
+      "id": "TwinleafTownRivalHouse2F_Text_TakeBagAndJournal",
       "en_US": [
         "{STRVAR_1 3, 0, 0}: ...I’d better take\n",
         "my Bag and Journal, too...\r"
       ]
     },
     {
-      "id": "TwinleafTownRivalHouse2F_Text_IllBeWaitingOnTheRoad",
+      "id": "TwinleafTownRivalHouse2F_Text_WaitingOnTheRoad",
       "en_US": [
         "Oh, hey, {STRVAR_1 3, 0, 0}!\r",
         "I’ll be waiting on the road!\n",

res/text/twinleaf_town_southwest_house.json

@@ -2,7 +2,7 @@
   "key": 9262,
   "messages": [
     {
-      "id": "TwinleafTownSouthwestHouse_Text_ThePokemonProfessorReturned",
+      "id": "TwinleafTownSouthwestHouse_Text_PokemonProfessorReturned",
       "en_US": [
         "Did you hear?\r",
         "The Pokémon Professor returned\n",
@@ -14,7 +14,7 @@
       ]
     },
     {
-      "id": "TwinleafTownSouthwestHouse_Text_ProfRowanGaveYouAPokedexDidHe",
+      "id": "TwinleafTownSouthwestHouse_Text_ProfRowanGavePokedex",
       "en_US": [
         "Well! Professor Rowan gave you a\n",
         "Pokédex, did he?"
@@ -28,7 +28,7 @@
       ]
     },
     {
-      "id": "TwinleafTownSouthwestHouse_Text_DoYouThinkICanBeFriendsWithPokemon",
+      "id": "TwinleafTownSouthwestHouse_Text_CanIBeFriendsWithPokemon",
       "en_US": [
         "Listen, listen, {STRVAR_1 3, 0, 0}.\r",
         "Do you think I can be friends with\n",

res/text/valley_windworks_building.json

@@ -2,7 +2,7 @@
   "key": 5122,
   "messages": [
     {
-      "id": "ValleyWindworksBuilding_Text_YouHaveTheKeyIveGotToAlertTheCommander",
+      "id": "ValleyWindworksBuilding_Text_GotToAlertCommander",
       "en_US": [
         "What?! No way!\n",
         "You have the key?\r",
@@ -13,7 +13,7 @@
       ]
     },
     {
-      "id": "ValleyWindworksBuilding_Text_HumphJustYouWaitOurCommanderWillSmooshYou",
+      "id": "ValleyWindworksBuilding_Text_CommanderWillSmooshYou",
       "en_US": [
         "My Pokémon can’t battle anymore.\r",
         "They’re gonna take away my Pokémon\n",
@@ -23,7 +23,7 @@
       ]
     },
     {
-      "id": "ValleyWindworksBuilding_Text_MyNameIsMarsLetsHaveABattleToDecideWhatWeShouldDoNext",
+      "id": "ValleyWindworksBuilding_Text_LetsHaveABattle",
       "en_US": [
         "I’m one of Team Galactic’s three\n",
         "Commanders.\r",
@@ -44,7 +44,7 @@
       ]
     },
     {
-      "id": "ValleyWindworksBuilding_Text_OopsIMessedThatOneUp",
+      "id": "ValleyWindworksBuilding_Text_IMessedThatOneUp",
       "en_US": [
         "Mars: Oops!\n",
         "I messed that one up!\r",
@@ -53,7 +53,7 @@
       ]
     },
     {
-      "id": "ValleyWindworksBuilding_Text_LoseToAChildWillYouNowMarsWeShouldBeGoing",
+      "id": "ValleyWindworksBuilding_Text_LoseToAChild",
       "en_US": [
         "Charon: My, my.\n",
         "Lose to a child, will you?\r",
@@ -78,14 +78,14 @@
       ]
     },
     {
-      "id": "ValleyWindworksBuilding_Text_IGuessItsTimeToSayGoodbyeAndLeaveForTheTimeBeing",
+      "id": "ValleyWindworksBuilding_Text_LeaveForTheTimeBeing",
       "en_US": [
         "I guess it’s time to say good-bye\n",
         "and leave for the time being!\r"
       ]
     },
     {
-      "id": "ValleyWindworksBuilding_Text_ICanFinallySeeMyLittleDaughterAgain",
+      "id": "ValleyWindworksBuilding_Text_FinallySeeMyDaughterAgain",
       "en_US": [
         "Team Galactic...\r",
         "They were saying they had to gather\n",
@@ -101,7 +101,7 @@
       ]
     },
     {
-      "id": "ValleyWindworksBuilding_Text_YuckPapaYoureStinkyGoShowerNowStinky",
+      "id": "ValleyWindworksBuilding_Text_YuckPapaYoureStinky",
       "en_US": [
         "Little girl: Papa!\r",
         "Yuck! Papa, you’re stinky!\n",
@@ -109,14 +109,14 @@
       ]
     },
     {
-      "id": "ValleyWindworksBuilding_Text_OhSorryAhahaTheyHadMeWorkingNonstop",
+      "id": "ValleyWindworksBuilding_Text_SorryWorkingNonstop",
       "en_US": [
         "Papa: Oh, sorry! Ahaha!\n",
         "They had me working nonstop!\r"
       ]
     },
     {
-      "id": "ValleyWindworksBuilding_Text_IThinkTheBalloonPokemonWillComeVisitingAgain",
+      "id": "ValleyWindworksBuilding_Text_BalloonPokemonWillVisitAgain",
       "en_US": [
         "Little girl: Thank you, Trainer!\n",
         "You made those bad people go away!\r",
@@ -125,7 +125,7 @@
       ]
     },
     {
-      "id": "ValleyWindworksBuilding_Text_ABalloonPokemonAppearsInFrontOfTheWindworksItsAlwaysACertainDayOfTheWeek",
+      "id": "ValleyWindworksBuilding_Text_BalloonPokemonOnDayOfWeek",
       "en_US": [
         "Papa: Oh, yes, a balloon Pokémon\n",
         "appears in front of the windworks.\r",
@@ -137,7 +137,7 @@
       ]
     },
     {
-      "id": "ValleyWindworksBuilding_Text_TheValleyWindworksUsesTurbinesToCaptureEnergy",
+      "id": "ValleyWindworksBuilding_Text_ValleyWindworksUsesTurbines",
       "en_US": [
         "The Valley Windworks uses turbines\n",
         "to capture energy from winds driven\f",
@@ -147,7 +147,7 @@
       ]
     },
     {
-      "id": "ValleyWindworksBuilding_Text_IfTheBalloonPokemonCameTheWindWouldBlowItAway",
+      "id": "ValleyWindworksBuilding_Text_BlowBalloonPokemonAway",
       "en_US": [
         "If the balloon Pokémon came,\n",
         "the wind would blow it away!"
@@ -170,7 +170,7 @@
       ]
     },
     {
-      "id": "ValleyWindworksBuilding_Text_ThePCScreenIsFilledWithNumbersUponNumbers",
+      "id": "ValleyWindworksBuilding_Text_PCScreenFilledWithNumbers",
       "en_US": [
         "The PC screen is filled with numbers\n",
         "upon numbers.\r",

res/text/valley_windworks_outside.json

@@ -2,7 +2,7 @@
   "key": 51110,
   "messages": [
     {
-      "id": "ValleyWindworksOutside_Text_DontYouDareGoIntoTheValleyWindworksYoullHaveToBattleMeForIt",
+      "id": "ValleyWindworksOutside_Text_BattleMeForIt",
       "en_US": [
         "Don’t you dare go into the Valley\n",
         "Windworks.\r",
@@ -15,7 +15,7 @@
       ]
     },
     {
-      "id": "ValleyWindworksOutside_Text_IsntThatJustGreatGettingOwnedBySomeKid",
+      "id": "ValleyWindworksOutside_Text_GettingOwnedBySomeKid",
       "en_US": [
         "Isn’t that just great.\n",
         "Getting owned by some kid.\r",
@@ -46,7 +46,7 @@
       ]
     },
     {
-      "id": "ValleyWindworksOutside_Text_IHaveReceivedTipsThatTheTeamGalacticHideoutIsInEternaCity",
+      "id": "ValleyWindworksOutside_Text_HideoutIsInEternaCity",
       "en_US": [
         "Looker: Magnificent! Yes, it is!\n",
         "What you have said, it is all true!\r",
@@ -68,25 +68,25 @@
       "en_US": "It’s locked from inside!"
     },
     {
-      "id": "ValleyWindworksOutside_Text_ItsLockedFromInsideUseTheWorksKey",
+      "id": "ValleyWindworksOutside_Text_UseTheWorksKey",
       "en_US": [
         "It’s locked from inside!\r",
         "Use the Works Key?"
       ]
     },
     {
-      "id": "ValleyWindworksOutside_Text_KerchunkTheDoorToValleyWindworksOpened",
+      "id": "ValleyWindworksOutside_Text_KerchunkTheDoorOpened",
       "en_US": [
         "Ker-chunk!\r",
         "The door to Valley Windworks opened!"
       ]
     },
     {
-      "id": "ValleyWindworksOutside_Text_Floooooon",
+      "id": "ValleyWindworksOutside_Text_DrifloonCry",
       "en_US": "Floooooon!\r"
     },
     {
-      "id": "ValleyWindworksOutside_Text_ValleyWindworksEcologicalWindDrivenEnergy",
+      "id": "ValleyWindworksOutside_Text_SignValleyWindworks",
       "en_US": [
         "Valley Windworks\n",
         "Ecological, Wind-Driven Energy"

res/text/veilstone_store_1f.json

@@ -33,7 +33,7 @@
       ]
     },
     {
-      "id": "VeilstoneStore1F_Text_GiveADifferentLookForContests",
+      "id": "VeilstoneStore1F_Text_DifferentLookForContests",
       "en_US": [
         "It’s a {STRVAR_1 31, 0, 0}.\r",
         "It will give your Pokémon a\n",

res/text/visible_items.json

@@ -13,7 +13,7 @@
       "en_US": "The Bag is full..."
     },
     {
-      "id": "VisibleItems_Text_PlayerPutTheItemInTheItemPocket1",
+      "id": "VisibleItems_Text_PlayerPutItemInItemPocket1",
       "en_US": [
         "{STRVAR_1 3, 0, 0} put the {STRVAR_1 8, 1, 0}\n",
         "in the {STRVAR_1 8, 2, 0} Pocket."
@@ -27,7 +27,7 @@
       ]
     },
     {
-      "id": "VisibleItems_Text_ObtainedTheItemTooBadTheBagIsFull",
+      "id": "VisibleItems_Text_ObtainedItemBagIsFull",
       "en_US": [
         "Obtained the {STRVAR_1 8, 0, 0}!\r",
         "Too bad!\n",
@@ -63,7 +63,7 @@
       ]
     },
     {
-      "id": "VisibleItems_Text_PlayerPutTheItemInTheItemPocket2",
+      "id": "VisibleItems_Text_PlayerPutItemInItemPocket2",
       "en_US": [
         "{STRVAR_1 3, 0, 0} put the {STRVAR_1 8, 1, 0}\n",
         "in the {COLOR 2}{STRVAR_1 31, 2, 0}{COLOR 0} Pocket."

res/text/wayward_cave_1f.json

@@ -2,7 +2,7 @@
   "key": 42051,
   "messages": [
     {
-      "id": "WaywardCave1F_Text_ImMiraPleaseTakeMeToTheExit",
+      "id": "WaywardCave1F_Text_PleaseTakeMeToTheExit",
       "en_US": [
         "I’m Mira...\r",
         "I was catching Pokémon, and then\n",
@@ -20,14 +20,14 @@
       ]
     },
     {
-      "id": "WaywardCave1F_Text_IllKeepYourPokemonHealthyAllTheTime",
+      "id": "WaywardCave1F_Text_IllKeepYourPokemonHealthy",
       "en_US": [
         "Mira: I’ll keep your Pokémon healthy\n",
         "all the time!"
       ]
     },
     {
-      "id": "WaywardCave1F_Text_MyNameIsMiraILikeYourName",
+      "id": "WaywardCave1F_Text_ILikeYourName",
       "en_US": [
         "Trainer, your name is {STRVAR_1 3, 0, 0}?\r",
         "My name is Mira.\n",
@@ -42,7 +42,7 @@
       ]
     },
     {
-      "id": "WaywardCave1F_Text_OhTheresTheExitThankYou",
+      "id": "WaywardCave1F_Text_TheresTheExit",
       "en_US": [
         "Mira: Oh! There’s the exit!\r",
         "I want to get tougher so I\n",
@@ -64,7 +64,7 @@
       "garbage": 26
     },
     {
-      "id": "WaywardCave1F_Text_ILikeHelpfulPokemonMovesLikeGrowlAndMinimize",
+      "id": "WaywardCave1F_Text_ILikeHelpfulMoves",
       "en_US": [
         "Mira: I like helpful Pokémon moves\n",
         "like Growl and Minimize.\r",
@@ -73,7 +73,7 @@
       ]
     },
     {
-      "id": "WaywardCave1F_Text_ThisCaveItsSoEasyToGetConfused",
+      "id": "WaywardCave1F_Text_EasyToGetConfused",
       "en_US": [
         "Mira: This cave...\n",
         "It’s so easy to get confused.\r",
@@ -81,7 +81,7 @@
       ]
     },
     {
-      "id": "WaywardCave1F_Text_PlayerDidYouGetToBeSoGoodBecauseYoureAlwaysWithPokemon",
+      "id": "WaywardCave1F_Text_MiraWillTryLikeYou",
       "en_US": [
         "Mira: {STRVAR_1 3, 0, 0}, did you get to be\n",
         "so good because you’re always with\f",