Replace unknown list struct

include/list_menu.h

@@ -28,6 +28,28 @@ struct ListMenuItem
 
 struct ListMenu;
 
+// For ListMenuGet/SetTemplateField
+enum ListMenuFields
+{
+    LISTFIELD_MOVECURSORFUNC = 0,
+    LISTFIELD_MOVECURSORFUNC2,
+    LISTFIELD_TOTALITEMS,
+    LISTFIELD_MAXSHOWED,
+    LISTFIELD_WINDOWID,
+    LISTFIELD_HEADERX,
+    LISTFIELD_ITEMX,
+    LISTFIELD_CURSORX,
+    LISTFIELD_UPTEXTY,
+    LISTFIELD_CURSORPAL,
+    LISTFIELD_FILLVALUE,
+    LISTFIELD_CURSORSHADOWPAL,
+    LISTFIELD_LETTERSPACING,
+    LISTFIELD_ITEMVERTICALPADDING,
+    LISTFIELD_SCROLLMULTIPLE,
+    LISTFIELD_FONTID,
+    LISTFIELD_CURSORKIND,
+};
+
 struct ListMenuTemplate
 {
     /*0x00*/ const struct ListMenuItem *items;
@@ -82,6 +104,6 @@ void ListMenuGetScrollAndRow(u8 listTaskId, u16 *cursorPos, u16 *itemsAbove);
 u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId);
 void ListMenuOverrideSetColors(u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
 void ListMenuDefaultCursorMoveFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list);
-void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value);
+void ListMenuSetTemplateField(u8 taskId, u8 field, s32 value);
 
 #endif //GUARD_LIST_MENU_H

src/item_menu.c

@@ -1224,7 +1224,7 @@ static void BeginMovingItemInPocket(u8 taskId, s16 itemIndex)
     u16 cursorPos;
     s16 *data = gTasks[taskId].data;
     ListMenuGetScrollAndRow(data[0], &cursorPos, &itemsAbove);
-    ListMenuSetUnkIndicatorsStructField(data[0], 0x10, 1);
+    ListMenuSetTemplateField(data[0], LISTFIELD_CURSORKIND, 1);
     data[1] = itemIndex;
     sBagMenuDisplay->itemOriginalLocation = itemIndex;
     StringCopy(gStringVar1, ItemId_GetName(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])));

src/item_pc.c

