diff --git a/data/scripts/aide.inc b/data/scripts/aide.inc
index 113a0a001a..67c58affc8 100644
--- a/data/scripts/aide.inc
+++ b/data/scripts/aide.inc
@@ -16,13 +16,13 @@ Aide_EventScript_DeclineCheckMons::
 Aide_Text_HaventCaughtEnoughMonsForItem::
 	.string "Let's see…\n"
 	.string "Uh-oh! You have caught only\l"
-	.string "{STR_VAR_3} kinds of POKéMON!\p"
+	.string "{STR_VAR_3} kinds of [Pokémon]!\p"
 	.string "You need {STR_VAR_1} kinds\n"
 	.string "if you want the {STR_VAR_2}.$"
 
 Aide_Text_GetEnoughMonsComeBackForItem::
 	.string "…Oh. I see.\p"
-	.string "When you get {STR_VAR_1} kinds of POKéMON,\n"
+	.string "When you get {STR_VAR_1} kinds of [Pokémon],\n"
 	.string "come back for the {STR_VAR_2}.$"
 
 Aide_Text_DontHaveAnyRoomForItem::
diff --git a/data/scripts/apricorn_tree.inc b/data/scripts/apricorn_tree.inc
index 0562ec74d9..6a19d2270d 100644
--- a/data/scripts/apricorn_tree.inc
+++ b/data/scripts/apricorn_tree.inc
@@ -78,10 +78,10 @@ ApricornTree_Text_PickedTheApricorn:
 ApricornTree_Text_PutAwayApricorn:
 	.string "{PLAYER} put away the\n"
 	.string "{STR_VAR_1} in\l"
-	.string "the BAG's {STR_VAR_3} POCKET.$"
+	.string "the [Bag]'s {STR_VAR_3} [Pocket].$"
 
 ApricornTree_Text_PocketFull:
-	.string "The BAG's {STR_VAR_3} POCKET is full.\p"
+	.string "The [Bag]'s {STR_VAR_3} [Pocket] is full.\p"
 	.string "{PLAYER} gave up on the\n"
 	.string "{STR_VAR_1}…$"
 
diff --git a/data/scripts/battle_frontier.inc b/data/scripts/battle_frontier.inc
index cbfd1ac5ee..6835b0eefb 100644
--- a/data/scripts/battle_frontier.inc
+++ b/data/scripts/battle_frontier.inc
@@ -10,4 +10,4 @@ BattleFrontier_ShowCaughtBannedSpeciesEnd:
 
 BattleFrontier_DoYouWantToSeeTheListOfCaughtBannedSpecies:
 	.string "Do you want to see the list of\n"
-	.string "POKéMON species you can't bring?$"
+	.string "[Pokémon] species you can't bring?$"
diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc
index f935dd79af..0a771f7f13 100644
--- a/data/scripts/berry_blender.inc
+++ b/data/scripts/berry_blender.inc
@@ -1,7 +1,7 @@
 .set NUM_OPPONENTS, VAR_0x8009
 
 BerryBlender_Text_WantToMakePokeblocks:
-	.string "Oh? Did you want to make some {POKEBLOCK}S\n"
+	.string "Oh? Did you want to make some {POKEBLOCK}[s]\n"
 	.string "with this old-timer?$"
 
 BerryBlender_Text_Excellent:
@@ -16,43 +16,43 @@ BerryBlender_Text_KnowHowToMakePokeblocks:
 
 BerryBlender_Text_LetsBerryBlender:
 	.string "Let's get started, then!\p"
-	.string "Let's BERRY BLENDER!$"
+	.string "Let's [Berry Blender]!$"
 
 BerryBlender_Text_ExplainBerryBlending:
 	.string "Okay, a little explanation, then.\p"
 	.string "Oh, don't worry, it's quite simple.\p"
-	.string "When the BLENDER's arrow comes to\n"
+	.string "When the [Blender]'s arrow comes to\n"
 	.string "your marker, just press the A Button.\p"
 	.string "That's all you have to do.\n"
 	.string "You'll see how easy it is when you try.$"
 
 BerryBlender_Text_DontHaveAnyBerries:
 	.string "Oh?\n"
-	.string "You don't have any BERRIES?\p"
-	.string "If you don't have any BERRIES,\n"
-	.string "you can't make any {POKEBLOCK}S.$"
+	.string "You don't have any [Berries]?\p"
+	.string "If you don't have any [Berries],\n"
+	.string "you can't make any {POKEBLOCK}[s].$"
 
 BerryBlender_Text_CanHaveOneOfMyBerries:
 	.string "Well, that won't do at all now, will it?\p"
 	.string "If you don't mind leftovers, you can\n"
-	.string "have one of my BERRIES.\p"
-	.string "That way, we could make some {POKEBLOCK}S\n"
-	.string "together using the BERRY BLENDER.$"
+	.string "have one of my [Berries].\p"
+	.string "That way, we could make some {POKEBLOCK}[s]\n"
+	.string "together using the [Berry Blender].$"
 
 BerryBlender_Text_DontHaveAnyBerriesToSpare:
-	.string "If I had some BERRIES left over,\n"
+	.string "If I had some [Berries] left over,\n"
 	.string "I'd gladly give you one…\p"
 	.string "But, I don't have any to spare today.\n"
 	.string "We'll have to do this another time.$"
 
 BerryBlender_Text_PokeblockCaseIsFull:
-	.string "But your {POKEBLOCK} CASE is full.\p"
-	.string "You should use some {POKEBLOCK}S before\n"
+	.string "But your {POKEBLOCK} [Case] is full.\p"
+	.string "You should use some {POKEBLOCK}[s] before\n"
 	.string "you come see me again.$"
 
 BerryBlender_Text_DontHavePokeblockCase:
-	.string "But you don't have a {POKEBLOCK} CASE.\p"
-	.string "You should get a {POKEBLOCK} CASE and then\n"
+	.string "But you don't have a {POKEBLOCK} [Case].\p"
+	.string "You should get a {POKEBLOCK} [Case] and then\n"
 	.string "come see me.$"
 
 BerryBlender_Text_LetsGetBlendingAlready:
@@ -64,7 +64,7 @@ BerryBlender_Text_WhatKindOfPokeblockWillIGet:
 
 BerryBlender_Text_WantToBlendPokeblocksWithUs:
 	.string "Hi, there! Did you want to blend some\n"
-	.string "{POKEBLOCK}S with us?$"
+	.string "{POKEBLOCK}[s] with us?$"
 
 BerryBlender_Text_Okay:
 	.string "Okay!$"
@@ -76,16 +76,16 @@ BerryBlender_Text_ThatsTooBad:
 
 BerryBlender_Text_KnowHowToMakePokeblocks2:
 	.string "Of course, you do know how to\n"
-	.string "blend {POKEBLOCK}S, don't you?$"
+	.string "blend {POKEBLOCK}[s], don't you?$"
 
 BerryBlender_Text_LetsBerryBlender2:
 	.string "Let's get started, then!\p"
-	.string "Let's BERRY BLENDER!$"
+	.string "Let's [Berry Blender]!$"
 
 BerryBlender_Text_ExplainBerryBlending2:
 	.string "Okay!\n"
 	.string "Let me explain it to you!\p"
-	.string "When the spinning BLENDER's arrow\n"
+	.string "When the spinning [Blender]'s arrow\n"
 	.string "reaches your marker, just press\l"
 	.string "the A Button.\p"
 	.string "That's all it takes.\n"
@@ -93,28 +93,28 @@ BerryBlender_Text_ExplainBerryBlending2:
 
 BerryBlender_Text_DontHaveAnyBerries2:
 	.string "Oh, but wait a second here…\n"
-	.string "You don't have any BERRIES.\p"
-	.string "You can't make any {POKEBLOCK}S without\n"
-	.string "BERRIES…\p"
+	.string "You don't have any [Berries].\p"
+	.string "You can't make any {POKEBLOCK}[s] without\n"
+	.string "[Berries]…\p"
 	.string "We'll always be around whenever you\n"
-	.string "get hold of some BERRIES to blend.$"
+	.string "get hold of some [Berries] to blend.$"
 
 BerryBlender_Text_PokeblockCaseIsFull2:
 	.string "Oh, but wait a second here…\n"
-	.string "Your {POKEBLOCK} CASE is full.\p"
-	.string "You should use some {POKEBLOCK}S and\n"
+	.string "Your {POKEBLOCK} [Case] is full.\p"
+	.string "You should use some {POKEBLOCK}[S] and\n"
 	.string "then come back.$"
 
 BerryBlender_Text_DontHavePokeblockCase2:
 	.string "Oh, but wait a second here…\n"
-	.string "You don't have a {POKEBLOCK} CASE.\p"
-	.string "You should get a {POKEBLOCK} CASE and\n"
+	.string "You don't have a {POKEBLOCK} [Case].\p"
+	.string "You should get a {POKEBLOCK} [Case] and\n"
 	.string "then come back.$"
 
 @ Unused
 BerryBlender_Text_MakePokeblocksWithOurGroup:
 	.string "Oh, hello! Did you want to make some\n"
-	.string "{POKEBLOCK}S with our little group?$"
+	.string "{POKEBLOCK}[s] with our little group?$"
 
 BerryBlender_Text_OhDear:
 	.string "Oh, dear!$"
@@ -125,45 +125,45 @@ BerryBlender_Text_LeftUsInShock:
 
 BerryBlender_Text_KnowHowToMakePokeblocks3:
 	.string "Naturally, you know how to make\n"
-	.string "{POKEBLOCK}S, don't you?$"
+	.string "{POKEBLOCK}[s], don't you?$"
 
 BerryBlender_Text_LetsBerryBlender3:
 	.string "Okay, dear!\n"
 	.string "Let's get started!\p"
-	.string "Let's BERRY BLENDER!$"
+	.string "Let's [Berry Blender]!$"
 
 BerryBlender_Text_ExplainBerryBlending3:
 	.string "Oh, dear!\p"
 	.string "Then, I'll explain it to you nicely.\p"
-	.string "When the BLENDER's arrow spins to\n"
+	.string "When the [Blender]'s arrow spins to\n"
 	.string "your marker, press the A Button.\p"
 	.string "That's all it takes.\n"
 	.string "Isn't it simple?$"
 
 BerryBlender_Text_DontHaveAnyBerries3:
-	.string "You don't have any BERRIES,\n"
+	.string "You don't have any [Berries],\n"
 	.string "do you?\p"
-	.string "If you don't have any BERRIES,\n"
-	.string "you can't make any {POKEBLOCK}S.\p"
-	.string "We'll always be making {POKEBLOCK}S here,\n"
+	.string "If you don't have any [Berries],\n"
+	.string "you can't make any {POKEBLOCK}[s].\p"
+	.string "We'll always be making {POKEBLOCK}[s] here,\n"
 	.string "so let's make some together when\l"
-	.string "you get a BERRY or two.$"
+	.string "you get a [Berry] or two.$"
 
 BerryBlender_Text_PokeblockCaseIsFull3:
-	.string "Your {POKEBLOCK} CASE is full,\n"
+	.string "Your {POKEBLOCK} [Case] is full,\n"
 	.string "it looks like.\p"
