Swapped out more text macros

5 files changed, 25 insertions, 25 deletions

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}.");