4 files changed, 27 insertions, 27 deletions
diff --git a/data/text/luminous_cave.inc b/data/text/luminous_cave.inc
index 60ab2f8..ad99469 100644
--- a/data/text/luminous_cave.inc
+++ b/data/text/luminous_cave.inc
@@ -16,7 +16,7 @@ gLuminousCaveEvolutionInfo:: @ 80DCAD0
 	.string "#+spot if they satisfy certain conditions.#P"
 	.string "#+Evolution brings about changes\n"
 	.string "#+in appearance and abilities.#P"
-	.string "#+Not only that~2c some Pokémon even change\n"
+	.string "#+Not only that{COMMA} some Pokémon even change\n"
 	.string "#+type and learn different moves.#P"
 	.string "#+However...#W The requirements for\n"
 	.string "#+evolution differ among Pokémon.#P"
@@ -25,7 +25,7 @@ gLuminousCaveEvolutionInfo:: @ 80DCAD0
 	.string "#+Still others may need special items\n"
 	.string "#+to attain evolution.#P"
 	.string "#+Ye must also be aware of this:#P"
-	.string "#+Once it has evolved~2c a Pokémon\n"
+	.string "#+Once it has evolved{COMMA} a Pokémon\n"
 	.string "#+can never regain its previous form.#P"
 	.string "#+That is why ye must think carefully\n"
 	.string "#+before committing to evolution.\0"
@@ -45,7 +45,7 @@ gLuminousCaveGiveAnotherItem:: @ 80DCDB8
 	.align 2, 0
 
 gLuminousCaveLackWhatIsNeeded:: @ 80DCDDC
-	.string "#+Alas~2c ye seem to lack what is needed\n"
+	.string "#+Alas{COMMA} ye seem to lack what is needed\n"
 	.string "#+for evolution.\0"
 	.align 2, 0
 
@@ -60,12 +60,12 @@ gLuminousCaveLetUsBegin:: @ 80DCE38
 
 gLuminousCaveChangedAppearance:: @ 80DCE68
 	.string "#+...#W$n0 is undergoing changes...#P"
-	.string "#+$n0~27s appearance changed...#P\0"
+	.string "#+$n0{APOSTROPHE}s appearance changed...#P\0"
 	.align 2, 0
 
 gLuminousCaveEvolved:: @ 80DCEB0
-	.string "#+It evolved from {COLOR_1 GREEN}$m0{END_COLOR_TEXT_1}\n"
-	.string "#+to {COLOR_1 YELLOW}$m1{END_COLOR_TEXT_1}!\0"
+	.string "#+It evolved from {COLOR_1 GREEN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}\n"
+	.string "#+to {COLOR_1 YELLOW}{ARG_POKEMON_1}{END_COLOR_TEXT_1}!\0"
 	.align 2, 0
 
 gLuminousCaveComeAlone:: @ 80DCEDC
diff --git a/data/text/party_menu.inc b/data/text/party_menu.inc
index 40cc664..7296f91 100644
--- a/data/text/party_menu.inc
+++ b/data/text/party_menu.inc
@@ -8,52 +8,52 @@ gUnknown_80DD388:: @ 80DD388
 
 gUnknown_80DD420:: @ 80DD420
 	.string "If you say farewell to this\n"
-	.string "Pokémon~2c it will be gone forever.#P"
+	.string "Pokémon{COMMA} it will be gone forever.#P"
 	.string "You will never be able to get another one\n"
 	.string "like it to join your team.\n"
 	.string "Will you release it anyway?\0"
 	.align 2, 0
 
 gUnknown_80DD4C4:: @ 80DD4C4
-	.string "#+$m1 joined the\n"
+	.string "#+{ARG_POKEMON_1} joined the\n"
 	.string "#+rescue team for adventures!\0"
 	.align 2, 0
 
 gUnknown_80DD4F4:: @ 80DD4F4
-	.string "#+$m1 left the team to remain\n"
+	.string "#+{ARG_POKEMON_1} left the team to remain\n"
 	.string "#+on standby in the Friend Area.\0"
 	.align 2, 0
 
 gUnknown_80DD534:: @ 80DD534
-	.string "#+$m1 became the leader\n"
+	.string "#+{ARG_POKEMON_1} became the leader\n"
 	.string "#+of the rescue team.\0"
 	.align 2, 0
 
 gUnknown_80DD564:: @ 80DD564
-	.string "#+$m1 left\n"
+	.string "#+{ARG_POKEMON_1} left\n"
 	.string "#+the Friend Area.\n"
-	.string "#+Bye-bye~2c $m1!\0"
+	.string "#+Bye-bye{COMMA} {ARG_POKEMON_1}!\0"
 	.align 2,0
 
 gUnknown_80DD594:: @ 80DD594
