diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_object_movement.h | 7 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 4 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 24 |
3 files changed, 18 insertions, 17 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 1b7ee756e..25fd988ea 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -129,7 +129,7 @@ u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent); u8 GetWalkNormalMovementAction(u32); u8 GetWalkFastMovementAction(u32); u8 GetWalkFastestMovementAction(u32); -u8 sub_8063F2C(u32 direction); +u8 GetWalkSlowestMovementAction(u32 direction); u8 GetTrainerFacingDirectionMovementType(u8 direction); u8 GetFaceDirectionMovementAction(u32); u8 GetFaceDirectionFastMovementAction(u32); @@ -149,7 +149,8 @@ const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId); u8 GetFirstInactiveObjectEventId(void); u8 GetCollisionFlagsAtCoords(struct ObjectEvent * objectEvent, s16 x, s16 y, u8 direction); u8 sub_8063FB0(u8 direction); -void OverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent);void sub_805C774(void); +void OverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent); +void CancelPlayerForcedMovement(void); void FreezeObjectEvents(void); bool8 FreezeObjectEvent(struct ObjectEvent *); void UnfreezeObjectEvent(struct ObjectEvent *); @@ -208,7 +209,7 @@ u8 sub_8064008(u32 direction); u8 GetPlayerRunMovementAction(u32 direction); u8 GetPlayerRunSlowMovementAction(u32 direction); u8 GetWalkSlowMovementAction(u32 direction); -u8 sub_80640E4(u32 direction); +u8 GetSpinMovementAction(u32 direction); u8 GetAcroWheelieFaceDirectionMovementAction(u32 direction); u8 GetAcroPopWheelieFaceDirectionMovementAction(u32 direction); u8 GetAcroEndWheelieFaceDirectionMovementAction(u32 direction); diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index b13bf6fb9..a254cff83 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -41,7 +41,7 @@ void StartPlayerAvatarVsSeekerAnim(void); u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender); u8 GetPlayerAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender); u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior); -void sub_805C0D4(u8 direction); +void PlayerGoSlowest(u8 direction); void PlayerGoSlow(u8 direction); void PlayerGoSpeed1(u8 direction); void PlayerGoSpeed2(u8 direction); @@ -59,7 +59,7 @@ void PlayerJumpLedge(u8 direction); void sub_805C260(void); void player_step(u8 direction, u16 newKeys, u16 heldKeys); bool32 PlayerIsMovingOnRockStairs(u8 direction); -void sub_805BEB8(void); +void UpdatePlayerAvatarTransitionState(void); void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender); void nullsub_24(u8 direction); u8 GetRSAvatarGraphicsIdByGender(u8 gender); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 80331804b..6baa6a6bc 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -279,24 +279,24 @@ enum { PLAYER_AVATAR_STATE_ACRO_BIKE, PLAYER_AVATAR_STATE_SURFING, PLAYER_AVATAR_STATE_UNDERWATER, - PLAYER_AVATAR_STATE_FIELD_MOVE, - PLAYER_AVATAR_STATE_FISHING, - PLAYER_AVATAR_STATE_WATERING, + PLAYER_AVATAR_STATE_CONTROLLABLE, + PLAYER_AVATAR_STATE_FORCED, + PLAYER_AVATAR_STATE_DASH, }; -#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << PLAYER_AVATAR_STATE_NORMAL) -#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << PLAYER_AVATAR_STATE_MACH_BIKE) -#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << PLAYER_AVATAR_STATE_ACRO_BIKE) -#define PLAYER_AVATAR_FLAG_SURFING (1 << PLAYER_AVATAR_STATE_SURFING) -#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << PLAYER_AVATAR_STATE_UNDERWATER) -#define PLAYER_AVATAR_FLAG_FIELD_MOVE (1 << PLAYER_AVATAR_STATE_FIELD_MOVE) -#define PLAYER_AVATAR_FLAG_FISHING (1 << PLAYER_AVATAR_STATE_FISHING) -#define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_WATERING) +#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << PLAYER_AVATAR_STATE_NORMAL) +#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << PLAYER_AVATAR_STATE_MACH_BIKE) +#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << PLAYER_AVATAR_STATE_ACRO_BIKE) +#define PLAYER_AVATAR_FLAG_SURFING (1 << PLAYER_AVATAR_STATE_SURFING) +#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << PLAYER_AVATAR_STATE_UNDERWATER) +#define PLAYER_AVATAR_FLAG_CONTROLLABLE (1 << PLAYER_AVATAR_STATE_CONTROLLABLE) +#define PLAYER_AVATAR_FLAG_FORCED (1 << PLAYER_AVATAR_STATE_FORCED) +#define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_DASH) enum { PLAYER_AVATAR_GFX_NORMAL, PLAYER_AVATAR_GFX_BIKE, - PLAYER_AVATAR_GFX_SURF, + PLAYER_AVATAR_GFX_RIDE, PLAYER_AVATAR_GFX_FIELD_MOVE, PLAYER_AVATAR_GFX_FISH, PLAYER_AVATAR_GFX_VSSEEKER, |