Merge branch 'master' into event_object_movement

include/field_player_avatar.h

@@ -16,7 +16,7 @@ void sub_808D074(u8);
 void sub_805C270(void);
 void sub_805C780(void);
 void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
-u8 sub_805C808(u8);
+u8 GetPlayerAvatarGraphicsIdByStateId(u8);
 void SetPlayerAvatarStateMask(u8 mask);
 void sub_805D9C4(struct Sprite *sprite);
 void sub_805D154(u8 direction);
@@ -36,5 +36,7 @@ bool32 sub_805DC24(void);
 bool8 PartyHasMonWithSurf(void);
 bool8 IsPlayerSurfingNorth(void);
 void player_get_pos_including_state_based_drift(s16 *x, s16 *y);
+void sub_805CBE8(void);
+u8 sub_805C7C8(u8 state, u8 gender);
 
 #endif //GUARD_FIELD_PLAYER_AVATAR_H