Merge pull request #226 from DizzyEggg/decompile_list_menu

Decompile list menu

6 files changed, 695 insertions, 63 deletions

diff --git a/src/daycare.c b/src/daycare.c
index 36e8b208d..d567ff79a 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -41,11 +41,10 @@ extern const u8 gDaycareText_PlayOther[];
 extern u8 GetCursorSelectionMonId(void);
 extern u16 ItemIdToBattleMoveId(u16);
 extern s32 ListMenuHandleInputGetItemId(u8);
-extern void sub_81AE6C8(u8, u16*, u16*);
+extern void DestroyListMenuTask(u8, u16*, u16*);
 extern void sub_819746C(u8, bool8);
 extern void NewMenuHelpers_DrawStdWindowFrame(u8, bool8);
 extern void sub_81B9328(void);
-extern void sub_81AF078(u32, bool8, struct ListMenu *);
 extern void CB2_ReturnToField(void);
 
 // this file's functions
@@ -79,18 +78,18 @@ static const struct ListMenuTemplate sDaycareListMenuLevelTemplate =
     .unk_08 = DaycarePrintMonInfo,
     .totalItems = 3,
     .maxShowed = 3,
-    .unk_10 = 0,
+    .windowId = 0,
     .unk_11 = 0,
     .unk_12 = 8,
-    .cursor_Y = 0,
+    .cursor_X = 0,
     .upText_Y = 1,
-    .cursorColor = 2,
-    .fillColor = 1,
-    .cursorShadowColor = 3,
-    .unk_16_0 = TRUE,
-    .spaceBetweenItems = 0,
-    .unk_16_7 = FALSE,
-    .unk_17_0 = 1,
+    .cursorPal = 2,
+    .fillValue = 1,
+    .cursorShadowPal = 3,
+    .lettersSpacing = 1,
+    .unk_16_3 = 0,
+    .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
+    .fontId = 1,
     .cursorKind = 0
 };
 
@@ -1271,7 +1270,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId)
             gSpecialVar_Result = 2;
             break;
         }
-        sub_81AE6C8(gTasks[taskId].tMenuListTaskId, NULL, NULL);
+        DestroyListMenuTask(gTasks[taskId].tMenuListTaskId, NULL, NULL);
         sub_819746C(gTasks[taskId].tWindowId, TRUE);
         RemoveWindow(gTasks[taskId].tWindowId);
         DestroyTask(taskId);
@@ -1280,7 +1279,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId)
     else if (gMain.newKeys & B_BUTTON)
     {
         gSpecialVar_Result = 2;
-        sub_81AE6C8(gTasks[taskId].tMenuListTaskId, NULL, NULL);
+        DestroyListMenuTask(gTasks[taskId].tMenuListTaskId, NULL, NULL);
         sub_819746C(gTasks[taskId].tWindowId, TRUE);
         RemoveWindow(gTasks[taskId].tWindowId);
         DestroyTask(taskId);
@@ -1299,7 +1298,7 @@ void ShowDaycareLevelMenu(void)
     NewMenuHelpers_DrawStdWindowFrame(windowId, FALSE);
 
     menuTemplate = sDaycareListMenuLevelTemplate;
-    menuTemplate.unk_10 = windowId;
+    menuTemplate.windowId = windowId;
     listMenuTaskId = ListMenuInit(&menuTemplate, 0, 0);
 
     CopyWindowToVram(windowId, 3);
diff --git a/src/decoration.c b/src/decoration.c
index e4d867a34..ffa1c3a68 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -113,7 +113,7 @@ void sub_812719C(u8 taskId);
 void sub_81271CC(u8 taskId);
 void sub_8127268(u8 taskId);
 void sub_8127454(u8 *dest, u16 decorId);
-void sub_8127480(u32 a0, bool8 flag, struct ListMenu *menu);
+void sub_8127480(s32 a0, bool8 flag, struct ListMenu *menu);
 void sub_81274A0(u8 a0, s32 a1, u8 a2);
 void sub_8127620(u8 taskId);
 void sub_812764C(u8 taskId);
@@ -801,7 +801,7 @@ void sub_8127330(u8 taskId)
     sDecorPCBuffer->items[i].name = sDecorPCBuffer->names[i];
     sDecorPCBuffer->items[i].id = -2;
     gMultiuseListMenuTemplate = gUnknown_085A6BD0;
-    gMultiuseListMenuTemplate.unk_10 = sDecorMenuWindowIndices[1];
+    gMultiuseListMenuTemplate.windowId = sDecorMenuWindowIndices[1];
     gMultiuseListMenuTemplate.totalItems = sDecorPCBuffer->unk_520;
     gMultiuseListMenuTemplate.items = sDecorPCBuffer->items;
     gMultiuseListMenuTemplate.maxShowed = sDecorPCBuffer->unk_521;
@@ -813,7 +813,7 @@ void sub_8127454(u8 *dest, u16 decorId)
     StringAppend(dest, gDecorations[decorId].name);
 }
 
