Merge branch 'master' into battle

20 files changed, 313 insertions, 330 deletions

diff --git a/src/bag.c b/src/bag.c
index a63f57702..c30bc626d 100644
--- a/src/bag.c
+++ b/src/bag.c
@@ -14,7 +14,7 @@
 extern const u8 gText_DepositItem[];
 
 const u16 gUnknown_8453098[] = INCBIN_U16("data/bag/bag_window_pal.gbapal");
-const struct TextColor gUnknown_84530B8[] = {
+const u8 gUnknown_84530B8[][3] = {
     {0, 1, 2},
     {0, 2, 3},
     {0, 3, 2},
@@ -229,13 +229,13 @@ void sub_810B858(void)
 
 void sub_810B8F0(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, s8 speed, u8 colorIdx)
 {
-    AddTextPrinterParameterized4(windowId, fontId, x, y, letterSpacing, lineSpacing, &gUnknown_84530B8[colorIdx], speed, str);
+    AddTextPrinterParameterized4(windowId, fontId, x, y, letterSpacing, lineSpacing, gUnknown_84530B8[colorIdx], speed, str);
 }
 
 void sub_810B958(const u8 * str)
 {
     u32 x = 0x48 - GetStringWidth(1, str, 0);
-    AddTextPrinterParameterized3(2, 1, x / 2, 1, &gUnknown_84530B8[0], 0, str);
+    AddTextPrinterParameterized3(2, 1, x / 2, 1, gUnknown_84530B8[0], 0, str);
 }
 
 void sub_810B994(void)
diff --git a/src/battle_records.c b/src/battle_records.c
index 79f29eb8a..3c2032641 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -58,7 +58,7 @@ static const struct WindowTemplate sWindowTemplates[] = {
     }, DUMMY_WIN_TEMPLATE
 };
 
-static const struct TextColor sTextColor = {
+static const u8 sTextColor[3] = {
     0, 2, 3
 };
 
@@ -494,7 +494,7 @@ static void PrintTotalRecord(struct LinkBattleRecords * records)
     }
 
     StringExpandPlaceholders(gStringVar4, gString_BattleRecords_TotalRecord);
-    AddTextPrinterParameterized4(0, 2, 12, 24, 0, 2, &sTextColor, 0, gStringVar4);
+    AddTextPrinterParameterized4(0, 2, 12, 24, 0, 2, sTextColor, 0, gStringVar4);
 }
 
 static void PrintOpponentBattleRecord(struct LinkBattleRecord * record, u8 y)
@@ -504,7 +504,7 @@ static void PrintOpponentBattleRecord(struct LinkBattleRecord * record, u8 y)
 
     if (record->wins == 0 && record->losses == 0 && record->draws == 0)
     {
-        AddTextPrinterParameterized4(0, 2, 0, y, 0, 2, &sTextColor, 0, gString_BattleRecords_7Dashes);
+        AddTextPrinterParameterized4(0, 2, 0, y, 0, 2, sTextColor, 0, gString_BattleRecords_7Dashes);
         for (i = 0; i < 3; i++)
         {
             if (i == 0)
@@ -513,7 +513,7 @@ static void PrintOpponentBattleRecord(struct LinkBattleRecord * record, u8 y)
                 x = 0x84;
             else
                 x = 0xB4;
-            AddTextPrinterParameterized4(0, 2, x, y, 0, 2, &sTextColor, 0, gString_BattleRecords_4Dashes);
+            AddTextPrinterParameterized4(0, 2, x, y, 0, 2, sTextColor, 0, gString_BattleRecords_4Dashes);
         }
     }
     else
@@ -541,7 +541,7 @@ static void PrintOpponentBattleRecord(struct LinkBattleRecord * record, u8 y)
                 x = 0xB4;
                 ConvertIntToDecimalStringN(gStringVar1, record->draws, STR_CONV_MODE_RIGHT_ALIGN, 4);
             }
-            AddTextPrinterParameterized4(0, 2, x, y, 0, 2, &sTextColor, 0, gStringVar1);
+            AddTextPrinterParameterized4(0, 2, x, y, 0, 2, sTextColor, 0, gStringVar1);
         }
     }
 }
@@ -554,9 +554,9 @@ static void PrintBattleRecords(void)
     FillWindowPixelRect(0, PIXEL_FILL(0), 0, 0, 0xD8, 0x90);
     StringExpandPlaceholders(gStringVar4, gString_BattleRecords_PlayersBattleResults);
     left = 0xD0 - GetStringWidth(2, gStringVar4, -1);
-    AddTextPrinterParameterized4(0, 2, left / 2, 4, 0, 2, &sTextColor, 0, gStringVar4);
+    AddTextPrinterParameterized4(0, 2, left / 2, 4, 0, 2, sTextColor, 0, gStringVar4);
     PrintTotalRecord(&gSaveBlock2Ptr->linkBattleRecords);
-    AddTextPrinterParameterized4(0, 2, 0x54, 0x30, 0, 2, &sTextColor, 0, gString_BattleRecords_ColumnHeaders);
+    AddTextPrinterParameterized4(0, 2, 0x54, 0x30, 0, 2, sTextColor, 0, gString_BattleRecords_ColumnHeaders);
     for (i = 0; i < LINK_B_RECORDS_COUNT; i++)
         PrintOpponentBattleRecord(&gSaveBlock2Ptr->linkBattleRecords.entries[i], 0x3D + 14 * i);
     CommitWindow(0);
diff --git a/src/buy_menu_helpers.c b/src/buy_menu_helpers.c
index 4cdf90e4e..cf8072977 100644
--- a/src/buy_menu_helpers.c
+++ b/src/buy_menu_helpers.c
@@ -148,23 +148,11 @@ static const struct WindowTemplate sShopBuyMenuYesNoWindowTemplate =
     .baseBlock = 0xC1,
 };
 
-static const struct TextColor sShopBuyMenuTextColors[] =
+static const u8 sShopBuyMenuTextColors[][3] =
 {
-    {
-        .fgColor = 0,
-        .bgColor = 1,
-        .shadowColor = 2,
-    },
-    {
-        .fgColor = 0,
-        .bgColor = 2,
-        .shadowColor = 3,
-    },
-    {
-        .fgColor = 0,
-        .bgColor = 3,
-        .shadowColor = 2,
-    },
+    {0, 1, 2},
+    {0, 2, 3},
+    {0, 3, 2}
 };
 
 void BuyMenuInitWindows(bool32 isSellingTM)
@@ -191,7 +179,7 @@ void BuyMenuDrawMoneyBox(void)
 
 void BuyMenuPrint(u8 windowId, u8 font, const u8 *text, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, s8 speed, u8 color)
 {
-    AddTextPrinterParameterized4(windowId, font, x, y, letterSpacing, lineSpacing, &sShopBuyMenuTextColors[color], speed, text);
+    AddTextPrinterParameterized4(windowId, font, x, y, letterSpacing, lineSpacing, sShopBuyMenuTextColors[color], speed, text);
 }
 
 void BuyMenuDisplayMessage(u8 taskId, const u8 *text, TaskFunc callback)
diff --git a/src/daycare.c b/src/daycare.c
index abc3b23ca..c082b4298 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -63,7 +63,7 @@ struct EggHatchData
     u8 unused_9;
     u8 unused_A;
     u16 species;
-    struct TextColor textColor;
+    u8 textColor[3];
 };
 
 extern const u8 gText_MaleSymbol4[];
@@ -168,215 +168,215 @@ static const u8 sEggHatchTiles[] = INCBIN_U8("graphics/misc/egg_hatch.4bpp");
 static const u8 sEggShardTiles[] = INCBIN_U8("graphics/misc/egg_shard.4bpp");
 
 static const struct OamData sOamData_EggHatch =
