diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-11 19:22:06 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-11 19:22:06 -0500 |
commit | ea347199a21f7a6c01a395e507db872ac1781e79 (patch) | |
tree | 625ec0a6469b40573d165ceee0855e969af45929 /src/mystery_event_menu.c | |
parent | f39053ee3023b02139784f88d346b3b57853c307 (diff) | |
parent | 14a76793e596d612efd273169c4172922c270f13 (diff) |
Merge branch 'master' into link
Diffstat (limited to 'src/mystery_event_menu.c')
-rw-r--r-- | src/mystery_event_menu.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 444650be1..22e50f4e7 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -17,7 +17,6 @@ #include "window.h" #include "gpu_regs.h" #include "text_window.h" -#include "new_menu_helpers.h" #include "decompress.h" // this file's functions @@ -291,13 +290,13 @@ static void CB2_MysteryEventMenu(void) static void PrintMysteryMenuText(u8 windowId, const u8 *text, u8 x, u8 y, s32 speed) { - struct TextColor textColor; + u8 textColor[3]; u8 letterSpacing = 0; u8 lineSpacing = 1; - textColor.fgColor = 1; - textColor.bgColor = 2; - textColor.shadowColor = 3; + textColor[0] = 1; + textColor[1] = 2; + textColor[2] = 3; - FillWindowPixelBuffer(windowId, (textColor.fgColor) | (textColor.fgColor << 4)); - AddTextPrinterParameterized2(windowId, 1, x, y, letterSpacing, lineSpacing, &textColor, speed, text); + FillWindowPixelBuffer(windowId, (textColor[0]) | (textColor[0] << 4)); + AddTextPrinterParameterized2(windowId, 1, x, y, letterSpacing, lineSpacing, textColor, speed, text); } |