Swapped out more text macros

25 files changed, 860 insertions, 857 deletions

diff --git a/charmap.txt b/charmap.txt
index 79e61d4..52f64cb 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -304,4 +304,7 @@ YELLOW_4 = 44 @ D
 LIGHT_BLUE = 45 @ E
 WHITE_5 = 46 @ F
 LIGHT_BLUE_2 = 47 @ G (TODO CHECK THIS)
+ITEM_COLOR = 49 @ I
+CYAN_3 = 4D @ M
 YELLOW_5 = 4E @ N
+UNKNOWN_COLOR = 57 @ W
diff --git a/data/cutscenes_1.s b/data/cutscenes_1.s
index c983f0f..e3f197c 100644
--- a/data/cutscenes_1.s
+++ b/data/cutscenes_1.s
@@ -62,7 +62,7 @@
 
     .global PleaseWakeUp_822C4C0
     PleaseWakeUp_822C4C0:
-    .string " ...Please{COMMA} wake up.#W\nCome on{COMMA} wake up.\0"
+    .string " ...Please{COMMA} wake up.{WAIT_PRESS}\nCome on{COMMA} wake up.\0"
     .align 2,0
 
     .global ExcuseMe_822C4F0
@@ -72,7 +72,7 @@
 
     .global HeyWakeUp_822C500
     HeyWakeUp_822C500:
-    .string " ...Hey{COMMA} wake up.#W\nWake up already.\0"
+    .string " ...Hey{COMMA} wake up.{WAIT_PRESS}\nWake up already.\0"
     .align 2,0
 
     .global Hey_822C528
@@ -97,27 +97,27 @@
 
     .global WonderWhoItIs_822C554
     WonderWhoItIs_822C554:
-    .string "#+I wonder who it is?\0"
+    .string "{CENTER_ALIGN}I wonder who it is?\0"
     .align 2,0
 
     .global VoiceSomewhere_822C56C
     VoiceSomewhere_822C56C:
-    .string "#+...I hear a voice from somewhere...\0"
+    .string "{CENTER_ALIGN}...I hear a voice from somewhere...\0"
     .align 2,0
 
     .global PleasantBreeze_822C594
     PleasantBreeze_822C594:
-    .string "#+I feel a pleasant breeze.\0"
+    .string "{CENTER_ALIGN}I feel a pleasant breeze.\0"
     .align 2,0
 
     .global AmIDreamingThis_822C5B0
     AmIDreamingThis_822C5B0:
-    .string "#+Am I dreaming this?\0"
+    .string "{CENTER_ALIGN}Am I dreaming this?\0"
     .align 2,0
 
     .global WhereAmI_822C5C8
     WhereAmI_822C5C8:
-    .string "#+Where am I?\0"
+    .string "{CENTER_ALIGN}Where am I?\0"
     .align 2,0
 
     .byte 0x90, 0x01, 0x07
diff --git a/data/data.s b/data/data.s
index 51554f7..d883239 100644
--- a/data/data.s
+++ b/data/data.s
@@ -410,7 +410,7 @@ gUnknown_80B71A0: @ 80B71A0
 
         .global CWEND_text
         CWEND_text:
-        .string "#CWEND{END_COLOR_TEXT_1}\0"
+        .string "{COLOR_1 UNKNOWN_COLOR}END{END_COLOR_TEXT_1}\0"
         .align 2,0
 
         .global CNLAST_text
@@ -425,7 +425,7 @@ gUnknown_80B71A0: @ 80B71A0
 
         .global CISTART_text
         CISTART_text:
-        .string "#CISTART{END_COLOR_TEXT_1}\0"
+        .string "{COLOR_1 ITEM_COLOR}START{END_COLOR_TEXT_1}\0"
         .align 2,0
 
 	.global gUnknown_80B71E4
diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s
index 74eb4a9..7f6e602 100644
--- a/data/data_80B9BB8.s
+++ b/data/data_80B9BB8.s
@@ -5969,7 +5969,7 @@ gUnknown_80D406C: @ 80D406C
 
 	.global gUnknown_80D4074
 gUnknown_80D4074: @ 80D4074
-        .string "#+{ARG_POKEMON_0}\0"
+        .string "{CENTER_ALIGN}{ARG_POKEMON_0}\0"
         .align 2,0
 
 	.global gUnknown_80D407C
@@ -6039,7 +6039,7 @@ gUnknown_80D40F4: @ 80D40F4
 
 	.global gUnknown_80D40FC
 gUnknown_80D40FC: @ 80D40FC
-        .string "#+%s\0"
+        .string "{CENTER_ALIGN}%s\0"
         .align 2,0
 
 	.global gUnknown_80D4104
diff --git a/data/data_80D47B8.s b/data/data_80D47B8.s
index 651e042..dcb62e7 100644
--- a/data/data_80D47B8.s
+++ b/data/data_80D47B8.s
@@ -44,7 +44,7 @@ gUnknown_80D47C8: @ 80D47C8
 
 	.global gUnknown_80D4828
 gUnknown_80D4828: @ 80D4828
-        .string "#C%c%s\0"
+        .string "{COLOR_1}%c%s\0"
         .align 2,0
 
 	.global gUnknown_80D4830
@@ -341,19 +341,19 @@ gFelicityDialogue: @ 80D49E0 (Felicity Bank Dialogue)
 gUnknown_80D4A58:
     .string " Sssnore...\n"
     .string "Ah{COMMA} you wish to know how the bank\n"
-    .string "operates... Very well...#P"
+    .string "operates... Very well...{EXTRA_MSG}"
     .string " Zzz...\n"
     .string "If you{APOSTROPHE}re defeated in a dungeon{COMMA}\n"
-    .string "you{APOSTROPHE}ll lose all your money. Did you know?#P"
+    .string "you{APOSTROPHE}ll lose all your money. Did you know?{EXTRA_MSG}"
     .string " Purr...\n"
     .string "But{COMMA} you{APOSTROPHE}ve nothing to fear if you leave\n"
-    .string "your money with Felicity Bank...#P"
+    .string "your money with Felicity Bank...{EXTRA_MSG}"
     .string " Meow... Even if you\n"
     .string "return defeated from a dungeon{COMMA} your\n"
-    .string "money will be safe with me...#P"
+    .string "money will be safe with me...{EXTRA_MSG}"
     .string " Sssnore...\n"
     .string "I assure you{COMMA} my bank will keep your\n"
-    .string "money safe...#P"
+    .string "money safe...{EXTRA_MSG}"
     .string " Zzz...\n"
     .string "Simple{COMMA} isn{APOSTROPHE}t it...?\0"
     .align 2, 0
@@ -367,7 +367,7 @@ gUnknown_80D4C14:
 
     .global gUnknown_80D4C50
 gUnknown_80D4C50:
-    .string " Fnarf? Hunh...?#P"
+    .string " Fnarf? Hunh...?{EXTRA_MSG}"
     .string " Purr... I so do apologize{COMMA}\n"
     .string "but you couldn{APOSTROPHE}t possibly carry any more\n"
     .string "money with you...\0"
@@ -375,7 +375,7 @@ gUnknown_80D4C50:
 
     .global gUnknown_80D4CC0
 gUnknown_80D4CC0:
-    .string " Fnarf? Meow...?#P"
+    .string " Fnarf? Meow...?{EXTRA_MSG}"
     .string " Purr...\n"
     .string "I so hate to disappoint{COMMA} but you have no\n"
     .string "money saved with me...\0"
@@ -390,15 +390,15 @@ gUnknown_80D4D20:
     .global gUnknown_80D4D44
 gUnknown_80D4D44:
     .string " Zzz...\n"
-    .string "{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}... Very well...#W\n"
+    .string "{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}... Very well...{WAIT_PRESS}\n"
     .string "I will guard it jealously...\0"
     .align 2, 0
 
     .global gUnknown_80D4D8C
 gUnknown_80D4D8C:
     .string " Fnarf? Purr...\n"
-    .string "Meow! All this money...#W\n"
-    .string "Our safe is about to burst...#P"
+    .string "Meow! All this money...{WAIT_PRESS}\n"
+    .string "Our safe is about to burst...{EXTRA_MSG}"
     .string " Purr...\n"
     .string "I am so sorry to say{COMMA} but I can{APOSTROPHE}t accept\n"
     .string "any more of your money...\0"
@@ -406,7 +406,7 @@ gUnknown_80D4D8C:
 
     .global gUnknown_80D4E28
 gUnknown_80D4E28:
-    .string " Sssnore... Hmm?#P"
+    .string " Sssnore... Hmm?{EXTRA_MSG}"
     .string " Zzz...\n"
     .string "I{APOSTROPHE}m so sorry to say{COMMA} but you appear not\n"
     .string "to have any money...\0"
@@ -458,18 +458,18 @@ gUnknown_80D4F94:
     .global gUnknown_80D4FC8
 gUnknown_80D4FC8:
     .string " Ah{COMMA} you wish to know how\n"
-    .string "the bank operates. Very well.#P"
+    .string "the bank operates. Very well.{EXTRA_MSG}"
     .string " If you are defeated\n"
     .string "in a dungeon{COMMA} you{APOSTROPHE}ll lose all your money.\n"
-    .string "Did you know that?#P"
-    .string " But you can avoid that!#W\n"
+    .string "Did you know that?{EXTRA_MSG}"
+    .string " But you can avoid that!{WAIT_PRESS}\n"
     .string "You{APOSTROPHE}ve nothing to fear if you leave your\n"
-    .string "money with Felicity Bank.#P"
+    .string "money with Felicity Bank.{EXTRA_MSG}"
     .string " Even if you return\n"
     .string "defeated from a dungeon{COMMA} your money will\n"
-    .string "be safe with me!#P"
+    .string "be safe with me!{EXTRA_MSG}"
     .string " I assure you{COMMA} my bank\n"
-    .string "will keep your money safe.#P"
+    .string "will keep your money safe.{EXTRA_MSG}"
     .string " Simple{COMMA} isn{APOSTROPHE}t it?\0"
     .align 2, 0
 
@@ -481,14 +481,14 @@ gUnknown_80D5158:
 
     .global gUnknown_80D5184
 gUnknown_80D5184:
-    .string " Oh?#W I do so apologize{COMMA}\n"
+    .string " Oh?{WAIT_PRESS} I do so apologize{COMMA}\n"
     .string "but you couldn{APOSTROPHE}t possibly carry any more\n"
     .string "money with you.\0"
     .align 2, 0
 
     .global gUnknown_80D51DC
 gUnknown_80D51DC:
-    .string " Oh?#W I so hate to disappoint{COMMA}\n"
+    .string " Oh?{WAIT_PRESS} I so hate to disappoint{COMMA}\n"
     .string "but you have no money saved with me.\0"
     .align 2, 0
 
@@ -500,21 +500,21 @@ gUnknown_80D5224:
 
     .global gUnknown_80D5244
 gUnknown_80D5244:
-    .string " {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}. Very well.#W\n"
+    .string " {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}. Very well.{WAIT_PRESS}\n"
     .string "I will guard it jealously.\0"
     .align 2, 0
 
     .global gUnknown_80D527C
 gUnknown_80D527C:
-    .string " Meow! All this money!#W\n"
-    .string "Our safe is about to burst!#P"
+    .string " Meow! All this money!{WAIT_PRESS}\n"
+    .string "Our safe is about to burst!{EXTRA_MSG}"
     .string " I am so sorry to say{COMMA} but\n"
     .string "I can{APOSTROPHE}t accept any more of your money!\0"
     .align 2, 0
 
     .global gUnknown_80D52F8
 gUnknown_80D52F8:
-    .string " Oh?#W I{APOSTROPHE}m so sorry to say{COMMA}\n"
+    .string " Oh?{WAIT_PRESS} I{APOSTROPHE}m so sorry to say{COMMA}\n"
     .string "but you appear not to have any money.\0"
     .align 2, 0
 
@@ -599,9 +599,9 @@ gKangaskhanStorageDialogue: @ 80D5404 (Kangaskhan Storage Dialogue)
 gUnknown_80D54A4:
     .string " Zzz... Snork!\n"
     .string "I can store items that you\n"
-    .string "found in dungeons...#P"
+    .string "found in dungeons...{EXTRA_MSG}"
     .string " Snarfle...\n"
-    .string "Things in storage don{APOSTROPHE}t get lost...#P"
+    .string "Things in storage don{APOSTROPHE}t get lost...{EXTRA_MSG}"
     .string " Zzz... Zzz...\n"
     .string "That{APOSTROPHE}s why...\n"
     .string "Keep important items in storage...\0"
@@ -628,20 +628,20 @@ gUnknown_80D55C0:
 
     .global gUnknown_80D55F4
 gUnknown_80D55F4:
-    .string " Snarfle? Hunh...?#W\n"
+    .string " Snarfle? Hunh...?{WAIT_PRESS}\n"
     .string "Zzz... Your storage space... Empty...\0"
     .align 2, 0
 
     .global gUnknown_80D5630
 gUnknown_80D5630:
-    .string " Snarfle? Hunh...?#W\n"
+    .string " Snarfle? Hunh...?{WAIT_PRESS}\n"
     .string "Zzz...\n"
     .string "You don{APOSTROPHE}t have enough space...\0"
     .align 2, 0
 
     .global gUnknown_80D5670
 gUnknown_80D5670:
-    .string " Snarfle? Hunh...?#W\n"
+    .string " Snarfle? Hunh...?{WAIT_PRESS}\n"
     .string "Zzz...\n"
     .string "You don{APOSTROPHE}t have anything...?\0"
     .align 2, 0
@@ -736,13 +736,13 @@ gUnknown_80D5954:
 gUnknown_80D5984:
     .string " I can store items that you\n"
     .string "found in dungeons{COMMA} or that you\n"
-    .string "bought from shops.#P"
+    .string "bought from shops.{EXTRA_MSG}"
     .string " If you faint in\n"
-    .string "a dungeon{COMMA} your items will be lost...#W\n"
-    .string "But what{APOSTROPHE}s in storage will be safe.#P"
+    .string "a dungeon{COMMA} your items will be lost...{WAIT_PRESS}\n"
+    .string "But what{APOSTROPHE}s in storage will be safe.{EXTRA_MSG}"
     .string " I keep guard over the\n"
     .string "storage space{COMMA} so anything you leave\n"
-    .string "with me won{APOSTROPHE}t ever disappear!#P"
+    .string "with me won{APOSTROPHE}t ever disappear!{EXTRA_MSG}"
     .string " If you have any items that\n"
     .string "you can{APOSTROPHE}t bear to lose{COMMA} be sure to leave\n"
     .string "them with me!\0"
@@ -762,7 +762,7 @@ gUnknown_80D5B24:
 
     .global gUnknown_80D5B5C
 gUnknown_80D5B5C:
-    .string " Oh{COMMA} dear{COMMA} sorry.#W\n"
+    .string " Oh{COMMA} dear{COMMA} sorry.{WAIT_PRESS}\n"
     .string "That {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} is an item you\n"
     .string "can{APOSTROPHE}t put in storage.\0"
     .align 2, 0
@@ -962,13 +962,13 @@ gKecleonShopDialogue: @ 80D5EC8 (Kecleon Wares Dialogue)
     .global gUnknown_80D6038
 gUnknown_80D6038:
     .string " Zzz... Reep reep...\n"
-    .string "Wonder Orbs are convenient...#P"
+    .string "Wonder Orbs are convenient...{EXTRA_MSG}"
     .string " Zzzzzz...\n"
-    .string "They disappear after one use...#P"
+    .string "They disappear after one use...{EXTRA_MSG}"
     .string " Zzz... And moves...\n"
-    .string "They are ultimate...#P"
+    .string "They are ultimate...{EXTRA_MSG}"
     .string " Zzz... Eep...\n"
-    .string "Learn moves with Technical Machines...#P"
+    .string "Learn moves with Technical Machines...{EXTRA_MSG}"
     .string " Zzz...\n"
     .string "My good wares...\n"
     .string "Come buy... Reep...\0"
@@ -976,45 +976,45 @@ gUnknown_80D6038:
 
     .global gUnknown_80D6128
 gUnknown_80D6128:
-    .string " Zzz... Eep? No{COMMA} no...#W\n"
+    .string " Zzz... Eep? No{COMMA} no...{WAIT_PRESS}\n"
     .string "You cannot hold any more money...\0"
     .align 2, 0
 
     .global gUnknown_80D6168
 gUnknown_80D6168:
-    .string " Zzz... Hunh? Wha--? Whoa!#W\n"
+    .string " Zzz... Hunh? Wha--? Whoa!{WAIT_PRESS}\n"
     .string "I... I can{APOSTROPHE}t accept anything like that!\0"
     .align 2, 0
 
     .global gUnknown_80D61B0
 gUnknown_80D61B0:
-    .string " Reep...? Eep!#W\n"
+    .string " Reep...? Eep!{WAIT_PRESS}\n"
     .string "Not enough money!\0"
     .align 2, 0
 
     .global gUnknown_80D61D4
 gUnknown_80D61D4:
-    .string " Zzz... Uh-oh...#W\n"
+    .string " Zzz... Uh-oh...{WAIT_PRESS}\n"
     .string "All gone!\n"
     .string "I am sold out...\0"
     .align 2, 0
 
     .global gUnknown_80D6204
 gUnknown_80D6204:
-    .string " Zzz... Hunh? Oh...#W\n"
+    .string " Zzz... Hunh? Oh...{WAIT_PRESS}\n"
     .string "Reep... No room... Reep...\n"
     .string "No room for my wares...\0"
     .align 2, 0
 
     .global gUnknown_80D6250
 gUnknown_80D6250:
-    .string " Zzzzzz... Oh?#W\n"
+    .string " Zzzzzz... Oh?{WAIT_PRESS}\n"
     .string "You{APOSTROPHE}ve got nothing...\0"
     .align 2, 0
 
     .global gUnknown_80D627C
 gUnknown_80D627C:
-    .string " Zzz... Oh...?#W\n"
+    .string " Zzz... Oh...?{WAIT_PRESS}\n"
     .string "You have nothing to sell...\n"
     .string "Hunh?\0"
     .align 2, 0
@@ -1022,21 +1022,21 @@ gUnknown_80D627C:
     .global gUnknown_80D62B0
 gUnknown_80D62B0:
     .string " Eep...? Zzz...\n"
-    .string "You have too much money!#P"
+    .string "You have too much money!{EXTRA_MSG}"
     .string " Zzz... Eh?\n"
     .string "You can{APOSTROPHE}t hold any more money...\0"
     .align 2, 0
 
     .global gUnknown_80D630C
 gUnknown_80D630C:
-    .string " Reep eep! Oh?#W\n"
+    .string " Reep eep! Oh?{WAIT_PRESS}\n"
     .string "Eep...?\n"
     .string "You have no money?\0"
     .align 2, 0
 
     .global gUnknown_80D6338
 gUnknown_80D6338:
-    .string " ...#WZzz...\n"
+    .string " ...{WAIT_PRESS}Zzz...\n"
     .string "I am all sold out... Sorry...\0"
     .align 2, 0
 
@@ -1119,27 +1119,27 @@ gUnknown_80D6544:
     .global gUnknown_80D6564
 gUnknown_80D6564:
     .string " Wonder Orbs are very{COMMA}\n"
-    .string "very convenient〜♪#P"
+    .string "very convenient〜♪{EXTRA_MSG}"
     .string " However{COMMA} they disappear\n"
-    .string "after one use...#W\n"
-    .string "But they are useful in a pinch!#P"
+    .string "after one use...{WAIT_PRESS}\n"
+    .string "But they are useful in a pinch!{EXTRA_MSG}"
     .string " Use them cleverly{COMMA} and your\n"
-    .string "adventures will be made much easier〜♪#P"
-    .string " And moves...#W\n"
-    .string "They are the ultimate power!#P"
-    .string " Smash rocks!#W Fly!#W\n"
+    .string "adventures will be made much easier〜♪{EXTRA_MSG}"
+    .string " And moves...{WAIT_PRESS}\n"
+    .string "They are the ultimate power!{EXTRA_MSG}"
+    .string " Smash rocks!{WAIT_PRESS} Fly!{WAIT_PRESS}\n"
     .string "There are many kinds of moves{COMMA} all of\n"
-    .string "them dynamic{COMMA} yet elegant!#P"
+    .string "them dynamic{COMMA} yet elegant!{EXTRA_MSG}"
     .string " There are even moves of\n"
-    .string "obscure rarity...#W\n"
-    .string "Simply gorgeous{COMMA} they are!#P"
-    .string " Now{COMMA} we have these moves!#W\n"
+    .string "obscure rarity...{WAIT_PRESS}\n"
+    .string "Simply gorgeous{COMMA} they are!{EXTRA_MSG}"
+    .string " Now{COMMA} we have these moves!{WAIT_PRESS}\n"
     .string "They can be learned using our Technical\n"
-    .string "Machines{COMMA} or TMs for short!#P"
+    .string "Machines{COMMA} or TMs for short!{EXTRA_MSG}"
     .string " You see?\n"
-    .string "Isn{APOSTROPHE}t it exciting? Even dreamy?#P"
+    .string "Isn{APOSTROPHE}t it exciting? Even dreamy?{EXTRA_MSG}"
     .string " Why{COMMA} it gets me so excited{COMMA}\n"
-    .string "my color has turned a rosy tint!#P"
+    .string "my color has turned a rosy tint!{EXTRA_MSG}"
     .string " I do hope you will shop\n"
     .string "with us--me and my brother next to\n"
     .string "me!\0"
@@ -1147,47 +1147,47 @@ gUnknown_80D6564:
 
     .global gUnknown_80D6818
 gUnknown_80D6818:
-    .string " Oh{COMMA} no{COMMA} no!#W\n"
+    .string " Oh{COMMA} no{COMMA} no!{WAIT_PRESS}\n"
     .string "My friend{COMMA} you cannot add to your money!\n"
     .string "I cannot do this.\0"
     .align 2, 0
 
     .global gUnknown_80D6868
 gUnknown_80D6868:
-    .string " Whoa{COMMA} whoa!#W\n"
+    .string " Whoa{COMMA} whoa!{WAIT_PRESS}\n"
     .string "I... I can{APOSTROPHE}t accept anything like that!\0"
     .align 2, 0
 
     .global gUnknown_80D68A4
 gUnknown_80D68A4:
-    .string " Eep! Oh{COMMA} dear!#W\n"
+    .string " Eep! Oh{COMMA} dear!{WAIT_PRESS}\n"
     .string "You{APOSTROPHE}re short on money{COMMA} my friend!\0"
     .align 2, 0
 
     .global gUnknown_80D68E0
 gUnknown_80D68E0:
-    .string " Oh? Uh-oh!#W\n"
-    .string "My shelves are bare of wares!#P"
+    .string " Oh? Uh-oh!{WAIT_PRESS}\n"
+    .string "My shelves are bare of wares!{EXTRA_MSG}"
     .string " I am completely sold out{COMMA}\n"
     .string "my friend!\0"
     .align 2, 0
 
     .global gUnknown_80D6938
 gUnknown_80D6938:
-    .string " Oh{COMMA} dear me!#W\n"
+    .string " Oh{COMMA} dear me!{WAIT_PRESS}\n"
     .string "My friend{COMMA} you{APOSTROPHE}ve run out of space for\n"
     .string "my wares!\0"
     .align 2, 0
 
     .global gUnknown_80D6980
 gUnknown_80D6980:
-    .string " Oh?#W\n"
+    .string " Oh?{WAIT_PRESS}\n"
     .string "My friend{COMMA} you seem to have nothing?\0"
     .align 2, 0
 
     .global gUnknown_80D69B0
 gUnknown_80D69B0:
-    .string " Oh{COMMA} oh{COMMA} oh?#W\n"
+    .string " Oh{COMMA} oh{COMMA} oh?{WAIT_PRESS}\n"
     .string "My friend{COMMA} you seem to not have anything\n"
     .string "that you can sell?\0"
     .align 2, 0
@@ -1195,22 +1195,22 @@ gUnknown_80D69B0:
     .global gUnknown_80D6A04
 gUnknown_80D6A04:
     .string " Oh{COMMA} my{COMMA} my!\n"
-    .string "My friend{COMMA} you have too much money!#P"
+    .string "My friend{COMMA} you have too much money!{EXTRA_MSG}"
     .string " You can{APOSTROPHE}t carry any more\n"
     .string "money than you have now.\0"
     .align 2, 0
 
     .global gUnknown_80D6A74
 gUnknown_80D6A74:
-    .string " Oh?#W\n"
+    .string " Oh?{WAIT_PRESS}\n"
     .string "My friend{COMMA} you seem not to have\n"
     .string "enough money?\0"
     .align 2, 0
 
     .global gUnknown_80D6AAC
 gUnknown_80D6AAC:
-    .string " ...#WI am all out of wares...\n"
-    .string "I am so sorry{COMMA} my friend...#P"
+    .string " ...{WAIT_PRESS}I am all out of wares...\n"
+    .string "I am so sorry{COMMA} my friend...{EXTRA_MSG}"
     .string " Tomorrow!\n"
     .string "Tomorrow I shall have more wares!\0"
     .align 2, 0
@@ -1288,9 +1288,9 @@ gUnknown_80D6D5C:
     .global gUnknown_80D6D98
 gUnknown_80D6D98:
     .string " Zzzzzz...\n"
-    .string "I sell items...#P"
+    .string "I sell items...{EXTRA_MSG}"
     .string " Items... Meep meep...\n"
-    .string "Are useful in dungeons...#P"
+    .string "Are useful in dungeons...{EXTRA_MSG}"
     .string " Use... Zzz... Huh...?\n"
     .string "Your imagination...and be clever...\n"
     .string "With them...\0"
@@ -1298,46 +1298,46 @@ gUnknown_80D6D98:
 
     .global gUnknown_80D6E30
 gUnknown_80D6E30:
-    .string " Zzz... Hunh{COMMA} what...?#W\n"
+    .string " Zzz... Hunh{COMMA} what...?{WAIT_PRESS}\n"
     .string "Zzz... You can{APOSTROPHE}t hold any more money...\0"
     .align 2, 0
 
     .global gUnknown_80D6E78
 gUnknown_80D6E78:
-    .string " Zzz... Whoa...#W\n"
+    .string " Zzz... Whoa...{WAIT_PRESS}\n"
     .string "I... I can{APOSTROPHE}t take that!\0"
     .align 2, 0
 
     .global gUnknown_80D6EA4
 gUnknown_80D6EA4:
