dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

sync list menu functions with firered

Browse Source
This commit is contained in:
cawtds
2025-06-02 22:51:26 +02:00
parent 0c32d840fa
commit 0fc900514b
5 changed files with 97 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/list_menu.h
View File

@@ -27,6 +27,28 @@ enum {
SCROLL_ARROW_DOWN
};
// 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 ListMenu;
struct ListMenuItem
@@ -120,8 +142,8 @@ void ListMenuGetScrollAndRow(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId);
void ListMenuOverrideSetColors(u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
void ListMenuDefaultCursorMoveFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list);
s32 ListMenuGetUnkIndicatorsStructFields(u8 taskId, u8 field);
void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value);
s32 ListMenuGetTemplateField(u8 taskId, u8 field);
void ListMenuSetTemplateField(u8 taskId, u8 field, s32 value);
u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16 *scrollOffset);
u8 AddScrollIndicatorArrowPairParameterized(u32 arrowType, s32 commonPos, s32 firstPos, s32 secondPos, s32 fullyDownThreshold, s32 tileTag, s32 palTag, u16 *scrollOffset);
void RemoveScrollIndicatorArrowPair(u8 taskId);

2
src/battle_pyramid_bag.c
View File

@@ -1312,7 +1312,7 @@ static void Task_BeginItemSwap(u8 taskId)
tListPos = gPyramidBagMenuState.scrollPosition + gPyramidBagMenuState.cursorPosition;
gPyramidBagMenu->toSwapPos = tListPos;
ListMenuSetUnkIndicatorsStructField(tListTaskId, 0x10, 1);
ListMenuSetTemplateField(tListTaskId, 0x10, 1);
CopyItemName(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode][tListPos], gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_MoveVar1Where);
FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));

2
src/item_menu.c
View File

