Label all movement type functions and their callbacks

3 files changed, 253 insertions, 254 deletions

diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index d01a7bb72..f74a1b67a 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -80,15 +80,15 @@ u8 sub_805CCAC(s16 a0, s16 a1, s16 a2, s16 a3);
 u8 sub_805CCE8(s16 a0, s16 a1, s16 a2, s16 a3);
 u8 sub_805CD24(s16 a0, s16 a1, s16 a2, s16 a3);
 
-u8 sub_805F3EC(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 sub_805F3F0(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 sub_805F438(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 sub_805F4F0(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 sub_805F5A8(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 sub_805F660(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_None(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_FaceDirection(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_GoSpeed0(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_GoSpeed1(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_GoSpeed2(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_GoSpeed3(struct MapObject *, struct Sprite *, u8, bool8(u8));
 u8 cph_IM_DIFFERENT(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 sub_805F760(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 oac_hopping(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_GoSpeed4(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_Jump(struct MapObject *, struct Sprite *, u8, bool8(u8));
 
 extern struct CameraSomething gUnknown_03004880;
 extern u16 gUnknown_03004898;
@@ -96,245 +96,244 @@ extern u16 gUnknown_0300489C;
 
 extern const struct Coords16 gDirectionToVector[];
 
-void FieldObjectCB_BerryTree(struct Sprite *);
-void FieldObjectCB_Hidden1(struct Sprite *);
-void FieldObjectCB_MountainDisguise(struct Sprite *);
-void FieldObjectCB_TreeDisguise(struct Sprite *);
-void sub_80587B4(struct Sprite *);
+void MovementType_BerryTreeGrowth(struct Sprite *);
+void MovementType_Hidden(struct Sprite *);
+void MovementType_MountainDisguise(struct Sprite *);
+void MovementType_TreeDisguise(struct Sprite *);
+void MovementType_None2(struct Sprite *);
 void MovementType_None(struct Sprite *);
-void sub_805C8AC(struct Sprite *);
-void sub_805CDE8(struct Sprite *);
-void sub_805CF28(struct Sprite *);
-void sub_805D0AC(struct Sprite *);
-void sub_805D230(struct Sprite *);
-void sub_805D4F4(struct Sprite *);
-void sub_805D634(struct Sprite *);
-void sub_805D774(struct Sprite *);
-void sub_805D8B4(struct Sprite *);
-void sub_805D9F4(struct Sprite *);
-void sub_805DB34(struct Sprite *);
-void sub_805DC74(struct Sprite *);
-void sub_805DDB4(struct Sprite *);
-void sub_805DEF4(struct Sprite *);
-void sub_805E034(struct Sprite *);
-void sub_805E174(struct Sprite *);
-void sub_805E278(struct Sprite *);
-void sub_805E37C(struct Sprite *);
-void sub_805E5DC(struct Sprite *);
-void sub_805E668(struct Sprite *);
-void sub_805E6F4(struct Sprite *);
-void sub_805E780(struct Sprite *);
-void sub_805E80C(struct Sprite *);
-void sub_805E898(struct Sprite *);
-void sub_805E924(struct Sprite *);
-void sub_805E9B0(struct Sprite *);
-void sub_805EA3C(struct Sprite *);
-void sub_805EAC8(struct Sprite *);
-void sub_805EB54(struct Sprite *);
-void sub_805EBE0(struct Sprite *);
-void sub_805EC6C(struct Sprite *);
-void sub_805ECF8(struct Sprite *);
-void sub_805ED84(struct Sprite *);
-void sub_805EE10(struct Sprite *);
-void sub_805EE9C(struct Sprite *);
-void sub_805EF28(struct Sprite *);
-void sub_805EFB4(struct Sprite *);
-void sub_805F040(struct Sprite *);
-void sub_805F0CC(struct Sprite *);
-void sub_805F158(struct Sprite *);
-void sub_805F1E4(struct Sprite *);
-void sub_805F270(struct Sprite *);
-void sub_805F2FC(struct Sprite *);
-void sub_805F8E0(struct Sprite *);
-void sub_805FB20(struct Sprite *);
-void sub_805FB90(struct Sprite *);
-void sub_805FC00(struct Sprite *);
-void sub_805FC70(struct Sprite *);
+void MovementType_WanderAround(struct Sprite *);
+void MovementType_LookAround(struct Sprite *);
+void MovementType_WanderUpAndDown(struct Sprite *);
+void MovementType_WanderLeftAndRight(struct Sprite *);
+void MovementType_FaceDirection(struct Sprite *);
+void MovementType_FaceDownAndUp(struct Sprite *);
+void MovementType_FaceLeftAndRight(struct Sprite *);
+void MovementType_FaceUpAndLeft(struct Sprite *);
+void MovementType_FaceUpAndRight(struct Sprite *);
+void MovementType_FaceDownAndLeft(struct Sprite *);
+void MovementType_FaceDownAndRight(struct Sprite *);
+void MovementType_FaceDownUpAndLeft(struct Sprite *);
+void MovementType_FaceDownUpAndRight(struct Sprite *);
+void MovementType_FaceUpLeftAndRight(struct Sprite *);
+void MovementType_FaceDownLeftAndRight(struct Sprite *);
+void MovementType_RotateCounterclockwise(struct Sprite *);
+void MovementType_RotateClockwise(struct Sprite *);
+void MovementType_WalkBackAndForth(struct Sprite *);
+void MovementType_WalkSequenceUpRightLeftDown(struct Sprite *);
+void MovementType_WalkSequenceRightLeftDownUp(struct Sprite *);
+void MovementType_WalkSequenceDownUpRightLeft(struct Sprite *);
+void MovementType_WalkSequenceLeftDownUpRight(struct Sprite *);
+void MovementType_WalkSequenceUpLeftRightDown(struct Sprite *);
+void MovementType_WalkSequenceLeftRightDownUp(struct Sprite *);
+void MovementType_WalkSequenceDownUpLeftRight(struct Sprite *);
+void MovementType_WalkSequenceRightDownUpLeft(struct Sprite *);
+void MovementType_WalkSequenceLeftUpDownRight(struct Sprite *);
+void MovementType_WalkSequenceUpDownRightLeft(struct Sprite *);
+void MovementType_WalkSequenceRightLeftUpDown(struct Sprite *);
+void MovementType_WalkSequenceDownRightLeftUp(struct Sprite *);
+void MovementType_WalkSequenceRightUpDownLeft(struct Sprite *);
+void MovementType_WalkSequenceUpDownLeftRight(struct Sprite *);
+void MovementType_WalkSequenceLeftRightUpDown(struct Sprite *);
+void MovementType_WalkSequenceDownLeftRightUp(struct Sprite *);
+void MovementType_WalkSequenceUpLeftDownRight(struct Sprite *);
+void MovementType_WalkSequenceDownRightUpLeft(struct Sprite *);
+void MovementType_WalkSequenceLeftDownRightUp(struct Sprite *);
+void MovementType_WalkSequenceRightUpLeftDown(struct Sprite *);
+void MovementType_WalkSequenceUpRightDownLeft(struct Sprite *);
+void MovementType_WalkSequenceDownLeftUpRight(struct Sprite *);
+void MovementType_WalkSequenceLeftUpRightDown(struct Sprite *);
+void MovementType_WalkSequenceRightDownLeftUp(struct Sprite *);
+void MovementType_CopyPlayer(struct Sprite *);
+void MovementType_CopyPlayerInGrass(struct Sprite *);
+void MovementType_WalkInPlace(struct Sprite *);
+void MovementType_JogInPlace(struct Sprite *);
+void MovementType_RunInPlace(struct Sprite *);
+void MovementType_Invisible(struct Sprite *);
 
-u8 sub_805C8F0(struct MapObject *, struct Sprite *);
-u8 sub_805C904(struct MapObject *, struct Sprite *);
-u8 sub_805C930(struct MapObject *, struct Sprite *);
-u8 sub_805C96C(struct MapObject *, struct Sprite *);
-u8 sub_805C98C(struct MapObject *, struct Sprite *);
-u8 sub_805C9D8(struct MapObject *, struct Sprite *);
-u8 sub_805CA08(struct MapObject *, struct Sprite *);
-u8 sub_805CE2C(struct MapObject *, struct Sprite *);
-u8 sub_805CE40(struct MapObject *, struct Sprite *);
-u8 sub_805CE6C(struct MapObject *, struct Sprite *);
-u8 sub_805CEB0(struct MapObject *, struct Sprite *);
-u8 sub_805CEE0(struct MapObject *, struct Sprite *);
-u8 sub_805CF6C(struct MapObject *, struct Sprite *);
-u8 sub_805CF80(struct MapObject *, struct Sprite *);
-u8 sub_805CFAC(struct MapObject *, struct Sprite *);
-u8 sub_805CFE8(struct MapObject *, struct Sprite *);
-u8 sub_805D008(struct MapObject *, struct Sprite *);
-u8 sub_805D054(struct MapObject *, struct Sprite *);
-u8 sub_805D084(struct MapObject *, struct Sprite *);
-u8 sub_805D0F0(struct MapObject *, struct Sprite *);
-u8 sub_805D104(struct MapObject *, struct Sprite *);
-u8 sub_805D130(struct MapObject *, struct Sprite *);
-u8 sub_805D16C(struct MapObject *, struct Sprite *);
-u8 sub_805D18C(struct MapObject *, struct Sprite *);
-u8 sub_805D1D8(struct MapObject *, struct Sprite *);
-u8 sub_805D208(struct MapObject *, struct Sprite *);
-u8 sub_805D274(struct MapObject *, struct Sprite *);
-u8 sub_805D2A0(struct MapObject *, struct Sprite *);
-u8 sub_805D2C0(struct MapObject *, struct Sprite *);
-u8 do_berry_tree_growth_sparkle_1(struct MapObject *, struct Sprite *);
-u8 sub_805D3EC(struct MapObject *, struct Sprite *);
-u8 do_berry_tree_growth_sparkle_2(struct MapObject *, struct Sprite *);
-u8 sub_805D458(struct MapObject *, struct Sprite *);
-u8 sub_805D4A8(struct MapObject *, struct Sprite *);
-u8 sub_805D538(struct MapObject *, struct Sprite *);
-u8 sub_805D54C(struct MapObject *, struct Sprite *);
-u8 sub_805D578(struct MapObject *, struct Sprite *);
-u8 sub_805D5BC(struct MapObject *, struct Sprite *);
-u8 sub_805D5EC(struct MapObject *, struct Sprite *);
-u8 sub_805D678(struct MapObject *, struct Sprite *);
-u8 sub_805D68C(struct MapObject *, struct Sprite *);
-u8 sub_805D6B8(struct MapObject *, struct Sprite *);
-u8 sub_805D6FC(struct MapObject *, struct Sprite *);
-u8 sub_805D72C(struct MapObject *, struct Sprite *);
-u8 sub_805D7B8(struct MapObject *, struct Sprite *);
-u8 sub_805D7CC(struct MapObject *, struct Sprite *);
-u8 sub_805D7F8(struct MapObject *, struct Sprite *);
-u8 sub_805D83C(struct MapObject *, struct Sprite *);
-u8 sub_805D86C(struct MapObject *, struct Sprite *);
-u8 sub_805D8F8(struct MapObject *, struct Sprite *);
-u8 sub_805D90C(struct MapObject *, struct Sprite *);
-u8 sub_805D938(struct MapObject *, struct Sprite *);
-u8 sub_805D97C(struct MapObject *, struct Sprite *);
-u8 sub_805D9AC(struct MapObject *, struct Sprite *);
-u8 sub_805DA38(struct MapObject *, struct Sprite *);
-u8 sub_805DA4C(struct MapObject *, struct Sprite *);
-u8 sub_805DA78(struct MapObject *, struct Sprite *);
-u8 sub_805DABC(struct MapObject *, struct Sprite *);
-u8 sub_805DAEC(struct MapObject *, struct Sprite *);
-u8 sub_805DB78(struct MapObject *, struct Sprite *);
-u8 sub_805DB8C(struct MapObject *, struct Sprite *);
-u8 sub_805DBB8(struct MapObject *, struct Sprite *);
-u8 sub_805DBFC(struct MapObject *, struct Sprite *);
-u8 sub_805DC2C(struct MapObject *, struct Sprite *);
-u8 sub_805DCB8(struct MapObject *, struct Sprite *);
-u8 sub_805DCCC(struct MapObject *, struct Sprite *);
-u8 sub_805DCF8(struct MapObject *, struct Sprite *);
-u8 sub_805DD3C(struct MapObject *, struct Sprite *);
-u8 sub_805DD6C(struct MapObject *, struct Sprite *);
-u8 sub_805DDF8(struct MapObject *, struct Sprite *);
-u8 sub_805DE0C(struct MapObject *, struct Sprite *);
-u8 sub_805DE38(struct MapObject *, struct Sprite *);
-u8 sub_805DE7C(struct MapObject *, struct Sprite *);
-u8 sub_805DEAC(struct MapObject *, struct Sprite *);
-u8 sub_805DF38(struct MapObject *, struct Sprite *);
-u8 sub_805DF4C(struct MapObject *, struct Sprite *);
-u8 sub_805DF78(struct MapObject *, struct Sprite *);
-u8 sub_805DFBC(struct MapObject *, struct Sprite *);
-u8 sub_805DFEC(struct MapObject *, struct Sprite *);
-u8 sub_805E078(struct MapObject *, struct Sprite *);
-u8 sub_805E08C(struct MapObject *, struct Sprite *);
-u8 sub_805E0B8(struct MapObject *, struct Sprite *);
-u8 sub_805E0FC(struct MapObject *, struct Sprite *);
-u8 sub_805E12C(struct MapObject *, struct Sprite *);
-u8 sub_805E1B8(struct MapObject *, struct Sprite *);
-u8 sub_805E1E4(struct MapObject *, struct Sprite *);
-u8 sub_805E208(struct MapObject *, struct Sprite *);
-u8 sub_805E234(struct MapObject *, struct Sprite *);
-u8 sub_805E2BC(struct MapObject *, struct Sprite *);
-u8 sub_805E2E8(struct MapObject *, struct Sprite *);
-u8 sub_805E30C(struct MapObject *, struct Sprite *);
-u8 sub_805E338(struct MapObject *, struct Sprite *);
-u8 sub_805E3C0(struct MapObject *, struct Sprite *);
-u8 sub_805E3D4(struct MapObject *, struct Sprite *);
-u8 sub_805E40C(struct MapObject *, struct Sprite *);
-u8 sub_805E4C4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E620(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E6AC(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E738(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E7C4(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E850(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E8DC(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E968(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E9F4(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EA80(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EB0C(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EB98(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EC24(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805ECB0(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805ED3C(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EDC8(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EE54(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EEE0(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EF6C(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EFF8(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805F084(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805F110(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805F19C(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805F228(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805F2B4(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *, struct Sprite *);
-u8 sub_805F364(struct MapObject *, struct Sprite *);
-u8 sub_805F3C4(struct MapObject *, struct Sprite *);
-u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *, struct Sprite *);
-u8 mss_08062EA4(struct MapObject *, struct Sprite *);
-u8 sub_805F3C4(struct MapObject *, struct Sprite *);
-u8 sub_805FAF8(struct MapObject *, struct Sprite *);
-u8 sub_805FB64(struct MapObject *, struct Sprite *);
-u8 sub_805FB04(struct MapObject *, struct Sprite *);
-u8 sub_805FBD4(struct MapObject *, struct Sprite *);
-u8 sub_805FB04(struct MapObject *, struct Sprite *);
-u8 sub_805FC44(struct MapObject *, struct Sprite *);
-u8 sub_805FB04(struct MapObject *, struct Sprite *);
-u8 sub_805FCB4(struct MapObject *, struct Sprite *);
-u8 sub_805FCE8(struct MapObject *, struct Sprite *);
-u8 sub_805FD08(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step5(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step6(struct MapObject *, struct Sprite *);
+u8 MovementType_LookAround_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_LookAround_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_LookAround_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_LookAround_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_LookAround_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step5(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step6(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step5(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step6(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDirection_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDirection_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDirection_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step4(struct MapObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step3(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_CopyPlayerInGrass_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_Hidden_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkInPlace_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_JogInPlace_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_RunInPlace_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_Invisible_Step0(struct MapObject *, struct Sprite *);
+u8 MovementType_Invisible_Step1(struct MapObject *, struct Sprite *);
+u8 MovementType_Invisible_Step2(struct MapObject *, struct Sprite *);
 
 u8 get_go_image_anim_num(u8);
 u8 get_go_fast_image_anim_num(u8);
@@ -403,7 +402,7 @@ u8 sub_805FDF8(u8);
 u8 sub_805FE08(u8);
 void npc_set_running_behaviour_etc(struct MapObject *, u8);
 u8 npc_running_behaviour_by_direction(u8);
-u8 npc_block_way(struct MapObject *, s16, s16, u32);
+u8 GetCollisionAtCoords(struct MapObject *, s16, s16, u32);
 u8 sub_8060024(struct MapObject *, s16, s16, u8);
 bool8 IsBerryTreeSparkling(u8, u8, u8);
 void sub_8060288(u8, u8, u8);
@@ -420,9 +419,9 @@ void FieldObjectClearHeldMovement(struct MapObject *);
 bool8 FieldObjectCheckHeldMovementStatus(struct MapObject *);
 u8 FieldObjectClearHeldMovementIfFinished(struct MapObject *);
 u8 FieldObjectGetHeldMovementActionId(struct MapObject *);
-u8 GetFaceDirectionAnimId(u32);
+u8 GetFaceDirectionMovementActionId(u32);
 u8 GetSimpleGoAnimId(u32);
-u8 GetGoSpeed0AnimId(u32);
+u8 GetGoSpeed0MovementActionId(u32);
 u8 sub_8060744(u32);
 u8 d2s_08064034(u32);
 u8 sub_806079C(u32);
@@ -434,7 +433,7 @@ u8 sub_8060878(u32);
 u8 sub_80608A4(u32);
 u8 sub_80608D0(u32);
 u8 GetStepInPlaceDelay32AnimId(u32);
-u8 GetStepInPlaceDelay16AnimId(u32);
+u8 GetStepInPlaceDelay16MovementActionId(u32);
 u8 GetStepInPlaceDelay8AnimId(u32);
 u8 GetStepInPlaceDelay4AnimId(u32);
 u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8);
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index b62782c8d..c0c952881 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -14,7 +14,7 @@ enum {
     PLAYER_AVATAR_STATE_WATERING,
 };
 
-// sub_80587B4
+// MovementType_None2
 void player_step(u8 a, u16 b, u16 c);
 u8 ForcedMovement_None(void);
 u8 ForcedMovement_Slip(void);
@@ -46,7 +46,7 @@ void PlayerAvatarTransition_Surfing(struct MapObject *a);
 void PlayerAvatarTransition_Underwater(struct MapObject *a);
 void sub_80591F4(struct MapObject *a);
 void sub_8059204(void);
-u8 player_get_x22(void);
+u8 PlayerGetCopyableMovement(void);
 void PlayerSetAnimId(u8 a, u8 b);
 void PlayerGoSpeed1(u8 a);
 void PlayerGoSpeed2(u8 a);
@@ -71,8 +71,8 @@ void sub_8059618(u8 a);
 void sub_8059630(u8 a);
 void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y);
 void PlayerGetDestCoords(s16 *, s16 *);
-u8 player_get_direction_lower_nybble(void);
-u8 player_get_direction_upper_nybble(void);
+u8 GetPlayerFacingDirection(void);
+u8 GetPlayerMovementDirection(void);
 u8 PlayerGetZCoord(void);
 u8 TestPlayerAvatarFlags(u8);
 u8 sub_80597D0(void);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 7408a9f9a..b49611e65 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -233,7 +233,7 @@ struct MapObject
     /*0x1F*/ u8 previousMetatileBehavior;
     /*0x20*/ u8 previousMovementDirection;
     /*0x21*/ u8 directionSequenceIndex;
-    /*0x22*/ u8 playerMovementActionId;
+    /*0x22*/ u8 playerCopyableMovement; // used as an index to gCopyPlayerMovementFuncs for the "copy player" movement types
     /*size = 0x24*/
 };