Decompile ListMenu_ProcessInput

6 files changed, 118 insertions, 58 deletions

diff --git a/arm9/src/game_init.c b/arm9/src/game_init.c
index a7508fab..a9e0b94e 100644
--- a/arm9/src/game_init.c
+++ b/arm9/src/game_init.c
@@ -344,8 +344,8 @@ void FUN_020163BC(void)
     gMain.unk3C = 0;
     gMain.unk40 = 0;
     gMain.unk44 = 0;
-    gMain.unk48 = 0;
-    gMain.unk4C = 0;
+    gMain.newKeys = 0;
+    gMain.newAndRepeatedKeys = 0;
     gMain.unk50 = 0;
     gMain.unk54 = 8;
     gMain.unk58 = 15;
@@ -387,9 +387,9 @@ void FUN_02016464(void)
     TPData raw, calib;
     if (PAD_DetectFold())
     {
-        gMain.unk48 = 0;
+        gMain.newKeys = 0;
         gMain.unk44 = 0;
-        gMain.unk4C = 0;
+        gMain.newAndRepeatedKeys = 0;
         gMain.unk60 = 0;
         gMain.unk62 = 0;
         return;
@@ -409,9 +409,9 @@ void FUN_02016464(void)
         gMain.unk50 = gMain.unk58;
     }
     gMain.unk38 = r0;
-    gMain.unk48 = gMain.unk3C;
+    gMain.newKeys = gMain.unk3C;
     gMain.unk44 = r0;
-    gMain.unk4C = gMain.unk40;
+    gMain.newAndRepeatedKeys = gMain.unk40;
     FUN_02016568();
     if (gMain.unk64 == 0)
     {
@@ -453,26 +453,26 @@ void FUN_02016568(void)
     case 0: // Normal
         break;
     case 1: // Start = X
-        if (gMain.unk48 & PAD_BUTTON_START)
-            gMain.unk48 |= PAD_BUTTON_X;
+        if (gMain.newKeys & PAD_BUTTON_START)
+            gMain.newKeys |= PAD_BUTTON_X;
         if (gMain.unk44 & PAD_BUTTON_START)
             gMain.unk44 |= PAD_BUTTON_X;
-        if (gMain.unk4C & PAD_BUTTON_START)
-            gMain.unk4C |= PAD_BUTTON_X;
+        if (gMain.newAndRepeatedKeys & PAD_BUTTON_START)
+            gMain.newAndRepeatedKeys |= PAD_BUTTON_X;
         break;
     case 2: // Swap X and Y; unused in the retail game
         {
             u32 r1 = 0;
-            if (gMain.unk48 & PAD_BUTTON_X)
+            if (gMain.newKeys & PAD_BUTTON_X)
             {
                 r1 |= PAD_BUTTON_Y;
             }
-            if (gMain.unk48 & PAD_BUTTON_Y)
+            if (gMain.newKeys & PAD_BUTTON_Y)
             {
                 r1 |= PAD_BUTTON_X;
             }
-            gMain.unk48 &= 0xF3FF;
-            gMain.unk48 |= r1;
+            gMain.newKeys &= 0xF3FF;
+            gMain.newKeys |= r1;
         }
         {
             u32 r1 = 0;
@@ -489,28 +489,28 @@ void FUN_02016568(void)
         }
         {
             u32 r1 = 0;
-            if (gMain.unk4C & PAD_BUTTON_X)
+            if (gMain.newAndRepeatedKeys & PAD_BUTTON_X)
             {
                 r1 |= PAD_BUTTON_Y;
             }
-            if (gMain.unk4C & PAD_BUTTON_Y)
+            if (gMain.newAndRepeatedKeys & PAD_BUTTON_Y)
             {
                 r1 |= PAD_BUTTON_X;
             }
-            gMain.unk4C &= 0xF3FF;
-            gMain.unk4C |= r1;
+            gMain.newAndRepeatedKeys &= 0xF3FF;
+            gMain.newAndRepeatedKeys |= r1;
         }
         break;
     case 3: // L = A
-        if (gMain.unk48 & PAD_BUTTON_L)
-            gMain.unk48 |= PAD_BUTTON_A;
+        if (gMain.newKeys & PAD_BUTTON_L)
+            gMain.newKeys |= PAD_BUTTON_A;
         if (gMain.unk44 & PAD_BUTTON_L)
             gMain.unk44 |= PAD_BUTTON_A;
-        if (gMain.unk4C & PAD_BUTTON_L)
-            gMain.unk4C |= PAD_BUTTON_A;
-        gMain.unk48 &= 0xFCFF;
+        if (gMain.newAndRepeatedKeys & PAD_BUTTON_L)
+            gMain.newAndRepeatedKeys |= PAD_BUTTON_A;
+        gMain.newKeys &= 0xFCFF;
         gMain.unk44 &= 0xFCFF;
-        gMain.unk4C &= 0xFCFF;
+        gMain.newAndRepeatedKeys &= 0xFCFF;
     }
 }
 
