diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /include/field_player_avatar.h | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'include/field_player_avatar.h')
| -rw-r--r-- | include/field_player_avatar.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 9f6f634f7..a4f77a172 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -34,28 +34,28 @@ void SetPlayerAvatarTransitionFlags(u16 a); // sub_80591F4 void sub_8059204(void); // player_get_x22 -// player_npc_set_state_and_x22_etc +void PlayerSetAnimId(u8 a, u8 b); void PlayerGoSpeed0(u8 a); void sub_80593C4(u8 a); void npc_use_some_d2s(u8 a); -// sub_80593F4 +void sub_80593F4(u8 a); void sub_805940C(u8 a); -// PlayerOnBikeCollide +void PlayerOnBikeCollide(u8); void PlayerFaceDirection(u8 a); void PlayerTurnInPlace(u8 a); void PlayerJumpLedge(u8 a); void sub_80594C0(void); -// sub_8059504 -// sub_805951C -// sub_8059534 -// sub_805954C -// sub_8059570 -// sub_8059594 -// sub_80595B8 -// sub_80595DC -// sub_8059600 -// sub_8059618 -// sub_8059630 +void sub_8059504(u8 a); +void PlayerStartWheelie(u8 a); +void sub_8059534(u8 a); +void sub_805954C(u8 a); +void sub_8059570(u8 a); +void sub_8059594(u8 a); +void sub_80595B8(u8 a); +void sub_80595DC(u8 a); +void sub_8059600(u8 a); +void sub_8059618(u8 a); +void sub_8059630(u8 a); void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y); void PlayerGetDestCoords(s16 *, s16 *); u8 player_get_direction_lower_nybble(void); @@ -66,21 +66,21 @@ u8 TestPlayerAvatarFlags(u8); // GetPlayerAvatarObjectId void sub_80597E8(void); void sub_80597F4(void); -u8 sub_805983C(u8 a, u8 b); +u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8 a, u8 b); u8 GetPlayerAvatarGraphicsIdByStateId(u8 a); -// GetPlayerAvatarGenderByGraphicsId -// PartyHasMonWithSurf -// IsPlayerSurfingNorth +u8 GetPlayerAvatarGenderByGraphicsId(u8 gfxId); +bool8 PartyHasMonWithSurf(void); +bool8 IsPlayerSurfingNorth(void); bool8 IsPlayerFacingSurfableFishableWater(void); // ClearPlayerAvatarInfo void SetPlayerAvatarStateMask(u8 a); -// GetPlayerAvatarGraphicsIdByCurrentState -// SetPlayerAvatarExtraStateTransition +u8 GetPlayerAvatarGraphicsIdByCurrentState(void); +void SetPlayerAvatarExtraStateTransition(u8 a, u8 b); void InitPlayerAvatar(s16 a, s16 b, u8 c, u8 d); // sub_8059B88 -// sub_8059BF4 +void sub_8059BF4(void); // sub_8059C3C -// sub_8059C94 +void sub_8059C94(u8); // sub_8059D08 // sub_8059E84 // sub_8059EA4 |