Merge pull request pret#454 from PikalaxALT/misc_fixes

Swap two fields in player PC struct
Sunnhild · Jul 18, 2021 · cd8ac0e · cd8ac0e
2 parents 00c0cb0 + 864d371
commit cd8ac0e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/include/player_pc.h b/include/player_pc.h
@@ -8,8 +8,8 @@
 
 struct PlayerPCItemPageStruct
 {
-    u16 cursorPos;
     u16 itemsAbove;
+    u16 cursorPos;
     u8 pageItems;
     u8 count;
     u8 filler_6[3];

diff --git a/src/mailbox_pc.c b/src/mailbox_pc.c
@@ -120,7 +120,7 @@ u8 MailboxPC_InitListMenu(struct PlayerPCItemPageStruct * playerPcStruct)
     gMultiuseListMenuTemplate.itemPrintFunc = ItemPrintFunc;
     gMultiuseListMenuTemplate.cursorKind = 0;
     gMultiuseListMenuTemplate.scrollMultiple = 0;
-    return ListMenuInit(&gMultiuseListMenuTemplate, playerPcStruct->itemsAbove, playerPcStruct->cursorPos);
+    return ListMenuInit(&gMultiuseListMenuTemplate, playerPcStruct->cursorPos, playerPcStruct->itemsAbove);
 }
 
 static void MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu * list)
@@ -131,7 +131,7 @@ static void MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu * list)
 
 void MailboxPC_AddScrollIndicatorArrows(struct PlayerPCItemPageStruct * playerPcStruct)
 {
-    playerPcStruct->scrollIndicatorId = AddScrollIndicatorArrowPairParameterized(2, 0xC2, 0xC, 0x94, playerPcStruct->count - playerPcStruct->pageItems + 1, 110, 110, &playerPcStruct->itemsAbove);
+    playerPcStruct->scrollIndicatorId = AddScrollIndicatorArrowPairParameterized(2, 0xC2, 0xC, 0x94, playerPcStruct->count - playerPcStruct->pageItems + 1, 110, 110, &playerPcStruct->cursorPos);
 }
 
 void MailboxPC_DestroyListMenuBuffer(void)

diff --git a/src/party_menu.c b/src/party_menu.c
@@ -5665,7 +5665,7 @@ static void TryGiveMailToSelectedMon(u8 taskId)
     struct MailStruct *mail;
 
     gPartyMenuUseExitCallback = FALSE;
-    mail = &gSaveBlock1Ptr->mail[gPlayerPcMenuManager.itemsAbove + 6 + gPlayerPcMenuManager.cursorPos];
+    mail = &gSaveBlock1Ptr->mail[gPlayerPcMenuManager.cursorPos + 6 + gPlayerPcMenuManager.itemsAbove];
     if (GetMonData(mon, MON_DATA_HELD_ITEM) != ITEM_NONE)
     {
         DisplayPartyMenuMessage(gText_PkmnHoldingItemCantHoldMail, TRUE);

diff --git 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);