-    {
-        .y = 0,
-        .affineMode = 0,
-        .objMode = 0,
-        .mosaic = 0,
-        .bpp = 0,
-        .shape = SPRITE_SHAPE(32x32),
-        .x = 0,
-        .matrixNum = 0,
-        .size = SPRITE_SIZE(32x32),
-        .tileNum = 0,
-        .priority = 1,
-        .paletteNum = 0,
-        .affineParam = 0,
-    };
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(32x32),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(32x32),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
 
 static const union AnimCmd sSpriteAnim_EggHatch0[] =
-    {
-        ANIMCMD_FRAME(0, 5),
-        ANIMCMD_END
-    };
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END
+};
 
 static const union AnimCmd sSpriteAnim_EggHatch1[] =
-    {
-        ANIMCMD_FRAME(16, 5),
-        ANIMCMD_END
-    };
+{
+    ANIMCMD_FRAME(16, 5),
+    ANIMCMD_END
+};
 
 static const union AnimCmd sSpriteAnim_EggHatch2[] =
-    {
-        ANIMCMD_FRAME(32, 5),
-        ANIMCMD_END
-    };
+{
+    ANIMCMD_FRAME(32, 5),
+    ANIMCMD_END
+};
 
 static const union AnimCmd sSpriteAnim_EggHatch3[] =
-    {
-        ANIMCMD_FRAME(48, 5),
-        ANIMCMD_END
-    };
+{
+    ANIMCMD_FRAME(48, 5),
+    ANIMCMD_END
+};
 
 static const union AnimCmd *const sSpriteAnimTable_EggHatch[] =
-    {
-        sSpriteAnim_EggHatch0,
-        sSpriteAnim_EggHatch1,
-        sSpriteAnim_EggHatch2,
-        sSpriteAnim_EggHatch3,
-    };
+{
+    sSpriteAnim_EggHatch0,
+    sSpriteAnim_EggHatch1,
+    sSpriteAnim_EggHatch2,
+    sSpriteAnim_EggHatch3,
+};
 
 static const struct SpriteSheet sEggHatch_Sheet =
-    {
-        .data = sEggHatchTiles,
-        .size = 2048,
-        .tag = 12345,
-    };
+{
+    .data = sEggHatchTiles,
+    .size = 2048,
+    .tag = 12345,
+};
 
 static const struct SpriteSheet sEggShards_Sheet =
-    {
-        .data = sEggShardTiles,
-        .size = 128,
-        .tag = 23456,
-    };
+{
+    .data = sEggShardTiles,
+    .size = 128,
+    .tag = 23456,
+};
 
 static const struct SpritePalette sEgg_SpritePalette =
-    {
-        .data = sEggPalette,
-        .tag = 54321
-    };
+{
+    .data = sEggPalette,
+    .tag = 54321
+};
 
 static const struct SpriteTemplate sSpriteTemplate_EggHatch =
-    {
-        .tileTag = 12345,
-        .paletteTag = 54321,
-        .oam = &sOamData_EggHatch,
-        .anims = sSpriteAnimTable_EggHatch,
-        .images = NULL,
-        .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = SpriteCallbackDummy
-    };
+{
+    .tileTag = 12345,
+    .paletteTag = 54321,
+    .oam = &sOamData_EggHatch,
+    .anims = sSpriteAnimTable_EggHatch,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
 
 static const struct OamData sOamData_EggShard =
-    {
-        .y = 0,
-        .affineMode = 0,
-        .objMode = 0,
-        .mosaic = 0,
-        .bpp = 0,
-        .shape = SPRITE_SHAPE(8x8),
-        .x = 0,
-        .matrixNum = 0,
-        .size = SPRITE_SIZE(8x8),
-        .tileNum = 0,
-        .priority = 2,
-        .paletteNum = 0,
-        .affineParam = 0,
-    };
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(8x8),
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
 
 static const union AnimCmd sSpriteAnim_EggShard0[] =
-    {
-        ANIMCMD_FRAME(0, 5),
-        ANIMCMD_END
-    };
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END
+};
 
 static const union AnimCmd sSpriteAnim_EggShard1[] =
-    {
-        ANIMCMD_FRAME(1, 5),
-        ANIMCMD_END
-    };
+{
+    ANIMCMD_FRAME(1, 5),
+    ANIMCMD_END
+};
 
 static const union AnimCmd sSpriteAnim_EggShard2[] =
-    {
-        ANIMCMD_FRAME(2, 5),
-        ANIMCMD_END
-    };
+{
+    ANIMCMD_FRAME(2, 5),
+    ANIMCMD_END
+};
 
 static const union AnimCmd sSpriteAnim_EggShard3[] =
-    {
-        ANIMCMD_FRAME(3, 5),
-        ANIMCMD_END
-    };
+{
+    ANIMCMD_FRAME(3, 5),
+    ANIMCMD_END
+};
 
 static const union AnimCmd *const sSpriteAnimTable_EggShard[] =
-    {
-        sSpriteAnim_EggShard0,
-        sSpriteAnim_EggShard1,
-        sSpriteAnim_EggShard2,
-        sSpriteAnim_EggShard3,
-    };
+{
+    sSpriteAnim_EggShard0,
+    sSpriteAnim_EggShard1,
+    sSpriteAnim_EggShard2,
+    sSpriteAnim_EggShard3,
+};
 
 static const struct SpriteTemplate sSpriteTemplate_EggShard =
-    {
-        .tileTag = 23456,
-        .paletteTag = 54321,
-        .oam = &sOamData_EggShard,
-        .anims = sSpriteAnimTable_EggShard,
-        .images = NULL,
-        .affineAnims = gDummySpriteAffineAnimTable,
-        .callback = SpriteCB_EggShard
-    };
+{
+    .tileTag = 23456,
+    .paletteTag = 54321,
+    .oam = &sOamData_EggShard,
+    .anims = sSpriteAnimTable_EggShard,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_EggShard
+};
 
 static const struct BgTemplate sBgTemplates_EggHatch[2] =