-	.string "You should use some {POKEBLOCK}S up\n"
+	.string "You should use some {POKEBLOCK}[S] up\n"
 	.string "and then come back.$"
 
 BerryBlender_Text_DontHavePokeblockCase3:
-	.string "You haven't gotten a {POKEBLOCK} CASE\n"
+	.string "You haven't gotten a {POKEBLOCK} [Case]\n"
 	.string "yet, it looks like.\p"
-	.string "You need to get a {POKEBLOCK} CASE before\n"
+	.string "You need to get a {POKEBLOCK} [Case] before\n"
 	.string "you come back.$"
 
 BerryBlender_Text_SetNewBlenderRecord:
 	.string "Okay! Today's going to be the day that\n"
-	.string "I set a new BLENDER speed record!$"
+	.string "I set a new [Blender] speed record!$"
 
 BerryBlender_Text_LookGoodAtBlendingJoinUs:
 	.string "Oh, dear!\n"
@@ -171,12 +171,12 @@ BerryBlender_Text_LookGoodAtBlendingJoinUs:
 	.string "Would you like to join us?$"
 
 BerryBlender_Text_MakeDeliciousPokeblocks:
-	.string "I'm going to make delicious {POKEBLOCK}S\n"
-	.string "and make my POKéMON cuter.$"
+	.string "I'm going to make delicious {POKEBLOCK}[s]\n"
+	.string "and make my [Pokémon] cuter.$"
 
 BerryBlender_Text_SaveGameBeforeBerryBlenderLink:
-	.string "{POKEBLOCK}S will be made with your friends \n"
-	.string "from BERRIES in the BERRY BLENDER.\p"
+	.string "{POKEBLOCK}[s] will be made with your friends \n"
+	.string "from [Berries] in the [Berry Blender].\p"
 	.string "Is it okay to save the game before\n"
 	.string "linking with your friends?$"
 
@@ -195,40 +195,40 @@ BerryBlender_Text_AllPlayersArrived:
 	.string "{STR_VAR_3} arrived.$"
 
 BerryBlender_Text_NoBerriesLink:
-	.string "You have no BERRIES.\n"
-	.string "The BERRY BLENDER can't be used.$"
+	.string "You have no [Berries].\n"
+	.string "The [Berry Blender] can't be used.$"
 
 BerryBlender_Text_PokeblockCaseIsFullLink:
-	.string "Your {POKEBLOCK} CASE is full.\n"
-	.string "The BERRY BLENDER can't be used.$"
+	.string "Your {POKEBLOCK} [Case] is full.\n"
+	.string "The [Berry Blender] can't be used.$"
 
 BerryBlender_Text_DontHavePokeblockCaseLink:
-	.string "You don't have a {POKEBLOCK} CASE.\n"
-	.string "The BERRY BLENDER can't be used.$"
+	.string "You don't have a {POKEBLOCK} [Case].\n"
+	.string "The [Berry Blender] can't be used.$"
 
 BerryBlender_Text_LoveMakingPokeblocks:
-	.string "I love making {POKEBLOCK}S.\p"
-	.string "I always have some BERRIES with me.$"
+	.string "I love making {POKEBLOCK}[s].\p"
+	.string "I always have some [Berries] with me.$"
 
 BerryBlender_Text_MakePokeblocksUsingBerryBlender:
 	.string "If you'd like, we could make some\n"
-	.string "{POKEBLOCK}S together using the\l"
-	.string "BERRY BLENDER.$"
+	.string "{POKEBLOCK}[s] together using the\l"
+	.string "[Berry Blender].$"
 
 BerryBlender_Text_DontHaveAnyBerriesHaveOne:
 	.string "Oh?\n"
-	.string "You don't have any BERRIES?\p"
+	.string "You don't have any [Berries]?\p"
 	.string "Well, that won't do at all now, will it?\p"
 	.string "If you don't mind leftovers, you can\n"
-	.string "have one of my BERRIES.$"
+	.string "have one of my [Berries].$"
 
 BerryBlender_Text_UseItToMakePokeblocksTogether:
-	.string "We'll use it to make {POKEBLOCK}S together\n"
-	.string "using the BERRY BLENDER.$"
+	.string "We'll use it to make {POKEBLOCK}[s] together\n"
+	.string "using the [Berry Blender].$"
 
 BerryBlender_Text_DontHaveAnyBerriesNoneToSpare:
 	.string "Oh?\n"
-	.string "You don't have any BERRIES?\p"
+	.string "You don't have any [Berries]?\p"
 	.string "If I had some left over, I'd gladly\n"
 	.string "give you one…\p"
 	.string "But, I don't have any to spare today.\n"
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 4112f2ab8e..9fc0b05a52 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -259,7 +259,7 @@ BerryTree_Text_ItsSoftLoamySoil:
 
 BerryTree_Text_WantToPlant:
 	.string "It's soft, loamy soil.\n"
-	.string "Want to plant a BERRY?$"
+	.string "Want to plant a [Berry]?$"
 
 BerryTree_Text_PlantedOneBerry:
 	.string "{PLAYER} planted one {STR_VAR_1} in\n"
@@ -319,12 +319,12 @@ BerryTree_Text_PickedTheBerry:
 
 BerryTree_Text_PutAwayBerry:
 	.string "{PLAYER} put away the {STR_VAR_1}\n"
-	.string "in the BAG's BERRIES POCKET.\p"
+	.string "in the [Bag]'s [Berries Pocket].\p"
 	.string "The soil returned to its soft and\n"
 	.string "loamy state.$"
 
 BerryTree_Text_BerryPocketFull:
-	.string "The BAG's BERRIES POCKET is full.\p"
+	.string "The [Bag]'s [Berries Pocket] is full.\p"
 	.string "The {STR_VAR_1} couldn't be taken.$"
 
 BerryTree_Text_BerryLeftUnpicked:
@@ -333,7 +333,7 @@ BerryTree_Text_BerryLeftUnpicked:
 
 BerryTree_Text_WantToWater:
 	.string "Want to water the {STR_VAR_1} with the\n"
-	.string "WAILMER PAIL?$"
+	.string "[Wailmer Pail]?$"
 
 BerryTree_Text_WateredTheBerry:
 	.string "{PLAYER} watered the {STR_VAR_1}.$"
@@ -388,7 +388,7 @@ BerryTree_Text_BerryLeftUnpicked_Mutation:
 	.string "and the {STR_VAR_3} unpicked.$"
 
 BerryTree_Text_BerryPocketFull_Mutation:
-	.string "The BAG's BERRIES POCKET is full.\p"
+	.string "The [Bag]'s [Berries Pocket] is full.\p"
 	.string "The {STR_VAR_1} and the\n"
 	.string "{STR_VAR_3} couldn't be taken.$"
 
@@ -398,8 +398,8 @@ BerryTree_Text_PickedTheBerry_Mutation:
 
 BerryTree_Text_PutAwayBerry_Mutation:
 	.string "{PLAYER} put away the {STR_VAR_1}\n"
-	.string "and the {STR_VAR_3} in the BAG's\l"
-	.string "BERRIES POCKET.\p"
+	.string "and the {STR_VAR_3} in the [Bag]'s\l"
+	.string "[Berries Pocket].\p"
 	.string "The soil returned to its soft and\n"
 	.string "loamy state.$"
 .endif
diff --git a/data/scripts/cable_club_frlg.inc b/data/scripts/cable_club_frlg.inc
index bba62dda1d..4ed76bdd8a 100644
--- a/data/scripts/cable_club_frlg.inc
+++ b/data/scripts/cable_club_frlg.inc
@@ -1219,8 +1219,8 @@ TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords::
 	end
 
 CableClub_Text_WelcomeWhichCableClubService_Frlg::
-	.string "Welcome to the POKéMON CABLE\n"
-	.string "CLUB.\p"
+	.string "Welcome to the [Pokémon Cable]\n"
+	.string "[Club].\p"
 	.string "Which of our services do you wish\n"
 	.string "to use?$"
 
@@ -1229,11 +1229,11 @@ CableClub_Text_WhichService_Frlg::
 	.string "to use?$"
 
 CableClub_Text_TradeMonsUsingLinkCable_Frlg::
-	.string "Trade POKéMON with another player\n"
+	.string "Trade [Pokémon] with another player\n"
 	.string "using a GBA Game Link cable.$"
 
 CableClub_Text_BattleUsingLinkCable_Frlg::
-	.string "You may battle another TRAINER\n"
+	.string "You may battle another [Trainer]\n"
 	.string "using a GBA Game Link cable.$"
 
 @ Unused, translated in Emerald
@@ -1241,16 +1241,16 @@ CableClub_Text_CloseThisMenu_Frlg::
 	.string "おわります$"
 
 CableClub_Text_NeedTwoMonsForDoubleBattle_Frlg::
-	.string "For a DOUBLE BATTLE, you must\n"
-	.string "have at least two POKéMON.$"
+	.string "For a [Double Battle], you must\n"
+	.string "have at least two [Pokémon].$"
 
 CableClub_Text_NeedTwoMonsToTrade_Frlg::
 	.string "For trading, you must have at\n"
-	.string "least two POKéMON with you.$"
+	.string "least two [Pokémon] with you.$"
 
 CableClub_Text_CantTradeEnigmaBerry_Frlg::
-	.string "A POKéMON holding the {STR_VAR_1}\n"
-	.string "BERRY can't be traded.$"
+	.string "A [Pokémon] holding the {STR_VAR_1}\n"
+	.string "[Berry] can't be traded.$"
 
 CableClub_Text_PleaseWaitBCancel_Frlg::
 	.string "Please wait.\n"
@@ -1302,11 +1302,11 @@ CableClub_Text_IncorrectNumberOfParticipants_Frlg::
 	.string "incorrect.$"
 
 CableClub_Text_CantSingleBattleWithXPlayers_Frlg::
-	.string "The SINGLE BATTLE Mode can't be\n"
+	.string "The [Single Battle] Mode can't be\n"
 	.string "played by {STR_VAR_1} players.$"
 
 CableClub_Text_CantDoubleBattleWithXPlayers_Frlg::
-	.string "The DOUBLE BATTLE Mode can't be\n"
+	.string "The [Double Battle] Mode can't be\n"
 	.string "played by {STR_VAR_1} players.$"
 
 CableClub_Text_NeedFourPlayers_Frlg::
@@ -1327,16 +1327,16 @@ Text_TerminateLinkConfirmation_Frlg::
 	.string "the room. Please wait.$"
 
 Text_TrainerTooBusyToNotice_Frlg::
-	.string "This TRAINER is too busy to\n"
+	.string "This [Trainer] is too busy to\n"
 	.string "notice…$"
 
 Text_LookedAtPlayersTrainerCard_Frlg::
 	.string "Score! Got to look at {STR_VAR_1}'s\n"
-	.string "TRAINER CARD!$"
+	.string "[Trainer Card]!$"
 
 Text_LookedAtPlayersTrainerCardColored_Frlg::
 	.string "Score! Got to look at {STR_VAR_1}'s\n"
