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

Use event object constants

Browse Source
This commit is contained in:
Slawter666
2019-05-25 20:26:29 +01:00
committed by huderlem
parent 39770f7fde
commit 5f292d621a
5 changed files with 155 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_player_avatar.c
+4 -4
View File
@@ -1337,13 +1337,13 @@ void SetPlayerAvatarStateMask(u8 flags)
gPlayerAvatar.flags |= flags;
}
static u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 a, u8 gender)
static u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 graphicsId, u8 gender)
{
u8 i;
for (i = 0; i < 5; i++)
{
if (gUnknown_0849750C[gender][i][0] == a)
if (gUnknown_0849750C[gender][i][0] == graphicsId)
return gUnknown_0849750C[gender][i][1];
}
return 1;
@@ -1362,9 +1362,9 @@ u8 GetPlayerAvatarGraphicsIdByCurrentState(void)
return 0;
}
void SetPlayerAvatarExtraStateTransition(u8 a, u8 b)
void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 b)
{
u8 unk = GetPlayerAvatarStateTransitionByGraphicsId(a, gPlayerAvatar.gender);
u8 unk = GetPlayerAvatarStateTransitionByGraphicsId(graphicsId, gPlayerAvatar.gender);
gPlayerAvatar.unk1 |= unk | b;
DoPlayerAvatarTransition();