+{
     {
-        {
-            .bg = 0,
-            .charBaseIndex = 2,
-            .mapBaseIndex = 24,
-            .screenSize = 3,
-            .paletteMode = 0,
-            .priority = 0,
-            .baseTile = 0
-        },
-
-        {
-            .bg = 1,
-            .charBaseIndex = 0,
-            .mapBaseIndex = 8,
-            .screenSize = 1,
-            .paletteMode = 0,
-            .priority = 2,
-            .baseTile = 0
-        },
-    };
+        .bg = 0,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 24,
+        .screenSize = 3,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+
+    {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 8,
+        .screenSize = 1,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+};
 
 static const struct WindowTemplate sWinTemplates_EggHatch[2] =
-    {
-        {
-            .bg = 0,
-            .tilemapLeft = 2,
-            .tilemapTop = 15,
-            .width = 26,
-            .height = 4,
-            .paletteNum = 0,
-            .baseBlock = 64
-        },
-        DUMMY_WIN_TEMPLATE
-    };
-
-static const struct WindowTemplate sYesNoWinTemplate =
+{
     {
         .bg = 0,
-        .tilemapLeft = 21,
-        .tilemapTop = 9,
-        .width = 6,
+        .tilemapLeft = 2,
+        .tilemapTop = 15,
+        .width = 26,
         .height = 4,
-        .paletteNum = 15,
-        .baseBlock = 424
-    };
+        .paletteNum = 0,
+        .baseBlock = 64
+    },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct WindowTemplate sYesNoWinTemplate =
+{
+    .bg = 0,
+    .tilemapLeft = 21,
+    .tilemapTop = 9,
+    .width = 6,
+    .height = 4,
+    .paletteNum = 15,
+    .baseBlock = 424
+};
 
 static const s16 sEggShardVelocities[][2] =
-    {
-        {Q_8_8(-1.5),       Q_8_8(-3.75)},
-        {Q_8_8(-5),         Q_8_8(-3)},
-        {Q_8_8(3.5),        Q_8_8(-3)},
-        {Q_8_8(-4),         Q_8_8(-3.75)},
-        {Q_8_8(2),          Q_8_8(-1.5)},
-        {Q_8_8(-0.5),       Q_8_8(-6.75)},
-        {Q_8_8(5),          Q_8_8(-2.25)},
-        {Q_8_8(-1.5),       Q_8_8(-3.75)},
-        {Q_8_8(4.5),        Q_8_8(-1.5)},
-        {Q_8_8(-1),         Q_8_8(-6.75)},
-        {Q_8_8(4),          Q_8_8(-2.25)},
-        {Q_8_8(-3.5),       Q_8_8(-3.75)},
-        {Q_8_8(1),          Q_8_8(-1.5)},
-        {Q_8_8(-3.515625),  Q_8_8(-6.75)},
-        {Q_8_8(4.5),        Q_8_8(-2.25)},
-        {Q_8_8(-0.5),       Q_8_8(-7.5)},
-        {Q_8_8(1),          Q_8_8(-4.5)},
-        {Q_8_8(-2.5),       Q_8_8(-2.25)},
-        {Q_8_8(2.5),        Q_8_8(-7.5)},
-    };
+{
+    {Q_8_8(-1.5),       Q_8_8(-3.75)},
+    {Q_8_8(-5),         Q_8_8(-3)},
+    {Q_8_8(3.5),        Q_8_8(-3)},
+    {Q_8_8(-4),         Q_8_8(-3.75)},
+    {Q_8_8(2),          Q_8_8(-1.5)},
+    {Q_8_8(-0.5),       Q_8_8(-6.75)},
+    {Q_8_8(5),          Q_8_8(-2.25)},
+    {Q_8_8(-1.5),       Q_8_8(-3.75)},
+    {Q_8_8(4.5),        Q_8_8(-1.5)},
+    {Q_8_8(-1),         Q_8_8(-6.75)},
+    {Q_8_8(4),          Q_8_8(-2.25)},
+    {Q_8_8(-3.5),       Q_8_8(-3.75)},
+    {Q_8_8(1),          Q_8_8(-1.5)},
+    {Q_8_8(-3.515625),  Q_8_8(-6.75)},
+    {Q_8_8(4.5),        Q_8_8(-2.25)},
+    {Q_8_8(-0.5),       Q_8_8(-7.5)},
+    {Q_8_8(1),          Q_8_8(-4.5)},
+    {Q_8_8(-2.5),       Q_8_8(-2.25)},
+    {Q_8_8(2.5),        Q_8_8(-7.5)},
+};
 
 // code
 
@@ -2202,8 +2202,8 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8
 static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed)
 {
     FillWindowPixelBuffer(windowId, 0xFF);
-    sEggHatchData->textColor.fgColor = 0;
-    sEggHatchData->textColor.bgColor = 5;
-    sEggHatchData->textColor.shadowColor = 6;
-    AddTextPrinterParameterized4(windowId, 3, x, y, 1, 1, &sEggHatchData->textColor, speed, string);
+    sEggHatchData->textColor[0] = 0;
+    sEggHatchData->textColor[1] = 5;
+    sEggHatchData->textColor[2] = 6;
+    AddTextPrinterParameterized4(windowId, 3, x, y, 1, 1, sEggHatchData->textColor, speed, string);
 }
diff --git a/src/diploma.c b/src/diploma.c
index 7fa140430..afb22400b 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -52,7 +52,7 @@ static const u8 gUnknown_84159B3[] = _("{HIGHLIGHT TRANSPARENT}　　　　　�
 static const u8 gUnknown_84159ED[] = _("{COLOR RED}{HIGHLIGHT TRANSPARENT}ゲームフリーク");
 static const u8 gUnknown_84159FB[] = _("{COLOR RED}{HIGHLIGHT TRANSPARENT}");
 
-static const ALIGNED(4) struct TextColor gUnknown_8415A04 = {0, 2, 3};
+static const ALIGNED(4) u8 gUnknown_8415A04[3] = {0, 2, 3};
 
 static const struct BgTemplate gUnknown_8415A08[] = {
     {
@@ -276,10 +276,10 @@ static void DiplomaPrintText(void)
     FillWindowPixelBuffer(0, 0);
     DynamicPlaceholderTextUtil_ExpandPlaceholders(arr, gUnknown_841B60E);
     width = GetStringWidth(2, arr, -1);
-    AddTextPrinterParameterized3(0, 2, 0x78 - (width / 2), 4, &gUnknown_8415A04, -1, arr);
+    AddTextPrinterParameterized3(0, 2, 0x78 - (width / 2), 4, gUnknown_8415A04, -1, arr);
     DynamicPlaceholderTextUtil_ExpandPlaceholders(arr, gUnknown_841B619);
     width = GetStringWidth(2, arr, -1);
-    AddTextPrinterParameterized3(0, 0x2, 0x78 - (width / 2), 0x1E, &gUnknown_8415A04, -1, arr);
-    AddTextPrinterParameterized3(0, 0x2, 0x78, 0x69, &gUnknown_8415A04, 0, gUnknown_841B684);
+    AddTextPrinterParameterized3(0, 0x2, 0x78 - (width / 2), 0x1E, gUnknown_8415A04, -1, arr);
+    AddTextPrinterParameterized3(0, 0x2, 0x78, 0x69, gUnknown_8415A04, 0, gUnknown_841B684);
     PutWindowTilemap(0);
 }
diff --git a/src/fame_checker.c b/src/fame_checker.c
index aa1684981..31bd11b55 100644
--- a/src/fame_checker.c
+++ b/src/fame_checker.c
@@ -152,9 +152,9 @@ static const u16 sOakSpritePalette[] = INCBIN_U16("data/fame_checker/pal_845f580
 static const u16 gUnknown_845F5A0[] = INCBIN_U16("data/fame_checker/pal_845f5a0.gbapal"); // unused?
 static const u16 sSilhouettePalette[] = INCBIN_U16("data/fame_checker/pal_845f5c0.gbapal");
 
-static const struct TextColor sTextColor_White  = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE,     TEXT_COLOR_DARK_GREY};
-static const struct TextColor sTextColor_DkGrey = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, 0x03};
-static const struct TextColor sTextColor_Green  = {TEXT_COLOR_TRANSPARENT, 0x06,                 0x07};
+static const u8 sTextColor_White[3]  = {0, 1, 2};
+static const u8 sTextColor_DkGrey[3] = {0, 2, 3};
+static const u8 sTextColor_Green[3]  = {0, 6, 7};
 
 static const u16 sTrainerIdxs[] = {
     FC_NONTRAINER_START + 0, // OAK
@@ -900,7 +900,7 @@ static void PrintUIHelp(u8 state)
     }
     width = GetStringWidth(0, src, 0);
     FillWindowPixelRect(FCWINDOWID_UIHELP, 0x00, 0, 0, 0xc0, 0x10);
-    AddTextPrinterParameterized4(FCWINDOWID_UIHELP, 0, 188 - width, 0, 0, 2, &sTextColor_White, -1, src);
+    AddTextPrinterParameterized4(FCWINDOWID_UIHELP, 0, 188 - width, 0, 0, 2, sTextColor_White, -1, src);
     FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_UIHELP);
 }
 