-    .string " Zzz... Huh{COMMA} my...!#W\n"
+    .string " Zzz... Huh{COMMA} my...!{WAIT_PRESS}\n"
     .string "Meep... Meep...\n"
     .string "You don{APOSTROPHE}t have enough money!\0"
     .align 2, 0
 
     .global gUnknown_80D6EEC
 gUnknown_80D6EEC:
-    .string " Zzz... Uh-oh?!#W\n"
+    .string " Zzz... Uh-oh?!{WAIT_PRESS}\n"
     .string "Eep!\n"
     .string "Sold out! All gone!\0"
     .align 2, 0
 
     .global gUnknown_80D6F18
 gUnknown_80D6F18:
-    .string " Zzz... Oh{COMMA} my!#W\n"
+    .string " Zzz... Oh{COMMA} my!{WAIT_PRESS}\n"
     .string "Meep... You have no space...\0"
     .align 2, 0
 
     .global gUnknown_80D6F4C
 gUnknown_80D6F4C:
-    .string " Zzz... Eep...?#W\n"
+    .string " Zzz... Eep...?{WAIT_PRESS}\n"
     .string "Meep... You don{APOSTROPHE}t seem to have\n"
     .string "anything...?\0"
     .align 2, 0
 
     .global gUnknown_80D6F8C
 gUnknown_80D6F8C:
-    .string " Zzz... Huh?#W\n"
+    .string " Zzz... Huh?{WAIT_PRESS}\n"
     .string "Meep meep...\n"
     .string "You don{APOSTROPHE}t seem to have anything to sell?\0"
     .align 2, 0
@@ -1345,21 +1345,21 @@ gUnknown_80D6F8C:
     .global gUnknown_80D6FD4
 gUnknown_80D6FD4:
     .string " Zzz... Oh{COMMA} my!\n"
-    .string "You have so much money...!#P"
+    .string "You have so much money...!{EXTRA_MSG}"
     .string " Zzz... Meep...\n"
     .string "You can{APOSTROPHE}t carry any more money...\0"
     .align 2, 0
 
     .global gUnknown_80D7038
 gUnknown_80D7038:
-    .string " Hunh?#W\n"
+    .string " Hunh?{WAIT_PRESS}\n"
     .string "Eep...?\n"
     .string "You don{APOSTROPHE}t have money?\0"
     .align 2, 0
 
     .global gUnknown_80D7064
 gUnknown_80D7064:
-    .string " ...#W ZZZ!\n"
+    .string " ...{WAIT_PRESS} ZZZ!\n"
     .string "I{APOSTROPHE}m sold out... Forgive me...\0"
     .align 2, 0
 
@@ -1442,20 +1442,20 @@ gUnknown_80D72A0:
 gUnknown_80D72B8:
     .string " We{COMMA} the {ARG_POKEMON_6}\n"
     .string "Brothers{COMMA} have a passion for selling\n"
-    .string "items.#P"
+    .string "items.{EXTRA_MSG}"
     .string " Items are useful for your\n"
-    .string "dungeon adventures.#P"
+    .string "dungeon adventures.{EXTRA_MSG}"
     .string " Use your imagination and\n"
-    .string "discover innovative uses{COMMA} please.#P"
+    .string "discover innovative uses{COMMA} please.{EXTRA_MSG}"
     .string " Ah{COMMA} yes.\n"
-    .string "If my shop sells out...#P"
+    .string "If my shop sells out...{EXTRA_MSG}"
     .string " New merchandise will\n"
-    .string "arrive the following day.#P"
+    .string "arrive the following day.{EXTRA_MSG}"
     .string " Until then{COMMA} please go to\n"
     .string "a dungeon and spend some time.\n"
-    .string "Please visit on your return〜♪#P"
+    .string "Please visit on your return〜♪{EXTRA_MSG}"
     .string " Ah{COMMA} yes. The {ARG_POKEMON_6}\n"
-    .string "Shop is a nationwide chain.#P"
+    .string "Shop is a nationwide chain.{EXTRA_MSG}"
     .string " There are shops even in\n"
     .string "dungeons.\n"
     .string "Please do visit〜♪ \0"
@@ -1463,66 +1463,66 @@ gUnknown_80D72B8:
 
     .global gUnknown_80D7480
 gUnknown_80D7480:
-    .string " Oh{COMMA} my!#W\n"
+    .string " Oh{COMMA} my!{WAIT_PRESS}\n"
     .string "You can{APOSTROPHE}t add any more to your money.\n"
     .string "I can{APOSTROPHE}t complete this deal{COMMA} sorry.\0"
     .align 2, 0
 
     .global gUnknown_80D74DC
 gUnknown_80D74DC:
-    .string " Oh{COMMA} whoa{COMMA} whoa!#W\n"
+    .string " Oh{COMMA} whoa{COMMA} whoa!{WAIT_PRESS}\n"
     .string "I... I couldn{APOSTROPHE}t possibly take that from you!\0"
     .align 2, 0
 
     .global gUnknown_80D7524
 gUnknown_80D7524:
-    .string " Oh{COMMA} my!#W\n"
+    .string " Oh{COMMA} my!{WAIT_PRESS}\n"
     .string "Sorry{COMMA} but you don{APOSTROPHE}t have enough money!\0"
     .align 2, 0
 
     .global gUnknown_80D7560
 gUnknown_80D7560:
-    .string " Uh-oh?!#W\n"
-    .string "That{APOSTROPHE}s it! No more merchandise!#P"
+    .string " Uh-oh?!{WAIT_PRESS}\n"
+    .string "That{APOSTROPHE}s it! No more merchandise!{EXTRA_MSG}"
     .string " I{APOSTROPHE}m completely sold out!\0"
     .align 2, 0
 
     .global gUnknown_80D75AC
 gUnknown_80D75AC:
-    .string " Oh{COMMA} my!#W\n"
+    .string " Oh{COMMA} my!{WAIT_PRESS}\n"
     .string "You have no space for any more items!\0"
     .align 2, 0
 
     .global gUnknown_80D75E0
 gUnknown_80D75E0:
-    .string " Oh? Oh?#W\n"
+    .string " Oh? Oh?{WAIT_PRESS}\n"
     .string "You don{APOSTROPHE}t seem to have anything?\0"
     .align 2, 0
 
     .global gUnknown_80D7610
 gUnknown_80D7610:
-    .string " Oh? Oh?#W\n"
+    .string " Oh? Oh?{WAIT_PRESS}\n"
     .string "You seem to have nothing to sell?\0"
     .align 2, 0
 
     .global gUnknown_80D7640
 gUnknown_80D7640:
     .string " Oh{COMMA} my goodness!\n"
-    .string "You{APOSTROPHE}re overflowing with money!#P"
+    .string "You{APOSTROPHE}re overflowing with money!{EXTRA_MSG}"
     .string " You couldn{APOSTROPHE}t possibly carry\n"
     .string "any more money! \0"
     .align 2, 0
 
     .global gUnknown_80D76A8
 gUnknown_80D76A8:
-    .string " Huh?#W\n"
+    .string " Huh?{WAIT_PRESS}\n"
     .string "You don{APOSTROPHE}t seem to have the money?\0"
     .align 2, 0
 
     .global gUnknown_80D76D4
 gUnknown_80D76D4:
-    .string " ...#WI{APOSTROPHE}m sold out...\n"
-    .string "Please{COMMA} forgive me.#P"
+    .string " ...{WAIT_PRESS}I{APOSTROPHE}m sold out...\n"
+    .string "Please{COMMA} forgive me.{EXTRA_MSG}"
     .string " I will have new merchandise\n"
     .string "for you tomorrow{COMMA} I swear!\0"
     .align 2, 0
@@ -1648,26 +1648,26 @@ gWigglytuffDialogue: @ 80D79A4 (Friend Area Shop)
     .global gUnknown_80D7A44
 gUnknown_80D7A44:
     .string " Zzz...\n"
-    .string "Want more friends?#P"
+    .string "Want more friends?{EXTRA_MSG}"
     .string " Zzz... Kwoo...\n"
-    .string "You need Friend Areas for friends...#P"
+    .string "You need Friend Areas for friends...{EXTRA_MSG}"
     .string " Zzz... Zzz...\n"
     .string "A Pokémon becomes your pal when it{APOSTROPHE}s in\n"
-    .string "the right Friend Area...#P"
+    .string "the right Friend Area...{EXTRA_MSG}"
     .string " Zzz... Dwee...\n"
     .string "That{APOSTROPHE}s why you should get more Friend\n"
-    .string "Areas...#P"
+    .string "Areas...{EXTRA_MSG}"
     .string " Zzz... Pokémon can only\n"
     .string "live in the right Friend Area for\n"
-    .string "their species...#P"
+    .string "their species...{EXTRA_MSG}"
     .string " Kwoo... Sssnore...\n"
     .string "See what Pokémon can live there by\n"
-    .string "checking {COLOR_1 YELLOW}Info{END_COLOR_TEXT_1}...#P"
+    .string "checking {COLOR_1 YELLOW}Info{END_COLOR_TEXT_1}...{EXTRA_MSG}"
     .string " Zzz...\n"
-    .string "I don{APOSTROPHE}t sell some Friend Areas...#P"
+    .string "I don{APOSTROPHE}t sell some Friend Areas...{EXTRA_MSG}"
     .string " Kwoo...\n"
     .string "Some rescue missions reward you with\n"
-    .string "Friend Areas...#P"
+    .string "Friend Areas...{EXTRA_MSG}"
     .string " Zzz... Dwee...\n"
     .string "Check the Pelipper Post Office{APOSTROPHE}s Bulletin\n"
     .string "Board or your Mailbox for missions...\0"
@@ -1677,7 +1677,7 @@ gUnknown_80D7A44:
 gUnknown_80D7C94:
     .string " Sssnore...\n"
     .string "{COLOR_1 GREEN}$h{END_COLOR_TEXT_1}...?\n"
-    .string "I can{APOSTROPHE}t get that Friend Area...#P"
+    .string "I can{APOSTROPHE}t get that Friend Area...{EXTRA_MSG}"
     .string " Zzz... Zzz...\n"
     .string "Sorry...\0"
     .align 2, 0
@@ -1686,7 +1686,7 @@ gUnknown_80D7C94:
 gUnknown_80D7CE8:
     .string " Zzz... Hunh...?\n"
     .string "{COLOR_1 GREEN}$h{END_COLOR_TEXT_1}...?\n"
-    .string "I don{APOSTROPHE}t know... I{APOSTROPHE}ll check...#P"
+    .string "I don{APOSTROPHE}t know... I{APOSTROPHE}ll check...{EXTRA_MSG}"
     .string " Sssnore...\n"
     .string "I{APOSTROPHE}ll have it for sale...\n"
     .string "When I find out...\0"
@@ -1720,35 +1720,35 @@ gUnknown_80D7E04:
 
     .global gUnknown_80D7E2C
 gUnknown_80D7E2C:
-    .string " Zzz... Dwee...? Oops?#W\n"
+    .string " Zzz... Dwee...? Oops?{WAIT_PRESS}\n"
     .string "Not enough money?\0"
     .align 2, 0
 
     .global gUnknown_80D7E58
 gUnknown_80D7E58:
-    .string " Zzz... Hunh?#W\n"
+    .string " Zzz... Hunh?{WAIT_PRESS}\n"
     .string "Sssnore... Sorry...\n"
     .string "Fresh out of Friend Areas...\0"
     .align 2, 0
 
     .global gUnknown_80D7E9C
 gUnknown_80D7E9C:
-    .string " Hunh...?#W\n"
+    .string " Hunh...?{WAIT_PRESS}\n"
     .string "You don{APOSTROPHE}t have any money...\n"
     .string "Zzzzzz...\0"
     .align 2, 0
 
     .global gUnknown_80D7ED0
 gUnknown_80D7ED0:
-    .string " Zzz... Zzz?#W\n"
+    .string " Zzz... Zzz?{WAIT_PRESS}\n"
     .string "Hunh...?\n"
     .string "You can{APOSTROPHE}t add to your Friend Areas...\0"
     .align 2, 0
 
     .global gUnknown_80D7F10
 gUnknown_80D7F10:
-    .string " Grats... Zzz...#W\n"
-    .string "You can go to {COLOR_1 GREEN}$h{END_COLOR_TEXT_1}...#P"
+    .string " Grats... Zzz...{WAIT_PRESS}\n"
+    .string "You can go to {COLOR_1 GREEN}$h{END_COLOR_TEXT_1}...{EXTRA_MSG}"
     .string " Dwee... Sssnore...\n"
     .string "Make friends with Pokémon in...\n"
     .string "{COLOR_1 GREEN}$h{END_COLOR_TEXT_1}...\0"
@@ -1756,11 +1756,11 @@ gUnknown_80D7F10:
 
     .global gUnknown_80D7F7C
 gUnknown_80D7F7C:
-    .string " Zzz... Dwee... Gotcha...#W\n"
-    .string "Zzz... Let{APOSTROPHE}s do it...#P"
+    .string " Zzz... Dwee... Gotcha...{WAIT_PRESS}\n"
+    .string "Zzz... Let{APOSTROPHE}s do it...{EXTRA_MSG}"
     .string " Sssnore♪ Sssnore♪\n"
     .string "{ARG_POKEMON_6}〜♪ {ARG_POKEMON_6}〜♪\n"
-    .string "Let{APOSTROPHE}s be friends...#P"
+    .string "Let{APOSTROPHE}s be friends...{EXTRA_MSG}"
     .string " Kwoo!\n"
     .string "Taaaaaaah!\0"
     .align 2, 0
@@ -1806,30 +1806,30 @@ gUnknown_80D80D4:
     .global gUnknown_80D8104
 gUnknown_80D8104:
     .string " Would you like to get more\n"
-    .string "friends...#W\n"
-    .string "...More members for your team?#P"
+    .string "friends...{WAIT_PRESS}\n"
+    .string "...More members for your team?{EXTRA_MSG}"
     .string " To add new friends{COMMA} what\n"
-    .string "you need are Friend Areas.#P"
+    .string "you need are Friend Areas.{EXTRA_MSG}"
     .string " A Pokémon can join your\n"
     .string "rescue team only after it settles in\n"
-    .string "the right Friend Area.#P"
+    .string "the right Friend Area.{EXTRA_MSG}"
     .string " So{COMMA} if you want to recruit\n"
     .string "new members{COMMA} you should add to your\n"
-    .string "Friend Areas.#P"
+    .string "Friend Areas.{EXTRA_MSG}"
     .string " Oh{COMMA} yes{COMMA} Pokémon can\n"
     .string "only live in the right Friend Area for\n"
-    .string "their species.#P"
+    .string "their species.{EXTRA_MSG}"
     .string " If you{APOSTROPHE}re buying a Friend\n"
     .string "Area{COMMA} you should confirm what Pokémon\n"
-    .string "can live there by checking {COLOR_1 YELLOW}Info{END_COLOR_TEXT_1}.#P"
+    .string "can live there by checking {COLOR_1 YELLOW}Info{END_COLOR_TEXT_1}.{EXTRA_MSG}"
     .string " Also{COMMA} there are some Friend\n"
-    .string "Areas that I don{APOSTROPHE}t sell.#P"
+    .string "Areas that I don{APOSTROPHE}t sell.{EXTRA_MSG}"
     .string " I think there are some\n"
     .string "rescue missions that give you access\n"
-    .string "to Friend Areas{COMMA} too.#P"
+    .string "to Friend Areas{COMMA} too.{EXTRA_MSG}"
     .string " You should check the\n"
     .string "Pelipper Post Office{APOSTROPHE}s Bulletin Board or\n"
-    .string "your Mailbox for rescue requests.#P"
+    .string "your Mailbox for rescue requests.{EXTRA_MSG}"
     .string " You know{COMMA} it makes me\n"
     .string "delighted when you make new friends!\0"
     .align 2, 0
@@ -1837,15 +1837,15 @@ gUnknown_80D8104:
     .global gUnknown_80D8420
 gUnknown_80D8420:
     .string " {COLOR_1 GREEN}$h{END_COLOR_TEXT_1}?\n"
-    .string "I can{APOSTROPHE}t get that Friend Area for you.#W\n"
+    .string "I can{APOSTROPHE}t get that Friend Area for you.{WAIT_PRESS}\n"
     .string "I{APOSTROPHE}m really sorry.\0"
     .align 2, 0
 
     .global gUnknown_80D8468
 gUnknown_80D8468:
     .string " {COLOR_1 GREEN}$h{END_COLOR_TEXT_1}?\n"
-    .string "I don{APOSTROPHE}t know much about it at all.#W\n"
-    .string "I{APOSTROPHE}ll check up on it.#P"
+    .string "I don{APOSTROPHE}t know much about it at all.{WAIT_PRESS}\n"
+    .string "I{APOSTROPHE}ll check up on it.{EXTRA_MSG}"
     .string " I{APOSTROPHE}ll add it to the Friend\n"
     .string "Areas you can buy when I find out more.\0"
     .align 2, 0
@@ -1876,34 +1876,34 @@ gUnknown_80D8584:
 
     .global gUnknown_80D85AC
 gUnknown_80D85AC:
-    .string " Oops?#W\n"
+    .string " Oops?{WAIT_PRESS}\n"
     .string "It doesn{APOSTROPHE}t look like you have enough\n"
     .string "money!\0"
     .align 2, 0
 
     .global gUnknown_80D85E4
 gUnknown_80D85E4:
-    .string " Oops?#W\n"
-    .string "Oh{COMMA} too bad.#W\n"
+    .string " Oops?{WAIT_PRESS}\n"
+    .string "Oh{COMMA} too bad.{WAIT_PRESS}\n"
     .string "I{APOSTROPHE}m fresh out of Friend Areas.\0"
     .align 2, 0
 
     .global gUnknown_80D8620
 gUnknown_80D8620:
-    .string " Um?#W\n"
+    .string " Um?{WAIT_PRESS}\n"
     .string "You don{APOSTROPHE}t have any money.\0"
     .align 2, 0
 
     .global gUnknown_80D8644
 gUnknown_80D8644:
-    .string " Oops!#W\n"
+    .string " Oops!{WAIT_PRESS}\n"
     .string "You can{APOSTROPHE}t add to your Friend Areas.\0"
     .align 2, 0
 
     .global gUnknown_80D8674
 gUnknown_80D8674:
-    .string " Congratulations!#W\n"
-    .string "You can go to {COLOR_1 GREEN}$h{END_COLOR_TEXT_1} now!#P"
+    .string " Congratulations!{WAIT_PRESS}\n"
+    .string "You can go to {COLOR_1 GREEN}$h{END_COLOR_TEXT_1} now!{EXTRA_MSG}"
     .string " You can recruit\n"
     .string "Pokémon that live in the Friend Area\n"
     .string "{COLOR_1 GREEN}$h{END_COLOR_TEXT_1}.\0"
@@ -1911,8 +1911,8 @@ gUnknown_80D8674:
 
     .global gUnknown_80D86E4
 gUnknown_80D86E4:
-    .string " Gotcha! Let{APOSTROPHE}s do it!#W\n"
-    .string "{ARG_POKEMON_6}〜♪ {ARG_POKEMON_6}〜♪#W\n"
+    .string " Gotcha! Let{APOSTROPHE}s do it!{WAIT_PRESS}\n"
+    .string "{ARG_POKEMON_6}〜♪ {ARG_POKEMON_6}〜♪{WAIT_PRESS}\n"
     .string "Let{APOSTROPHE}s be friends... Yoomtaaaaaaah!\0"
     .align 2, 0
 
@@ -2012,16 +2012,16 @@ gGulpinDialogue: @ 80D8888 (Gulpin Link Shop)
 gUnknown_80D8950:
     .string " Zzz... Snuffle...\n"
     .string "I{APOSTROPHE}d go broke if it weren{APOSTROPHE}t for those\n"
-    .string "forgetful Pokémon...#P"
+    .string "forgetful Pokémon...{EXTRA_MSG}"
     .string " Zzz... Gwaaah...\n"
     .string "Especially that {COLOR_1 CYAN}{ARG_POKEMON_4}{END_COLOR_TEXT_1}...\n"
-    .string "It seems to be forgetful...#P"
+    .string "It seems to be forgetful...{EXTRA_MSG}"
     .string " Sssnore...\n"
     .string "I hope it forgets more moves...\n"
-    .string "So it needs to see me...#P"
+    .string "So it needs to see me...{EXTRA_MSG}"
     .string " Zzz... Mumble...\n"
     .string "But we decided to get rid of that\n"
-    .string "{COLOR_1 CYAN}{ARG_POKEMON_4}{END_COLOR_TEXT_1}...#P"
+    .string "{COLOR_1 CYAN}{ARG_POKEMON_4}{END_COLOR_TEXT_1}...{EXTRA_MSG}"
     .string " Gwaaaah... Gweh...\n"
     .string "{COLOR_1 CYAN}{ARG_POKEMON_4}{END_COLOR_TEXT_1} won{APOSTROPHE}t be coming around\n"
     .string "anymore... \0"
@@ -2029,17 +2029,17 @@ gUnknown_80D8950:
 
     .global gUnknown_80D8AB8
 gUnknown_80D8AB8:
-    .string " Zzznork...#W\n"
+    .string " Zzznork...{WAIT_PRESS}\n"
     .string "Link moves to use them all in\n"
-    .string "one turn...#P"
+    .string "one turn...{EXTRA_MSG}"
     .string " Zzz... Fnurf...?\n"
     .string "Linked moves...\n"
-    .string "Top one goes first...#P"
+    .string "Top one goes first...{EXTRA_MSG}"
     .string " Zzz... Hah...?\n"
-    .string "Delink moves to break links...#P"
+    .string "Delink moves to break links...{EXTRA_MSG}"
     .string " Zzzzz... Fwaaah...\n"
     .string "Change order of moves with {R_BUTTON}...\n"
-    .string "And up and down on {DPAD}...#P"
+    .string "And up and down on {DPAD}...{EXTRA_MSG}"
     .string " Gwaaah... Gweh...\n"
     .string "Make your own links...\0"
     .align 2, 0
@@ -2048,10 +2048,10 @@ gUnknown_80D8AB8:
 gUnknown_80D8BD4:
     .string " Zzz... Zzz...\n"
     .string "A set move can be used...\n"
-    .string "Press {L_BUTTON} and {A_BUTTON}...#P"
-    .string " Sssnort... Set the move...#W\n"
-    .string "Press {L_BUTTON} and {A_BUTTON}...#W Use move!#W\n"
-    .string "Convenient...#P"
+    .string "Press {L_BUTTON} and {A_BUTTON}...{EXTRA_MSG}"
+    .string " Sssnort... Set the move...{WAIT_PRESS}\n"
+    .string "Press {L_BUTTON} and {A_BUTTON}...{WAIT_PRESS} Use move!{WAIT_PRESS}\n"
+    .string "Convenient...{EXTRA_MSG}"
     .string " Sssnore...\n"
     .string "Switch the set move in a dungeon{COMMA} too...\0"
     .align 2, 0
@@ -2065,11 +2065,11 @@ gUnknown_80D8C98:
     .global gUnknown_80D8CC8
 gUnknown_80D8CC8:
     .string " Fgwaaah...\n"
-    .string "Here goes...#P"
+    .string "Here goes...{EXTRA_MSG}"
     .string " Zzznort...\n"
-    .string "Gggggggg...#W Pwah!#P"
+    .string "Gggggggg...{WAIT_PRESS} Pwah!{EXTRA_MSG}"
     .string " Fwaaah hah!\n"
-    .string "There...#P"
+    .string "There...{EXTRA_MSG}"
     .string " Zzz... Mutter...\n"
     .string "{COLOR_1 CYAN}{ARG_POKEMON_5}{END_COLOR_TEXT_1} forgot...\n"
     .string "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and moves linked to it...\0"
@@ -2078,11 +2078,11 @@ gUnknown_80D8CC8:
     .global gUnknown_80D8D64
 gUnknown_80D8D64:
     .string " Fgwaaah...\n"
-    .string "Here goes...#P"
+    .string "Here goes...{EXTRA_MSG}"
     .string " Zzznort...\n"
-    .string "Gggggggg...#W Pwah!#P"
+    .string "Gggggggg...{WAIT_PRESS} Pwah!{EXTRA_MSG}"
     .string " Fwaaah hah!\n"
-    .string "There...#P"
+    .string "There...{EXTRA_MSG}"
     .string " Zzz... Mumble...\n"
     .string "{COLOR_1 CYAN}{ARG_POKEMON_5}{END_COLOR_TEXT_1} forgot...\n"
     .string "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}...\0"
@@ -2104,7 +2104,7 @@ gUnknown_80D8E28:
     .global gUnknown_80D8E48
 gUnknown_80D8E48:
     .string " Zzznork...? Hunh?\n"
-    .string "You{APOSTROPHE}re a special Pokémon...#P"
+    .string "You{APOSTROPHE}re a special Pokémon...{EXTRA_MSG}"
     .string " Mumble...\n"
     .string "I can{APOSTROPHE}t help you...\0"
     .align 2, 0
@@ -2118,13 +2118,13 @@ gUnknown_80D8E9C:
     .global gUnknown_80D8EC4
 gUnknown_80D8EC4:
     .string " Fgwaaah...\n"
-    .string "Here goes...#P"
+    .string "Here goes...{EXTRA_MSG}"
     .string " Zzznort...\n"
-    .string "Gggggggg...#W Pwah! Gulpin!#P"
+    .string "Gggggggg...{WAIT_PRESS} Pwah! Gulpin!{EXTRA_MSG}"
     .string " Fwaaah hah!\n"
-    .string "There...#P"
+    .string "There...{EXTRA_MSG}"
     .string " Zzz... Mumble...\n"
-    .string "#CM{ARG_POKEMON_5}{END_COLOR_TEXT_1}{APOSTROPHE}s OK...#P"
+    .string "{COLOR_1 CYAN_3}{ARG_POKEMON_5}{END_COLOR_TEXT_1}{APOSTROPHE}s OK...{EXTRA_MSG}"
     .string " Sssnork... Forgotten...\n"
     .string "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and moves linked to it...\n"
     .string "Remembered {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}...\0"
@@ -2133,12 +2133,12 @@ gUnknown_80D8EC4:
     .global gUnknown_80D8F98
 gUnknown_80D8F98:
     .string " Fgwaah...\n"
