diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
| commit | b22d3a821d8656d9fb88000ce02e5b885a59e1c3 (patch) | |
| tree | 7d4054b0df9f5746b3e31623868bf7d604ae7328 /include/field_player_avatar.h | |
| parent | 8626240b54d87449e5db70345840ccf20717d8c7 (diff) | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'include/field_player_avatar.h')
| -rw-r--r-- | include/field_player_avatar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index df9084eab..60ece38fe 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -14,7 +14,7 @@ u8 PlayerGetCopyableMovement(void); void MovePlayerNotOnBike(u8 direction, u16 heldKeys); void MovementType_Player(struct Sprite * sprite); -void sub_805C270(void); +void HandleEnforcedLookDirectionOnPlayerStopMoving(void); void StopPlayerAvatar(void); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); u8 GetPlayerAvatarGraphicsIdByStateId(u8); @@ -22,7 +22,7 @@ void SetPlayerAvatarStateMask(u8 mask); void AlignFishingAnimationFrames(struct Sprite *sprite); void CreateStopSurfingTask_NoMusicChange(u8 direction); void SavePlayerFacingDirectionForTeleport(u8 direction); -void SetPlayerAvatarTransitionFlags(u16 a); +void SetPlayerAvatarTransitionFlags(u16 flags); bool8 IsPlayerFacingSurfableFishableWater(void); void StartFishing(u8 secondaryId); u8 GetPlayerAvatarObjectId(void); |