-void sub_8127480(u32 a0, bool8 flag, struct ListMenu *menu)
+void sub_8127480(s32 a0, bool8 flag, struct ListMenu *menu)
 {
     if (flag != TRUE)
     {
@@ -892,7 +892,7 @@ void sub_812764C(u8 taskId)
     if (!gPaletteFade.active)
     {
         input = ListMenuHandleInputGetItemId(data[13]);
-        sub_81AE860(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
+        ListMenuGetScrollAndRow(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
         switch (input)
         {
             case -1:
@@ -905,7 +905,7 @@ void sub_812764C(u8 taskId)
                 PlaySE(SE_SELECT);
                 gCurDecorationIndex = input;
                 sub_8127554();
-                sub_81AE6C8(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
+                DestroyListMenuTask(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
                 sub_8126A58(1);
                 sub_81277A8();
                 free(sDecorPCBuffer);
@@ -1074,7 +1074,7 @@ void sub_8127A8C(u8 taskId)
     data = gTasks[taskId].data;
     sub_8127554();
     sub_81277A8();
-    sub_81AE6C8(data[13], NULL, NULL);
+    DestroyListMenuTask(data[13], NULL, NULL);
     free(sDecorPCBuffer);
     sub_8126E44(taskId);
 }
diff --git a/src/item_menu.c b/src/item_menu.c
index 9090a39c5..24dce79f6 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -128,7 +128,7 @@ void sub_81ABAC4(void);
 void sub_81ABAE0(void);
 u8 sub_81AB1F0(u8);
 void sub_81AC23C(u8);
-void bag_menu_change_item_callback(u32 a, bool8 b, struct ListMenu*);
+void bag_menu_change_item_callback(s32 a, bool8 b, struct ListMenu*);
 void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a);
 void ItemMenu_UseOutOfBattle(u8 taskId);
 void ItemMenu_Toss(u8 taskId);
@@ -688,7 +688,7 @@ void get_name(s8 *dest, u16 itemId)
     }
 }
 
-void bag_menu_change_item_callback(u32 a, bool8 b, struct ListMenu *unused)
+void bag_menu_change_item_callback(s32 a, bool8 b, struct ListMenu *unused)
 {
     if (b != 1)
     {
@@ -830,7 +830,7 @@ void task_close_bag_menu_2(u8 taskId)
     s16* data = gTasks[taskId].data;
     if (!gPaletteFade.active)
     {
-        sub_81AE6C8(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
+        DestroyListMenuTask(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
         if (gUnknown_0203CE54->unk0 != 0)
             SetMainCallback2(gUnknown_0203CE54->unk0);
         else
@@ -915,7 +915,7 @@ void bag_menu_inits_lists_menu(u8 taskId)
     u16* scrollPos = &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket];
     u16* cursorPos = &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket];
     bag_menu_RemoveBagItem_message_window(4);
-    sub_81AE6C8(data[0], scrollPos, cursorPos);
+    DestroyListMenuTask(data[0], scrollPos, cursorPos);
     sub_81AB9A8(gUnknown_0203CE58.pocket);
     sub_81ABA88(gUnknown_0203CE58.pocket);
     load_bag_item_list_buffers(gUnknown_0203CE58.pocket);
@@ -967,7 +967,7 @@ void Task_BagMenu(u8 taskId)
         {
             if (sub_81AC2C0() == 1)
             {
-                sub_81AE860(data[0], scrollPos, cursorPos);
+                ListMenuGetScrollAndRow(data[0], scrollPos, cursorPos);
                 if ((*scrollPos + *cursorPos) != gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - 1)
                 {
                     PlaySE(SE_SELECT);
@@ -979,7 +979,7 @@ void Task_BagMenu(u8 taskId)
         else
         {
             int r4 = ListMenuHandleInputGetItemId(data[0]);
-            sub_81AE860(data[0], scrollPos, cursorPos);
+            ListMenuGetScrollAndRow(data[0], scrollPos, cursorPos);
             switch (r4)
             {
                 case -1:
@@ -1063,7 +1063,7 @@ void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, u16 a3)
     {
         ClearWindowTilemap(0);
         ClearWindowTilemap(1);
-        sub_81AE6C8(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
+        DestroyListMenuTask(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
         schedule_bg_copy_tilemap_to_vram(0);
         gSprites[gUnknown_0203CE54->unk806[gUnknown_0203CE54->unk81B_1 ^ 1]].invisible = 1;
         sub_81AB824();
@@ -1125,7 +1125,7 @@ void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, u16 a3)
 	adds r1, r2, r1\n\
 	adds r3, 0x8\n\
 	adds r2, r3\n\
-	bl sub_81AE6C8\n\
+	bl DestroyListMenuTask\n\
 	movs r0, 0\n\
 	bl schedule_bg_copy_tilemap_to_vram\n\
 	ldr r3, =gSprites\n\
@@ -1340,13 +1340,13 @@ void sub_81AC3C0(u8 taskId)
         if (gMain.newKeys & SELECT_BUTTON)
         {
             PlaySE(SE_SELECT);
-            sub_81AE860(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
+            ListMenuGetScrollAndRow(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
             sub_81AC498(taskId);
         }
         else
         {
             r7 = ListMenuHandleInputGetItemId(data[0]);
-            sub_81AE860(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
+            ListMenuGetScrollAndRow(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
             sub_80D4FC8(0);
             sub_80D4FEC(gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]);
             switch (r7)
@@ -1381,7 +1381,7 @@ void sub_81AC498(u8 taskId)
     {
         sub_80D702C(gBagPockets[gUnknown_0203CE58.pocket].itemSlots, data[1], realPos);
         gUnknown_0203CE54->unk81A = -1;
-        sub_81AE6C8(data[0], scrollPos, cursorPos);
+        DestroyListMenuTask(data[0], scrollPos, cursorPos);
         if (data[1] < realPos)
             gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]--;
         load_bag_item_list_buffers(gUnknown_0203CE58.pocket);
@@ -1399,7 +1399,7 @@ void sub_81AC590(u8 taskId)
     u16* cursorPos = &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket];
 
     gUnknown_0203CE54->unk81A = -1;
-    sub_81AE6C8(data[0], scrollPos, cursorPos);
+    DestroyListMenuTask(data[0], scrollPos, cursorPos);
     if (data[1] < (*scrollPos + *cursorPos))
         gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]--;
     load_bag_item_list_buffers(gUnknown_0203CE58.pocket);
@@ -1771,7 +1771,7 @@ void Task_ActuallyToss(u8 taskId)
     {
         PlaySE(SE_SELECT);
         RemoveBagItem(gSpecialVar_ItemId, data[8]);
-        sub_81AE6C8(data[0], scrollPos, cursorPos);
+        DestroyListMenuTask(data[0], scrollPos, cursorPos);
         sub_81AB9A8(gUnknown_0203CE58.pocket);
         sub_81ABA88(gUnknown_0203CE58.pocket);
         load_bag_item_list_buffers(gUnknown_0203CE58.pocket);
@@ -1791,7 +1791,7 @@ void ItemMenu_Register(u8 taskId)
         gSaveBlock1Ptr->registeredItem = 0;
     else
         gSaveBlock1Ptr->registeredItem = gSpecialVar_ItemId;
-    sub_81AE6C8(data[0], scrollPos, cursorPos);
+    DestroyListMenuTask(data[0], scrollPos, cursorPos);
     load_bag_item_list_buffers(gUnknown_0203CE58.pocket);
     data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
     schedule_bg_copy_tilemap_to_vram(0);
@@ -2039,7 +2039,7 @@ void sub_81AD8C8(u8 taskId)
     PlaySE(SE_REGI);
     RemoveBagItem(gSpecialVar_ItemId, data[8]);
     AddMoney(&gSaveBlock1Ptr->money, (itemid_get_market_price(gSpecialVar_ItemId) / 2) * data[8]);
-    sub_81AE6C8(data[0], scrollPos, cursorPos);
+    DestroyListMenuTask(data[0], scrollPos, cursorPos);
     sub_81AB9A8(gUnknown_0203CE58.pocket);
     sub_81ABA88(gUnknown_0203CE58.pocket);
     load_bag_item_list_buffers(gUnknown_0203CE58.pocket);
@@ -2212,7 +2212,7 @@ void Task_WallyTutorialBagMenu(u8 taskId)
             case 0x132:
                 PlaySE(SE_SELECT);
                 bag_menu_remove_some_window();
-                sub_81AE6C8(data[0], 0, 0);
+                DestroyListMenuTask(data[0], 0, 0);
                 RestoreBagAfterWallyTutorial();
                 unknown_ItemMenu_Confirm(taskId);
                 break;
diff --git a/src/list_menu.c b/src/list_menu.c
new file mode 100644
index 000000000..c78d32bb3
--- /dev/null
+++ b/src/list_menu.c
@@ -0,0 +1,633 @@
+#include "global.h"
+#include "menu.h"
+#include "list_menu.h"
+#include "window.h"
+#include "text_window.h"
+#include "main.h"
+#include "task.h"
+#include "menu_indicators.h"
+#include "strings.h"
+#include "sound.h"
+#include "constants/songs.h"
+
+struct UnknownMysteryGiftLinkMenuStruct
+{
+    s32 field_0;
+    u8 field_4;
+    u8 field_5;
+    u8 field_6;
+};
+
+struct UnknownListMenuPals
+{
+    u8 cursorPal:4;
+    u8 fillValue:4;
+    u8 cursorShadowPal:4;
+    u8 lettersSpacing:6;
+    u8 field_2_2:6; // unused
+    u8 fontId:7;
+    u8 field_3_7:1;
+};
+
+extern struct UnknownMysteryGiftLinkMenuStruct gUnknown_0203CE84;
+
+// this file's functions
+static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow);
+static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown);
+static void ListMenuPrintEntries(struct ListMenu *list, u16 startIndex, u16 yOffset, u16 count);
+static void ListMenuDrawCursor(struct ListMenu *list);
+static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 a2);
+static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind);
+
+// IWRAM common
+struct UnknownListMenuPals gUnknown_03006300;
+struct ListMenuTemplate gMultiuseListMenuTemplate;
+
+// code
+static void ListMenuDummyTask(u8 taskId)
+{
+
+}
+
+s32 DoMysteryGiftListMenu(struct WindowTemplate *windowTemplate, struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum)
+{
+    switch (gUnknown_0203CE84.field_4)
+    {
+    case 0:
+    default:
+        gUnknown_0203CE84.field_5 = AddWindow(windowTemplate);
+        switch (arg2)
+        {
+        case 2:
+            sub_809882C(gUnknown_0203CE84.field_5, tileNum, palNum);
+        case 1:
+            sub_8098858(gUnknown_0203CE84.field_5, tileNum, palNum / 16);
+            break;
+        }
+        gMultiuseListMenuTemplate = *listMenuTemplate;
+        gMultiuseListMenuTemplate.windowId = gUnknown_0203CE84.field_5;
+        gUnknown_0203CE84.field_6 = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0);
+        CopyWindowToVram(gUnknown_0203CE84.field_5, 1);
+        gUnknown_0203CE84.field_4 = 1;
+        break;
+    case 1:
+        gUnknown_0203CE84.field_0 = ListMenuHandleInputGetItemId(gUnknown_0203CE84.field_6);
+        if (gMain.newKeys & A_BUTTON)
+        {
+            gUnknown_0203CE84.field_4 = 2;
+        }
+        if (gMain.newKeys & B_BUTTON)
+        {
+            gUnknown_0203CE84.field_0 = LIST_B_PRESSED;
+            gUnknown_0203CE84.field_4 = 2;
+        }
+        if (gUnknown_0203CE84.field_4 == 2)
+        {
+            if (arg2 == 0)
+            {
+                ClearWindowTilemap(gUnknown_0203CE84.field_5);
+            }
+            else
+            {
+                switch (arg2)
+                {
+                case 0: // can never be reached, because of the if statement above
+                    sub_819746C(gUnknown_0203CE84.field_5, FALSE);
+                    break;
+                case 2:
+                case 1:
+                    sub_819746C(gUnknown_0203CE84.field_5, FALSE);
+                    break;
+                }
+            }
+
+            CopyWindowToVram(gUnknown_0203CE84.field_5, 1);
+        }
+        break;
+    case 2:
+        DestroyListMenuTask(gUnknown_0203CE84.field_6, NULL, NULL);
+        RemoveWindow(gUnknown_0203CE84.field_5);
+        gUnknown_0203CE84.field_4 = 0;
+        return gUnknown_0203CE84.field_0;
+    }
+
+    return -1;
+}
+
+u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow)
+{
+    u8 taskId = ListMenuInitInternal(listMenuTemplate, scrollOffset, selectedRow);
+    PutWindowTilemap(listMenuTemplate->windowId);
+    CopyWindowToVram(listMenuTemplate->windowId, 2);
+
+    return taskId;
+}
+
+// unused
+u8 ListMenuInitWithWindows(struct ListMenuTemplate *listMenuTemplate, struct UnknownListMenuWindowStruct *arg1, u16 scrollOffset, u16 selectedRow)
+{
+    s32 i;
+
+    u8 taskId = ListMenuInitInternal(listMenuTemplate, scrollOffset, selectedRow);
+    for (i = 0; arg1[i].palNum != 0xFF; i++)
+    {
+        PutWindowRectTilemapOverridePalette(listMenuTemplate->windowId,
+                                            arg1[i].x,
+                                            arg1[i].y,
+                                            arg1[i].width,
+                                            arg1[i].height,
+                                            arg1[i].palNum);
+    }
+    CopyWindowToVram(listMenuTemplate->windowId, 2);
+
+    return taskId;
+}
+
+s32 ListMenuHandleInputGetItemId(u8 listTaskId)
+{
+    struct ListMenu *list = (void*) gTasks[listTaskId].data;
+
+    if (gMain.newKeys & A_BUTTON)
+    {
+        return list->template.items[list->scrollOffset + list->selectedRow].id;
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        return LIST_B_PRESSED;
+    }
+    else if (gMain.newAndRepeatedKeys & DPAD_UP)
+    {
+        ListMenuChangeSelection(list, TRUE, 1, FALSE);
+        return LIST_NOTHING_CHOSEN;
+    }
+    else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
+    {
+        ListMenuChangeSelection(list, TRUE, 1, TRUE);
+        return LIST_NOTHING_CHOSEN;
+    }
+    else // try to move by one window scroll
+    {
+        bool16 rightButton, leftButton;
+        switch (list->template.scrollMultiple)
+        {
+        case LIST_NO_MULTIPLE_SCROLL:
+        default:
+            leftButton = FALSE;
+            rightButton = FALSE;
+            break;
+        case LIST_MULTIPLE_SCROLL_DPAD:
+            leftButton = gMain.newAndRepeatedKeys & DPAD_LEFT;
+            rightButton = gMain.newAndRepeatedKeys & DPAD_RIGHT;
+            break;
+        case LIST_MULTIPLE_SCROLL_L_R:
+            leftButton = gMain.newAndRepeatedKeys & L_BUTTON;
+            rightButton = gMain.newAndRepeatedKeys & R_BUTTON;
+            break;
+        }
+
+        if (leftButton)
+        {
+            ListMenuChangeSelection(list, TRUE, list->template.maxShowed, FALSE);
+            return LIST_NOTHING_CHOSEN;
+        }
+        else if (rightButton)
+        {
+            ListMenuChangeSelection(list, TRUE, list->template.maxShowed, TRUE);
+            return LIST_NOTHING_CHOSEN;
+        }
+        else
+        {
+            return LIST_NOTHING_CHOSEN;
+        }
+    }
+}
+
+void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
+{
+    struct ListMenu *list = (void*) gTasks[listTaskId].data;
+
+    if (scrollOffset != NULL)
+        *scrollOffset = list->scrollOffset;
+    if (selectedRow != NULL)
+        *selectedRow = list->selectedRow;
+
+    if (list->unk_1E != 0xFF)
+        ListMenuRemoveCursorObject(list->unk_1E, list->template.cursorKind - 2);
+
+    DestroyTask(listTaskId);
+}
+
+void sub_81AE70C(u8 listTaskId)
+{
+    struct ListMenu *list = (void*) gTasks[listTaskId].data;
+
+    FillWindowPixelBuffer(list->template.windowId, (list->template.fillValue << 4) | (list->template.fillValue));
+    ListMenuPrintEntries(list, list->scrollOffset, 0, list->template.maxShowed);
+    ListMenuDrawCursor(list);
+    CopyWindowToVram(list->template.windowId, 2);
+}
+
+// unused
+void ChangeListMenuPals(u8 listTaskId, u8 cursorPal, u8 fillValue, u8 cursorShadowPal)
+{
+    struct ListMenu *list = (void*) gTasks[listTaskId].data;
+
+    list->template.cursorPal = cursorPal;
+    list->template.fillValue = fillValue;
+    list->template.cursorShadowPal = cursorShadowPal;
+}
+
+// unused
+void ChangeListMenuCoords(u8 listTaskId, u8 x, u8 y)
+{
+    struct ListMenu *list = (void*) gTasks[listTaskId].data;
+
+    SetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT, x);
+    SetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP, y);
+}
+
+// unused
+s32 ListMenuTestInput(struct ListMenuTemplate *template, u32 scrollOffset, u32 selectedRow, u16 keys, u16 *newScrollOffset, u16 *newSelectedRow)
+{
+    struct ListMenu list;
+
+    list.template = *template;
+    list.scrollOffset = scrollOffset;
+    list.selectedRow = selectedRow;
+    list.unk_1C = 0;
+    list.unk_1D = 0;
+
+    if (keys == DPAD_UP)
+        ListMenuChangeSelection(&list, FALSE, 1, FALSE);
+    if (keys == DPAD_DOWN)
+        ListMenuChangeSelection(&list, FALSE, 1, TRUE);
+
+    if (newScrollOffset != NULL)
+        *newScrollOffset = list.scrollOffset;
+    if (newSelectedRow != NULL)
+        *newSelectedRow = list.selectedRow;
+
+    return LIST_NOTHING_CHOSEN;
+}
+
+void ListMenuGetCurrentItemArrayId(u8 listTaskId, u16 *arrayId)
+{
+    struct ListMenu *list = (void*) gTasks[listTaskId].data;
+
+    if (arrayId != NULL)
+        *arrayId = list->scrollOffset + list->selectedRow;
+}
+
+void ListMenuGetScrollAndRow(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
+{
+    struct ListMenu *list = (void*) gTasks[listTaskId].data;
+
+    if (scrollOffset != NULL)
+        *scrollOffset = list->scrollOffset;
+    if (selectedRow != NULL)
+        *selectedRow = list->selectedRow;
+}
+
+u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId)
+{
+    struct ListMenu *list = (void*) gTasks[listTaskId].data;
+    u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3;
+
+    return list->selectedRow * yMultiplier + list->template.upText_Y;
+}
+
+static u8 ListMenuInitInternal(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow)
+{
+    u8 listTaskId = CreateTask(ListMenuDummyTask, 0);
+    struct ListMenu *list = (void*) gTasks[listTaskId].data;
+
+    list->template = *listMenuTemplate;
+    list->scrollOffset = scrollOffset;
+    list->selectedRow = selectedRow;
+    list->unk_1C = 0;
+    list->unk_1D = 0;
+    list->unk_1E = 0xFF;
+    list->unk_1F = 0;
+
+    gUnknown_03006300.cursorPal = list->template.cursorPal;
+    gUnknown_03006300.fillValue = list->template.fillValue;
+    gUnknown_03006300.cursorShadowPal = list->template.cursorShadowPal;
+    gUnknown_03006300.lettersSpacing = list->template.lettersSpacing;
+    gUnknown_03006300.fontId = list->template.fontId;
+    gUnknown_03006300.field_3_7 = 0;
+
+    if (list->template.totalItems < list->template.maxShowed)
+        list->template.maxShowed = list->template.totalItems;
+
+    FillWindowPixelBuffer(list->template.windowId, (list->template.fillValue << 4) | (list->template.fillValue));
+    ListMenuPrintEntries(list, list->scrollOffset, 0, list->template.maxShowed);
+    ListMenuDrawCursor(list);
+    ListMenuCallSelectionChangedCallback(list, 1);
+
+    return listTaskId;
+}
+
+static void ListMenuPrint(struct ListMenu *list, const u8 *str, u8 x, u8 y)
+{
+    u8 colors[3];
+    if (gUnknown_03006300.field_3_7)
+    {
+        colors[0] = gUnknown_03006300.fillValue;
+        colors[1] = gUnknown_03006300.cursorPal;
+        colors[2] = gUnknown_03006300.cursorShadowPal;
+        AddTextPrinterParameterized2(list->template.windowId,
+                                     gUnknown_03006300.fontId,
+                                     x, y,
+                                     gUnknown_03006300.lettersSpacing,
+                                     0, colors, TEXT_SPEED_FF, str);
+
+        gUnknown_03006300.field_3_7 = 0;
+    }
+    else
+    {
+        colors[0] = list->template.fillValue;
+        colors[1] = list->template.cursorPal;
+        colors[2] = list->template.cursorShadowPal;
+        AddTextPrinterParameterized2(list->template.windowId,
+                                     list->template.fontId,
+                                     x, y,
+                                     list->template.lettersSpacing,
+                                     0, colors, TEXT_SPEED_FF, str);
+    }
+}
+
+static void ListMenuPrintEntries(struct ListMenu *list, u16 startIndex, u16 yOffset, u16 count)
+{
+    s32 i;
+    u8 x, y;
+    u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3;
+
+    for (i = 0; i < count; i++)
+    {
+        if (list->template.items[startIndex].id != -3)
+            x = list->template.unk_12;
+        else
+            x = list->template.unk_11;
+
+        y = (yOffset + i) * yMultiplier + list->template.upText_Y;
+        if (list->template.unk_08 != NULL)
+            list->template.unk_08(list->template.windowId, list->template.items[startIndex].id, y);
+
+        ListMenuPrint(list, list->template.items[startIndex].name, x, y);
+        startIndex++;
+    }
+}
+
+static void ListMenuDrawCursor(struct ListMenu *list)
+{
+    u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3;
+    u8 x = list->template.cursor_X;
+    u8 y = list->selectedRow * yMultiplier + list->template.upText_Y;
+    switch (list->template.cursorKind)
+    {
+    case 0:
+        ListMenuPrint(list, gText_SelectorArrow2, x, y);
+        break;
+    case 1:
+        break;
+    case 2:
+        if (list->unk_1E == 0xFF)
+            list->unk_1E = ListMenuAddCursorObject(list, 0);
+        ListMenuUpdateCursorObject(list->unk_1E,
+                                   GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT) * 8 - 1,
+                                   GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y - 1, 0);
+        break;
+    case 3:
+        if (list->unk_1E == 0xFF)
+            list->unk_1E = ListMenuAddCursorObject(list, 1);
+        ListMenuUpdateCursorObject(list->unk_1E,
+                                   GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT) * 8 + x,
+                                   GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y, 1);
+        break;
+    }
+}
+
+static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind)
+{
+    struct CursorStruct cursor;
+
+    cursor.unk0 = 0;
+    cursor.unk1 = 0xA0;
+    cursor.unk2 = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8 + 2;
+    cursor.unk4 = GetFontAttribute(list->template.fontId, 1) + 2;
+    cursor.unk6 = 0x4000;
+    cursor.unk8 = 0xFFFF;
+    cursor.unkA = 0xF;
+
+    return ListMenuAddCursorObjectInternal(&cursor, cursorKind);
+}
+
+static void ListMenuErasePrintedCursor(struct ListMenu *list, u16 selectedRow)
+{
+    u8 cursorKind = list->template.cursorKind;
+    if (cursorKind == 0)
+    {
+        u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3;
+        u8 width  = GetMenuCursorDimensionByFont(list->template.fontId, 0);
+        u8 height = GetMenuCursorDimensionByFont(list->template.fontId, 1);
+        FillWindowPixelRect(list->template.windowId,
+                            (list->template.fillValue << 4) | (list->template.fillValue),
+                            list->template.cursor_X,
+                            selectedRow * yMultiplier + list->template.upText_Y,
+                            width,
+                            height);
+    }
+}
+
+static u8 ListMenuUpdateSelectedRowIndexAndScrollOffset(struct ListMenu *list, bool8 movingDown)
+{
+    u16 selectedRow = list->selectedRow;
+    u16 scrollOffset = list->scrollOffset;
+    u16 newRow;
+    u32 newScroll;
+
+    if (!movingDown)
+    {
+        if (list->template.maxShowed == 1)
+            newRow = 0;
+        else
+            newRow = list->template.maxShowed - ((list->template.maxShowed / 2) + (list->template.maxShowed % 2)) - 1;
+
+        if (scrollOffset == 0)
+        {
+            while (selectedRow != 0)
+            {
+                selectedRow--;
+                if (list->template.items[scrollOffset + selectedRow].id != -3)
+                {
+                    list->selectedRow = selectedRow;
+                    return 1;
+                }
+            }
+
+            return 0;
+        }
+        else
+        {
+            while (selectedRow > newRow)
+            {
+                selectedRow--;
+                if (list->template.items[scrollOffset + selectedRow].id != -3)
+                {
+                    list->selectedRow = selectedRow;
+                    return 1;
+                }
+            }
+
+            newScroll = scrollOffset - 1;
+        }
+    }
+    else
+    {
+        if (list->template.maxShowed == 1)
+            newRow = 0;
+        else
+            newRow = ((list->template.maxShowed / 2) + (list->template.maxShowed % 2));
+
+        if (scrollOffset == list->template.totalItems - list->template.maxShowed)
+        {
+            while (selectedRow < list->template.maxShowed - 1)
+            {
+                selectedRow++;
+                if (list->template.items[scrollOffset + selectedRow].id != -3)
+                {
+                    list->selectedRow = selectedRow;
+                    return 1;
+                }
+            }
+
+            return 0;
+        }
+        else
+        {
+            while (selectedRow < newRow)
+            {
+                selectedRow++;
+                if (list->template.items[scrollOffset + selectedRow].id != -3)
+                {
+                    list->selectedRow = selectedRow;
+                    return 1;
+                }
+            }
+
+            newScroll = scrollOffset + 1;
+        }
+    }
+
+    list->selectedRow = newRow;
+    list->scrollOffset = newScroll;
+    return 2;
+}
+
+static void ListMenuScroll(struct ListMenu *list, u8 count, bool8 movingDown)
+{
+    if (count >= list->template.maxShowed)
+    {
+        FillWindowPixelBuffer(list->template.windowId, (list->template.fillValue << 4) | (list->template.fillValue));
+        ListMenuPrintEntries(list, list->scrollOffset, 0, list->template.maxShowed);
+    }
+    else
+    {
+        u8 yMultiplier = GetFontAttribute(list->template.fontId, 1) + list->template.unk_16_3;
+
+        if (!movingDown)
+        {
+            u16 y, width, height;
+
+            ScrollWindow(list->template.windowId, 1, count * yMultiplier, (list->template.fillValue << 4) | (list->template.fillValue));
+            ListMenuPrintEntries(list, list->scrollOffset, 0, count);
+
+            y = (list->template.maxShowed * yMultiplier) + list->template.upText_Y;
+            width = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8;
+            height = (GetWindowAttribute(list->template.windowId, WINDOW_HEIGHT) * 8) - y;
+            FillWindowPixelRect(list->template.windowId,
+                                (list->template.fillValue << 4) | (list->template.fillValue),
+                                0, y, width, height);
+        }
+        else
+        {
+            u16 width;
+
+            ScrollWindow(list->template.windowId, 0, count * yMultiplier, (list->template.fillValue << 4) | (list->template.fillValue));
+            ListMenuPrintEntries(list, list->scrollOffset + (list->template.maxShowed - count), list->template.maxShowed - count, count);
+
+            width = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8;
+            FillWindowPixelRect(list->template.windowId,
+                                (list->template.fillValue << 4) | (list->template.fillValue),
+                                0, 0, width, list->template.upText_Y);
+        }
+    }
+}
+
+static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown)
+{
+    u16 oldSelectedRow;
+    u8 selectionChange, i, cursorCount;
+
+    oldSelectedRow = list->selectedRow;
+    cursorCount = 0;
+    selectionChange = 0;
+    for (i = 0; i < count; i++)
+    {
+        do
+        {
+            u8 ret = ListMenuUpdateSelectedRowIndexAndScrollOffset(list, movingDown);
+            selectionChange |= ret;
+            if (ret != 2)
+                break;
+            cursorCount++;
+        } while (list->template.items[list->scrollOffset + list->selectedRow].id == -3);
+    }
+
+    if (updateCursorAndCallCallback)
+    {
+        switch (selectionChange)
+        {
+        case 0:
+        default:
+            return TRUE;
+        case 1:
+            ListMenuErasePrintedCursor(list, oldSelectedRow);
+            ListMenuDrawCursor(list);
+            ListMenuCallSelectionChangedCallback(list, 0);
+            CopyWindowToVram(list->template.windowId, 2);
+            break;
+        case 2:
+        case 3:
+            ListMenuErasePrintedCursor(list, oldSelectedRow);
+            ListMenuScroll(list, cursorCount, movingDown);
+            ListMenuDrawCursor(list);
+            ListMenuCallSelectionChangedCallback(list, 0);
+            CopyWindowToVram(list->template.windowId, 2);
+            break;
+        }
+    }
+
+    return FALSE;
+}
+
+static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 a2)
+{
+    if (list->template.moveCursorFunc != NULL)
+        list->template.moveCursorFunc(list->template.items[list->scrollOffset + list->selectedRow].id, a2, list);
+}
+
+// unused
+void sub_81AF028(u8 cursorPal, u8 fillValue, u8 cursorShadowPal)
+{
+    gUnknown_03006300.cursorPal = cursorPal;
+    gUnknown_03006300.fillValue = fillValue;
+    gUnknown_03006300.cursorShadowPal = cursorShadowPal;
+    gUnknown_03006300.field_3_7 = 1;
+}
+
+void sub_81AF078(s32 arg0, u8 arg1, struct ListMenu *list)
+{
+    if (!arg1)
+        PlaySE(SE_SELECT);
+}
diff --git a/src/pokeblock.c b/src/pokeblock.c
index b9a1f6bf3..b244409c4 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -91,7 +91,7 @@ static void sub_81362E0(void);
 static void sub_8136344(void);
 static void HandlePokeblockListMenuItems(void);
 static void sub_81363BC(void);
-static void MovePokeblockMenuCursor(u32 pkblId, bool8 arg1, struct ListMenu *arg2);
+static void MovePokeblockMenuCursor(s32 pkblId, bool8 arg1, struct ListMenu *arg2);
 static void PutPokeblockInfoText(void);
 static void HandlePokeblockMenuCursor(u16 cursorPos, u16 arg1);
 static void PutPokeblockListMenuString(u8 *dst, u16 pkblId);
@@ -319,18 +319,18 @@ static const struct ListMenuTemplate sPokeblockListMenuTemplate =
     .unk_08 = NULL,
     .totalItems = 0,
     .maxShowed = 0,
-    .unk_10 = 1,
+    .windowId = 1,
     .unk_11 = 0,
     .unk_12 = 1,
-    .cursor_Y = 0,
+    .cursor_X = 0,
     .upText_Y = 1,
-    .cursorColor = 2,
-    .fillColor = 0,
-    .cursorShadowColor = 3,
-    .unk_16_0 = FALSE,
-    .spaceBetweenItems = 32,
-    .unk_16_7 = FALSE,
-    .unk_17_0 = 1,
+    .cursorPal = 2,
+    .fillValue = 0,
+    .cursorShadowPal = 3,
+    .lettersSpacing = 0,
+    .unk_16_3 = 0,
+    .scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD,
+    .fontId = 1,
     .cursorKind = 1
 };
 
@@ -620,7 +620,7 @@ static void HandlePokeblockListMenuItems(void)
     sPokeblockMenu->items[i].id = LIST_B_PRESSED;
 
     gMultiuseListMenuTemplate = sPokeblockListMenuTemplate;
-    gMultiuseListMenuTemplate.unk_17_0 = 7;
+    gMultiuseListMenuTemplate.fontId = 7;
     gMultiuseListMenuTemplate.totalItems = sPokeblockMenu->itemsNo;
     gMultiuseListMenuTemplate.items = sPokeblockMenu->items;
     gMultiuseListMenuTemplate.maxShowed = sPokeblockMenu->maxShowed;
@@ -639,7 +639,7 @@ static void PutPokeblockListMenuString(u8 *dst, u16 pkblId)
     StringExpandPlaceholders(txtPtr, gText_LvVar1);
 }
 
-static void MovePokeblockMenuCursor(u32 pkblId, bool8 arg1, struct ListMenu *arg2)
+static void MovePokeblockMenuCursor(s32 pkblId, bool8 arg1, struct ListMenu *arg2)
 {
     if (arg1 != TRUE)
     {
@@ -869,7 +869,7 @@ static void Task_FreeDataAndExitPokeblockCase(u8 taskId)
         if (sPokeblockMenu->caseId == PBLOCK_CASE_FEEDER || sPokeblockMenu->caseId == PBLOCK_CASE_GIVE)
             gFieldCallback = sub_80AF168;
 
-        sub_81AE6C8(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
+        DestroyListMenuTask(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
         sub_8136418();
         ResetSpriteData();
         FreeAllSpritePalettes();
@@ -893,7 +893,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId)
     {
         if (gMain.newKeys & SELECT_BUTTON)
         {
-            sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
+            ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
             if (sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos != sPokeblockMenu->itemsNo - 1)
             {
                 PlaySE(SE_SELECT);
@@ -908,7 +908,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId)
             u16 oldPosition = sSavedPokeblockData.lastItemPos;
             s32 itemId = ListMenuHandleInputGetItemId(data[0]);
 
-            sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
+            ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
             if (oldPosition != sSavedPokeblockData.lastItemPos)
             {
                 HandlePokeblockMenuCursor(oldPosition, 5);
@@ -945,7 +945,7 @@ static void Task_HandlePokeblocksSwapInput(u8 taskId)
     if (gMain.newKeys & SELECT_BUTTON)
     {
         PlaySE(SE_SELECT);
-        sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
+        ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
         HandlePokeblocksSwap(taskId, FALSE);
     }
     else
@@ -954,7 +954,7 @@ static void Task_HandlePokeblocksSwapInput(u8 taskId)
         u16 var = sSavedPokeblockData.lastItemPos;
         s32 itemId = ListMenuHandleInputGetItemId(data[0]);
 
-        sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
+        ListMenuGetScrollAndRow(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
         if (i != sSavedPokeblockData.lastItemPage || var != sSavedPokeblockData.lastItemPos)
         {
             for (i = 0; i < 9; i++)
@@ -996,7 +996,7 @@ static void HandlePokeblocksSwap(u8 taskId, bool8 noSwap)
     u16 swappedFromId = sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos;
 
     sPokeblockMenu->isSwapping = FALSE;
-    sub_81AE6C8(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
+    DestroyListMenuTask(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
 
     if (!noSwap && data[2] != swappedFromId && data[2] != swappedFromId - 1)
     {
@@ -1112,7 +1112,7 @@ static void HandleErasePokeblock(u8 taskId)
         lastPos = &sSavedPokeblockData.lastItemPos;
         data = gTasks[taskId].data;
 
-        sub_81AE6C8(data[0], lastPage, lastPos);
+        DestroyListMenuTask(data[0], lastPage, lastPos);
         HandlePokeblockMenuCursor(*lastPos, 5);
         SetMenuItemsCountAndMaxShowed();
         sub_81362E0();
diff --git a/src/secret_base.c b/src/secret_base.c
index df754f2a0..c886912f4 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -6,8 +6,8 @@
 #include "main.h"
 #include "task.h"
 #include "palette.h"
-#include "list_menu.h"
 #include "window.h"
+#include "list_menu.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "menu_indicators.h"
@@ -66,7 +66,7 @@ EWRAM_DATA struct SecretBaseListMenuBuffer *gUnknown_0203A020 = NULL;
 
 void sub_80E9C9C(u8 taskId);
 void game_continue(u8 taskId);
-void sub_80E9DEC(u32 a0, bool8 flag, struct ListMenu *menu);
+void sub_80E9DEC(s32 a0, bool8 flag, struct ListMenu *menu);
 void sub_80E9E00(u8 taskId);
 void sub_80E9E44(u8 taskId);
 void sub_80E9E90(u8 taskId);
@@ -913,13 +913,13 @@ void game_continue(u8 taskId)
         data[3] = 8;
     }
     gMultiuseListMenuTemplate = gUnknown_0858D07C;
-    gMultiuseListMenuTemplate.unk_10 = data[6];
+    gMultiuseListMenuTemplate.windowId = data[6];
     gMultiuseListMenuTemplate.totalItems = data[0];
     gMultiuseListMenuTemplate.items = gUnknown_0203A020->items;
     gMultiuseListMenuTemplate.maxShowed = data[3];
 }
 
-void sub_80E9DEC(u32 a0, bool8 flag, struct ListMenu *menu)
+void sub_80E9DEC(s32 a0, bool8 flag, struct ListMenu *menu)
 {
     if (flag != TRUE)
     {
@@ -953,14 +953,14 @@ void sub_80E9E90(u8 taskId)
 
     data = gTasks[taskId].data;
     input = ListMenuHandleInputGetItemId(data[5]);
-    sub_81AE860(data[5], &data[2], &data[1]);
+    ListMenuGetScrollAndRow(data[5], &data[2], &data[1]);
     switch (input)
     {
         case -1:
             break;
         case -2:
             PlaySE(SE_SELECT);
-            sub_81AE6C8(data[5], NULL, NULL);
+            DestroyListMenuTask(data[5], NULL, NULL);
             RemoveScrollIndicatorArrowPair(data[8]);
             sub_819746C(data[6], 0);
             ClearWindowTilemap(data[6]);
@@ -1042,7 +1042,7 @@ void sub_80EA08C(u8 taskId)
 
     data = gTasks[taskId].data;
     sub_8197434(0, 0);
-    sub_81AE6C8(data[5], &data[2], &data[1]);
+    DestroyListMenuTask(data[5], &data[2], &data[1]);
     gSaveBlock1Ptr->secretBases[data[4]].sbr_field_1_6 = 0;
     game_continue(taskId);
     sub_812225C(&data[2], &data[1], data[3], data[0]);
@@ -1061,7 +1061,7 @@ void sub_80EA13C(u8 taskId)
 
     data = gTasks[taskId].data;
     sub_8197434(0, 0);
-    sub_81AE6C8(data[5], &data[2], &data[1]);
+    DestroyListMenuTask(data[5], &data[2], &data[1]);
     sub_80E9E00(taskId);
     gTasks[taskId].func = sub_80E9E90;
 }