Merge remote-tracking branch 'upstream' into tustin2121-patch-5

1 files changed, 8 insertions, 8 deletions

diff --git a/src/mail.c b/src/mail.c
index 0078bc4fc..f6f96b012 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -17,7 +17,7 @@
 #include "bg.h"
 #include "pokemon_icon.h"
 #include "constants/species.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "easy_chat.h"
 #include "constants/rgb.h"
 
@@ -158,10 +158,10 @@ static const struct WindowTemplate sUnknown_0859F29C[] = {
     DUMMY_WIN_TEMPLATE
 };
 
-static const u8 sUnknown_0859F2AC[] = {
-     0,
-    10,
-    11
+static const u8 sTextColors[] = {
+    TEXT_COLOR_TRANSPARENT,
+    TEXT_DYNAMIC_COLOR_1,
+    TEXT_DYNAMIC_COLOR_2
 };
 
 static const u16 sUnknown_0859F2B0[][2] = {
@@ -486,14 +486,14 @@ static void sub_8121B1C(void)
         {
             continue;
         }
-        AddTextPrinterParameterized3(0, 1, sMailRead->layout->var8[i].xOffset + sMailRead->layout->wordsYPos, y + sMailRead->layout->wordsXPos, sUnknown_0859F2AC, 0, sMailRead->strbuf[i]);
+        AddTextPrinterParameterized3(0, 1, sMailRead->layout->var8[i].xOffset + sMailRead->layout->wordsYPos, y + sMailRead->layout->wordsXPos, sTextColors, 0, sMailRead->strbuf[i]);
         y += sMailRead->layout->var8[i].lineHeight;
     }
     bufptr = StringCopy(strbuf, gText_FromSpace);
     StringCopy(bufptr, sMailRead->playerName);
     box_x = GetStringCenterAlignXOffset(1, strbuf, sMailRead->signatureWidth) + 0x68;
     box_y = sMailRead->layout->signatureYPos + 0x58;
-    AddTextPrinterParameterized3(0, 1, box_x, box_y, sUnknown_0859F2AC, 0, strbuf);
+    AddTextPrinterParameterized3(0, 1, box_x, box_y, sTextColors, 0, strbuf);
     CopyWindowToVram(0, 3);
     CopyWindowToVram(1, 3);
 }
@@ -542,7 +542,7 @@ static void CB2_ExitMailReadFreeVars(void)
             case 1:
             case 2:
                 FreeMonIconPalette(sub_80D2E84(sMailRead->mail->species));
-                sub_80D2EF8(&gSprites[sMailRead->monIconSprite]);
+                FreeAndDestroyMonIconSprite(&gSprites[sMailRead->monIconSprite]);
         }
         memset(sMailRead, 0, sizeof(*sMailRead));
         ResetPaletteFade();