-    .string "Here goes...#P"
+    .string "Here goes...{EXTRA_MSG}"
     .string " Zzznort...\n"
-    .string "Gggggggg...#W Pwah! Gulpin!#P"
+    .string "Gggggggg...{WAIT_PRESS} Pwah! Gulpin!{EXTRA_MSG}"
     .string " Fwaah hah!\n"
-    .string "There...#P"
-    .string " Zzz... Zzz... #CM{ARG_POKEMON_5}{END_COLOR_TEXT_1}\n"
+    .string "There...{EXTRA_MSG}"
+    .string " Zzz... Zzz... {COLOR_1 CYAN_3}{ARG_POKEMON_5}{END_COLOR_TEXT_1}\n"
     .string "forgot {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}...\n"
     .string "Remembered {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}...\0"
     .align 2, 0
@@ -2160,13 +2160,13 @@ gUnknown_80D9080:
     .global gUnknown_80D90BC
 gUnknown_80D90BC:
     .string " Zzzznort... Move...?\n"
-    .string "Remember {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?#P"
+    .string "Remember {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?{EXTRA_MSG}"
     .string " Fwaah...\n"
-    .string "Gggggggggggg...#W Gulpin!#P"
+    .string "Gggggggggggg...{WAIT_PRESS} Gulpin!{EXTRA_MSG}"
     .string " Fgwaah...\n"
-    .string "There...#P"
+    .string "There...{EXTRA_MSG}"
     .string " Zzz... Zzz...\n"
-    .string "#CM{ARG_POKEMON_5}{END_COLOR_TEXT_1} remembered...\n"
+    .string "{COLOR_1 CYAN_3}{ARG_POKEMON_5}{END_COLOR_TEXT_1} remembered...\n"
     .string "Hunh? That move{COMMA} {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}...\0"
     .align 2, 0
 
@@ -2234,60 +2234,60 @@ gUnknown_80D92EC:
     .global gUnknown_80D9328
 gUnknown_80D9328:
     .string " What if you had to forget\n"
-    .string "a move{COMMA} but you wanted it back?#W\n"
-    .string "Ever face that situation?#P"
-    .string " I can help!#W\n"
+    .string "a move{COMMA} but you wanted it back?{WAIT_PRESS}\n"
+    .string "Ever face that situation?{EXTRA_MSG}"
+    .string " I can help!{WAIT_PRESS}\n"
     .string "Come to me{COMMA} and I can make you instantly\n"
-    .string "remember forgotten moves!#P"
-    .string " I...#W\n"
-    .string "Well{COMMA} when Pokémon remember...#W\n"
-    .string "I love seeing that instant!#P"
-    .string " That look of enlightenment!#W\n"
-    .string "That amazed look of pleasure!#P"
+    .string "remember forgotten moves!{EXTRA_MSG}"
+    .string " I...{WAIT_PRESS}\n"
+    .string "Well{COMMA} when Pokémon remember...{WAIT_PRESS}\n"
+    .string "I love seeing that instant!{EXTRA_MSG}"
+    .string " That look of enlightenment!{WAIT_PRESS}\n"
+    .string "That amazed look of pleasure!{EXTRA_MSG}"
     .string " I run this business because\n"
     .string "I live to see that moment!\0"
     .align 2, 0
 
     .global gUnknown_80D9498
 gUnknown_80D9498:
-    .string " When moves are linked...#W\n"
+    .string " When moves are linked...{WAIT_PRESS}\n"
     .string "Two or more moves can be used one after\n"
-    .string "another in one turn!#P"
+    .string "another in one turn!{EXTRA_MSG}"
     .string " For example{COMMA} if the moves\n"
     .string "{COLOR_1 CYAN}Scratch{END_COLOR_TEXT_1} and {COLOR_1 CYAN}Growl{END_COLOR_TEXT_1} are\n"
-    .string "linked...#P"
+    .string "linked...{EXTRA_MSG}"
     .string " Both {COLOR_1 CYAN}Scratch{END_COLOR_TEXT_1} and {COLOR_1 CYAN}Growl{END_COLOR_TEXT_1} are\n"
-    .string "used in one turn!#W\n"
-    .string "See? Amazing{COMMA} huh?#P"
-    .string " Using links{COMMA} heheh...#W\n"
+    .string "used in one turn!{WAIT_PRESS}\n"
+    .string "See? Amazing{COMMA} huh?{EXTRA_MSG}"
+    .string " Using links{COMMA} heheh...{WAIT_PRESS}\n"
     .string "Well{COMMA} depending on the moves you link{COMMA}\n"
-    .string "you can get incredible results!#P"
+    .string "you can get incredible results!{EXTRA_MSG}"
     .string " Oh{COMMA} yes.\n"
     .string "When moves are linked{COMMA} they are used in\n"
-    .string "sequence from the top one first.#P"
+    .string "sequence from the top one first.{EXTRA_MSG}"
     .string " You can also separate linked\n"
-    .string "moves by selecting the Delink command.#P"
+    .string "moves by selecting the Delink command.{EXTRA_MSG}"
     .string " The sequence of moves can\n"
     .string "be changed by pressing {R_BUTTON}{COMMA}\n"
-    .string "then pressing up or down on {DPAD}.#P"
-    .string " Try to innovate with links.#W\n"
+    .string "then pressing up or down on {DPAD}.{EXTRA_MSG}"
+    .string " Try to innovate with links.{WAIT_PRESS}\n"
     .string "Try creating links of your very own!\0"
     .align 2, 0
 
     .global gUnknown_80D972C
 gUnknown_80D972C:
     .string " When you{APOSTROPHE}re in a dungeon\n"
-    .string "and you{APOSTROPHE}re about to use a move...#W\n"
-    .string "Isn{APOSTROPHE}t it a pain to open a window each time?#P"
-    .string " You can avoid that!#W\n"
+    .string "and you{APOSTROPHE}re about to use a move...{WAIT_PRESS}\n"
+    .string "Isn{APOSTROPHE}t it a pain to open a window each time?{EXTRA_MSG}"
+    .string " You can avoid that!{WAIT_PRESS}\n"
     .string "You can just conveniently {QUOTE_START}Set{QUOTE_END}\n"
-    .string "a move for instant use!#P"
+    .string "a move for instant use!{EXTRA_MSG}"
     .string " A set move can be instantly\n"
-    .string "used with {L_BUTTON} and {A_BUTTON}!#W\n"
-    .string "See? Isn{APOSTROPHE}t it easy?#P"
-    .string " Just set the move...#W\n"
-    .string "Hold {L_BUTTON} and then press {A_BUTTON} to use it!#W\n"
-    .string "It{APOSTROPHE}s very convenient!#P"
+    .string "used with {L_BUTTON} and {A_BUTTON}!{WAIT_PRESS}\n"
+    .string "See? Isn{APOSTROPHE}t it easy?{EXTRA_MSG}"
+    .string " Just set the move...{WAIT_PRESS}\n"
+    .string "Hold {L_BUTTON} and then press {A_BUTTON} to use it!{WAIT_PRESS}\n"
+    .string "It{APOSTROPHE}s very convenient!{EXTRA_MSG}"
     .string " You can also switch the set\n"
     .string "move in a dungeon.\n"
     .string "Do try it out!\n"
@@ -2302,10 +2302,10 @@ gUnknown_80D98D4:
 
     .global gUnknown_80D9904
 gUnknown_80D9904:
-    .string " OK{COMMA} here goes!#P"
-    .string " Gggggggg...#W Poof!#P"
+    .string " OK{COMMA} here goes!{EXTRA_MSG}"
+    .string " Gggggggg...{WAIT_PRESS} Poof!{EXTRA_MSG}"
     .string " There!\n"
-    .string "Success!#P"
+    .string "Success!{EXTRA_MSG}"
     .string " {COLOR_1 CYAN}{ARG_POKEMON_5}{END_COLOR_TEXT_1} has forgotten\n"
     .string "the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and any moves\n"
     .string "linked to it!\0"
@@ -2313,10 +2313,10 @@ gUnknown_80D9904:
 
     .global gUnknown_80D9988
 gUnknown_80D9988:
-    .string " OK{COMMA} here goes!#P"
-    .string " Gggggggg...#W Poof!#P"
+    .string " OK{COMMA} here goes!{EXTRA_MSG}"
+    .string " Gggggggg...{WAIT_PRESS} Poof!{EXTRA_MSG}"
     .string " There!\n"
-    .string "Success!#P"
+    .string "Success!{EXTRA_MSG}"
     .string " {COLOR_1 CYAN}{ARG_POKEMON_5}{END_COLOR_TEXT_1} has forgotten\n"
     .string "the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}!\0"
     .align 2, 0
@@ -2335,8 +2335,8 @@ gUnknown_80D9A2C:
 
     .global gUnknown_80D9A50
 gUnknown_80D9A50:
-    .string " Uh... Huh?#W\n"
-    .string "You appear to be a special Pokémon.#P"
+    .string " Uh... Huh?{WAIT_PRESS}\n"
+    .string "You appear to be a special Pokémon.{EXTRA_MSG}"
     .string " I can{APOSTROPHE}t help you remember\n"
     .string "any moves{COMMA} I don{APOSTROPHE}t think.\n"
     .string "I{APOSTROPHE}m sorry.\0"
@@ -2344,18 +2344,18 @@ gUnknown_80D9A50:
 
     .global gUnknown_80D9ACC
 gUnknown_80D9ACC:
-    .string " Uh... Hello?#W\n"
+    .string " Uh... Hello?{WAIT_PRESS}\n"
     .string "There don{APOSTROPHE}t appear to be any moves that\n"
     .string "can be remembered.\0"
     .align 2, 0
 
     .global gUnknown_80D9B1C
 gUnknown_80D9B1C:
-    .string " OK{COMMA} here goes!#P"
-    .string " Gggggggg...#W Pwah! Gulpin!#P"
+    .string " OK{COMMA} here goes!{EXTRA_MSG}"
+    .string " Gggggggg...{WAIT_PRESS} Pwah! Gulpin!{EXTRA_MSG}"
     .string " There!\n"
-    .string "Success!#P"
-    .string " #CM{ARG_POKEMON_5}{END_COLOR_TEXT_1} is done!#P"
+    .string "Success!{EXTRA_MSG}"
+    .string " {COLOR_1 CYAN_3}{ARG_POKEMON_5}{END_COLOR_TEXT_1} is done!{EXTRA_MSG}"
     .string " It{APOSTROPHE}s forgotten the move\n"
     .string "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and any moves linked to it{COMMA}\n"
     .string "and {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1} has been remembered!\0"
@@ -2363,11 +2363,11 @@ gUnknown_80D9B1C:
 
     .global gUnknown_80D9BD8
 gUnknown_80D9BD8:
-    .string " OK{COMMA} here goes!#P"
-    .string " Gggggggg...#W Pwah! Gulpin!#P"
+    .string " OK{COMMA} here goes!{EXTRA_MSG}"
+    .string " Gggggggg...{WAIT_PRESS} Pwah! Gulpin!{EXTRA_MSG}"
     .string " There!\n"
-    .string "Success!#P"
-    .string " #CM{ARG_POKEMON_5}{END_COLOR_TEXT_1} has forgotten\n"
+    .string "Success!{EXTRA_MSG}"
+    .string " {COLOR_1 CYAN_3}{ARG_POKEMON_5}{END_COLOR_TEXT_1} has forgotten\n"
     .string "the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and remembered\n"
     .string "the move {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}!\0"
     .align 2, 0
@@ -2389,12 +2389,12 @@ gUnknown_80D9CC0:
     .global gUnknown_80D9D00
 gUnknown_80D9D00:
     .string " So{COMMA} the move {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}\n"
-    .string "is the one to be remembered?#W\n"
-    .string "OK{COMMA} here goes!#P"
-    .string " Gggggggggggg...#W Gulpin!#P"
+    .string "is the one to be remembered?{WAIT_PRESS}\n"
+    .string "OK{COMMA} here goes!{EXTRA_MSG}"
+    .string " Gggggggggggg...{WAIT_PRESS} Gulpin!{EXTRA_MSG}"
     .string " There!\n"
-    .string "Success!#P"
-    .string " #CM{ARG_POKEMON_5}{END_COLOR_TEXT_1} has\n"
+    .string "Success!{EXTRA_MSG}"
+    .string " {COLOR_1 CYAN_3}{ARG_POKEMON_5}{END_COLOR_TEXT_1} has\n"
     .string "remembered the move {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}!\0"
     .align 2, 0
 
@@ -2486,11 +2486,11 @@ gMakuhitaDialogue: @ 80D9FC8 (Makuhita Dojo)
 gUnknown_80DA018:
     .string " Zzznarr... Zzz...\n"
     .string "This dojo...\n"
-    .string "Help rescue teams...#P"
+    .string "Help rescue teams...{EXTRA_MSG}"
     .string " Zzznarr... Urr...\n"
-    .string "Train in different rooms to level up...#P"
+    .string "Train in different rooms to level up...{EXTRA_MSG}"
     .string " Zzznarr... Urr!\n"
-    .string "Make stronger rescue team...#P"
+    .string "Make stronger rescue team...{EXTRA_MSG}"
     .string " Urr... Zzznarr!\n"
     .string "Don{APOSTROPHE}t let up!\0"
     .align 2, 0
@@ -2504,27 +2504,27 @@ gUnknown_80DA0DC:
     .global gUnknown_80DA100
 gUnknown_80DA100:
     .string " Ah... Zzznarr...\n"
-    .string "Cleared it...#P"
+    .string "Cleared it...{EXTRA_MSG}"
     .string " Zzzznarr... Urr...\n"
-    .string "Good going... Keep going...#W\n"
-    .string "Hunh...#W ...#P"
-    .string " Gwoh?#W\n"
-    .string "Gwogwogwoh?#P"
+    .string "Good going... Keep going...{WAIT_PRESS}\n"
+    .string "Hunh...{WAIT_PRESS} ...{EXTRA_MSG}"
+    .string " Gwoh?{WAIT_PRESS}\n"
+    .string "Gwogwogwoh?{EXTRA_MSG}"
     .string " Mugawah?\n"
-    .string "Cleared everything?#P"
+    .string "Cleared everything?{EXTRA_MSG}"
     .string " Zzznarr!\n"
-    .string "Congrazzz...#P"
+    .string "Congrazzz...{EXTRA_MSG}"
     .string " Zzznarr... Zzznarr...\n"
     .string "Your reward...\n"
-    .string "Promised...#P"
+    .string "Promised...{EXTRA_MSG}"
     .string " Zzz... Urr!\n"
-    .string "#CIBonsly Doll{END_COLOR_TEXT_1}...\0"
+    .string "{COLOR_1 ITEM_COLOR}Bonsly Doll{END_COLOR_TEXT_1}...\0"
     .align 2, 0
 
     .global gUnknown_80DA204
 gUnknown_80DA204:
     .string " Ah... Zzznarr...\n"
-    .string "Cleared it...#P"
+    .string "Cleared it...{EXTRA_MSG}"
     .string " Congrazzz...\n"
     .string "Keep going... Zzz...\0"
     .align 2, 0
@@ -2532,7 +2532,7 @@ gUnknown_80DA204:
     .global gUnknown_80DA248
 gUnknown_80DA248:
     .string " Aiyah... Zzznarr...\n"
-    .string "Didn{APOSTROPHE}t finish...#P"
+    .string "Didn{APOSTROPHE}t finish...{EXTRA_MSG}"
     .string " Zzz... Urr?\n"
     .string "No giving up...\0"
     .align 2, 0
@@ -2570,30 +2570,30 @@ gUnknown_80DA30C:
     .global gUnknown_80DA338
 gUnknown_80DA338:
     .string " This dojo was founded to\n"
-    .string "support the efforts of rescue teams.#P"
+    .string "support the efforts of rescue teams.{EXTRA_MSG}"
     .string " Train in different rooms to\n"
-    .string "level up...#W\n"
-    .string "And toughen up your rescue team.#P"
-    .string " Also...#W\n"
+    .string "level up...{WAIT_PRESS}\n"
+    .string "And toughen up your rescue team.{EXTRA_MSG}"
+    .string " Also...{WAIT_PRESS}\n"
     .string "In the {COLOR_1 YELLOW_4}Fire Maze{END_COLOR_TEXT_1} you will find only\n"
-    .string "Fire-type Pokémon.#P"
+    .string "Fire-type Pokémon.{EXTRA_MSG}"
     .string " In the {COLOR_1 YELLOW_4}Water Maze{END_COLOR_TEXT_1} there\n"
-    .string "will only be Water-type Pokémon.#P"
+    .string "will only be Water-type Pokémon.{EXTRA_MSG}"
     .string " In such ways{COMMA} only one type\n"
     .string "of Pokémon will be in a given room.\n"
-    .string "Study how types match up in battle.#P"
+    .string "Study how types match up in battle.{EXTRA_MSG}"
     .string " The Pokémon in this dojo{COMMA}\n"
-    .string "by the way{COMMA} are all volunteers.#P"
+    .string "by the way{COMMA} are all volunteers.{EXTRA_MSG}"
     .string " They are participating\n"
     .string "because they want to see rescue teams\n"
-    .string "succeed.#P"
+    .string "succeed.{EXTRA_MSG}"
     .string " The only thanks they expect\n"
     .string "is to see you become stronger.\n"
-    .string "Don{APOSTROPHE}t let them down!#P"
-    .string " There{APOSTROPHE}s more.#W\n"
+    .string "Don{APOSTROPHE}t let them down!{EXTRA_MSG}"
+    .string " There{APOSTROPHE}s more.{WAIT_PRESS}\n"
     .string "For a rescue team that successfully\n"
-    .string "completes all training courses...#P"
-    .string " I have a special reward!#P"
+    .string "completes all training courses...{EXTRA_MSG}"
+    .string " I have a special reward!{EXTRA_MSG}"
     .string " Let that compel you to train\n"
     .string "harder!\0"
     .align 2, 0
@@ -2601,7 +2601,7 @@ gUnknown_80DA338:
     .global gUnknown_80DA62C
 gUnknown_80DA62C:
     .string " Don{APOSTROPHE}t let up on your training!\n"
-    .string "Keep bettering yourself!#P"
+    .string "Keep bettering yourself!{EXTRA_MSG}"
     .string " May you never lose your\n"
     .string "drive!\0"
     .align 2, 0
@@ -2609,49 +2609,49 @@ gUnknown_80DA62C:
     .global gUnknown_80DA688
 gUnknown_80DA688:
     .string " Ah...\n"
-    .string "You have succeeded in your training!#P"
-    .string " You{APOSTROPHE}ve shown your worth!#W\n"
+    .string "You have succeeded in your training!{EXTRA_MSG}"
+    .string " You{APOSTROPHE}ve shown your worth!{WAIT_PRESS}\n"
     .string "Without a doubt{COMMA} you have grown more\n"
-    .string "powerful from your training!#W Wait...#W ...#P"
-    .string " Wuh?#W\n"
-    .string "What{COMMA} what{COMMA} what?!#P"
-    .string " Did you maybe...#W\n"
-    .string "Conquer all the training courses?#P"
-    .string " That{APOSTROPHE}s...#W Amazing! You!#W\n"
-    .string "Congratulations!#P"
-    .string " I promised!#W\n"
+    .string "powerful from your training!{WAIT_PRESS} Wait...{WAIT_PRESS} ...{EXTRA_MSG}"
+    .string " Wuh?{WAIT_PRESS}\n"
+    .string "What{COMMA} what{COMMA} what?!{EXTRA_MSG}"
+    .string " Did you maybe...{WAIT_PRESS}\n"
+    .string "Conquer all the training courses?{EXTRA_MSG}"
+    .string " That{APOSTROPHE}s...{WAIT_PRESS} Amazing! You!{WAIT_PRESS}\n"
+    .string "Congratulations!{EXTRA_MSG}"
+    .string " I promised!{WAIT_PRESS}\n"
     .string "I promised you a reward for completing\n"
-    .string "the training courses!#P"
-    .string " So... Here it is!#W\n"
-    .string "My #CIBonsly Doll{END_COLOR_TEXT_1}!#P"
+    .string "the training courses!{EXTRA_MSG}"
+    .string " So... Here it is!{WAIT_PRESS}\n"
+    .string "My {COLOR_1 ITEM_COLOR}Bonsly Doll{END_COLOR_TEXT_1}!{EXTRA_MSG}"
     .string " Isn{APOSTROPHE}t it smashing? Hey?!\0"
     .align 2, 0
 
     .global gUnknown_80DA844
 gUnknown_80DA844:
     .string " Ah...\n"
-    .string "You have succeeded in your training!#P"
-    .string " You{APOSTROPHE}ve shown your worth!#W\n"
+    .string "You have succeeded in your training!{EXTRA_MSG}"
+    .string " You{APOSTROPHE}ve shown your worth!{WAIT_PRESS}\n"
     .string "Without a doubt{COMMA} you have grown more\n"
-    .string "powerful from your training!#P"
+    .string "powerful from your training!{EXTRA_MSG}"
     .string " May this success drive\n"
     .string "you to train even harder!\0"
     .align 2, 0
 
     .global gUnknown_80DA908
 gUnknown_80DA908:
-    .string " Aiyah...#W\n"
-    .string "You failed to reach the end...#W\n"
-    .string "More training is what you need.#P"
-    .string " But effort is never wasted!#P"
+    .string " Aiyah...{WAIT_PRESS}\n"
+    .string "You failed to reach the end...{WAIT_PRESS}\n"
+    .string "More training is what you need.{EXTRA_MSG}"
+    .string " But effort is never wasted!{EXTRA_MSG}"
     .string " Learn from this and move\n"
     .string "forward!\0"
     .align 2, 0
 
     .global gUnknown_80DA998
 gUnknown_80DA998:
-    .string " The {ARG_POKEMON_0}?#W\n"
-    .string "Your decision stands!#W\n"
+    .string " The {ARG_POKEMON_0}?{WAIT_PRESS}\n"
+    .string "Your decision stands!{WAIT_PRESS}\n"
     .string "Let the training begin!\0"
     .align 2, 0
 
@@ -2673,7 +2673,7 @@ gUnknown_80DAA2C:
 
     .global gUnknown_80DAA44
 gUnknown_80DAA44:
-    .string " This is the Makuhita Dojo!#W\n"
+    .string " This is the Makuhita Dojo!{WAIT_PRESS}\n"
     .string "Through rigorous training{COMMA} one begets\n"
     .string "true power.\0"
     .align 2, 0
@@ -2881,13 +2881,13 @@ gUnknown_80DB5A4: @ 80DB5A4
 
 	.global gUnknown_80DB5B0
 gUnknown_80DB5B0: @ 80DB5B0
-        .string "#C%c"
+        .string "{COLOR_1}%c"
         .byte 0x81, 0x59
         .align 2,0
 
 	.global gUnknown_80DB5B8
 gUnknown_80DB5B8: @ 80DB5B8
-        .string "#C%c%s\0"
+        .string "{COLOR_1}%c%s\0"
         .align 2,0
 
 	.global gUnknown_80DB5C0
@@ -3226,7 +3226,7 @@ gTeamToolboxB: @ 80DB984
 
 	.global gUnknown_80DB994
 gUnknown_80DB994: @ 80DB994
-        .string "#C"
+        .string "{COLOR_1}"
         .byte 0x02
         .string "{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}\0"
         .align 2,0
@@ -3250,20 +3250,20 @@ gUnknown_80DB9B0: @ 80DB9B0
 
 	.global gUnknown_80DB9BC
 gUnknown_80DB9BC: @ 80DB9BC
-        .string "#+Who will learn the move\n"
-        .string "#+{COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}?\0"
+        .string "{CENTER_ALIGN}Who will learn the move\n"
+        .string "{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}?\0"
         .align 2,0
 
 	.global gUnknown_80DB9E4
 gUnknown_80DB9E4: @ 80DB9E4
-        .string "#+#CM{ARG_POKEMON_8}{END_COLOR_TEXT_1} learned\n"
-        .string "#+the move {COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}!\0"
+        .string "{CENTER_ALIGN}{COLOR_1 CYAN_3}{ARG_POKEMON_8}{END_COLOR_TEXT_1} learned\n"
+        .string "{CENTER_ALIGN}the move {COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}!\0"
         .align 2,0
 
 	.global gUnknown_80DBA0C
 gUnknown_80DBA0C: @ 80DBA0C
-        .string "#+No one in the current team\n"
-        .string "#+can learn this move. \0"
+        .string "{CENTER_ALIGN}No one in the current team\n"
+        .string "{CENTER_ALIGN}can learn this move. \0"
         .align 2,0
         .string "pksdir0\0"
         .align 2,0
@@ -3303,69 +3303,69 @@ gUnknown_80DBA88: @ 80DBA88
 
 	.global gUnknown_80DBAA0
 gUnknown_80DBAA0: @ 80DBAA0
-        .string "#+{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1} received\n"
-        .string "#+the promised {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}. \0"
+        .string "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1} received\n"
+        .string "{CENTER_ALIGN}the promised {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}. \0"
         .align 2,0
 
 	.global gUnknown_80DBAD0
 gUnknown_80DBAD0: @ 80DBAD0
-        .string "#+{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s team received\n"
-        .string "#+the promised {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.\0"
+        .string "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s team received\n"
+        .string "{CENTER_ALIGN}the promised {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.\0"
         .align 2,0
 
 	.global gUnknown_80DBB08
 gUnknown_80DBB08: @ 80DBB08
-        .string "#+The team also received\n"
-        .string "#+the item {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.\0"
+        .string "{CENTER_ALIGN}The team also received\n"
+        .string "{CENTER_ALIGN}the item {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.\0"
         .align 2,0
 
 	.global gUnknown_80DBB38
 gUnknown_80DBB38: @ 80DBB38
-        .string "#+Received the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}!#P#+A very rare statue. It has been placed\n"
-        .string "#+outside your rescue team base.\0"
+        .string "{CENTER_ALIGN}Received the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}!{EXTRA_MSG}{CENTER_ALIGN}A very rare statue. It has been placed\n"
+        .string "{CENTER_ALIGN}outside your rescue team base.\0"
         .align 2,0
 
 	.global gUnknown_80DBB9C
 gUnknown_80DBB9C: @ 80DBB9C
