diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-26 14:29:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-26 14:29:44 -0400 |
| commit | f9f91be60a6e21eb2c9bd87ac67865e05296eab8 (patch) | |
| tree | 230f93ac894e13bd9043d11cef2a4b6f7f35ef2f /include | |
| parent | d6571f2355d356431809668e8e905606a28ce7cf (diff) | |
| parent | bd9ea239256ecdb716e31c9063102cf52f972f93 (diff) | |
Merge pull request #1527 from cbt6/field-player
Document field player functions
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_player_avatar.h | 4 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 903fe6ef1..e9174d589 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -32,10 +32,10 @@ void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction); u8 CheckForObjectEventCollision(struct ObjectEvent *a, s16 b, s16 c, u8 d, u8 e); u8 PlayerGetZCoord(void); void SetPlayerAvatarTransitionFlags(u16 a); -void sub_808BCE8(void); +void CancelPlayerForcedMovement(void); void InitPlayerAvatar(s16 a, s16 b, u8 c, u8 d); void PlayerFreeze(void); -void sub_808BCF4(void); +void StopPlayerAvatar(void); void SetSpinStartFacingDir(u8); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8, u8); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 5d788ddf7..71ccd7068 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -246,14 +246,14 @@ enum { PLAYER_AVATAR_STATE_WATERING, }; -#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << 0) -#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1) -#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2) -#define PLAYER_AVATAR_FLAG_SURFING (1 << 3) -#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4) -#define PLAYER_AVATAR_FLAG_5 (1 << 5) -#define PLAYER_AVATAR_FLAG_FORCED_MOVE (1 << 6) -#define PLAYER_AVATAR_FLAG_DASH (1 << 7) +#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << 0) +#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1) +#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2) +#define PLAYER_AVATAR_FLAG_SURFING (1 << 3) +#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4) +#define PLAYER_AVATAR_FLAG_CONTROLLABLE (1 << 5) +#define PLAYER_AVATAR_FLAG_FORCED_MOVE (1 << 6) +#define PLAYER_AVATAR_FLAG_DASH (1 << 7) enum { |