Start labeling movement actions

11 files changed, 1047 insertions, 1038 deletions

diff --git a/src/data/field_map_obj/anim_func_ptrs.h b/src/data/field_map_obj/anim_func_ptrs.h
index 22bb6794b..c024295c3 100644
--- a/src/data/field_map_obj/anim_func_ptrs.h
+++ b/src/data/field_map_obj/anim_func_ptrs.h
@@ -5,458 +5,331 @@
 #ifndef POKERUBY_ANIM_FUNC_PTRS_H
 #define POKERUBY_ANIM_FUNC_PTRS_H
 
-u8 sub_8060CE0(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8060CF0(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8060D00(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8060D10(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8060F3C(struct MapObject *, struct Sprite *);
-u8 sub_8060F5C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8060F7C(struct MapObject *, struct Sprite *);
-u8 sub_8060F9C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8060FBC(struct MapObject *, struct Sprite *);
-u8 sub_8060FDC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8060FFC(struct MapObject *, struct Sprite *);
-u8 sub_806101C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_806103C(struct MapObject *, struct Sprite *);
-u8 sub_806105C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_806107C(struct MapObject *, struct Sprite *);
-u8 sub_806109C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80610BC(struct MapObject *, struct Sprite *);
-u8 sub_80610DC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80610FC(struct MapObject *, struct Sprite *);
-u8 sub_806111C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80613A8(struct MapObject *, struct Sprite *);
-u8 sub_80613D4(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061400(struct MapObject *, struct Sprite *);
-u8 sub_806142C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061458(struct MapObject *, struct Sprite *);
-u8 sub_8061484(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80614B0(struct MapObject *, struct Sprite *);
-u8 sub_80614DC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_806152C(struct MapObject *, struct Sprite *);
-u8 sub_8061510(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_806154C(struct MapObject *, struct Sprite *);
-u8 sub_8061510(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_806156C(struct MapObject *, struct Sprite *);
-u8 sub_8061510(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_806158C(struct MapObject *, struct Sprite *);
-u8 sub_8061510(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_80615AC(struct MapObject *, struct Sprite *);
-u8 sub_8061510(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_80615CC(struct MapObject *, struct Sprite *);
-u8 sub_80615EC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_806160C(struct MapObject *, struct Sprite *);
-u8 sub_806162C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_806164C(struct MapObject *, struct Sprite *);
-u8 sub_806166C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_806168C(struct MapObject *, struct Sprite *);
-u8 sub_80616AC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061778(struct MapObject *, struct Sprite *);
-u8 sub_806173C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80617B0(struct MapObject *, struct Sprite *);
-u8 sub_806173C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80617E8(struct MapObject *, struct Sprite *);
-u8 sub_806173C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061820(struct MapObject *, struct Sprite *);
-u8 sub_806173C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061858(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061890(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80618C8(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061900(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061938(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061970(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80619A8(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80619E0(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061A18(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061A50(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061A88(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061AC0(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061AF8(struct MapObject *, struct Sprite *);
-u8 sub_8061B18(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061B38(struct MapObject *, struct Sprite *);
-u8 sub_8061B58(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061B78(struct MapObject *, struct Sprite *);
-u8 sub_8061B98(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061BB8(struct MapObject *, struct Sprite *);
-u8 sub_8061BD8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061BF8(struct MapObject *, struct Sprite *);
-u8 sub_8061C18(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061C38(struct MapObject *, struct Sprite *);
-u8 sub_8061C58(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061C78(struct MapObject *, struct Sprite *);
-u8 sub_8061C98(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061CB8(struct MapObject *, struct Sprite *);
-u8 sub_8061CD8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
+u8 MovementAction_FaceDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_PauseSpriteAnim(struct MapObject *, struct Sprite *);
+u8 MovementAction_FaceUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_FaceLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_FaceRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkSlowDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkSlowDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkSlowUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkSlowUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkSlowLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkSlowLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkSlowRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkSlowRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkNormalDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkNormalDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkNormalUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkNormalUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkNormalLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkNormalLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkNormalRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkNormalRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_Jump2Down_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_Jump2Down_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_Jump2Up_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_Jump2Up_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_Jump2Left_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_Jump2Left_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_Jump2Right_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_Jump2Right_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_Delay1_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_Delay_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
+u8 MovementAction_Delay2_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
+u8 MovementAction_Delay4_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
+u8 MovementAction_Delay8_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
+u8 MovementAction_Delay16_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlowDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlow_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlowUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlowLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlowRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceNormalDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceNormalUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceNormalLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceNormalRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastestDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastestUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastestLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastestRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastestDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastestDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastestUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastestUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastestLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastestLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastestRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkFastestRight_Step1(struct MapObject *, struct Sprite *);
 u8 sub_8061CF8(struct MapObject *, struct Sprite *);
 u8 sub_8061D18(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8061D38(struct MapObject *, struct Sprite *);
 u8 sub_8061D58(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8061D78(struct MapObject *, struct Sprite *);
 u8 sub_8061D98(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8061DB8(struct MapObject *, struct Sprite *);
 u8 sub_8061DD8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 do_run_south_anim(struct MapObject *, struct Sprite *);
 u8 sub_8061E18(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 do_run_north_anim(struct MapObject *, struct Sprite *);
 u8 sub_8061E58(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 do_run_west_anim(struct MapObject *, struct Sprite *);
 u8 sub_8061E98(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 do_run_east_anim(struct MapObject *, struct Sprite *);
 u8 sub_8061ED8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8061F24(struct MapObject *, struct Sprite *);
 u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8061F90(struct MapObject *, struct Sprite *);
 u8 sub_8061FB0(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8061FD8(struct MapObject *, struct Sprite *);
 u8 sub_8061FF8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062020(struct MapObject *, struct Sprite *);
 u8 sub_8062040(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062068(struct MapObject *, struct Sprite *);
 u8 sub_8062088(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80620B0(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_806210C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062170(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062180(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062190(struct MapObject *, struct Sprite *);
 u8 sub_80621BC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80621E8(struct MapObject *, struct Sprite *);
 u8 sub_8062214(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062240(struct MapObject *, struct Sprite *);
 u8 sub_806226C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062298(struct MapObject *, struct Sprite *);
 u8 sub_80622C4(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80622F0(struct MapObject *, struct Sprite *);
 u8 sub_806231C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062348(struct MapObject *, struct Sprite *);
 u8 sub_8062374(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80623A0(struct MapObject *, struct Sprite *);
 u8 sub_80623CC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80623F8(struct MapObject *, struct Sprite *);
 u8 sub_8062424(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062450(struct MapObject *, struct Sprite *);
 u8 sub_806247C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80624A8(struct MapObject *, struct Sprite *);
 u8 sub_80624D4(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062500(struct MapObject *, struct Sprite *);
 u8 sub_806252C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062558(struct MapObject *, struct Sprite *);
 u8 sub_8062584(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80625B0(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80625C8(struct MapObject *, struct Sprite *);
 u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80625D8(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 sub_80625E8(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 sub_80625F8(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 sub_8062608(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 sub_8062634(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 sub_8062644(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 do_exclamation_mark_bubble_1(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 do_exclamation_mark_bubble_2(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 do_heart_bubble(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 sub_80626C0(struct MapObject *, struct Sprite *);
 u8 sub_8062704(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 sub_8062724(struct MapObject *, struct Sprite *);
 u8 sub_8062740(struct MapObject *, struct Sprite *);
 u8 sub_8062764(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 sub_80627A0(struct MapObject *, struct Sprite *);
 u8 sub_80627BC(struct MapObject *, struct Sprite *);
 u8 sub_80627E0(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 sub_806281C(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 sub_806282C(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 sub_806283C(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 sub_806286C(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
+u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
 u8 sub_806289C(struct MapObject *, struct Sprite *);
 u8 sub_80628D0(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80628FC(struct MapObject *, struct Sprite *);
 u8 sub_8062930(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_806299C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80629AC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80629BC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80629CC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80629DC(struct MapObject *, struct Sprite *);
 u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062A00(struct MapObject *, struct Sprite *);
 u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062A24(struct MapObject *, struct Sprite *);
 u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062A48(struct MapObject *, struct Sprite *);
 u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062A6C(struct MapObject *, struct Sprite *);
 u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062A90(struct MapObject *, struct Sprite *);
 u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062AB4(struct MapObject *, struct Sprite *);
 u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062AD8(struct MapObject *, struct Sprite *);
 u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062AFC(struct MapObject *, struct Sprite *);
 u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062B20(struct MapObject *, struct Sprite *);
 u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062B44(struct MapObject *, struct Sprite *);
 u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062B68(struct MapObject *, struct Sprite *);
 u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062BD0(struct MapObject *, struct Sprite *);
 u8 sub_8062BFC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062C28(struct MapObject *, struct Sprite *);
 u8 sub_8062C54(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062C80(struct MapObject *, struct Sprite *);
 u8 sub_8062CAC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062CD8(struct MapObject *, struct Sprite *);
 u8 sub_8062D04(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062D30(struct MapObject *, struct Sprite *);
 u8 sub_8062D5C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062D88(struct MapObject *, struct Sprite *);
 u8 sub_8062DB4(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062DE0(struct MapObject *, struct Sprite *);
 u8 sub_8062E0C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062E38(struct MapObject *, struct Sprite *);
 u8 sub_8062E64(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062E90(struct MapObject *, struct Sprite *);
 u8 sub_8062EBC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062EE8(struct MapObject *, struct Sprite *);
 u8 sub_8062F14(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062F40(struct MapObject *, struct Sprite *);
 u8 sub_8062F6C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062F98(struct MapObject *, struct Sprite *);
 u8 sub_8062FC4(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8062FF0(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
 u8 sub_8063028(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
 u8 sub_8063060(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
 u8 sub_8063098(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
 u8 sub_8063108(struct MapObject *, struct Sprite *);
 u8 sub_8063128(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8063148(struct MapObject *, struct Sprite *);
 u8 sub_8063168(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8063188(struct MapObject *, struct Sprite *);
 u8 sub_80631A8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80631C8(struct MapObject *, struct Sprite *);
 u8 sub_80631E8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8063238(struct MapObject *, struct Sprite *);
 u8 sub_8063258(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8063278(struct MapObject *, struct Sprite *);
 u8 sub_8063298(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80632B8(struct MapObject *, struct Sprite *);
 u8 sub_80632D8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80632F8(struct MapObject *, struct Sprite *);
 u8 sub_8063318(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8063370(struct MapObject *, struct Sprite *);
 u8 sub_8063390(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80633B0(struct MapObject *, struct Sprite *);
 u8 sub_80633D0(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_80633F0(struct MapObject *, struct Sprite *);
 u8 sub_8063410(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
 u8 sub_8063430(struct MapObject *, struct Sprite *);
 u8 sub_8063450(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-
-u8 (*const Unknown_83759A0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_83759A8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_83759B0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_83759B8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_83759D4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_83759E0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_83759EC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_83759F8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A04[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A10[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A1C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A28[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A40[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A4C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A58[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A64[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A70[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A7C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A88[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A94[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375AA0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375AAC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375AB8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375AC4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375AD0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375ADC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375AE8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375AF4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B00[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B0C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B18[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B24[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B30[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B3C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B48[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B54[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B60[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B6C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B78[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B84[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B90[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B9C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BA8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BB4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BC0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BCC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BD8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BE4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BF0[])(struct MapObject *, struct Sprite *);
+
+u8 (*const gMovementActionFuncs_FaceDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Jump2Down[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Jump2Up[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Jump2Left[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Jump2Right[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay1[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay2[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay4[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay8[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay16[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct MapObject *, struct Sprite *);
 u8 (*const Unknown_8375BFC[])(struct MapObject *, struct Sprite *);
 u8 (*const Unknown_8375C08[])(struct MapObject *, struct Sprite *);
 u8 (*const Unknown_8375C14[])(struct MapObject *, struct Sprite *);
@@ -547,56 +420,56 @@ u8 (*const Unknown_8375FE4[])(struct MapObject *, struct Sprite *);
 u8 (*const Unknown_8375FF0[])(struct MapObject *, struct Sprite *);
 u8 (*const Unknown_8375FFC[])(struct MapObject *, struct Sprite *);
 
-u8 (*const *const gUnknown_08375778[])(struct MapObject *, struct Sprite *) = {
-    Unknown_83759A0, // face south
-    Unknown_83759A8, // face north
-    Unknown_83759B0, // face west
-    Unknown_83759B8, // face east
-    Unknown_83759D4,
-    Unknown_83759E0,
-    Unknown_83759EC,
-    Unknown_83759F8,
-    Unknown_8375A04,
-    Unknown_8375A10,
-    Unknown_8375A1C,
-    Unknown_8375A28,
-    Unknown_8375A40,
-    Unknown_8375A4C,
-    Unknown_8375A58,
-    Unknown_8375A64,
-    Unknown_8375A70,
-    Unknown_8375A7C,
-    Unknown_8375A88,
-    Unknown_8375A94,
-    Unknown_8375AA0,
-    Unknown_8375AAC,
-    Unknown_8375AB8,
-    Unknown_8375AC4,
-    Unknown_8375AD0,
-    Unknown_8375ADC,
-    Unknown_8375AE8,
-    Unknown_8375AF4,
-    Unknown_8375B00,
-    Unknown_8375B0C,
-    Unknown_8375B18,
-    Unknown_8375B24,
-    Unknown_8375B30,
-    Unknown_8375B3C,
-    Unknown_8375B48,
-    Unknown_8375B54,
-    Unknown_8375B60,
-    Unknown_8375B6C,
-    Unknown_8375B78,
-    Unknown_8375B84,
-    Unknown_8375B90,
-    Unknown_8375B9C,
-    Unknown_8375BA8,
-    Unknown_8375BB4,
-    Unknown_8375BC0,
-    Unknown_8375BCC,
-    Unknown_8375BD8,
-    Unknown_8375BE4,
-    Unknown_8375BF0,
+u8 (*const *const gMovementActionFuncs[])(struct MapObject *, struct Sprite *) = {
+    gMovementActionFuncs_FaceDown,                // MOVEMENT_ACTION_FACE_DOWN
+    gMovementActionFuncs_FaceUp,                  // MOVEMENT_ACTION_FACE_UP
+    gMovementActionFuncs_FaceLeft,                // MOVEMENT_ACTION_FACE_LEFT
+    gMovementActionFuncs_FaceRight,               // MOVEMENT_ACTION_FACE_RIGHT
+    gMovementActionFuncs_WalkSlowDown,            // MOVEMENT_ACTION_WALK_DOWN_SLOW
+    gMovementActionFuncs_WalkSlowUp,              // MOVEMENT_ACTION_WALK_UP_SLOW
+    gMovementActionFuncs_WalkSlowLeft,            // MOVEMENT_ACTION_WALK_LEFT_SLOW
+    gMovementActionFuncs_WalkSlowRight,           // MOVEMENT_ACTION_WALK_RIGHT_SLOW
+    gMovementActionFuncs_WalkNormalDown,          // MOVEMENT_ACTION_WALK_DOWN_NORMAL
+    gMovementActionFuncs_WalkNormalUp,            // MOVEMENT_ACTION_WALK_UP_NORMAL
+    gMovementActionFuncs_WalkNormalLeft,          // MOVEMENT_ACTION_WALK_LEFT_NORMAL
+    gMovementActionFuncs_WalkNormalRight,         // MOVEMENT_ACTION_WALK_RIGHT_NORMAL
+    gMovementActionFuncs_Jump2Down,               // MOVEMENT_ACTION_JUMP_2_DOWN
+    gMovementActionFuncs_Jump2Up,                 // MOVEMENT_ACTION_JUMP_2_UP
+    gMovementActionFuncs_Jump2Left,               // MOVEMENT_ACTION_JUMP_2_LEFT
+    gMovementActionFuncs_Jump2Right,              // MOVEMENT_ACTION_JUMP_2_RIGHT
+    gMovementActionFuncs_Delay1,                  // MOVEMENT_ACTION_DELAY_1
+    gMovementActionFuncs_Delay2,                  // MOVEMENT_ACTION_DELAY_2
+    gMovementActionFuncs_Delay4,                  // MOVEMENT_ACTION_DELAY_4
+    gMovementActionFuncs_Delay8,                  // MOVEMENT_ACTION_DELAY_8
+    gMovementActionFuncs_Delay16,                 // MOVEMENT_ACTION_DELAY_16
+    gMovementActionFuncs_WalkFastDown,            // MOVEMENT_ACTION_WALK_FAST_DOWN
+    gMovementActionFuncs_WalkFastUp,              // MOVEMENT_ACTION_WALK_FAST_UP
+    gMovementActionFuncs_WalkFastLeft,            // MOVEMENT_ACTION_WALK_FAST_LEFT
+    gMovementActionFuncs_WalkFastRight,           // MOVEMENT_ACTION_WALK_FAST_RIGHT
+    gMovementActionFuncs_WalkInPlaceSlowDown,     // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN
+    gMovementActionFuncs_WalkInPlaceSlowUp,       // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP
+    gMovementActionFuncs_WalkInPlaceSlowLeft,     // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT
+    gMovementActionFuncs_WalkInPlaceSlowRight,    // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT
+    gMovementActionFuncs_WalkInPlaceNormalDown,   // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN
+    gMovementActionFuncs_WalkInPlaceNormalUp,     // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP
+    gMovementActionFuncs_WalkInPlaceNormalLeft,   // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT
+    gMovementActionFuncs_WalkInPlaceNormalRight,  // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT
+    gMovementActionFuncs_WalkInPlaceFastDown,     // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN
+    gMovementActionFuncs_WalkInPlaceFastUp,       // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP
+    gMovementActionFuncs_WalkInPlaceFastLeft,     // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT
+    gMovementActionFuncs_WalkInPlaceFastRight,    // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT
+    gMovementActionFuncs_WalkInPlaceFastestDown,  // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN
+    gMovementActionFuncs_WalkInPlaceFastestUp,    // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP
+    gMovementActionFuncs_WalkInPlaceFastestLeft,  // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT
+    gMovementActionFuncs_WalkInPlaceFastestRight, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT
+    gMovementActionFuncs_RideWaterCurrentDown,    // MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN
+    gMovementActionFuncs_RideWaterCurrentUp,      // MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP
+    gMovementActionFuncs_RideWaterCurrentLeft,    // MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT
+    gMovementActionFuncs_RideWaterCurrentRight,   // MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT
+    gMovementActionFuncs_WalkFastestDown,         // MOVEMENT_ACTION_WALK_FASTEST_DOWN
+    gMovementActionFuncs_WalkFastestUp,           // MOVEMENT_ACTION_WALK_FASTEST_UP
+    gMovementActionFuncs_WalkFastestLeft,         // MOVEMENT_ACTION_WALK_FASTEST_LEFT
+    gMovementActionFuncs_WalkFastestRight,        // MOVEMENT_ACTION_WALK_FASTEST_RIGHT
     Unknown_8375BFC,
     Unknown_8375C08,
     Unknown_8375C14,
@@ -689,831 +562,831 @@ u8 (*const *const gUnknown_08375778[])(struct MapObject *, struct Sprite *) = {
 };
 
 
-u8 (*const Unknown_83759A0[])(struct MapObject *, struct Sprite *) = {
-    sub_8060CE0,
-    sub_8063474
+u8 (*const gMovementActionFuncs_FaceDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_FaceDown_Step0,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_83759A8[])(struct MapObject *, struct Sprite *) = {
-    sub_8060CF0,
-    sub_8063474
+u8 (*const gMovementActionFuncs_FaceUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_FaceUp_Step0,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_83759B0[])(struct MapObject *, struct Sprite *) = {
-    sub_8060D00,
-    sub_8063474
+u8 (*const gMovementActionFuncs_FaceLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_FaceLeft_Step0,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_83759B8[])(struct MapObject *, struct Sprite *) = {
-    sub_8060D10,
-    sub_8063474
+u8 (*const gMovementActionFuncs_FaceRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_FaceRight_Step0,
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const gUnknown_083759C0[])(u8) = {
-    get_go_image_anim_num,
-    get_go_fast_image_anim_num,
-    get_go_fast_image_anim_num,
-    get_go_faster_image_anim_num,
-    sub_805FD78
+    GetWalkSlowMovementAction_Extended,
+    GetWalkNormalMovementAction_Extended,
+    GetWalkNormalMovementAction_Extended,
+    GetJump2MovementAction_Extended,
+    GetDelayMovementAction_Extended
 };
 
-u8 (*const Unknown_83759D4[])(struct MapObject *, struct Sprite *) = {
-    sub_8060F3C,
-    sub_8060F5C,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkSlowDown_Step0,
+    MovementAction_WalkSlowDown_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_83759E0[])(struct MapObject *, struct Sprite *) = {
-    sub_8060F7C,
-    sub_8060F9C,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkSlowUp_Step0,
+    MovementAction_WalkSlowUp_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_83759EC[])(struct MapObject *, struct Sprite *) = {
-    sub_8060FBC,
-    sub_8060FDC,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkSlowLeft_Step0,
+    MovementAction_WalkSlowLeft_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_83759F8[])(struct MapObject *, struct Sprite *) = {
-    sub_8060FFC,
-    sub_806101C,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkSlowRight_Step0,
+    MovementAction_WalkSlowRight_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375A04[])(struct MapObject *, struct Sprite *) = {
-    sub_806103C,
-    sub_806105C,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkNormalDown_Step0,
+    MovementAction_WalkNormalDown_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375A10[])(struct MapObject *, struct Sprite *) = {
-    sub_806107C,
-    sub_806109C,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkNormalUp_Step0,
+    MovementAction_WalkNormalUp_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375A1C[])(struct MapObject *, struct Sprite *) = {
-    sub_80610BC,
-    sub_80610DC,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkNormalLeft_Step0,
+    MovementAction_WalkNormalLeft_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375A28[])(struct MapObject *, struct Sprite *) = {
-    sub_80610FC,
-    sub_806111C,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkNormalRight_Step0,
+    MovementAction_WalkNormalRight_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
 const s16 gUnknown_08375A34[] = {0, 1, 1};
 const s16 gUnknown_08375A3A[] = {0, 0, 1};
 
-u8 (*const Unknown_8375A40[])(struct MapObject *, struct Sprite *) = {
-    sub_80613A8,
-    sub_80613D4,
-    sub_8063474
+u8 (*const gMovementActionFuncs_Jump2Down[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_Jump2Down_Step0,
+    MovementAction_Jump2Down_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375A4C[])(struct MapObject *, struct Sprite *) = {
-    sub_8061400,
-    sub_806142C,
-    sub_8063474
+u8 (*const gMovementActionFuncs_Jump2Up[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_Jump2Up_Step0,
+    MovementAction_Jump2Up_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375A58[])(struct MapObject *, struct Sprite *) = {
-    sub_8061458,
-    sub_8061484,
-    sub_8063474
+u8 (*const gMovementActionFuncs_Jump2Left[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_Jump2Left_Step0,
+    MovementAction_Jump2Left_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375A64[])(struct MapObject *, struct Sprite *) = {
-    sub_80614B0,
-    sub_80614DC,
-    sub_8063474
+u8 (*const gMovementActionFuncs_Jump2Right[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_Jump2Right_Step0,
+    MovementAction_Jump2Right_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375A70[])(struct MapObject *, struct Sprite *) = {
-    sub_806152C,
-    sub_8061510,
-    sub_8063470
+u8 (*const gMovementActionFuncs_Delay1[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_Delay1_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish
 };
 
-u8 (*const Unknown_8375A7C[])(struct MapObject *, struct Sprite *) = {
-    sub_806154C,
-    sub_8061510,
-    sub_8063470
+u8 (*const gMovementActionFuncs_Delay2[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_Delay2_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish
 };
 
-u8 (*const Unknown_8375A88[])(struct MapObject *, struct Sprite *) = {
-    sub_806156C,
-    sub_8061510,
-    sub_8063470
+u8 (*const gMovementActionFuncs_Delay4[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_Delay4_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish
 };
 
-u8 (*const Unknown_8375A94[])(struct MapObject *, struct Sprite *) = {
-    sub_806158C,
-    sub_8061510,
-    sub_8063470
+u8 (*const gMovementActionFuncs_Delay8[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_Delay8_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish
 };
 
-u8 (*const Unknown_8375AA0[])(struct MapObject *, struct Sprite *) = {
-    sub_80615AC,
-    sub_8061510,
-    sub_8063470
+u8 (*const gMovementActionFuncs_Delay16[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_Delay16_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish
 };
 
-u8 (*const Unknown_8375AAC[])(struct MapObject *, struct Sprite *) = {
-    sub_80615CC,
-    sub_80615EC,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkFastDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkFastDown_Step0,
+    MovementAction_WalkFastDown_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375AB8[])(struct MapObject *, struct Sprite *) = {
-    sub_806160C,
-    sub_806162C,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkFastUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkFastUp_Step0,
+    MovementAction_WalkFastUp_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375AC4[])(struct MapObject *, struct Sprite *) = {
-    sub_806164C,
-    sub_806166C,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkFastLeft_Step0,
+    MovementAction_WalkFastLeft_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375AD0[])(struct MapObject *, struct Sprite *) = {
-    sub_806168C,
-    sub_80616AC,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkFastRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkFastRight_Step0,
+    MovementAction_WalkFastRight_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375ADC[])(struct MapObject *, struct Sprite *) = {
-    sub_8061778,
-    sub_806173C,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceSlowDown_Step0,
+    MovementAction_WalkInPlaceSlow_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375AE8[])(struct MapObject *, struct Sprite *) = {
-    sub_80617B0,
-    sub_806173C,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceSlowUp_Step0,
+    MovementAction_WalkInPlaceSlow_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375AF4[])(struct MapObject *, struct Sprite *) = {
-    sub_80617E8,
-    sub_806173C,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceSlowLeft_Step0,
+    MovementAction_WalkInPlaceSlow_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375B00[])(struct MapObject *, struct Sprite *) = {
-    sub_8061820,
-    sub_806173C,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceSlowRight_Step0,
+    MovementAction_WalkInPlaceSlow_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375B0C[])(struct MapObject *, struct Sprite *) = {
-    sub_8061858,
-    sub_8061714,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceNormalDown_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375B18[])(struct MapObject *, struct Sprite *) = {
-    sub_8061890,
-    sub_8061714,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceNormalUp_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375B24[])(struct MapObject *, struct Sprite *) = {
-    sub_80618C8,
-    sub_8061714,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceNormalLeft_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375B30[])(struct MapObject *, struct Sprite *) = {
-    sub_8061900,
-    sub_8061714,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceNormalRight_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375B3C[])(struct MapObject *, struct Sprite *) = {
-    sub_8061938,
-    sub_8061714,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastDown_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375B48[])(struct MapObject *, struct Sprite *) = {
-    sub_8061970,
-    sub_8061714,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastUp_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375B54[])(struct MapObject *, struct Sprite *) = {
-    sub_80619A8,
-    sub_8061714,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastLeft_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375B60[])(struct MapObject *, struct Sprite *) = {
-    sub_80619E0,
-    sub_8061714,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastRight_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375B6C[])(struct MapObject *, struct Sprite *) = {
-    sub_8061A18,
-    sub_8061714,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastestDown_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375B78[])(struct MapObject *, struct Sprite *) = {
-    sub_8061A50,
-    sub_8061714,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastestUp_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375B84[])(struct MapObject *, struct Sprite *) = {
-    sub_8061A88,
-    sub_8061714,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastestLeft_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375B90[])(struct MapObject *, struct Sprite *) = {
-    sub_8061AC0,
-    sub_8061714,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastestRight_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375B9C[])(struct MapObject *, struct Sprite *) = {
-    sub_8061AF8,
-    sub_8061B18,
-    sub_8063474
+u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_RideWaterCurrentDown_Step0,
+    MovementAction_RideWaterCurrentDown_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375BA8[])(struct MapObject *, struct Sprite *) = {
-    sub_8061B38,
-    sub_8061B58,
-    sub_8063474
+u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_RideWaterCurrentUp_Step0,
+    MovementAction_RideWaterCurrentUp_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375BB4[])(struct MapObject *, struct Sprite *) = {
-    sub_8061B78,
-    sub_8061B98,
-    sub_8063474
+u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_RideWaterCurrentLeft_Step0,
+    MovementAction_RideWaterCurrentLeft_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375BC0[])(struct MapObject *, struct Sprite *) = {
-    sub_8061BB8,
-    sub_8061BD8,
-    sub_8063474
+u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_RideWaterCurrentRight_Step0,
+    MovementAction_RideWaterCurrentRight_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375BCC[])(struct MapObject *, struct Sprite *) = {
-    sub_8061BF8,
-    sub_8061C18,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkFastestDown_Step0,
+    MovementAction_WalkFastestDown_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375BD8[])(struct MapObject *, struct Sprite *) = {
-    sub_8061C38,
-    sub_8061C58,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkFastestUp_Step0,
+    MovementAction_WalkFastestUp_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375BE4[])(struct MapObject *, struct Sprite *) = {
-    sub_8061C78,
-    sub_8061C98,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkFastestLeft_Step0,
+    MovementAction_WalkFastestLeft_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375BF0[])(struct MapObject *, struct Sprite *) = {
-    sub_8061CB8,
-    sub_8061CD8,
-    sub_8063474
+u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkFastestRight_Step0,
+    MovementAction_WalkFastestRight_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375BFC[])(struct MapObject *, struct Sprite *) = {
     sub_8061CF8,
     sub_8061D18,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375C08[])(struct MapObject *, struct Sprite *) = {
     sub_8061D38,
     sub_8061D58,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375C14[])(struct MapObject *, struct Sprite *) = {
     sub_8061D78,
     sub_8061D98,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375C20[])(struct MapObject *, struct Sprite *) = {
     sub_8061DB8,
     sub_8061DD8,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375C2C[])(struct MapObject *, struct Sprite *) = {
     do_run_south_anim,
     sub_8061E18,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375C38[])(struct MapObject *, struct Sprite *) = {
     do_run_north_anim,
     sub_8061E58,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375C44[])(struct MapObject *, struct Sprite *) = {
     do_run_west_anim,
     sub_8061E98,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375C50[])(struct MapObject *, struct Sprite *) = {
     do_run_east_anim,
     sub_8061ED8,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375C5C[])(struct MapObject *, struct Sprite *) = {
     sub_8061F24,
     sub_8061F3C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375C68[])(struct MapObject *, struct Sprite *) = {
     sub_8061F90,
     sub_8061FB0,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375C74[])(struct MapObject *, struct Sprite *) = {
     sub_8061FD8,
     sub_8061FF8,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375C80[])(struct MapObject *, struct Sprite *) = {
     sub_8062020,
     sub_8062040,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375C8C[])(struct MapObject *, struct Sprite *) = {
     sub_8062068,
     sub_8062088,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375C98[])(struct MapObject *, struct Sprite *) = {
     sub_80620B0,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375CA0[])(struct MapObject *, struct Sprite *) = {
     sub_806210C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375CA8[])(struct MapObject *, struct Sprite *) = {
     sub_8062170,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375CB0[])(struct MapObject *, struct Sprite *) = {
     sub_8062180,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375CB8[])(struct MapObject *, struct Sprite *) = {
     sub_8062190,
     sub_80621BC,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375CC4[])(struct MapObject *, struct Sprite *) = {
     sub_80621E8,
     sub_8062214,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375CD0[])(struct MapObject *, struct Sprite *) = {
     sub_8062240,
     sub_806226C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375CDC[])(struct MapObject *, struct Sprite *) = {
     sub_8062298,
     sub_80622C4,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375CE8[])(struct MapObject *, struct Sprite *) = {
     sub_80622F0,
     sub_806231C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375CF4[])(struct MapObject *, struct Sprite *) = {
     sub_8062348,
     sub_8062374,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375D00[])(struct MapObject *, struct Sprite *) = {
     sub_80623A0,
     sub_80623CC,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375D0C[])(struct MapObject *, struct Sprite *) = {
     sub_80623F8,
     sub_8062424,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375D18[])(struct MapObject *, struct Sprite *) = {
     sub_8062450,
     sub_806247C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375D24[])(struct MapObject *, struct Sprite *) = {
     sub_80624A8,
     sub_80624D4,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375D30[])(struct MapObject *, struct Sprite *) = {
     sub_8062500,
     sub_806252C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375D3C[])(struct MapObject *, struct Sprite *) = {
     sub_8062558,
     sub_8062584,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375D48[])(struct MapObject *, struct Sprite *) = {
     sub_80625B0,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375D50[])(struct MapObject *, struct Sprite *) = {
     sub_80625C8,
     sub_8061F3C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375D5C[])(struct MapObject *, struct Sprite *) = {
     sub_80625D8,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375D64[])(struct MapObject *, struct Sprite *) = {
     sub_80625E8,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375D6C[])(struct MapObject *, struct Sprite *) = {
     sub_80625F8,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375D74[])(struct MapObject *, struct Sprite *) = {
     sub_8062608,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375D7C[])(struct MapObject *, struct Sprite *) = {
     sub_8062634,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375D84[])(struct MapObject *, struct Sprite *) = {
     sub_8062644,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375D8C[])(struct MapObject *, struct Sprite *) = {
     do_exclamation_mark_bubble_1,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375D94[])(struct MapObject *, struct Sprite *) = {
     do_exclamation_mark_bubble_2,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375D9C[])(struct MapObject *, struct Sprite *) = {
     do_heart_bubble,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375DA4[])(struct MapObject *, struct Sprite *) = {
     sub_80626C0,
     sub_8062704,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375DB0[])(struct MapObject *, struct Sprite *) = {
     sub_8062724,
     sub_8062740,
     sub_8062764,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375DC0[])(struct MapObject *, struct Sprite *) = {
     sub_80627A0,
     sub_80627BC,
     sub_80627E0,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375DD0[])(struct MapObject *, struct Sprite *) = {
     sub_806281C,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375DD8[])(struct MapObject *, struct Sprite *) = {
     sub_806282C,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375DE0[])(struct MapObject *, struct Sprite *) = {
     sub_806283C,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375DE8[])(struct MapObject *, struct Sprite *) = {
     sub_806286C,
-    sub_8063470
+    MovementAction_Finish
 };
 
 u8 (*const Unknown_8375DF0[])(struct MapObject *, struct Sprite *) = {
     sub_806289C,
     sub_80628D0,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375DFC[])(struct MapObject *, struct Sprite *) = {
     sub_80628FC,
     sub_8062930,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375E08[])(struct MapObject *, struct Sprite *) = {
     sub_806299C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375E10[])(struct MapObject *, struct Sprite *) = {
     sub_80629AC,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375E18[])(struct MapObject *, struct Sprite *) = {
     sub_80629BC,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375E20[])(struct MapObject *, struct Sprite *) = {
     sub_80629CC,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375E28[])(struct MapObject *, struct Sprite *) = {
     sub_80629DC,
     sub_8061F3C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375E34[])(struct MapObject *, struct Sprite *) = {
     sub_8062A00,
     sub_8061F3C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375E40[])(struct MapObject *, struct Sprite *) = {
     sub_8062A24,
     sub_8061F3C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375E4C[])(struct MapObject *, struct Sprite *) = {
     sub_8062A48,
     sub_8061F3C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375E58[])(struct MapObject *, struct Sprite *) = {
     sub_8062A6C,
     sub_8061F3C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375E64[])(struct MapObject *, struct Sprite *) = {
     sub_8062A90,
     sub_8061F3C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375E70[])(struct MapObject *, struct Sprite *) = {
     sub_8062AB4,
     sub_8061F3C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375E7C[])(struct MapObject *, struct Sprite *) = {
     sub_8062AD8,
     sub_8061F3C,
-    sub_8063474,
+    MovementAction_PauseSpriteAnim,
     sub_8062AFC,
     sub_8061F3C,
-    sub_8063474,
+    MovementAction_PauseSpriteAnim,
     sub_8062B20,
     sub_8061F3C,
-    sub_8063474,
+    MovementAction_PauseSpriteAnim,
     sub_8062B44,
     sub_8061F3C,
-    sub_8063474,
+    MovementAction_PauseSpriteAnim,
     sub_8062B68,
     sub_8061F3C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375EB8[])(struct MapObject *, struct Sprite *) = {
     sub_8062BD0,
     sub_8062BFC,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375EC4[])(struct MapObject *, struct Sprite *) = {
     sub_8062C28,
     sub_8062C54,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375ED0[])(struct MapObject *, struct Sprite *) = {
     sub_8062C80,
     sub_8062CAC,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375EDC[])(struct MapObject *, struct Sprite *) = {
     sub_8062CD8,
     sub_8062D04,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375EE8[])(struct MapObject *, struct Sprite *) = {
     sub_8062D30,
     sub_8062D5C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375EF4[])(struct MapObject *, struct Sprite *) = {
     sub_8062D88,
     sub_8062DB4,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375F00[])(struct MapObject *, struct Sprite *) = {
     sub_8062DE0,
     sub_8062E0C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375F0C[])(struct MapObject *, struct Sprite *) = {
     sub_8062E38,
     sub_8062E64,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375F18[])(struct MapObject *, struct Sprite *) = {
     sub_8062E90,
     sub_8062EBC,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375F24[])(struct MapObject *, struct Sprite *) = {
     sub_8062EE8,
     sub_8062F14,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375F30[])(struct MapObject *, struct Sprite *) = {
     sub_8062F40,
     sub_8062F6C,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375F3C[])(struct MapObject *, struct Sprite *) = {
     sub_8062F98,
     sub_8062FC4,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375F48[])(struct MapObject *, struct Sprite *) = {
     sub_8062FF0,
-    sub_8061714,
-    sub_8063474
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375F54[])(struct MapObject *, struct Sprite *) = {
     sub_8063028,
-    sub_8061714,
-    sub_8063474
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375F60[])(struct MapObject *, struct Sprite *) = {
     sub_8063060,
-    sub_8061714,
-    sub_8063474
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375F6C[])(struct MapObject *, struct Sprite *) = {
     sub_8063098,
-    sub_8061714,
-    sub_8063474
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375F78[])(struct MapObject *, struct Sprite *) = {
     sub_8063108,
     sub_8063128,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375F84[])(struct MapObject *, struct Sprite *) = {
     sub_8063148,
     sub_8063168,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375F90[])(struct MapObject *, struct Sprite *) = {
     sub_8063188,
     sub_80631A8,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375F9C[])(struct MapObject *, struct Sprite *) = {
     sub_80631C8,
     sub_80631E8,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375FA8[])(struct MapObject *, struct Sprite *) = {
     sub_8063238,
     sub_8063258,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375FB4[])(struct MapObject *, struct Sprite *) = {
     sub_8063278,
     sub_8063298,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375FC0[])(struct MapObject *, struct Sprite *) = {
     sub_80632B8,
     sub_80632D8,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375FCC[])(struct MapObject *, struct Sprite *) = {
     sub_80632F8,
     sub_8063318,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375FD8[])(struct MapObject *, struct Sprite *) = {
     sub_8063370,
     sub_8063390,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375FE4[])(struct MapObject *, struct Sprite *) = {
     sub_80633B0,
     sub_80633D0,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375FF0[])(struct MapObject *, struct Sprite *) = {
     sub_80633F0,
     sub_8063410,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375FFC[])(struct MapObject *, struct Sprite *) = {
     sub_8063430,
     sub_8063450,
-    sub_8063474
+    MovementAction_PauseSpriteAnim
 };
 
 #endif //POKERUBY_ANIM_FUNC_PTRS_H
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 35cfcbd0f..8613f1f03 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1958,13 +1958,73 @@ const s16 gMovementDelaysShort[] =  {32, 48,  64,  80};
 
 #include "data/field_map_obj/callback_subroutine_pointers.h"
 
-const u8 gUnknown_083755F4[] = {0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01};
-const u8 gUnknown_083755FD[] = {0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05};
-const u8 gUnknown_08375606[] = {0x08, 0x08, 0x09, 0x0A, 0x0B, 0x08, 0x08, 0x09, 0x09};
-const u8 gUnknown_0837560F[] = {0x0C, 0x0C, 0x0D, 0x0E, 0x0F, 0x0C, 0x0C, 0x0D, 0x0D};
-const u8 gUnknown_08375618[] = {0x10, 0x10, 0x11, 0x12, 0x13, 0x10, 0x10, 0x11, 0x11};
-const u8 gUnknown_08375621[] = {0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15};
-const u8 gUnknown_0837562A[] = {0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15};
+const u8 gFaceDirectionMovementActions_Extended[] = {
+    MOVEMENT_ACTION_FACE_DOWN,  // DIR_NONE
+    MOVEMENT_ACTION_FACE_DOWN,  // DIR_SOUTH
+    MOVEMENT_ACTION_FACE_UP,    // DIR_NORTH
+    MOVEMENT_ACTION_FACE_LEFT,  // DIR_WEST
+    MOVEMENT_ACTION_FACE_RIGHT, // DIR_EAST
+    MOVEMENT_ACTION_FACE_DOWN,  // DIR_SOUTHWEST
+    MOVEMENT_ACTION_FACE_DOWN,  // DIR_SOUTHEAST
+    MOVEMENT_ACTION_FACE_UP,    // DIR_NORTHWEST
+    MOVEMENT_ACTION_FACE_UP,    // DIR_NORTHEAST
+};
+const u8 gWalkSlowMovementActions_Extended[] = {
+    MOVEMENT_ACTION_WALK_SLOW_DOWN,  // DIR_NONE
+    MOVEMENT_ACTION_WALK_SLOW_DOWN,  // DIR_SOUTH
+    MOVEMENT_ACTION_WALK_SLOW_UP,    // DIR_NORTH
+    MOVEMENT_ACTION_WALK_SLOW_LEFT,  // DIR_WEST
+    MOVEMENT_ACTION_WALK_SLOW_RIGHT, // DIR_EAST
+    MOVEMENT_ACTION_WALK_SLOW_DOWN,  // DIR_SOUTHWEST
+    MOVEMENT_ACTION_WALK_SLOW_DOWN,  // DIR_SOUTHEAST
+    MOVEMENT_ACTION_WALK_SLOW_UP,    // DIR_NORTHWEST
+    MOVEMENT_ACTION_WALK_SLOW_UP,    // DIR_NORTHEAST
+};
+const u8 gWalkNormalMovementActions_Extended[] = {
+    MOVEMENT_ACTION_WALK_NORMAL_DOWN,  // DIR_NONE
+    MOVEMENT_ACTION_WALK_NORMAL_DOWN,  // DIR_SOUTH
+    MOVEMENT_ACTION_WALK_NORMAL_UP,    // DIR_NORTH
+    MOVEMENT_ACTION_WALK_NORMAL_LEFT,  // DIR_WEST
+    MOVEMENT_ACTION_WALK_NORMAL_RIGHT, // DIR_EAST
+    MOVEMENT_ACTION_WALK_NORMAL_DOWN,  // DIR_SOUTHWEST
+    MOVEMENT_ACTION_WALK_NORMAL_DOWN,  // DIR_SOUTHEAST
+    MOVEMENT_ACTION_WALK_NORMAL_UP,    // DIR_NORTHWEST
+    MOVEMENT_ACTION_WALK_NORMAL_UP,    // DIR_NORTHEAST
+};
+const u8 gJump2MovementActions_Extended[] = {
+	MOVEMENT_ACTION_JUMP_2_DOWN,
+	MOVEMENT_ACTION_JUMP_2_DOWN,
+	MOVEMENT_ACTION_JUMP_2_UP,
+	MOVEMENT_ACTION_JUMP_2_LEFT,
+	MOVEMENT_ACTION_JUMP_2_RIGHT,
+	MOVEMENT_ACTION_JUMP_2_DOWN,
+	MOVEMENT_ACTION_JUMP_2_DOWN,
+	MOVEMENT_ACTION_JUMP_2_UP,
+	MOVEMENT_ACTION_JUMP_2_UP,
+};
+const u8 gDelayMovementActions_Extended[] = { // TODO: why would delays be mapped to directions?
+	MOVEMENT_ACTION_DELAY_1,
+	MOVEMENT_ACTION_DELAY_1,
+	MOVEMENT_ACTION_DELAY_2,
+	MOVEMENT_ACTION_DELAY_4,
+	MOVEMENT_ACTION_DELAY_8,
+	MOVEMENT_ACTION_DELAY_1,
+	MOVEMENT_ACTION_DELAY_1,
+	MOVEMENT_ACTION_DELAY_2,
+	MOVEMENT_ACTION_DELAY_2,
+};
+const u8 gWalkFastMovementActions_Extended[] = { // TODO: this is broken. It appears like an additional Delay movement type was added late into development, which shifted these arrays off, but they were hardcoded.
+	MOVEMENT_ACTION_DELAY_16,
+	MOVEMENT_ACTION_DELAY_16,
+	MOVEMENT_ACTION_WALK_FAST_DOWN,
+	MOVEMENT_ACTION_WALK_FAST_UP,
+	MOVEMENT_ACTION_WALK_FAST_LEFT,
+	MOVEMENT_ACTION_DELAY_16,
+	MOVEMENT_ACTION_DELAY_16,
+	MOVEMENT_ACTION_WALK_FAST_DOWN,
+	MOVEMENT_ACTION_WALK_FAST_DOWN,
+};
+const u8 gWalkFastMovementActions_Extended2[] = {0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15};
 const u8 gUnknown_08375633[] = {0x18, 0x18, 0x19, 0x1A, 0x1B, 0x18, 0x18, 0x19, 0x19};
 const u8 gUnknown_0837563C[] = {0x1C, 0x1C, 0x1D, 0x1E, 0x1F, 0x1C, 0x1C, 0x1D, 0x1D};
 const u8 gUnknown_08375645[] = {0x20, 0x20, 0x21, 0x22, 0x23, 0x20, 0x20, 0x21, 0x21};
@@ -1975,21 +2035,21 @@ const u8 gUnknown_08375669[] = {0x08, 0x08, 0x09, 0x0A, 0x0B, 0x08, 0x08, 0x09,
 const u8 gUnknown_08375672[] = {0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15};
 const u8 gUnknown_0837567B[] = {0x08, 0x08, 0x07, 0x09, 0x0A, 0x08, 0x08, 0x07, 0x07};
 
-bool8 (*const gUnknown_08375684[])(u8) = {
+bool8 (*const gOppositeDirectionBlockedMetatileFuncs[])(u8) = {
     MetatileBehavior_IsSouthBlocked,
     MetatileBehavior_IsNorthBlocked,
     MetatileBehavior_IsWestBlocked,
     MetatileBehavior_IsEastBlocked
 };
 
-bool8 (*const gUnknown_08375694[])(u8) = {
+bool8 (*const gDirectionBlockedMetatileFuncs[])(u8) = {
     MetatileBehavior_IsNorthBlocked,
     MetatileBehavior_IsSouthBlocked,
     MetatileBehavior_IsEastBlocked,
     MetatileBehavior_IsWestBlocked
 };
 
-const struct Coords16 gDirectionToVector[] = {
+const struct Coords16 gDirectionToVectors[] = {
     { 0,  0},
     { 0,  1},
     { 0, -1},
@@ -2001,23 +2061,89 @@ const struct Coords16 gDirectionToVector[] = {
     { 1, -1}
 };
 
-const u8 gUnknown_083756C8[] = {0x00, 0x00, 0x01, 0x02, 0x03};
-const u8 gUnknown_083756CD[] = {0x04, 0x04, 0x05, 0x06, 0x07};
-const u8 gUnknown_083756D2[] = {0x08, 0x08, 0x09, 0x0A, 0x0B};
-const u8 gUnknown_083756D7[] = {0x15, 0x15, 0x16, 0x17, 0x18};
-const u8 gUnknown_083756DC[] = {0x29, 0x29, 0x2A, 0x2B, 0x2C};
-const u8 gUnknown_083756E1[] = {0x2D, 0x2D, 0x2E, 0x2F, 0x30};
+const u8 gFaceDirectionMovementActions[] = {
+    MOVEMENT_ACTION_FACE_DOWN,
+    MOVEMENT_ACTION_FACE_DOWN,
+    MOVEMENT_ACTION_FACE_UP,
+    MOVEMENT_ACTION_FACE_LEFT,
+    MOVEMENT_ACTION_FACE_RIGHT,
+};
+const u8 gWalkSlowMovementActions[] = {
+    MOVEMENT_ACTION_WALK_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_SLOW_UP,
+    MOVEMENT_ACTION_WALK_SLOW_LEFT,
+    MOVEMENT_ACTION_WALK_SLOW_RIGHT,
+};
+const u8 gWalkNormalMovementActions[] = {
+    MOVEMENT_ACTION_WALK_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_NORMAL_UP,
+    MOVEMENT_ACTION_WALK_NORMAL_LEFT,
+    MOVEMENT_ACTION_WALK_NORMAL_RIGHT,
+};
+const u8 gWalkFastMovementActions[] = {
+	MOVEMENT_ACTION_WALK_FAST_DOWN,
+	MOVEMENT_ACTION_WALK_FAST_DOWN,
+	MOVEMENT_ACTION_WALK_FAST_UP,
+	MOVEMENT_ACTION_WALK_FAST_LEFT,
+	MOVEMENT_ACTION_WALK_FAST_RIGHT,
+};
+const u8 gRideWaterCurrentMovementActions[] = {
+	MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN,
+	MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN,
+	MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP,
+	MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT,
+	MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT,
+};
+const u8 gWalkFastestMovementActions[] = {
+	MOVEMENT_ACTION_WALK_FASTEST_DOWN,
+	MOVEMENT_ACTION_WALK_FASTEST_DOWN,
+	MOVEMENT_ACTION_WALK_FASTEST_UP,
+	MOVEMENT_ACTION_WALK_FASTEST_LEFT,
+	MOVEMENT_ACTION_WALK_FASTEST_RIGHT,
+};
 const u8 gUnknown_083756E6[] = {0x31, 0x31, 0x32, 0x33, 0x34};
 const u8 gUnknown_083756EB[] = {0x35, 0x35, 0x36, 0x37, 0x38};
-const u8 gUnknown_083756F0[] = {0x0C, 0x0C, 0x0D, 0x0E, 0x0F};
+const u8 gJump2MovementActions[] = {
+	MOVEMENT_ACTION_JUMP_2_DOWN,
+	MOVEMENT_ACTION_JUMP_2_DOWN,
+	MOVEMENT_ACTION_JUMP_2_UP,
+	MOVEMENT_ACTION_JUMP_2_LEFT,
+	MOVEMENT_ACTION_JUMP_2_RIGHT,
+};
 const u8 gUnknown_083756F5[] = {0x46, 0x46, 0x47, 0x48, 0x49};
 const u8 gUnknown_083756FA[] = {0x4B, 0x4B, 0x4A, 0x4D, 0x4C};
 const u8 gUnknown_083756FF[] = {0x42, 0x42, 0x43, 0x44, 0x45};
 const u8 gUnknown_08375704[] = {0x3A, 0x3A, 0x3B, 0x3C, 0x3D};
-const u8 gUnknown_08375709[] = {0x19, 0x19, 0x1A, 0x1B, 0x1C};
-const u8 gUnknown_0837570E[] = {0x1D, 0x1D, 0x1E, 0x1F, 0x20};
-const u8 gUnknown_08375713[] = {0x21, 0x21, 0x22, 0x23, 0x24};
-const u8 gUnknown_08375718[] = {0x25, 0x25, 0x26, 0x27, 0x28};
+const u8 gWalkInPlaceSlowMovementActions[] = {
+	MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,
+	MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,
+	MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP,
+	MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT,
+	MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT,
+};
+const u8 gWalkInPlaceNormalMovementActions[] = {
+	MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN,
+	MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN,
+	MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP,
+	MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT,
+	MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT,
+};
+const u8 gWalkInPlaceFastMovementActions[] = {
+	MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN,
+	MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN,
+	MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP,
+	MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT,
+	MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT,
+};
+const u8 gWalkInPlaceFastestMovementActions[] = {
+	MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
+	MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
+	MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP,
+	MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT,
+	MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT,
+};
 const u8 gUnknown_0837571D[] = {0x62, 0x62, 0x63, 0x64, 0x65};
 const u8 gUnknown_08375722[] = {0x66, 0x66, 0x67, 0x68, 0x69};
 const u8 gUnknown_08375727[] = {0x6A, 0x6A, 0x6B, 0x6C, 0x6D};
@@ -2029,7 +2155,16 @@ const u8 gUnknown_08375740[] = {0x7E, 0x7E, 0x7F, 0x80, 0x81};
 const u8 gUnknown_08375745[] = {0x82, 0x82, 0x83, 0x84, 0x85};
 const u8 gUnknown_0837574A[] = {0x86, 0x86, 0x87, 0x88, 0x89};
 
-const u8 gUnknown_0837574F[] = {2, 1, 4, 3, 8, 7, 6, 5};
+const u8 gOppositeDirections[] = {
+    DIR_NORTH,
+    DIR_SOUTH,
+    DIR_EAST,
+    DIR_WEST,
+    DIR_NORTHEAST,
+    DIR_NORTHWEST,
+    DIR_SOUTHEAST,
+    DIR_SOUTHWEST
+};
 
 const u8 gUnknown_08375757[][4] = {
     {2, 1, 4, 3},
@@ -2358,7 +2493,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *
     mapObject->spriteId = spriteId;
     mapObject->inanimate = gfxInfo->inanimate;
     if (!mapObject->inanimate)
-        StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->facingDirection));
+        StartSpriteAnim(sprite, GetFaceDirectionMovementAction_Extended(mapObject->facingDirection));
     SetObjectSubpriorityByZCoord(mapObject->previousElevation, sprite, 1);
     sub_80634D0(mapObject, sprite);
     return mapObjectId;
@@ -2469,7 +2604,7 @@ u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x
     return spriteId;
 }
 
-extern void sub_8064970(struct Sprite *);
+extern void UpdateFieldSpriteSubpriorityAndVisibility(struct Sprite *);
 extern void sub_8060470(s16 *, s16 *, s16, s16);
 void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z);
 
@@ -2481,7 +2616,7 @@ u8 sub_805B410(u8 graphicsId, u8 b, s16 x, s16 y, u8 elevation, u8 direction)
     u8 spriteId;
 
     gfxInfo = GetFieldObjectGraphicsInfo(graphicsId);
-    MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, sub_8064970, &spriteTemplate, &subspriteTables);
+    MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, UpdateFieldSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables);
 #ifdef NONMATCHING
     spriteTemplate.paletteTag = 0xFFFF;
 #else
@@ -2511,7 +2646,7 @@ u8 sub_805B410(u8 graphicsId, u8 b, s16 x, s16 y, u8 elevation, u8 direction)
         }
         InitObjectPriorityByZCoord(sprite, elevation);
         SetObjectSubpriorityByZCoord(elevation, sprite, 1);
-        StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(direction));
+        StartSpriteAnim(sprite, GetFaceDirectionMovementAction_Extended(direction));
     }
     return spriteId;
 }
@@ -2662,7 +2797,7 @@ void sub_805B75C(u8 mapObjectId, s16 b, s16 c)
         sprite->data[0] = mapObjectId;
         mapObject->spriteId = spriteId;
         if (!mapObject->inanimate && mapObject->movementType != MOVEMENT_TYPE_PLAYER)
-            StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->facingDirection));
+            StartSpriteAnim(sprite, GetFaceDirectionMovementAction_Extended(mapObject->facingDirection));
         sub_805B914(mapObject);
         SetObjectSubpriorityByZCoord(mapObject->previousElevation, sprite, 1);
     }
@@ -2730,7 +2865,7 @@ void FieldObjectTurn(struct MapObject *mapObject, u8 direction)
     FieldObjectSetDirection(mapObject, direction);
     if (!mapObject->inanimate)
     {
-        StartSpriteAnim(&gSprites[mapObject->spriteId], FieldObjectDirectionToImageAnimId(mapObject->facingDirection));
+        StartSpriteAnim(&gSprites[mapObject->spriteId], GetFaceDirectionMovementAction_Extended(mapObject->facingDirection));
         SeekSpriteAnim(&gSprites[mapObject->spriteId], 0);
     }
 }
@@ -3360,7 +3495,7 @@ extern void FieldObjectSetSingleMovement(struct MapObject *, struct Sprite *, u8
 
 u8 MovementType_WanderAround_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
@@ -3410,7 +3545,7 @@ u8 MovementType_WanderAround_Step4(struct MapObject *mapObject, struct Sprite *s
 
 u8 MovementType_WanderAround_Step5(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetGoSpeed0MovementActionId(mapObject->movementDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetWalkNormalMovementAction(mapObject->movementDirection));
     mapObject->singleMovementActive = 1;
     sprite->data[1] = 6;
     return 1;
@@ -3674,7 +3809,7 @@ u8 MovementType_LookAround_Step0(struct MapObject *mapObject, struct Sprite *spr
 
 u8 MovementType_LookAround_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
@@ -3706,7 +3841,7 @@ u8 MovementType_LookAround_Step4(struct MapObject *mapObject, struct Sprite *spr
     u8 directions[4];
     memcpy(directions, gStandardDirections, 4);
     direction = sub_805CD60(mapObject, 0);
-    if (direction == 0)
+    if (direction == DIR_NONE)
         direction = directions[Random() & 3];
 
     FieldObjectSetDirection(mapObject, direction);
@@ -3725,7 +3860,7 @@ u8 MovementType_WanderUpAndDown_Step0(struct MapObject *mapObject, struct Sprite
 
 u8 MovementType_WanderUpAndDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
@@ -3768,7 +3903,7 @@ u8 MovementType_WanderUpAndDown_Step4(struct MapObject *mapObject, struct Sprite
 
 u8 MovementType_WanderUpAndDown_Step5(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetGoSpeed0MovementActionId(mapObject->movementDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetWalkNormalMovementAction(mapObject->movementDirection));
     mapObject->singleMovementActive = 1;
     sprite->data[1] = 6;
     return 1;
@@ -3795,7 +3930,7 @@ u8 MovementType_WanderLeftAndRight_Step0(struct MapObject *mapObject, struct Spr
 
 u8 MovementType_WanderLeftAndRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
@@ -3838,7 +3973,7 @@ u8 MovementType_WanderLeftAndRight_Step4(struct MapObject *mapObject, struct Spr
 
 u8 MovementType_WanderLeftAndRight_Step5(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetGoSpeed0MovementActionId(mapObject->movementDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetWalkNormalMovementAction(mapObject->movementDirection));
     mapObject->singleMovementActive = 1;
     sprite->data[1] = 6;
     return 1;
@@ -3859,7 +3994,7 @@ fieldmap_object_cb(MovementType_FaceDirection, MovementType_FaceDirection_Callba
 u8 MovementType_FaceDirection_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 1;
     return 1;
 }
@@ -3997,7 +4132,7 @@ u8 MovementType_FaceDownAndUp_Step0(struct MapObject *mapObject, struct Sprite *
 
 u8 MovementType_FaceDownAndUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
@@ -4029,7 +4164,7 @@ u8 MovementType_FaceDownAndUp_Step4(struct MapObject *mapObject, struct Sprite *
     u8 directions[2];
     memcpy(directions, gUpAndDownDirections, 2);
     direction = sub_805CD60(mapObject, 1);
-    if (direction == 0)
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 1];
     }
@@ -4049,7 +4184,7 @@ u8 MovementType_FaceLeftAndRight_Step0(struct MapObject *mapObject, struct Sprit
 
 u8 MovementType_FaceLeftAndRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
@@ -4081,7 +4216,7 @@ u8 MovementType_FaceLeftAndRight_Step4(struct MapObject *mapObject, struct Sprit
     u8 directions[2];
     memcpy(directions, gLeftAndRightDirections, 2);
     direction = sub_805CD60(mapObject, 2);
-    if (direction == 0)
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 1];
     }
@@ -4101,7 +4236,7 @@ u8 MovementType_FaceUpAndLeft_Step0(struct MapObject *mapObject, struct Sprite *
 
 u8 MovementType_FaceUpAndLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
@@ -4133,7 +4268,7 @@ u8 MovementType_FaceUpAndLeft_Step4(struct MapObject *mapObject, struct Sprite *
     u8 directions[2];
     memcpy(directions, gUpAndLeftDirections, 2);
     direction = sub_805CD60(mapObject, 3);
-    if (direction == 0)
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 1];
     }
@@ -4153,7 +4288,7 @@ u8 MovementType_FaceUpAndRight_Step0(struct MapObject *mapObject, struct Sprite
 
 u8 MovementType_FaceUpAndRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
@@ -4185,7 +4320,7 @@ u8 MovementType_FaceUpAndRight_Step4(struct MapObject *mapObject, struct Sprite
     u8 directions[2];
     memcpy(directions, gUpAndRightDirections, 2);
     direction = sub_805CD60(mapObject, 4);
-    if (direction == 0)
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 1];
     }
@@ -4205,7 +4340,7 @@ u8 MovementType_FaceDownAndLeft_Step0(struct MapObject *mapObject, struct Sprite
 
 u8 MovementType_FaceDownAndLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
@@ -4237,7 +4372,7 @@ u8 MovementType_FaceDownAndLeft_Step4(struct MapObject *mapObject, struct Sprite
     u8 directions[2];
     memcpy(directions, gDownAndLeftDirections, 2);
     direction = sub_805CD60(mapObject, 5);
-    if (direction == 0)
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 1];
     }
@@ -4257,7 +4392,7 @@ u8 MovementType_FaceDownAndRight_Step0(struct MapObject *mapObject, struct Sprit
 
 u8 MovementType_FaceDownAndRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
@@ -4289,7 +4424,7 @@ u8 MovementType_FaceDownAndRight_Step4(struct MapObject *mapObject, struct Sprit
     u8 directions[2];
     memcpy(directions, gDownAndRightDirections, 2);
     direction = sub_805CD60(mapObject, 6);
-    if (direction == 0)
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 1];
     }
@@ -4309,7 +4444,7 @@ u8 MovementType_FaceDownUpAndLeft_Step0(struct MapObject *mapObject, struct Spri
 
 u8 MovementType_FaceDownUpAndLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
@@ -4341,7 +4476,7 @@ u8 MovementType_FaceDownUpAndLeft_Step4(struct MapObject *mapObject, struct Spri
     u8 directions[4];
     memcpy(directions, gDownUpAndLeftDirections, 4);
     direction = sub_805CD60(mapObject, 7);
-    if (direction == 0)
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 3];
     }
@@ -4361,7 +4496,7 @@ u8 MovementType_FaceDownUpAndRight_Step0(struct MapObject *mapObject, struct Spr
 
 u8 MovementType_FaceDownUpAndRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
@@ -4393,7 +4528,7 @@ u8 MovementType_FaceDownUpAndRight_Step4(struct MapObject *mapObject, struct Spr
     u8 directions[4];
     memcpy(directions, gDownUpAndRightDirections, 4);
     direction = sub_805CD60(mapObject, 8);
-    if (direction == 0)
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 3];
     }
@@ -4413,7 +4548,7 @@ u8 MovementType_FaceUpLeftAndRight_Step0(struct MapObject *mapObject, struct Spr
 
 u8 MovementType_FaceUpLeftAndRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
@@ -4445,7 +4580,7 @@ u8 MovementType_FaceUpLeftAndRight_Step4(struct MapObject *mapObject, struct Spr
     u8 directions[4];
     memcpy(directions, gUpLeftAndRightDirections, 4);
     direction = sub_805CD60(mapObject, 9);
-    if (direction == 0)
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 3];
     }
@@ -4465,7 +4600,7 @@ u8 MovementType_FaceDownLeftAndRight_Step0(struct MapObject *mapObject, struct S
 
 u8 MovementType_FaceDownLeftAndRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
@@ -4497,7 +4632,7 @@ u8 MovementType_FaceDownLeftAndRight_Step4(struct MapObject *mapObject, struct S
     u8 directions[4];
     memcpy(directions, gDownLeftAndRightDirections, 4);
     direction = sub_805CD60(mapObject, 10);
-    if (direction == 0)
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 3];
     }
@@ -4511,7 +4646,7 @@ fieldmap_object_cb(MovementType_RotateCounterclockwise, MovementType_RotateCount
 u8 MovementType_RotateCounterclockwise_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 1;
     return 1;
 }
@@ -4541,7 +4676,7 @@ u8 MovementType_RotateCounterclockwise_Step3(struct MapObject *mapObject, struct
     u8 directions[5];
     memcpy(directions, gCounterclockwiseDirections, 5);
     direction = sub_805CD60(mapObject, 0);
-    if (direction == 0)
+    if (direction == DIR_NONE)
     {
         direction = directions[mapObject->facingDirection];
     }
@@ -4555,7 +4690,7 @@ fieldmap_object_cb(MovementType_RotateClockwise, MovementType_RotateClockwise_Ca
 u8 MovementType_RotateClockwise_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     sprite->data[1] = 1;
     return 1;
 }
@@ -4585,7 +4720,7 @@ u8 MovementType_RotateClockwise_Step3(struct MapObject *mapObject, struct Sprite
     u8 directions[5];
     memcpy(directions, gClockwiseDirections, 5);
     direction = sub_805CD60(mapObject, 0);
-    if (direction == 0)
+    if (direction == DIR_NONE)
     {
         direction = directions[mapObject->facingDirection];
     }
@@ -4626,17 +4761,17 @@ u8 MovementType_WalkBackAndForth_Step2(struct MapObject *mapObject, struct Sprit
         FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection));
     }
     collisionState = GetCollisionInDirection(mapObject, mapObject->movementDirection);
-    movementActionId = GetGoSpeed0MovementActionId(mapObject->movementDirection);
+    movementActionId = GetWalkNormalMovementAction(mapObject->movementDirection);
     if (collisionState == 1)
     {
         mapObject->directionSequenceIndex++;
         FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection));
-        movementActionId = GetGoSpeed0MovementActionId(mapObject->movementDirection);
+        movementActionId = GetWalkNormalMovementAction(mapObject->movementDirection);
         collisionState = GetCollisionInDirection(mapObject, mapObject->movementDirection);
     }
     if (collisionState != 0)
     {
-        movementActionId = GetStepInPlaceDelay16MovementActionId(mapObject->facingDirection);
+        movementActionId = GetWalkInPlaceNormalMovementAction(mapObject->facingDirection);
     }
     FieldObjectSetSingleMovement(mapObject, sprite, movementActionId);
     mapObject->singleMovementActive = 1;
@@ -4670,18 +4805,18 @@ u8 MoveNextDirectionInSequence(struct MapObject *mapObject, struct Sprite *sprit
         mapObject->directionSequenceIndex = 0;
     }
     FieldObjectSetDirection(mapObject, directionSequence[mapObject->directionSequenceIndex]);
-    movementActionId = GetGoSpeed0MovementActionId(mapObject->movementDirection);
+    movementActionId = GetWalkNormalMovementAction(mapObject->movementDirection);
     collisionState = GetCollisionInDirection(mapObject, mapObject->movementDirection);
     if (collisionState == 1)
     {
         mapObject->directionSequenceIndex++;
         FieldObjectSetDirection(mapObject, directionSequence[mapObject->directionSequenceIndex]);
-        movementActionId = GetGoSpeed0MovementActionId(mapObject->movementDirection);
+        movementActionId = GetWalkNormalMovementAction(mapObject->movementDirection);
         collisionState = GetCollisionInDirection(mapObject, mapObject->movementDirection);
     }
     if (collisionState != 0)
     {
-        movementActionId = GetStepInPlaceDelay16MovementActionId(mapObject->facingDirection);
+        movementActionId = GetWalkInPlaceNormalMovementAction(mapObject->facingDirection);
     }
     FieldObjectSetSingleMovement(mapObject, sprite, movementActionId);
     mapObject->singleMovementActive = 1;
@@ -5050,7 +5185,7 @@ bool8 CopyablePlayerMovement_None(struct MapObject *mapObject, struct Sprite *sp
 
 bool8 CopyablePlayerMovement_FaceDirection(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
 {
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, playerDirection)));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, playerDirection)));
     mapObject->singleMovementActive = 1;
     sprite->data[1] = 2;
     return 1;
@@ -5065,10 +5200,10 @@ bool8 CopyablePlayerMovement_GoSpeed0(struct MapObject *mapObject, struct Sprite
     direction = playerDirection;
     direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction);
     FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-    FieldObjectSetSingleMovement(mapObject, sprite, GetGoSpeed0MovementActionId(direction));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetWalkNormalMovementAction(direction));
     if (GetCollisionAtCoords(mapObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(direction));
+        FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(direction));
     }
     mapObject->singleMovementActive = 1;
     sprite->data[1] = 2;
@@ -5084,10 +5219,10 @@ bool8 CopyablePlayerMovement_GoSpeed1(struct MapObject *mapObject, struct Sprite
     direction = playerDirection;
     direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction);
     FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-    FieldObjectSetSingleMovement(mapObject, sprite, sub_8060744(direction));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetWalkFastMovementAction(direction));
     if (GetCollisionAtCoords(mapObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(direction));
+        FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(direction));
     }
     mapObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
@@ -5103,10 +5238,10 @@ bool8 CopyablePlayerMovement_GoSpeed2(struct MapObject *mapObject, struct Sprite
     direction = playerDirection;
     direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction);
     FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-    FieldObjectSetSingleMovement(mapObject, sprite, sub_806079C(direction));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetWalkFastestMovementAction(direction));
     if (GetCollisionAtCoords(mapObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(direction));
+        FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(direction));
     }
     mapObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
@@ -5125,7 +5260,7 @@ bool8 CopyablePlayerMovement_GoSpeed3(struct MapObject *mapObject, struct Sprite
     FieldObjectSetSingleMovement(mapObject, sprite, sub_80607C8(direction));
     if (GetCollisionAtCoords(mapObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(direction));
+        FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(direction));
     }
     mapObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
@@ -5156,7 +5291,7 @@ bool8 CopyablePlayerMovement_GoSpeed4(struct MapObject *mapObject, struct Sprite
     FieldObjectSetSingleMovement(mapObject, sprite, sub_80608A4(direction));
     if (GetCollisionAtCoords(mapObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(direction));
+        FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(direction));
     }
     mapObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
@@ -5174,10 +5309,10 @@ bool8 CopyablePlayerMovement_Jump(struct MapObject *mapObject, struct Sprite *sp
     x = mapObject->currentCoords.x;
     y = mapObject->currentCoords.y;
     sub_8060320(direction, &x, &y, 2, 2);
-    FieldObjectSetSingleMovement(mapObject, sprite, GetJumpLedgeAnimId(direction));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetJump2MovementAction(direction));
     if (GetCollisionAtCoords(mapObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(direction));
+        FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(direction));
     }
     mapObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
@@ -5270,7 +5405,7 @@ fieldmap_object_cb(MovementType_WalkInPlace, MovementType_WalkInPlace_Callback,
 u8 MovementType_WalkInPlace_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    FieldObjectSetSingleMovement(mapObject, sprite, GetStepInPlaceDelay16MovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetWalkInPlaceNormalMovementAction(mapObject->facingDirection));
     sprite->data[1] = 1;
     return 1;
 }
@@ -5280,7 +5415,7 @@ fieldmap_object_cb(MovementType_JogInPlace, MovementType_JogInPlace_Callback, gM
 u8 MovementType_JogInPlace_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    FieldObjectSetSingleMovement(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetWalkInPlaceFastMovementAction(mapObject->facingDirection));
     sprite->data[1] = 1;
     return 1;
 }
@@ -5290,7 +5425,7 @@ fieldmap_object_cb(MovementType_RunInPlace, MovementType_RunInPlace_Callback, gM
 u8 MovementType_RunInPlace_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    FieldObjectSetSingleMovement(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetWalkInPlaceFastestMovementAction(mapObject->facingDirection));
     sprite->data[1] = 1;
     return 1;
 }
@@ -5300,7 +5435,7 @@ fieldmap_object_cb(MovementType_Invisible, MovementType_Invisible_Callback, gMov
 u8 MovementType_Invisible_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementActionId(mapObject->facingDirection));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(mapObject->facingDirection));
     mapObject->invisible = 1;
     sprite->data[1] = 1;
     return 1;
@@ -5331,39 +5466,39 @@ void npc_reset(struct MapObject *mapObject, struct Sprite *sprite)
     sprite->data[1] = 0;
 }
 
-u8 FieldObjectDirectionToImageAnimId(u8 direction)
+u8 GetFaceDirectionMovementAction_Extended(u8 direction)
 {
-    return gUnknown_083755F4[direction];
+    return gFaceDirectionMovementActions_Extended[direction];
 }
 
-u8 get_go_image_anim_num(u8 direction)
+u8 GetWalkSlowMovementAction_Extended(u8 direction)
 {
-    return gUnknown_083755FD[direction];
+    return gWalkSlowMovementActions_Extended[direction];
 }
 
-u8 get_go_fast_image_anim_num(u8 direction)
+u8 GetWalkNormalMovementAction_Extended(u8 direction)
 {
-    return gUnknown_08375606[direction];
+    return gWalkNormalMovementActions_Extended[direction];
 }
 
-u8 get_go_faster_image_anim_num(u8 direction)
+u8 GetJump2MovementAction_Extended(u8 direction)
 {
-    return gUnknown_0837560F[direction];
+    return gJump2MovementActions_Extended[direction];
 }
 
-u8 sub_805FD78(u8 direction)
+u8 GetDelayMovementAction_Extended(u8 direction)
 {
-    return gUnknown_08375618[direction];
+    return gDelayMovementActions_Extended[direction];
 }
 
-u8 sub_805FD88(u8 direction)
+u8 GetWalkFastMovementAction_Extended(u8 direction)
 {
-    return gUnknown_08375621[direction];
+    return gWalkFastMovementActions_Extended[direction];
 }
 
-u8 sub_805FD98(u8 direction)
+u8 GetWalkFastMovementAction_Extended2(u8 direction)
 {
-    return gUnknown_0837562A[direction];
+    return gWalkFastMovementActions_Extended2[direction];
 }
 
 u8 unref_sub_805FDA8(u8 direction)
@@ -5406,11 +5541,11 @@ u8 get_run_image_anim_num(u8 direction)
     return gUnknown_08375672[direction];
 }
 
-void sub_805FE28(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum)
+void sub_805FE28(struct MapObject *mapObject, struct Sprite *sprite, u8 movementActionId)
 {
     if (!mapObject->inanimate)
     {
-        sprite->animNum = animNum;
+        sprite->animNum = movementActionId;
         if (sprite->animCmdIndex == 1)
         {
             sprite->animCmdIndex = 2;
@@ -5422,12 +5557,12 @@ void sub_805FE28(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum)
     }
 }
 
-void sub_805FE64(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum)
+void sub_805FE64(struct MapObject *mapObject, struct Sprite *sprite, u8 movementActionId)
 {
     u8 animCmdIndex;
     if (!mapObject->inanimate)
     {
-        sprite->animNum = animNum;
+        sprite->animNum = movementActionId;
         animCmdIndex = 3;
         if (sprite->animCmdIndex < 2)
         {
@@ -5538,7 +5673,8 @@ bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, s16 x,
 
 bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction)
 {
-    if (gUnknown_08375684[direction - 1](mapObject->currentMetatileBehavior) || gUnknown_08375694[direction - 1](MapGridGetMetatileBehaviorAt(x, y)))
+    if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](mapObject->currentMetatileBehavior)
+        || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y)))
     {
         return 1;
     }
@@ -5586,14 +5722,14 @@ void sub_8060288(u8 localId, u8 mapNum, u8 mapGroup)
 
 void MoveCoords(u8 direction, s16 *x, s16 *y)
 {
-    *x += gDirectionToVector[direction].x;
-    *y += gDirectionToVector[direction].y;
+    *x += gDirectionToVectors[direction].x;
+    *y += gDirectionToVectors[direction].y;
 }
 
 void unref_sub_80602F8(u8 direction, s16 *x, s16 *y)
 {
-    *x += gDirectionToVector[direction].x << 4;
-    *y += gDirectionToVector[direction].y << 4;
+    *x += gDirectionToVectors[direction].x << 4;
+    *y += gDirectionToVectors[direction].y << 4;
 }
 
 void sub_8060320(u32 dirn, s16 *x, s16 *y, s16 deltaX, s16 deltaY)
@@ -5601,19 +5737,19 @@ void sub_8060320(u32 dirn, s16 *x, s16 *y, s16 deltaX, s16 deltaY)
     u8 direction = dirn;
     s16 dx2 = deltaX;
     s16 dy2 = deltaY;
-    if (gDirectionToVector[direction].x > 0)
+    if (gDirectionToVectors[direction].x > 0)
     {
         *x += dx2;
     }
-    if (gDirectionToVector[direction].x < 0)
+    if (gDirectionToVectors[direction].x < 0)
     {
         *x -= dx2;
     }
-    if (gDirectionToVector[direction].y > 0)
+    if (gDirectionToVectors[direction].y > 0)
     {
         *y += dy2;
     }
-    if (gDirectionToVector[direction].y < 0)
+    if (gDirectionToVectors[direction].y < 0)
     {
         *y -= dy2;
     }
@@ -5808,27 +5944,27 @@ u8 name(u32 idx)\
     return animIds[direction];\
 }
 
-dirn_to_anim(GetFaceDirectionMovementActionId, gUnknown_083756C8)
-dirn_to_anim(GetSimpleGoAnimId, gUnknown_083756CD)
-dirn_to_anim(GetGoSpeed0MovementActionId, gUnknown_083756D2)
-dirn_to_anim(sub_8060744, gUnknown_083756D7)
-dirn_to_anim(d2s_08064034, gUnknown_083756DC)
-dirn_to_anim(sub_806079C, gUnknown_083756E1)
+dirn_to_anim(GetFaceDirectionMovementAction, gFaceDirectionMovementActions)
+dirn_to_anim(GetWalkSlowMovementAction, gWalkSlowMovementActions)
+dirn_to_anim(GetWalkNormalMovementAction, gWalkNormalMovementActions)
+dirn_to_anim(GetWalkFastMovementAction, gWalkFastMovementActions)
+dirn_to_anim(GetRideWaterCurrentMovementAction, gRideWaterCurrentMovementActions)
+dirn_to_anim(GetWalkFastestMovementAction, gWalkFastestMovementActions)
 dirn_to_anim(sub_80607C8, gUnknown_083756E6)
 dirn_to_anim(sub_80607F4, gUnknown_083756EB)
-dirn_to_anim(GetJumpLedgeAnimId, gUnknown_083756F0)
+dirn_to_anim(GetJump2MovementAction, gJump2MovementActions)
 dirn_to_anim(sub_806084C, gUnknown_083756F5)
 dirn_to_anim(sub_8060878, gUnknown_083756FA)
 dirn_to_anim(sub_80608A4, gUnknown_083756FF)
 dirn_to_anim(sub_80608D0, gUnknown_08375704)
-dirn_to_anim(GetStepInPlaceDelay32AnimId, gUnknown_08375709)
-dirn_to_anim(GetStepInPlaceDelay16MovementActionId, gUnknown_0837570E)
-dirn_to_anim(GetStepInPlaceDelay8AnimId, gUnknown_08375713)
-dirn_to_anim(GetStepInPlaceDelay4AnimId, gUnknown_08375718)
+dirn_to_anim(GetWalkInPlaceSlowMovementAction, gWalkInPlaceSlowMovementActions)
+dirn_to_anim(GetWalkInPlaceNormalMovementAction, gWalkInPlaceNormalMovementActions)
+dirn_to_anim(GetWalkInPlaceFastMovementAction, gWalkInPlaceFastMovementActions)
+dirn_to_anim(GetWalkInPlaceFastestMovementAction, gWalkInPlaceFastestMovementActions)
 
 u8 FieldObjectFaceOppositeDirection(struct MapObject *mapObject, u8 direction)
 {
-    return FieldObjectSetHeldMovement(mapObject, GetFaceDirectionMovementActionId(GetOppositeDirection(direction)));
+    return FieldObjectSetHeldMovement(mapObject, GetFaceDirectionMovementAction(GetOppositeDirection(direction)));
 }
 
 u8 sub_80609D8(u8 index)
@@ -5943,13 +6079,13 @@ u8 sub_8060B64(u8 index)
 
 u8 GetOppositeDirection(u8 direction)
 {
-    u8 directions[8];
-    memcpy(directions, gUnknown_0837574F, 8);
-    if (direction == 0 || direction > 8)
+    u8 oppositeDirections[8];
+    memcpy(oppositeDirections, gOppositeDirections, 8);
+    if (direction == DIR_NONE || direction > 8)
     {
         return direction;
     }
-    return directions[direction - 1];
+    return oppositeDirections[direction - 1];
 }
 
 u32 zffu_offset_calc(u8 a0, u8 a1)
@@ -5972,7 +6108,7 @@ u32 state_to_direction(u8 a0, u32 a1, u32 a2)
 
 void FieldObjectExecHeldMovementAction(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    if (gUnknown_08375778[mapObject->movementActionId][sprite->data[2]](mapObject, sprite))
+    if (gMovementActionFuncs[mapObject->movementActionId][sprite->data[2]](mapObject, sprite))
     {
         mapObject->heldMovementFinished = 1;
     }
@@ -5980,7 +6116,7 @@ void FieldObjectExecHeldMovementAction(struct MapObject *mapObject, struct Sprit
 
 bool8 FieldObjectExecSingleMovementAction(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    if (gUnknown_08375778[mapObject->movementActionId][sprite->data[2]](mapObject, sprite))
+    if (gMovementActionFuncs[mapObject->movementActionId][sprite->data[2]](mapObject, sprite))
     {
         mapObject->movementActionId = 0xFF;
         sprite->data[2] = 0;
@@ -5990,42 +6126,42 @@ bool8 FieldObjectExecSingleMovementAction(struct MapObject *mapObject, struct Sp
     return 0;
 }
 
-void FieldObjectSetSingleMovement(struct MapObject *mapObject, struct Sprite *sprite, u8 animId)
+void FieldObjectSetSingleMovement(struct MapObject *mapObject, struct Sprite *sprite, u8 movementActionId)
 {
-    mapObject->movementActionId = animId;
+    mapObject->movementActionId = movementActionId;
     sprite->data[2] = 0;
 }
 
-void an_look_any(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
+void FaceDirection(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
 {
     FieldObjectSetDirection(mapObject, direction);
     npc_coords_shift_still(mapObject);
-    sub_805FE64(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection));
+    sub_805FE64(mapObject, sprite, GetWalkSlowMovementAction_Extended(mapObject->facingDirection));
     sprite->animPaused = 1;
     sprite->data[2] = 1;
 }
 
-u8 sub_8060CE0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementAction_FaceDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, DIR_SOUTH);
+    FaceDirection(mapObject, sprite, DIR_SOUTH);
     return 1;
 }
 
-u8 sub_8060CF0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementAction_FaceUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, DIR_NORTH);
+    FaceDirection(mapObject, sprite, DIR_NORTH);
     return 1;
 }
 
-u8 sub_8060D00(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementAction_FaceLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, DIR_WEST);
+    FaceDirection(mapObject, sprite, DIR_WEST);
     return 1;
 }
 
-u8 sub_8060D10(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementAction_FaceRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, DIR_EAST);
+    FaceDirection(mapObject, sprite, DIR_EAST);
     return 1;
 }
 
@@ -6092,7 +6228,7 @@ void sub_8060E68(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
 void sub_8060ED8(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
 {
     sub_8060E68(mapObject, sprite, direction);
-    sub_805FE28(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection));
+    sub_805FE28(mapObject, sprite, GetWalkSlowMovementAction_Extended(mapObject->facingDirection));
 }
 
 bool8 an_walk_any_2(struct MapObject *mapObject, struct Sprite *sprite)
@@ -6107,15 +6243,15 @@ bool8 an_walk_any_2(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8060F5C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkSlowDown_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8060F3C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8060ED8(mapObject, sprite, DIR_SOUTH);
-    return sub_8060F5C(mapObject, sprite);
+    return MovementAction_WalkSlowDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_8060F5C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (an_walk_any_2(mapObject, sprite))
     {
@@ -6125,15 +6261,15 @@ bool8 sub_8060F5C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8060F9C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkSlowUp_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8060F7C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8060ED8(mapObject, sprite, DIR_NORTH);
-    return sub_8060F9C(mapObject, sprite);
+    return MovementAction_WalkSlowUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_8060F9C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (an_walk_any_2(mapObject, sprite))
     {
@@ -6143,15 +6279,15 @@ bool8 sub_8060F9C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8060FDC(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkSlowLeft_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8060FBC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8060ED8(mapObject, sprite, DIR_WEST);
-    return sub_8060FDC(mapObject, sprite);
+    return MovementAction_WalkSlowLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_8060FDC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (an_walk_any_2(mapObject, sprite))
     {
@@ -6161,15 +6297,15 @@ bool8 sub_8060FDC(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806101C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkSlowRight_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8060FFC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8060ED8(mapObject, sprite, DIR_EAST);
-    return sub_806101C(mapObject, sprite);
+    return MovementAction_WalkSlowRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_806101C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (an_walk_any_2(mapObject, sprite))
     {
@@ -6179,15 +6315,15 @@ bool8 sub_806101C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806105C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkNormalDown_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_806103C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_SOUTH, 0);
-    return sub_806105C(mapObject, sprite);
+    return MovementAction_WalkNormalDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_806105C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6197,15 +6333,15 @@ bool8 sub_806105C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806109C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkNormalUp_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_806107C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_NORTH, 0);
-    return sub_806109C(mapObject, sprite);
+    return MovementAction_WalkNormalUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_806109C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6215,15 +6351,15 @@ bool8 sub_806109C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80610DC(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkNormalLeft_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_80610BC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_WEST, 0);
-    return sub_80610DC(mapObject, sprite);
+    return MovementAction_WalkNormalLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_80610DC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6233,15 +6369,15 @@ bool8 sub_80610DC(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806111C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkNormalRight_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_80610FC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_EAST, 0);
-    return sub_806111C(mapObject, sprite);
+    return MovementAction_WalkNormalRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_806111C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6272,7 +6408,7 @@ void sub_806113C(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
 void maybe_shadow_1(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a4, u8 a5)
 {
     sub_806113C(mapObject, sprite, direction, a4, a5);
-    sub_805FE28(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection));
+    sub_805FE28(mapObject, sprite, GetWalkSlowMovementAction_Extended(mapObject->facingDirection));
     DoShadowFieldEffect(mapObject);
 }
 
@@ -6344,22 +6480,22 @@ bool8 sub_8061358(struct MapObject *mapObject, struct Sprite *sprite)
         return FALSE;
     }
     FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection));
-    sub_805FE64(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection));
+    sub_805FE64(mapObject, sprite, GetWalkSlowMovementAction_Extended(mapObject->facingDirection));
     return FALSE;
 }
 
-bool8 sub_80613D4(struct MapObject *, struct Sprite *);
-bool8 sub_806142C(struct MapObject *, struct Sprite *);
-bool8 sub_8061484(struct MapObject *, struct Sprite *);
-bool8 sub_80614DC(struct MapObject *, struct Sprite *);
+bool8 MovementAction_Jump2Down_Step1(struct MapObject *, struct Sprite *);
+bool8 MovementAction_Jump2Up_Step1(struct MapObject *, struct Sprite *);
+bool8 MovementAction_Jump2Left_Step1(struct MapObject *, struct Sprite *);
+bool8 MovementAction_Jump2Right_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_80613A8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Down_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_SOUTH, 2, 0);
-    return sub_80613D4(mapObject, sprite);
+    return MovementAction_Jump2Down_Step1(mapObject, sprite);
 }
 
-bool8 sub_80613D4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Down_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -6370,13 +6506,13 @@ bool8 sub_80613D4(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061400(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Up_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_NORTH, 2, 0);
-    return sub_806142C(mapObject, sprite);
+    return MovementAction_Jump2Up_Step1(mapObject, sprite);
 }
 
-bool8 sub_806142C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Up_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -6387,13 +6523,13 @@ bool8 sub_806142C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061458(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Left_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_WEST, 2, 0);
-    return sub_8061484(mapObject, sprite);
+    return MovementAction_Jump2Left_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061484(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Left_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -6404,13 +6540,13 @@ bool8 sub_8061484(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80614B0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Right_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_EAST, 2, 0);
-    return sub_80614DC(mapObject, sprite);
+    return MovementAction_Jump2Right_Step1(mapObject, sprite);
 }
 
-bool8 sub_80614DC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Right_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -6427,7 +6563,7 @@ void sub_8061508(struct Sprite *sprite, u16 duration)
     sprite->data[3] = duration;
 }
 
-bool8 sub_8061510(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Delay_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sprite->data[3]--;
     if (!sprite->data[3])
@@ -6438,48 +6574,48 @@ bool8 sub_8061510(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806152C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Delay1_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8061508(sprite, 1);
-    return sub_8061510(mapObject, sprite);
+    return MovementAction_Delay_Step1(mapObject, sprite);
 }
 
-bool8 sub_806154C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Delay2_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8061508(sprite, 2);
-    return sub_8061510(mapObject, sprite);
+    return MovementAction_Delay_Step1(mapObject, sprite);
 }
 
-bool8 sub_806156C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Delay4_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8061508(sprite, 4);
-    return sub_8061510(mapObject, sprite);
+    return MovementAction_Delay_Step1(mapObject, sprite);
 }
 
-bool8 sub_806158C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Delay8_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8061508(sprite, 8);
-    return sub_8061510(mapObject, sprite);
+    return MovementAction_Delay_Step1(mapObject, sprite);
 }
 
-bool8 sub_80615AC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Delay16_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8061508(sprite, 16);
-    return sub_8061510(mapObject, sprite);
+    return MovementAction_Delay_Step1(mapObject, sprite);
 }
 
-bool8 sub_80615EC(struct MapObject *mapObject, struct Sprite *sprite);
-bool8 sub_806162C(struct MapObject *mapObject, struct Sprite *sprite);
-bool8 sub_806166C(struct MapObject *mapObject, struct Sprite *sprite);
-bool8 sub_80616AC(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_WalkFastDown_Step1(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_WalkFastUp_Step1(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_WalkFastLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_WalkFastRight_Step1(struct MapObject *mapObject, struct Sprite *sprite);
 
-bool8 sub_80615CC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_SOUTH, 1);
-    return sub_80615EC(mapObject, sprite);
+    return MovementAction_WalkFastDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_80615EC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6488,13 +6624,13 @@ bool8 sub_80615EC(struct MapObject *mapObject, struct Sprite *sprite)
     }
     return FALSE;
 }
-bool8 sub_806160C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_NORTH, 1);
-    return sub_806162C(mapObject, sprite);
+    return MovementAction_WalkFastUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_806162C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6503,13 +6639,13 @@ bool8 sub_806162C(struct MapObject *mapObject, struct Sprite *sprite)
     }
     return FALSE;
 }
-bool8 sub_806164C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_WEST, 1);
-    return sub_806166C(mapObject, sprite);
+    return MovementAction_WalkFastLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_806166C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6518,13 +6654,13 @@ bool8 sub_806166C(struct MapObject *mapObject, struct Sprite *sprite)
     }
     return FALSE;
 }
-bool8 sub_806168C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_EAST, 1);
-    return sub_80616AC(mapObject, sprite);
+    return MovementAction_WalkFastRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_80616AC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6534,16 +6670,16 @@ bool8 sub_80616AC(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-void sub_80616CC(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 animId, u16 duration)
+void sub_80616CC(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 movementAction, u16 duration)
 {
     FieldObjectSetDirection(mapObject, direction);
-    sub_805FE28(mapObject, sprite, animId);
+    sub_805FE28(mapObject, sprite, movementAction);
     sprite->animPaused = 0;
     sprite->data[2] = 1;
     sprite->data[3] = duration;
 }
 
-bool8 sub_8061714(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlace_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sprite->data[3]--;
     if (sprite->data[3] == 0)
@@ -6555,120 +6691,120 @@ bool8 sub_8061714(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806173C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceSlow_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sprite->data[3] & 1)
     {
         sprite->animDelayCounter++;
     }
-    return sub_8061714(mapObject, sprite);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061778(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_SOUTH, get_go_image_anim_num(DIR_SOUTH), 32);
-    return sub_806173C(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_SOUTH, GetWalkSlowMovementAction_Extended(DIR_SOUTH), 32);
+    return MovementAction_WalkInPlaceSlow_Step1(mapObject, sprite);
 }
 
-bool8 sub_80617B0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceSlowUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_NORTH, get_go_image_anim_num(DIR_NORTH), 32);
-    return sub_806173C(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_NORTH, GetWalkSlowMovementAction_Extended(DIR_NORTH), 32);
+    return MovementAction_WalkInPlaceSlow_Step1(mapObject, sprite);
 }
 
-bool8 sub_80617E8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceSlowLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_WEST, get_go_image_anim_num(DIR_WEST), 32);
-    return sub_806173C(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_WEST, GetWalkSlowMovementAction_Extended(DIR_WEST), 32);
+    return MovementAction_WalkInPlaceSlow_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061820(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceSlowRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_EAST, get_go_image_anim_num(DIR_EAST), 32);
-    return sub_806173C(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_EAST, GetWalkSlowMovementAction_Extended(DIR_EAST), 32);
+    return MovementAction_WalkInPlaceSlow_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061858(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceNormalDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_SOUTH, get_go_image_anim_num(DIR_SOUTH), 16);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_SOUTH, GetWalkSlowMovementAction_Extended(DIR_SOUTH), 16);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061890(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceNormalUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_NORTH, get_go_image_anim_num(DIR_NORTH), 16);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_NORTH, GetWalkSlowMovementAction_Extended(DIR_NORTH), 16);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_80618C8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceNormalLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_WEST, get_go_image_anim_num(DIR_WEST), 16);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_WEST, GetWalkSlowMovementAction_Extended(DIR_WEST), 16);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061900(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceNormalRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_EAST, get_go_image_anim_num(DIR_EAST), 16);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_EAST, GetWalkSlowMovementAction_Extended(DIR_EAST), 16);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061938(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_SOUTH, get_go_fast_image_anim_num(DIR_SOUTH), 8);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_SOUTH, GetWalkNormalMovementAction_Extended(DIR_SOUTH), 8);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061970(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_NORTH, get_go_fast_image_anim_num(DIR_NORTH), 8);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_NORTH, GetWalkNormalMovementAction_Extended(DIR_NORTH), 8);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_80619A8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_WEST, get_go_fast_image_anim_num(DIR_WEST), 8);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_WEST, GetWalkNormalMovementAction_Extended(DIR_WEST), 8);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_80619E0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_EAST, get_go_fast_image_anim_num(DIR_EAST), 8);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_EAST, GetWalkNormalMovementAction_Extended(DIR_EAST), 8);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061A18(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_SOUTH, get_go_faster_image_anim_num(DIR_SOUTH), 4);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_SOUTH, GetJump2MovementAction_Extended(DIR_SOUTH), 4);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061A50(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_NORTH, get_go_faster_image_anim_num(DIR_NORTH), 4);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_NORTH, GetJump2MovementAction_Extended(DIR_NORTH), 4);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061A88(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_WEST, get_go_faster_image_anim_num(DIR_WEST), 4);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_WEST, GetJump2MovementAction_Extended(DIR_WEST), 4);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061AC0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_EAST, get_go_faster_image_anim_num(DIR_EAST), 4);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(mapObject, sprite, DIR_EAST, GetJump2MovementAction_Extended(DIR_EAST), 4);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061B18(struct MapObject *, struct Sprite *);
+bool8 MovementAction_RideWaterCurrentDown_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8061AF8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_SOUTH, 2);
-    return sub_8061B18(mapObject, sprite);
+    return MovementAction_RideWaterCurrentDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061B18(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6679,15 +6815,15 @@ bool8 sub_8061B18(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 
-bool8 sub_8061B58(struct MapObject *, struct Sprite *);
+bool8 MovementAction_RideWaterCurrentUp_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8061B38(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_NORTH, 2);
-    return sub_8061B58(mapObject, sprite);
+    return MovementAction_RideWaterCurrentUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061B58(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6698,15 +6834,15 @@ bool8 sub_8061B58(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 
-bool8 sub_8061B98(struct MapObject *, struct Sprite *);
+bool8 MovementAction_RideWaterCurrentLeft_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8061B78(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_WEST, 2);
-    return sub_8061B98(mapObject, sprite);
+    return MovementAction_RideWaterCurrentLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061B98(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6717,15 +6853,15 @@ bool8 sub_8061B98(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 
-bool8 sub_8061BD8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_RideWaterCurrentRight_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8061BB8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_EAST, 2);
-    return sub_8061BD8(mapObject, sprite);
+    return MovementAction_RideWaterCurrentRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061BD8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6735,15 +6871,15 @@ bool8 sub_8061BD8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061C18(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkFastestDown_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8061BF8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_SOUTH, 3);
-    return sub_8061C18(mapObject, sprite);
+    return MovementAction_WalkFastestDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061C18(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6753,15 +6889,15 @@ bool8 sub_8061C18(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061C58(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkFastestUp_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8061C38(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_NORTH, 3);
-    return sub_8061C58(mapObject, sprite);
+    return MovementAction_WalkFastestUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061C58(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6772,15 +6908,15 @@ bool8 sub_8061C58(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 
-bool8 sub_8061C98(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkFastestLeft_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8061C78(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_WEST, 3);
-    return sub_8061C98(mapObject, sprite);
+    return MovementAction_WalkFastestLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061C98(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6791,15 +6927,15 @@ bool8 sub_8061C98(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 
-bool8 sub_8061CD8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkFastestRight_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8061CB8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_EAST, 3);
-    return sub_8061CD8(mapObject, sprite);
+    return MovementAction_WalkFastestRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061CD8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6968,11 +7104,11 @@ bool8 sub_8061F24(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8064864(struct Sprite *);
+bool8 SpriteAnimEnded(struct Sprite *);
 
 bool8 sub_8061F3C(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    if (sub_8064864(sprite))
+    if (SpriteAnimEnded(sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6983,7 +7119,7 @@ bool8 sub_8061F3C(struct MapObject *mapObject, struct Sprite *sprite)
 void sub_8061F5C(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
 {
     sub_806113C(mapObject, sprite, direction, 1, 0);
-    StartSpriteAnim(sprite, sub_805FD88(direction));
+    StartSpriteAnim(sprite, GetWalkFastMovementAction_Extended(direction));
 }
 
 bool8 sub_8061FB0(struct MapObject *, struct Sprite *);
@@ -7067,7 +7203,7 @@ bool8 sub_80620B0(struct MapObject *mapObject, struct Sprite *sprite)
     u8 objectId;
     if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), &objectId))
     {
-        an_look_any(mapObject, sprite, sub_805FE90(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[objectId].currentCoords.x, gMapObjects[objectId].currentCoords.y));
+        FaceDirection(mapObject, sprite, sub_805FE90(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[objectId].currentCoords.x, gMapObjects[objectId].currentCoords.y));
     }
     sprite->data[2] = 1;
     return TRUE;
@@ -7078,7 +7214,7 @@ bool8 sub_806210C(struct MapObject *mapObject, struct Sprite *sprite)
     u8 objectId;
     if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), &objectId))
     {
-        an_look_any(mapObject, sprite, GetOppositeDirection(sub_805FE90(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[objectId].currentCoords.x, gMapObjects[objectId].currentCoords.y)));
+        FaceDirection(mapObject, sprite, GetOppositeDirection(sub_805FE90(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[objectId].currentCoords.x, gMapObjects[objectId].currentCoords.y)));
     }
     sprite->data[2] = 1;
     return TRUE;
@@ -7328,7 +7464,7 @@ bool8 sub_8062584(struct MapObject *mapObject, struct Sprite *sprite)
 
 bool8 sub_80625B0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, gInitialMovementTypeFacingDirections[mapObject->movementType]);
+    FaceDirection(mapObject, sprite, gInitialMovementTypeFacingDirections[mapObject->movementType]);
     return TRUE;
 }
 
@@ -7445,7 +7581,7 @@ bool8 sub_8062724(struct MapObject *mapObject, struct Sprite *sprite)
 
 bool8 sub_8062740(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    if (sub_8064864(sprite))
+    if (SpriteAnimEnded(sprite))
     {
         SetMovementDelay(sprite, 0x20);
         sprite->data[2] = 2;
@@ -7473,7 +7609,7 @@ bool8 sub_80627A0(struct MapObject *mapObject, struct Sprite *sprite)
 
 bool8 sub_80627BC(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    if (sub_8064864(sprite))
+    if (SpriteAnimEnded(sprite))
     {
         SetMovementDelay(sprite, 0x20);
         sprite->data[2] = 2;
@@ -7600,25 +7736,25 @@ bool8 sub_80629CC(struct MapObject *mapObject, struct Sprite *sprite)
 
 bool8 sub_80629DC(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, sub_805FD98(DIR_SOUTH));
+    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, GetWalkFastMovementAction_Extended2(DIR_SOUTH));
     return FALSE;
 }
 
 bool8 sub_8062A00(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_NORTH, sub_805FD98(DIR_NORTH));
+    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_NORTH, GetWalkFastMovementAction_Extended2(DIR_NORTH));
     return FALSE;
 }
 
 bool8 sub_8062A24(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_WEST, sub_805FD98(DIR_WEST));
+    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_WEST, GetWalkFastMovementAction_Extended2(DIR_WEST));
     return FALSE;
 }
 
 bool8 sub_8062A48(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_EAST, sub_805FD98(DIR_EAST));
+    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_EAST, GetWalkFastMovementAction_Extended2(DIR_EAST));
     return FALSE;
 }
 
@@ -7673,7 +7809,7 @@ bool8 sub_8062B68(struct MapObject *mapObject, struct Sprite *sprite)
 void sub_8062B8C(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a3, u8 a4)
 {
     sub_806113C(mapObject, sprite, direction, a3, a4);
-    StartSpriteAnimIfDifferent(sprite, sub_805FD98(direction));
+    StartSpriteAnimIfDifferent(sprite, GetWalkFastMovementAction_Extended2(direction));
     DoShadowFieldEffect(mapObject);
 }
 
@@ -7908,31 +8044,31 @@ bool8 sub_8062FC4(struct MapObject *mapObject, struct Sprite *sprite)
 bool8 sub_8062FF0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_80616CC(mapObject, sprite, DIR_SOUTH, sub_805FDD8(DIR_SOUTH), 8);
-    return sub_8061714(mapObject, sprite);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
 bool8 sub_8063028(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_80616CC(mapObject, sprite, DIR_NORTH, sub_805FDD8(DIR_NORTH), 8);
-    return sub_8061714(mapObject, sprite);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
 bool8 sub_8063060(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_80616CC(mapObject, sprite, DIR_WEST, sub_805FDD8(DIR_WEST), 8);
-    return sub_8061714(mapObject, sprite);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
 bool8 sub_8063098(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_80616CC(mapObject, sprite, DIR_EAST, sub_805FDD8(DIR_EAST), 8);
-    return sub_8061714(mapObject, sprite);
+    return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
 void sub_80630D0(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a3)
 {
     sub_8060D20(mapObject, sprite, direction, a3);
-    StartSpriteAnim(sprite, sub_805FD98(mapObject->facingDirection));
+    StartSpriteAnim(sprite, GetWalkFastMovementAction_Extended2(mapObject->facingDirection));
     SeekSpriteAnim(sprite, 0);
 }
 
@@ -8165,12 +8301,12 @@ bool8 sub_8063450(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8063470(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Finish(struct MapObject *mapObject, struct Sprite *sprite)
 {
     return TRUE;
 }
 
-bool8 sub_8063474(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PauseSpriteAnim(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sprite->animPaused = 1;
     return TRUE;
@@ -8879,7 +9015,7 @@ void GroundEffect_IceReflection(struct MapObject *mapObj, struct Sprite *sprite)
 
 void GroundEffect_FlowingWater(struct MapObject *mapObj, struct Sprite *sprite)
 {
-    oe_exec_and_other_stuff(FLDEFF_FEET_IN_FLOWING_WATER, mapObj);
+    StartFieldEffectForMapObject(FLDEFF_FEET_IN_FLOWING_WATER, mapObj);
 }
 
 static void (*const gUnknown_08376080[])(struct MapObject *mapObj, struct Sprite *sprite, u8 a) = {
@@ -8906,8 +9042,8 @@ static void DoTracksGroundEffect_Footprints(struct MapObject *mapObj, struct Spr
 {
     // First half-word is a Field Effect script id. (gFieldEffectScriptPointers)
     u16 sandFootprints_FieldEffectData[2] = {
-            FLDEFF_SAND_FOOTPRINTS,
-            FLDEFF_DEEP_SAND_FOOTPRINTS
+        FLDEFF_SAND_FOOTPRINTS,
+        FLDEFF_DEEP_SAND_FOOTPRINTS
     };
 
     gFieldEffectArguments[0] = mapObj->previousCoords.x;
@@ -8953,12 +9089,12 @@ void GroundEffect_Ripple(struct MapObject *mapObj, struct Sprite *sprite)
 
 void GroundEffect_StepOnPuddle(struct MapObject *mapObj, struct Sprite *sprite)
 {
-    oe_exec_and_other_stuff(FLDEFF_SPLASH, mapObj);
+    StartFieldEffectForMapObject(FLDEFF_SPLASH, mapObj);
 }
 
 void GroundEffect_SandPile(struct MapObject *mapObj, struct Sprite *sprite)
 {
-    oe_exec_and_other_stuff(FLDEFF_SAND_PILE, mapObj);
+    StartFieldEffectForMapObject(FLDEFF_SAND_PILE, mapObj);
 }
 
 void GroundEffect_JumpOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite)
@@ -9016,12 +9152,12 @@ void GroundEffect_JumpLandingDust(struct MapObject *mapObj, struct Sprite *sprit
 
 void GroundEffect_ShortGrass(struct MapObject *mapObj, struct Sprite *sprite)
 {
-    oe_exec_and_other_stuff(FLDEFF_SHORT_GRASS, mapObj);
+    StartFieldEffectForMapObject(FLDEFF_SHORT_GRASS, mapObj);
 }
 
 void GroundEffect_HotSprings(struct MapObject *mapObj, struct Sprite *sprite)
 {
-    oe_exec_and_other_stuff(FLDEFF_HOT_SPRINGS_WATER, mapObj);
+    StartFieldEffectForMapObject(FLDEFF_HOT_SPRINGS_WATER, mapObj);
 }
 
 void GroundEffect_Seaweed(struct MapObject *mapObj, struct Sprite *sprite)
@@ -9276,37 +9412,37 @@ void UnfreezeMapObjects(void)
 
 void Step1(struct Sprite *sprite, u8 dir)
 {
-    sprite->pos1.x += gDirectionToVector[dir].x;
-    sprite->pos1.y += gDirectionToVector[dir].y;
+    sprite->pos1.x += gDirectionToVectors[dir].x;
+    sprite->pos1.y += gDirectionToVectors[dir].y;
 }
 
 void Step2(struct Sprite *sprite, u8 dir)
 {
-    sprite->pos1.x += 2 * (u16) gDirectionToVector[dir].x;
-    sprite->pos1.y += 2 * (u16) gDirectionToVector[dir].y;
+    sprite->pos1.x += 2 * (u16) gDirectionToVectors[dir].x;
+    sprite->pos1.y += 2 * (u16) gDirectionToVectors[dir].y;
 }
 
 void Step3(struct Sprite *sprite, u8 dir)
 {
-    sprite->pos1.x += 2 * (u16) gDirectionToVector[dir].x + (u16) gDirectionToVector[dir].x;
-    sprite->pos1.y += 2 * (u16) gDirectionToVector[dir].y + (u16) gDirectionToVector[dir].y;
+    sprite->pos1.x += 2 * (u16) gDirectionToVectors[dir].x + (u16) gDirectionToVectors[dir].x;
+    sprite->pos1.y += 2 * (u16) gDirectionToVectors[dir].y + (u16) gDirectionToVectors[dir].y;
 }
 
 void Step4(struct Sprite *sprite, u8 dir)
 {
-    sprite->pos1.x += 4 * (u16) gDirectionToVector[dir].x;
-    sprite->pos1.y += 4 * (u16) gDirectionToVector[dir].y;
+    sprite->pos1.x += 4 * (u16) gDirectionToVectors[dir].x;
+    sprite->pos1.y += 4 * (u16) gDirectionToVectors[dir].y;
 }
 
 void Step8(struct Sprite *sprite, u8 dir)
 {
-    sprite->pos1.x += 8 * (u16) gDirectionToVector[dir].x;
-    sprite->pos1.y += 8 * (u16) gDirectionToVector[dir].y;
+    sprite->pos1.x += 8 * (u16) gDirectionToVectors[dir].x;
+    sprite->pos1.y += 8 * (u16) gDirectionToVectors[dir].y;
 }
 
-void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3)
+void oamt_npc_ministep_reset(struct Sprite *sprite, u8 direction, u8 a3)
 {
-    sprite->data[3] = a2;
+    sprite->data[3] = direction;
     sprite->data[4] = a3;
     sprite->data[5] = 0;
 }
@@ -9412,9 +9548,9 @@ u8 sub_806478C(struct Sprite *sprite)
     return v2;
 }
 
-static void SetMovementDelay(struct Sprite *sprite, s16 a2)
+static void SetMovementDelay(struct Sprite *sprite, s16 delay)
 {
-    sprite->data[3] = a2;
+    sprite->data[3] = delay;
 }
 
 static bool8 WaitForMovementDelay(struct Sprite *sprite)
@@ -9434,7 +9570,7 @@ void obj_anim_image_set_and_seek(struct Sprite *sprite, u8 a2, u8 a3)
     SeekSpriteAnim(sprite, a3);
 }
 
-bool8 sub_8064864(struct Sprite *sprite)
+bool8 SpriteAnimEnded(struct Sprite *sprite)
 {
     if (sprite->animEnded)
         return TRUE;
@@ -9442,7 +9578,7 @@ bool8 sub_8064864(struct Sprite *sprite)
         return FALSE;
 }
 
-void sub_806487C(struct Sprite *sprite, bool8 invisible)
+void UpdateFieldSpriteVisibility(struct Sprite *sprite, bool8 invisible)
 {
     u16 x, y;
     s16 x2, y2;
@@ -9469,28 +9605,28 @@ void sub_806487C(struct Sprite *sprite, bool8 invisible)
         sprite->invisible = 1;
 }
 
-void sub_8064970(struct Sprite *sprite)
+void UpdateFieldSpriteSubpriorityAndVisibility(struct Sprite *sprite)
 {
     SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1);
-    sub_806487C(sprite, 0);
+    UpdateFieldSpriteVisibility(sprite, 0);
 }
 
-void sub_8064990(u8 a1, u8 dir)
+void TurnMapObject(u8 mapObjectId, u8 direction)
 {
     u8 i;
     for (i = 0; i < MAX_SPRITES; i++)
     {
         struct Sprite *sprite = &gSprites[i];
-        if (sprite->inUse && sprite->callback == sub_8064970 && (u8)sprite->data[0] == a1)
+        if (sprite->inUse && sprite->callback == UpdateFieldSpriteSubpriorityAndVisibility && (u8)sprite->data[0] == mapObjectId)
         {
-            u8 animNum = FieldObjectDirectionToImageAnimId(dir);
+            u8 animNum = GetFaceDirectionMovementAction_Extended(direction);
             StartSpriteAnim(sprite, animNum);
             break;
         }
     }
 }
 
-u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject)
+u32 StartFieldEffectForMapObject(u8 fieldEffectId, struct MapObject *mapObject)
 {
     FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     return FieldEffectStart(fieldEffectId);
@@ -9501,7 +9637,7 @@ void DoShadowFieldEffect(struct MapObject *mapObject)
     if (!mapObject->hasShadow)
     {
         mapObject->hasShadow = 1;
-        oe_exec_and_other_stuff(FLDEFF_SHADOW, mapObject);
+        StartFieldEffectForMapObject(FLDEFF_SHADOW, mapObject);
     }
 }
 
diff --git a/src/field_effect.c b/src/field_effect.c
index 6eb425389..02b42c6f7 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1180,7 +1180,7 @@ bool8 sub_80867AC(struct Task *task) // gUnknown_0839F2CC[0]
     CameraObjectReset2();
     gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1;
     gPlayerAvatar.preventStep = TRUE;
-    FieldObjectSetHeldMovement(playerObject, GetFaceDirectionMovementActionId(GetPlayerFacingDirection()));
+    FieldObjectSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
     task->data[4] = playerSprite->subspriteMode;
     playerObject->fixedPriority = 1;
     playerSprite->oam.priority = 1;
@@ -1330,7 +1330,7 @@ bool8 sub_8086AC0(struct Task *task)
     mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
     if (!FieldObjectIsMovementOverridden(mapObject) || FieldObjectClearHeldMovementIfFinished(mapObject))
     {
-        FieldObjectSetHeldMovement(mapObject, GetFaceDirectionMovementActionId(GetPlayerFacingDirection()));
+        FieldObjectSetHeldMovement(mapObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
         task->data[0]++;
         task->data[2] = 0;
         task->data[3] = 0;
@@ -1447,7 +1447,7 @@ bool8 sub_8086CF4(struct Task *task)
     u8 behavior;
     CameraObjectReset2();
     mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    FieldObjectSetHeldMovement(mapObject, GetFaceDirectionMovementActionId(DIR_EAST));
+    FieldObjectSetHeldMovement(mapObject, GetFaceDirectionMovementAction(DIR_EAST));
     PlayerGetDestCoords(&x, &y);
     behavior = MapGridGetMetatileBehaviorAt(x, y);
     task->data[0]++;
@@ -1545,7 +1545,7 @@ bool8 sub_8086ED4(struct Task *task)
     {
         CameraObjectReset1();
         ScriptContext2_Disable();
-        FieldObjectSetHeldMovement(mapObject, GetGoSpeed0MovementActionId(DIR_EAST));
+        FieldObjectSetHeldMovement(mapObject, GetWalkNormalMovementAction(DIR_EAST));
         DestroyTask(FindTaskIdByFunc(sub_8086CBC));
     }
     return FALSE;
@@ -1600,7 +1600,7 @@ bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct MapObject
 
 bool8 sub_8087030(struct Task *task, struct MapObject *mapObject)
 {
-    FieldObjectSetHeldMovement(mapObject, GetSimpleGoAnimId(DIR_NORTH));
+    FieldObjectSetHeldMovement(mapObject, GetWalkSlowMovementAction(DIR_NORTH));
     task->data[0]++;
     return FALSE;
 }
@@ -1909,7 +1909,7 @@ bool8 sub_80876F8(struct Task *task, struct MapObject *mapObject, struct Sprite
         } else
         {
             task->data[1]++;
-            FieldObjectSetHeldMovement(mapObject, GetStepInPlaceDelay4AnimId(mapObject->facingDirection));
+            FieldObjectSetHeldMovement(mapObject, GetWalkInPlaceFastestMovementAction(mapObject->facingDirection));
             PlaySE(SE_FU_ZUZUZU);
         }
     }
@@ -2011,7 +2011,7 @@ void sub_8087914(struct Task *task)
             DestroyTask(FindTaskIdByFunc(sub_80878C4));
         } else if (task->data[1] == 0 || (--task->data[1]) == 0)
         {
-            FieldObjectSetHeldMovement(mapObject, GetFaceDirectionMovementActionId(unknown_0839F380[mapObject->facingDirection]));
+            FieldObjectSetHeldMovement(mapObject, GetFaceDirectionMovementAction(unknown_0839F380[mapObject->facingDirection]));
             if (task->data[2] < 12)
             {
                 task->data[2]++;
@@ -2071,7 +2071,7 @@ void sub_8087AC8(struct Task *task)
             DestroyTask(FindTaskIdByFunc(sub_8087A74));
             return;
         }
-        FieldObjectSetHeldMovement(mapObject, GetFaceDirectionMovementActionId(unknown_0839F380[mapObject->facingDirection]));
+        FieldObjectSetHeldMovement(mapObject, GetFaceDirectionMovementAction(unknown_0839F380[mapObject->facingDirection]));
         if (task->data[2] < 32)
         {
             task->data[2]++;
@@ -2878,7 +2878,7 @@ void sub_8088AF4(struct Task *task)
     {
         gPlayerAvatar.preventStep = FALSE;
         gPlayerAvatar.flags &= 0xdf;
-        FieldObjectSetHeldMovement(mapObject, GetFaceDirectionMovementActionId(mapObject->movementDirection));
+        FieldObjectSetHeldMovement(mapObject, GetFaceDirectionMovementAction(mapObject->movementDirection));
         sub_8127ED0(mapObject->fieldEffectSpriteId, 1);
         UnfreezeMapObjects();
         ScriptContext2_Disable();
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index ea3225564..26e43eb28 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -313,7 +313,7 @@ void unc_grass_normal(struct Sprite *sprite)
         {
             metatileBehavior = 4;
         }
-        sub_806487C(sprite, 0);
+        UpdateFieldSpriteVisibility(sprite, 0);
         sub_812882C(sprite, sprite->data[0], metatileBehavior);
     }
 }
@@ -417,7 +417,7 @@ void unc_grass_tall(struct Sprite *sprite)
         {
             sprite->data[7] = TRUE;
         }
-        sub_806487C(sprite, 0);
+        UpdateFieldSpriteVisibility(sprite, 0);
         sub_812882C(sprite, sprite->data[0], 0);
     }
 }
@@ -496,7 +496,7 @@ void sub_8127334(struct Sprite *sprite)
         sprite->pos2.y = (graphicsInfo->height >> 1) - 8;
         sprite->subpriority = linkedSprite->subpriority - 1;
         sprite->oam.priority = linkedSprite->oam.priority;
-        sub_806487C(sprite, linkedSprite->invisible);
+        UpdateFieldSpriteVisibility(sprite, linkedSprite->invisible);
     }
 }
 
@@ -570,14 +570,14 @@ static void sub_81275A0(struct Sprite *sprite)
     {
         sprite->data[0] = 1;
     }
-    sub_806487C(sprite, FALSE);
+    UpdateFieldSpriteVisibility(sprite, FALSE);
 }
 
 static void sub_81275C4(struct Sprite *sprite)
 {
     sprite->invisible ^= 1;
     sprite->data[1] ++;
-    sub_806487C(sprite, sprite->invisible);
+    UpdateFieldSpriteVisibility(sprite, sprite->invisible);
     if (sprite->data[1] > 56)
     {
         FieldEffectStop(sprite, sprite->data[7]);
@@ -624,7 +624,7 @@ void sub_81276B4(struct Sprite *sprite)
     {
         sprite->pos1.x = gSprites[gMapObjects[mapObjectId].spriteId].pos1.x;
         sprite->pos1.y = gSprites[gMapObjects[mapObjectId].spriteId].pos1.y;
-        sub_806487C(sprite, FALSE);
+        UpdateFieldSpriteVisibility(sprite, FALSE);
     }
 }
 
@@ -710,7 +710,7 @@ static void sub_81278D8(struct Sprite *sprite)
         sprite->pos1.x = linkedSprite->pos1.x;
         sprite->pos1.y = linkedSprite->pos1.y;
         sprite->subpriority = linkedSprite->subpriority;
-        sub_806487C(sprite, FALSE);
+        UpdateFieldSpriteVisibility(sprite, FALSE);
         if (mapObject->currentCoords.x != sprite->data[3] || mapObject->currentCoords.y != sprite->data[4])
         {
             sprite->data[3] = mapObject->currentCoords.x;
@@ -780,7 +780,7 @@ void sub_8127A7C(struct Sprite *sprite)
         sprite->pos1.x = linkedSprite->pos1.x;
         sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 8;
         sprite->subpriority = linkedSprite->subpriority - 1;
-        sub_806487C(sprite, FALSE);
+        UpdateFieldSpriteVisibility(sprite, FALSE);
     }
 }
 
@@ -920,7 +920,7 @@ static void sub_8127DD0(struct Sprite *sprite)
 
 static void sub_8127E30(struct Sprite *sprite)
 {
-    sub_806487C(sprite, FALSE);
+    UpdateFieldSpriteVisibility(sprite, FALSE);
     if (sprite->animEnded)
     {
         FieldEffectStop(sprite, FLDEFF_ASH);
@@ -1237,7 +1237,7 @@ void sub_81282E0(struct Sprite *sprite)
         sprite->pos1.x = x;
         sprite->pos1.y = y;
         sprite->subpriority = gSprites[gMapObjects[mapObjectId].spriteId].subpriority;
-        sub_806487C(sprite, FALSE);
+        UpdateFieldSpriteVisibility(sprite, FALSE);
     }
 }
 
@@ -1262,7 +1262,7 @@ void sub_8128410(struct Sprite *sprite)
     sprite->data[0] += 0x80;
     sprite->data[0] &= 0x100;
     sprite->pos1.y -= sprite->data[0] >> 8;
-    sub_806487C(sprite, FALSE);
+    UpdateFieldSpriteVisibility(sprite, FALSE);
     if (sprite->invisible || sprite->animEnded)
     {
         FieldEffectStop(sprite, FLDEFF_BUBBLES);
@@ -1434,7 +1434,7 @@ void sub_81287C4(struct Sprite *sprite)
     }
     else
     {
-        sub_806487C(sprite, FALSE);
+        UpdateFieldSpriteVisibility(sprite, FALSE);
         SetObjectSubpriorityByZCoord(sprite->data[0], sprite, 0);
     }
 }
@@ -1447,7 +1447,7 @@ void sub_8128800(struct Sprite *sprite)
     }
     else
     {
-        sub_806487C(sprite, FALSE);
+        UpdateFieldSpriteVisibility(sprite, FALSE);
     }
 }
 
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index a6c399756..653971a50 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -279,7 +279,7 @@ void task_map_chg_seq_0807E20C(u8 taskId)
             u8 mapObjId;
             sub_8080958(1);
             mapObjId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-            FieldObjectSetHeldMovement(&gMapObjects[mapObjId], GetGoSpeed0MovementActionId(GetPlayerFacingDirection()));
+            FieldObjectSetHeldMovement(&gMapObjects[mapObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
             task->data[0] = 2;
         }
         break;
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index a5bed6bec..521a5f80b 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -774,24 +774,24 @@ void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement)
 // normal speed (1 speed)
 void PlayerGoSpeed1(u8 a)
 {
-    PlayerSetAnimId(GetGoSpeed0MovementActionId(a), 2);
+    PlayerSetAnimId(GetWalkNormalMovementAction(a), 2);
 }
 
 // fast speed (2 speed)
 void PlayerGoSpeed2(u8 a)
 {
-    PlayerSetAnimId(sub_8060744(a), 2);
+    PlayerSetAnimId(GetWalkFastMovementAction(a), 2);
 }
 
 void npc_use_some_d2s(u8 a)
 {
-    PlayerSetAnimId(d2s_08064034(a), 2);
+    PlayerSetAnimId(GetRideWaterCurrentMovementAction(a), 2);
 }
 
 // fastest speed (4 speed)
 void PlayerGoSpeed4(u8 a)
 {
-    PlayerSetAnimId(sub_806079C(a), 2);
+    PlayerSetAnimId(GetWalkFastestMovementAction(a), 2);
 }
 
 void sub_805940C(u8 a)
@@ -802,29 +802,29 @@ void sub_805940C(u8 a)
 void PlayerOnBikeCollide(u8 a)
 {
     PlayCollisionSoundIfNotFacingWarp(a);
-    PlayerSetAnimId(GetStepInPlaceDelay16MovementActionId(a), 2);
+    PlayerSetAnimId(GetWalkInPlaceNormalMovementAction(a), 2);
 }
 
 static void PlayerNotOnBikeCollide(u8 a)
 {
     PlayCollisionSoundIfNotFacingWarp(a);
-    PlayerSetAnimId(GetStepInPlaceDelay32AnimId(a), 2);
+    PlayerSetAnimId(GetWalkInPlaceSlowMovementAction(a), 2);
 }
 
 void PlayerFaceDirection(u8 direction)
 {
-    PlayerSetAnimId(GetFaceDirectionMovementActionId(direction), 1);
+    PlayerSetAnimId(GetFaceDirectionMovementAction(direction), 1);
 }
 
 void PlayerTurnInPlace(u8 direction)
 {
-    PlayerSetAnimId(GetStepInPlaceDelay8AnimId(direction), 1);
+    PlayerSetAnimId(GetWalkInPlaceFastMovementAction(direction), 1);
 }
 
 void PlayerJumpLedge(u8 direction)
 {
     PlaySE(SE_DANSA);
-    PlayerSetAnimId(GetJumpLedgeAnimId(direction), 8);
+    PlayerSetAnimId(GetJump2MovementAction(direction), 8);
 }
 
 void sub_80594C0(void)
@@ -832,7 +832,7 @@ void sub_80594C0(void)
     if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING)
     {
         if (player_should_look_direction_be_enforced_upon_movement())
-            sub_8059348(GetFaceDirectionMovementActionId(gMapObjects[gPlayerAvatar.mapObjectId].facingDirection));
+            sub_8059348(GetFaceDirectionMovementAction(gMapObjects[gPlayerAvatar.mapObjectId].facingDirection));
     }
 }
 
@@ -1175,14 +1175,14 @@ void sub_8059C3C(u8 a)
 void sub_8059C94(u8 direction)
 {
     sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE));
-    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FD98(direction));
+    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetWalkFastMovementAction_Extended2(direction));
     SeekSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 1);
 }
 
 void sub_8059D08(u8 direction)
 {
     sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING));
-    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], FieldObjectDirectionToImageAnimId(direction));
+    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFaceDirectionMovementAction_Extended(direction));
 }
 
 static void sub_8059D60(struct MapObject *mapObject)
@@ -1242,8 +1242,8 @@ u8 sub_8059EA4(struct Task *task, struct MapObject *playerObject, struct MapObje
     {
         FieldObjectClearHeldMovementIfFinished(playerObject);
         FieldObjectClearHeldMovementIfFinished(strengthObject);
-        FieldObjectSetHeldMovement(playerObject, GetStepInPlaceDelay16MovementActionId((u8)task->data[2]));
-        FieldObjectSetHeldMovement(strengthObject, GetSimpleGoAnimId((u8)task->data[2]));
+        FieldObjectSetHeldMovement(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2]));
+        FieldObjectSetHeldMovement(strengthObject, GetWalkSlowMovementAction((u8)task->data[2]));
         gFieldEffectArguments[0] = strengthObject->currentCoords.x;
         gFieldEffectArguments[1] = strengthObject->currentCoords.y;
         gFieldEffectArguments[2] = strengthObject->previousElevation;
@@ -1338,7 +1338,7 @@ u8 sub_805A100(struct Task *task, struct MapObject *mapObject)
     {
         u8 direction;
 
-        FieldObjectSetHeldMovement(mapObject, GetFaceDirectionMovementActionId(direction = directions[mapObject->movementDirection - 1]));
+        FieldObjectSetHeldMovement(mapObject, GetFaceDirectionMovementAction(direction = directions[mapObject->movementDirection - 1]));
         if (direction == (u8)task->data[1])
             task->data[2]++;
         task->data[0]++;
@@ -1364,7 +1364,7 @@ u8 sub_805A1B8(struct Task *task, struct MapObject *mapObject)
 {
     if (FieldObjectClearHeldMovementIfFinished(mapObject))
     {
-        FieldObjectSetHeldMovement(mapObject, GetSimpleGoAnimId(GetOppositeDirection(task->data[1])));
+        FieldObjectSetHeldMovement(mapObject, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1])));
         ScriptContext2_Disable();
         gPlayerAvatar.preventStep = FALSE;
         DestroyTask(FindTaskIdByFunc(sub_805A08C));
@@ -1413,7 +1413,7 @@ static void sub_805A2D0(u8 taskId)
     if (FieldObjectClearHeldMovementIfFinished(playerMapObj))
     {
         sub_805B980(playerMapObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL));
-        FieldObjectSetHeldMovement(playerMapObj, GetFaceDirectionMovementActionId(playerMapObj->facingDirection));
+        FieldObjectSetHeldMovement(playerMapObj, GetFaceDirectionMovementAction(playerMapObj->facingDirection));
         gPlayerAvatar.preventStep = FALSE;
         ScriptContext2_Disable();
         DestroySprite(&gSprites[playerMapObj->fieldEffectSpriteId]);
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index c710547d3..05abfc54d 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -354,11 +354,11 @@ void sub_80C78A0(void)
 
     if (VarGet(VAR_PORTHOLE_STATE) == 2)
     {
-        StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(4));
+        StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionMovementAction_Extended(4));
     }
     else
     {
-        StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(3));
+        StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionMovementAction_Extended(3));
     }
 }
 
diff --git a/src/fldeff_berrytree.c b/src/fldeff_berrytree.c
index 4571cc4c4..7b7a454b3 100644
--- a/src/fldeff_berrytree.c
+++ b/src/fldeff_berrytree.c
@@ -20,7 +20,7 @@ static void Task_WateringBerryTreeAnim_1(u8 taskId)
         || FieldObjectClearHeldMovementIfFinished(playerMapObj))
     {
         sub_8059D08(GetPlayerFacingDirection());
-        FieldObjectSetHeldMovement(playerMapObj, GetStepInPlaceDelay16MovementActionId(GetPlayerFacingDirection()));
+        FieldObjectSetHeldMovement(playerMapObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection()));
         gTasks[taskId].func = Task_WateringBerryTreeAnim_2;
     }
 }
@@ -34,7 +34,7 @@ static void Task_WateringBerryTreeAnim_2(u8 taskId)
         
         if (value < 10)
         {
-            FieldObjectSetHeldMovement(playerMapObj, GetStepInPlaceDelay16MovementActionId(GetPlayerFacingDirection()));
+            FieldObjectSetHeldMovement(playerMapObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection()));
         }
         else
         {
diff --git a/src/overworld.c b/src/overworld.c
index 806a3a4d2..850bea867 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -2738,10 +2738,10 @@ void SpriteCB_LinkPlayer(struct Sprite *sprite)
     SetObjectSubpriorityByZCoord(mapObj->previousElevation, sprite, 1);
     sprite->oam.priority = ZCoordToPriority(mapObj->previousElevation);
     if (!linkPlayerMapObj->mode)
-        StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObj->range.as_byte));
+        StartSpriteAnim(sprite, GetFaceDirectionMovementAction_Extended(mapObj->range.as_byte));
     else
-        StartSpriteAnimIfDifferent(sprite, get_go_image_anim_num(mapObj->range.as_byte));
-    sub_806487C(sprite, 0);
+        StartSpriteAnimIfDifferent(sprite, GetWalkSlowMovementAction_Extended(mapObj->range.as_byte));
+    UpdateFieldSpriteVisibility(sprite, 0);
     if (mapObj->triggerGroundEffectsOnMove)
     {
         sprite->invisible = ((sprite->data[7] & 4) >> 2);
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 9422f8cb6..d382c66c3 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1156,10 +1156,10 @@ bool8 ScrCmd_createvobject(struct ScriptContext *ctx)
 
 bool8 ScrCmd_turnvobject(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
+    u8 mapObjectId = ScriptReadByte(ctx);
     u8 direction = ScriptReadByte(ctx);
 
-    sub_8064990(v1, direction);
+    TurnMapObject(mapObjectId, direction);
     return FALSE;
 }
 
diff --git a/src/trainer_see.c b/src/trainer_see.c
index e786c582f..ff074d7b7 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -265,7 +265,7 @@ static bool8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainer
 
     FieldObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
-    direction = GetFaceDirectionMovementActionId(trainerObj->facingDirection);
+    direction = GetFaceDirectionMovementAction(trainerObj->facingDirection);
     FieldObjectSetHeldMovement(trainerObj, direction);
     task->data[0]++;
     return TRUE;
@@ -294,7 +294,7 @@ static bool8 sub_808441C(u8 taskId, struct Task *task, struct MapObject *trainer
     {
         if (task->data[3])
         {
-            FieldObjectSetHeldMovement(trainerObj, GetGoSpeed0MovementActionId(trainerObj->facingDirection));
+            FieldObjectSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection));
             task->data[3]--;
         }
         else
@@ -322,7 +322,7 @@ static bool8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainer
         return FALSE;
 
     sub_80597E8();
-    FieldObjectSetHeldMovement(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionMovementActionId(GetOppositeDirection(trainerObj->facingDirection)));
+    FieldObjectSetHeldMovement(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection)));
     task->data[0]++;
     return FALSE;
 }