-        .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...\n"
-        .string "#+You{APOSTROPHE}ve already acquired it.#P#+Sorry to see that...#P#+In its place{COMMA} {COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{COMMA}\n"
-        .string "#+you can have {COLOR_1 LIGHT_BLUE_2}1{COMMA}000{END_COLOR_TEXT_1} {POKE}."
+        .string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...\n"
+        .string "{CENTER_ALIGN}You{APOSTROPHE}ve already acquired it.{EXTRA_MSG}{CENTER_ALIGN}Sorry to see that...{EXTRA_MSG}{CENTER_ALIGN}In its place{COMMA} {COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{COMMA}\n"
+        .string "{CENTER_ALIGN}you can have {COLOR_1 LIGHT_BLUE_2}1{COMMA}000{END_COLOR_TEXT_1} {POKE}."
         .align 2,0
 
 	.global gUnknown_80DBC28
 gUnknown_80DBC28: @ 80DBC28
-        .string "#+Your Toolbox is full.\n"
-        .string "#+The item was sent to storage.\0"
+        .string "{CENTER_ALIGN}Your Toolbox is full.\n"
+        .string "{CENTER_ALIGN}The item was sent to storage.\0"
         .align 2,0
 
 	.global gUnknown_80DBC60
 gUnknown_80DBC60: @ 80DBC60
-        .string "#+Your Toolbox is full.\n"
-        .string "#+What would you like to do?\0"
+        .string "{CENTER_ALIGN}Your Toolbox is full.\n"
+        .string "{CENTER_ALIGN}What would you like to do?\0"
         .align 2,0
 
 	.global gUnknown_80DBC98
 gUnknown_80DBC98: @ 80DBC98
-        .string "#+Is it OK to throw away\n"
-        .string "#+this {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}?\0"
+        .string "{CENTER_ALIGN}Is it OK to throw away\n"
+        .string "{CENTER_ALIGN}this {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}?\0"
         .align 2,0
 
 	.global gUnknown_80DBCC4
 gUnknown_80DBCC4: @ 80DBCC4
-        .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}\n"
-        .string "#+was thrown away.\0"
+        .string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}\n"
+        .string "{CENTER_ALIGN}was thrown away.\0"
         .align 2,0
 
 	.global gUnknown_80DBCE8
 gUnknown_80DBCE8: @ 80DBCE8
-        .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was put in\n"
-        .string "#+storage to get the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.\0"
+        .string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was put in\n"
+        .string "{CENTER_ALIGN}storage to get the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.\0"
         .align 2,0
 
 	.global gUnknown_80DBD24
 gUnknown_80DBD24: @ 80DBD24
-        .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was discarded\n"
-        .string "#+to get the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.\0"
+        .string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was discarded\n"
+        .string "{CENTER_ALIGN}to get the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.\0"
         .align 2,0
 
 	.global gKangaskhanTrashToolboxItem
@@ -3768,15 +3768,15 @@ gUnknown_80DC164: @ 80DC164
 
 	.global gUnknown_80DC1A0
 gUnknown_80DC1A0: @ 80DC1A0
-        .string "#+Forget the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and\n"
-        .string "#+any moves linked to it{COMMA} and learn the move\n"
-        .string "#+{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?\0"
+        .string "{CENTER_ALIGN}Forget the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and\n"
+        .string "{CENTER_ALIGN}any moves linked to it{COMMA} and learn the move\n"
+        .string "{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?\0"
         .align 2,0
 
 	.global gUnknown_80DC1FC
 gUnknown_80DC1FC: @ 80DC1FC
-        .string "#+Forget the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}\n"
-        .string "#+and learn {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?\0"
+        .string "{CENTER_ALIGN}Forget the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}\n"
+        .string "{CENTER_ALIGN}and learn {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?\0"
         .align 2,0
 
 	.global gUnknown_80DC230
@@ -4308,7 +4308,7 @@ gUnknown_80DC934: @ 80DC934
 	.global gUnknown_80DC93C
 gUnknown_80DC93C: @ 80DC93C
 @ replacing .incbin "baserom.gba", 0x000dc93c, 0x14
-        .string "#c%c%s{END_COLOR_TEXT_2}\0"
+        .string "{COLOR_2}%c%s{END_COLOR_TEXT_2}\0"
         .align 2,0
         .string "pksdir0\0"
         .align 2,0
@@ -4346,7 +4346,7 @@ gUnknown_80DC988: @ 80DC988
 	.global gUnknown_80DC998
 gUnknown_80DC998: @ 80DC998
 @ replacing .incbin "baserom.gba", 0x000dc998, 0xc
-        .string "#c%c%s{END_COLOR_TEXT_2}\0"
+        .string "{COLOR_2}%c%s{END_COLOR_TEXT_2}\0"
         .align 2,0
 
 	.global gUnknown_80DC9A4
@@ -4476,7 +4476,7 @@ gUnknown_80DD74C: @ 80DD74C
 	.global gUnknown_80DD764
 gUnknown_80DD764: @ 80DD764
         .string "You have chosen to say farewell\n"
-        .string "to this Pokémon.#P"
+        .string "to this Pokémon.{EXTRA_MSG}"
         .string "The Pokémon will leave its Friend Area.\n"
         .string "It will no longer be available for\n"
         .string "adventures. Is that OK?\0"
@@ -4485,7 +4485,7 @@ gUnknown_80DD764: @ 80DD764
 	.global gUnknown_80DD7FC
 gUnknown_80DD7FC: @ 80DD7FC
         .string "If you say farewell to this\n"
-        .string "Pokémon{COMMA} it will be gone forever.#P"
+        .string "Pokémon{COMMA} it will be gone forever.{EXTRA_MSG}"
         .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"
@@ -4493,13 +4493,13 @@ gUnknown_80DD7FC: @ 80DD7FC
 
 	.global gUnknown_80DD8A0
 gUnknown_80DD8A0: @ 80DD8A0
-        .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
-        .string "#+returned to the Toolbox.\0"
+        .string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
+        .string "{CENTER_ALIGN}returned to the Toolbox.\0"
         .align 2,0
 
 	.global gUnknown_80DD8D0
 gUnknown_80DD8D0: @ 80DD8D0
-        .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n#+sent to storage.\0"
+        .string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n{CENTER_ALIGN}sent to storage.\0"
         .align 2,0
 
 	.global gFriendActionStandby
diff --git a/data/data_80DED44.s b/data/data_80DED44.s
index bf335b5..ae006c1 100644
--- a/data/data_80DED44.s
+++ b/data/data_80DED44.s
@@ -469,15 +469,15 @@ gUnknown_80E0434: @ 80E0434
 	.global gUnknown_80E045C
 gUnknown_80E045C: @ 80E045C
 @ replacing .incbin "baserom.gba", 0x000e045c, 0x28
-        .string "#+{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1} received\n"
-        .string "#+{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1}"
+        .string "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1} received\n"
+        .string "{CENTER_ALIGN}{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1}"
         .byte 0x20, 0x83
         .byte 0xbf, 0x83, 0xc4, 0x2e, 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80E0484
 gUnknown_80E0484: @ 80E0484
-        .string "#+{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s team received\n"
-        .string "#+{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}"
+        .string "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s team received\n"
+        .string "{CENTER_ALIGN}{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}"
         .byte 0x2E, 0x00, 0x00, 0x00
 
 	.global gUnknown_80E04B4
@@ -493,16 +493,16 @@ gUnknown_80E04F4: @ 80E04F4
 
 	.global gUnknown_80E05C0
 gUnknown_80E05C0: @ 80E05C0
-        .string "#+{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1} gained access\n"
-        .string "#+to the Friend Area\n"
-        .string "#+{COLOR_1 GREEN}$h{END_COLOR_TEXT_1}.\0"
+        .string "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1} gained access\n"
+        .string "{CENTER_ALIGN}to the Friend Area\n"
+        .string "{CENTER_ALIGN}{COLOR_1 GREEN}$h{END_COLOR_TEXT_1}.\0"
         .align 2,0
 
 	.global gUnknown_80E05FC
 gUnknown_80E05FC: @ 80E05FC
-        .string "#+{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s team gained access\n"
-        .string "#+to the Friend Area\n"
-        .string "#+{COLOR_1 GREEN}$h{END_COLOR_TEXT_1}.\0"
+        .string "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s team gained access\n"
+        .string "{CENTER_ALIGN}to the Friend Area\n"
+        .string "{CENTER_ALIGN}{COLOR_1 GREEN}$h{END_COLOR_TEXT_1}.\0"
         .align 2,0
 
 	.global gUnknown_80E0640
@@ -513,16 +513,16 @@ gUnknown_80E0640: @ 80E0640
 
 	.global gUnknown_80E0670
 gUnknown_80E0670: @ 80E0670
-        .string "#+Rescue Team {COLOR_1 LIGHT_BLUE_2}$t{END_COLOR_TEXT_1}\n"
-        .string "#+gained {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} rescue points.\0"
+        .string "{CENTER_ALIGN}Rescue Team {COLOR_1 LIGHT_BLUE_2}$t{END_COLOR_TEXT_1}\n"
+        .string "{CENTER_ALIGN}gained {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} rescue points.\0"
         .align 2,0
 
 	.global gUnknown_80E06A8
 gUnknown_80E06A8: @ 80E06A8
-        .string "#+Congratulations!#P"
-        .string "#+{COLOR_1 LIGHT_BLUE_2}$t{END_COLOR_TEXT_1} went up in rank\n"
-        .string "#+from the {ARG_POKEMON_2}\n"
-        .string "#+to the {ARG_POKEMON_3}!\0"
+        .string "{CENTER_ALIGN}Congratulations!{EXTRA_MSG}"
+        .string "{CENTER_ALIGN}{COLOR_1 LIGHT_BLUE_2}$t{END_COLOR_TEXT_1} went up in rank\n"
+        .string "{CENTER_ALIGN}from the {ARG_POKEMON_2}\n"
+        .string "{CENTER_ALIGN}to the {ARG_POKEMON_3}!\0"
         .align 2,0
         .string "pksdir0\0"
         .align 2,0
@@ -579,9 +579,9 @@ gUnknown_80E0760: @ 80E0760
 
 	.global gUnknown_80E0778
 gUnknown_80E0778: @ 80E0778
-        .string "#+{COLOR_1 YELLOW_5}$n0{END_COLOR_TEXT_1} received the #CIBonsly Doll{END_COLOR_TEXT_1}!\n"
-        .string "#+It has been placed outside your\n"
-        .string "#+rescue team base.\0"
+        .string "{CENTER_ALIGN}{COLOR_1 YELLOW_5}$n0{END_COLOR_TEXT_1} received the {COLOR_1 ITEM_COLOR}Bonsly Doll{END_COLOR_TEXT_1}!\n"
+        .string "{CENTER_ALIGN}It has been placed outside your\n"
+        .string "{CENTER_ALIGN}rescue team base.\0"
         .align 2,0
 
 	.global gUnknown_80E07D8
@@ -620,7 +620,7 @@ gUnknown_80E0824: @ 80E0824
 
 	.global gUnknown_80E0828
 gUnknown_80E0828: @ 80E0828
-        .string "#c%c%s{END_COLOR_TEXT_2}\0"
+        .string "{COLOR_2}%c%s{END_COLOR_TEXT_2}\0"
         .align 2,0
         .string "pksdir0\0"
         .align 2,0
diff --git a/data/data_80E1F30.s b/data/data_80E1F30.s
index f772f66..999a217 100644
--- a/data/data_80E1F30.s
+++ b/data/data_80E1F30.s
@@ -36,7 +36,7 @@ gUnknown_80E1F80: @ 80E1F80
 
 	.global gUnknown_80E1F94
 gUnknown_80E1F94: @ 80E1F94
-        .string "#CW???{END_COLOR_TEXT_1}\0"
+        .string "{COLOR_1 UNKNOWN_COLOR}???{END_COLOR_TEXT_1}\0"
         .align 2,0
         .string "pksdir0\0"
 
diff --git a/data/data_80E2068.s b/data/data_80E2068.s
index 68cf88b..d00a658 100644
--- a/data/data_80E2068.s
+++ b/data/data_80E2068.s
@@ -669,9 +669,9 @@ gUnknown_80E2D7C: @ 80E2D7C
 
 	.global gUnknown_80E2DD0
 gUnknown_80E2DD0: @ 80E2DD0
-.string "#+Communicating...\n"
-.string "#+Please wait with the power on.\n"
-.string "#+To cancel{COMMA} press {B_BUTTON}.\0"
+.string "{CENTER_ALIGN}Communicating...\n"
+.string "{CENTER_ALIGN}Please wait with the power on.\n"
+.string "{CENTER_ALIGN}To cancel{COMMA} press {B_BUTTON}.\0"
 .align 2,0
 
 	.global gUnknown_80E2E20
@@ -682,16 +682,16 @@ gUnknown_80E2E20: @ 80E2E20
 
 	.global gUnknown_80E2E54
 gUnknown_80E2E54: @ 80E2E54
-.string "#+Reading from GBA Game Pak.\n"
-.string "#+Do not remove the GBA Game Pak.\n"
-.string "#+Please wait with the power on.\0"
+.string "{CENTER_ALIGN}Reading from GBA Game Pak.\n"
+.string "{CENTER_ALIGN}Do not remove the GBA Game Pak.\n"
+.string "{CENTER_ALIGN}Please wait with the power on.\0"
 .align 2,0
 
 	.global gUnknown_80E2EB4
 gUnknown_80E2EB4: @ 80E2EB4
-.string "#+Writing to GBA Game Pak.\n"
-.string "#+Do not remove the GBA Game Pak.\n"
-.string "#+Please wait with the power on.\0"
+.string "{CENTER_ALIGN}Writing to GBA Game Pak.\n"
+.string "{CENTER_ALIGN}Do not remove the GBA Game Pak.\n"
+.string "{CENTER_ALIGN}Please wait with the power on.\0"
 .align 2,0
 
 	.global gUnknown_80E2F14
@@ -830,7 +830,7 @@ gUnknown_80E33D8: @ 80E33D8
 	.global gUnknown_80E3430
 gUnknown_80E3430: @ 80E3430
 .string "This mail already has an attached\n"
-.string "{COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}.#POnce an item has been chosen{COMMA} it may not\n"
+.string "{COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}.{EXTRA_MSG}Once an item has been chosen{COMMA} it may not\n"
 .string "be exchanged with another item.\0"
 .align 2,0
 
@@ -889,11 +889,11 @@ gUnknown_80E367C: @ 80E367C
 gUnknown_80E3690: @ 80E3690
 .string "If your team is defeated and in need\n"
 .string "of rescuing{COMMA} send an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}\n"
-.string "to a friend.#POnce you send your mail{COMMA} you must wait\n"
+.string "to a friend.{EXTRA_MSG}Once you send your mail{COMMA} you must wait\n"
 .string "for your friend to send you\n"
-.string "an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.#PIf the {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} arrives{COMMA} your\n"
+.string "an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}If the {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} arrives{COMMA} your\n"
 .string "team can be revived to resume exploring\n"
-.string "the dungeon it was in.#PWhen your team is revived{COMMA} don{APOSTROPHE}t forget\n"
+.string "the dungeon it was in.{EXTRA_MSG}When your team is revived{COMMA} don{APOSTROPHE}t forget\n"
 .string "to send a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} to the friend\n"
 .string "who came to your rescue.\0"
 .align 2,0
@@ -902,11 +902,11 @@ gUnknown_80E3690: @ 80E3690
 gUnknown_80E3818: @ 80E3818
 .string "If your team is defeated in\n"
 .string "a dungeon{COMMA} you may send a friend\n"
-.string "an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} for help.#PHowever{COMMA} there are some places\n"
+.string "an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} for help.{EXTRA_MSG}However{COMMA} there are some places\n"
 .string "where it is impossible for you to\n"
-.string "call for a rescue.#PAlso{COMMA} if you send an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}{COMMA}\n"
+.string "call for a rescue.{EXTRA_MSG}Also{COMMA} if you send an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}{COMMA}\n"
 .string "you may not continue with your\n"
-.string "adventure while awaiting rescue.#PIf you cannot wait to be rescued{COMMA}\n"
+.string "adventure while awaiting rescue.{EXTRA_MSG}If you cannot wait to be rescued{COMMA}\n"
 .string "you will have to give up and return\n"
 .string "to your rescue team base.\0"
 .align 2,0
@@ -915,11 +915,11 @@ gUnknown_80E3818: @ 80E3818
 gUnknown_80E3998: @ 80E3998
 .string "If your friend successfully rescues\n"
 .string "your team{COMMA} accept your friend{APOSTROPHE}s\n"
-.string "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.#POnce the {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} is received{COMMA}\n"
+.string "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}Once the {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} is received{COMMA}\n"
 .string "you may revive your team and resume\n"
-.string "exploring the dungeon you were in.#PUsing a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA}\n"
+.string "exploring the dungeon you were in.{EXTRA_MSG}Using a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA}\n"
 .string "your friend can also send you\n"
-.string "a {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1}.#PHowever{COMMA} the {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1} will not\n"
+.string "a {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1}.{EXTRA_MSG}However{COMMA} the {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1} will not\n"
 .string "be able to bring an item with it when\n"
 .string "joining your team.\0"
 .align 2,0
@@ -928,7 +928,7 @@ gUnknown_80E3998: @ 80E3998
 gUnknown_80E3B1C: @ 80E3B1C
 .string "If your team has been rescued{COMMA} be sure\n"
 .string "to send a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} to the friend\n"
-.string "that came to your help.#PYou may also attach a {COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}\n"
+.string "that came to your help.{EXTRA_MSG}You may also attach a {COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}\n"
 .string "from storage to your {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}\n"
 .string "and send it to your friend.\0"
 .align 2,0
@@ -937,12 +937,12 @@ gUnknown_80E3B1C: @ 80E3B1C
 gUnknown_80E3BF8: @ 80E3BF8
 .string "If your friend{APOSTROPHE}s team needs rescuing{COMMA}\n"
 .string "you must first receive an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}\n"
-.string "from your friend.#PWhen you get the mail{COMMA} you may embark\n"
+.string "from your friend.{EXTRA_MSG}When you get the mail{COMMA} you may embark\n"
 .string "on your rescue mission from the\n"
-.string "{COLOR_1 LIGHT_BLUE_2}Pelipper Post Office{END_COLOR_TEXT_1}.#PIf you rescue your friend{APOSTROPHE}s defeated\n"
+.string "{COLOR_1 LIGHT_BLUE_2}Pelipper Post Office{END_COLOR_TEXT_1}.{EXTRA_MSG}If you rescue your friend{APOSTROPHE}s defeated\n"
 .string "team{COMMA} send an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} to your\n"
-.string "friend.#PIf you rescue a friend{COMMA} you will be eligible\n"
-.string "to receive a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.#PIf you have quicksaved inside a dungeon{COMMA}\n"
+.string "friend.{EXTRA_MSG}If you rescue a friend{COMMA} you will be eligible\n"
+.string "to receive a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}If you have quicksaved inside a dungeon{COMMA}\n"
 .string "you may not choose {COLOR_1 LIGHT_BLUE_2}Go Rescue{END_COLOR_TEXT_1}.\n"
 .string "Your last save must be out of a dungeon.\0"
 .align 2,0
@@ -951,18 +951,18 @@ gUnknown_80E3BF8: @ 80E3BF8
 gUnknown_80E3DE4: @ 80E3DE4
 .string "You may receive an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} from\n"
 .string "a friend{APOSTROPHE}s team that lies defeated in\n"
-.string "a dungeon.#PIf there is no space for new mail{COMMA} delete\n"
+.string "a dungeon.{EXTRA_MSG}If there is no space for new mail{COMMA} delete\n"
 .string "old mail at the {COLOR_1 LIGHT_BLUE_2}Pelipper Post Office{END_COLOR_TEXT_1}.\0"
 .align 2,0
 
 	.global gUnknown_80E3E98
 gUnknown_80E3E98: @ 80E3E98
 .string "If you successfully rescue your friend{APOSTROPHE}s\n"
-.string "team{COMMA} send your friend an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.#PUsing a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA} you may\n"
+.string "team{COMMA} send your friend an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}Using a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA} you may\n"
 .string "also send your friend a Pokémon from\n"
-.string "your Friend Area as a helper.#PDon{APOSTROPHE}t worry--sending a Pokémon as\n"
+.string "your Friend Area as a helper.{EXTRA_MSG}Don{APOSTROPHE}t worry--sending a Pokémon as\n"
 .string "a helper will not make it disappear from\n"
-.string "its Friend Area.#PIf there is no space for new mail{COMMA} delete\n"
+.string "its Friend Area.{EXTRA_MSG}If there is no space for new mail{COMMA} delete\n"
 .string "old mail at the {COLOR_1 LIGHT_BLUE_2}Pelipper Post Office{END_COLOR_TEXT_1}.\0"
 .align 2,0
 
@@ -970,9 +970,9 @@ gUnknown_80E3E98: @ 80E3E98
 gUnknown_80E4014: @ 80E4014
 .string "When you receive an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}{COMMA}\n"
 .string "you may embark on your rescue mission\n"
-.string "from the {COLOR_1 LIGHT_BLUE_2}Pelipper Post Office{END_COLOR_TEXT_1}.#PBeware--if you do not have access to\n"
+.string "from the {COLOR_1 LIGHT_BLUE_2}Pelipper Post Office{END_COLOR_TEXT_1}.{EXTRA_MSG}Beware--if you do not have access to\n"
 .string "the dungeon they are in{COMMA} you may not go\n"
-.string "on a rescue mission there.#PAccept challenging rescues only\n"
+.string "on a rescue mission there.{EXTRA_MSG}Accept challenging rescues only\n"
 .string "if you are ready and qualified!\0"
 .align 2,0
 
@@ -980,7 +980,7 @@ gUnknown_80E4014: @ 80E4014
 gUnknown_80E4130: @ 80E4130
 .string "If you send an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}{COMMA} you may\n"
 .string "receive a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} in return\n"
-.string "from your friend.#PThe {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} may also come\n"
+.string "from your friend.{EXTRA_MSG}The {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} may also come\n"
 .string "with a {COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1} attached.\0"
 .align 2,0
 
@@ -988,9 +988,9 @@ gUnknown_80E4130: @ 80E4130
 gUnknown_80E41DC: @ 80E41DC
 .string "Using the {COLOR_1 LIGHT_BLUE_2}Dual Slot{END_COLOR_TEXT_1} function{COMMA}\n"
 .string "you may perform rescue operations with\n"
-.string "friends using the GBA Game Pak version.#PInsert the DS Game Card and the GBA\n"
+.string "friends using the GBA Game Pak version.{EXTRA_MSG}Insert the DS Game Card and the GBA\n"
 .string "Game Pak in your Nintendo DS system{COMMA}\n"
-.string "then turn on the power.#PFriend Rescue missions using\n"
+.string "then turn on the power.{EXTRA_MSG}Friend Rescue missions using\n"
 .string "the {COLOR_1 LIGHT_BLUE_2}Dual Slot{END_COLOR_TEXT_1} function will be\n"
 .string "available on the main menu. \0"
 .align 2,0
@@ -999,10 +999,10 @@ gUnknown_80E41DC: @ 80E41DC
 gUnknown_80E4314: @ 80E4314
 .string "Friends can rescue each other{APOSTROPHE}s defeated\n"
 .string "teams using a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA}\n"
-.string "{COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}{COMMA} and so on.#PYou may go on a rescue mission to save\n"
+.string "{COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}{COMMA} and so on.{EXTRA_MSG}You may go on a rescue mission to save\n"
 .string "your friend{APOSTROPHE}s team that has been defeated\n"
-.string "in a dungeon.#POr{COMMA} you may call for help from a friend\n"
-.string "to save your fallen team in a dungeon.#PUsing {COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}{COMMA} you can even\n"
+.string "in a dungeon.{EXTRA_MSG}Or{COMMA} you may call for help from a friend\n"
+.string "to save your fallen team in a dungeon.{EXTRA_MSG}Using {COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}{COMMA} you can even\n"
 .string "exchange help with faraway friends.\0"
 .align 2,0
 
diff --git a/data/data_80E59A8.s b/data/data_80E59A8.s
index 46d4ded..6299a16 100644
--- a/data/data_80E59A8.s
+++ b/data/data_80E59A8.s
@@ -185,7 +185,7 @@ gUnknown_80E61C0: @ 80E61C0
 
 	.global gUnknown_80E61E4
 gUnknown_80E61E4: @ 80E61E4
-        .string "{COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} #CI{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}\n"
+        .string "{COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} {COLOR_1 ITEM_COLOR}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}\n"
         .string "will be sent.\n"
         .string "Is that OK?\0"
         .align 2,0
@@ -206,21 +206,21 @@ gUnknown_80E6268: @ 80E6268
 
 	.global gUnknown_80E62C4
 gUnknown_80E62C4: @ 80E62C4
-        .string "#+In communication...\n"
-        .string "#+Please wait with the power on.\n"
-        .string "#+To cancel{COMMA} press {B_BUTTON}.\0"
+        .string "{CENTER_ALIGN}In communication...\n"
+        .string "{CENTER_ALIGN}Please wait with the power on.\n"
+        .string "{CENTER_ALIGN}To cancel{COMMA} press {B_BUTTON}.\0"
         .align 2,0
 
 	.global gUnknown_80E6314
 gUnknown_80E6314: @ 80E6314
         .string "You received\n"
-        .string "{COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} #CI{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.\n"
+        .string "{COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} {COLOR_1 ITEM_COLOR}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.\n"
         .string "Your adventure will be saved.\0"
         .align 2,0
 
 	.global gUnknown_80E6358
 gUnknown_80E6358: @ 80E6358
-        .string "You sent {COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} #CI{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.\0"
+        .string "You sent {COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} {COLOR_1 ITEM_COLOR}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.\0"
         .align 2,0
 
 @ Trade Items Link Errors
@@ -530,17 +530,17 @@ gUnknown_80E6EAC: @ 80E6EAC
 
         .global CheckAgain_80E6ECC
         CheckAgain_80E6ECC:
-        .asciz "#+Please check again."
+        .string "{CENTER_ALIGN}Please check again.\0"
         .align 2,0
 
         .global StorageEmpty_80E6EE4
         StorageEmpty_80E6EE4:
-        .asciz "#+The storage space is empty!"
+        .string "{CENTER_ALIGN}The storage space is empty!\0"
         .align 2,0
 
         .global Caution_80E6F04
         Caution_80E6F04:
