diff options
author | dheu <gwimminus@gmail.com> | 2019-07-10 14:50:54 +0800 |
---|---|---|
committer | dheu <gwimminus@gmail.com> | 2019-07-10 14:50:54 +0800 |
commit | da593ec33d7b59af1bd125638d5271c64c11c6e7 (patch) | |
tree | a0e81df26c77c974c5643cb4dbc63ea3558848d9 /src/item_pc.c | |
parent | 8fe7ed27febc86f61735b1395ebb5924d7607809 (diff) | |
parent | 39d68ebd445be5657a916dec1b4872717e9c40d3 (diff) |
fix: rm asm/diploma.s
Diffstat (limited to 'src/item_pc.c')
-rw-r--r-- | src/item_pc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/item_pc.c b/src/item_pc.c index 2d30416c9..abafaa8d9 100644 --- a/src/item_pc.c +++ b/src/item_pc.c @@ -653,7 +653,7 @@ static void Task_ItemPcTurnOff2(u8 taskId) if (!gPaletteFade.active && !sub_80A0AAC()) { - DestroyListMenu(data[0], &sListMenuState.scroll, &sListMenuState.row); + DestroyListMenuTask(data[0], &sListMenuState.scroll, &sListMenuState.row); if (sStateDataPtr->savedCallback != NULL) SetMainCallback2(sStateDataPtr->savedCallback); else @@ -737,7 +737,7 @@ static void Task_ItemPcMain(u8 taskId) return; } } - input = ListMenuHandleInput(data[0]); + input = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &sListMenuState.scroll, &sListMenuState.row); switch (input) { @@ -772,7 +772,7 @@ static void ItemPc_MoveItemModeInit(u8 taskId, s16 pos) { s16 * data = gTasks[taskId].data; - sub_8107BD0(data[0], 16, 1); + ListMenuSetUnkIndicatorsStructField(data[0], 16, 1); data[1] = pos; sStateDataPtr->moveModeOrigPos = pos; StringCopy(gStringVar1, ItemId_GetName(ItemPc_GetItemIdBySlotId(data[1]))); @@ -789,7 +789,7 @@ static void Task_ItemPcMoveItemModeRun(u8 taskId) { s16 * data = gTasks[taskId].data; - ListMenuHandleInput(data[0]); + ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &sListMenuState.scroll, &sListMenuState.row); sub_80986A8(-32, ListMenuGetYCoordForPrintingArrowCursor(data[0])); if (JOY_NEW(A_BUTTON | SELECT_BUTTON)) @@ -814,7 +814,7 @@ static void ItemPc_InsertItemIntoNewSlot(u8 taskId, u32 pos) else { ItemMenu_MoveItemSlotToNewPositionInArray(gSaveBlock1Ptr->pcItems, data[1], pos); - DestroyListMenu(data[0], &sListMenuState.scroll, &sListMenuState.row); + DestroyListMenuTask(data[0], &sListMenuState.scroll, &sListMenuState.row); if (data[1] < pos) sListMenuState.row--; ItemPc_BuildListMenuTemplate(); @@ -828,7 +828,7 @@ static void ItemPc_MoveItemModeCancel(u8 taskId, u32 pos) { s16 * data = gTasks[taskId].data; - DestroyListMenu(data[0], &sListMenuState.scroll, &sListMenuState.row); + DestroyListMenuTask(data[0], &sListMenuState.scroll, &sListMenuState.row); if (data[1] < pos) sListMenuState.row--; ItemPc_BuildListMenuTemplate(); @@ -947,7 +947,7 @@ static void Task_ItemPcCleanUpWithdraw(u8 taskId) ItemPc_DestroySubwindow(2); PutWindowTilemap(1); - DestroyListMenu(data[0], &sListMenuState.scroll, &sListMenuState.row); + DestroyListMenuTask(data[0], &sListMenuState.scroll, &sListMenuState.row); ItemPc_CountPcItems(); ItemPc_SetCursorPosition(); ItemPc_BuildListMenuTemplate(); |