From 7f3264c151a88be3f3b90ffd884fa185f4555cac Mon Sep 17 00:00:00 2001 From: sbird Date: Tue, 26 Dec 2023 14:26:07 +0100 Subject: [PATCH] [dynamic multichoice] fix -Wall warnings / errors --- src/list_menu.c | 2 +- src/scrcmd.c | 3 ++- src/script_menu.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/list_menu.c b/src/list_menu.c index f4148e5fd9..e83f325161 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -887,7 +887,7 @@ bool8 ListMenuChangeSelectionFull(struct ListMenu *list, bool32 updateCursor, bo bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown) { - ListMenuChangeSelectionFull(list, updateCursorAndCallCallback, updateCursorAndCallCallback, count, movingDown); + return ListMenuChangeSelectionFull(list, updateCursorAndCallCallback, updateCursorAndCallCallback, count, movingDown); } static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 onInit) diff --git a/src/scrcmd.c b/src/scrcmd.c index 0716d46b9b..11ae5f3d75 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1390,7 +1390,7 @@ bool8 ScrCmd_dynmultichoice(struct ScriptContext *ctx) struct ListMenuItem *items; if (argc == 0) - return; + return FALSE; if (maxBeforeScroll == 0xFF) maxBeforeScroll = DYN_MULTICHOICE_DEFAULT_MAX_BEFORE_SCROLL; @@ -1446,6 +1446,7 @@ bool8 ScrCmd_dynmultipush(struct ScriptContext *ctx) item.name = nameBuffer; item.id = id; MultichoiceDynamic_PushElement(item); + return FALSE; } bool8 ScrCmd_multichoice(struct ScriptContext *ctx) diff --git a/src/script_menu.c b/src/script_menu.c index a650306821..021f23053c 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -387,7 +387,7 @@ static void DrawMultichoiceMenuDynamic(u8 left, u8 top, u8 argc, struct ListMenu gTasks[taskId].data[2] = windowId; gTasks[taskId].data[5] = argc; gTasks[taskId].data[7] = maxBeforeScroll; - StoreWordInTwoHalfwords(&gTasks[taskId].data[3], (u32) items); + StoreWordInTwoHalfwords((u16*) &gTasks[taskId].data[3], (u32) items); list = (void *) gTasks[gTasks[taskId].data[0]].data; ListMenuChangeSelectionFull(list, TRUE, FALSE, initialRow, TRUE); @@ -524,7 +524,7 @@ static void Task_HandleScrollingMultichoiceInput(u8 taskId) RemoveScrollIndicatorArrowPair(gTasks[taskId].data[6]); } - LoadWordFromTwoHalfwords(&gTasks[taskId].data[3], (u32* )(&items)); + LoadWordFromTwoHalfwords((u16*) &gTasks[taskId].data[3], (u32* )(&items)); FreeListMenuItems(items, gTasks[taskId].data[5]); TRY_FREE_AND_SET_NULL(sDynamicMenuEventScratchPad); DestroyListMenuTask(gTasks[taskId].data[0], NULL, NULL);