-        .string "#+{COLOR_1 RED}Caution!{END_COLOR_TEXT_1} \0"
+        .string "{CENTER_ALIGN}{COLOR_1 RED}Caution!{END_COLOR_TEXT_1} \0"
         .align 2,0
 
         .asciz "pksdir0"
@@ -588,7 +588,7 @@ gUnknown_80E7090: @ 80E7090
 
         .global DeletingAdventure_80E70B0
         DeletingAdventure_80E70B0:
-        .string "#+Deleting your adventure!"
+        .string "{CENTER_ALIGN}Deleting your adventure!"
         .align 2,0
 
 	.global gUnknown_80E70CC
@@ -609,7 +609,7 @@ gUnknown_80E70CC: @ 80E70CC
 
         .global AdventureDeleted_80E70F0
         AdventureDeleted_80E70F0:
-        .string "#+Your adventure has been deleted."
+        .string "{CENTER_ALIGN}Your adventure has been deleted."
         .align 2,0
 
 	.global gUnknown_80E7114
@@ -651,17 +651,17 @@ gUnknown_80E7214: @ 80E7214
 
         .global CheckAgain_80E7234
         CheckAgain_80E7234:
-        .asciz "#+Please check it again."
+        .string "{CENTER_ALIGN}Please check it again.\0"
         .align 2,0
 
         .global IncorrectPassword_80E7250
         IncorrectPassword_80E7250:
-        .asciz "#+Incorrect password!"
+        .string "{CENTER_ALIGN}Incorrect password!\0"
         .align 2,0
 
         .global Error_80E7268
         Error_80E7268:
-        .string "#+{COLOR_1 RED}Error!{END_COLOR_TEXT_1} \0"
+        .string "{CENTER_ALIGN}{COLOR_1 RED}Error!{END_COLOR_TEXT_1} \0"
         .align 2,0
 
 	.global gUnknown_80E7278
@@ -690,12 +690,12 @@ gUnknown_80E7290: @ 80E7290
 
         .global PasswordAccept_80E72B4
         PasswordAccept_80E72B4:
-        .asciz "#+The password has been accepted."
+        .string "{CENTER_ALIGN}The password has been accepted.\0"
         .align 2,0
 
         .global Success_80E72D8
         Success_80E72D8:
-        .string "#+{COLOR_1 LIGHT_BLUE_2}Success!{END_COLOR_TEXT_1} \0"
+        .string "{CENTER_ALIGN}{COLOR_1 LIGHT_BLUE_2}Success!{END_COLOR_TEXT_1} \0"
         .align 2,0
 
 	.global gUnknown_80E72EC
@@ -720,7 +720,7 @@ gUnknown_80E7304: @ 80E7304
 
         .global NotSOSMail_80E7324
         NotSOSMail_80E7324:
-        .string "#+This is not an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.\0"
+        .string "{CENTER_ALIGN}This is not an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.\0"
         .align 2,0
 
 	.global gUnknown_80E7344
@@ -745,7 +745,7 @@ gUnknown_80E735C: @ 80E735C
 
         .global ReceiveSOSMail_80E737C
         ReceiveSOSMail_80E737C:
-        .string "#+This {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} has been received already.\0"
+        .string "{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} has been received already.\0"
         .align 2,0
 
 	.global gUnknown_80E73AC
diff --git a/data/data_80F4278.s b/data/data_80F4278.s
index 8487e01..82c5cfe 100644
--- a/data/data_80F4278.s
+++ b/data/data_80F4278.s
@@ -6020,11 +6020,11 @@ gUnknown_8100928: @ 8100928
 
 	.global gUnknown_8100934
 gUnknown_8100934: @ 8100934
-	.string " How dare you!#W\n"
-	.string "It{APOSTROPHE}s their fault!#P"
+	.string " How dare you!{WAIT_PRESS}\n"
+	.string "It{APOSTROPHE}s their fault!{EXTRA_MSG}"
 	.string " I haven{APOSTROPHE}t slept in days\n"
 	.string "because the earthquakes frighten me so!\n"
-	.string "Every night we had them!#P"
+	.string "Every night we had them!{EXTRA_MSG}"
 	.string " Those earthquakes are\n"
 	.string "caused by this brat{APOSTROPHE}s ilk running wild\n"
 	.string "underground!\0"
@@ -6664,9 +6664,9 @@ gUnknown_8103E34: @ 8103E34
 
 	.global gUnknown_8103E40
 gUnknown_8103E40: @ 8103E40
-	.string "#+There appears to be no one here.#P"
-	.string "#+It{APOSTROPHE}s impossible to go farther.#W\n"
-	.string "#+It{APOSTROPHE}s time to go back.\0"
+	.string "{CENTER_ALIGN}There appears to be no one here.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}It{APOSTROPHE}s impossible to go farther.{WAIT_PRESS}\n"
+	.string "{CENTER_ALIGN}It{APOSTROPHE}s time to go back.\0"
 	.align 2, 0
 
 	.global gUnknown_8103EA4
@@ -7189,8 +7189,8 @@ gUnknown_81063D0: @ 81063D0
 
 	.global gPurityForestSomeoneThereText
 gPurityForestSomeoneThereText: @ 81063DC
-	.string "#+Oh?#W\n"
-	.string "#+There{APOSTROPHE}s someone there.\0"
+	.string "{CENTER_ALIGN}Oh?{WAIT_PRESS}\n"
+	.string "{CENTER_ALIGN}There{APOSTROPHE}s someone there.\0"
 	.align 2, 0
 
 	.global gUnknown_8106400
@@ -7201,8 +7201,8 @@ gUnknown_8106400: @ 8106400
 
 	.global gPurityForestCelebiIntroText
 gPurityForestCelebiIntroText: @ 810640C
-	.string "#+It{APOSTROPHE}s...#W\n"
-	.string "#+The Time Travel Pokémon {ARG_POKEMON_2}!\0"
+	.string "{CENTER_ALIGN}It{APOSTROPHE}s...{WAIT_PRESS}\n"
+	.string "{CENTER_ALIGN}The Time Travel Pokémon {ARG_POKEMON_2}!\0"
 	.align 2, 0
 
 	.global gUnknown_810643C
@@ -7213,7 +7213,7 @@ gUnknown_810643C: @ 810643C
 
 	.global gPurityForestCelebiWantsToJoinText
 gPurityForestCelebiWantsToJoinText: @ 8106448
-	.string "#+{ARG_POKEMON_2} wants to join the team.\0"
+	.string "{CENTER_ALIGN}{ARG_POKEMON_2} wants to join the team.\0"
 	.align 2, 0
 
 	.global gUnknown_8106468
@@ -7224,7 +7224,7 @@ gUnknown_8106468: @ 8106468
 
 	.global gPurityForestCelebiJoinedText
 gPurityForestCelebiJoinedText: @ 8106474
-	.string "#+{ARG_POKEMON_2} joined the team! \0"
+	.string "{CENTER_ALIGN}{ARG_POKEMON_2} joined the team! \0"
 	.align 2, 0
 
 	.global gUnknown_810648C
@@ -7235,8 +7235,8 @@ gUnknown_810648C: @ 810648C
 
 	.global gPurityForestCelebiVeryHappyText
 gPurityForestCelebiVeryHappyText: @ 8106498
-	.string "#+{ARG_POKEMON_3} appears to\n"
-	.string "#+be very happy!\0"
+	.string "{CENTER_ALIGN}{ARG_POKEMON_3} appears to\n"
+	.string "{CENTER_ALIGN}be very happy!\0"
 	.align 2, 0
 
 	.global gUnknown_81064BC
@@ -7247,8 +7247,8 @@ gUnknown_81064BC: @ 81064BC
 
 	.global gPurityForestCelebiDelightedToJoinText
 gPurityForestCelebiDelightedToJoinText: @ 81064C8
-	.string "#+It{APOSTROPHE}s delighted to have\n"
-	.string "#+joined the rescue team!\0"
+	.string "{CENTER_ALIGN}It{APOSTROPHE}s delighted to have\n"
+	.string "{CENTER_ALIGN}joined the rescue team!\0"
 	.align 2, 0
 
 	.global gUnknown_8106500
@@ -7259,8 +7259,8 @@ gUnknown_8106500: @ 8106500
 
 	.global gPurityForestTurnedDownOfferText
 gPurityForestTurnedDownOfferText: @ 810650C
-	.string "#+{ARG_POKEMON_0} turned down\n"
-	.string "#+the offer to join.\0"
+	.string "{CENTER_ALIGN}{ARG_POKEMON_0} turned down\n"
+	.string "{CENTER_ALIGN}the offer to join.\0"
 	.align 2, 0
 
 	.global gUnknown_8106534
@@ -7271,7 +7271,7 @@ gUnknown_8106534: @ 8106534
 
 	.global gPurityForestCelebiDisappointedText
 gPurityForestCelebiDisappointedText: @ 8106540
-	.string "#+Celebi is very disappointed.\0"
+	.string "{CENTER_ALIGN}Celebi is very disappointed.\0"
 	.align 2, 0
 
 	.global gUnknown_8106560
@@ -7282,14 +7282,14 @@ gUnknown_8106560: @ 8106560
 
 	.global gPurityForestCelebiLeftDejectedlyText
 gPurityForestCelebiLeftDejectedlyText: @ 810656C
-	.string "#+{ARG_POKEMON_2} left\n"
-	.string "#+dejectedly...\0"
+	.string "{CENTER_ALIGN}{ARG_POKEMON_2} left\n"
+	.string "{CENTER_ALIGN}dejectedly...\0"
 	.align 2, 0
 
 	.global gPurityForestAllowCelebiToJoinText
 gPurityForestAllowCelebiToJoinText: @ 8106588
-	.string "#+Allow {ARG_POKEMON_2}\n"
-	.string "#+to join the team?\0"
+	.string "{CENTER_ALIGN}Allow {ARG_POKEMON_2}\n"
+	.string "{CENTER_ALIGN}to join the team?\0"
 	.align 2, 0
 
 	.global gPtrPurityForestAllowCelebiToJoinText
@@ -7317,8 +7317,8 @@ gPurityForestAllowCelebiToJoinYesText: @ 81065C8
 
 	.global gPurityForestRefuseCelebiConfirmText
 gPurityForestRefuseCelebiConfirmText: @ 81065D0
-	.string "#+Are you sure?#W\n"
-	.string "#+You{APOSTROPHE}re sure you won{APOSTROPHE}t accept it?\0"
+	.string "{CENTER_ALIGN}Are you sure?{WAIT_PRESS}\n"
+	.string "{CENTER_ALIGN}You{APOSTROPHE}re sure you won{APOSTROPHE}t accept it?\0"
 	.align 2, 0
 
 	.global gPtrPurityForestRefuseCelebiConfirmText
@@ -7473,7 +7473,7 @@ gUnknown_8106AEC: @ 8106AEC
 
 	.global gUnknown_8106B50
 gUnknown_8106B50: @ 8106B50
-        .string "#C%c%s\0"
+        .string "{COLOR_1}%c%s\0"
         .align 2,0
         .string "pksdir0\0"
         .align 2,0
@@ -7656,7 +7656,7 @@ gUnknown_8106D68: @ 8106D68
 
 	.global gUnknown_8106D8C
 gUnknown_8106D8C: @ 8106D8C
-        .string "#c%d{ARG_POKEMON_0}\0"
+        .string "{COLOR_2}%d{ARG_POKEMON_0}\0"
         .align 2,0
         .string "pksdir0\0"
         .align 2,0
@@ -7965,7 +7965,7 @@ gUnknown_8107638: @ 8107638
 
 	.global gUnknown_810763C
 gUnknown_810763C: @ 810763C
-        .string "#c%c%s{END_COLOR_TEXT_2}\0"
+        .string "{COLOR_2}%c%s{END_COLOR_TEXT_2}\0"
 
 	.global gUnknown_8107645
 gUnknown_8107645: @ 8107645
@@ -8272,14 +8272,14 @@ gUnknown_810983C: @ 810983C
 
 	.global gUnknown_81098A4
 gUnknown_81098A4: @ 81098A4
-	.string "#c"
+	.string "{COLOR_2}"
         .byte 0x4
         .string "%s{END_COLOR_TEXT_2}\0"
         .align 2,0
 
 	.global gUnknown_81098AC
 gUnknown_81098AC: @ 81098AC
-        .string "%s#=%c#C"
+        .string "%s#=%c{COLOR_1}"
         .byte 0x4
         .string "%s{END_COLOR_TEXT_1}\0"
         .align 2,0
@@ -8302,12 +8302,12 @@ gUnknown_81098DC: @ 81098DC
 
 	.global gUnknown_81098E0
 gUnknown_81098E0: @ 81098E0
-        .string "#c%c%s%s{END_COLOR_TEXT_2}\0"
+        .string "{COLOR_2}%c%s%s{END_COLOR_TEXT_2}\0"
         .align 2,0
 
 	.global gUnknown_81098EC
 gUnknown_81098EC: @ 81098EC
-        .string "#c%c#:%s%s%s#;%c%2d/%2d{END_COLOR_TEXT_2}\0"
+        .string "{COLOR_2}%c#:%s%s%s#;%c%2d/%2d{END_COLOR_TEXT_2}\0"
         .align 2,0
 
 	.global gUnknown_8109908
@@ -8320,7 +8320,7 @@ gUnknown_810990C: @ 810990C
 
 	.global gUnknown_8109910
 gUnknown_8109910: @ 8109910
-        .string "#c%c%s%s%s#=%c%2d/%2d{END_COLOR_TEXT_2}\0"
+        .string "{COLOR_2}%c%s%s%s#=%c%2d/%2d{END_COLOR_TEXT_2}\0"
         .align 2,0
 
 	.global gUnknown_8109928
@@ -8381,7 +8381,7 @@ gDummyScenarioText: @ 8109CA8
 
 	.global gUnknown_8109CC0
 gUnknown_8109CC0: @ 8109CC0
-        .string "#CW???{END_COLOR_TEXT_1}\0"
+        .string "{COLOR_1 UNKNOWN_COLOR}???{END_COLOR_TEXT_1}\0"
         .align 2,0
         .string "pksdir0\0"
 
diff --git a/data/data_810AE24.s b/data/data_810AE24.s
index 855b346..966da4b 100644
--- a/data/data_810AE24.s
+++ b/data/data_810AE24.s
@@ -891,7 +891,7 @@ sUnknown_810D5F0:
     .align 2, 0
 
 sUnknown_810D608:
-    .string "Won~27t get sleepy\0"
+    .string "Won{APOSTROPHE}t get sleepy\0"
     .align 2, 0
 
 sUnknown_810D61C:
@@ -995,335 +995,335 @@ gFormattedStatusNames: @ 810D628
     .4byte sUnknown_810D78C
 
 sUnknown_810D78C:
-    .string "#c5Stair Spotter#r  \0"
+    .string "{COLOR_2 CYAN}Stair Spotter{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D7A4:
-    .string "#c5Doubled Attack#r  \0"
+    .string "{COLOR_2 CYAN}Doubled Attack{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D7BC:
-    .string "#c5Perish Song#r  \0"
+    .string "{COLOR_2 CYAN}Perish Song{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D7D0:
-    .string "#c5Terrified#r  \0"
+    .string "{COLOR_2 CYAN}Terrified{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D7E4:
-    .string "#c5Exposed#r  \0"
+    .string "{COLOR_2 CYAN}Exposed{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D7F4:
-    .string "#c5Grudge#r  \0"
+    .string "{COLOR_2 CYAN}Grudge{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D804:
-    .string "#c5Scanning#r  \0"
+    .string "{COLOR_2 CYAN}Scanning{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D814:
-    .string "#c5Power Ears#r  \0"
+    .string "{COLOR_2 CYAN}Power Ears{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D828:
-    .string "#c5Stockpiling#r  \0"
+    .string "{COLOR_2 CYAN}Stockpiling{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D83C:
-    .string "#c5Muzzled#r  \0"
+    .string "{COLOR_2 CYAN}Muzzled{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D84C:
-    .string "#c5Eyedrops#r  \0"
+    .string "{COLOR_2 CYAN}Eyedrops{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D85C:
-    .string "#c5Cross-Eyed#r  \0"
+    .string "{COLOR_2 CYAN}Cross-Eyed{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D870:
-    .string "#c5Blinker#r  \0"
+    .string "{COLOR_2 CYAN}Blinker{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D880:
-    .string "#c5Mobile#r  \0"
+    .string "{COLOR_2 CYAN}Mobile{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D890:
-    .string "#c5Transformed#r  \0"
+    .string "{COLOR_2 CYAN}Transformed{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D8A4:
-    .string "#c5Invisible#r  \0"
+    .string "{COLOR_2 CYAN}Invisible{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D8B8:
-    .string "#c5Pierce#r  \0"
+    .string "{COLOR_2 CYAN}Pierce{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D8C8:
-    .string "#c5Long Toss#r  \0"
+    .string "{COLOR_2 CYAN}Long Toss{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D8DC:
-    .string "#c5Focus Energy#r  \0"
+    .string "{COLOR_2 CYAN}Focus Energy{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D8F0:
-    .string "#c5Set Damage#r  \0"
+    .string "{COLOR_2 CYAN}Set Damage{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D904:
-    .string "#c5Whiffer#r  \0"
+    .string "{COLOR_2 CYAN}Whiffer{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D914:
-    .string "#c5Sure Shot#r  \0"
+    .string "{COLOR_2 CYAN}Sure Shot{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D928:
-    .string "#c5Destiny Bond#r  \0"
+    .string "{COLOR_2 CYAN}Destiny Bond{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D93C:
-    .string "#c5Leech Seed#r  \0"
+    .string "{COLOR_2 CYAN}Leech Seed{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D950:
-    .string "#c5Hungry Pal#r  \0"
+    .string "{COLOR_2 CYAN}Hungry Pal{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D964:
-    .string "#c5Snatch#r  \0"
+    .string "{COLOR_2 CYAN}Snatch{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D974:
-    .string "#c5Decoy#r  \0"
+    .string "{COLOR_2 CYAN}Decoy{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D984:
-    .string "#c5Cursed#r  \0"
+    .string "{COLOR_2 CYAN}Cursed{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D994:
-    .string "#c5Weakened#r  \0"
+    .string "{COLOR_2 CYAN}Weakened{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D9A4:
-    .string "#c5Mist#r  \0"
+    .string "{COLOR_2 CYAN}Mist{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D9B0:
-    .string "#c5Vital Throw#r  \0"
+    .string "{COLOR_2 CYAN}Vital Throw{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D9C4:
-    .string "#c5Conversion 2#r  \0"
+    .string "{COLOR_2 CYAN}Conversion 2{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D9D8:
-    .string "#c5Mirror Move#r  \0"
+    .string "{COLOR_2 CYAN}Mirror Move{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810D9EC:
-    .string "#c5Mini Counter#r  \0"
+    .string "{COLOR_2 CYAN}Mini Counter{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DA00:
-    .string "#c5Enduring#r  \0"
+    .string "{COLOR_2 CYAN}Enduring{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DA10:
-    .string "#c5Mirror Coat#r  \0"
+    .string "{COLOR_2 CYAN}Mirror Coat{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DA24:
-    .string "#c5Protect#r  \0"
+    .string "{COLOR_2 CYAN}Protect{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DA34:
-    .string "#c5Wish#r  \0"
+    .string "{COLOR_2 CYAN}Wish{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DA40:
-    .string "#c5Magic Coat#r  \0"
+    .string "{COLOR_2 CYAN}Magic Coat{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DA54:
-    .string "#c5Counter#r  \0"
+    .string "{COLOR_2 CYAN}Counter{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DA64:
-    .string "#c5Light Screen#r  \0"
+    .string "{COLOR_2 CYAN}Light Screen{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DA78:
-    .string "#c5Safeguard#r  \0"
+    .string "{COLOR_2 CYAN}Safeguard{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DA8C:
-    .string "#c5Reflect#r  \0"
+    .string "{COLOR_2 CYAN}Reflect{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DA9C:
-    .string "#c5Half Speed#r  \0"
+    .string "{COLOR_2 CYAN}Half Speed{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DAB0:
-    .string "#c5Enraged#r  \0"
+    .string "{COLOR_2 CYAN}Enraged{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DAC0:
-    .string "#c5Charging#r  \0"
+    .string "{COLOR_2 CYAN}Charging{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DAD0:
-    .string "#c5Digging#r  \0"
+    .string "{COLOR_2 CYAN}Digging{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DAE0:
-    .string "#c5Diving#r  \0"
+    .string "{COLOR_2 CYAN}Diving{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DAF0:
-    .string "#c5Bouncing#r  \0"
+    .string "{COLOR_2 CYAN}Bouncing{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DB00:
-    .string "#c5Flying#r  \0"
+    .string "{COLOR_2 CYAN}Flying{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DB10:
-    .string "#c5Skull Bash#r  \0"
+    .string "{COLOR_2 CYAN}Skull Bash{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DB24:
-    .string "#c5Focus Punch#r  \0"
+    .string "{COLOR_2 CYAN}Focus Punch{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DB38:
-    .string "#c5Razor Wind#r  \0"
+    .string "{COLOR_2 CYAN}Razor Wind{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DB4C:
-    .string "#c5Sky Attack#r  \0"
+    .string "{COLOR_2 CYAN}Sky Attack{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DB60:
-    .string "#c5Solarbeam#r  \0"
+    .string "{COLOR_2 CYAN}Solarbeam{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DB74:
-    .string "#c5Bide#r  \0"
+    .string "{COLOR_2 CYAN}Bide{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DB80:
-    .string "#c5Double Speed#r  \0"
+    .string "{COLOR_2 CYAN}Double Speed{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DB94:
-    .string "#c5Infatuated#r  \0"
+    .string "{COLOR_2 CYAN}Infatuated{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DBA8:
-    .string "#c5Encore#r  \0"
+    .string "{COLOR_2 CYAN}Encore{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DBB8:
-    .string "#c5Taunted#r  \0"
+    .string "{COLOR_2 CYAN}Taunted{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DBC8:
-    .string "#c5Cowering#r  \0"
+    .string "{COLOR_2 CYAN}Cowering{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DBD8:
-    .string "#c5Paused#r  \0"
+    .string "{COLOR_2 CYAN}Paused{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DBE8:
-    .string "#c5Confused#r  \0"
+    .string "{COLOR_2 CYAN}Confused{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DBF8:
-    .string "#c5Cringe#r  \0"
+    .string "{COLOR_2 CYAN}Cringe{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DC08:
-    .string "#c5Famished#r  \0"
+    .string "{COLOR_2 CYAN}Famished{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DC18:
-    .string "#c5Constriction#r  \0"
+    .string "{COLOR_2 CYAN}Constriction{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DC2C:
-    .string "#c5Petrified#r  \0"
+    .string "{COLOR_2 CYAN}Petrified{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DC40:
-    .string "#c5Ingrain#r  \0"
+    .string "{COLOR_2 CYAN}Ingrain{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DC50:
-    .string "#c5Wrapped#r  \0"
+    .string "{COLOR_2 CYAN}Wrapped{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DC60:
-    .string "#c5Wrap#r  \0"
+    .string "{COLOR_2 CYAN}Wrap{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DC6C:
-    .string "#c5Leg Hold#r  \0"
+    .string "{COLOR_2 CYAN}Leg Hold{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DC7C:
-    .string "#c5Frozen#r  \0"
+    .string "{COLOR_2 CYAN}Frozen{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DC8C:
-    .string "#c5Identifying#r  \0"
+    .string "{COLOR_2 CYAN}Identifying{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DCA0:
-    .string "#c5Paralysis#r  \0"
+    .string "{COLOR_2 CYAN}Paralysis{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DCB4:
-    .string "#c5Badly Poisoned#r  \0"
+    .string "{COLOR_2 CYAN}Badly Poisoned{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DCCC:
-    .string "#c5Poisoned#r  \0"
+    .string "{COLOR_2 CYAN}Poisoned{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DCDC:
-    .string "#c5Burn#r  \0"
+    .string "{COLOR_2 CYAN}Burn{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DCE8:
-    .string "#c5Low HP#r  \0"
+    .string "{COLOR_2 CYAN}Low HP{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DCF8:
-    .string "#c5Napping#r  \0"
+    .string "{COLOR_2 CYAN}Napping{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DD08:
-    .string "#c5Yawning#r  \0"
+    .string "{COLOR_2 CYAN}Yawning{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DD18:
-    .string "#c5Nightmare#r  \0"
+    .string "{COLOR_2 CYAN}Nightmare{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DD2C:
-    .string "#c5Sleepless#r  \0"
+    .string "{COLOR_2 CYAN}Sleepless{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DD40:
-    .string "#c5Sleep#r  \0"
+    .string "{COLOR_2 CYAN}Sleep{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810DD50:
@@ -1785,27 +1785,27 @@ gStatusDescriptions: @ 810E074
 
 sUnknown_810E38C:
     .string "Physical Attack moves are those based on\n"
-    .string "the stats #c6Attack#r and #c6Defense#r.\n"
+    .string "the stats {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}.\n"
     .string "Physical Attack moves are of the types\n"
-    .string "Normal~2c Fighting~2c Poison~2c Ground~2c Flying~2c\n"
-    .string "Bug~2c Rock~2c Ghost~2c and Steel.\0"
+    .string "Normal{COMMA} Fighting{COMMA} Poison{COMMA} Ground{COMMA} Flying{COMMA}\n"
+    .string "Bug{COMMA} Rock{COMMA} Ghost{COMMA} and Steel.\0"
     .align 2, 0
 
 sUnknown_810E45C:
-    .string "#c5Physical Attack Moves#r  \0"
+    .string "{COLOR_2 CYAN}Physical Attack Moves{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810E47C:
     .string "Special Attack moves are those based on\n"
-    .string "the stats #c6Special Attack#r and\n"
-    .string "#c6Special Defense#r.\n"
+    .string "the stats {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} and\n"
+    .string "{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}.\n"
     .string "Special Attack moves are of the types\n"
-    .string "Fire~2c Water~2c Grass~2c Electric~2c Ice~2c Psychic~2c\n"
-    .string "Dragon~2c and Dark.\0"
+    .string "Fire{COMMA} Water{COMMA} Grass{COMMA} Electric{COMMA} Ice{COMMA} Psychic{COMMA}\n"
+    .string "Dragon{COMMA} and Dark.\0"
     .align 2, 0
 
 sUnknown_810E550:
