diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2021-07-18 08:14:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-18 08:14:14 -0400 |
| commit | cd8ac0ed9b9e9f53979409bf1a99d62132e5001b (patch) | |
| tree | a56812ac4847017c67b4071bcc3d141b7500970d /src/player_pc.c | |
| parent | 00c0cb05b041096a55494a190ef14bb2285b4f05 (diff) | |
| parent | 864d371c25f800e7bc35fbb5620798a63545c08e (diff) | |
Merge pull request #454 from PikalaxALT/misc_fixes
Swap two fields in player PC struct
Diffstat (limited to 'src/player_pc.c')
| -rw-r--r-- | src/player_pc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/player_pc.c b/src/player_pc.c index 63131f83e..7df276e92 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -37,7 +37,7 @@ static EWRAM_DATA const u8 *sItemOrder = NULL; static EWRAM_DATA u8 sTopMenuItemCount = 0; EWRAM_DATA struct PlayerPCItemPageStruct gPlayerPcMenuManager = {}; -#define SELECTED_MAIL (gSaveBlock1Ptr->mail[PC_MAIL_NUM(gPlayerPcMenuManager.itemsAbove) + gPlayerPcMenuManager.cursorPos]) +#define SELECTED_MAIL (gSaveBlock1Ptr->mail[PC_MAIL_NUM(gPlayerPcMenuManager.cursorPos) + gPlayerPcMenuManager.itemsAbove]) static void Task_DrawPlayerPcTopMenu(u8 taskId); static void Task_TopMenuHandleInput(u8 taskId); @@ -233,8 +233,8 @@ static void Task_PlayerPcMailbox(u8 taskId) } else { - gPlayerPcMenuManager.cursorPos = 0; gPlayerPcMenuManager.itemsAbove = 0; + gPlayerPcMenuManager.cursorPos = 0; PCMailCompaction(); Task_SetPageItemVars(taskId); if (gPlayerPcMenuManager.notInRoom == FALSE) @@ -468,7 +468,7 @@ static void Task_MailboxPcHandleInput(u8 taskId) if (!gPaletteFade.active) { input = ListMenu_ProcessInput(tListMenuTaskId); - ListMenuGetScrollAndRow(tListMenuTaskId, &gPlayerPcMenuManager.itemsAbove, &gPlayerPcMenuManager.cursorPos); + ListMenuGetScrollAndRow(tListMenuTaskId, &gPlayerPcMenuManager.cursorPos, &gPlayerPcMenuManager.itemsAbove); switch (input) { case -1: @@ -482,7 +482,7 @@ static void Task_MailboxPcHandleInput(u8 taskId) PlaySE(SE_SELECT); MailboxPC_RemoveWindow(0); MailboxPC_RemoveWindow(1); - DestroyListMenuTask(tListMenuTaskId, &gPlayerPcMenuManager.itemsAbove, &gPlayerPcMenuManager.cursorPos); + DestroyListMenuTask(tListMenuTaskId, &gPlayerPcMenuManager.cursorPos, &gPlayerPcMenuManager.itemsAbove); ScheduleBgCopyTilemapToVram(0); RemoveScrollIndicatorArrowPair(gPlayerPcMenuManager.scrollIndicatorId); gTasks[taskId].func = Task_PrintWhatToDoWithSelectedMail; @@ -640,10 +640,10 @@ static void Task_TryPutMailInBag_DestroyMsgIfSuccessful(u8 taskId) ClearMailStruct(mail); PCMailCompaction(); gPlayerPcMenuManager.count--; - if (gPlayerPcMenuManager.count < gPlayerPcMenuManager.pageItems + gPlayerPcMenuManager.itemsAbove) + if (gPlayerPcMenuManager.count < gPlayerPcMenuManager.pageItems + gPlayerPcMenuManager.cursorPos) { - if (gPlayerPcMenuManager.itemsAbove != 0) - gPlayerPcMenuManager.itemsAbove--; + if (gPlayerPcMenuManager.cursorPos != 0) + gPlayerPcMenuManager.cursorPos--; } Task_SetPageItemVars(taskId); } @@ -692,10 +692,10 @@ static void CB2_ReturnToMailboxPc_UpdateScrollVariables(void) PCMailCompaction(); if (count != gPlayerPcMenuManager.count) { - if (gPlayerPcMenuManager.count < gPlayerPcMenuManager.pageItems + gPlayerPcMenuManager.itemsAbove) + if (gPlayerPcMenuManager.count < gPlayerPcMenuManager.pageItems + gPlayerPcMenuManager.cursorPos) { - if (gPlayerPcMenuManager.itemsAbove != 0) - gPlayerPcMenuManager.itemsAbove--; + if (gPlayerPcMenuManager.cursorPos != 0) + gPlayerPcMenuManager.cursorPos--; } } Task_SetPageItemVars(taskId); |