summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/event_object_movement.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 119fa7f07..71a2d7c9d 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -73,9 +73,9 @@ void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16);
void PatchObjectPalette(u16, u8);
void ReloadMapObjectsWithOffset(s16 x, s16 y);
void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat);
-void sub_8063AD4(s16, s16, s16 *, s16 *);
+void GetMapCoordsFromSpritePos(s16, s16, s16 *, s16 *);
u8 GetFaceDirectionAnimNum(u8);
-void sub_8063BC4(s16 *, s16 *, s16, s16);
+void SetSpritePosToOffsetMapCoords(s16 *, s16 *, s16, s16);
void ObjectEventClearHeldMovement(struct ObjectEvent *);
void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *);
void SpawnObjectEventsInView(s16, s16);
@@ -140,8 +140,8 @@ u8 GetSlideMovementAction(u32);
u8 GetJumpInPlaceMovementAction(u32);
u8 GetJumpMovementAction(u32);
u8 GetJump2MovementAction(u32);
-bool8 sub_8068BCC(struct Sprite *sprite);
-void sub_8068D1C(struct Sprite *, u8, u8, u8);
+bool8 NpcTakeStep(struct Sprite *sprite);
+void SetJumpSpriteData(struct Sprite *, u8, u8, u8);
u8 sub_8068D3C(struct Sprite *);
u8 sub_8068DC4(struct Sprite *);
void TurnObjectEvent(u8, u8);
@@ -180,13 +180,13 @@ 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 sub_8068BBC(struct Sprite *, u8);
-void sub_8068C58(struct Sprite *, u8);
-bool8 sub_8068C68(struct Sprite *sprite);
-void sub_8068C08(struct Sprite *, u8);
+void SetSpriteDataForNormalStep(struct Sprite *, u8);
+void SetSpriteDataForNormalStep2(struct Sprite *, u8);
+bool8 UpdateWalkSlowAnim(struct Sprite *sprite);
+void SetSpriteDataForNormalStep3(struct Sprite *, u8);
bool8 sub_8068C18(struct Sprite *sprite);
void DoShadowFieldEffect(struct ObjectEvent *);
-void sub_8068CA4(struct Sprite *, u8);
+void SetSpriteDataForNormalStep4(struct Sprite *, u8);
bool8 sub_8068CB4(struct Sprite *sprite);
void SetAndStartSpriteAnim(struct Sprite *, u8, u8);
bool8 SpriteAnimEnded(struct Sprite *);