diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_object_movement.h | 2 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 18 | ||||
| -rw-r--r-- | include/rotating_gate.h | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h index c382ae4d8..1a473eea9 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -146,6 +146,7 @@ u8 GetJumpInPlaceMovementAction(u32); bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 specialAnimId); bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject); u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject); +u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject); void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType); void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject); void ShiftStillEventObjectCoords(struct EventObject *pObject); @@ -185,6 +186,7 @@ bool8 FreezeEventObject(struct EventObject *eventObject); u8 GetMoveDirectionFastAnimNum(u8); u8 GetMoveDirectionFasterAnimNum(u8); u8 GetMoveDirectionFastestAnimNum(u8); +u8 GetLedgeJumpDirection(s16, s16, u8); void CameraObjectSetFollowedObjectId(u8 objectId); void MovementType_None(struct Sprite *); diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 8cd6c275b..b11b5e21a 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -45,4 +45,22 @@ void SetPlayerAvatarStateMask(u8 a); u8 GetPlayerAvatarGraphicsIdByStateId(u8 a); u8 GetJumpSpecialMovementAction(u32); +bool8 ForcedMovement_None(void); +bool8 ForcedMovement_Slip(void); +bool8 ForcedMovement_WalkSouth(void); +bool8 ForcedMovement_WalkNorth(void); +bool8 ForcedMovement_WalkWest(void); +bool8 ForcedMovement_WalkEast(void); +bool8 ForcedMovement_PushedSouthByCurrent(void); +bool8 ForcedMovement_PushedNorthByCurrent(void); +bool8 ForcedMovement_PushedWestByCurrent(void); +bool8 ForcedMovement_PushedEastByCurrent(void); +bool8 ForcedMovement_SlideSouth(void); +bool8 ForcedMovement_SlideNorth(void); +bool8 ForcedMovement_SlideWest(void); +bool8 ForcedMovement_SlideEast(void); +bool8 ForcedMovement_0xBB(void); +bool8 ForcedMovement_0xBC(void); +bool8 ForcedMovement_MuddySlope(void); + #endif // GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/rotating_gate.h b/include/rotating_gate.h index 50a838953..2ae26aa5b 100644 --- a/include/rotating_gate.h +++ b/include/rotating_gate.h @@ -4,5 +4,6 @@ void RotatingGatePuzzleCameraUpdate(s16, s16); void RotatingGate_InitPuzzleAndGraphics(); u32 CheckForRotatingGatePuzzleCollision(u8, s16, s16); +bool32 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8, s16, s16); #endif // GUARD_ROTATING_GATE_H |