@@ -1432,7 +1432,7 @@ static void StartItemSwap(u8 taskId)
{
s16 *data = gTasks[taskId].data;
ListMenuSetUnkIndicatorsStructField(tListTaskId, 16, 1);
ListMenuSetTemplateField(tListTaskId, 16, 1);
tListPosition = gBagPosition.scrollPosition[gBagPosition.pocket] + gBagPosition.cursorPosition[gBagPosition.pocket];
gBagMenu->toSwapPos = tListPosition;
CopyItemName(BagGetItemIdByPocketPosition(gBagPosition.pocket + 1, tListPosition), gStringVar1);

163
src/list_menu.c
View File

@@ -17,29 +17,6 @@
// This allows them to have idle animations. Cursors prior to this are simply printed text.
#define CURSOR_OBJECT_START CURSOR_RED_OUTLINE
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 ScrollIndicatorPair
{
u8 field_0;
@@ -904,104 +881,104 @@ void ListMenuDefaultCursorMoveFunc(s32 itemIndex, bool8 onInit, struct ListMenu
}
// unused
s32 ListMenuGetUnkIndicatorsStructFields(u8 taskId, u8 field)
s32 ListMenuGetTemplateField(u8 taskId, u8 field)
{
struct UnkIndicatorsStruct *data = (void *) gTasks[taskId].data;
struct ListMenu *data = (void *) gTasks[taskId].data;
switch (field)
{
case 0:
case 1:
return (s32)(data->field_4);
case 2:
return data->field_C;
case 3:
return data->field_E;
case 4:
return data->field_10;
case 5:
return data->field_11;
case 6:
return data->field_12;
case 7:
return data->field_13;
case 8:
return data->field_14_0;
case 9:
return data->field_14_1;
case 10:
return data->field_15_0;
case 11:
return data->field_15_1;
case 12:
return data->field_16_0;
case 13:
return data->field_16_1;
case 14:
return data->field_16_2;
case 15:
return data->field_17_0;
case 16:
return data->field_17_1;
case LISTFIELD_MOVECURSORFUNC:
case LISTFIELD_MOVECURSORFUNC2:
return (s32)(data->template.moveCursorFunc);
case LISTFIELD_TOTALITEMS:
return data->template.totalItems;
case LISTFIELD_MAXSHOWED:
return data->template.maxShowed;
case LISTFIELD_WINDOWID:
return data->template.windowId;
case LISTFIELD_HEADERX:
return data->template.header_X;
case LISTFIELD_ITEMX:
return data->template.item_X;
case LISTFIELD_CURSORX:
return data->template.cursor_X;
case LISTFIELD_UPTEXTY:
return data->template.upText_Y;
case LISTFIELD_CURSORPAL:
return data->template.cursorPal;
case LISTFIELD_FILLVALUE:
return data->template.fillValue;
case LISTFIELD_CURSORSHADOWPAL:
return data->template.cursorShadowPal;
case LISTFIELD_LETTERSPACING:
return data->template.lettersSpacing;
case LISTFIELD_ITEMVERTICALPADDING:
return data->template.itemVerticalPadding;
case LISTFIELD_SCROLLMULTIPLE:
return data->template.scrollMultiple;
case LISTFIELD_FONTID:
return data->template.fontId;
case LISTFIELD_CURSORKIND:
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 = (void *) &gTasks[taskId].data;
struct ListMenu *data = (void *) &gTasks[taskId].data;
switch (field)
{
case 0:
case 1:
data->field_4 = (void *)(value);
case LISTFIELD_MOVECURSORFUNC:
case LISTFIELD_MOVECURSORFUNC2:
data->template.moveCursorFunc = (void *)value;
break;
case 2:
data->field_C = value;
case LISTFIELD_TOTALITEMS:
data->template.totalItems = value;
break;
case 3:
data->field_E = value;
case LISTFIELD_MAXSHOWED:
data->template.maxShowed = value;
break;
case 4:
data->field_10 = value;
case LISTFIELD_WINDOWID:
data->template.windowId = value;
break;
case 5:
data->field_11 = value;
case LISTFIELD_HEADERX:
data->template.header_X = value;
break;
case 6:
data->field_12 = value;
case LISTFIELD_ITEMX:
data->template.item_X = value;
break;
case 7:
data->field_13 = value;
case LISTFIELD_CURSORX:
data->template.cursor_X = value;
break;
case 8:
data->field_14_0 = value;
case LISTFIELD_UPTEXTY:
data->template.upText_Y = value;
break;
case 9:
data->field_14_1 = value;
case LISTFIELD_CURSORPAL:
data->template.cursorPal = value;
break;
case 10:
data->field_15_0 = value;
case LISTFIELD_FILLVALUE:
data->template.fillValue = value;
break;
case 11:
data->field_15_1 = value;
case LISTFIELD_CURSORSHADOWPAL:
data->template.cursorShadowPal = value;
break;
case 12:
data->field_16_0 = value;
case LISTFIELD_LETTERSPACING:
data->template.lettersSpacing = value;
break;
case 13:
data->field_16_1 = value;
case LISTFIELD_ITEMVERTICALPADDING:
data->template.itemVerticalPadding = value;
break;
case 14:
data->field_16_2 = value;
case LISTFIELD_SCROLLMULTIPLE:
data->template.scrollMultiple = value;
break;
case 15:
data->field_17_0 = value;
case LISTFIELD_FONTID:
data->template.fontId = value;
break;
case 16:
data->field_17_1 = value;
case LISTFIELD_CURSORKIND:
data->template.cursorKind = value;
break;
}
}

2
src/player_pc.c
View File

@@ -1273,7 +1273,7 @@ static void ItemStorage_ExitItemList(u8 taskId)
static void ItemStorage_StartItemSwap(u8 taskId)
{
s16 *data = gTasks[taskId].data;
ListMenuSetUnkIndicatorsStructField(tListTaskId, 16, 1);
ListMenuSetTemplateField(tListTaskId, 16, 1);
sItemStorageMenu->toSwapPos = gPlayerPCItemPageInfo.itemsAbove + gPlayerPCItemPageInfo.cursorPos;
ItemStorage_SetSwapArrow(tListTaskId, 0, 0);
ItemStorage_UpdateSwapLinePos(sItemStorageMenu->toSwapPos);