diff options
Diffstat (limited to 'src/berry_blender.c')
| -rw-r--r-- | src/berry_blender.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index c7f465967..45e3acd24 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -18,7 +18,6 @@ #include "event_data.h" #include "main.h" #include "link.h" -#include "new_menu_helpers.h" #include "item_menu_icons.h" #include "berry.h" #include "item.h" @@ -3489,7 +3488,7 @@ void ShowBerryBlenderRecordWindow(void) winTemplate = sBlenderRecordWindowTemplate; gResultsWindowId = AddWindow(&winTemplate); - sub_81973FC(gResultsWindowId, 0); + NewMenuHelpers_DrawStdWindowFrame(gResultsWindowId, 0); FillWindowPixelBuffer(gResultsWindowId, 0x11); xPos = GetStringCenterAlignXOffset(1, gText_BlenderMaxSpeedRecord, 0x90); @@ -3574,35 +3573,35 @@ static bool32 TryAddContestLinkTvShow(struct Pokeblock *pokeblock, struct TvBlen static void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 x, u8 y, s32 speed, s32 caseId) { - struct TextColor txtColor; + u8 txtColor[3]; u32 letterSpacing = 0; switch (caseId) { case 0: case 3: - txtColor.fgColor = 1; - txtColor.bgColor = 2; - txtColor.shadowColor = 3; + txtColor[0] = 1; + txtColor[1] = 2; + txtColor[2] = 3; break; case 1: - txtColor.fgColor = 0; - txtColor.bgColor = 2; - txtColor.shadowColor = 3; + txtColor[0] = 0; + txtColor[1] = 2; + txtColor[2] = 3; break; case 2: - txtColor.fgColor = 0; - txtColor.bgColor = 4; - txtColor.shadowColor = 5; + txtColor[0] = 0; + txtColor[1] = 4; + txtColor[2] = 5; break; } if (caseId != 3) { - FillWindowPixelBuffer(windowId, txtColor.fgColor | (txtColor.fgColor << 4)); + FillWindowPixelBuffer(windowId, txtColor[0] | (txtColor[0] << 4)); } - AddTextPrinterParameterized2(windowId, 1, x, y, letterSpacing, 1, &txtColor, speed, string); + AddTextPrinterParameterized2(windowId, 1, x, y, letterSpacing, 1, txtColor, speed, string); } static bool32 Blender_PrintText(s16 *textState, const u8 *string, s32 textSpeed) |