-	.string "TRAINER CARD!\p"
+	.string "[Trainer Card]!\p"
 	.string "It's a {STR_VAR_2} card!$"
 
 Text_TakeSeatStartBattle_Frlg::
@@ -1352,7 +1352,7 @@ RecordCorner_Text_ThanksForComing_Frlg::
 	.string "ごりよう　ありがとう　ございました$"
 
 CableClub_Text_TrainerCardDataOverwritten_Frlg::
-	.string "The TRAINER CARD data will\n"
+	.string "The [Trainer Card] data will\n"
 	.string "be overwritten.$"
 
 CableClub_Text_HopeToSeeYouAgain_Frlg::
@@ -1361,14 +1361,14 @@ CableClub_Text_HopeToSeeYouAgain_Frlg::
 CableClub_Text_NotSetUpForFarAwayRegion_Frlg::
 	.string "I'm awfully sorry.\p"
 	.string "We're not set up to conduct trades\n"
-	.string "with TRAINERS far away in another\l"
+	.string "with [Trainers] far away in another\l"
 	.string "region yet…$"
 
 CableClub_Text_OtherTrainerNotReady_Frlg::
-	.string "The other TRAINER is not ready.$"
+	.string "The other [Trainer] is not ready.$"
 
 CableClub_Text_YouHaveAMonThatCantBeTaken_Frlg::
-	.string "You have at least one POKéMON\n"
+	.string "You have at least one [Pokémon]\n"
 	.string "that can't be taken.$"
 
 CableClub_Text_AdapterNotConnected_Frlg::
@@ -1388,16 +1388,16 @@ CableClub_Text_PleaseWait_Frlg::
 	.string "しょうしょう　おまちください$"
 
 CableClub_Text_YouMayTradeHere_Frlg::
-	.string "You may trade your POKéMON here\n"
-	.string "with another TRAINER.$"
+	.string "You may trade your [Pokémon] here\n"
+	.string "with another [Trainer].$"
 
 CableClub_Text_YouMayBattleHere_Frlg::
 	.string "You may battle with your friends\n"
 	.string "here.$"
 
 CableClub_Text_CanMakeBerryPowder_Frlg::
-	.string "Two to five TRAINERS can make\n"
-	.string "BERRY POWDER together.$"
+	.string "Two to five [Trainers] can make\n"
+	.string "[Berry Powder] together.$"
 
 @ Unused, Record Mix nopped
 CableClub_Text_CanMixRecords_Frlg::
@@ -1405,7 +1405,7 @@ CableClub_Text_CanMixRecords_Frlg::
 	.string "あそびかたを　せつめいします$"
 
 CableClub_Text_CancelSelectedItem_Frlg::
-	.string "Cancels the selected MENU item.$"
+	.string "Cancels the selected [Menu] item.$"
 
 @ Unused, translated in Emerald
 CableClub_Text_WhichBattleMode_Frlg::
@@ -1416,20 +1416,20 @@ CableClub_Text_ReturnsToPreviousStep_Frlg::
 	.string "ひとつ　まえに　もどります$"
 
 CableClub_Text_NeedBerryForBerryCrush_Frlg::
-	.string "To use the BERRY CRUSH service,\n"
-	.string "you must have at least one BERRY.$"
+	.string "To use the [Berry Crush] service,\n"
+	.string "you must have at least one [Berry].$"
 
 CableClub_Text_NeedTwoMonsForUnionRoom_Frlg::
-	.string "To enter the UNION ROOM, you must\n"
-	.string "have at least two POKéMON.$"
+	.string "To enter the [Union Room], you must\n"
+	.string "have at least two [Pokémon].$"
 
 CableClub_Text_NoEnigmaBerryInUnionRoom_Frlg::
-	.string "No POKéMON holding the {STR_VAR_1}\n"
-	.string "BERRY may enter the UNION ROOM.$"
+	.string "No [Pokémon] holding the {STR_VAR_1}\n"
+	.string "[Berry] may enter the [Union Room].$"
 
 CableClub_Text_UnionRoomAdapterNotConnected_Frlg::
-	.string "This is the POKéMON WIRELESS CLUB\n"
-	.string "UNION ROOM.\p"
+	.string "This is the [Pokémon Wireless Club]\n"
+	.string "[Union Room].\p"
 	.string "Unfortunately, your Wireless\n"
 	.string "Adapter is not connected properly.\p"
 	.string "Please do come again.$"
@@ -1445,26 +1445,26 @@ Text_DescribeWhichGame_Frlg::
 	.string "Which game should I describe?$"
 
 Text_PokemonJumpInfo_Frlg::
-	.string "“POKéMON JUMP”\p"
-	.string "Make your POKéMON skip the\n"
-	.string "VINE WHIP rope with the A Button.\p"
-	.string "Only mini POKéMON around 28 inches\n"
+	.string "“[Pokémon Jump]”\p"
+	.string "Make your [Pokémon] skip the\n"
+	.string "[Vine Whip] rope with the A Button.\p"
+	.string "Only mini [Pokémon] around 28 inches\n"
 	.string "or less may participate.\p"
-	.string "POKéMON that only swim, burrow, or\n"
+	.string "[Pokémon] that only swim, burrow, or\n"
 	.string "fly are not good at jumping.\p"
-	.string "As a result, those POKéMON may not\n"
+	.string "As a result, those [Pokémon] may not\n"
 	.string "participate.\p"
 	.string "Good things happen if everyone\n"
 	.string "jumps in time.$"
 
 Text_DodrioBerryPickingInfo_Frlg::
-	.string "“DODRIO BERRY-PICKING”\p"
-	.string "Command DODRIO's three heads to\n"
-	.string "catch falling BERRIES.\p"
+	.string "“[Dodrio Berry-Picking]”\p"
+	.string "Command [Dodrio]'s three heads to\n"
+	.string "catch falling [Berries].\p"
 	.string "Press right, up, or left on the\n"
 	.string "{PLUS} Control Pad to move the heads.\p"
 	.string "To play this game, you must have\n"
-	.string "a DODRIO.$"
+	.string "a [Dodrio].$"
 
 Text_TalkToManToPlay_Frlg::
 	.string "If you want to play a game,\n"
@@ -1489,7 +1489,7 @@ Text_PlayWhichGame_Frlg::
 	.string "to play?$"
 
 Text_EnterWhichPokemon_Frlg::
-	.string "Which POKéMON would you like to\n"
+	.string "Which [Pokémon] would you like to\n"
 	.string "enter?$"
 
 Text_AllGoodToGo_Frlg::
@@ -1503,23 +1503,23 @@ Text_LeavingDoComeAgain_Frlg::
 
 EventScript_ExplainPokemonJumpRequirements_Frlg::
 	.string "It doesn't look like you have any\n"
-	.string "POKéMON that you can enter…\p"
+	.string "[Pokémon] that you can enter…\p"
 	.string "Would you like me to explain what\n"
-	.string "kinds of POKéMON can enter?$"
+	.string "kinds of [Pokémon] can enter?$"
 
 Text_ShortJumpingPokemonAllowed_Frlg::
-	.string "“POKéMON JUMP” is open to POKéMON\n"
+	.string "“[Pokémon Jump]” is open to [Pokémon]\n"
 	.string "around 28 inches or less.\p"
 	.string "What you can't enter are those\n"
-	.string "POKéMON that can't jump.\p"
-	.string "You know, like POKéMON that only\n"
+	.string "[Pokémon] that can't jump.\p"
+	.string "You know, like [Pokémon] that only\n"
 	.string "swim, burrow, or fly.\p"
 	.string "That's all you need to know.$"
 
 Text_OnlyDodrioAllowed_Frlg::
-	.string "“DODRIO BERRY-PICKING”…\n"
+	.string "“[Dodrio Berry-Picking]”…\n"
 	.string "Well, the name says it all.\p"
-	.string "You have to have a DODRIO to play\n"
+	.string "You have to have a [Dodrio] to play\n"
 	.string "this game.$"
 
 @ Unused, translated in Emerald
@@ -1528,15 +1528,15 @@ Text_RetryFromStartPlease_Frlg::
 	.string "やりなおして　みて　くれ$"
 
 CableClub_Text_WelcomeWhichDirectCornerRoom_Frlg::
-	.string "Welcome to the POKéMON WIRELESS\n"
-	.string "CLUB DIRECT CORNER.\p"
+	.string "Welcome to the [Pokémon Wireless]\n"
+	.string "[Club Direct Corner].\p"
 	.string "You may interact directly with\n"
 	.string "your friends here.\p"
 	.string "Which room would you like to\n"
 	.string "enter?$"
 
 CableClub_Text_TradePokemon_Frlg::
-	.string "Would you like to trade POKéMON?$"
+	.string "Would you like to trade [Pokémon]?$"
 
 CableClub_Text_PlayWhichBattleMode_Frlg::
 	.string "Which Battle Mode would you like\n"
@@ -1544,133 +1544,133 @@ CableClub_Text_PlayWhichBattleMode_Frlg::
 
 CableClub_Text_UseBerryCrush_Frlg::
 	.string "Would you like to use the\n"
-	.string "BERRY CRUSH System?$"
+	.string "[Berry Crush] System?$"
 
 CableClub_Text_ExplainBattleModes_Frlg::
 	.string "There are three Battle Modes.\p"
-	.string "SINGLE BATTLE is for two TRAINERS\n"
-	.string "with one or more POKéMON each.\p"
-	.string "Each TRAINER can have one POKéMON\n"
+	.string "[Single Battle] is for two [Trainers]\n"
+	.string "with one or more [Pokémon] each.\p"
+	.string "Each [Trainer] can have one [Pokémon]\n"
 	.string "in battle at a time.\p"
-	.string "DOUBLE BATTLE is for two TRAINERS\n"
-	.string "with two or more POKéMON each.\p"
-	.string "Each TRAINER will send out two\n"
-	.string "POKéMON in battle at a time.\p"
-	.string "MULTI BATTLE is for four TRAINERS\n"
-	.string "with one or more POKéMON each.\p"
-	.string "Each TRAINER can have one POKéMON\n"
+	.string "[Double Battle] is for two [Trainers]\n"
+	.string "with two or more [Pokémon] each.\p"
+	.string "Each [Trainer] will send out two\n"
+	.string "[Pokémon] in battle at a time.\p"
+	.string "[Multi Battle] is for four [Trainers]\n"
+	.string "with one or more [Pokémon] each.\p"
+	.string "Each [Trainer] can have one [Pokémon]\n"
 	.string "in battle at a time.$"
 
 CableClub_Text_ChooseGroupLeaderOfTwo_Frlg::
 	.string "Please decide which of you two\n"
-	.string "will become the LEADER.\p"
+	.string "will become the [Leader].\p"
 	.string "The other player must then choose\n"
-	.string "“JOIN GROUP.”$"
+	.string "“[Join Group].”$"
 
 CableClub_Text_ChooseGroupLeaderOfFour_Frlg::
 	.string "Please decide which of you four\n"
-	.string "will become the GROUP LEADER.\p"
+	.string "will become the [Group Leader].\p"
 	.string "The other players must then choose\n"