-    .string "#c5Special Attack Moves#r  \0"
+    .string "{COLOR_2 CYAN}Special Attack Moves{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810E56C:
@@ -1816,49 +1816,49 @@ sUnknown_810E56C:
     .align 2, 0
 
 sUnknown_810E5F4:
-    .string "Because of moves~2c special abilities~2c etc.~2c\n"
+    .string "Because of moves{COMMA} special abilities{COMMA} etc.{COMMA}\n"
     .string "the Pokémon is weakened in terms of such\n"
-    .string "stats as #c6Attack#r~2c #c6Defense#r~2c #c6Special Attack#r~2c\n"
-    .string "and #c6Special Defense#r. It is possible to heal\n"
-    .string "this condition with a Wonder Tile~2c etc.\n"
+    .string "stats as {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}{COMMA} {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}{COMMA} {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}{COMMA}\n"
+    .string "and {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}. It is possible to heal\n"
+    .string "this condition with a Wonder Tile{COMMA} etc.\n"
     .string "Moving to the next floor will also heal it.\0"
     .align 2, 0
 
 sUnknown_810E714:
     .string "Two or more moves can be linked together\n"
     .string "to use them in succession in one turn.\n"
-    .string "Although linked moves can be powerful~2c\n"
+    .string "Although linked moves can be powerful{COMMA}\n"
     .string "they also make the Pokémon hungry faster.\n"
-    .string "The link is broken if the #c6PP#r of a linked\n"
+    .string "The link is broken if the {COLOR_2 YELLOW}PP{END_COLOR_TEXT_2} of a linked\n"
     .string "move is used up.\0"
     .align 2, 0
 
 sUnknown_810E7F8:
-    .string "#c5Link#r  \0"
+    .string "{COLOR_2 CYAN}Link{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810E804:
-    .string "The floor~27s status changes to Water Sport.\n"
+    .string "The floor{APOSTROPHE}s status changes to Water Sport.\n"
     .string "The power of Fire-type moves is halved.\0"
     .align 2, 0
 
 sUnknown_810E85C:
-    .string "#c5Water Sport#r  \0"
+    .string "{COLOR_2 CYAN}Water Sport{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810E870:
-    .string "The floor~27s status changes to Mud Sport.\n"
+    .string "The floor{APOSTROPHE}s status changes to Mud Sport.\n"
     .string "The power of Electric-type moves is\n"
     .string "halved.\0"
     .align 2, 0
 
 sUnknown_810E8C8:
-    .string "#c5Mud Sport#r  \0"
+    .string "{COLOR_2 CYAN}Mud Sport{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810E8DC:
     .string "The Pokémon is sped up.\n"
-    .string "Its #c6attack frequency#r has been boosted.\0"
+    .string "Its {COLOR_2 YELLOW}attack frequency{END_COLOR_TEXT_2} has been boosted.\0"
     .align 2, 0
 
 sUnknown_810E920:
@@ -1872,14 +1872,14 @@ sUnknown_810E95C:
     .align 2, 0
 
 sUnknown_810E9A8:
-    .string "The Ghost-type Pokémon~27s identity is\n"
+    .string "The Ghost-type Pokémon{APOSTROPHE}s identity is\n"
     .string "revealed.\n"
-    .string "Its type matchup changes~2c making it weak\n"
+    .string "Its type matchup changes{COMMA} making it weak\n"
     .string "against Normal- and Fighting-type moves.\0"
     .align 2, 0
 
 sUnknown_810EA30:
-    .string "If the Pokémon is defeated~2c its Grudge\n"
+    .string "If the Pokémon is defeated{COMMA} its Grudge\n"
     .string "causes the victorious foe to completely\n"
     .string "lose the PP of its last move.\n"
     .string "Its effect wears off upon moving to the\n"
@@ -1897,27 +1897,27 @@ sUnknown_810EAD4:
 sUnknown_810EB60:
     .string "The Pokémon gains the ability to pinpoint\n"
     .string "the locations of other Pokémon on the\n"
-    .string "floor~27s map.\n"
+    .string "floor{APOSTROPHE}s map.\n"
     .string "This effect wears off upon moving to the\n"
     .string "next floor.\0"
     .align 2, 0
 
 sUnknown_810EBF4:
     .string "The Pokémon is storing power with the\n"
-    .string "move #c4Stockpile#r.\n"
-    .string "The more power Stockpiled~2c the more\n"
-    .string "powerful the move #c4Spit Up#r#r becomes.\n"
+    .string "move {COLOR_2 GREEN}Stockpile{END_COLOR_TEXT_2}.\n"
+    .string "The more power Stockpiled{COMMA} the more\n"
+    .string "powerful the move {COLOR_2 GREEN}Spit Up{END_COLOR_TEXT_2}{END_COLOR_TEXT_2} becomes.\n"
     .string "The stored power is lost if the Pokémon\n"
     .string "goes on to the next floor.\0"
     .align 2, 0
 
 sUnknown_810ECC4:
-    .string "The Pokémon~27s #c6Movement Speed#r is\n"
+    .string "The Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} is\n"
     .string "reduced from its usual level.\0"
     .align 2, 0
 
 sUnknown_810ED0C:
-    .string "The Pokémon~27s #c6Movement Speed#r is boosted\n"
+    .string "The Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} is boosted\n"
     .string "over its usual level.\0"
     .align 2, 0
 
@@ -1925,37 +1925,37 @@ sUnknown_810ED54:
     .string "The Pokémon (or trap) explodes savagely\n"
     .string "and inflicts damage on all Pokémon within\n"
     .string "a 2-tile range.\n"
-    .string "The huge explosion halves the #c6HP#r of\n"
+    .string "The huge explosion halves the {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} of\n"
     .string "rescue team members. It also destroys\n"
     .string "walls and items within the 2-tile range.\0"
     .align 2, 0
 
 sUnknown_810EE30:
-    .string "#c5Huge Explosion#r  \0"
+    .string "{COLOR_2 CYAN}Huge Explosion{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810EE48:
     .string "The Pokémon (or trap) explodes and\n"
     .string "inflicts damage on all Pokémon within\n"
     .string "a 1-tile range.\n"
-    .string "The explosion halves the #c6HP#r of rescue\n"
+    .string "The explosion halves the {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} of rescue\n"
     .string "team members. It also destroys walls and\n"
     .string "items within the 1-tile range.\0"
     .align 2, 0
 
 sUnknown_810EF14:
-    .string "#c5Explode#r  \0"
+    .string "{COLOR_2 CYAN}Explode{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810EF24:
     .string "There is a raging snowstorm.\n"
     .string "This weather condition boosts the\n"
-    .string "#c6Movement Speed#r of Ice-type Pokémon\n"
+    .string "{COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} of Ice-type Pokémon\n"
     .string "by one level.\0"
     .align 2, 0
 
 sUnknown_810EF9C:
-    .string "#c5Snow#r  \0"
+    .string "{COLOR_2 CYAN}Snow{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810EFA8:
@@ -1965,29 +1965,29 @@ sUnknown_810EFA8:
     .align 2, 0
 
 sUnknown_810EFF8:
-    .string "#c5Fog#r  \0"
+    .string "{COLOR_2 CYAN}Fog{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810F004:
     .string "The weather is cloudy and dark.\n"
-    .string "This condition lowers the #c6Attack#r\n"
-    .string "and #c6Special Attack#r of all Pokémon\n"
+    .string "This condition lowers the {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}\n"
+    .string "and {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} of all Pokémon\n"
     .string "except for the Normal type.\0"
     .align 2, 0
 
 sUnknown_810F090:
-    .string "#c5Cloudy#r  \0"
+    .string "{COLOR_2 CYAN}Cloudy{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810F0A0:
     .string "There is a raging sandstorm.\n"
     .string "This weather condition inflicts damage\n"
-    .string "on all Pokémon except for the Ground~2c\n"
-    .string "Rock~2c and Steel types.\0"
+    .string "on all Pokémon except for the Ground{COMMA}\n"
+    .string "Rock{COMMA} and Steel types.\0"
     .align 2, 0
 
 sUnknown_810F128:
-    .string "#c5Sandstorm#r  \0"
+    .string "{COLOR_2 CYAN}Sandstorm{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810F13C:
@@ -1997,7 +1997,7 @@ sUnknown_810F13C:
     .align 2, 0
 
 sUnknown_810F198:
-    .string "#c5Sunny#r  \0"
+    .string "{COLOR_2 CYAN}Sunny{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810F1A8:
@@ -2007,7 +2007,7 @@ sUnknown_810F1A8:
     .align 2, 0
 
 sUnknown_810F204:
-    .string "#c5Rain#r  \0"
+    .string "{COLOR_2 CYAN}Rain{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810F210:
@@ -2017,7 +2017,7 @@ sUnknown_810F210:
     .align 2, 0
 
 sUnknown_810F27C:
-    .string "#c5Hail#r  \0"
+    .string "{COLOR_2 CYAN}Hail{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810F288:
@@ -2032,13 +2032,13 @@ sUnknown_810F2BC:
     .align 2, 0
 
 sUnknown_810F334:
-    .string "If the Pokémon is defeated~2c its grudge\n"
+    .string "If the Pokémon is defeated{COMMA} its grudge\n"
     .string "causes the foe to completely lose the PP\n"
     .string "of the move it used last.\0"
     .align 2, 0
 
 sUnknown_810F3A0:
-    .string "#c5Grudge Effect#r  \0"
+    .string "{COLOR_2 CYAN}Grudge Effect{END_COLOR_TEXT_2}  \0"
     .align 2, 0
 
 sUnknown_810F3B8:
@@ -2048,7 +2048,7 @@ sUnknown_810F3B8:
     .align 2, 0
 
 sUnknown_810F42C:
-    .string "The Pokémon~27s sense of direction becomes\n"
+    .string "The Pokémon{APOSTROPHE}s sense of direction becomes\n"
     .string "completely scrambled.\n"
     .string "Its moves and attacks will hit even\n"
     .string "team members.\n"
@@ -2056,7 +2056,7 @@ sUnknown_810F42C:
     .align 2, 0
 
 sUnknown_810F4C8:
-    .string "The Pokémon~27s accuracy of moves and\n"
+    .string "The Pokémon{APOSTROPHE}s accuracy of moves and\n"
     .string "attacks is minimized so they hardly\n"
     .string "ever hit.\n"
     .string "Even sure-hit moves may miss.\n"
@@ -2064,13 +2064,13 @@ sUnknown_810F4C8:
     .align 2, 0
 
 sUnknown_810F564:
-    .string "The critical-hit rate of the Pokémon~27s\n"
+    .string "The critical-hit rate of the Pokémon{APOSTROPHE}s\n"
     .string "moves is boosted to the maximum.\n"
     .string "This effect lasts a set amount of turns.\0"
     .align 2, 0
 
 sUnknown_810F5D8:
-    .string "The Pokémon~27s accuracy of moves and\n"
+    .string "The Pokémon{APOSTROPHE}s accuracy of moves and\n"
     .string "attacks is boosted so they always hit.\n"
     .string "This effect lasts a set amount of turns.\0"
     .align 2, 0
@@ -2083,7 +2083,7 @@ sUnknown_810F650:
     .align 2, 0
 
 sUnknown_810F6C4:
-    .string "The Pokémon~27s attacks and moves will\n"
+    .string "The Pokémon{APOSTROPHE}s attacks and moves will\n"
     .string "all fail.\n"
     .string "This effect lasts a set amount of turns.\0"
     .align 2, 0
@@ -2109,15 +2109,15 @@ sUnknown_810F818:
     .align 2, 0
 
 sUnknown_810F8A8:
-    .string "The Pokémon~27s eyesight fails.\n"
-    .string "It can~27t see the terrain~2c other Pokémon~2c or\n"
+    .string "The Pokémon{APOSTROPHE}s eyesight fails.\n"
+    .string "It can{APOSTROPHE}t see the terrain{COMMA} other Pokémon{COMMA} or\n"
     .string "items on the ground.\n"
     .string "This condition lasts a set amount of turns.\0"
     .align 2, 0
 
 sUnknown_810F93C:
-    .string "The Pokémon can move~2c attack~2c and use\n"
-    .string "moves inside walls and on water~2c lava~2c\n"
+    .string "The Pokémon can move{COMMA} attack{COMMA} and use\n"
+    .string "moves inside walls and on water{COMMA} lava{COMMA}\n"
     .string "or clouds. Beware--it will grow hungry\n"
     .string "faster while traveling through walls.\n"
     .string "Its effect wears off upon moving to the\n"
@@ -2126,7 +2126,7 @@ sUnknown_810F93C:
 
 sUnknown_810FA14:
     .string "The Pokémon transforms into\n"
-    .string "a different Pokémon~2c appearance-wise.\n"
+    .string "a different Pokémon{COMMA} appearance-wise.\n"
     .string "This effect wears off upon moving to the\n"
     .string "next floor.\0"
     .align 2, 0
@@ -2139,7 +2139,7 @@ sUnknown_810FA90:
 
 sUnknown_810FAFC:
     .string "Any item thrown by the Pokémon will fly\n"
-    .string "through all obstacles~2c including walls~2c\n"
+    .string "through all obstacles{COMMA} including walls{COMMA}\n"
     .string "until disappearing. This will affect all\n"
     .string "Pokémon in its path.\n"
     .string "Its effect wears off upon moving to the\n"
@@ -2147,7 +2147,7 @@ sUnknown_810FAFC:
     .align 2, 0
 
 sUnknown_810FBC4:
-    .string "If the Pokémon throws an item~2c it will fly\n"
+    .string "If the Pokémon throws an item{COMMA} it will fly\n"
     .string "until it hits an obstacle.\n"
     .string "This effect wears off upon moving to the\n"
     .string "next floor.\0"
@@ -2155,7 +2155,7 @@ sUnknown_810FBC4:
 
 sUnknown_810FC44:
     .string "The amount of damage inflicted by the\n"
-    .string "Pokémon~27s moves and regular attack\n"
+    .string "Pokémon{APOSTROPHE}s moves and regular attack\n"
     .string "becomes set at a certain figure.\n"
     .string "This effect lasts a set amount of turns.\0"
     .align 2, 0
@@ -2170,7 +2170,7 @@ sUnknown_810FCDC:
 sUnknown_810FD84:
     .string "A Leech Seed is planted on the\n"
     .string "Pokémon. The Leech Seed drains the\n"
-    .string "Pokémon~27s #c6HP#r every several turns.\n"
+    .string "Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} every several turns.\n"
     .string "This effect lasts a set amount of turns.\0"
     .align 2, 0
 
@@ -2199,9 +2199,9 @@ sUnknown_810FF58:
 
 sUnknown_8110004:
     .string "The Pokémon is protected from any\n"
-    .string "reduction of the stats #c6Attack#r~2c #c6Defense#r~2c\n"
-    .string "#c6Special Attack#r~2c #c6Special Defense#r~2c\n"
-    .string "#c6Accuracy#r~2c and #c6Evasion#r.\n"
+    .string "reduction of the stats {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}{COMMA} {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}{COMMA}\n"
+    .string "{COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}{COMMA} {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}{COMMA}\n"
+    .string "{COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2}{COMMA} and {COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2}.\n"
     .string "This condition lasts a set amount of turns.\0"
     .align 2, 0
 
@@ -2209,30 +2209,30 @@ sUnknown_81100DC:
     .string "The Pokémon counters any Physical Attack\n"
     .string "move or regular attack by picking up and\n"
     .string "hurling the foe.\n"
-    .string "If the Pokémon faints~2c it cannot retaliate\n"
+    .string "If the Pokémon faints{COMMA} it cannot retaliate\n"
     .string "with a throw.\n"
     .string "This condition lasts a set amount of turns.\0"
     .align 2, 0
 
 sUnknown_81101A8:
-    .string "If hit by a move~2c the Pokémon changes its\n"
-    .string "type to one that is resistant to the move~27s\n"
+    .string "If hit by a move{COMMA} the Pokémon changes its\n"
+    .string "type to one that is resistant to the move{APOSTROPHE}s\n"
     .string "type.\n"
     .string "This condition lasts a set amount of turns.\0"
     .align 2, 0
 
 sUnknown_8110234:
     .string "The Pokémon counters any Physical Attack\n"
-    .string "move or regular attack~2c and inflicts one\n"
+    .string "move or regular attack{COMMA} and inflicts one\n"
     .string "quarter the damage it took from the foe.\n"
-    .string "If the Pokémon faints~2c it cannot hit back.\n"
+    .string "If the Pokémon faints{COMMA} it cannot hit back.\n"
     .string "This condition lasts a set amount of turns.\0"
     .align 2, 0
 
 sUnknown_811030C:
     .string "If the Pokémon takes damage that would\n"
-    .string "usually cause it to faint~2c it will hold on\n"
-    .string "with just #c61HP#r.\n"
+    .string "usually cause it to faint{COMMA} it will hold on\n"
+    .string "with just {COLOR_2 YELLOW}1HP{END_COLOR_TEXT_2}.\n"
     .string "This effect lasts a set amount of turns.\0"
     .align 2, 0
 
@@ -2240,7 +2240,7 @@ sUnknown_81103A0:
     .string "The Pokémon bounces back the power of\n"
     .string "any Special Attack used by a foe directly\n"
     .string "around it. If the Pokémon faints from\n"
-    .string "the Special Attack~2c it can~27t strike back.\n"
+    .string "the Special Attack{COMMA} it can{APOSTROPHE}t strike back.\n"
     .string "This condition lasts a set amount of turns.\0"
     .align 2, 0
 
@@ -2248,12 +2248,12 @@ sUnknown_8110470:
     .string "The Pokémon will take no damage from\n"
     .string "attacks and moves. It will also resist\n"
     .string "effects of moves. It may take damage\n"
-    .string "from rocks~2c explosions~2c etc.\n"
+    .string "from rocks{COMMA} explosions{COMMA} etc.\n"
     .string "This condition lasts a set amount of turns.\0"
     .align 2, 0
 
 sUnknown_8110530:
-    .string "The Pokémon regains #c6HP#r faster than usual.\n"
+    .string "The Pokémon regains {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} faster than usual.\n"
     .string "This effect lasts a set amount of turns.\0"
     .align 2, 0
 
@@ -2265,9 +2265,9 @@ sUnknown_8110588:
 
 sUnknown_81105F8:
     .string "The Pokémon counters any Physical Attack\n"
-    .string "move or regular attack~2c and inflicts the\n"
+    .string "move or regular attack{COMMA} and inflicts the\n"
     .string "same damage it took from the foe.\n"
-    .string "If the Pokémon faints~2c it cannot hit back.\n"
+    .string "If the Pokémon faints{COMMA} it cannot hit back.\n"
     .string "This condition lasts a set amount of turns.\0"
     .align 2, 0
 
@@ -2291,7 +2291,7 @@ sUnknown_8110794:
     .align 2, 0
 
 sUnknown_8110814:
-    .string "The Pokémon~27s Attack rises by one level\n"
+    .string "The Pokémon{APOSTROPHE}s Attack rises by one level\n"
     .string "each time it takes damage.\n"
     .string "This effect wears off in a set amount\n"
     .string "of turns.\0"
@@ -2304,7 +2304,7 @@ sUnknown_811088C:
     .align 2, 0
 
 sUnknown_81108FC:
-    .string "Using the move #c4Dig#r~2c \n"
+    .string "Using the move {COLOR_2 GREEN}Dig{END_COLOR_TEXT_2}{COMMA} \n"
     .string "the Pokémon has gone underground to\n"
     .string "prepare for its attack.\n"
     .string "It will strike on the next turn to inflict\n"
@@ -2312,7 +2312,7 @@ sUnknown_81108FC:
     .align 2, 0
 
 sUnknown_8110988:
-    .string "Using the move #c4Dive#r~2c \n"
+    .string "Using the move {COLOR_2 GREEN}Dive{END_COLOR_TEXT_2}{COMMA} \n"
     .string "the Pokémon has gone underwater to\n"
     .string "prepare for its attack.\n"
     .string "It will strike on the next turn to inflict\n"
@@ -2322,56 +2322,56 @@ sUnknown_8110988:
 sUnknown_8110A14:
     .string "The Pokémon has bounced high to ready\n"
     .string "its attack.\n"
-    .string "On the next turn~2c it will strike down\n"
+    .string "On the next turn{COMMA} it will strike down\n"
     .string "to inflict damage.\0"
     .align 2, 0
 
 sUnknown_8110A84:
     .string "The Pokémon is preparing to attack from\n"
     .string "high in the sky.\n"
-    .string "On the next turn~2c it will strike from\n"
+    .string "On the next turn{COMMA} it will strike from\n"
     .string "the sky to inflict damage.\0"
     .align 2, 0
 
 sUnknown_8110B00:
     .string "The Pokémon is preparing to use\n"
-    .string "the move #c4Skull Bash#r.\n"
-    .string "On the next turn~2c #c4Skull Bash#r will be\n"
+    .string "the move {COLOR_2 GREEN}Skull Bash{END_COLOR_TEXT_2}.\n"
+    .string "On the next turn{COMMA} {COLOR_2 GREEN}Skull Bash{END_COLOR_TEXT_2} will be\n"
     .string "unleashed.\0"
     .align 2, 0
 
 sUnknown_8110B74:
     .string "The Pokémon is preparing to use\n"
-    .string "the move #c4Focus Punch#r.\n"
-    .string "On the next turn~2c #c4Focus Punch#r will be\n"
+    .string "the move {COLOR_2 GREEN}Focus Punch{END_COLOR_TEXT_2}.\n"
+    .string "On the next turn{COMMA} {COLOR_2 GREEN}Focus Punch{END_COLOR_TEXT_2} will be\n"
     .string "unleashed.\0"
     .align 2, 0
 
 sUnknown_8110BE8:
     .string "The Pokémon is preparing to use\n"
-    .string "the move #c4Razor Wind#r.\n"
-    .string "On the next turn~2c #c4Razor Wind#r will be\n"
+    .string "the move {COLOR_2 GREEN}Razor Wind{END_COLOR_TEXT_2}.\n"
+    .string "On the next turn{COMMA} {COLOR_2 GREEN}Razor Wind{END_COLOR_TEXT_2} will be\n"
     .string "unleashed.\0"
     .align 2, 0
 
 sUnknown_8110C5C:
     .string "The Pokémon is preparing to use\n"
-    .string "the move #c4Sky Attack#r.\n"
-    .string "On the next turn~2c #c4Sky Attack#r will be\n"
+    .string "the move {COLOR_2 GREEN}Sky Attack{END_COLOR_TEXT_2}.\n"
+    .string "On the next turn{COMMA} {COLOR_2 GREEN}Sky Attack{END_COLOR_TEXT_2} will be\n"
     .string "unleashed.\0"
     .align 2, 0
 
 sUnknown_8110CD0:
     .string "The Pokémon is preparing to launch\n"
-    .string "the move #c4Solarbeam#r.\n"
-    .string "On the next turn~2c #c4Solarbeam#r will be\n"
+    .string "the move {COLOR_2 GREEN}Solarbeam{END_COLOR_TEXT_2}.\n"
+    .string "On the next turn{COMMA} {COLOR_2 GREEN}Solarbeam{END_COLOR_TEXT_2} will be\n"
     .string "unleashed.\0"
     .align 2, 0
 
 sUnknown_8110D44:
     .string "The Pokémon stops moving for several\n"
     .string "turns and takes hits from foes.\n"
-    .string "In the end~2c it will strike back to cause\n"
+    .string "In the end{COMMA} it will strike back to cause\n"
     .string "double the damage it took over that time.\0"
     .align 2, 0
 
@@ -2382,16 +2382,16 @@ sUnknown_8110DE0:
     .align 2, 0
 
 sUnknown_8110E50:
-    .string "When using moves or Wonder Orbs~2c the\n"
+    .string "When using moves or Wonder Orbs{COMMA} the\n"
     .string "Pokémon will only use offensive ones\n"
     .string "that inflict damage.\n"
     .string "This effect lasts a set amount of turns.\0"
     .align 2, 0
 
 sUnknown_8110EDC:
-    .string "The Pokémon is frightened~2c making it\n"
+    .string "The Pokémon is frightened{COMMA} making it\n"
     .string "launch attacks and moves completely\n"
-    .string "backwards. If an ally is behind it~2c the\n"
+    .string "backwards. If an ally is behind it{COMMA} the\n"
     .string "backward attacks and moves will hit.\n"
     .string "This condition lasts a set amount of turns.\0"
     .align 2, 0
@@ -2404,8 +2404,8 @@ sUnknown_8110FA4:
 
 sUnknown_811100C:
     .string "The Pokémon lays down roots in the\n"
-    .string "ground. It becomes immobilized~2c but\n"
-    .string "it regenerates #c6HP#r every several turns.\n"
+    .string "ground. It becomes immobilized{COMMA} but\n"
+    .string "it regenerates {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} every several turns.\n"
     .string "These effects last a set amount of turns.\0"
     .align 2, 0
 
@@ -2419,7 +2419,7 @@ sUnknown_81110AC:
 sUnknown_811113C:
     .string "The Pokémon wraps around the foe and\n"
     .string "inflicts damage every several turns.\n"
-    .string "During that time~2c the Pokémon is also\n"
+    .string "During that time{COMMA} the Pokémon is also\n"
     .string "incapable of doing anything else.\n"
     .string "These effects last a set amount of turns.\0"
     .align 2, 0
@@ -2437,7 +2437,7 @@ sUnknown_8111270:
 
 sUnknown_81112BC:
     .string "The Pokémon becomes frozen solid.\n"
-    .string "While frozen~2c it will not take damage\n"
+    .string "While frozen{COMMA} it will not take damage\n"
     .string "from attacks and almost all moves.\n"
     .string "Fire-type moves can thaw out the Pokémon\n"
     .string "and may inflict damage.\n"
@@ -2447,9 +2447,9 @@ sUnknown_81112BC:
 sUnknown_8111398:
     .string "The Pokémon is on the verge of collapse\n"
     .string "from hunger. Every action results in a\n"
-    .string "loss of #c6HP#r.\n"
+    .string "loss of {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\n"
     .string "This condition will persist until the\n"
-    .string "Pokémon~27s #c6Belly#r is filled.\0"
+    .string "Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} is filled.\0"
     .align 2, 0
 
 sUnknown_8111440:
@@ -2458,10 +2458,10 @@ sUnknown_8111440:
     .align 2, 0
 
 sUnknown_8111498:
