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/list_menu.c | |
| parent | 2bd15329e07a23d3515dc1c9c9e5d8f75d3be429 (diff) | |
| parent | 6c0fd9884cfa7eca6c2b2f0394efea1140d0feb1 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'src/list_menu.c')
| -rw-r--r-- | src/list_menu.c | 18 |
1 files changed, 9 insertions, 9 deletions
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); } } |