-	.string "“JOIN GROUP.”$"
+	.string "“[Join Group].”$"
 
 CableClub_Text_ChooseGroupLeader_Frlg::
 	.string "Please decide which of you will\n"
-	.string "become the GROUP LEADER.\p"
+	.string "become the [Group Leader].\p"
 	.string "The other players must then choose\n"
-	.string "“JOIN GROUP.”$"
+	.string "“[Join Group].”$"
 
 CableClub_Text_WelcomeUnionRoomEnter_Frlg::
-	.string "Welcome to the POKéMON WIRELESS\n"
-	.string "CLUB UNION ROOM.\p"
+	.string "Welcome to the [Pokémon Wireless]\n"
+	.string "[Club Union Room].\p"
 	.string "You may interact directly with\n"
-	.string "other TRAINERS here, some of\l"
+	.string "other [Trainers] here, some of\l"
 	.string "whom you may not even know.\p"
-	.string "Would you like to enter the ROOM?$"
+	.string "Would you like to enter the [Room]?$"
 
 CableClub_Text_UnionRoomInfo_Frlg::
-	.string "The TRAINERS in the UNION ROOM\n"
+	.string "The [Trainers] in the [Union Room]\n"
 	.string "will be those players around you\l"
-	.string "who have also entered the ROOM.\p"
+	.string "who have also entered the [Room].\p"
 	.string "You may do all sorts of things\n"
 	.string "here, such as exchanging greetings.\p"
-	.string "You may enter two POKéMON up to\n"
+	.string "You may enter two [Pokémon] up to\n"
 	.string "Lv. 30 for a one-on-one battle.\p"
 	.string "You may take part in a chat with\n"
 	.string "two to five people.\p"
-	.string "Or, you may register a POKéMON for\n"
+	.string "Or, you may register a [Pokémon] for\n"
 	.string "trade.\p"
-	.string "Would you like to enter the ROOM?$"
+	.string "Would you like to enter the [Room]?$"
 
 CableClub_Text_EnjoyUnionRoom_Frlg::
 	.string "I hope you enjoy your time in\n"
-	.string "the UNION ROOM.$"
+	.string "the [Union Room].$"
 
 CableClub_Text_FirstTimeRightThisWay_Frlg::
 	.string "Hello!\n"
-	.string "My name is TEALA.\p"
+	.string "My name is [Teala].\p"
 	.string "This must be your first time\n"
 	.string "up here.\p"
 	.string "I'll show you how the Wireless\n"
 	.string "Communication System works.\p"
 	.string "First, I need to show you this\n"
-	.string "floor of our POKéMON CENTER.\p"
+	.string "floor of our [Pokémon Center].\p"
 	.string "Right this way, please.$"
 
 CableClub_Text_ExplainWirelessClubFirstTime_Frlg::
 	.string "On the top floor, there are two\n"
 	.string "rooms.\p"
 	.string "First, the room on the left.\n"
-	.string "It's the UNION ROOM.\p"
-	.string "You may link up with TRAINERS\n"
+	.string "It's the [Union Room].\p"
+	.string "You may link up with [Trainers]\n"
 	.string "around you who have also entered\l"
-	.string "the UNION ROOM.\p"
+	.string "the [Union Room].\p"
 	.string "With them, you may do things like\n"
 	.string "chat, battle, and trade.\p"
 	.string "Second, the room on the right is\n"
-	.string "the DIRECT CORNER.\p"
-	.string "You may trade or battle POKéMON\n"
+	.string "the [Direct Corner].\p"
+	.string "You may trade or battle [Pokémon]\n"
 	.string "with your friends in this room.\p"
 	.string "If the Wireless Adapter isn't\n"
 	.string "connected, you may still link up\l"
 	.string "using a GBA Game Link cable.\p"
 	.string "If that is the case, you must go\n"
-	.string "to the DIRECT CORNER.\p"
+	.string "to the [Direct Corner].\p"
 	.string "I hope you enjoy the Wireless \n"
 	.string "Communication System.$"
 
 CableClub_Text_AskAboutLinking_Frlg::
 	.string "Hello, {PLAYER}!\p"
-	.string "It's me, TEALA, the POKéMON\n"
-	.string "CENTER 2F attendant.\p"
+	.string "It's me, [Teala], the [Pokémon]\n"
+	.string "[Center] 2F attendant.\p"
 	.string "Is there something you needed to\n"
 	.string "ask me about linking?$"
 
 CableClub_Text_ExplainWirelessClub_Frlg::
-	.string "Let me explain how the POKéMON\n"
-	.string "WIRELESS CLUB works.\p"
+	.string "Let me explain how the [Pokémon]\n"
+	.string "[Wireless Club] works.\p"
 	.string "On this, the top floor, there are\n"
 	.string "two rooms.\p"
 	.string "First, the room on the left.\n"
-	.string "It's the UNION ROOM.\p"
-	.string "You may link up with TRAINERS\n"
+	.string "It's the [Union Room].\p"
+	.string "You may link up with [Trainers]\n"
 	.string "around you who have also entered\l"
-	.string "the UNION ROOM.\p"
+	.string "the [Union Room].\p"
 	.string "With them, you may do things like\n"
 	.string "chat, battle, and trade.\p"
 	.string "Second, the room on the right is\n"
-	.string "the DIRECT CORNER.\p"
-	.string "You may trade or battle POKéMON\n"
+	.string "the [Direct Corner].\p"
+	.string "You may trade or battle [Pokémon]\n"
 	.string "with your friends in this room.\p"
 	.string "Sometimes, you may not be able to\n"
-	.string "find your friends in the UNION ROOM\l"
-	.string "or the DIRECT CORNER.\p"
+	.string "find your friends in the [Union Room]\l"
+	.string "or the [Direct Corner].\p"
 	.string "In that case, please move closer\n"
 	.string "to your friends.\p"
 	.string "If the Wireless Adapter isn't\n"
 	.string "connected, you may still link up\l"
 	.string "using a GBA Game Link cable.\p"
 	.string "If that is the case, you must go\n"
-	.string "to the DIRECT CORNER.\p"
+	.string "to the [Direct Corner].\p"
 	.string "I hope you enjoy the Wireless \n"
 	.string "Communication System.$"
 
@@ -1680,7 +1680,7 @@ CableClub_Text_HopeYouEnjoyWirelessSystem_Frlg::
 
 Text_WirelessClubUndergoingAdjustments::
 	.string "I'm terribly sorry.\n"
-	.string "The POKéMON WIRELESS CLUB is\l"
+	.string "The [Pokémon Wireless Club] is\l"
 	.string "undergoing adjustments now.$"
 
 Text_AppearsToBeUndergoingAdjustments::
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 717eaa9edc..3d5ecc2270 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -1358,9 +1358,9 @@ LilycoveCity_ContestLobby_EventScript_DelayForRSPlayer::
 LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase:
 	.string "Hello!\p"
 	.string "This is the reception counter for\n"
-	.string "POKéMON CONTESTS.\p"
+	.string "[Pokémon Contests].\p"
 	.string "Oh? It appears that you don't have\n"
-	.string "a {POKEBLOCK} CASE yet.\p"
+	.string "a {POKEBLOCK} [Case] yet.\p"
 	.string "In that case, we need to provide you\n"
 	.string "with this!$"
 
@@ -1369,115 +1369,115 @@ LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp:
 	.string "up…\p"
 	.string "Hello!\p"
 	.string "This is the reception counter for\n"
-	.string "POKéMON CONTESTS.$"
+	.string "[Pokémon Contests].$"
 
 LilycoveCity_ContestLobby_Text_ContestReception:
 	.string "Hello!\p"
 	.string "This is the reception counter for\n"
-	.string "POKéMON CONTESTS.$"
+	.string "[Pokémon Contests].$"
 
 @ Unused
 LilycoveCity_ContestLobby_Text_CounterOnlyFor4PlayerContests:
 	.string "Hello!\p"
 	.string "This reception counter is only\n"
-	.string "for 4-player POKéMON CONTESTS.$"
+	.string "for 4-player [Pokémon Contests].$"
 
 LilycoveCity_ContestLobby_Text_EnterContest1:
-	.string "Would you like to enter your POKéMON\n"
-	.string "in our CONTESTS?$"
+	.string "Would you like to enter your [Pokémon]\n"
+	.string "in our [Contests]?$"
 
 LilycoveCity_ContestLobby_Text_WhichTopic1:
 	.string "Which topic would you like?$"
 
 LilycoveCity_ContestLobby_Text_ExplainContests:
-	.string "A POKéMON CONTEST involves four\n"
-	.string "TRAINERS entering one POKéMON each\l"
+	.string "A [Pokémon Contest] involves four\n"
+	.string "[Trainers] entering one [Pokémon] each\l"
 	.string "in competitive judging.\p"
-	.string "A CONTEST has two stages of judging,\n"
+	.string "A [Contest] has two stages of judging,\n"
 	.string "primary and secondary.\p"
 	.string "Primary judging is a popularity poll\n"
 	.string "involving the audience.\p"
 	.string "Secondary judging features appeals\n"
-	.string "by the POKéMON using their moves.\p"
+	.string "by the [Pokémon] using their moves.\p"
 	.string "Plan appeals carefully to earn the\n"
-	.string "most attention of the JUDGE and\l"
+	.string "most attention of the [Judge] and\l"
 	.string "excite the audience.\l"
 	.string "Do your best to stand out.\p"
 	.string "The primary and secondary scores are\n"
 	.string "added at the end.\p"
-	.string "The POKéMON garnering the highest\n"
+	.string "The [Pokémon] garnering the highest\n"
 	.string "score is declared the winner.$"
 
 LilycoveCity_ContestLobby_Text_ExplainContestTypes:
-	.string "There are five kinds of CONTESTS.\p"
-	.string "COOL, BEAUTY, CUTE, SMART, and\n"
-	.string "TOUGH are the five categories.\p"
-	.string "Choose the CONTEST that is right for\n"
-	.string "the POKéMON you plan to enter.$"
+	.string "There are five kinds of [Contests].\p"
+	.string "[Cool], [Beauty], [Cute], [Smart], and\n"
+	.string "[Tough] are the five categories.\p"
+	.string "Choose the [Contest] that is right for\n"
+	.string "the [Pokémon] you plan to enter.$"
 
 LilycoveCity_ContestLobby_Text_ExplainContestRanks:
-	.string "There are four ranks of POKéMON\n"
-	.string "CONTESTS.\p"
-	.string "NORMAL, SUPER, HYPER, and MASTER\n"
+	.string "There are four ranks of [Pokémon]\n"
+	.string "[Contests].\p"
+	.string "[Normal], [Super], [Hyper], and [Master]\n"
 	.string "are the four ranks.\p"
-	.string "In the NORMAL Rank, any POKéMON may\n"
+	.string "In the [Normal] Rank, any [Pokémon] may\n"
 	.string "enter.\p"
-	.string "Any POKéMON that won a NORMAL Rank\n"
-	.string "CONTEST may move up to the SUPER Rank\l"
+	.string "Any [Pokémon] that won a [Normal] Rank\n"
+	.string "[Contest] may move up to the [Super] Rank\l"
 	.string "in the same category.\p"