-    .string "The Pokémon~27s #c6Movement Speed#r and\n"
-    .string "#c6attack frequency#r are reduced.\n"
+    .string "The Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} and\n"
+    .string "{COLOR_2 YELLOW}attack frequency{END_COLOR_TEXT_2} are reduced.\n"
     .string "Attacks and moves become unusable.\n"
-    .string "Wonder Orbs also won~27t work~2c but other\n"
+    .string "Wonder Orbs also won{APOSTROPHE}t work{COMMA} but other\n"
     .string "items will.\n"
     .string "Its effects last a set amount of turns.\0"
     .align 2, 0
@@ -2469,41 +2469,41 @@ sUnknown_8111498:
 sUnknown_8111568:
     .string "The Pokémon takes damage every\n"
     .string "two turns. It is also prevented from \n"
-    .string "regenerating #c6HP#r. This condition does not\n"
+    .string "regenerating {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}. This condition does not\n"
     .string "disappear over turns.\n"
     .string "Heal it quickly by using certain moves or\n"
-    .string "items~2c or by going to the next floor.\n"
+    .string "items{COMMA} or by going to the next floor.\n"
     .string "\0"
     .align 2, 0
 
 sUnknown_8111644:
     .string "The Pokémon takes damage every ten\n"
     .string "turns. It is also prevented from \n"
-    .string "regenerating #c6HP#r.\n"
+    .string "regenerating {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\n"
     .string "Poison does not disappear over turns.\n"
     .string "Heal it quickly by using certain moves or\n"
-    .string "items~2c or by going to the next floor.\0"
+    .string "items{COMMA} or by going to the next floor.\0"
     .align 2, 0
 
 sUnknown_8111718:
     .string "The Pokémon takes damage every few\n"
     .string "turns from its burn.\n"
-    .string "A burn can be healed by going into water~2c\n"
-    .string "using certain moves or items~2c or by\n"
+    .string "A burn can be healed by going into water{COMMA}\n"
+    .string "using certain moves or items{COMMA} or by\n"
     .string "going to the next floor.\0"
     .align 2, 0
 
 sUnknown_81117BC:
-    .string "The Pokémon~27s #c6HP#r is low from taking\n"
+    .string "The Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} is low from taking\n"
     .string "damage. It is in danger.\n"
-    .string "Do something to restore #c6HP#r!\0"
+    .string "Do something to restore {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}!\0"
     .align 2, 0
 
 sUnknown_8111824:
     .string "The Pokémon falls asleep and becomes\n"
     .string "incapable of any action.\n"
-    .string "Upon awakening~2c the Pokémon fully\n"
-    .string "regains #c6HP#r and heals from any\n"
+    .string "Upon awakening{COMMA} the Pokémon fully\n"
+    .string "regains {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} and heals from any\n"
     .string "status problems.\0"
     .align 2, 0
 
@@ -2633,7 +2633,7 @@ gUnknown_811383C: @ 811383C
 
         .global PlaceText
         PlaceText:
-        .string "#+Place: {ARG_POKEMON_0}\0"
+        .string "{CENTER_ALIGN}Place: {ARG_POKEMON_0}\0"
         .align 2,0
 
 	.global gUnknown_8113850
@@ -3272,12 +3272,12 @@ gUnknown_8116148: @ 8116148
 
 	.global gInvalidityText
 gInvalidityText: @ 811615C
-        .string "#CWinvalidity{END_COLOR_TEXT_1}\0"
+        .string "{COLOR_1 UNKNOWN_COLOR}invalidity{END_COLOR_TEXT_1}\0"
         .align 2,0
 
 	.global gUndefineText
 gUndefineText: @ 811616C
-        .string "#CWundefine{END_COLOR_TEXT_1}\0"
+        .string "{COLOR_1 UNKNOWN_COLOR}undefine{END_COLOR_TEXT_1}\0"
         .align 2,0
 
 	.global gUnknown_811617C
@@ -3476,14 +3476,14 @@ gUnknown_81163E4: @ 81163E4
 
 	.global gUnknown_81163F0
 gUnknown_81163F0: @ 81163F0
-        .string "#+However{COMMA} $n0{APOSTROPHE}s team\n"
-        .string "#+had too much money already...\0"
+        .string "{CENTER_ALIGN}However{COMMA} $n0{APOSTROPHE}s team\n"
+        .string "{CENTER_ALIGN}had too much money already...\0"
         .align 2,0
 
 	.global gUnknown_811642C
 gUnknown_811642C: @ 811642C
-        .string "#+However{COMMA} $n0{APOSTROPHE}s team\n"
-        .string "#+had too many items already...\0"
+        .string "{CENTER_ALIGN}However{COMMA} $n0{APOSTROPHE}s team\n"
+        .string "{CENTER_ALIGN}had too many items already...\0"
         .align 2,0
         .string "pksdir0\0"
         .align 2,0
@@ -3697,8 +3697,8 @@ gUnknown_81167E8: @ 81167E8
 
 	.global gUnknown_81167EC
 gUnknown_81167EC: @ 81167EC
-        .string "#+The rescue rank went up from\n"
-        .string "#+{ARG_MOVE_ITEM_0} to {ARG_MOVE_ITEM_1}!\0"
+        .string "{CENTER_ALIGN}The rescue rank went up from\n"
+        .string "{CENTER_ALIGN}{ARG_MOVE_ITEM_0} to {ARG_MOVE_ITEM_1}!\0"
         .align 2,0
 
 	.global gUnknown_811681C
@@ -3783,7 +3783,7 @@ gUnknown_8117000: @ 8117000
         .4byte 0x81170ac
         .4byte 0x811709c
 
-        .string "#CWinvalidity{END_COLOR_TEXT_1}\0"
+        .string "{COLOR_1 UNKNOWN_COLOR}invalidity{END_COLOR_TEXT_1}\0"
         .align 2,0
         .string "{COLOR_1 YELLOW_3}scene{END_COLOR_TEXT_1}\0"
         .align 2,0
@@ -4347,7 +4347,7 @@ gUnknown_8118250: @ 8118250
 
 	.global gGroundLives_InvalidityText
 gGroundLives_InvalidityText: @ 811825C
-        .string "#CWinvalidity{END_COLOR_TEXT_1}\0"
+        .string "{COLOR_1 UNKNOWN_COLOR}invalidity{END_COLOR_TEXT_1}\0"
         .align 2,0
 
         .global GroundLives_ActionText
diff --git a/data/friend_area.inc b/data/friend_area.inc
index eba3b8d..6464510 100644
--- a/data/friend_area.inc
+++ b/data/friend_area.inc
@@ -49,28 +49,28 @@ gUnknown_80DD1A8: @ 80DD1A8
 
 	.global gUnknown_80DD1C8
 gUnknown_80DD1C8: @ 80DD1C8
-	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n"
-	.string "#+handed over. \0"
+	.string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n"
+	.string "{CENTER_ALIGN}handed over. \0"
 	.align 2,0
 
 	.global gUnknown_80DD1EC
 gUnknown_80DD1EC: @ 80DD1EC
-	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n"
-	.string "#+handed over.#P"
-	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
-	.string "#+returned to the Toolbox.\0"
+	.string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n"
+	.string "{CENTER_ALIGN}handed over.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
+	.string "{CENTER_ALIGN}returned to the Toolbox.\0"
 	.align 2,0
 
 	.global gUnknown_80DD240
 gUnknown_80DD240: @ 80DD240
-	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
-	.string "#+returned to the Toolbox.\0"
+	.string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
+	.string "{CENTER_ALIGN}returned to the Toolbox.\0"
 	.align 2,0
 
 	.global gUnknown_80DD270
 gUnknown_80DD270: @ 80DD270
-        .string "#+{ARG_POKEMON_1} left the team to remain\n"
-        .string "#+on standby in the Friend Area.\0"
+        .string "{CENTER_ALIGN}{ARG_POKEMON_1} left the team to remain\n"
+        .string "{CENTER_ALIGN}on standby in the Friend Area.\0"
         .align 2,0
 
 	.global gUnknown_80DD2B0
diff --git a/data/friend_area_dialogue.s b/data/friend_area_dialogue.s
index a5c557f..74f523b 100644
--- a/data/friend_area_dialogue.s
+++ b/data/friend_area_dialogue.s
@@ -24,98 +24,98 @@ gFriendAreaDialogue: @ 813237C
 
     .global FriendAreaSleepyEnergy
     FriendAreaSleepyEnergy:
-    .string "#+It appears to be a little sleepy{COMMA}\n"
-    .string "#+but it{APOSTROPHE}s still full of energy.\0"
+    .string "{CENTER_ALIGN}It appears to be a little sleepy{COMMA}\n"
+    .string "{CENTER_ALIGN}but it{APOSTROPHE}s still full of energy.\0"
     .align 2,0
 
     .global FriendAreaGummi
     FriendAreaGummi:
-    .string "#+It may want a Gummi.\0"
+    .string "{CENTER_ALIGN}It may want a Gummi.\0"
     .align 2,0
 
     .global FriendAreaAnxious
     FriendAreaAnxious:
-    .string "#+It appears to be very anxious\n"
-    .string "#+to go on an adventure.\0"
+    .string "{CENTER_ALIGN}It appears to be very anxious\n"
+    .string "{CENTER_ALIGN}to go on an adventure.\0"
     .align 2,0
 
     .global FriendAreaPensive
     FriendAreaPensive:
-    .string "#+It looked pensive for a moment{COMMA}\n"
-    .string "#+but it{APOSTROPHE}s grinning widely again.\0"
+    .string "{CENTER_ALIGN}It looked pensive for a moment{COMMA}\n"
+    .string "{CENTER_ALIGN}but it{APOSTROPHE}s grinning widely again.\0"
     .align 2,0
 
     .global FriendAreaGrin
     FriendAreaGrin:
-    .string "#+It{APOSTROPHE}s looking this way with a grin.\0"
+    .string "{CENTER_ALIGN}It{APOSTROPHE}s looking this way with a grin.\0"
     .align 2,0
 
     .global FriendAreaEager
     FriendAreaEager:
-    .string "#+It appears very eager\n"
-    .string "#+to go to a dungeon.\0"
+    .string "{CENTER_ALIGN}It appears very eager\n"
+    .string "{CENTER_ALIGN}to go to a dungeon.\0"
     .align 2,0
 
     .global FriendAreaWorried
     FriendAreaWorried:
-    .string "#+It appeared to have been worried{COMMA}\n"
-    .string "#+but seems to have solved it.\0"
+    .string "{CENTER_ALIGN}It appeared to have been worried{COMMA}\n"
+    .string "{CENTER_ALIGN}but seems to have solved it.\0"
     .align 2,0
 
     .global FriendAreaDeep
     FriendAreaDeep:
-    .string "#+It suddenly appears to be deep in thought.\0"
+    .string "{CENTER_ALIGN}It suddenly appears to be deep in thought.\0"
     .align 2,0
 
     .global FriendAreaFidge
     FriendAreaFidge:
-    .string "#+It suddenly turned fidgety.\0"
+    .string "{CENTER_ALIGN}It suddenly turned fidgety.\0"
     .align 2,0
 
     .global FriendAreaMood
     FriendAreaMood:
-    .string "#+Its mood appears to have changed.\0"
+    .string "{CENTER_ALIGN}Its mood appears to have changed.\0"
     .align 2,0
 
     .global FriendAreaTense
     FriendAreaTense:
-    .string "#+It appears to be a little tense.\0"
+    .string "{CENTER_ALIGN}It appears to be a little tense.\0"
     .align 2,0
 
     .global FriendAreaRelax
     FriendAreaRelax:
-    .string "#+It is relaxing at its favorite spot.\0"
+    .string "{CENTER_ALIGN}It is relaxing at its favorite spot.\0"
     .align 2,0
 
     .global FriendAreaHappy
     FriendAreaHappy:
-    .string "#+It is very happy!\0"
+    .string "{CENTER_ALIGN}It is very happy!\0"
     .align 2,0
 
     .global FriendAreaStraight
     FriendAreaStraight:
-    .string "#+It{APOSTROPHE}s trying to keep a straight face{COMMA}\n"
-    .string "#+but it can{APOSTROPHE}t stop laughing!\0"
+    .string "{CENTER_ALIGN}It{APOSTROPHE}s trying to keep a straight face{COMMA}\n"
+    .string "{CENTER_ALIGN}but it can{APOSTROPHE}t stop laughing!\0"
     .align 2,0
 
     .global FriendAreaGrinning
     FriendAreaGrinning:
-    .string "#+It is grinning happily.\0"
+    .string "{CENTER_ALIGN}It is grinning happily.\0"
     .align 2,0
 
     .global FriendAreaVeryHappy
     FriendAreaVeryHappy:
-    .string "#+It appears to be very happy!\0"
+    .string "{CENTER_ALIGN}It appears to be very happy!\0"
     .align 2,0
 
     .global FriendAreaLikesPlace
     FriendAreaLikesPlace:
-    .string "#+It appears to like this place a lot!\0"
+    .string "{CENTER_ALIGN}It appears to like this place a lot!\0"
     .align 2,0
 
     .global FriendAreaFullEnergy
     FriendAreaFullEnergy:
-    .string "#+It seems to be full of energy!\0"
+    .string "{CENTER_ALIGN}It seems to be full of energy!\0"
     .align 2,0
 
     .string "pksdir0\0"
diff --git a/data/personality_test.s b/data/personality_test.s
index c70e045..c7dc79e 100644
--- a/data/personality_test.s
+++ b/data/personality_test.s
@@ -232,7 +232,7 @@
 
     DocileQuest3Question:
     .string "A friend brought over something you{APOSTROPHE}d\n"
-    .string "forgotten.#W\n"
+    .string "forgotten.{WAIT_PRESS}\n"
     .string "How do you thank your friend?\0"
     .align 2,0
 
@@ -295,9 +295,9 @@
 
     BraveQuest1Question:
     .string "You{APOSTROPHE}re going bungee jumping for the first\n"
-    .string "time.#PSince it{APOSTROPHE}s scary{COMMA} you decide to test the\n"
-    .string "jump with a doll...#W\n"
-    .string "And the bungee cord snaps!#P"
+    .string "time.{EXTRA_MSG}Since it{APOSTROPHE}s scary{COMMA} you decide to test the\n"
+    .string "jump with a doll...{WAIT_PRESS}\n"
+    .string "And the bungee cord snaps!{EXTRA_MSG}"
     .string "Will you still try to make a jump anyway?\0"
     .align 2,0
 
@@ -367,10 +367,10 @@
     .4byte BraveQuest2BPoints
 
     BraveQuest2BQuestion:
-    .string "You valiantly fight the aliens...#W\n"
-    .string "But{COMMA} you are defeated...#PAn alien says to you...#P{QUOTE_START}YOU HAVE IMPRESSED US.\n"
-    .string "IT WAS A PLEASURE TO SEE.#PJOIN US{COMMA} AND TOGETHER WE SHALL\n"
-    .string "RULE THE WORLD.{QUOTE_END}#W\n"
+    .string "You valiantly fight the aliens...{WAIT_PRESS}\n"
+    .string "But{COMMA} you are defeated...{EXTRA_MSG}An alien says to you...{EXTRA_MSG}{QUOTE_START}YOU HAVE IMPRESSED US.\n"
+    .string "IT WAS A PLEASURE TO SEE.{EXTRA_MSG}JOIN US{COMMA} AND TOGETHER WE SHALL\n"
+    .string "RULE THE WORLD.{QUOTE_END}{WAIT_PRESS}\n"
     .string "What will you do?\0"
     .align 2,0
 
@@ -402,7 +402,7 @@
     .4byte BraveQuest3Points
 
     BraveQuest3Question:
-    .string "There is a scream from behind a door!#W\n"
+    .string "There is a scream from behind a door!{WAIT_PRESS}\n"
     .string "How will you react?\0"
     .align 2,0
 
@@ -449,7 +449,7 @@
 
     BraveQuest4Question:
     .string "A delinquent is hassling a girl on\n"
-    .string "a busy city street!#W\n"
+    .string "a busy city street!{WAIT_PRESS}\n"
     .string "What will you do?\0"
     .align 2,0
 
@@ -575,9 +575,9 @@
 
     JollyQuest4Question:
     .string "A foreign person has started up a\n"
-    .string "conversation with you.#P"
+    .string "conversation with you.{EXTRA_MSG}"
     .string "To be honest{COMMA} you don{APOSTROPHE}t have a clue what\n"
-    .string "this fellow is saying.#W\n"
+    .string "this fellow is saying.{WAIT_PRESS}\n"
     .string "How do you reply?\0"
     .align 2,0
 
@@ -905,7 +905,7 @@
     .global TimidQuest2Question
     TimidQuest2Question:
     .string "Grab any digit on your left hand with your\n"
-    .string "right hand.#W\n"
+    .string "right hand.{WAIT_PRESS}\n"
     .string "Which digit did you grab?\0"
     .align 2,0
 
@@ -948,7 +948,7 @@
     .global TimidQuest3Question
     TimidQuest3Question:
     .string "You are suddenly locked inside a\n"
-    .string "pitch-black room!#W\n"
+    .string "pitch-black room!{WAIT_PRESS}\n"
     .string "What do you do?\0"
     .align 2,0
 
@@ -1037,8 +1037,8 @@
 
     .global HastyQuest1Question
     HastyQuest1Question:
-    .string "You receive a gift!#W\n"
-    .string "But you don{APOSTROPHE}t know what{APOSTROPHE}s in it.#W\n"
+    .string "You receive a gift!{WAIT_PRESS}\n"
+    .string "But you don{APOSTROPHE}t know what{APOSTROPHE}s in it.{WAIT_PRESS}\n"
     .string "You{APOSTROPHE}re curious{COMMA} so what do you do?\0"
     .align 2,0
 
@@ -1083,7 +1083,7 @@
 
     .global HastyQuest2Question
     HastyQuest2Question:
-    .string "You win a lottery!#W\n"
+    .string "You win a lottery!{WAIT_PRESS}\n"
     .string "What do you do with the money?\0"
     .align 2,0
 
@@ -1791,7 +1791,7 @@
 
     .global QuirkyQuest3Question
     QuirkyQuest3Question:
-    .string "There is a person you like...#W\n"
+    .string "There is a person you like...{WAIT_PRESS}\n"
     .string "But there{APOSTROPHE}s no opportunity to get close.\n"
     .string "What do you do?\0"
     .align 2,0
diff --git a/data/pokemon_mail.s b/data/pokemon_mail.s
index 35ece2a..7d44db2 100644
--- a/data/pokemon_mail.s
+++ b/data/pokemon_mail.s
@@ -167,7 +167,7 @@ gPokemonMail: @ 80EBA18
 
     .global gMail_NewsText2
     gMail_NewsText2:
-    .string "#+{COLOR_1 CYAN}{ARG_POKEMON_0} Innocent! Part 2{END_COLOR_TEXT_1}\n"
+    .string "{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_POKEMON_0} Innocent! Part 2{END_COLOR_TEXT_1}\n"
     .string "{COLOR_1 GREEN}Quote from Charizard on the scene:{END_COLOR_TEXT_1}\n"
     .string "{QUOTE_START}That{APOSTROPHE}s what I thought right from\n"
     .string "the start{COMMA} hahaha!{QUOTE_END}\n"
@@ -184,7 +184,7 @@ gPokemonMail: @ 80EBA18
 
     .global gMail_NewsText1
     gMail_NewsText1:
-    .string "#+{COLOR_1 CYAN}{ARG_POKEMON_0} Innocent! Part 1{END_COLOR_TEXT_1}\n"
+    .string "{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_POKEMON_0} Innocent! Part 1{END_COLOR_TEXT_1}\n"
     .string "{ARG_POKEMON_1} met with Ninetales on {COLOR_1 RED}Mt. Freeze{END_COLOR_TEXT_1}.\n"
     .string "Ninetales testified that {ARG_POKEMON_0} was\n"
     .string "not the human that appeared in the legend.\n"
@@ -223,7 +223,7 @@ gPokemonMail: @ 80EBA18
     .string "Totodile\n"
     .string "{COLOR_1 GREEN}Bite{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Scary Face{END_COLOR_TEXT_1}\n"
     .string "Cyndaquil\n"
-    .string "{COLOR_1 GREEN}Flame Wheel{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Smokescreen{END_COLOR_TEXT_1}#P"
+    .string "{COLOR_1 GREEN}Flame Wheel{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Smokescreen{END_COLOR_TEXT_1}{EXTRA_MSG}"
     .string "Pikachu\n"
     .string "{COLOR_1 GREEN}Thunderbolt{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Double Team{END_COLOR_TEXT_1}\n"
     .string "Skitty\n"
@@ -242,7 +242,7 @@ gPokemonMail: @ 80EBA18
     .string "Bulbasaur\n"
     .string "{COLOR_1 GREEN}Razor Leaf{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Sleep Powder{END_COLOR_TEXT_1}\n"
     .string "Chikorita\n"
-    .string "{COLOR_1 GREEN}Body Slam{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Reflect{END_COLOR_TEXT_1}#P"
+    .string "{COLOR_1 GREEN}Body Slam{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Reflect{END_COLOR_TEXT_1}{EXTRA_MSG}"
     .string "Treecko\n"
     .string "{COLOR_1 GREEN}Screech{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Pound{END_COLOR_TEXT_1}\n"
     .string "Machop\n"
@@ -588,10 +588,10 @@ gPokemonMail: @ 80EBA18
     gMail_KeyText:
     .string "{CENTER_ALIGN COLOR_1 YELLOW}Head Out to the Desert Region!{END_COLOR_TEXT_1}\n"
     .string "If you{APOSTROPHE}ve been wondering what lies behind\n"
-    .string "the mysterious locked doors of the #CDSolar\n"
+    .string "the mysterious locked doors of the {COLOR_1 YELLOW_4}Solar\n"
     .string "Cave{END_COLOR_TEXT_1}{COMMA} there{APOSTROPHE}s been a breakthrough!\n"
     .string "Reports indicate the door keys are easily\n"
-    .string "found in the #CDDesert Region{END_COLOR_TEXT_1}. Explorers are\n"
+    .string "found in the {COLOR_1 YELLOW_4}Desert Region{END_COLOR_TEXT_1}. Explorers are\n"
     .string "advised to compose teams with Pokémon\n"
     .string "adapted to the desert environment.\0"
     .align 2,0
@@ -674,7 +674,7 @@ gPokemonMail: @ 80EBA18
     .string "At the Makuhita Dojo{COMMA} one can learn how\n"
     .string "Pokémon type matchups affect battles.\n"
     .string "It{APOSTROPHE}s because the dojo{APOSTROPHE}s training rooms are\n"
-    .string "divided by type. For example{COMMA} in the #CDFire\n"
+    .string "divided by type. For example{COMMA} in the {COLOR_1 YELLOW_4}Fire\n"
     .string "Maze{END_COLOR_TEXT_1}{COMMA} there are only Fire-type Pokémon.\n"
     .string "Try move types to see what works best!\0"
     .align 2,0
@@ -693,7 +693,7 @@ gPokemonMail: @ 80EBA18
     .string "use. Further studies are said to be under\n"
     .string "consideration by the authorities.\n"
     .string "In related news{COMMA} the cave is to be named\n"
-    .string "the #CDSolar Cave{END_COLOR_TEXT_1}.\0"
+    .string "the {COLOR_1 YELLOW_4}Solar Cave{END_COLOR_TEXT_1}.\0"
     .align 2,0
 
     .global gMail_MachineHeadline
@@ -830,7 +830,7 @@ gPokemonMail: @ 80EBA18
     .string "Pikachu\n"
     .string "{COLOR_1 GREEN}Thundershock{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}\n"
     .string "Squirtle\n"
-    .string "{COLOR_1 GREEN}Tail Whip{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Tackle{END_COLOR_TEXT_1}#PTotodile\n"
+    .string "{COLOR_1 GREEN}Tail Whip{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Tackle{END_COLOR_TEXT_1}{EXTRA_MSG}Totodile\n"
     .string "{COLOR_1 GREEN}Leer{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Scratch{END_COLOR_TEXT_1}\n"
     .string "Mudkip\n"
     .string "{COLOR_1 GREEN}Water Gun{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Mud-Slap{END_COLOR_TEXT_1}\n"
@@ -851,7 +851,7 @@ gPokemonMail: @ 80EBA18
     .string "Cyndaquil\n"
     .string "{COLOR_1 GREEN}Leer{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Tackle{END_COLOR_TEXT_1}\n"
     .string "Torchic\n"
-    .string "{COLOR_1 GREEN}Ember{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}#PEevee\n"
+    .string "{COLOR_1 GREEN}Ember{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}{EXTRA_MSG}Eevee\n"
     .string "{COLOR_1 GREEN}Tail Whip{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Tackle{END_COLOR_TEXT_1}\n"
     .string "Meowth\n"
     .string "{COLOR_1 GREEN}Scratch{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}\n"
@@ -872,7 +872,7 @@ gPokemonMail: @ 80EBA18
     .string "Bulbasaur\n"
     .string "{COLOR_1 GREEN}Vine Whip{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}\n"
     .string "Chikorita\n"
-    .string "{COLOR_1 GREEN}Razor Leaf{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}#PTreecko\n"
+    .string "{COLOR_1 GREEN}Razor Leaf{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}{EXTRA_MSG}Treecko\n"
     .string "{COLOR_1 GREEN}Leer{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Pound{END_COLOR_TEXT_1}\n"
     .string "Machop\n"
     .string "{COLOR_1 GREEN}Leer{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Low Kick{END_COLOR_TEXT_1}\n"
diff --git a/data/scripts/personality_test.inc b/data/scripts/personality_test.inc
index ca7c88e..e6de4a1 100644
--- a/data/scripts/personality_test.inc
+++ b/data/scripts/personality_test.inc
@@ -35,30 +35,30 @@
     endFuncAndScript
 
     InterviewBegin_826E108:
-    .string "#+OK...#W\n"
-    .string "#+Let the interview begin!\0"
+    .string "{CENTER_ALIGN}OK...{WAIT_PRESS}\n"
+    .string "{CENTER_ALIGN}Let the interview begin!\0"
     .align 2,0
 
     AreYouReady_826E130:
-    .string "#+Are you ready?\0"
+    .string "{CENTER_ALIGN}Are you ready?\0"
     .align 2,0
 
     AnswerSincerely_826E144:
