dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-playerpc

Browse Source
This commit is contained in:
GriffinR
2021-08-02 14:08:10 -04:00
committed by GitHub
parent 06b909bcd8 d391486247
commit bd5cf07059
1050 changed files with 51407 additions and 50700 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/menu_specialized.c
+5 -5
View File
@@ -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;
}
}