diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-07-11 10:32:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-11 10:32:30 -0400 |
| commit | 617e411aca5db4c8f3a319c1a23ac7a6343e3a87 (patch) | |
| tree | 454d2be7f4589b863b82ab64c65c0792b83f7c3d /src/item_menu.c | |
| parent | 038d247e147eec5a3b59eb8272979a686fe5c646 (diff) | |
| parent | 535189bf14d73af495705e98e4795cda61994114 (diff) | |
Merge pull request #1092 from PikalaxALT/ubfix
Fix some UB exposed with GCC 10.1.0
Diffstat (limited to 'src/item_menu.c')
| -rwxr-xr-x | src/item_menu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/item_menu.c b/src/item_menu.c index 561019e89..591ebe018 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1776,7 +1776,7 @@ void Task_ChooseHowManyToToss(u8 taskId) if (AdjustQuantityAccordingToDPadInput(&tItemCount, data[2]) == TRUE) { - PrintItemDepositAmount(gBagMenu->unk817, tItemCount); + PrintItemDepositAmount(gBagMenu->windowPointers[7], tItemCount); } else if (gMain.newKeys & A_BUTTON) { @@ -2050,7 +2050,7 @@ void Task_BuyHowManyDialogueHandleInput(u8 taskId) if (AdjustQuantityAccordingToDPadInput(&tItemCount, data[2]) == TRUE) { - PrintItemSoldAmount(gBagMenu->unk818, tItemCount, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount); + PrintItemSoldAmount(gBagMenu->windowPointers[8], tItemCount, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount); } else if (gMain.newKeys & A_BUTTON) { @@ -2094,7 +2094,7 @@ void sub_81AD8C8(u8 taskId) LoadBagItemListBuffers(gBagPositionStruct.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); BagMenu_PrintCursor_(data[0], 2); - PrintMoneyAmountInMoneyBox(gBagMenu->unk819, GetMoney(&gSaveBlock1Ptr->money), 0); + PrintMoneyAmountInMoneyBox(gBagMenu->windowPointers[9], GetMoney(&gSaveBlock1Ptr->money), 0); gTasks[taskId].func = sub_81AD9C0; } @@ -2134,7 +2134,7 @@ void sub_81ADA7C(u8 taskId) if (AdjustQuantityAccordingToDPadInput(&tItemCount, data[2]) == TRUE) { - PrintItemDepositAmount(gBagMenu->unk817, tItemCount); + PrintItemDepositAmount(gBagMenu->windowPointers[7], tItemCount); } else if (gMain.newKeys & A_BUTTON) { |