-	.string "In the same way, a SUPER Rank winner\n"
-	.string "can move up to the HYPER Rank, and\l"
-	.string "a HYPER Rank winner can advance to\l"
-	.string "the MASTER Rank in the same category.\p"
-	.string "A POKéMON that won in the MASTER Rank\n"
-	.string "may compete in the MASTER Rank as\l"
-	.string "often as its TRAINER wants.$"
+	.string "In the same way, a [Super] Rank winner\n"
+	.string "can move up to the [Hyper] Rank, and\l"
+	.string "a [Hyper] Rank winner can advance to\l"
+	.string "the [Master] Rank in the same category.\p"
+	.string "A [Pokémon] that won in the [Master] Rank\n"
+	.string "may compete in the [Master] Rank as\l"
+	.string "often as its [Trainer] wants.$"
 
 LilycoveCity_ContestLobby_Text_EnterWhichRank:
 	.string "Which Rank would you like to enter?$"
 
 LilycoveCity_ContestLobby_Text_EnterWhichContest1:
-	.string "Which CONTEST would you like to enter?$"
+	.string "Which [Contest] would you like to enter?$"
 
 LilycoveCity_ContestLobby_Text_EnterWhichPokemon1:
-	.string "Which POKéMON would you like to enter?$"
+	.string "Which [Pokémon] would you like to enter?$"
 
 LilycoveCity_ContestLobby_Text_MonNotQualifiedForRank:
-	.string "I'm terribly sorry, but your POKéMON\n"
+	.string "I'm terribly sorry, but your [Pokémon]\n"
 	.string "is not qualified to compete at this\l"
 	.string "Rank yet…$"
 
 LilycoveCity_ContestLobby_Text_EggCannotTakePart:
-	.string "I'm sorry, but an EGG cannot take part\n"
-	.string "in a POKéMON CONTEST.$"
+	.string "I'm sorry, but an [Egg] cannot take part\n"
+	.string "in a [Pokémon Contest].$"
 
 LilycoveCity_ContestLobby_Text_MonInNoConditionForContest:
-	.string "Your POKéMON appears to be in no\n"
-	.string "condition to take part in a CONTEST…$"
+	.string "Your [Pokémon] appears to be in no\n"
+	.string "condition to take part in a [Contest]…$"
 
 LilycoveCity_ContestLobby_Text_AlreadyWonEnterAnyway:
-	.string "Oh, but that RIBBON…\p"
-	.string "Your POKéMON has won this CONTEST\n"
+	.string "Oh, but that [Ribbon]…\p"
+	.string "Your [Pokémon] has won this [Contest]\n"
 	.string "before, hasn't it?\p"
 	.string "Would you like to enter it in this\n"
-	.string "CONTEST anyway?$"
+	.string "[Contest] anyway?$"
 
 LilycoveCity_ContestLobby_Text_ConfirmContestMon:
-	.string "Is that your CONTEST POKéMON?$"
+	.string "Is that your [Contest Pokémon]?$"
 
 LilycoveCity_ContestLobby_Text_YourMonIsEntryNum4:
-	.string "Okay, your POKéMON will be entered\n"
-	.string "in this CONTEST.\p"
-	.string "Your POKéMON is Entry No. 4.\n"
-	.string "The CONTEST will begin shortly.$"
+	.string "Okay, your [Pokémon] will be entered\n"
+	.string "in this [Contest].\p"
+	.string "Your [Pokémon] is Entry No. 4.\n"
+	.string "The [Contest] will begin shortly.$"
 
 LilycoveCity_ContestLobby_Text_ComeThroughHere:
 	.string "Please come in through here.\n"
 	.string "Good luck!$"
 
 LilycoveCity_ContestLobby_Text_PokemonWonWeHavePrize:
-	.string "Congratulations! Your POKéMON is the\n"
-	.string "CONTEST winner!\p"
+	.string "Congratulations! Your [Pokémon] is the\n"
+	.string "[Contest] winner!\p"
 	.string "We have your prize right here.\n"
 	.string "Please, right this way!$"
 
@@ -1487,28 +1487,28 @@ LilycoveCity_ContestLobby_Text_ComeBackForPrizeLater:
 
 ContestHall_Text_GettingStartedParticipantsAsFollows:
 	.string "MC: Hello! We're just getting started\n"
-	.string "with a {STR_VAR_3} Rank POKéMON\l"
+	.string "with a {STR_VAR_3} Rank [Pokémon]\l"
 	.string "{STR_VAR_2}!\p"
-	.string "The participating TRAINERS and their\n"
-	.string "POKéMON are as follows:$"
+	.string "The participating [Trainers] and their\n"
+	.string "[Pokémon] are as follows:$"
 
 ContestHall_Text_GettingStartedParticipantsAsFollowsLink:
 	.string "MC: Hello! We're just getting started\n"
-	.string "with a 4-player linked POKéMON\l"
+	.string "with a 4-player linked [Pokémon]\l"
 	.string "{STR_VAR_2}!\p"
-	.string "The participating TRAINERS and their\n"
-	.string "POKéMON are as follows:$"
+	.string "The participating [Trainers] and their\n"
+	.string "[Pokémon] are as follows:$"
 
 ContestHall_Text_EntryXTrainersMon:
 	.string "MC: Entry No. {STR_VAR_2}!\n"
 	.string "{STR_VAR_1}'s {STR_VAR_3}!$"
 
 ContestHall_Text_SeenContestantsAudienceWillVote:
-	.string "MC: We've just seen the four POKéMON\n"
+	.string "MC: We've just seen the four [Pokémon]\n"
 	.string "contestants.\p"
 	.string "Now it's time for primary judging!\p"
 	.string "The audience will vote on their\n"
-	.string "favorite POKéMON contestants.\p"
+	.string "favorite [Pokémon] contestants.\p"
 	.string "Without any further ado, let the\n"
 	.string "voting begin!$"
 
@@ -1538,11 +1538,11 @@ ContestHall_Text_ThankYouForAppeals:
 ContestHall_Text_JudgeLooksReady:
 	.string "Now, all that remains is the pulse-\n"
 	.string "pounding proclamation of the winner.\p"
-	.string "The JUDGE looks ready to make\n"
+	.string "The [Judge] looks ready to make\n"
 	.string "the announcement!$"
 
 ContestHall_Text_WeWillNowDeclareWinner:
-	.string "JUDGE: We will now declare the winner!$"
+	.string "[Judge]: We will now declare the winner!$"
 
 ContestHall_Text_CongratsTrainerXandMon:
 	.string "MC: Entry No. {STR_VAR_2}!\p"
@@ -1558,14 +1558,14 @@ ContestHall_Text_AcceptYourPrize:
 	.string "Please accept your prize!$"
 
 ContestHall_Text_ConferRibbonAsPrize:
-	.string "We confer on you this RIBBON\n"
+	.string "We confer on you this [Ribbon]\n"
 	.string "as your prize!$"
 
 ContestHall_Text_ReceivedRibbon:
-	.string "{PLAYER} received a RIBBON.$"
+	.string "{PLAYER} received a [Ribbon].$"
 
 ContestHall_Text_PutRibbonOnMon:
-	.string "{PLAYER} put the RIBBON on\n"
+	.string "{PLAYER} put the [Ribbon] on\n"
 	.string "{STR_VAR_1}.$"
 
 ContestHall_Text_PickUpPrizeAtCounterLater:
@@ -1576,13 +1576,13 @@ ContestHall_Text_PickUpPrizeAtCounterLater:
 @ Unused
 ContestHall_Text_OnlyRegister4Players:
 	.string "I only register four players for\n"
-	.string "POKéMON CONTESTS.\p"
+	.string "[Pokémon Contests].\p"
 	.string "If three other players link up, all\n"
-	.string "four may enter the same CONTEST.\p"
+	.string "four may enter the same [Contest].\p"
 	.string "Would you like to take part?$"
 
 LilycoveCity_ContestLobby_Text_ProgressWillBeSaved:
-	.string "Before entering a CONTEST, your\n"
+	.string "Before entering a [Contest], your\n"
 	.string "progress will be saved.$"
 
 LilycoveCity_ContestLobby_Text_ParticipateAnotherTime:
@@ -1591,27 +1591,27 @@ LilycoveCity_ContestLobby_Text_ParticipateAnotherTime:
 
 @ Unused
 LilycoveCity_ContestLobby_Text_EnterContest2:
-	.string "Would you like to enter a CONTEST?$"
+	.string "Would you like to enter a [Contest]?$"
 
 @ Unused
 LilycoveCity_ContestLobby_Text_Explain4PlayerContest:
 	.string "When four players are ready, connect\n"
 	.string "over a Game Link cable, and register\l"
 	.string "with me, please.\p"
-	.string "Please choose the same CONTEST\n"
+	.string "Please choose the same [Contest]\n"
 	.string "as your fellow contestants.\p"
-	.string "The CONTEST begins as soon as all\n"
+	.string "The [Contest] begins as soon as all\n"
 	.string "players register their entry.\p"
-	.string "After that, the usual CONTEST rules\n"
+	.string "After that, the usual [Contest] rules\n"
 	.string "apply.$"
 
 @ Unused
 LilycoveCity_ContestLobby_Text_EnterWhichContest2:
-	.string "Which CONTEST would you like to enter?$"
+	.string "Which [Contest] would you like to enter?$"
 
 @ Unused
 LilycoveCity_ContestLobby_Text_EnterWhichPokemon2:
-	.string "Which POKéMON would you like to enter?$"
+	.string "Which [Pokémon] would you like to enter?$"
 
 LilycoveCity_ContestLobby_Text_Transmitting:
 	.string "Transmitting…$"
@@ -1621,7 +1621,7 @@ LilycoveCity_ContestLobby_Text_TransmissionError:
 
 LilycoveCity_ContestLobby_Text_PlayersChoseDifferentContest:
 	.string "You may have chosen a different\n"
-	.string "CONTEST than another player.$"
+	.string "[Contest] than another player.$"
 
 LilycoveCity_ContestLobby_Text_PlayersMadeDifferentChoice:
 	.string "You may have made a different\n"
@@ -1642,44 +1642,44 @@ LilycoveCity_ContestLobby_Text_TransmissionErrorTryAgain:
 	.string "Please try again.$"
 
 LilycoveCity_ContestLobby_Text_YourMonIsEntryNumX:
-	.string "Your POKéMON will be entered in\n"
-	.string "the CONTEST.\p"
-	.string "Your POKéMON is Entry No. {STR_VAR_2}.$"
+	.string "Your [Pokémon] will be entered in\n"
+	.string "the [Contest].\p"
+	.string "Your [Pokémon] is Entry No. {STR_VAR_2}.$"
 
 LilycoveCity_ContestLobby_Text_ContestBeginShortly:
-	.string "The CONTEST will begin shortly.$"
+	.string "The [Contest] will begin shortly.$"
 
 LilycoveCity_ContestLobby_Text_LinkContestReception:
-	.string "Welcome! This is the POKéMON CONTEST\n"
+	.string "Welcome! This is the [Pokémon Contest]\n"
 	.string "link reception counter.\p"
