From 8650f2345d1342fe869d4b9af1d662a823fbba14 Mon Sep 17 00:00:00 2001 From: MCboy Date: Sun, 12 Aug 2018 22:28:41 +0430 Subject: define function in header --- include/rotating_gate.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') 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 -- cgit v1.2.3 From e6db9c5d19275c662969f7e06688935ad476f8da Mon Sep 17 00:00:00 2001 From: MCboy Date: Sun, 12 Aug 2018 22:29:44 +0430 Subject: add function to header --- include/event_object_movement.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/event_object_movement.h b/include/event_object_movement.h index a8f5caa28..4d6251275 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 MovementType_None(struct Sprite *); void MovementType_LookAround(struct Sprite *); -- cgit v1.2.3 From f7c3151ef24fdf02a724646f033241eff331972a Mon Sep 17 00:00:00 2001 From: MCboy Date: Sun, 12 Aug 2018 22:31:19 +0430 Subject: add functions to header --- include/field_player_avatar.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'include') 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 -- cgit v1.2.3 From 9e9ec8dc963c4786ac3af19102ebe690cb7785d5 Mon Sep 17 00:00:00 2001 From: MCboy Date: Sun, 12 Aug 2018 23:17:27 +0430 Subject: god damn it contributers :c --- include/event_object_movement.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 4d6251275..1a473eea9 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -187,6 +187,7 @@ u8 GetMoveDirectionFastAnimNum(u8); u8 GetMoveDirectionFasterAnimNum(u8); u8 GetMoveDirectionFastestAnimNum(u8); u8 GetLedgeJumpDirection(s16, s16, u8); +void CameraObjectSetFollowedObjectId(u8 objectId); void MovementType_None(struct Sprite *); void MovementType_LookAround(struct Sprite *); -- cgit v1.2.3