-	.string "#+The {COLOR_1 GREEN}$i1{END_COLOR_TEXT_1} was\n"
+	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n"
 	.string "#+handed over. \0"
 	.align 2, 0
 
 gUnknown_80DD5B8:: @ 80DD5B8
-	.string "#+The {COLOR_1 GREEN}$i1{END_COLOR_TEXT_1} was\n"
+	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n"
 	.string "#+handed over.#P"
-	.string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was\n"
+	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
 	.string "#+returned to the Toolbox.\0"
 	.align 2, 0
 
 gUnknown_80DD60C:: @ 80DD60C
-	.string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was\n"
+	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
 	.string "#+returned to the Toolbox.\0"
 	.align 2, 0
 
 gUnknown_80DD63C:: @ 80DD63C
-	.string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was\n"
+	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
 	.string "#+sent to storage.\0"
 	.align 2, 0
 
@@ -98,7 +98,7 @@ gPartyMenuCheckIQ:: @ 80DD6C4
 	.align 2, 0
 
 gPartyMenuItemPlaceholder:: @ 80DD6D0
-	.string "Item: {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} \0"
+	.string "Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} \0"
 	.align 2, 0
 
 gUnknown_80DD6E0:: @ 80DD6E0
diff --git a/data/text/save.inc b/data/text/save.inc
index f20a139..4ab070c 100644
--- a/data/text/save.inc
+++ b/data/text/save.inc
@@ -1,6 +1,6 @@
 gSaveTextQuicksaving:: @ 80B6A34
 	.string "#+Quicksaving your adventure...\n"
-	.string "#+Please don~27t turn off the power.\0"
+	.string "#+Please don{APOSTROPHE}t turn off the power.\0"
 	.align 2, 0
 
 gSaveTextYourAdventureHasBeenSaved:: @ 80B6A7C
@@ -9,7 +9,7 @@ gSaveTextYourAdventureHasBeenSaved:: @ 80B6A7C
 
 gSaveTextYourAdventureHasBeenSavedLong:: @ 80B6AA0
 	.string "#+Your adventure has been saved.\n"
-	.string "#+When you are in a dungeon~2c quicksave\n"
+	.string "#+When you are in a dungeon{COMMA} quicksave\n"
 	.string "#+your progress before ending the game.\0"
 	.align 2, 0
 
@@ -30,11 +30,11 @@ gSaveTextError:: @ 80B6B88
 	.align 2, 0
 
 gSaveTextCantResume:: @ 80B6BDC
-	.string "#+Your data was not properly saved~2c\n"
+	.string "#+Your data was not properly saved{COMMA}\n"
 	.string "#+so your game cannot be resumed\n"
 	.string "#+from your last spot.#P#+Your last outing is considered a defeat.\n"
-	.string "#+Before shutting down~2c save in your\n"
-	.string "#+team base~2c or quicksave in a dungeon.\0"
+	.string "#+Before shutting down{COMMA} save in your\n"
+	.string "#+team base{COMMA} or quicksave in a dungeon.\0"
 	.align 2, 0
 
 gSaveTextMayNotResume:: @ 80B6CB8
diff --git a/data/text/wonder_mail_complete.inc b/data/text/wonder_mail_complete.inc
index 06308a4..ea8f9c9 100644
--- a/data/text/wonder_mail_complete.inc
+++ b/data/text/wonder_mail_complete.inc
@@ -4,22 +4,22 @@ gWonderMailClientThanksForRescuingMe:: @ 80E0184
 
 gWonderMailClientThanksForRescuingThem:: @ 80E01A0
 	.string " Thank you for rescuing\n"
-	.string "{COLOR_1 CYAN}$m1{END_COLOR_TEXT_1}!\0"
+	.string "{COLOR_1 CYAN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}!\0"
 	.align 2, 0
 
 gWonderMailClientEscorted:: @ 80E01C4
 	.string " Thank you for escorting me\n"
-	.string "to {COLOR_1 CYAN}$m1{END_COLOR_TEXT_1}! \0"
+	.string "to {COLOR_1 CYAN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}! \0"
 	.align 2, 0
 
 gWonderMailClientItemDelivered1:: @ 80E01F0
 	.string " Thank you for delivering\n"
-	.string "the {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}!\0"
+	.string "the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}!\0"
 	.align 2, 0
 
 gWonderMailClientItemDelivered2:: @ 80E0218
 	.string " Thank you for getting me\n"
-	.string "the {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}!\0"
+	.string "the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}!\0"
 	.align 2, 0
 
 	.string "pksdir0\0"