Merge branch 'master' into doc-playerpc

1 files changed, 5 insertions, 5 deletions

diff --git a/src/menu_specialized.c b/src/menu_specialized.c
index ab17c64a5..2fd12f2fd 100644
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -255,7 +255,7 @@ static u8 MailboxMenu_GetWindowId(u8 windowIdx)
     return sMailboxWindowIds[windowIdx];
 }
 
-static void MailboxMenu_ItemPrintFunc(u8 windowId, s32 itemId, u8 y)
+static void MailboxMenu_ItemPrintFunc(u8 windowId, u32 itemId, u8 y)
 {
     u8 buffer[30];
     u16 length;
@@ -1312,13 +1312,13 @@ static void SetConditionSparklePosition(struct Sprite *sprite)
 
     if (mon != NULL)
     {
-        sprite->pos1.x = mon->pos1.x + mon->pos2.x + sConditionSparkleCoords[sprite->sSparkleId][0];
-        sprite->pos1.y = mon->pos1.y + mon->pos2.y + sConditionSparkleCoords[sprite->sSparkleId][1];
+        sprite->x = mon->x + mon->x2 + sConditionSparkleCoords[sprite->sSparkleId][0];
+        sprite->y = mon->y + mon->y2 + sConditionSparkleCoords[sprite->sSparkleId][1];
     }
     else
     {
-        sprite->pos1.x = sConditionSparkleCoords[sprite->sSparkleId][0] + 40;
-        sprite->pos1.y = sConditionSparkleCoords[sprite->sSparkleId][1] + 104;
+        sprite->x = sConditionSparkleCoords[sprite->sSparkleId][0] + 40;
+        sprite->y = sConditionSparkleCoords[sprite->sSparkleId][1] + 104;
     }
 }