diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-08-28 14:56:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 14:56:08 -0400 |
| commit | 6c0fd9884cfa7eca6c2b2f0394efea1140d0feb1 (patch) | |
| tree | a8743c0093dee3a30b0f4624bd690183620bc0d8 /src/tm_case.c | |
| parent | 634fe80e9dcaffc9b1cf622b3132e686e926e97f (diff) | |
| parent | 1e8b809ff231a255837dbf711d976895354062e1 (diff) | |
Merge pull request #95 from PikalaxALT/no_struct_textcolor
Eliminate `struct TextColor` definition and use
Diffstat (limited to 'src/tm_case.c')
| -rw-r--r-- | src/tm_case.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tm_case.c b/src/tm_case.c index 79e10bcfc..2031234af 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) |