@@ -1213,10 +1213,10 @@ static void UpdateIconDescriptionBox(u8 whichText)
     gIconDescriptionBoxIsOpen = 1;
     FillWindowPixelRect(FCWINDOWID_ICONDESC, 0x00, 0, 0, 0x58, 0x20);
     width = (0x54 - GetStringWidth(0, sFlavorTextOriginLocationTexts[idx], 0)) / 2;
-    AddTextPrinterParameterized4(FCWINDOWID_ICONDESC, 0, width, 0, 0, 2, &sTextColor_DkGrey, -1, sFlavorTextOriginLocationTexts[idx]);
+    AddTextPrinterParameterized4(FCWINDOWID_ICONDESC, 0, width, 0, 0, 2, sTextColor_DkGrey, -1, sFlavorTextOriginLocationTexts[idx]);
     StringExpandPlaceholders(gStringVar1, sFlavorTextOriginObjectNameTexts[idx]);
     width = (0x54 - GetStringWidth(0, gStringVar1, 0)) / 2;
-    AddTextPrinterParameterized4(FCWINDOWID_ICONDESC, 0, width, 10, 0, 2, &sTextColor_DkGrey, -1, gStringVar1);
+    AddTextPrinterParameterized4(FCWINDOWID_ICONDESC, 0, width, 10, 0, 2, sTextColor_DkGrey, -1, gStringVar1);
     FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC);
 }
 
@@ -1341,14 +1341,14 @@ static void FC_DoMoveCursor(s32 itemIndex, bool8 onInit)
     u16 who;
     ListMenuGetScrollAndRow(sFameCheckerData->listMenuTaskId, &listY, &cursorY);
     who = listY + cursorY;
-    AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 8, 14 * cursorY + 4, 0, 0, &sTextColor_Green, 0, sListMenuItems[itemIndex].label);
+    AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 8, 14 * cursorY + 4, 0, 0, sTextColor_Green, 0, sListMenuItems[itemIndex].label);
     if (!onInit)
     {
         if (listY < sFameCheckerData->listMenuTopIdx2)
             sFameCheckerData->listMenuDrawnSelIdx++;
         else if (listY > sFameCheckerData->listMenuTopIdx2 && who != sFameCheckerData->numUnlockedPersons - 1)
             sFameCheckerData->listMenuDrawnSelIdx--;
-        AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, &sTextColor_DkGrey, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].label);
+        AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, sTextColor_DkGrey, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].label);
 
     }
     sFameCheckerData->listMenuCurIdx = itemIndex;
@@ -1546,7 +1546,7 @@ static void PlaceListMenuCursor(bool8 isActive)
 {
     u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(sFameCheckerData->listMenuTaskId);
     if (isActive == TRUE)
-        AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &sTextColor_DkGrey, 0, gFameCheckerText_ListMenuCursor);
+        AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, sTextColor_DkGrey, 0, gFameCheckerText_ListMenuCursor);
     else
-        AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, &sTextColor_White, 0, gFameCheckerText_ListMenuCursor);
+        AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, sTextColor_White, 0, gFameCheckerText_ListMenuCursor);
 }
diff --git a/src/help_system.c b/src/help_system.c
index 1fd43fffa..2d96ae9d6 100644
--- a/src/help_system.c
+++ b/src/help_system.c
@@ -25,7 +25,7 @@ struct HelpSystemVideoState
     /*0x0c*/ u16 savedBg0Hofs;
     /*0x0e*/ u16 savedBg0Vofs;
     /*0x10*/ u16 savedBldCnt;
-    /*0x12*/ struct TextColor savedTextColor;
+    /*0x12*/ u8 savedTextColor[3];
     /*0x15*/ u8 state;
 };
 
@@ -171,9 +171,9 @@ void SaveMapTiles(void)
 void SaveMapTextColors(void)
 {
     SaveTextColors(
-        &sVideoState.savedTextColor.fgColor,
-        &sVideoState.savedTextColor.bgColor,
-        &sVideoState.savedTextColor.shadowColor
+        &sVideoState.savedTextColor[0],
+        &sVideoState.savedTextColor[1],
+        &sVideoState.savedTextColor[2]
     );
 }
 
@@ -200,9 +200,9 @@ void RestoreMapTiles(void)
 void RestoreMapTextColors(void)
 {
     RestoreTextColors(
-        &sVideoState.savedTextColor.fgColor,
-        &sVideoState.savedTextColor.bgColor,
-        &sVideoState.savedTextColor.shadowColor
+        &sVideoState.savedTextColor[0],
+        &sVideoState.savedTextColor[1],
+        &sVideoState.savedTextColor[2]
     );
 }
 
diff --git a/src/item_pc.c b/src/item_pc.c
index ca8c5bb8c..24f6afed2 100644
--- a/src/item_pc.c
+++ b/src/item_pc.c
@@ -125,7 +125,7 @@ static const struct MenuAction sItemPcSubmenuOptions[] = {
     {gFameCheckerText_Cancel, {.void_u8 = Task_ItemPcCancel}}
 };
 
-static const struct TextColor gUnknown_8453F8C[] = {
+static const u8 gUnknown_8453F8C[][3] = {
     {0,  1, 2},
     {0,  2, 3},
     {0,  3, 2},
@@ -1111,7 +1111,7 @@ static void unused_ItemPc_AddTextPrinterParameterized(u8 windowId, const u8 * st
 
 static void ItemPc_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 colorIdx)
 {
-    AddTextPrinterParameterized4(windowId, fontId, x, y, letterSpacing, lineSpacing, &gUnknown_8453F8C[colorIdx], speed, str);
+    AddTextPrinterParameterized4(windowId, fontId, x, y, letterSpacing, lineSpacing, gUnknown_8453F8C[colorIdx], speed, str);
 }
 
 static void ItemPc_SetBorderStyleOnWindow(u8 windowId)
diff --git a/src/list_menu.c b/src/list_menu.c
index 5f2bd02b3..d25eb3faf 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -368,21 +368,21 @@ static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 sc
 
 static void ListMenuPrint(struct ListMenu *list, const u8 *str, u8 x, u8 y)
 {
-    struct TextColor colors;
+    u8 colors[3];
     if (gListMenuOverride.enabled)
     {
-        colors.fgColor = gListMenuOverride.fillValue;
-        colors.bgColor = gListMenuOverride.cursorPal;
-        colors.shadowColor = gListMenuOverride.cursorShadowPal;
-        AddTextPrinterParameterized4(list->template.windowId, gListMenuOverride.fontId, x, y, gListMenuOverride.lettersSpacing, 0, &colors, TEXT_SPEED_FF, str);
+        colors[0] = gListMenuOverride.fillValue;
+        colors[1] = gListMenuOverride.cursorPal;
+        colors[2] = gListMenuOverride.cursorShadowPal;
+        AddTextPrinterParameterized4(list->template.windowId, gListMenuOverride.fontId, x, y, gListMenuOverride.lettersSpacing, 0, colors, TEXT_SPEED_FF, str);
         gListMenuOverride.enabled = FALSE;
     }
     else
     {
-        colors.fgColor = list->template.fillValue;
-        colors.bgColor = list->template.cursorPal;
-        colors.shadowColor = list->template.cursorShadowPal;
-        AddTextPrinterParameterized4(list->template.windowId, list->template.fontId, x, y, list->template.lettersSpacing, 0, &colors, TEXT_SPEED_FF, str);
+        colors[0] = list->template.fillValue;
+        colors[1] = list->template.cursorPal;
+        colors[2] = list->template.cursorShadowPal;
+        AddTextPrinterParameterized4(list->template.windowId, list->template.fontId, x, y, list->template.lettersSpacing, 0, colors, TEXT_SPEED_FF, str);
     }
 }
 
diff --git a/src/map_preview_screen.c b/src/map_preview_screen.c
index b913d5fe8..a17f37802 100644
--- a/src/map_preview_screen.c
+++ b/src/map_preview_screen.c
@@ -447,14 +447,14 @@ u16 sub_80F8318(u8 mapsec)
 {
     u16 windowId;
     u32 xctr;
-    struct TextColor color[0];
+    u8 color[0];
 
     windowId = AddWindow(&sMapNameWindow);
     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
     PutWindowTilemap(windowId);
-    color->fgColor = 1; // Access violation
-    color->bgColor = 4; // Access violation
-    color->shadowColor = 3; // Access violation
+    color[0] = 1; // Access violation
+    color[1] = 4; // Access violation
+    color[2] = 3; // Access violation
     GetMapName(gStringVar4, mapsec, 0);
     xctr = 104 - GetStringWidth(2, gStringVar4, 0);
     AddTextPrinterParameterized4(windowId, 2, xctr / 2, 2, 0, 0, color/* Access violation */, -1, gStringVar4);
diff --git a/src/menu.c b/src/menu.c
index bef442d84..b8a68145c 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -41,12 +41,7 @@ static void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLef
 static void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
 static u8 MultichoiceGrid_MoveCursor(s8 deltaX, s8 deltaY);
 
-static const struct TextColor gUnknown_8456618 = 
-{
-    .fgColor = 15,
-    .bgColor = 1,
-    .shadowColor = 2,
-};
+static const u8 gUnknown_8456618[3] = {15, 1, 2};
 
 void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum)
 {
@@ -205,7 +200,7 @@ void TopBarWindowPrintString(const u8 *string, u8 unused, bool8 copyToVram)
         PutWindowTilemap(sTopBarWindowId);
         FillWindowPixelBuffer(sTopBarWindowId, PIXEL_FILL(15));
         width = GetStringWidth(0, string, 0);
-        AddTextPrinterParameterized3(sTopBarWindowId, 0, -20 - width, 1, &gUnknown_8456618, 0, string);
+        AddTextPrinterParameterized3(sTopBarWindowId, 0, -20 - width, 1, gUnknown_8456618, 0, string);
         if (copyToVram)
             CopyWindowToVram(sTopBarWindowId, 3);
     }
@@ -213,22 +208,22 @@ void TopBarWindowPrintString(const u8 *string, u8 unused, bool8 copyToVram)
 
 void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgColorChooser, u8 unused, bool8 copyToVram)
 {
-    struct TextColor color;
+    u8 color[3];
     s32 fgColor, width;
 
     if ( sTopBarWindowId != 0xFF )
     {
         if (fgColorChooser)
         {
-            color.fgColor = 0;
-            color.bgColor = 1;
-            color.shadowColor = 2;
+            color[0] = 0;
+            color[1] = 1;
+            color[2] = 2;
         }
         else
         {
-            color.fgColor = 15;
-            color.bgColor = 1;
-            color.shadowColor = 2;
+            color[0] = 15;
+            color[1] = 1;
+            color[2] = 2;
         }
 
         PutWindowTilemap(sTopBarWindowId);
@@ -236,9 +231,9 @@ void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgCo
         if (string2)
         {
             width = GetStringWidth(0, string2, 0);
-            AddTextPrinterParameterized3(sTopBarWindowId, 0, -20 - width, 1, &color, 0, string2);
+            AddTextPrinterParameterized3(sTopBarWindowId, 0, -20 - width, 1, color, 0, string2);
         }
-        AddTextPrinterParameterized4(sTopBarWindowId, 1, 4, 1, 0, 0, &color, 0, string);
+        AddTextPrinterParameterized4(sTopBarWindowId, 1, 4, 1, 0, 0, color, 0, string);
         if (copyToVram)
             CopyWindowToVram(sTopBarWindowId, 3);
     }
diff --git a/src/menu2.c b/src/menu2.c
index 6a3668cfa..6ee1488b1 100644
--- a/src/menu2.c
+++ b/src/menu2.c
@@ -424,7 +424,7 @@ static const u8 gUnknown_845FD54[][5] = {
     [SPECIES_OLD_UNOWN_QMARK - 1] = {0x20, 0x23, 0x08, 0x20, 0x2d}
 };
 
-void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 x, u8 y, const struct TextColor * color, s8 speed, const u8 * str)
+void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 x, u8 y, const u8 * color, s8 speed, const u8 * str)
 {
     struct TextPrinterTemplate printer;
 
@@ -438,13 +438,13 @@ void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 x, u8 y, const stru
     printer.letterSpacing = GetFontAttribute(fontId, 2);
     printer.lineSpacing = GetFontAttribute(fontId, 3);
     printer.unk = 0;
-    printer.fgColor = color->bgColor;
-    printer.bgColor = color->fgColor;
-    printer.shadowColor = color->shadowColor;
+    printer.fgColor = color[1];
+    printer.bgColor = color[0];
+    printer.shadowColor = color[2];
     AddTextPrinter(&printer, speed, NULL);
 }
 
-void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str)
+void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const u8 *color, s8 speed, const u8 *str)
 {
     struct TextPrinterTemplate printer;
 
@@ -458,9 +458,9 @@ void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterS
     printer.letterSpacing = letterSpacing;
     printer.lineSpacing = lineSpacing;
     printer.unk = 0;
-    printer.fgColor = color->bgColor;
-    printer.bgColor = color->fgColor;
-    printer.shadowColor = color->shadowColor;
+    printer.fgColor = color[1];
+    printer.bgColor = color[0];
+    printer.shadowColor = color[2];
     AddTextPrinter(&printer, speed, NULL);
 }
 
diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c
index c67cd1358..85c1dfccb 100644
--- a/src/mevent_8145654.c
+++ b/src/mevent_8145654.c
@@ -61,7 +61,7 @@ void sub_81461D8(void);
 
 extern const struct OamData gOamData_83AC9F8;
 
-const struct TextColor gUnknown_8467068[] = {
+const u8 gUnknown_8467068[][3] = {
     {0, 2, 3},
     {0, 1, 2}
 };
@@ -348,28 +348,28 @@ void sub_8145D18(u8 whichWindow)
         case 0:
         {
             s32 x;
-            AddTextPrinterParameterized3(windowId, 3, 0, 1, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_018B);
+            AddTextPrinterParameterized3(windowId, 3, 0, 1, gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_018B);
             x = 160 - GetStringWidth(3, gUnknown_203F3C8->unk_01B4, GetFontAttribute(3, 2));
             if (x < 0)
                 x = 0;
-            AddTextPrinterParameterized3(windowId, 3, x, 17, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_01B4);
+            AddTextPrinterParameterized3(windowId, 3, x, 17, gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_01B4);
             if (gUnknown_203F3C8->unk_0000.unk_04 != 0)
             {
-                AddTextPrinterParameterized3(windowId, 2, 166, 17, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_01DD);
+                AddTextPrinterParameterized3(windowId, 2, 166, 17, gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal1], 0, gUnknown_203F3C8->unk_01DD);
             }
             break;
         }
         case 1:
             for (; sp0C < 4; sp0C++)
             {
-                AddTextPrinterParameterized3(windowId, 3, 0, 16 * sp0C + 2, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal2], 0, gUnknown_203F3C8->unk_01E4[sp0C]);
+                AddTextPrinterParameterized3(windowId, 3, 0, 16 * sp0C + 2, gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal2], 0, gUnknown_203F3C8->unk_01E4[sp0C]);
             }
             break;
         case 2:
-            AddTextPrinterParameterized3(windowId, 3, 0, gUnknown_8467070[gUnknown_203F3C8->unk_0000.unk_08_0], &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_0288);
+            AddTextPrinterParameterized3(windowId, 3, 0, gUnknown_8467070[gUnknown_203F3C8->unk_0000.unk_08_0], gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_0288);
             if (gUnknown_203F3C8->unk_0000.unk_08_0 != 2)
             {
-                AddTextPrinterParameterized3(windowId, 3, 0, 16 + gUnknown_8467070[gUnknown_203F3C8->unk_0000.unk_08_0], &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02B1);
+                AddTextPrinterParameterized3(windowId, 3, 0, 16 + gUnknown_8467070[gUnknown_203F3C8->unk_0000.unk_08_0], gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02B1);
             }
             else
             {
@@ -378,11 +378,11 @@ void sub_8145D18(u8 whichWindow)
                 s32 spacing = GetFontAttribute(3, 2);
                 for (; sp0C < gUnknown_203F3C8->unk_0175; sp0C++)
                 {
-                    AddTextPrinterParameterized3(windowId, 3, x, y, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02DC[sp0C].unk_01);
+                    AddTextPrinterParameterized3(windowId, 3, x, y, gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02DC[sp0C].unk_01);
                     if (gUnknown_203F3C8->unk_02DC[sp0C].unk_42[0] != EOS)
                     {
                         x += GetStringWidth(3, gUnknown_203F3C8->unk_02DC[sp0C].unk_01, spacing);
-                        AddTextPrinterParameterized3(windowId, 2, x, y, &gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02DC[sp0C].unk_42);
+                        AddTextPrinterParameterized3(windowId, 2, x, y, gUnknown_8467068[gUnknown_203F3C8->unk_0170->textPal3], 0, gUnknown_203F3C8->unk_02DC[sp0C].unk_42);
                         x += GetStringWidth(3, gUnknown_203F3C8->unk_02DC[sp0C].unk_42, spacing) + gUnknown_203F3C8->unk_02DC[sp0C].unk_00;
                     }
                 }
@@ -471,7 +471,7 @@ void sub_8146980(void);
 void sub_8146A30(void);
 void sub_8146B58(void);
 
-const struct TextColor gUnknown_8468038[] = {
+const u8 gUnknown_8468038[][3] = {
     {0, 2, 3},
     {0, 1, 2}
 };
@@ -758,10 +758,10 @@ void sub_8146A30(void)
     x = (0xe0 - GetStringWidth(3, gUnknown_203F3CC->unk_01CE, GetFontAttribute(3, 2))) / 2;
     if (x < 0)
         x = 0;
-    AddTextPrinterParameterized3(gUnknown_203F3CC->unk_01C8[0], 3, x, 6, &gUnknown_8468038[gUnknown_203F3CC->unk_01BC->textPal1], 0, gUnknown_203F3CC->unk_01CE);
+    AddTextPrinterParameterized3(gUnknown_203F3CC->unk_01C8[0], 3, x, 6, gUnknown_8468038[gUnknown_203F3CC->unk_01BC->textPal1], 0, gUnknown_203F3CC->unk_01CE);
     for (; i < 10; ++i)
     {
-        AddTextPrinterParameterized3(gUnknown_203F3CC->unk_01C8[1], 3, 0, 16 * i + 2, &gUnknown_8468038[gUnknown_203F3CC->unk_01BC->textPal2], 0, gUnknown_203F3CC->unk_01F7[i]);
+        AddTextPrinterParameterized3(gUnknown_203F3CC->unk_01C8[1], 3, 0, 16 * i + 2, gUnknown_8468038[gUnknown_203F3CC->unk_01BC->textPal2], 0, gUnknown_203F3CC->unk_01F7[i]);
     }
     CopyWindowToVram(gUnknown_203F3CC->unk_01C8[0], 3);
     CopyWindowToVram(gUnknown_203F3CC->unk_01C8[1], 3);
diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c
index 9ff96eb23..57bc07f33 100644
--- a/src/mystery_gift_menu.c
+++ b/src/mystery_gift_menu.c
@@ -409,9 +409,9 @@ const u8 *const Unref_08366ED8[] = {
     gText_ReturnToTitle
 };
 
-ALIGNED(4) const struct TextColor sMG_Ereader_TextColor_1      = { 0, 1, 2 };
-ALIGNED(4) const struct TextColor sMG_Ereader_TextColor_1_Copy = { 0, 1, 2 };
-ALIGNED(4) const struct TextColor sMG_Ereader_TextColor_2      = { 1, 2, 3 };
+ALIGNED(4) const u8 sMG_Ereader_TextColor_1[3]      = { 0, 1, 2 };
+ALIGNED(4) const u8 sMG_Ereader_TextColor_1_Copy[3] = { 0, 1, 2 };
+ALIGNED(4) const u8 sMG_Ereader_TextColor_2[3]      = { 1, 2, 3 };
 
 const u8 gUnknown_8466EF3[] = _("テスト");
 const u8 gUnknown_8466EF7[] = _("むげんのチケット");
@@ -538,14 +538,14 @@ void PrintMysteryGiftOrEReaderTopMenu(bool8 mg_or_ereader, bool32 usePickOkCance
     if (!mg_or_ereader)
     {
         src = usePickOkCancel == TRUE ? gText_PickOKExit : gText_PickOKCancel;
-        AddTextPrinterParameterized4(0, 2, 2, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, gText_MysteryGift);
+        AddTextPrinterParameterized4(0, 2, 2, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gText_MysteryGift);
         width = 222 - GetStringWidth(0, src, 0);
-        AddTextPrinterParameterized4(0, 0, width, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, src);
+        AddTextPrinterParameterized4(0, 0, width, 2, 0, 0, sMG_Ereader_TextColor_1, 0, src);
     }
     else
     {
-        AddTextPrinterParameterized4(0, 2, 2, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, gJPText_MysteryGift);
-        AddTextPrinterParameterized4(0, 0, 0x78, 2, 0, 0, &sMG_Ereader_TextColor_1, 0, gJPText_DecideStop);
+        AddTextPrinterParameterized4(0, 2, 2, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gJPText_MysteryGift);
+        AddTextPrinterParameterized4(0, 0, 0x78, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gJPText_DecideStop);
     }
     CopyWindowToVram(0, 2);
     PutWindowTilemap(0);
@@ -596,7 +596,7 @@ void AddTextPrinterToWindow1(const u8 *str)
 {
     StringExpandPlaceholders(gStringVar4, str);
     FillWindowPixelBuffer(1, 0x11);
-    AddTextPrinterParameterized4(1, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4);
+    AddTextPrinterParameterized4(1, 2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4);
     DrawTextBorderOuter(1, 0x001, 0xF);
     PutWindowTilemap(1);
     CopyWindowToVram(1, 3);
@@ -737,7 +737,7 @@ s8 mevent_message_print_and_prompt_yes_no(u8 * textState, u16 * windowId, bool8
             *windowId = AddWindow(&sWindowTemplate_PromptYesOrNo_Width20);
         }
         FillWindowPixelBuffer(*windowId, 0x11);
-        AddTextPrinterParameterized4(*windowId, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4);
+        AddTextPrinterParameterized4(*windowId, 2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4);
         DrawTextBorderOuter(*windowId, 0x001, 0x0F);
         CopyWindowToVram(*windowId, 2);
         PutWindowTilemap(*windowId);
@@ -798,7 +798,7 @@ s32 HandleMysteryGiftListMenu(u8 * textState, u16 * windowId, bool32 cannotToss,
         }
         *windowId = AddWindow(&sMysteryGiftMenuWindowTemplate);
         FillWindowPixelBuffer(*windowId, 0x11);
-        AddTextPrinterParameterized4(*windowId, 2, 0, 2, 0, 2, &sMG_Ereader_TextColor_2, 0, gStringVar4);
+        AddTextPrinterParameterized4(*windowId, 2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4);
         DrawTextBorderOuter(*windowId, 0x001, 0x0F);
         CopyWindowToVram(*windowId, 2);
         PutWindowTilemap(*windowId);
diff --git a/src/oak_speech.c b/src/oak_speech.c
index c00335136..04b66f528 100644
--- a/src/oak_speech.c
+++ b/src/oak_speech.c
@@ -37,7 +37,7 @@ struct OakSpeechResources
     u16 unk_0010;
     u16 unk_0012;
     u16 unk_0014[4];
-    struct TextColor textColor;
+    u8 textColor[3];
     u8 textSpeed;
     u8 filler_0020[0x1800];
     u8 bg2TilemapBuffer[0x400];
@@ -273,11 +273,11 @@ static const struct WindowTemplate sNewGameAdventureIntroWindowTemplates[] = {
     }, DUMMY_WIN_TEMPLATE
 };
 
-ALIGNED(4) const struct TextColor sTextColor_HelpSystem = {
+const u8 sTextColor_HelpSystem[4] = {
     0x00, 0x01, 0x02
 };
 
-ALIGNED(4) const struct TextColor sTextColor_OakSpeech = {
+const u8 sTextColor_OakSpeech[4] = {
     0x00, 0x02, 0x03
 };
 
@@ -576,7 +576,7 @@ static void CreateHelpDocsPage1(void)
     sOakSpeechResources->unk_0014[0] = AddWindow(sHelpDocsWindowTemplatePtrs[sOakSpeechResources->unk_0012]);
     PutWindowTilemap(sOakSpeechResources->unk_0014[0]);
     FillWindowPixelBuffer(sOakSpeechResources->unk_0014[0], 0x00);
-    AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[0], 2, 2, 0, 1, 1, &sTextColor_HelpSystem, 0, gNewGame_HelpDocs1);
+    AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[0], 2, 2, 0, 1, 1, sTextColor_HelpSystem, 0, gNewGame_HelpDocs1);
     CopyWindowToVram(sOakSpeechResources->unk_0014[0], 3);
     FillBgTilemapBufferRect_Palette0(1, 0x3000, 1, 3, 5, 16);
     CopyBgTilemapBufferToVram(1);
@@ -598,7 +598,7 @@ static void Task_OakSpeech4(u8 taskId)
             sOakSpeechResources->unk_0014[i] = AddWindow(&sHelpDocsWindowTemplatePtrs[sOakSpeechResources->unk_0012][i]);
             PutWindowTilemap(sOakSpeechResources->unk_0014[i]);
             FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00);
-            AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[i], 2, 6, 0, 1, 1, &sTextColor_HelpSystem, 0, sHelpDocsPtrs[i + r7 * 3]);
+            AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[i], 2, 6, 0, 1, 1, sTextColor_HelpSystem, 0, sHelpDocsPtrs[i + r7 * 3]);
             CopyWindowToVram(sOakSpeechResources->unk_0014[i], 3);
         }
 
@@ -730,7 +730,7 @@ static void Task_OakSpeech6(u8 taskId)
         sOakSpeechResources->unk_0012 = 0;
         gMain.state = 0;
         data[15] = 16;
-        AddTextPrinterParameterized4(data[14], 2, 3, 5, 1, 0, &sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[0]);
+        AddTextPrinterParameterized4(data[14], 2, 3, 5, 1, 0, sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[0]);
         data[5] = CreateTextCursorSpriteForOakSpeech(0, 0xe2, 0x91, 0, 0);
         gSprites[data[5]].oam.objMode = ST_OAM_OBJ_BLEND;
         gSprites[data[5]].oam.priority = 0;
@@ -790,7 +790,7 @@ static void Task_OakSpeech7(u8 taskId)
         if (data[15] <= 0)
         {
             FillWindowPixelBuffer(data[14], 0x00);
-            AddTextPrinterParameterized4(data[14], 2, 3, 5, 1, 0, &sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[sOakSpeechResources->unk_0012]);
+            AddTextPrinterParameterized4(data[14], 2, 3, 5, 1, 0, sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[sOakSpeechResources->unk_0012]);
             if (sOakSpeechResources->unk_0012 == 0)
             {
                 ClearTopBarWindow();
@@ -1056,14 +1056,14 @@ static void Task_OakSpeech19(u8 taskId)
         PutWindowTilemap(gTasks[taskId].data[13]);
         DrawStdFrameWithCustomTileAndPalette(gTasks[taskId].data[13], 1, GetStdWindowBaseTileNum(), 14);
         FillWindowPixelBuffer(gTasks[taskId].data[13], 0x11);
-        sOakSpeechResources->textColor.fgColor = 1;
-        sOakSpeechResources->textColor.bgColor = 2;
-        sOakSpeechResources->textColor.shadowColor = 3;
-        AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 1, &sOakSpeechResources->textColor, 0, gText_Boy);
-        sOakSpeechResources->textColor.fgColor = 1;
-        sOakSpeechResources->textColor.bgColor = 2;
-        sOakSpeechResources->textColor.shadowColor = 3;
-        AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 17, &sOakSpeechResources->textColor, 0, gText_Girl);
+        sOakSpeechResources->textColor[0] = 1;
+        sOakSpeechResources->textColor[1] = 2;
+        sOakSpeechResources->textColor[2] = 3;
+        AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 1, sOakSpeechResources->textColor, 0, gText_Boy);
+        sOakSpeechResources->textColor[0] = 1;
+        sOakSpeechResources->textColor[1] = 2;
+        sOakSpeechResources->textColor[2] = 3;
+        AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 17, sOakSpeechResources->textColor, 0, gText_Girl);
         Menu_InitCursor(gTasks[taskId].data[13], 2, 0, 1, GetFontAttribute(2, 1) + 2, 2, 0);
         CopyWindowToVram(gTasks[taskId].data[13], 3);
         gTasks[taskId].func = Task_OakSpeech20;
diff --git a/src/quest_log.c b/src/quest_log.c
index e88285995..6083e9348 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -410,7 +410,7 @@ const struct WindowTemplate gUnknown_845661C[3] = {
     { 0, 0, 14, 30, 6, 15, 0x14c }
 };
 
-const struct TextColor gUnknown_8456634 = {15, 1, 12};
+const u8 gUnknown_8456634[3] = {15, 1, 12};
 
 const u16 gUnknown_8456638[] = INCBIN_U16("data/graphics/unknown_8456638.bin");
 
@@ -923,7 +923,7 @@ void sub_8111070(u8 a0)
         StringAppend(gStringVar4, gStringVar1);
     }
 
-    AddTextPrinterParameterized4(gUnknown_203ADFE[0], 2, 2, 2, 1, 2, &gUnknown_8456634, 0, gStringVar4);
+    AddTextPrinterParameterized4(gUnknown_203ADFE[0], 2, 2, 2, 1, 2, gUnknown_8456634, 0, gStringVar4);
     PutWindowTilemap(gUnknown_203ADFE[0]);
     PutWindowTilemap(gUnknown_203ADFE[1]);
     CopyWindowToVram(gUnknown_203ADFE[0], 2);
@@ -1418,7 +1418,7 @@ void sub_8111D10(void)
 
     PutWindowTilemap(gUnknown_203ADFE[2]);
     sub_8111D90(gUnknown_203ADFE[2]);
-    AddTextPrinterParameterized4(gUnknown_203ADFE[2], 2, 2, gUnknown_8456698[count], 1, 0, &gUnknown_8456634, 0, gStringVar4);
+    AddTextPrinterParameterized4(gUnknown_203ADFE[2], 2, 2, gUnknown_8456698[count], 1, 0, gUnknown_8456634, 0, gStringVar4);
     ScheduleBgCopyTilemapToVram(0);
 }
 
@@ -2463,13 +2463,13 @@ void sub_8112FD0(void)
     sub_8112F18(gUnknown_203B020);
 }
 
-const struct TextColor gUnknown_8456930 = {
+const u8 gUnknown_8456930[3] = {
     0, 10, 2
 };
 
 void sub_8112FE4(const u8 * a0)
 {
-    AddTextPrinterParameterized4(gUnknown_203B020, 0x02, 2, 5, 1, 1, &gUnknown_8456930, -1, a0);
+    AddTextPrinterParameterized4(gUnknown_203B020, 0x02, 2, 5, 1, 1, gUnknown_8456930, -1, a0);
 }
 
 void sub_8113018(const u8 * text, u8 mode)
diff --git a/src/slot_machine.c b/src/slot_machine.c
index 740234d95..28292902f 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -2074,7 +2074,7 @@ static bool32 sub_8141180(u8 a0)
 static bool8 sub_8141198(u8 * state, struct SlotMachineSetupTaskData * ptr)
 {
     u16 pal;
-    struct TextColor textColor;
+    u8 textColor[3];
     u32 x;
 
     switch (*state)
@@ -2125,10 +2125,10 @@ static bool8 sub_8141198(u8 * state, struct SlotMachineSetupTaskData * ptr)
         PutWindowTilemap(1);
 
         x = 0xEC - GetStringWidth(0, gString_SlotMachineControls, 0);
-        textColor.fgColor = 15;
-        textColor.bgColor = 1;
-        textColor.shadowColor = 2;
-        AddTextPrinterParameterized3(1, 0, x, 0, &textColor, 0, gString_SlotMachineControls);
+        textColor[0] = 15;
+        textColor[1] = 1;
+        textColor[2] = 2;
+        AddTextPrinterParameterized3(1, 0, x, 0, textColor, 0, gString_SlotMachineControls);
         CopyBgTilemapBufferToVram(0);
 
         SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | 0x20 | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
diff --git a/src/tm_case.c b/src/tm_case.c
index ac737af5d..b9c89b6b3 100644
--- a/src/tm_case.c
+++ b/src/tm_case.c
@@ -185,7 +185,7 @@ static const u8 sText_SingleSpace[] = _(" ");
 
 static ALIGNED(4) const u16 sPal3Override[] = {RGB(8, 8, 8), RGB(30, 16, 6)};
 
-static const struct TextColor sTextColors[] = {
+static const u8 sTextColors[][3] = {
     {0, 1, 2},
     {0, 2, 3},
     {0, 3, 6},
@@ -1317,7 +1317,7 @@ static void InitWindowTemplatesAndPals(void)
 
 static void AddTextPrinterParameterized_ColorByIndex(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 colorIdx)
 {
-    AddTextPrinterParameterized4(windowId, fontId, x, y, letterSpacing, lineSpacing, &sTextColors[colorIdx], speed, str);
+    AddTextPrinterParameterized4(windowId, fontId, x, y, letterSpacing, lineSpacing, sTextColors[colorIdx], speed, str);
 }
 
 static void TMCase_SetWindowBorder1(u8 windowId)
@@ -1339,7 +1339,7 @@ static void TMCase_PrintMessageWithFollowupTask(u8 taskId, u8 windowId, const u8
 static void PrintStringTMCaseOnWindow3(void)
 {
     u32 distance = 72 - GetStringWidth(1, gText_TMCase, 0);
-    AddTextPrinterParameterized3(3, 1, distance / 2, 1, &sTextColors[0], 0, gText_TMCase);
+    AddTextPrinterParameterized3(3, 1, distance / 2, 1, sTextColors[0], 0, gText_TMCase);
 }
 
 static void DrawMoveInfoUIMarkers(void)
diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index 054a0da2f..da3cf6dda 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -423,7 +423,7 @@ const struct WindowTemplate gUnknown_847A218[] = {
 
 const u32 gUnknown_847A228 = 0x70;  // unused
 
-const struct TextColor gUnknown_847A22C = {0, 2, 3};
+const u8 gUnknown_847A22C[3] = {0, 2, 3};
 
 void (*const gUnknown_847A230[])(void) = {
     sub_815DD44,
@@ -1433,14 +1433,14 @@ void PrintTrainerTowerRecords(void)
     sub_815DC8C();
     FillWindowPixelRect(0, 0, 0, 0, 0xd8, 0x90);
     sub_815EC0C();
-    AddTextPrinterParameterized3(0, 2, 0x4a, 0, &gUnknown_847A22C, 0, gUnknown_83FE982);
+    AddTextPrinterParameterized3(0, 2, 0x4a, 0, gUnknown_847A22C, 0, gUnknown_83FE982);
 
     for (i = 0; i < 4; i++)
     {
         PRINT_TOWER_TIME(sub_815EDDC(&gSaveBlock1Ptr->unkArray[i].unk4));
         StringExpandPlaceholders(gStringVar4, gUnknown_83FE998);
-        AddTextPrinterParameterized3(windowId, 2, 0x18, 0x24 + 0x14 * i, &gUnknown_847A22C, 0, gUnknown_83FE9C4[i]);
-        AddTextPrinterParameterized3(windowId, 2, 0x60, 0x24 + 0x14 * i, &gUnknown_847A22C, 0, gStringVar4);
+        AddTextPrinterParameterized3(windowId, 2, 0x18, 0x24 + 0x14 * i, gUnknown_847A22C, 0, gUnknown_83FE9C4[i]);
+        AddTextPrinterParameterized3(windowId, 2, 0x60, 0x24 + 0x14 * i, gUnknown_847A22C, 0, gStringVar4);
     }
 
     PutWindowTilemap(windowId);
diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c
index cc80d37b6..1c355c3ba 100644
--- a/src/wireless_communication_status_screen.c
+++ b/src/wireless_communication_status_screen.c
@@ -329,37 +329,37 @@ void sub_814F46C(u8 taskId)
 
 void sub_814F65C(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 palIdx)
 {
-    struct TextColor textColor;
+    u8 textColor[3];
     switch (palIdx)
     {
     case 0:
-        textColor.fgColor = 0;
-        textColor.bgColor = 2;
-        textColor.shadowColor = 3;
+        textColor[0] = 0;
+        textColor[1] = 2;
+        textColor[2] = 3;
         break;
     case 1:
-        textColor.fgColor = 0;
-        textColor.bgColor = 1;
-        textColor.shadowColor = 3;
+        textColor[0] = 0;
+        textColor[1] = 1;
+        textColor[2] = 3;
         break;
     case 2:
-        textColor.fgColor = 0;
-        textColor.bgColor = 4;
-        textColor.shadowColor = 5;
+        textColor[0] = 0;
+        textColor[1] = 4;
+        textColor[2] = 5;
         break;
     case 3:
-        textColor.fgColor = 0;
-        textColor.bgColor = 7;
-        textColor.shadowColor = 6;
+        textColor[0] = 0;
+        textColor[1] = 7;
+        textColor[2] = 6;
         break;
     case 4:
-        textColor.fgColor = 0;
-        textColor.bgColor = 1;
-        textColor.shadowColor = 2;
+        textColor[0] = 0;
+        textColor[1] = 1;
+        textColor[2] = 2;
         break;
     // default: UB
     }
-    AddTextPrinterParameterized4(windowId, fontId,x, y, fontId == 0 ? 0 : 1, 0, &textColor, -1, str);
+    AddTextPrinterParameterized4(windowId, fontId,x, y, fontId == 0 ? 0 : 1, 0, textColor, -1, str);
 }
 
 u32 sub_814F714(struct UnkStruct_x20 * unk20, u32 * arg1)