@@ -767,7 +767,7 @@ static void ItemPc_MoveItemModeInit(u8 taskId, s16 pos)
 {
     s16 * data = gTasks[taskId].data;
 
-    ListMenuSetUnkIndicatorsStructField(data[0], 16, 1);
+    ListMenuSetTemplateField(data[0], LISTFIELD_CURSORKIND, 1);
     data[1] = pos;
     sStateDataPtr->moveModeOrigPos = pos;
     StringCopy(gStringVar1, ItemId_GetName(ItemPc_GetItemIdBySlotId(data[1])));

src/list_menu.c

@@ -11,29 +11,6 @@
 #include "pokemon_icon.h"
 #include "constants/songs.h"
 
-struct UnkIndicatorsStruct
-{
-    u8 field_0;
-    u16 *field_4;
-    u16 field_8;
-    u16 field_A;
-    u16 field_C;
-    u16 field_E;
-    u8 field_10;
-    u8 field_11;
-    u8 field_12;
-    u8 field_13;
-    u8 field_14_0:4;
-    u8 field_14_1:4;
-    u8 field_15_0:4;
-    u8 field_15_1:4;
-    u8 field_16_0:3;
-    u8 field_16_1:3;
-    u8 field_16_2:2;
-    u8 field_17_0:6;
-    u8 field_17_1:2;
-};
-
 struct MysteryGiftLinkMenuStruct
 {
     u32 currItemId;
@@ -646,104 +623,104 @@ void ListMenuDefaultCursorMoveFunc(s32 itemIndex, bool8 onInit, struct ListMenu
         PlaySE(SE_SELECT);
 }
 
-static s32 ListMenuGetUnkIndicatorsStructFields(u8 taskId, u8 field)
+static s32 ListMenuGetTemplateField(u8 taskId, u8 field)
 {
-    struct UnkIndicatorsStruct *data = (struct UnkIndicatorsStruct *)gTasks[taskId].data;
+    struct ListMenu *data = (struct ListMenu *)gTasks[taskId].data;
 
     switch (field)
     {
-    case 0:
+    case LISTFIELD_MOVECURSORFUNC:
-    case 1:
+    case LISTFIELD_MOVECURSORFUNC2:
-        return (s32)(data->field_4);
+        return (s32)(data->template.moveCursorFunc);
-    case 2:
+    case LISTFIELD_TOTALITEMS:
-        return data->field_C;
+        return data->template.totalItems;
-    case 3:
+    case LISTFIELD_MAXSHOWED:
-        return data->field_E;
+        return data->template.maxShowed;
-    case 4:
+    case LISTFIELD_WINDOWID:
-        return data->field_10;
+        return data->template.windowId;
-    case 5:
+    case LISTFIELD_HEADERX:
-        return data->field_11;
+        return data->template.header_X;
-    case 6:
+    case LISTFIELD_ITEMX:
-        return data->field_12;
+        return data->template.item_X;
-    case 7:
+    case LISTFIELD_CURSORX:
-        return data->field_13;
+        return data->template.cursor_X;
-    case 8:
+    case LISTFIELD_UPTEXTY:
-        return data->field_14_0;
+        return data->template.upText_Y;
-    case 9:
+    case LISTFIELD_CURSORPAL:
-        return data->field_14_1;
+        return data->template.cursorPal;
-    case 10:
+    case LISTFIELD_FILLVALUE:
-        return data->field_15_0;
+        return data->template.fillValue;
-    case 11:
+    case LISTFIELD_CURSORSHADOWPAL:
-        return data->field_15_1;
+        return data->template.cursorShadowPal;
-    case 12:
+    case LISTFIELD_LETTERSPACING:
-        return data->field_16_0;
+        return data->template.lettersSpacing;
-    case 13:
+    case LISTFIELD_ITEMVERTICALPADDING:
-        return data->field_16_1;
+        return data->template.itemVerticalPadding;
-    case 14:
+    case LISTFIELD_SCROLLMULTIPLE:
-        return data->field_16_2;
+        return data->template.scrollMultiple;
-    case 15:
+    case LISTFIELD_FONTID:
-        return data->field_17_0;
+        return data->template.fontId;
-    case 16:
+    case LISTFIELD_CURSORKIND:
-        return data->field_17_1;
+        return data->template.cursorKind;
     default:
         return -1;
     }
 }
 
-void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value)
+void ListMenuSetTemplateField(u8 taskId, u8 field, s32 value)
 {
-    struct UnkIndicatorsStruct *data = (struct UnkIndicatorsStruct *)gTasks[taskId].data;
+    struct ListMenu *data = (struct ListMenu *)gTasks[taskId].data;
 
     switch (field)
     {
-    case 0:
+    case LISTFIELD_MOVECURSORFUNC:
-    case 1:
+    case LISTFIELD_MOVECURSORFUNC2:
-        data->field_4 = (void *)value;
+        data->template.moveCursorFunc = (void *)value;
         break;
-    case 2:
+    case LISTFIELD_TOTALITEMS:
-        data->field_C = value;
+        data->template.totalItems = value;
         break;
-    case 3:
+    case LISTFIELD_MAXSHOWED:
-        data->field_E = value;
+        data->template.maxShowed = value;
         break;
-    case 4:
+    case LISTFIELD_WINDOWID:
-        data->field_10 = value;
+        data->template.windowId = value;
         break;
-    case 5:
+    case LISTFIELD_HEADERX:
-        data->field_11 = value;
+        data->template.header_X = value;
         break;
-    case 6:
+    case LISTFIELD_ITEMX:
-        data->field_12 = value;
+        data->template.item_X = value;
         break;
-    case 7:
+    case LISTFIELD_CURSORX:
-        data->field_13 = value;
+        data->template.cursor_X = value;
         break;
-    case 8:
+    case LISTFIELD_UPTEXTY:
-        data->field_14_0 = value;
+        data->template.upText_Y = value;
         break;
-    case 9:
+    case LISTFIELD_CURSORPAL:
-        data->field_14_1 = value;
+        data->template.cursorPal = value;
         break;
-    case 10:
+    case LISTFIELD_FILLVALUE:
-        data->field_15_0 = value;
+        data->template.fillValue = value;
         break;
-    case 11:
+    case LISTFIELD_CURSORSHADOWPAL:
-        data->field_15_1 = value;
+        data->template.cursorShadowPal = value;
         break;
-    case 12:
+    case LISTFIELD_LETTERSPACING:
-        data->field_16_0 = value;
+        data->template.lettersSpacing = value;
         break;
-    case 13:
+    case LISTFIELD_ITEMVERTICALPADDING:
-        data->field_16_1 = value;
+        data->template.itemVerticalPadding = value;
         break;
-    case 14:
+    case LISTFIELD_SCROLLMULTIPLE:
-        data->field_16_2 = value;
+        data->template.scrollMultiple = value;
         break;
-    case 15:
+    case LISTFIELD_FONTID:
-        data->field_17_0 = value;
+        data->template.fontId = value;
         break;
-    case 16:
+    case LISTFIELD_CURSORKIND:
-        data->field_17_1 = value;
+        data->template.cursorKind = value;
         break;
     }
 }

src/pokedex_screen.c

@@ -1187,10 +1187,10 @@ static void MoveCursorFunc_DexModeSelect(s32 itemIndex, bool8 onInit, struct Lis
 static void ItemPrintFunc_DexModeSelect(u8 windowId, s32 itemId, u8 y)
 {
     u32 itemId_ = itemId;
-    if (itemId_ > 8 || sPokedexScreenData->unlockedCategories & (1 << itemId_))
+    if (itemId_ >= DEX_CATEGORY_COUNT || sPokedexScreenData->unlockedCategories & (1 << itemId_))
-        ListMenuOverrideSetColors(1, 0, 3);
+        ListMenuOverrideSetColors(TEXT_COLOR_WHITE, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GRAY);
     else
-        ListMenuOverrideSetColors(10, 0, 11);
+        ListMenuOverrideSetColors(TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_2);
 }
 
 static void Task_DexScreen_NumericalOrder(u8 taskId)