Expanded charmap usage (#76)

* Added item icons/Hiragana to charmap

* Use color formatting charmap macros

* Removed redundant text formatting macros

9 files changed, 110 insertions, 110 deletions

diff --git a/src/code_8012A18_1.c b/src/code_8012A18_1.c
index 15cac81..d5b6be7 100644
--- a/src/code_8012A18_1.c
+++ b/src/code_8012A18_1.c
@@ -69,7 +69,7 @@ s32 sub_8015FEC(u8 *buffer, s32 size)
   s32 currLength;
   s32 iVar4;
   u8 *bufferPtr;
-  
+
   iVar4 = 0;
   currLength = 0;
 
@@ -162,7 +162,7 @@ void nullsub_36(void)
 }
 
 void sub_8016110(void)
-{ 
+{
   switch(gUnknown_203B200->state)
   {
     case 0:
@@ -176,7 +176,7 @@ void sub_8016110(void)
         else {
             sub_80922B4(gAvailablePokemonNames,gUnknown_203B200->pokeName, POKEMON_NAME_LENGTH);
         }
-        // Is the name #C5$m0#R OK?
+        // Is the name {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1} OK?
         sub_8014248(&gUnknown_80DB688,0,3,gUnknown_203B200->menus,0,4,0,0,0x20);
         break;
 
@@ -194,7 +194,7 @@ void sub_8016110(void)
 }
 
 void CreateConfirmNameMenu(void)
-{ 
+{
   gUnknown_203B200->menus[0].text = gUnknown_80D4920; // Yes
   gUnknown_203B200->menus[0].menuAction = MENU_ACTION_YES;
   gUnknown_203B200->menus[1].text = gUnknown_80D4928; // No
@@ -207,7 +207,7 @@ void sub_80161F8(void)
 {
   s32 iVar2;
   s32 maxLength;
-  
+
   if (sub_80154F0() == 3) {
     sub_80155F0();
     if (IsNameEmpty()) {
diff --git a/src/code_801AFA4.c b/src/code_801AFA4.c
index 14b9e99..e60fec1 100644
--- a/src/code_801AFA4.c
+++ b/src/code_801AFA4.c
@@ -126,7 +126,7 @@ void sub_801B080(void)
         case 0:
             sub_801B178();
             // #+Who will learn the move
-            // #+#C5$m7#R?
+            // #+{COLOR_1 CYAN}$m7{END_COLOR_TEXT_1}?
             sub_8014248(&gUnknown_80DB9BC, 0, gUnknown_203B22C->unk60, gUnknown_203B22C->menuItems, 0, 4, 0, 0, 0x20);
             break;
         case 1:
@@ -140,8 +140,8 @@ void sub_801B080(void)
                 gTeamInventory_203B460->teamItems[gUnknown_203B22C->teamItemIndex].itemIndex = ITEM_ID_USED_TM;
             }
             PlaySound(0x9C << 1);
-            // #+CM$m8#R learned
-            // #+the move #C5$m7#R!
+            // #+CM$m8{END_COLOR_TEXT_1} learned
+            // #+the move {COLOR_1 CYAN}$m7{END_COLOR_TEXT_1}!
             sub_80141B4(&gUnknown_80DB9E4, 0, 0, 0x121);
             break;
         case 3:
diff --git a/src/code_801D760.c b/src/code_801D760.c
index f19925f..bdab0f2 100644
--- a/src/code_801D760.c
+++ b/src/code_801D760.c
@@ -99,7 +99,7 @@ struct unk_203B250 *gUnknown_203B250;
 void sub_801D680(void)
 {
   int local_c;
-  
+
   local_c = 0;
   if ((sub_8012FD8(&gUnknown_203B250->unk18) == '\0') && (sub_8013114(&gUnknown_203B250->unk18,&local_c), local_c != 1)) {
     gUnknown_203B250->unk14 = local_c;
@@ -307,7 +307,7 @@ void sub_801D894(void)
   u32 *preload_string;
   u32 *r5; // R5
   u8 buffer [96]; // sp +4
-  
+
   if (gUnknown_203B250->currFriendAreaLocation == NONE) {
     location = sub_8098FB4();
   }
@@ -327,7 +327,7 @@ void sub_801D894(void)
   LoadTeamRankBadge(2, 8, 6);
 
 // Have to load before TeamRank funcs
-  r5 = &gUnknown_80DBF3C; // %s #C5%d#R Pts.
+  r5 = &gUnknown_80DBF3C; // %s {COLOR_1 CYAN}%d{END_COLOR_TEXT_1} Pts.
   rank = GetRescueTeamRank();
   ExpandPlaceholdersBuffer(buffer, r5, GetTeamRankString(rank), GetTeamRankPts());
   xxx_call_draw_string(32, 4, buffer, 2, 0);
@@ -374,7 +374,7 @@ u32 sub_801D9E4(void)
 }
 
 void sub_801DA58(s16 param_0)
-{  
+{
     s32 cast;
     cast = param_0;
     sub_8013878(gUnknown_203B258, cast);
diff --git a/src/code_8090208.c b/src/code_8090208.c
index b64b551..3a60640 100644
--- a/src/code_8090208.c
+++ b/src/code_8090208.c
@@ -16,7 +16,7 @@ struct unkDungeonStruct
 
 void sub_8090208(u8 *buffer, struct unkDungeonStruct *dungeonLocation)
 {
-    ExpandPlaceholdersBuffer(buffer, gUnknown_8108F10, gDungeonNames[dungeonLocation->index].name1); // #cD%s#r (normal floor print (no B)
+    ExpandPlaceholdersBuffer(buffer, gUnknown_8108F10, gDungeonNames[dungeonLocation->index].name1); // {COLOR_2 YELLOW_3}%s{END_COLOR_TEXT_2} (normal floor print (no B)
 }
 
 void PrintDungeonLocationtoBuffer(u8 *buffer, struct unkDungeonStruct *dungeonLocation)
diff --git a/src/friend_area_action_menu.c b/src/friend_area_action_menu.c
index e6d09cd..48ebb1a 100644
--- a/src/friend_area_action_menu.c
+++ b/src/friend_area_action_menu.c
@@ -234,13 +234,13 @@ void sub_8027274(void)
         break;
     case 6:
         gUnknown_203B2BC->unk4 = 2;
-        // The #C4$i0#R was
+        // The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was
         // returned to the Toolbox
         sub_80141B4(gUnknown_80DD8A0,0,0,0x101);
         break;
     case 7:
         gUnknown_203B2BC->unk4 = 2;
-        // The #C4$i0#R was
+        // The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was
         // returned to storage
         sub_80141B4(gUnknown_80DD8D0,0,0,0x101);
         break;
diff --git a/src/pokemon_mid.c b/src/pokemon_mid.c
index 38eb0d4..9bd00d5 100644
--- a/src/pokemon_mid.c
+++ b/src/pokemon_mid.c
@@ -239,13 +239,13 @@ void CopySpeciesNametoBuffer(u8 * buffer, s16 index)
 void CopyYellowSpeciesNametoBuffer(u8 *buffer, s16 index)
 {
     s32 new_index = index;
-    ExpandPlaceholdersBuffer(buffer, gUnknown_8107600, gMonsterParameters[new_index].species); // #c6%s#r
+    ExpandPlaceholdersBuffer(buffer, gUnknown_8107600, gMonsterParameters[new_index].species); // {COLOR_2 YELLOW}%s{END_COLOR_TEXT_2}
 }
 
 void CopyCyanSpeciesNametoBuffer(u8 *buffer, s16 index)
 {
     s32 new_index = index;
-    ExpandPlaceholdersBuffer(buffer, gUnknown_8107608, gMonsterParameters[new_index].species); // #c5%s#r
+    ExpandPlaceholdersBuffer(buffer, gUnknown_8107608, gMonsterParameters[new_index].species); // {COLOR_2 CYAN}%s{END_COLOR_TEXT_2}
 }
 
 void sub_808D930(u8 *buffer, s16 index)
@@ -278,7 +278,7 @@ void sub_808D9AC(u8 *buffer, struct PokemonStruct *pokemon, s32 colorNum)
   if (colorNum == 0) {
     colorNum = COLOR_CYAN;
   }
-  ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // #c%c%s#r
+  ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // #c%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 == 0) {
     colorNum = COLOR_YELLOW;
   }
-  ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // #c%c%s#r
+  ExpandPlaceholdersBuffer(buffer,gUnknown_810763C,colorNum,nameBuffer); // #c%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 74a3ca5..078fc50 100644
--- a/src/thank_you_wonder_mail.c
+++ b/src/thank_you_wonder_mail.c
@@ -211,39 +211,39 @@ ALIGNED(4) const u8 gUnknown_80DF138[]=
 	 "follow through on their side.\n"
 	 "Please try again from the start.";
 
-ALIGNED(4) const u8 gUnknown_80DF194[]=
-	" Your #CGThank-You Mail#R\n"
-	"has been sent.";
+ALIGNED(4) const u8 gUnknown_80DF194[]= _(
+	" Your {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}\n"
+	"has been sent.");
 
 ALIGNED(4) const u8 gUnknown_80DF1C0[]=
-	 " ...Oh?\n"
-	 "This password appears to be wrong.\n"
-	 "Would you like to try again?";
+	" ...Oh?\n"
+	"This password appears to be wrong.\n"
+	"Would you like to try again?";
 
-ALIGNED(4) const u8 gUnknown_80DF208[]=
+ALIGNED(4) const u8 gUnknown_80DF208[]= _(
 	" ...Oh? This password doesn~27t\n"
-	"appear to be for a #CGThank-You Mail#R.";
+	"appear to be for a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.");
 
-ALIGNED(4) const u8 gUnknown_80DF250[]=
-	 ": This is the counter for\n"
-	 "#CGThank-You Mail#R.#P"
-	 ": Oh~2c hi~2c #CN%s#R.\n"
-	 "I~27ve been waiting for you. You wanted me\n"
-	 "to process a #CGThank-You Mail#R?#P"
-	 ": Let me get on it right away.";
+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"
+	": Oh~2c hi~2c #CN%s{END_COLOR_TEXT_1}.\n"
+	"I~27ve been waiting for you. You wanted me\n"
+	"to process a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?#P"
+	": Let me get on it right away.");
 
-ALIGNED(4) const u8 gUnknown_80DF304[]=
+ALIGNED(4) const u8 gUnknown_80DF304[]= _(
 	" Is it OK to send this\n"
-	"#CGThank-You Mail#R?";
+	"{COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?");
 
-ALIGNED(4) const u8 gUnknown_80DF330[]=
-	 " Please choose the\n"
-	 "#CGThank-You Mail#R that you want to\n"
-	 "send to your friend.";
+ALIGNED(4) const u8 gUnknown_80DF330[]= _(
+	" Please choose the\n"
+	"{COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} that you want to\n"
+	"send to your friend.");
 
-ALIGNED(4) const u8 gUnknown_80DF380[]=
+ALIGNED(4) const u8 gUnknown_80DF380[]= _(
 	" OK. Please enter the\n"
-	"#CGThank-You Mail password#R.";
+	"{COLOR_1 LIGHT_BLUE_2}Thank-You Mail password{END_COLOR_TEXT_1}.");
 
 ALIGNED(4) const u8 gUnknown_80DF3B4[]=
 	" Please give this password\n"
@@ -251,50 +251,50 @@ ALIGNED(4) const u8 gUnknown_80DF3B4[]=
 	" I also must save your\n"
 	"adventure.";
 
-ALIGNED(4) const u8 gUnknown_80DF418[]=
+ALIGNED(4) const u8 gUnknown_80DF418[]= _(
 	" OK~2c here is your\n"
-	"#CGThank-You Mail password#R.";
+	"{COLOR_1 LIGHT_BLUE_2}Thank-You Mail password{END_COLOR_TEXT_1}.");
 
 ALIGNED(4) const u8 gUnknown_80DF44C[]=
 	" I need to save your\n"
 	"adventure.";
 
 ALIGNED(4) const u8 gUnknown_80DF46C[]=
-	 " There we go.\n"
-	 "I~27m all done.#P"
-	 " Doesn~27t it feel great to\n"
+	" There we go.\n"
+	"I~27m all done.#P"
+	" Doesn~27t it feel great to\n"
 	"be appreciated for doing something good?\n"
 	"Please keep up your rescue work!";
 
-ALIGNED(4) const u8 gUnknown_80DF4F4[]=
-	 " A #CGThank-You Mail#R has\n"
-	 "arrived from your friend for your rescue\n"
-	 "mission.";
+ALIGNED(4) const u8 gUnknown_80DF4F4[]= _(
+	" A {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} has\n"
+	"arrived from your friend for your rescue\n"
+	"mission.");
 
 ALIGNED(4) const u8 gUnknown_80DF544[]= _(
 	 "#+Communicating...\n"
 	 "#+Please wait with the power on.\n"
 	 "#+To cancel~2c press {B_BUTTON}.");
 
-ALIGNED(4) const u8 gUnknown_80DF594[]=
-	 " There. I~27ve sent your\n"
-	 "#CGThank-You Mail#R.\n"
-	 "I need to save your adventure.";
+ALIGNED(4) const u8 gUnknown_80DF594[]= _(
+	" There. I~27ve sent your\n"
+	"{COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.\n"
+	"I need to save your adventure.");
 
-ALIGNED(4) const u8 gUnknown_80DF5E4[]=
-	 " Please connect the GBA\n"
-	 "systems with a #CGGame Link cable#R.\n"
-	 "Is your friend also ready?";
+ALIGNED(4) const u8 gUnknown_80DF5E4[]= _(
+	" Please connect the GBA\n"
+	"systems with a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}.\n"
+	"Is your friend also ready?");
 
-ALIGNED(4) const u8 gUnknown_80DF63C[]=
-	 " There~2c all done.\n"
-	 "#CN%s#R~2c I hope your friend\n"
-	 "appreciates your sense of gratitude.";
+ALIGNED(4) const u8 gUnknown_80DF63C[]= _(
+	" There~2c all done.\n"
+	"#CN%s{END_COLOR_TEXT_1}~2c I hope your friend\n"
+	"appreciates your sense of gratitude.");
 
 ALIGNED(4) const u8 gUnknown_80DF694[]=
-	 " The item you~27ve chosen\n"
-	 "here can~27t be exchanged later.\n"
-	 "Are you certain this item is OK?";
+	" The item you~27ve chosen\n"
+	"here can~27t be exchanged later.\n"
+	"Are you certain this item is OK?";
 
 ALIGNED(4) const u8 gUnknown_80DF6F0[]=
 	" I~27ve saved your adventure. ";
@@ -304,35 +304,35 @@ ALIGNED(4) const u8 gUnknown_80DF710[]=
 	"the item to be sent.";
 
 ALIGNED(4) const u8 gUnknown_80DF73C[]=
-	 " ...Oh?\n"
-	 "Your storage space is empty.\n"
-	 "What would you like to do?";
+	" ...Oh?\n"
+	"Your storage space is empty.\n"
+	"What would you like to do?";
 
-ALIGNED(4) const u8 gUnknown_80DF77C[]=
-	 " Would you like to choose\n"
-	 "a #CGreward item#R from storage and\n"
-	 "send it with your mail?";
+ALIGNED(4) const u8 gUnknown_80DF77C[]= _(
+	" Would you like to choose\n"
+	"a {COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1} from storage and\n"
+	"send it with your mail?");
 
-ALIGNED(4) const u8 gUnknown_80DF7D4[]=
+ALIGNED(4) const u8 gUnknown_80DF7D4[]= _(
 	" ...Oh?\n"
-	"You~27ve already attached a #CGreward item#R\n"
+	"You~27ve already attached a {COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}\n"
 	"to this mail.#P"
 	" I~27m sorry~2c but once an item\n"
 	"has been attached to mail~2c it can~27t be\n"
-	"exchanged.";
+	"exchanged.");
 
 ALIGNED(4) const u8 gUnknown_80DF870[]=
 	" Would you like to send it\n"
 	"again with the item you chose before?";
 
-ALIGNED(4) const u8 gUnknown_80DF8B4[]=
+ALIGNED(4) const u8 gUnknown_80DF8B4[]= _(
 	" ...Oh?\n"
-	"You don~27t seem to have a #CGThank-You Mail#R.";
+	"You don~27t seem to have a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.");
 
-ALIGNED(4) const u8 gUnknown_80DF8EC[]=
+ALIGNED(4) const u8 gUnknown_80DF8EC[]= _(
 	" Hello.\n"
-	"I handle #CGThank-You Mail#R.\n"
-	"How may I serve you?";
+	"I handle {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.\n"
+	"How may I serve you?");
 
 ALIGNED(4) const u8 gUnknown_80DF928[]=
 	" May I help you with\n"
@@ -342,13 +342,13 @@ ALIGNED(4) const u8 gUnknown_80DF94C[] =
 	" Please come see me\n"
 	"anytime.";
 
-ALIGNED(4) const u8 gUnknown_80DF96C[] =
+ALIGNED(4) const u8 gUnknown_80DF96C[] = _(
 	" How would you like to send\n"
-	"your #CGThank-You Mail#R?";
+	"your {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?");
 
-ALIGNED(4) const u8 gUnknown_80DF9A4[]=
+ALIGNED(4) const u8 gUnknown_80DF9A4[]= _(
 	" How would you like to\n"
-	"receive your friend~27s #CGThank-You Mail#R?";
+	"receive your friend~27s {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?");
 
 ALIGNED(4) const u8 thank_you_fill[] = "pksdir0";
 
diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c
index 73d25be..8a9c0ed 100644
--- a/src/wonder_mail_2.c
+++ b/src/wonder_mail_2.c
@@ -165,7 +165,7 @@ ALIGNED(4) const char gUnknown_80DF9F0[] = "????";
 ALIGNED(4) const char gUnknown_80DF9F8[] = _(
 	" Oh~2c hello!\n"
 	"Your rescue mission went well~2c didn~27t it?\n"
-	"I wouldn~27t expect any less~2c #CG%s#R!#P"
+	"I wouldn~27t expect any less~2c {COLOR_1 LIGHT_BLUE_2}%s{END_COLOR_TEXT_1}!#P"
 	" Well~2c well!\n"
 	"Here is your reward from the Pokémon\n"
 	"Rescue Organization!");
@@ -177,12 +177,12 @@ ALIGNED(4) const char gUnknown_80DFAA8[] =
 	" And now~2c I must save\n"
 	"your adventure.";
 
-ALIGNED(4) const char gUnknown_80DFB14[] =
+ALIGNED(4) const char gUnknown_80DFB14[] = _(
 	" Oh~2c yes~2c that~27s right.\n"
-	"Please don~27t forget to send an #CGA-OK Mail#R\n"
+	"Please don~27t forget to send an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}\n"
 	"to the friend you just rescued.#P"
 	" Please give me a shout if\n"
-	"you would like to send #CGA-OK Mail#R.";
+	"you would like to send {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.");
 
 ALIGNED(4) const char wonder_mail_2_fill[] = "pksdir0";
 
diff --git a/src/wonder_mail_main_menu.c b/src/wonder_mail_main_menu.c
index 84c0d25..340e804 100644
--- a/src/wonder_mail_main_menu.c
+++ b/src/wonder_mail_main_menu.c
@@ -94,38 +94,38 @@ ALIGNED(4) const char gUnknown_80E7A48[] = "There is no response from your frien
 
 ALIGNED(4) const char gUnknown_80E7AC4[] = "What would you like to do?";
 
-ALIGNED(4) const char gUnknown_80E7AE0[] = "How would you like to send your\n"
-                                           "#CGWonder Mail#R?";
+ALIGNED(4) const char gUnknown_80E7AE0[] = _("How would you like to send your\n"
+                                           "{COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1}?");
 
-ALIGNED(4) const char gUnknown_80E7B14[] = "How would you like to receive the\n"
-                                           "#CGWonder Mail#R?";
+ALIGNED(4) const char gUnknown_80E7B14[] = _("How would you like to receive the\n"
+                                           "{COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1}?");
 
 ALIGNED(4) const char gUnknown_80E7B48[] = "Your adventure will be saved.";
 
-ALIGNED(4) const char gUnknown_80E7B68[] = "Your #CGWonder Mail#R was sent.";
+ALIGNED(4) const char gUnknown_80E7B68[] = _("Your {COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1} was sent.");
 
-ALIGNED(4) const char gUnknown_80E7B88[] = "The received #CGWonder Mail#R was\n"
-                                           "added to the #CGJob List#R.";
+ALIGNED(4) const char gUnknown_80E7B88[] = _("The received {COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1} was\n"
+                                             "added to the {COLOR_1 LIGHT_BLUE_2}Job List{END_COLOR_TEXT_1}.");
 
-ALIGNED(4) const char gUnknown_80E7BC8[] = "The #CGWonder Mail#R was refused.";
+ALIGNED(4) const char gUnknown_80E7BC8[] = _("The {COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1} was refused.");
 
-ALIGNED(4) const char gUnknown_80E7BEC[] = _("Connect a #CGGame Link cable#R.\n"
+ALIGNED(4) const char gUnknown_80E7BEC[] = _("Connect a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}.\n"
                                              "When you and your friend are ready~2c\n"
                                              "you may communicate. ");
 
 ALIGNED(4) const char gUnknown_80E7C48[] = _("#+In communication...\n"
-                                           "#+Please wait with the power on.\n"
-                                           "#+To cancel~2c press {B_BUTTON}.");
+                                             "#+Please wait with the power on.\n"
+                                             "#+To cancel~2c press {B_BUTTON}.");
 
-ALIGNED(4) const char gUnknown_80E7C98[] = "Please enter the\n"
-                                           "#CGWonder Mail password#R.";
+ALIGNED(4) const char gUnknown_80E7C98[] = _("Please enter the\n"
+                                             "{COLOR_1 LIGHT_BLUE_2}Wonder Mail password{END_COLOR_TEXT_1}.");
 
 ALIGNED(4) const char gUnknown_80E7CC4[] = "This password is incorrect.\n"
                                            "Would you like to enter it again?";
 
 ALIGNED(4) const char wonder_mail_main_fill0[] = "pksdir0";
 
-const struct MenuItem WonderMailMainUnused[3] = 
+const struct MenuItem WonderMailMainUnused[3] =
 {
     {Yes_80E7D2C, 1},
     {Cancel_80E7D24, 0},
@@ -302,7 +302,7 @@ u8 UpdateWonderMailMenu(void)
     case COMMUNICATION_ERROR:
         ReturnToReceiveWonderMailMainScreen();
         break;
-    case PROMPT_PASSWORD_ENTRY: // "Please enter the Wonder Mail Password" Screen 
+    case PROMPT_PASSWORD_ENTRY: // "Please enter the Wonder Mail Password" Screen
         AdvanceToPasswordEntryScreen();
         break;
     case PASSWORD_ENTRY_SCREEN: // Password Entry
@@ -408,7 +408,7 @@ void sub_8039B58(void)
   if (sub_80144A4(&temp) == 0) {
     if (gUnknown_203B3E8->wonderMailStatus == 0) {
       switch(gUnknown_203B3E8->unk24C){
-        case 9: 
+        case 9:
             SetWonderMailMainMenuState(WONDER_MAIL_SENT);
             break;
         case 10:
@@ -476,7 +476,7 @@ void PrintWonderMailMainMenuError(u32 status)
 void HandlePasswordEntryScreen(void)
 {
   int iVar2;
-  
+
   iVar2 = sub_80154F0();
   MemoryFill8(gUnknown_203B3E8->UNK38.unk38_u8, 0, sizeof(gUnknown_203B3E8->UNK38));
   switch(iVar2){
@@ -484,7 +484,7 @@ void HandlePasswordEntryScreen(void)
       sub_80155F0();
       ResetUnusedInputStruct();
       sub_800641C(gUnknown_203B3E8->unk1EC,1,1);
-      if ( !DecodeWonderMailPassword(gUnknown_203B3E8->PasswordEntryBuffer, &gUnknown_203B3E8->UNK38.decodedMail) || !IsValidWonderMail(&gUnknown_203B3E8->UNK38.decodedMail) ) 
+      if ( !DecodeWonderMailPassword(gUnknown_203B3E8->PasswordEntryBuffer, &gUnknown_203B3E8->UNK38.decodedMail) || !IsValidWonderMail(&gUnknown_203B3E8->UNK38.decodedMail) )
       {
         // Invalid password
         SetWonderMailMainMenuState(PASSWORD_INVALID);
@@ -574,7 +574,7 @@ void HandleWonderMailAddedScreen(void)
 void HandleInvalidPasswordMenu(void)
 {
   s32 menuAction;
-  
+
   // Prompt to re-enter password
   if(sub_80144A4(&menuAction) == 0)
   {
@@ -598,7 +598,7 @@ void WonderMailMainMenuCallback(void)
 {
   int iVar2;
   struct unkStruct_803B344 *temp;
-  
+
   switch(gUnknown_203B3E8->state) {
     case SELECT_WONDER_MAIL_MODE_MAIN_SCREEN:
         sub_8014248(gUnknown_80E7AC4,0,1,gSelectWonderMailModeMainMenuItems,0,4,0,0,0x101);
@@ -625,7 +625,7 @@ void WonderMailMainMenuCallback(void)
         {
             gUnknown_203B3E8->unk488 = NULL;
             gUnknown_203B3E8->unk48C = NULL;
-        } 
+        }
         sub_802D098(&gUnknown_203B3E8->unk474);
         break;
     case PREPARE_SAVE: