From 8e7202ec3d289305190aedc66d02435571747a76 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sun, 21 Oct 2018 02:24:57 -0500 Subject: Fix LZ compressed data alignment --- src/menu_helpers.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/menu_helpers.c') diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 8cabbde42..5070ef312 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -7,6 +7,7 @@ #include "bg.h" #include "main.h" #include "text.h" +#include "graphics.h" #include "link.h" #include "string_util.h" #include "sound.h" @@ -19,9 +20,6 @@ extern bool32 sub_800B504(void); -extern const u8 gBagSwapLineGfx[]; -extern const u8 gBagSwapLinePal[]; - // this file's functions static void Task_ContinueTaskAfterMessagePrints(u8 taskId); static void Task_CallYesOrNoCallback(u8 taskId); -- cgit v1.2.3 From 7dd4ed70601039d0c811752211b4aefa1d09b69b Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Mon, 5 Nov 2018 14:45:54 -0600 Subject: r5/r6 swap on sub_80E2578 --- src/menu_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/menu_helpers.c') diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 8cabbde42..79480cda2 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -169,7 +169,7 @@ void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *templa static void Task_CallYesOrNoCallback(u8 taskId) { - switch (Menu_ProcessInputNoWrap_()) + switch (Menu_ProcessInputNoWrapClearOnChoose()) { case 0: PlaySE(SE_SELECT); -- cgit v1.2.3 From 6d38431c330a79d97bfb72fdaaaa65901ce0fa64 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 6 Nov 2018 10:44:48 -0600 Subject: Begin cleaning text.c --- src/menu_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/menu_helpers.c') diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 5070ef312..8bd53ab85 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -134,7 +134,7 @@ void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 if (string != gStringVar4) StringExpandPlaceholders(gStringVar4, string); - gTextFlags.flag_0 = 1; + gTextFlags.canABSpeedUpPrint = 1; AddTextPrinterParameterized2(windowId, fontId, gStringVar4, textSpeed, NULL, 2, 1, 3); gUnknown_0300117C = taskFunc; gTasks[taskId].func = Task_ContinueTaskAfterMessagePrints; -- cgit v1.2.3