-	.string "You may enter CONTESTS together with\n"
+	.string "You may enter [Contests] together with\n"
 	.string "one or more friends.$"
 
 LilycoveCity_ContestLobby_Text_WhichTopic2:
 	.string "Which topic would you like?$"
 
 LilycoveCity_ContestLobby_Text_EnterContest3:
-	.string "Would you like to enter a CONTEST?$"
+	.string "Would you like to enter a [Contest]?$"
 
 LilycoveCity_ContestLobby_Text_EnterWhichContest3:
-	.string "Which CONTEST would you like to enter?$"
+	.string "Which [Contest] would you like to enter?$"
 
 LilycoveCity_ContestLobby_Text_MonInNoCondition2:
-	.string "Your POKéMON appears to be in no\n"
-	.string "condition to take part in a CONTEST…$"
+	.string "Your [Pokémon] appears to be in no\n"
+	.string "condition to take part in a [Contest]…$"
 
 LilycoveCity_ContestLobby_Text_EggCannotTakePart2:
-	.string "I'm sorry, but an EGG cannot take part\n"
-	.string "in a POKéMON CONTEST.$"
+	.string "I'm sorry, but an [Egg] cannot take part\n"
+	.string "in a [Pokémon Contest].$"
 
 LilycoveCity_ContestLobby_Text_EnterWhichPokemon3:
-	.string "Which POKéMON would you like to enter?$"
+	.string "Which [Pokémon] would you like to enter?$"
 
 LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader:
 	.string "Please decide which of you will\n"
-	.string "become the GROUP LEADER.\p"
+	.string "become the [Group Leader].\p"
 	.string "The other players must then choose\n"
-	.string "“JOIN GROUP.”$"
+	.string "“[Join Group].”$"
 
 LilycoveCity_ContestLobby_Text_PlayerAt4PCounterUseGMode:
 	.string "At least one player has entered using\n"
@@ -1687,83 +1687,83 @@ LilycoveCity_ContestLobby_Text_PlayerAt4PCounterUseGMode:
 	.string "There must be four players connected\n"
 	.string "using a GBA Game Link cable.\p"
 	.string "When the four players are ready,\n"
-	.string "select G-MODE (GLOBAL MODE),\l"
+	.string "select [G-Mode] ([Global Mode]),\l"
 	.string "then register to enter again, please.$"
 
 LilycoveCity_ContestLobby_Text_ExplainLinkContest:
-	.string "This is a CONTEST for two to four\n"
+	.string "This is a [Contest] for two to four\n"
 	.string "players linked using a Wireless\l"
 	.string "Adapter or a GBA Game Link cable.\p"
 	.string "Participants are first asked to choose\n"
 	.string "the mode they wish to enter.\p"
 	.string "There are two different modes.\p"
-	.string "E-MODE (EMERALD MODE) is for\n"
+	.string "[E-Mode] ([Emerald Mode]) is for\n"
 	.string "two to four players, each with a\l"
-	.string "POKéMON Emerald Game Pak.\p"
-	.string "G-MODE (GLOBAL MODE) is only for\n"
-	.string "four players, each with a POKéMON\l"
+	.string "[Pokémon] Emerald Game Pak.\p"
+	.string "[G-Mode] ([Global Mode]) is only for\n"
+	.string "four players, each with a [Pokémon]\l"
 	.string "Emerald, Ruby, or Sapphire Game Pak.\p"
 	.string "The players should discuss which mode\n"
 	.string "they want, then choose the same mode.\p"
 	.string "Once all the players have chosen\n"
-	.string "the same CONTEST in the same mode,\l"
+	.string "the same [Contest] in the same mode,\l"
 	.string "the entry registration is complete.\p"
-	.string "After that, a CONTEST will start in\n"
+	.string "After that, a [Contest] will start in\n"
 	.string "the usual manner.$"
 
 LilycoveCity_ContestLobby_Text_ExplainEMode:
-	.string "In E-MODE (EMERALD MODE),\n"
-	.string "a LINK CONTEST can be held with\l"
+	.string "In [E-Mode] ([Emerald Mode]),\n"
+	.string "a [Link Contest] can be held with\l"
 	.string "two to four players. Each player must\l"
-	.string "have a POKéMON Emerald Game Pak.\p"
+	.string "have a [Pokémon] Emerald Game Pak.\p"
 	.string "The players must be linked with each\n"
 	.string "other using Wireless Adapters or\l"
 	.string "GBA Game Link cables.\p"
 	.string "If there are fewer than four players,\n"
-	.string "TRAINERS in the hall will join to fill\l"
-	.string "the 4-player CONTEST lineup.\p"
-	.string "Please be aware that E-MODE is not\n"
-	.string "available in POKéMON Ruby or Sapphire.$"
+	.string "[Trainers] in the hall will join to fill\l"
+	.string "the 4-player [Contest] lineup.\p"
+	.string "Please be aware that [E-Mode] is not\n"
+	.string "available in [Pokémon] Ruby or Sapphire.$"
 
 LilycoveCity_ContestLobby_Text_ExplainGMode:
-	.string "G-MODE (GLOBAL MODE) is specifically\n"
+	.string "[G-Mode] ([Global Mode]) is specifically\n"
 	.string "for four players who are linked using\l"
 	.string "GBA Game Link cables.\p"
-	.string "Each player must have a POKéMON\n"
+	.string "Each player must have a [Pokémon]\n"
 	.string "Emerald, Ruby, or Sapphire Game Pak.\p"
-	.string "The CONTEST starts after all players\n"
-	.string "choose G-MODE (POKéMON Emerald) or\l"
+	.string "The [Contest] starts after all players\n"
+	.string "choose [G-Mode] ([Pokémon] Emerald) or\l"
 	.string "enter through the 4-player reception\l"
-	.string "counter (POKéMON Ruby or Sapphire).$"
+	.string "counter ([Pokémon] Ruby or Sapphire).$"
 
 LilycoveCity_ContestLobby_Text_NoWirelessAdapterInGMode:
 	.string "I'm terribly sorry.\p"
-	.string "G-MODE does not function\n"
+	.string "[G-Mode] does not function\n"
 	.string "with Wireless Adapters.\p"
-	.string "Please select E-MODE or try\n"
+	.string "Please select [E-Mode] or try\n"
 	.string "again using a GBA Game Link cable.$"
 
 LilycoveCity_ContestLobby_Text_WhichContestMode:
-	.string "Which CONTEST MODE would you like\n"
+	.string "Which [Contest Mode] would you like\n"
 	.string "to enter?$"
 
 ContestHall_Text_GettingStartedWireless:
 	.string "MC: Hello! We're just getting started\n"
-	.string "with a 4-player linked POKéMON\l"
+	.string "with a 4-player linked [Pokémon]\l"
 	.string "{STR_VAR_2}!$"
 
 ContestHall_Text_ParticipantsAsFollows:
-	.string "The participating TRAINERS and their\n"
-	.string "POKéMON are as follows:$"
+	.string "The participating [Trainers] and their\n"
+	.string "[Pokémon] are as follows:$"
 
 ContestHall_Text_WeveSeenContestants:
-	.string "MC: We've just seen the four POKéMON\n"
+	.string "MC: We've just seen the four [Pokémon]\n"
 	.string "contestants.\p"
 	.string "Now it's time for primary judging!$"
 
 ContestHall_Text_AudienceWillVote:
 	.string "The audience will vote on their\n"
-	.string "favorite POKéMON contestants.$"
+	.string "favorite [Pokémon] contestants.$"
 
 ContestHall_Text_LetVotingBegin:
 	.string "Without any further ado,\n"
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index e7f3da4104..4e37a08bdb 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -266,19 +266,19 @@ EventScript_EggHatch::
 	end
 
 Route117_Text_SeeWifeIfYoudLikeMeToRaiseMon:
-	.string "I'm the DAY-CARE MAN.\p"
+	.string "I'm the [Day-Care Man].\p"
 	.string "I help take care of the precious\n"
-	.string "POKéMON of TRAINERS.\p"
-	.string "If you'd like me to raise your POKéMON,\n"
+	.string "[Pokémon] of [Trainers].\p"
+	.string "If you'd like me to raise your [Pokémon],\n"
 	.string "have a word with my wife.$"
 
 Route117_Text_DoYouWantEgg:
 	.string "Ah, it's you!\p"
-	.string "We were raising your POKéMON,\n"
+	.string "We were raising your [Pokémon],\n"
 	.string "and my goodness, were we surprised!\p"
-	.string "Your POKéMON had an EGG!\p"
+	.string "Your [Pokémon] had an [Egg]!\p"
 	.string "We don't know how it got there,\n"
-	.string "but your POKéMON had it.\p"
+	.string "but your [Pokémon] had it.\p"
 	.string "You do want it, yes?$"
 
 Route117_Text_YourMonIsDoingFine:
@@ -294,8 +294,8 @@ Route117_Text_YouHaveNoRoomForIt:
 	.string "Come back when you've made room.$"
 
 Route117_Text_ReceivedEgg:
-	.string "{PLAYER} received the EGG from\n"
-	.string "the DAY-CARE MAN.$"
+	.string "{PLAYER} received the [Egg] from\n"
+	.string "the [Day-Care Man].$"
 
 Route117_Text_TakeGoodCareOfIt:
 	.string "Take good care of it.$"
@@ -305,11 +305,11 @@ Route117_Text_FriendlyWithOtherTrainersMon:
 	.string "it seemed to be friendly with\l"
 	.string "{STR_VAR_2}'s {STR_VAR_3}.\p"
 	.string "I may even have seen it receiving\n"
-	.string "a piece of MAIL.$"
+	.string "a piece of [Mail].$"
 
 @ Unused
 Route117_Text_SeeWifeIfYouWantToPickUpMon:
-	.string "If you want to pick up your POKéMON,\n"
+	.string "If you want to pick up your [Pokémon],\n"
 	.string "have a word with my wife.$"
 
 Route117_Text_YourMonsAreDoingFine:
@@ -321,12 +321,12 @@ Route117_Text_IWillKeepDoYouWantIt:
 	.string "You do want this, yes?$"
 
 Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon:
-	.string "I'm the DAY-CARE LADY.\p"
-	.string "We can raise POKéMON for you.\p"
+	.string "I'm the [Day-Care Lady].\p"
+	.string "We can raise [Pokémon] for you.\p"
 	.string "Would you like us to raise one?$"
 
 Route117_PokemonDayCare_Text_WhichMonShouldWeRaise:
-	.string "Which POKéMON should we raise for\n"
+	.string "Which [Pokémon] should we raise for\n"
 	.string "you?$"
 
 Route117_PokemonDayCare_Text_WellRaiseYourMon:
@@ -335,7 +335,7 @@ Route117_PokemonDayCare_Text_WellRaiseYourMon:
 	.string "Come back for it later.$"
 
 Route117_PokemonDayCare_Text_WeCanRaiseOneMore:
-	.string "We can raise two of your POKéMON.\n"
+	.string "We can raise two of your [Pokémon].\n"
 	.string "Would you like us to raise one more?$"
 
 Route117_PokemonDayCare_Text_HusbandWasLookingForYou:
