Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-04-27 01:47:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2223 from estellarc/pret/avatar-to-state

Browse Source 
`sPlayerAvatarGfxToStateFlag` structure documentation
This commit is contained in:
GriffinR 2026-01-03 22:20:34 -05:00 committed by GitHub
commit 6eb688876d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/field_player_avatar.c
View File

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