diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-29 03:00:08 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-29 03:09:24 +0800 |
| commit | 4b5195c9cb7afa4f7fd45d5381b258a0e7ee17cf (patch) | |
| tree | 7c64a1fe5ceeeef620e7e35adc75f021108aed5e /src/tm_case.c | |
| parent | 2bd15329e07a23d3515dc1c9c9e5d8f75d3be429 (diff) | |
| parent | 6c0fd9884cfa7eca6c2b2f0394efea1140d0feb1 (diff) | |
Merge branch 'master' into battle
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 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) |