@@ -358,19 +358,19 @@ Route117_PokemonDayCare_Text_ComeAgain:
 
 Route117_PokemonDayCare_Text_GoodToSeeYou:
 	.string "Ah, it's you! Good to see you.\n"
-	.string "Your POKéMON can only be doing good!$"
+	.string "Your [Pokémon] can only be doing good!$"
 
 Route117_PokemonDayCare_Text_YourMonHasGrownXLevels:
 	.string "By level, your {STR_VAR_1} has\n"
 	.string "grown by {STR_VAR_2}.$"
 
 Route117_PokemonDayCare_Text_YourTeamIsFull:
-	.string "Your POKéMON team is full.\n"
+	.string "Your [Pokémon] team is full.\n"
 	.string "Make room, then come see me.$"
 
 @ Unused
 Route117_PokemonDayCare_Text_TakeBackWhichMon:
-	.string "Which POKéMON will you take back?$"
+	.string "Which [Pokémon] will you take back?$"
 
 Route117_PokemonDayCare_Text_ItWillCostX:
 	.string "If you want your {STR_VAR_1} back,\n"
@@ -378,22 +378,22 @@ Route117_PokemonDayCare_Text_ItWillCostX:
 
 Route117_PokemonDayCare_Text_HeresYourMon:
 	.string "Perfect!\n"
-	.string "Here's your POKéMON.$"
+	.string "Here's your [Pokémon].$"
 
 Route117_PokemonDayCare_Text_TookBackMon:
 	.string "{PLAYER} took back {STR_VAR_1} from\n"
-	.string "the DAY-CARE LADY.$"
+	.string "the [Day-Care Lady].$"
 
 Route117_PokemonDayCare_Text_YouHaveJustOneMon:
 	.string "Oh? But you have just one\n"
-	.string "POKéMON.\p"
+	.string "[Pokémon].\p"
 	.string "Come back another time.$"
 
 Route117_PokemonDayCare_Text_TakeYourMonBack:
-	.string "Will you take your POKéMON back?$"
+	.string "Will you take your [Pokémon] back?$"
 
 Route117_PokemonDayCare_Text_WhatWillYouBattleWith:
-	.string "If you leave me that POKéMON,\n"
+	.string "If you leave me that [Pokémon],\n"
 	.string "what will you battle with?\p"
 	.string "Come back another time.$"
 
@@ -403,7 +403,7 @@ Text_EggHatchHuh:
 Route117_PokemonDayCare_Text_YoullBeLeftWithJustOne:
 	.string "Huh?\n"
 	.string "Now, now.\p"
-	.string "If you leave that POKéMON with\n"
+	.string "If you leave that [Pokémon] with\n"
 	.string "me, you'll be left with just one.\p"
 	.string "You will be better off if you catch\n"
 	.string "some more, I dare say.$"
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index 0aeaa23af6..b76b3c0095 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -45,15 +45,15 @@ EventScript_CancelCut::
 
 Text_WantToCut:
 	.string "This tree looks like it can be\n"
-	.string "CUT down!\p"
-	.string "Would you like to CUT it?$"
+	.string "[Cut] down!\p"
+	.string "Would you like to [Cut] it?$"
 
 Text_MonUsedFieldMove:
 	.string "{STR_VAR_1} used {STR_VAR_2}!$"
 
 Text_CantCut:
 	.string "This tree looks like it can be\n"
-	.string "CUT down!$"
+	.string "[Cut] down!$"
 
 @ Use rock smash from party menu
 EventScript_UseRockSmash::
@@ -215,10 +215,10 @@ EventScript_CancelSmash::
 
 Text_WantToSmash:
 	.string "This rock appears to be breakable.\n"
-	.string "Would you like to use ROCK SMASH?$"
+	.string "Would you like to use [Rock Smash]?$"
 
 Text_CantSmash:
-	.string "It's a rugged rock, but a POKéMON\n"
+	.string "It's a rugged rock, but a [Pokémon]\n"
 	.string "may be able to smash it.$"
 
 EventScript_StrengthBoulder::
@@ -264,21 +264,21 @@ EventScript_CancelStrength::
 	end
 
 Text_WantToStrength:
-	.string "It's a big boulder, but a POKéMON\n"
+	.string "It's a big boulder, but a [Pokémon]\n"
 	.string "may be able to push it aside.\p"
-	.string "Would you like to use STRENGTH?$"
+	.string "Would you like to use [Strength]?$"
 
 Text_MonUsedStrength:
-	.string "{STR_VAR_1} used STRENGTH!\p"
-	.string "{STR_VAR_1}'s STRENGTH made it\n"
+	.string "{STR_VAR_1} used [Strength]!\p"
+	.string "{STR_VAR_1}'s [Strength] made it\n"
 	.string "possible to move boulders around!$"
 
 Text_CantStrength:
-	.string "It's a big boulder, but a POKéMON\n"
+	.string "It's a big boulder, but a [Pokémon]\n"
 	.string "may be able to push it aside.$"
 
 Text_StrengthActivated:
-	.string "STRENGTH made it possible to move\n"
+	.string "[Strength] made it possible to move\n"
 	.string "boulders around.$"
 
 EventScript_UseWaterfall::
@@ -311,10 +311,10 @@ Text_CantWaterfall:
 
 Text_WantToWaterfall:
 	.string "It's a large waterfall.\n"
-	.string "Would you like to use WATERFALL?$"
+	.string "Would you like to use [Waterfall]?$"
 
 Text_MonUsedWaterfall:
-	.string "{STR_VAR_1} used WATERFALL.$"
+	.string "{STR_VAR_1} used [Waterfall].$"
 
 EventScript_UseDive::
 	lockall
@@ -400,23 +400,23 @@ EventScript_UseCutGrass::
 	goto EventScript_CutGrassCommon
 
 Text_CantDive:
-	.string "The sea is deep here. A POKéMON\n"
+	.string "The sea is deep here. A [Pokémon]\n"
 	.string "may be able to go underwater.$"
 
 Text_WantToDive:
 	.string "The sea is deep here.\n"
-	.string "Would you like to use DIVE?$"
+	.string "Would you like to use [Dive]?$"
 
 Text_MonUsedDive:
-	.string "{STR_VAR_1} used DIVE.$"
+	.string "{STR_VAR_1} used [Dive].$"
 
 Text_CantSurface:
 	.string "Light is filtering down from above.\n"
-	.string "A POKéMON may be able to surface.$"
+	.string "A [Pokémon] may be able to surface.$"
 
 Text_WantToSurface:
 	.string "Light is filtering down from above.\n"
-	.string "Would you like to use DIVE?$"
+	.string "Would you like to use [Dive]?$"
 
 EventScript_FailSweetScent::
 	msgbox Text_FailSweetScent, MSGBOX_SIGN
diff --git a/data/scripts/flavor_text.inc b/data/scripts/flavor_text.inc
index 07d888c716..ec87878f61 100644
--- a/data/scripts/flavor_text.inc
+++ b/data/scripts/flavor_text.inc
@@ -115,7 +115,7 @@ EventScript_Indigo_HighestAuthority::
 @ Flavor text for interacting with various background objects
 
 Text_Bookshelf::
-	.string "It's crammed full of POKéMON\n"
+	.string "It's crammed full of [Pokémon]\n"
 	.string "books.$"
 
 Text_NothingButPokemonBooks::
@@ -123,11 +123,11 @@ Text_NothingButPokemonBooks::
 	.string "ポケモンの　ほん　ばかりだ$"
 
 Text_ATownMap::
-	.string "A TOWN MAP.$"
+	.string "A [Town Map].$"
 
 Text_PokeMartShelf::
 	.string "Wow!\n"
-	.string "Tons of POKéMON stuff!$"
+	.string "Tons of [Pokémon] stuff!$"
 
 Text_DishesPlatesNeatlyLinedUp::
 	.string "Dishes and plates are neatly\n"
@@ -146,21 +146,21 @@ Text_Snacks::
 
 Text_PokemartSign::
 	.string "All your item needs fulfilled!\n"
-	.string "POKéMON MART$"
+	.string "[Pokémon Mart]$"
 
 Text_PokecenterSign::
-	.string "Heal Your POKéMON!\n"
-	.string "POKéMON CENTER$"
+	.string "Heal Your [Pokémon]!\n"
+	.string "[Pokémon Center]$"
 
 Text_Indigo_UltimateGoal::
-	.string "INDIGO PLATEAU\p"
-	.string "The ultimate goal of TRAINERS!\n"
-	.string "POKéMON LEAGUE HQ$"
+	.string "[Indigo Plateau]\p"
+	.string "The ultimate goal of [Trainers]!\n"
+	.string "[Pokémon League HQ]$"
 
 Text_Indigo_HighestAuthority::
-	.string "INDIGO PLATEAU\p"
-	.string "The highest POKéMON authority!\n"
-	.string "POKéMON LEAGUE HQ$"
+	.string "[Indigo Plateau]\p"
+	.string "The highest [Pokémon] authority!\n"
+	.string "[Pokémon League HQ]$"
 
 Text_Food::
 	.string "It should be packed with all kinds\n"
@@ -171,7 +171,7 @@ Text_Blueprints::
 	.string "It's filled with diagrams and text.$"
 
 Text_Painting::
-	.string "It's a pretty picture of a POKéMON.\n"
+	.string "It's a pretty picture of a [Pokémon].\n"
 	.string "It looks like it's feeling good.$"
 
 Text_PowerPlantMachine::
@@ -200,7 +200,7 @@ Text_TrashBin::
 	.string "There's nothing here!$"
 
 Text_Cup::
-	.string "It's a cup with a POKéMON mark\n"
+	.string "It's a cup with a [Pokémon] mark\n"
 	.string "on it.$"
 
 Text_PolishedWindow::
@@ -232,5 +232,5 @@ Text_Burglary::
 	.string "here…$"
 
 Text_PlayerFacingTVScreen::
-	.string "There's a POKéMON on TV!\n"
+	.string "There's a [Pokémon] on TV!\n"
 	.string "It looks like it's having fun.$"
diff --git a/data/scripts/follower.inc b/data/scripts/follower.inc
index 427cc1dee3..5c4c5cf79f 100644
--- a/data/scripts/follower.inc
+++ b/data/scripts/follower.inc
@@ -8,7 +8,7 @@ gText_FollowerDefault::
 	.string "ERROR 404: Script not found.$"
 
 gText_WantsToFly::
-	.string "{STR_VAR_1} looks up at the\nsky restlessly.\pWould you like to use FLY?$"
+	.string "{STR_VAR_1} looks up at the\nsky restlessly.\pWould you like to use [Fly]?$"
 
 EventScript_Follower::
 	lock
diff --git a/data/scripts/gift_altering_cave.inc b/data/scripts/gift_altering_cave.inc
index 0ea69aac02..f69e0850f8 100644
--- a/data/scripts/gift_altering_cave.inc
+++ b/data/scripts/gift_altering_cave.inc
@@ -13,11 +13,11 @@ MysteryGiftScript_AlteringCave_:
 	end
 
 sText_MysteryGiftAlteringCave:
