sPlayerAvatarGfxToStateFlagstructure

This commit is contained in:
Estellar 2026-01-03 21:49:12 -03:00
parent 13b7dc4401
commit edc7399104

View File

@ -267,7 +267,11 @@ static const u8 sRSAvatarGfxIds[GENDER_COUNT] =
[FEMALE] = OBJ_EVENT_GFX_LINK_RS_MAY
};
static const u8 sPlayerAvatarGfxToStateFlag[GENDER_COUNT][5][2] =
static const struct __attribute__((packed))
{
u8 graphicsId;
u8 playerFlag;
} sPlayerAvatarGfxToStateFlag[GENDER_COUNT][5] =
{
[MALE] =
{
@ -1347,8 +1351,8 @@ static u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 graphicsId, u8 gender)
for (i = 0; i < ARRAY_COUNT(sPlayerAvatarGfxToStateFlag[0]); i++)
{
if (sPlayerAvatarGfxToStateFlag[gender][i][0] == graphicsId)
return sPlayerAvatarGfxToStateFlag[gender][i][1];
if (sPlayerAvatarGfxToStateFlag[gender][i].graphicsId == graphicsId)
return sPlayerAvatarGfxToStateFlag[gender][i].playerFlag;
}
return PLAYER_AVATAR_FLAG_ON_FOOT;
}
@ -1360,8 +1364,8 @@ u8 GetPlayerAvatarGraphicsIdByCurrentState(void)
for (i = 0; i < ARRAY_COUNT(sPlayerAvatarGfxToStateFlag[0]); i++)
{
if (sPlayerAvatarGfxToStateFlag[gPlayerAvatar.gender][i][1] & flags)
return sPlayerAvatarGfxToStateFlag[gPlayerAvatar.gender][i][0];
if (sPlayerAvatarGfxToStateFlag[gPlayerAvatar.gender][i].playerFlag & flags)
return sPlayerAvatarGfxToStateFlag[gPlayerAvatar.gender][i].graphicsId;
}
return 0;
}