diff --git a/arm9/src/list_menu.c b/arm9/src/list_menu.c
index 98136562..a0069e32 100644
--- a/arm9/src/list_menu.c
+++ b/arm9/src/list_menu.c
@@ -2,14 +2,16 @@
 
 #include "global.h"
 #include "heap.h"
+#include "main.h"
 #include "list_menu.h"
 
 extern void * FUN_02013690(u32 heap_id);
 extern void FUN_020136E0(void *, u32);
-extern void FUN_02019620(struct Window *, u32);
-void FUN_02001714(struct ListMenu *, u16, u16, u16);
-void FUN_020017AC(struct ListMenu *);
-void FUN_02001B64(struct ListMenu *, BOOL);
+extern void FillWindowPixelBuffer(struct Window *, u32);
+void ListMenuPrintEntries(struct ListMenu *, u16, u16, u16);
+void ListMenuDrawCursor(struct ListMenu *);
+BOOL ListMenuChangeSelection(struct ListMenu *, s32, u8, s32);
+void ListMenuCallSelectionChangedCallback(struct ListMenu *, BOOL);
 extern void CopyWindowToVram(struct Window *);
 
 struct ListMenu * ListMenuInit(const struct ListMenuTemplate * template, u16 cursorPos, u16 itemsAbove, u32 heap_id)
@@ -40,10 +42,68 @@ struct ListMenu * ListMenuInit(const struct ListMenuTemplate * template, u16 cur
             | ((u32)(list->template.fillValue << 24) >> 24)
         )
     );
-    FUN_02019620(list->template.window, list->template.fillValue);
-    FUN_02001714(list, list->cursorPos, 0, list->template.maxShowed);
-    FUN_020017AC(list);
-    FUN_02001B64(list, 1);
+    FillWindowPixelBuffer(list->template.window, list->template.fillValue);
+    ListMenuPrintEntries(list, list->cursorPos, 0, list->template.maxShowed);
+    ListMenuDrawCursor(list);
+    ListMenuCallSelectionChangedCallback(list, TRUE);
     CopyWindowToVram(template->window);
     return list;
 }
+
+s32 ListMenu_ProcessInput(struct ListMenu * list)
+{
+    list->unk_33 = 0;
+
+    if (gMain.newKeys & REG_PAD_KEYINPUT_A_MASK) {
+        return list->template.items[list->cursorPos + list->itemsAbove].index;
+    }
+    else if (gMain.newKeys & REG_PAD_KEYINPUT_B_MASK) {
+        return LIST_CANCEL;
+    }
+    else if (gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_UP_MASK) {
+        if (!ListMenuChangeSelection(list, TRUE, 1, FALSE))
+            list->unk_33 = 1;
+        return LIST_NOTHING_CHOSEN;
+    }
+    else if (gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_DOWN_MASK) {
+        if (!ListMenuChangeSelection(list, TRUE, 1, TRUE))
+            list->unk_33 = 2;
+        return LIST_NOTHING_CHOSEN;
+    }
+    else
+    {
+        u16 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 & REG_PAD_KEYINPUT_LEFT_MASK;
+            rightButton = gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_RIGHT_MASK;
+            break;
+        case LIST_MULTIPLE_SCROLL_L_R:
+            leftButton = gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_L_MASK;
+            rightButton = gMain.newAndRepeatedKeys & REG_PAD_KEYINPUT_R_MASK;
+            break;
+        }
+        if (leftButton)
+        {
+            if (!ListMenuChangeSelection(list, TRUE, list->template.maxShowed, FALSE))
+                list->unk_33 = 3;
+            return LIST_NOTHING_CHOSEN;
+        }
+        else if (rightButton)
+        {
+            if (!ListMenuChangeSelection(list, TRUE, list->template.maxShowed, TRUE))
+                list->unk_33 = 4;
+            return LIST_NOTHING_CHOSEN;
+        }
+        else
+        {
+            return LIST_NOTHING_CHOSEN;
+        }
+    }
+}
diff --git a/arm9/src/main.c b/arm9/src/main.c
index dd806cf8..4879cb4c 100644
--- a/arm9/src/main.c
+++ b/arm9/src/main.c
@@ -255,7 +255,7 @@ THUMB_FUNC void FUN_02000F4C(u32 arg0, u32 arg1)
     {
         HandleDSLidAction();
         FUN_02016464();
-        if (gMain.unk48 & 1)
+        if (gMain.newKeys & 1)
             break;
         FUN_02000E9C();
     }
diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c
index 4ad17e51..3bb26ac0 100644
--- a/arm9/src/scrcmd.c
+++ b/arm9/src/scrcmd.c
@@ -672,7 +672,7 @@ THUMB_FUNC BOOL ScrCmd_WaitButtonAB(struct ScriptContext *ctx)
 THUMB_FUNC static BOOL FUN_0203A46C(struct ScriptContext *ctx)
 {
 #pragma unused(ctx)
-    if (gMain.unk48 & 0x3) // Mask (A | B) ?
+    if (gMain.newKeys & 0x3) // Mask (A | B) ?
     {
         return TRUE;
     }
@@ -688,7 +688,7 @@ THUMB_FUNC BOOL ScrCmd_WaitButtonABTime(struct ScriptContext *ctx)
 
 THUMB_FUNC static BOOL FUN_0203A4AC(struct ScriptContext *ctx)
 {
-    if (gMain.unk48 & 0x3) // Mask (A | B) ?
+    if (gMain.newKeys & 0x3) // Mask (A | B) ?
     {
         return TRUE;
     }
@@ -709,27 +709,27 @@ THUMB_FUNC BOOL ScrCmd_WaitButton(struct ScriptContext *ctx)
 
 THUMB_FUNC static BOOL FUN_0203A4E0(struct ScriptContext *ctx)
 {
-    if (gMain.unk48 & 3)
+    if (gMain.newKeys & 3)
     {
         return TRUE;
     }
-    else if (gMain.unk48 & 0x40)
+    else if (gMain.newKeys & 0x40)
     {
         FUN_02055304(ctx->unk80->unk38, 0);
     }
-    else if (gMain.unk48 & 0x80)
+    else if (gMain.newKeys & 0x80)
     {
         FUN_02055304(ctx->unk80->unk38, 1);
     }
-    else if (gMain.unk48 & 0x20)
+    else if (gMain.newKeys & 0x20)
     {
         FUN_02055304(ctx->unk80->unk38, 2);
     }
-    else if (gMain.unk48 & 0x10)
+    else if (gMain.newKeys & 0x10)
     {
         FUN_02055304(ctx->unk80->unk38, 3);
     }
-    else if (gMain.unk48 & 0x400)
+    else if (gMain.newKeys & 0x400)
     {
         FUN_02039460(ctx->unk80);
     }
@@ -749,11 +749,11 @@ THUMB_FUNC BOOL ScrCmd_Unk0032(struct ScriptContext *ctx)
 THUMB_FUNC static BOOL FUN_0203A570(struct ScriptContext *ctx)
 {
 #pragma unused(ctx)
-    if (gMain.unk48 & 0x3)
+    if (gMain.newKeys & 0x3)
     {
         return TRUE;
     }
-    else if (gMain.unk48 & 0xf0)
+    else if (gMain.newKeys & 0xf0)
     {
         return TRUE;
     }
@@ -969,19 +969,19 @@ THUMB_FUNC static BOOL FUN_0203A94C(struct ScriptContext *ctx)
         return TRUE;
     }
 
-    if (gMain.unk48 & 0x40)
+    if (gMain.newKeys & 0x40)
     {
         tmp = 0;
     }
-    else if (gMain.unk48 & 0x80)
+    else if (gMain.newKeys & 0x80)
     {
         tmp = 1;
     }
-    else if (gMain.unk48 & 0x20)
+    else if (gMain.newKeys & 0x20)
     {
         tmp = 2;
     }
-    else if (gMain.unk48 & 0x10)
+    else if (gMain.newKeys & 0x10)
     {
         tmp = 3;
     }
@@ -995,7 +995,7 @@ THUMB_FUNC static BOOL FUN_0203A94C(struct ScriptContext *ctx)
     }
     else
     {
-        if (gMain.unk48 & 0x400)
+        if (gMain.newKeys & 0x400)
         {
             FUN_0201BD7C(*unk1);
             *varPtr = 1;
@@ -1018,24 +1018,24 @@ THUMB_FUNC static BOOL FUN_0203AA0C(struct ScriptContext *ctx)
     u16 *unk = GetVarPointer(ctx->unk80, (u16)ctx->data[0]);
 
     u32 tmp = 0xFFFF;
-    if (gMain.unk48 & 0x3)
+    if (gMain.newKeys & 0x3)
     {
         *unk = 0;
         return TRUE;
     }
-    else if (gMain.unk48 & 0x40)
+    else if (gMain.newKeys & 0x40)
     {
         tmp = 0;
     }
-    else if (gMain.unk48 & 0x80)
+    else if (gMain.newKeys & 0x80)
     {
         tmp = 1;
     }
-    else if (gMain.unk48 & 0x20)
+    else if (gMain.newKeys & 0x20)
     {
         tmp = 2;
     }
-    else if (gMain.unk48 & 0x10)
+    else if (gMain.newKeys & 0x10)
     {
         tmp = 3;
     }
@@ -1048,7 +1048,7 @@ THUMB_FUNC static BOOL FUN_0203AA0C(struct ScriptContext *ctx)
     }
     else
     {
-        if (gMain.unk48 & 0x400)
+        if (gMain.newKeys & 0x400)
         {
             *unk = 1;
             return TRUE;
diff --git a/arm9/src/text_02054590.c b/arm9/src/text_02054590.c
index 470a2fe3..392af46d 100644
--- a/arm9/src/text_02054590.c
+++ b/arm9/src/text_02054590.c
@@ -11,7 +11,7 @@ extern void FUN_0200CD68(u32 param0, u32 param1, u32 param2, u32 param3, u8 para
 extern u32 FUN_0201AB08(u32 *param0);
 extern void FUN_0200D0BC(u32 *param0, u32 param1, u32 param2, u32 param3);
 
-extern void FUN_02019620(u32 *param0, u32 param1);
+extern void FillWindowPixelBuffer(u32 *param0, u32 param1);
 
 extern void FUN_02002B60(u8 param0);
 extern void FUN_02002B7C(u32 param0);
@@ -52,7 +52,7 @@ THUMB_FUNC void FUN_02054608(u32 *param0, struct Options *options)
 
 THUMB_FUNC void FUN_0205464C(u32 *param0)
 {
-    FUN_02019620(param0, 15);
+    FillWindowPixelBuffer(param0, 15);
 }
 
 THUMB_FUNC u16 FUN_02054658(u8 windowId, const u16 *str, struct Options *options, u8 param3)
@@ -103,6 +103,6 @@ THUMB_FUNC void FUN_020546E0(u32 param0, u32 param1, u32 param2, u32 param3)
 THUMB_FUNC void FUN_02054744(u32 *param0, u32 param1, u32 param2)
 {
     FUN_0200D300(*param0, FUN_0201AB08(param0), 0x399, 9, (u8)param1, param2, 4);
-    FUN_02019620(param0, 15);
+    FillWindowPixelBuffer(param0, 15);
     FUN_0200D6F8(param0, 0, 0x399, 9, (u8)param1);
 }
diff --git a/arm9/src/unk_0206015C.c b/arm9/src/unk_0206015C.c
index 3d295156..a217f52c 100644
--- a/arm9/src/unk_0206015C.c
+++ b/arm9/src/unk_0206015C.c
@@ -111,7 +111,7 @@ THUMB_FUNC BOOL FUN_02060194(struct UnkStruct_0204639C *unkStruct0)
 
     case 5:
         unkStruct1->unkE += 1;
-        if (unkStruct1->unkE < 0x3c && !(gMain.unk48 & 1))
+        if (unkStruct1->unkE < 0x3c && !(gMain.newKeys & 1))
             break;
 
         MOD06_02245198(unkStruct1->unkD, unkStruct1->unk4);