-	.string "Thank you for using the MYSTERY\n"
-	.string "GIFT System.\p"
+	.string "Thank you for using the [Mystery]\n"
+	.string "[Gift] System.\p"
 	.string "There appears to be a rumor about\n"
-	.string "rare POKéMON sightings.\p"
+	.string "rare [Pokémon] sightings.\p"
 	.string "The sightings reportedly came from\n"
-	.string "the ALTERING CAVE on ROUTE 103.\p"
+	.string "the [Altering Cave] on [Route 103].\p"
 	.string "Perhaps it would be worthwhile for\n"
 	.string "you to investigate this rumor.$"
diff --git a/data/scripts/gift_aurora_ticket.inc b/data/scripts/gift_aurora_ticket.inc
index 0cadf804a7..5c252ab7ef 100644
--- a/data/scripts/gift_aurora_ticket.inc
+++ b/data/scripts/gift_aurora_ticket.inc
@@ -35,23 +35,23 @@ AuroraTicket_Obtained:
 	end
 
 sText_AuroraTicketForYou:
-	.string "Thank you for using the MYSTERY\n"
-	.string "GIFT System.\p"
+	.string "Thank you for using the [Mystery]\n"
+	.string "[Gift] System.\p"
 	.string "You must be {PLAYER}.\n"
 	.string "There is a ticket here for you.$"
 
 sText_AuroraTicketUseAtPort:
 	.string "It appears to be for use at the\n"
-	.string "LILYCOVE CITY port.\p"
+	.string "[Lilycove City] port.\p"
 	.string "Why not give it a try and see what\n"
 	.string "it is about?$"
 
 sText_AuroraTicketThankYou:
-	.string "Thank you for using the MYSTERY\n"
-	.string "GIFT System.$"
+	.string "Thank you for using the [Mystery]\n"
+	.string "[Gift] System.$"
 
 sText_AuroraTicketBagFull:
 	.string "Oh, I'm sorry, {PLAYER}.\n"
-	.string "Your BAG's KEY ITEMS POCKET is full.\p"
+	.string "Your [Bag]'s [Key Items Pocket] is full.\p"
 	.string "Please store something on your PC,\n"
 	.string "then come back for this.$"
diff --git a/data/scripts/gift_battle_card.inc b/data/scripts/gift_battle_card.inc
index 95e55e1b95..8adb9654d7 100644
--- a/data/scripts/gift_battle_card.inc
+++ b/data/scripts/gift_battle_card.inc
@@ -24,20 +24,20 @@ MysteryGiftScript_BattleCardInfo:
 	end
 
 sText_MysteryGiftBattleCountCard:
-	.string "Thank you for using the MYSTERY\n"
-	.string "GIFT System.\p"
-	.string "Your BATTLE COUNT CARD keeps\n"
+	.string "Thank you for using the [Mystery]\n"
+	.string "[Gift] System.\p"
+	.string "Your [Battle Count Card] keeps\n"
 	.string "track of your battle record against\l"
-	.string "TRAINERS with the same CARD.\p"
-	.string "Look for and battle TRAINERS who\n"
-	.string "have the same CARD as you.\p"
+	.string "[Trainers] with the same [Card].\p"
+	.string "Look for and battle [Trainers] who\n"
+	.string "have the same [Card] as you.\p"
 	.string "You may check the overall rankings\n"
-	.string "by reading the NEWS.\p"
+	.string "by reading the [News].\p"
 	.string "Please do give it a try!$"
 
 sText_MysteryGiftBattleCountCard_WonPrize:
-	.string "Thank you for using the MYSTERY\n"
-	.string "GIFT System.\p"
+	.string "Thank you for using the [Mystery]\n"
+	.string "[Gift] System.\p"
 	.string "Congratulations!\p"
 	.string "You have won a prize for winning\n"
 	.string "three battles!\p"
diff --git a/data/scripts/gift_mystic_ticket.inc b/data/scripts/gift_mystic_ticket.inc
index 3ed8aa6bcf..5e140ec75c 100644
--- a/data/scripts/gift_mystic_ticket.inc
+++ b/data/scripts/gift_mystic_ticket.inc
@@ -36,23 +36,23 @@ MysticTicket_Obtained:
 	end
 
 sText_MysticTicketForYou:
-	.string "Thank you for using the MYSTERY\n"
-	.string "GIFT System.\p"
+	.string "Thank you for using the [Mystery]\n"
+	.string "[Gift] System.\p"
 	.string "You must be {PLAYER}.\n"
 	.string "There is a ticket here for you.$"
 
 sText_MysticTicketUseAtPort:
 	.string "It appears to be for use at the\n"
-	.string "LILYCOVE CITY port.\p"
+	.string "[Lilycove City] port.\p"
 	.string "Why not give it a try and see what\n"
 	.string "it is about?$"
 
 sText_MysticTicketThankYou:
-	.string "Thank you for using the MYSTERY\n"
-	.string "GIFT System.$"
+	.string "Thank you for using the [Mystery]\n"
+	.string "[Gift] System.$"
 
 sText_MysticTicketBagFull:
 	.string "Oh, I'm sorry, {PLAYER}.\n"
-	.string "Your BAG's KEY ITEMS POCKET is full.\p"
+	.string "Your [Bag]'s [Key Items Pocket] is full.\p"
 	.string "Please store something on your PC,\n"
 	.string "then come back for this.$"
diff --git a/data/scripts/gift_old_sea_map.inc b/data/scripts/gift_old_sea_map.inc
index 06435492e4..45ba0840ff 100644
--- a/data/scripts/gift_old_sea_map.inc
+++ b/data/scripts/gift_old_sea_map.inc
@@ -35,24 +35,24 @@ OldSeaMap_Obtained:
 	end
 
 sText_MysteryGiftOldSeaMapForYou:
-	.string "Thank you for using the MYSTERY\n"
-	.string "GIFT System.\p"
+	.string "Thank you for using the [Mystery]\n"
+	.string "[Gift] System.\p"
 	.string "Let me confirm--you are {PLAYER}?\p"
-	.string "We received this OLD SEA MAP\n"
+	.string "We received this [Old Sea Map]\n"
 	.string "addressed to you.$"
 
 sText_MysteryGiftOldSeaMapUseAtPort:
 	.string "It appears to be for use at the\n"
-	.string "LILYCOVE CITY port.\p"
+	.string "[Lilycove City] port.\p"
 	.string "Why not give it a try and see what\n"
 	.string "it is about?$"
 
 sText_MysteryGiftOldSeaMapThankYou:
-	.string "Thank you for using the MYSTERY\n"
-	.string "GIFT System.$"
+	.string "Thank you for using the [Mystery]\n"
+	.string "[Gift] System.$"
 
 sText_MysteryGiftOldSeaMapBagFull:
 	.string "Oh, I'm sorry, {PLAYER}.\n"
-	.string "Your BAG's KEY ITEMS POCKET is full.\p"
+	.string "Your [Bag]'s [Key Items Pocket] is full.\p"
 	.string "Please store something on your PC,\n"
 	.string "then come back for this.$"
diff --git a/data/scripts/gift_pichu.inc b/data/scripts/gift_pichu.inc
index 56c1e52349..2bab472183 100644
--- a/data/scripts/gift_pichu.inc
+++ b/data/scripts/gift_pichu.inc
@@ -59,14 +59,14 @@ SurfPichu_Slot5:
 	return
 
 sText_MysteryGiftEgg:
-	.string "Thank you for using the MYSTERY\n"
-	.string "GIFT System.\p"
-	.string "From the POKéMON CENTER we\n"
-	.string "have a gift--a POKéMON EGG!\p"
+	.string "Thank you for using the [Mystery]\n"
+	.string "[Gift] System.\p"
+	.string "From the [Pokémon Center] we\n"
+	.string "have a gift--a [Pokémon Egg]!\p"
 	.string "Please raise it with love and\n"
 	.string "kindness.$"
 
 sText_FullParty:
 	.string "Oh, your party appears to be full.\p"
 	.string "Please come see me after storing\n"
-	.string "a POKéMON on a PC.$"
+	.string "a [Pokémon] on a PC.$"
diff --git a/data/scripts/gift_stamp_card.inc b/data/scripts/gift_stamp_card.inc
index 4ac399bec5..0c037e638b 100644
--- a/data/scripts/gift_stamp_card.inc
+++ b/data/scripts/gift_stamp_card.inc
@@ -15,7 +15,7 @@ MysteryGiftScript_StampCard::
 	end
 
 sText_MysteryGiftStampCard:
-	.string "Thank you for using the STAMP CARD\n"
+	.string "Thank you for using the [Stamp Card]\n"
 	.string "System.\p"
 	.string "You have {STR_VAR_1} more to collect to\n"
-	.string "fill your STAMP CARD.$"
+	.string "fill your [Stamp Card].$"
diff --git a/data/scripts/gift_trainer.inc b/data/scripts/gift_trainer.inc
index b927809058..5060d9a3ec 100644
--- a/data/scripts/gift_trainer.inc
+++ b/data/scripts/gift_trainer.inc
@@ -20,29 +20,29 @@ MysteryGiftScript_VisitingTrainerArrived:
 	end
 
 sText_MysteryGiftVisitingTrainerInstructions:
-	.string "Thank you for using the MYSTERY\n"
-	.string "GIFT System.\p"
-	.string "By holding this WONDER CARD, you\n"
+	.string "Thank you for using the [Mystery]\n"
+	.string "[Gift] System.\p"
+	.string "By holding this [Wonder Card], you\n"
 	.string "may take part in a survey at a\l"
-	.string "POKéMON MART.\p"
+	.string "[Pokémon Mart].\p"
 	.string "Use these surveys to invite\n"
-	.string "TRAINERS to SOOTOPOLIS CITY.\p"
+	.string "[Trainers] to [Sootopolis City].\p"
 	.string "…Let me give you a secret\n"
 	.string "password for a survey:\p"
-	.string "“GIVE ME\n"
-	.string "AWESOME TRAINER”\p"
+	.string "“[Give Me]\n"
+	.string "[Awesome Trainer]”\p"
 	.string "Write that in on a survey and send\n"
-	.string "it to the WIRELESS\l"
-	.string "COMMUNICATION SYSTEM.$"
+	.string "it to the [Wireless]\l"
+	.string "[Communication System].$"
 
 sText_MysteryGiftVisitingTrainerArrived:
-	.string "Thank you for using the MYSTERY\n"
-	.string "GIFT System.\p"
-	.string "A TRAINER has arrived in\n"
-	.string "SOOTOPOLIS CITY looking for you.\p"
+	.string "Thank you for using the [Mystery]\n"
+	.string "[Gift] System.\p"
+	.string "A [Trainer] has arrived in\n"
+	.string "[Sootopolis City] looking for you.\p"
 	.string "We hope you will enjoy\n"
-	.string "battling the visiting TRAINER.\p"
-	.string "You may invite other TRAINERS by\n"
+	.string "battling the visiting [Trainer].\p"
+	.string "You may invite other [Trainers] by\n"
 	.string "entering other passwords.\p"
 	.string "Try looking for other passwords\n"
 	.string "that may work.$"