-    .string "#+I want you to answer them sincerely.\0"
+    .string "{CENTER_ALIGN}I want you to answer them sincerely.\0"
     .align 2,0
 
     SeveralQuestions_826E16C:
-    .string "#+But before I can let you through{COMMA}\n"
-    .string "#+I have several questions for you.\0"
+    .string "{CENTER_ALIGN}But before I can let you through{COMMA}\n"
+    .string "{CENTER_ALIGN}I have several questions for you.\0"
     .align 2,0
 
     WorldOfPokemon_826E1B8:
-    .string "#+This is the portal that leads\n"
-    .string "#+to the world of Pokémon!\0"
+    .string "{CENTER_ALIGN}This is the portal that leads\n"
+    .string "{CENTER_ALIGN}to the world of Pokémon!\0"
     .align 2,0
 
     Welcome_826E1F4:
-    .string "#+Welcome!\0"
+    .string "{CENTER_ALIGN}Welcome!\0"
     .align 2,0
 
     .byte 0x90, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00
diff --git a/data/text/credits.inc b/data/text/credits.inc
index 7bcec19..0e6ea9f 100644
--- a/data/text/credits.inc
+++ b/data/text/credits.inc
@@ -7,7 +7,7 @@
 
         .global StaffCredits_80E4AD8
         StaffCredits_80E4AD8:
-        .string "#+"
+        .string "{CENTER_ALIGN}"
         .byte 0x82, 0xa0
         .string "STAFF CREDITS"
         .byte 0x82, 0xa2, 0x00
diff --git a/data/text/luminous_cave.inc b/data/text/luminous_cave.inc
index ad99469..d7136af 100644
--- a/data/text/luminous_cave.inc
+++ b/data/text/luminous_cave.inc
@@ -1,124 +1,124 @@
 gLuminousCaveSeekAwakening:: @ 80DCA34
-	.string "#+...#WA voice emanates from somewhere...#P"
-	.string "#+...Ye who seek awakening...#P"
-	.string "#+This is Luminous Cave.#W\n"
-	.string "#+Do ye seek a new evolution?\0"
+	.string "{CENTER_ALIGN}...{WAIT_PRESS}A voice emanates from somewhere...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}...Ye who seek awakening...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}This is Luminous Cave.{WAIT_PRESS}\n"
+	.string "{CENTER_ALIGN}Do ye seek a new evolution?\0"
 	.align 2, 0
 
 gLuminousCaveAskEvolution:: @ 80DCAB8
-	.string "#+Do ye seek evolution?\0"
+	.string "{CENTER_ALIGN}Do ye seek evolution?\0"
 	.align 2, 0
 
 gLuminousCaveEvolutionInfo:: @ 80DCAD0
-	.string "#+There are those among Pokémon\n"
-	.string "#+that can evolve.#P"
-	.string "#+Such Pokémon can evolve at this very\n"
-	.string "#+spot if they satisfy certain conditions.#P"
-	.string "#+Evolution brings about changes\n"
-	.string "#+in appearance and abilities.#P"
-	.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"
-	.string "#+Some become ready for evolution\n"
-	.string "#+merely by leveling up.#P"
-	.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{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"
+	.string "{CENTER_ALIGN}There are those among Pokémon\n"
+	.string "{CENTER_ALIGN}that can evolve.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Such Pokémon can evolve at this very\n"
+	.string "{CENTER_ALIGN}spot if they satisfy certain conditions.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Evolution brings about changes\n"
+	.string "{CENTER_ALIGN}in appearance and abilities.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Not only that{COMMA} some Pokémon even change\n"
+	.string "{CENTER_ALIGN}type and learn different moves.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}However...{WAIT_PRESS} The requirements for\n"
+	.string "{CENTER_ALIGN}evolution differ among Pokémon.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Some become ready for evolution\n"
+	.string "{CENTER_ALIGN}merely by leveling up.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Still others may need special items\n"
+	.string "{CENTER_ALIGN}to attain evolution.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye must also be aware of this:{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Once it has evolved{COMMA} a Pokémon\n"
+	.string "{CENTER_ALIGN}can never regain its previous form.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}That is why ye must think carefully\n"
+	.string "{CENTER_ALIGN}before committing to evolution.\0"
 	.align 2, 0
 
 gLuminousCaveYeShallReturn:: @ 80DCD5C
-	.string "#+Ye shall return if evolution\n"
-	.string "#+is what ye seek...\0"
+	.string "{CENTER_ALIGN}Ye shall return if evolution\n"
+	.string "{CENTER_ALIGN}is what ye seek...\0"
 	.align 2, 0
 
 gLuminousCaveGiveItem:: @ 80DCD90
-	.string "#+Will ye give an item for evolution?\0"
+	.string "{CENTER_ALIGN}Will ye give an item for evolution?\0"
 	.align 2, 0
 
 gLuminousCaveGiveAnotherItem:: @ 80DCDB8
-	.string "#+Will ye give yet another item?\0"
+	.string "{CENTER_ALIGN}Will ye give yet another item?\0"
 	.align 2, 0
 
 gLuminousCaveLackWhatIsNeeded:: @ 80DCDDC
-	.string "#+Alas{COMMA} ye seem to lack what is needed\n"
-	.string "#+for evolution.\0"
+	.string "{CENTER_ALIGN}Alas{COMMA} ye seem to lack what is needed\n"
+	.string "{CENTER_ALIGN}for evolution.\0"
 	.align 2, 0
 
 gLuminousCaveOnlyOneItem:: @ 80DCE18
-	.string "#+Ye seem to have but one item.\0"
+	.string "{CENTER_ALIGN}Ye seem to have but one item.\0"
 	.align 2, 0
 
 gLuminousCaveLetUsBegin:: @ 80DCE38
-	.string "#+...Ye who seek awakening...\n"
-	.string "#+Let us begin.\0"
+	.string "{CENTER_ALIGN}...Ye who seek awakening...\n"
+	.string "{CENTER_ALIGN}Let us begin.\0"
 	.align 2, 0
 
 gLuminousCaveChangedAppearance:: @ 80DCE68
-	.string "#+...#W$n0 is undergoing changes...#P"
-	.string "#+$n0{APOSTROPHE}s appearance changed...#P\0"
+	.string "{CENTER_ALIGN}...{WAIT_PRESS}$n0 is undergoing changes...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}$n0{APOSTROPHE}s appearance changed...{EXTRA_MSG}\0"
 	.align 2, 0
 
 gLuminousCaveEvolved:: @ 80DCEB0
-	.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"
+	.string "{CENTER_ALIGN}It evolved from {COLOR_1 GREEN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}\n"
+	.string "{CENTER_ALIGN}to {COLOR_1 YELLOW}{ARG_POKEMON_1}{END_COLOR_TEXT_1}!\0"
 	.align 2, 0
 
 gLuminousCaveComeAlone:: @ 80DCEDC
-	.string "#+...#P"
-	.string "#+One cannot evolve if one\n"
-	.string "#+is in the company of others.#P"
-	.string "#+Come alone if ye wish to evolve.\0"
+	.string "{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}One cannot evolve if one\n"
+	.string "{CENTER_ALIGN}is in the company of others.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Come alone if ye wish to evolve.\0"
 	.align 2, 0
 
 gLuminousCaveLackLevel:: @ 80DCF44
-	.string "#+...#P"
-	.string "#+Ye cannot evolve yet.#P"
-	.string "#+Ye have not high enough a level.\0"
+	.string "{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye cannot evolve yet.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye have not high enough a level.\0"
 	.align 2, 0
 
 gLuminousCaveCantEvolveAnymore:: @ 80DCF88
-	.string "#+...#P"
-	.string "#+Ye cannot evolve anymore.\0"
+	.string "{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye cannot evolve anymore.\0"
 	.align 2, 0
 
 gLuminousCaveLackFriendArea:: @ 80DCFAC
-	.string "#+...#P"
-	.string "#+Ye cannot evolve yet.#P"
-	.string "#+Ye need your Friend Area to evolve.\0"
+	.string "{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye cannot evolve yet.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye need your Friend Area to evolve.\0"
 	.align 2, 0
 
 gLuminousCaveLackRoom:: @ 80DCFF4
-	.string "#+...#P"
-	.string "#+Ye cannot evolve yet.#P"
-	.string "#+The Friend Area to which ye shall go\n"
-	.string "#+has no room for ye.\0"
+	.string "{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye cannot evolve yet.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}The Friend Area to which ye shall go\n"
+	.string "{CENTER_ALIGN}has no room for ye.\0"
 	.align 2, 0
 
 gLuminousCaveLackIQ:: @ 80DD054
-	.string "#+...#P"
-	.string "#+Ye cannot evolve yet.#P"
-	.string "#+Ye seem to lack the IQ to evolve.\0"
+	.string "{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye cannot evolve yet.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye seem to lack the IQ to evolve.\0"
 	.align 2, 0
 
 gLuminousCaveLackItem:: @ 80DD098
-	.string "#+#+...#P"
-	.string "#+Ye cannot evolve yet.#P"
-	.string "#+Ye seem to lack an item to evolve.\0"
+	.string "{CENTER_ALIGN}{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye cannot evolve yet.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye seem to lack an item to evolve.\0"
 	.align 2, 0
 
 gLuminousCaveCantEvolveYet:: @ 80DD0E0
-	.string "#+#+...#P"
-	.string "#+Ye cannot evolve yet. \0"
+	.string "{CENTER_ALIGN}{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye cannot evolve yet. \0"
 	.align 2, 0
 
 gLuminousCaveGiveName:: @ 80DD104
-	.string "#+Ye must give a name to\n"
-	.string "#+the evolved Pokémon. \0"
+	.string "{CENTER_ALIGN}Ye must give a name to\n"
+	.string "{CENTER_ALIGN}the evolved Pokémon. \0"
 	.align 2, 0
 
 	.string "pksdir0\0"
diff --git a/data/text/party_menu.inc b/data/text/party_menu.inc
index 7296f91..1afaaae 100644
--- a/data/text/party_menu.inc
+++ b/data/text/party_menu.inc
@@ -1,6 +1,6 @@
 gUnknown_80DD388:: @ 80DD388
 	.string "You have chosen to say farewell\n"
-	.string "to this Pokémon.#P"
+	.string "to this Pokémon.{EXTRA_MSG}"
 	.string "The Pokémon will leave its Friend Area.\n"
 	.string "It will no longer be available for\n"
 	.string "adventures. Is that OK?\0"
@@ -8,53 +8,53 @@ gUnknown_80DD388:: @ 80DD388
 
 gUnknown_80DD420:: @ 80DD420
 	.string "If you say farewell to this\n"
-	.string "Pokémon{COMMA} it will be gone forever.#P"
+	.string "Pokémon{COMMA} it will be gone forever.{EXTRA_MSG}"
 	.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 "#+{ARG_POKEMON_1} joined the\n"
-	.string "#+rescue team for adventures!\0"
+	.string "{CENTER_ALIGN}{ARG_POKEMON_1} joined the\n"
+	.string "{CENTER_ALIGN}rescue team for adventures!\0"
 	.align 2, 0
 
 gUnknown_80DD4F4:: @ 80DD4F4
-	.string "#+{ARG_POKEMON_1} left the team to remain\n"
-	.string "#+on standby in the Friend Area.\0"
+	.string "{CENTER_ALIGN}{ARG_POKEMON_1} left the team to remain\n"
+	.string "{CENTER_ALIGN}on standby in the Friend Area.\0"
 	.align 2, 0
 
 gUnknown_80DD534:: @ 80DD534
-	.string "#+{ARG_POKEMON_1} became the leader\n"
-	.string "#+of the rescue team.\0"
+	.string "{CENTER_ALIGN}{ARG_POKEMON_1} became the leader\n"
+	.string "{CENTER_ALIGN}of the rescue team.\0"
 	.align 2, 0
 
 gUnknown_80DD564:: @ 80DD564
-	.string "#+{ARG_POKEMON_1} left\n"
-	.string "#+the Friend Area.\n"
-	.string "#+Bye-bye{COMMA} {ARG_POKEMON_1}!\0"
+	.string "{CENTER_ALIGN}{ARG_POKEMON_1} left\n"
+	.string "{CENTER_ALIGN}the Friend Area.\n"
+	.string "{CENTER_ALIGN}Bye-bye{COMMA} {ARG_POKEMON_1}!\0"
 	.align 2,0
 
 gUnknown_80DD594:: @ 80DD594
-	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n"
-	.string "#+handed over. \0"
+	.string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n"
+	.string "{CENTER_ALIGN}handed over. \0"
 	.align 2, 0
 
 gUnknown_80DD5B8:: @ 80DD5B8
-	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n"
-	.string "#+handed over.#P"
-	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
-	.string "#+returned to the Toolbox.\0"
+	.string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n"
+	.string "{CENTER_ALIGN}handed over.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
+	.string "{CENTER_ALIGN}returned to the Toolbox.\0"
 	.align 2, 0
 
 gUnknown_80DD60C:: @ 80DD60C
-	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
-	.string "#+returned to the Toolbox.\0"
+	.string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
+	.string "{CENTER_ALIGN}returned to the Toolbox.\0"
 	.align 2, 0
 
 gUnknown_80DD63C:: @ 80DD63C
-	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
-	.string "#+sent to storage.\0"
+	.string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
+	.string "{CENTER_ALIGN}sent to storage.\0"
 	.align 2, 0
 
 gPartyMenuStandBy:: @ 80DD664
diff --git a/data/text/save.inc b/data/text/save.inc
index c508992..c0c17aa 100644
--- a/data/text/save.inc
+++ b/data/text/save.inc
@@ -1,46 +1,46 @@
 gSaveTextQuicksaving:: @ 80B6A34
-	.string "#+Quicksaving your adventure...\n"
-	.string "#+Please don{APOSTROPHE}t turn off the power.\0"
+	.string "{CENTER_ALIGN}Quicksaving your adventure...\n"
+	.string "{CENTER_ALIGN}Please don{APOSTROPHE}t turn off the power.\0"
 	.align 2, 0
 
 gSaveTextYourAdventureHasBeenSaved:: @ 80B6A7C
-	.string "#+Your adventure has been saved.\0"
+	.string "{CENTER_ALIGN}Your adventure has been saved.\0"
 	.align 2, 0
 
 gSaveTextYourAdventureHasBeenSavedLong:: @ 80B6AA0
-	.string "#+Your adventure has been saved.\n"
-	.string "#+When you are in a dungeon{COMMA} quicksave\n"
-	.string "#+your progress before ending the game.\0"
+	.string "{CENTER_ALIGN}Your adventure has been saved.\n"
+	.string "{CENTER_ALIGN}When you are in a dungeon{COMMA} quicksave\n"
+	.string "{CENTER_ALIGN}your progress before ending the game.\0"
 	.align 2, 0
 
 gSaveTextTheDataCouldNotBeWritten:: @ 80B6B14
-	.string "#+The data could not be written.\n"
-	.string "#+Please turn off the power and remove\n"
-	.string "#+and reinsert the DS Card.\0"
+	.string "{CENTER_ALIGN}The data could not be written.\n"
+	.string "{CENTER_ALIGN}Please turn off the power and remove\n"
+	.string "{CENTER_ALIGN}and reinsert the DS Card.\0"
 	.align 2, 0
 
 gSaveTextFailed:: @ 80B6B78
-	.string "#+Save failed.\0"
+	.string "{CENTER_ALIGN}Save failed.\0"
 	.align 2, 0
 
 gSaveTextError:: @ 80B6B88
-	.string "#+Error reading data.\n"
-	.string "#+Please turn off the power and reinsert\n"
-	.string "#+the DS Game Card.\0"
+	.string "{CENTER_ALIGN}Error reading data.\n"
+	.string "{CENTER_ALIGN}Please turn off the power and reinsert\n"
+	.string "{CENTER_ALIGN}the DS Game Card.\0"
 	.align 2, 0
 
 gSaveTextCantResume:: @ 80B6BDC
-	.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{COMMA} save in your\n"
-	.string "#+team base{COMMA} or quicksave in a dungeon.\0"
+	.string "{CENTER_ALIGN}Your data was not properly saved{COMMA}\n"
+	.string "{CENTER_ALIGN}so your game cannot be resumed\n"
+	.string "{CENTER_ALIGN}from your last spot.{EXTRA_MSG}{CENTER_ALIGN}Your last outing is considered a defeat.\n"
+	.string "{CENTER_ALIGN}Before shutting down{COMMA} save in your\n"
+	.string "{CENTER_ALIGN}team base{COMMA} or quicksave in a dungeon.\0"
 	.align 2, 0
 
 gSaveTextMayNotResume:: @ 80B6CB8
-	.string "#+You may not resume your dungeon\n"
-	.string "#+adventure using this saved data.\n"
-	.string "#+Your last outing is considered a defeat.\0"
+	.string "{CENTER_ALIGN}You may not resume your dungeon\n"
+	.string "{CENTER_ALIGN}adventure using this saved data.\n"
+	.string "{CENTER_ALIGN}Your last outing is considered a defeat.\0"
 	.align 2, 0
 
 	.string "pksdir0\0"
diff --git a/src/code_801AFA4.c b/src/code_801AFA4.c
index 117b34b..e12bd0d 100644
--- a/src/code_801AFA4.c
+++ b/src/code_801AFA4.c
@@ -125,8 +125,8 @@ void sub_801B080(void)
     {
         case 0:
             sub_801B178();
-            // #+Who will learn the move
-            // #+{COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}?
+            // {CENTER_ALIGN}Who will learn the move
+            // {CENTER_ALIGN}{COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}?
             sub_8014248(&gUnknown_80DB9BC, 0, gUnknown_203B22C->unk60, gUnknown_203B22C->menuItems, 0, 4, 0, 0, 0x20);
             break;
         case 1:
@@ -140,13 +140,13 @@ void sub_801B080(void)
                 gTeamInventory_203B460->teamItems[gUnknown_203B22C->teamItemIndex].itemIndex = ITEM_ID_USED_TM;
             }
             PlaySound(0x9C << 1);
-            // #+CM{ARG_POKEMON_8}{END_COLOR_TEXT_1} learned
-            // #+the move {COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}!
+            // {CENTER_ALIGN}CM{ARG_POKEMON_8}{END_COLOR_TEXT_1} learned
+            // {CENTER_ALIGN}the move {COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}!
             sub_80141B4(&gUnknown_80DB9E4, 0, 0, 0x121);
             break;
         case 3:
-            // #+No one in the current team
-            // #+can learn this move.
+            // {CENTER_ALIGN}No one in the current team
+            // {CENTER_ALIGN}can learn this move.
             sub_80141B4(&gUnknown_80DBA0C, 0, 0, 0x121);
             break;
         default:
diff --git a/src/pokemon_mid.c b/src/pokemon_mid.c
index 1721e1d..3f47b0a 100644
--- a/src/pokemon_mid.c
+++ b/src/pokemon_mid.c
@@ -278,7 +278,7 @@ void PrintColoredPokeNameToBuffer(u8 *buffer, struct PokemonStruct *pokemon, s32
   if (colorNum == COLOR_WHITE) {
     colorNum = COLOR_CYAN;
   }
-  ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // #c%c%s{END_COLOR_TEXT_2}
+  ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // {COLOR_2}%c%s{END_COLOR_TEXT_2}
 }
 
 void sub_808D9DC(u8 *buffer, u8 *param_2, s32 colorNum)
@@ -289,7 +289,7 @@ void sub_808D9DC(u8 *buffer, u8 *param_2, s32 colorNum)
   if (colorNum == COLOR_WHITE) {
     colorNum = COLOR_YELLOW;
   }
-  ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // #c%c%s{END_COLOR_TEXT_2}
+  ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // {COLOR_2}%c%s{END_COLOR_TEXT_2}
 }
 
 void sub_808DA0C(u8 *buffer, u8 *param_2)
diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c
index cfd83c6..22e1467 100644
--- a/src/thank_you_wonder_mail.c
+++ b/src/thank_you_wonder_mail.c
@@ -226,10 +226,10 @@ ALIGNED(4) const u8 gUnknown_80DF208[]= _(
 
 ALIGNED(4) const u8 gUnknown_80DF250[]= _(
 	": This is the counter for\n"
-	"{COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.#P"
+	"{COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}"
 	": Oh{COMMA} hi{COMMA} {COLOR_1 YELLOW_5}%s{END_COLOR_TEXT_1}.\n"
 	"I{APOSTROPHE}ve been waiting for you. You wanted me\n"
-	"to process a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?#P"
+	"to process a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?{EXTRA_MSG}"
 	": Let me get on it right away.");
 
 ALIGNED(4) const u8 gUnknown_80DF304[]= _(
@@ -245,11 +245,11 @@ ALIGNED(4) const u8 gUnknown_80DF380[]= _(
 	" OK. Please enter the\n"
 	"{COLOR_1 LIGHT_BLUE_2}Thank-You Mail password{END_COLOR_TEXT_1}.");
 
-ALIGNED(4) const u8 gUnknown_80DF3B4[]=
+ALIGNED(4) const u8 gUnknown_80DF3B4[]= _(
 	" Please give this password\n"
-	"to the friend that rescued your team.#P"
+	"to the friend that rescued your team.{EXTRA_MSG}"
 	" I also must save your\n"
-	"adventure.";
+	"adventure.");
 
 ALIGNED(4) const u8 gUnknown_80DF418[]= _(
 	" OK{COMMA} here is your\n"
@@ -261,7 +261,7 @@ ALIGNED(4) const u8 gUnknown_80DF44C[]=
 
 ALIGNED(4) const u8 gUnknown_80DF46C[]= _(
 	" There we go.\n"
-	"I{APOSTROPHE}m all done.#P"
+	"I{APOSTROPHE}m all done.{EXTRA_MSG}"
 	" Doesn{APOSTROPHE}t it feel great to\n"
 	"be appreciated for doing something good?\n"
 	"Please keep up your rescue work!");
@@ -272,9 +272,9 @@ ALIGNED(4) const u8 gUnknown_80DF4F4[]= _(
 	"mission.");
 
 ALIGNED(4) const u8 gUnknown_80DF544[]= _(
-	 "#+Communicating...\n"
-	 "#+Please wait with the power on.\n"
-	 "#+To cancel{COMMA} press {B_BUTTON}.");
+	 "{CENTER_ALIGN}Communicating...\n"
+	 "{CENTER_ALIGN}Please wait with the power on.\n"
+	 "{CENTER_ALIGN}To cancel{COMMA} press {B_BUTTON}.");
 
 ALIGNED(4) const u8 gUnknown_80DF594[]= _(
 	" There. I{APOSTROPHE}ve sent your\n"
@@ -316,7 +316,7 @@ ALIGNED(4) const u8 gUnknown_80DF77C[]= _(
 ALIGNED(4) const u8 gUnknown_80DF7D4[]= _(
 	" ...Oh?\n"
 	"You{APOSTROPHE}ve already attached a {COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}\n"
-	"to this mail.#P"
+	"to this mail.{EXTRA_MSG}"
 	" I{APOSTROPHE}m sorry{COMMA} but once an item\n"
 	"has been attached to mail{COMMA} it can{APOSTROPHE}t be\n"
 	"exchanged.");
diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c
index cf1f122..fe4fdbc 100644
--- a/src/wonder_mail_2.c
+++ b/src/wonder_mail_2.c
@@ -189,7 +189,7 @@ ALIGNED(4) const char gUnknown_80DF9F0[] = "????";
 ALIGNED(4) const char gUnknown_80DF9F8[] = _(
 	" Oh{COMMA} hello!\n"
 	"Your rescue mission went well{COMMA} didn{APOSTROPHE}t it?\n"
-	"I wouldn{APOSTROPHE}t expect any less{COMMA} {COLOR_1 LIGHT_BLUE_2}%s{END_COLOR_TEXT_1}!#P"
+	"I wouldn{APOSTROPHE}t expect any less{COMMA} {COLOR_1 LIGHT_BLUE_2}%s{END_COLOR_TEXT_1}!{EXTRA_MSG}"
 	" Well{COMMA} well!\n"
 	"Here is your reward from the Pokémon\n"
 	"Rescue Organization!");
@@ -197,14 +197,14 @@ ALIGNED(4) const char gUnknown_80DF9F8[] = _(
 ALIGNED(4) const char gUnknown_80DFAA8[] = _(
 	" I hope you will keep on\n"
 	"rescuing your friends in\n"
-	"dire straits.#P"
+	"dire straits.{EXTRA_MSG}"
 	" And now{COMMA} I must save\n"
 	"your adventure.");
 
 ALIGNED(4) const char gUnknown_80DFB14[] = _(
 	" Oh{COMMA} yes{COMMA} that{APOSTROPHE}s right.\n"
 	"Please don{APOSTROPHE}t forget to send an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}\n"
-	"to the friend you just rescued.#P"
+	"to the friend you just rescued.{EXTRA_MSG}"
 	" Please give me a shout if\n"
 	"you would like to send {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.");
 
@@ -779,7 +779,7 @@ void sub_802BCC4(void)
 
 u32 sub_802BD14(s32 param_1, struct UnkTextStruct2_sub *param_2, u32 param_3)
 {
-  
+
   if (HasNoMailinMailbox()) {
       return 0;
   }
diff --git a/src/wonder_mail_main_menu.c b/src/wonder_mail_main_menu.c
index 9566614..ed6ebbe 100644
--- a/src/wonder_mail_main_menu.c
+++ b/src/wonder_mail_main_menu.c
@@ -113,9 +113,9 @@ ALIGNED(4) const char gUnknown_80E7BEC[] = _("Connect a {COLOR_1 LIGHT_BLUE_2}Ga
                                              "When you and your friend are ready{COMMA}\n"
                                              "you may communicate. ");
 
-ALIGNED(4) const char gUnknown_80E7C48[] = _("#+In communication...\n"
-                                             "#+Please wait with the power on.\n"
-                                             "#+To cancel{COMMA} press {B_BUTTON}.");
+ALIGNED(4) const char gUnknown_80E7C48[] = _("{CENTER_ALIGN}In communication...\n"
+                                             "{CENTER_ALIGN}Please wait with the power on.\n"
+                                             "{CENTER_ALIGN}To cancel{COMMA} press {B_BUTTON}.");
 
 ALIGNED(4) const char gUnknown_80E7C98[] = _("Please enter the\n"
                                              "{COLOR_1 LIGHT_BLUE_2}Wonder Mail password{END_COLOR_TEXT_1}.");