summaryrefslogtreecommitdiff
path: root/src/mystery_event_menu.c
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-02-07 18:24:42 -0600
committerGitHub <noreply@github.com>2018-02-07 18:24:42 -0600
commit250538fcae79e4d11c6efb4f4bfb34080f72bd48 (patch)
treeb81a93d022488ed5a71ce0ac80ee4dd1b5662ac9 /src/mystery_event_menu.c
parent48e63979c8a131bc059974194bd548f60dcdd24c (diff)
parent772fd47564da4d2c4072b83e43a9cc28e62ce5bb (diff)
Merge pull request #205 from Diegoisawesome/menu
Decompile menu.s and new_menu_helpers.s
Diffstat (limited to 'src/mystery_event_menu.c')
-rw-r--r--src/mystery_event_menu.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
index 0478f50cd..31b366ae9 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);
}