summaryrefslogtreecommitdiff
path: root/include/event_object_movement.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/event_object_movement.h')
-rw-r--r--include/event_object_movement.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 852af21df..46529bdfe 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -124,7 +124,7 @@ u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent);
u8 GetWalkNormalMovementAction(u32);
u8 GetWalkFastMovementAction(u32);
u8 GetWalkFastestMovementAction(u32);
-u8 GetWalkSlowestMovementAction(u32 direction);
+u8 GetWalkSlowerMovementAction(u32 direction);
u8 GetTrainerFacingDirectionMovementType(u8 direction);
u8 GetFaceDirectionMovementAction(u32);
u8 GetFaceDirectionFastMovementAction(u32);
@@ -134,7 +134,7 @@ u8 GetSlideMovementAction(u32);
u8 GetJumpInPlaceMovementAction(u32);
u8 GetJumpMovementAction(u32);
u8 GetJump2MovementAction(u32);
-bool8 NpcTakeStep(struct Sprite *sprite);
+bool8 UpdateWalkSlowerAnim(struct Sprite *sprite);
void SetJumpSpriteData(struct Sprite *, u8, u8, u8);
u8 DoJumpSpriteMovement(struct Sprite *);
u8 DoJumpSpecialSpriteMovement(struct Sprite *);
@@ -171,16 +171,16 @@ void UpdateObjectEventsForCameraUpdate(s16 x, s16 y);
void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *);
void SetMovementDelay(struct Sprite *, s16);
bool8 WaitForMovementDelay(struct Sprite *);
-void oamt_npc_ministep_reset(struct Sprite *, u8, u8);
-bool8 obj_npc_ministep(struct Sprite *sprite);
-void SetSpriteDataForNormalStep(struct Sprite *, u8);
-void SetSpriteDataForNormalStep2(struct Sprite *, u8);
+void SetSpriteDataForNormalStep(struct Sprite *, u8, u8);
+bool8 NpcTakeStep(struct Sprite *sprite);
+void SetWalkSlowerSpriteData(struct Sprite *, u8);
+void SetWalkSlowestSpriteData(struct Sprite *, u8);
+bool8 UpdateWalkSlowestAnim(struct Sprite *sprite);
+void SetWalkSlowSpriteData(struct Sprite *, u8);
bool8 UpdateWalkSlowAnim(struct Sprite *sprite);
-void SetSpriteDataForNormalStep3(struct Sprite *, u8);
-bool8 sub_8068C18(struct Sprite *sprite);
void DoShadowFieldEffect(struct ObjectEvent *);
-void SetSpriteDataForNormalStep4(struct Sprite *, u8);
-bool8 sub_8068CB4(struct Sprite *sprite);
+void SetRunSlowSpriteData(struct Sprite *, u8);
+bool8 UpdateRunSlowAnim(struct Sprite *sprite);
void SetAndStartSpriteAnim(struct Sprite *, u8, u8);
bool8 SpriteAnimEnded(struct Sprite *);
u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent);
@@ -212,7 +212,7 @@ u8 GetJumpInPlaceTurnAroundMovementAction(u32 direction);
u8 GetAcroWheelieInPlaceDirectionMovementAction(u32 direction);
u8 GetAcroPopWheelieMoveDirectionMovementAction(u32 direction);
u8 GetAcroWheelieMoveDirectionMovementAction(u32 direction);
-u8 sub_80641EC(u32 direction);
+u8 GetJumpSpecialWithEffectMovementAction(u32 direction);
u8 GetFishingBiteDirectionAnimNum(u8 direction);
void TrySpawnObjectEvents(s16 cameraX, s16 cameraY);
void ResetObjectEvents(void);