Finish labeling all movement actions

8 files changed, 928 insertions, 897 deletions

diff --git a/src/data/field_map_obj/anim_func_ptrs.h b/src/data/field_map_obj/anim_func_ptrs.h
index c024295c3..36ffed251 100644
--- a/src/data/field_map_obj/anim_func_ptrs.h
+++ b/src/data/field_map_obj/anim_func_ptrs.h
@@ -98,188 +98,188 @@ 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_8061D38(struct MapObject *, struct Sprite *);
-u8 sub_8061D58(struct MapObject *, struct Sprite *);
-u8 sub_8061D78(struct MapObject *, struct Sprite *);
-u8 sub_8061D98(struct MapObject *, struct Sprite *);
-u8 sub_8061DB8(struct MapObject *, struct Sprite *);
-u8 sub_8061DD8(struct MapObject *, struct Sprite *);
-u8 do_run_south_anim(struct MapObject *, struct Sprite *);
-u8 sub_8061E18(struct MapObject *, struct Sprite *);
-u8 do_run_north_anim(struct MapObject *, struct Sprite *);
-u8 sub_8061E58(struct MapObject *, struct Sprite *);
-u8 do_run_west_anim(struct MapObject *, struct Sprite *);
-u8 sub_8061E98(struct MapObject *, struct Sprite *);
-u8 do_run_east_anim(struct MapObject *, struct Sprite *);
-u8 sub_8061ED8(struct MapObject *, struct Sprite *);
+u8 MovementAction_SlideDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_SlideDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_SlideUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_SlideUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_SlideLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_SlideLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_SlideRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_SlideRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_PlayerRunDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_PlayerRunDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_PlayerRunUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_PlayerRunUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_PlayerRunLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_PlayerRunLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_PlayerRunRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_PlayerRunRight_Step1(struct MapObject *, struct Sprite *);
 u8 sub_8061F24(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8061F90(struct MapObject *, struct Sprite *);
-u8 sub_8061FB0(struct MapObject *, struct Sprite *);
-u8 sub_8061FD8(struct MapObject *, struct Sprite *);
-u8 sub_8061FF8(struct MapObject *, struct Sprite *);
-u8 sub_8062020(struct MapObject *, struct Sprite *);
-u8 sub_8062040(struct MapObject *, struct Sprite *);
-u8 sub_8062068(struct MapObject *, struct Sprite *);
-u8 sub_8062088(struct MapObject *, struct Sprite *);
-u8 sub_80620B0(struct MapObject *, struct Sprite *);
-u8 sub_806210C(struct MapObject *, struct Sprite *);
-u8 sub_8062170(struct MapObject *, struct Sprite *);
-u8 sub_8062180(struct MapObject *, struct Sprite *);
-u8 sub_8062190(struct MapObject *, struct Sprite *);
-u8 sub_80621BC(struct MapObject *, struct Sprite *);
-u8 sub_80621E8(struct MapObject *, struct Sprite *);
-u8 sub_8062214(struct MapObject *, struct Sprite *);
-u8 sub_8062240(struct MapObject *, struct Sprite *);
-u8 sub_806226C(struct MapObject *, struct Sprite *);
-u8 sub_8062298(struct MapObject *, struct Sprite *);
-u8 sub_80622C4(struct MapObject *, struct Sprite *);
-u8 sub_80622F0(struct MapObject *, struct Sprite *);
-u8 sub_806231C(struct MapObject *, struct Sprite *);
-u8 sub_8062348(struct MapObject *, struct Sprite *);
-u8 sub_8062374(struct MapObject *, struct Sprite *);
-u8 sub_80623A0(struct MapObject *, struct Sprite *);
-u8 sub_80623CC(struct MapObject *, struct Sprite *);
-u8 sub_80623F8(struct MapObject *, struct Sprite *);
-u8 sub_8062424(struct MapObject *, struct Sprite *);
-u8 sub_8062450(struct MapObject *, struct Sprite *);
-u8 sub_806247C(struct MapObject *, struct Sprite *);
-u8 sub_80624A8(struct MapObject *, struct Sprite *);
-u8 sub_80624D4(struct MapObject *, struct Sprite *);
-u8 sub_8062500(struct MapObject *, struct Sprite *);
-u8 sub_806252C(struct MapObject *, struct Sprite *);
-u8 sub_8062558(struct MapObject *, struct Sprite *);
-u8 sub_8062584(struct MapObject *, struct Sprite *);
-u8 sub_80625B0(struct MapObject *, struct Sprite *);
-u8 sub_80625C8(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_80625D8(struct MapObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_FacePlayer_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_FaceAwayPlayer_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_LockFacingDirection_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_UnlockFacingDirection_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceDownUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceDownUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceUpDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceUpDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceLeftRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceLeftRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceRightLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceRightLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_FaceOriginalDirection_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_NurseJoyBowDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct MapObject *, struct Sprite *);
+u8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
-u8 sub_80625E8(struct MapObject *, struct Sprite *);
+u8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
-u8 sub_80625F8(struct MapObject *, struct Sprite *);
+u8 MovementAction_DisableAnimation_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
-u8 sub_8062608(struct MapObject *, struct Sprite *);
+u8 MovementAction_RestoreAnimation_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
-u8 sub_8062634(struct MapObject *, struct Sprite *);
+u8 MovementAction_SetInvisible_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
-u8 sub_8062644(struct MapObject *, struct Sprite *);
+u8 MovementAction_SetVisible_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
-u8 do_exclamation_mark_bubble_1(struct MapObject *, struct Sprite *);
+u8 MovementAction_EmoteExclamationMark_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
-u8 do_exclamation_mark_bubble_2(struct MapObject *, struct Sprite *);
+u8 MovementAction_EmoteQuestionMark_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
-u8 do_heart_bubble(struct MapObject *, struct Sprite *);
+u8 MovementAction_EmoteHeart_Step0(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 MovementAction_RevealTrainer_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_RevealTrainer_Step1(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 MovementAction_RockSmashBreak_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_RockSmashBreak_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_RockSmashBreak_Step2(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 MovementAction_CutTree_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_CutTree_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_CutTree_Step2(struct MapObject *, struct Sprite *);
 u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
-u8 sub_806281C(struct MapObject *, struct Sprite *);
+u8 MovementAction_SetFixedPriority_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
-u8 sub_806282C(struct MapObject *, struct Sprite *);
+u8 MovementAction_ClearFixedPriority_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
-u8 sub_806283C(struct MapObject *, struct Sprite *);
+u8 MovementAction_InitAffineAnim_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_Finish(struct MapObject *, struct Sprite *);
-u8 sub_806286C(struct MapObject *, struct Sprite *);
+u8 MovementAction_ClearAffineAnim_Step0(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_80628FC(struct MapObject *, struct Sprite *);
-u8 sub_8062930(struct MapObject *, struct Sprite *);
-u8 sub_806299C(struct MapObject *, struct Sprite *);
-u8 sub_80629AC(struct MapObject *, struct Sprite *);
-u8 sub_80629BC(struct MapObject *, struct Sprite *);
-u8 sub_80629CC(struct MapObject *, struct Sprite *);
-u8 sub_80629DC(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8062A00(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8062A24(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8062A48(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8062A6C(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8062A90(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8062AB4(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8062AD8(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkDownAffine0_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkDownAffine0_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkDownAffine1_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WalkDownAffine1_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieFaceDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieFaceUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieFaceLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieFaceRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroBumpFaceDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroBumpFaceUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroBumpFaceLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroBumpFaceRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct MapObject *, struct Sprite *);
 u8 sub_8062AFC(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct MapObject *, struct Sprite *);
 u8 sub_8062B20(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct MapObject *, struct Sprite *);
 u8 sub_8062B44(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct MapObject *, struct Sprite *);
 u8 sub_8062B68(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8062BD0(struct MapObject *, struct Sprite *);
-u8 sub_8062BFC(struct MapObject *, struct Sprite *);
-u8 sub_8062C28(struct MapObject *, struct Sprite *);
-u8 sub_8062C54(struct MapObject *, struct Sprite *);
-u8 sub_8062C80(struct MapObject *, struct Sprite *);
-u8 sub_8062CAC(struct MapObject *, struct Sprite *);
-u8 sub_8062CD8(struct MapObject *, struct Sprite *);
-u8 sub_8062D04(struct MapObject *, struct Sprite *);
-u8 sub_8062D30(struct MapObject *, struct Sprite *);
-u8 sub_8062D5C(struct MapObject *, struct Sprite *);
-u8 sub_8062D88(struct MapObject *, struct Sprite *);
-u8 sub_8062DB4(struct MapObject *, struct Sprite *);
-u8 sub_8062DE0(struct MapObject *, struct Sprite *);
-u8 sub_8062E0C(struct MapObject *, struct Sprite *);
-u8 sub_8062E38(struct MapObject *, struct Sprite *);
-u8 sub_8062E64(struct MapObject *, struct Sprite *);
-u8 sub_8062E90(struct MapObject *, struct Sprite *);
-u8 sub_8062EBC(struct MapObject *, struct Sprite *);
-u8 sub_8062EE8(struct MapObject *, struct Sprite *);
-u8 sub_8062F14(struct MapObject *, struct Sprite *);
-u8 sub_8062F40(struct MapObject *, struct Sprite *);
-u8 sub_8062F6C(struct MapObject *, struct Sprite *);
-u8 sub_8062F98(struct MapObject *, struct Sprite *);
-u8 sub_8062FC4(struct MapObject *, struct Sprite *);
-u8 sub_8062FF0(struct MapObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieInPlaceDown_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
-u8 sub_8063028(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieInPlaceUp_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
-u8 sub_8063060(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct MapObject *, struct Sprite *);
 u8 MovementAction_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
-u8 sub_8063098(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieInPlaceRight_Step0(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_8063148(struct MapObject *, struct Sprite *);
-u8 sub_8063168(struct MapObject *, struct Sprite *);
-u8 sub_8063188(struct MapObject *, struct Sprite *);
-u8 sub_80631A8(struct MapObject *, struct Sprite *);
-u8 sub_80631C8(struct MapObject *, struct Sprite *);
-u8 sub_80631E8(struct MapObject *, struct Sprite *);
-u8 sub_8063238(struct MapObject *, struct Sprite *);
-u8 sub_8063258(struct MapObject *, struct Sprite *);
-u8 sub_8063278(struct MapObject *, struct Sprite *);
-u8 sub_8063298(struct MapObject *, struct Sprite *);
-u8 sub_80632B8(struct MapObject *, struct Sprite *);
-u8 sub_80632D8(struct MapObject *, struct Sprite *);
-u8 sub_80632F8(struct MapObject *, struct Sprite *);
-u8 sub_8063318(struct MapObject *, struct Sprite *);
-u8 sub_8063370(struct MapObject *, struct Sprite *);
-u8 sub_8063390(struct MapObject *, struct Sprite *);
-u8 sub_80633B0(struct MapObject *, struct Sprite *);
-u8 sub_80633D0(struct MapObject *, struct Sprite *);
-u8 sub_80633F0(struct MapObject *, struct Sprite *);
-u8 sub_8063410(struct MapObject *, struct Sprite *);
-u8 sub_8063430(struct MapObject *, struct Sprite *);
-u8 sub_8063450(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveRight_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroBumpMoveDown_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroBumpMoveDown_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroBumpMoveUp_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroBumpMoveUp_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroBumpMoveLeft_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroBumpMoveLeft_Step1(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroBumpMoveRight_Step0(struct MapObject *, struct Sprite *);
+u8 MovementAction_AcroBumpMoveRight_Step1(struct MapObject *, struct Sprite *);
 
 u8 (*const gMovementActionFuncs_FaceDown[])(struct MapObject *, struct Sprite *);
 u8 (*const gMovementActionFuncs_FaceUp[])(struct MapObject *, struct Sprite *);
@@ -330,95 +330,95 @@ u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct MapObject *, struct Sp
 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 *);
-u8 (*const Unknown_8375C20[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C2C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C38[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C44[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C50[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SlideDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SlideUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SlideLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SlideRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct MapObject *, struct Sprite *);
 u8 (*const Unknown_8375C5C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C68[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C74[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C80[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C8C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C98[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CA0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CA8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CB0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CB8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CC4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CD0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CDC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CE8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CF4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D00[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D0C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D18[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D24[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D30[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D3C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D48[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D50[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D5C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D64[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D6C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D74[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D7C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D84[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D8C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D94[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D9C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DA4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DB0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DC0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DD0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DD8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DE0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DE8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DF0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DFC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E08[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E10[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E18[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E20[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E28[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E34[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E40[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E4C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E58[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E64[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E70[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E7C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375EB8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375EC4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375ED0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375EDC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375EE8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375EF4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F00[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F0C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F18[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F24[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F30[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F3C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F48[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F54[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F60[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F6C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F78[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F84[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F90[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F9C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375FA8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375FB4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375FC0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375FCC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375FD8[])(struct MapObject *, struct Sprite *);
-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 gMovementActionFuncs_JumpSpecialDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FacePlayer[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_DisableAnimation[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SetInvisible[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SetVisible[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_EmoteHeart[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RevealTrainer[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_CutTree[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkDownAffine0[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkDownAffine1[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroBumpFaceDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroBumpFaceUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroBumpFaceLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroBumpFaceRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroBumpMoveDown[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroBumpMoveUp[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroBumpMoveLeft[])(struct MapObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroBumpMoveRight[])(struct MapObject *, struct Sprite *);
 
 u8 (*const *const gMovementActionFuncs[])(struct MapObject *, struct Sprite *) = {
     gMovementActionFuncs_FaceDown,                // MOVEMENT_ACTION_FACE_DOWN
@@ -470,95 +470,95 @@ u8 (*const *const gMovementActionFuncs[])(struct MapObject *, struct Sprite *) =
     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,
-    Unknown_8375C20,
-    Unknown_8375C2C,
-    Unknown_8375C38,
-    Unknown_8375C44,
-    Unknown_8375C50,
+    gMovementActionFuncs_SlideDown,               // MOVEMENT_ACITON_SLIDE_DOWN
+    gMovementActionFuncs_SlideUp,                 // MOVEMENT_ACITON_SLIDE_UP
+    gMovementActionFuncs_SlideLeft,               // MOVEMENT_ACITON_SLIDE_LEFT
+    gMovementActionFuncs_SlideRight,              // MOVEMENT_ACITON_SLIDE_RIGHT
+    gMovementActionFuncs_PlayerRunDown,           // MOVEMENT_ACTION_PLAYER_RUN_DOWN
+    gMovementActionFuncs_PlayerRunUp,             // MOVEMENT_ACTION_PLAYER_RUN_UP
+    gMovementActionFuncs_PlayerRunLeft,           // MOVEMENT_ACTION_PLAYER_RUN_LEFT
+    gMovementActionFuncs_PlayerRunRight,          // MOVEMENT_ACTION_PLAYER_RUN_RIGHT
     Unknown_8375C5C,
-    Unknown_8375C68,
-    Unknown_8375C74,
-    Unknown_8375C80,
-    Unknown_8375C8C,
-    Unknown_8375C98,
-    Unknown_8375CA0,
-    Unknown_8375CA8,
-    Unknown_8375CB0,
-    Unknown_8375CB8,
-    Unknown_8375CC4,
-    Unknown_8375CD0,
-    Unknown_8375CDC,
-    Unknown_8375CE8,
-    Unknown_8375CF4,
-    Unknown_8375D00,
-    Unknown_8375D0C,
-    Unknown_8375D18,
-    Unknown_8375D24,
-    Unknown_8375D30,
-    Unknown_8375D3C,
-    Unknown_8375D48,
-    Unknown_8375D50,
-    Unknown_8375D5C,
-    Unknown_8375D64,
-    Unknown_8375D6C,
-    Unknown_8375D74,
-    Unknown_8375D7C,
-    Unknown_8375D84,
-    Unknown_8375D8C,
-    Unknown_8375D94,
-    Unknown_8375D9C,
-    Unknown_8375DA4,
-    Unknown_8375DB0,
-    Unknown_8375DC0,
-    Unknown_8375DD0,
-    Unknown_8375DD8,
-    Unknown_8375DE0,
-    Unknown_8375DE8,
-    Unknown_8375DF0,
-    Unknown_8375DFC,
-    Unknown_8375E08,
-    Unknown_8375E10,
-    Unknown_8375E18,
-    Unknown_8375E20,
-    Unknown_8375E28,
-    Unknown_8375E34,
-    Unknown_8375E40,
-    Unknown_8375E4C,
-    Unknown_8375E58,
-    Unknown_8375E64,
-    Unknown_8375E70,
-    Unknown_8375E7C,
-    Unknown_8375EB8,
-    Unknown_8375EC4,
-    Unknown_8375ED0,
-    Unknown_8375EDC,
-    Unknown_8375EE8,
-    Unknown_8375EF4,
-    Unknown_8375F00,
-    Unknown_8375F0C,
-    Unknown_8375F18,
-    Unknown_8375F24,
-    Unknown_8375F30,
-    Unknown_8375F3C,
-    Unknown_8375F48,
-    Unknown_8375F54,
-    Unknown_8375F60,
-    Unknown_8375F6C,
-    Unknown_8375F78,
-    Unknown_8375F84,
-    Unknown_8375F90,
-    Unknown_8375F9C,
-    Unknown_8375FA8,
-    Unknown_8375FB4,
-    Unknown_8375FC0,
-    Unknown_8375FCC,
-    Unknown_8375FD8,
-    Unknown_8375FE4,
-    Unknown_8375FF0,
-    Unknown_8375FFC
+    gMovementActionFuncs_JumpSpecialDown,         // MOVEMENT_ACTION_JUMP_SPECIAL_DOWN
+    gMovementActionFuncs_JumpSpecialUp,           // MOVEMENT_ACTION_JUMP_SPECIAL_UP
+    gMovementActionFuncs_JumpSpecialLeft,         // MOVEMENT_ACTION_JUMP_SPECIAL_LEFT
+    gMovementActionFuncs_JumpSpecialRight,        // MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT
+    gMovementActionFuncs_FacePlayer,              // MOVEMENT_ACTION_FACE_PLAYER
+    gMovementActionFuncs_FaceAwayPlayer,          // MOVEMENT_ACTION_FACE_AWAY_PLAYER
+    gMovementActionFuncs_LockFacingDirection,     // MOVEMENT_ACTION_LOCK_FACING_DIRECTION
+    gMovementActionFuncs_UnlockFacingDirection,   // MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION
+    gMovementActionFuncs_JumpDown,                // MOVEMENT_ACITON_JUMP_DOWN
+    gMovementActionFuncs_JumpUp,                  // MOVEMENT_ACITON_JUMP_UP
+    gMovementActionFuncs_JumpLeft,                // MOVEMENT_ACITON_JUMP_LEFT
+    gMovementActionFuncs_JumpRight,               // MOVEMENT_ACITON_JUMP_RIGHT
+    gMovementActionFuncs_JumpInPlaceDown,         // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN
+    gMovementActionFuncs_JumpInPlaceUp,           // MOVEMENT_ACTION_JUMP_IN_PLACE_UP
+    gMovementActionFuncs_JumpInPlaceLeft,         // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT
+    gMovementActionFuncs_JumpInPlaceRight,        // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT
+    gMovementActionFuncs_JumpInPlaceDownUp,       // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP
+    gMovementActionFuncs_JumpInPlaceUpDown,       // MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN
+    gMovementActionFuncs_JumpInPlaceLeftRight,    // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT
+    gMovementActionFuncs_JumpInPlaceRightLeft,    // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT
+    gMovementActionFuncs_FaceOriginalDirection,   // MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION
+    gMovementActionFuncs_NurseJoyBowDown,         // MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN
+    gMovementActionFuncs_EnableJumpLandingGroundEffect,  // MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT
+    gMovementActionFuncs_DisableJumpLandingGroundEffect, // MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT
+    gMovementActionFuncs_DisableAnimation,        // MOVEMENT_ACTION_DISABLE_ANIMATION
+    gMovementActionFuncs_RestoreAnimation,        // MOVEMENT_ACTION_RESTORE_ANIMATION
+    gMovementActionFuncs_SetInvisible,            // MOVEMENT_ACTION_SET_INVISIBLE
+    gMovementActionFuncs_SetVisible,              // MOVEMENT_ACTION_SET_VISIBLE
+    gMovementActionFuncs_EmoteExclamationMark,    // MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK
+    gMovementActionFuncs_EmoteQuestionMark,       // MOVEMENT_ACTION_EMOTE_QUESTION_MARK
+    gMovementActionFuncs_EmoteHeart,              // MOVEMENT_ACTION_EMOTE_HEART
+    gMovementActionFuncs_RevealTrainer,           // MOVEMENT_ACTION_REVEAL_TRAINER
+    gMovementActionFuncs_RockSmashBreak,          // MOVEMENT_ACTION_ROCK_SMASH_BREAK
+    gMovementActionFuncs_CutTree,                 // MOVEMENT_ACTION_CUT_TREE
+    gMovementActionFuncs_SetFixedPriority,        // MOVEMENT_ACTION_SET_FIXED_PRIORITY
+    gMovementActionFuncs_ClearFixedPriority,      // MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY
+    gMovementActionFuncs_InitAffineAnim,          // MOVEMENT_ACTION_INIT_AFFINE_ANIM
+    gMovementActionFuncs_ClearAffineAnim,         // MOVEMENT_ACTION_CLEAR_AFFINE_ANIM
+    gMovementActionFuncs_WalkDownAffine0,         // MOVEMENT_ACTION_WALK_DOWN_AFFINE_0
+    gMovementActionFuncs_WalkDownAffine1,         // MOVEMENT_ACTION_WALK_DOWN_AFFINE_1
+    gMovementActionFuncs_AcroWheelieFaceDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN
+    gMovementActionFuncs_AcroWheelieFaceUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP
+    gMovementActionFuncs_AcroWheelieFaceLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT
+    gMovementActionFuncs_AcroWheelieFaceRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT
+    gMovementActionFuncs_AcroPopWheelieDown,      // MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN
+    gMovementActionFuncs_AcroPopWheelieUp,        // MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP
+    gMovementActionFuncs_AcroPopWheelieLeft,      // MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT
+    gMovementActionFuncs_AcroPopWheelieRight,     // MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT
+    gMovementActionFuncs_AcroBumpFaceDown,        // MOVEMENT_ACTION_ACRO_BUMP_FACE_DOWN
+    gMovementActionFuncs_AcroBumpFaceUp,          // MOVEMENT_ACTION_ACRO_BUMP_FACE_UP
+    gMovementActionFuncs_AcroBumpFaceLeft,        // MOVEMENT_ACTION_ACRO_BUMP_FACE_LEFT
+    gMovementActionFuncs_AcroBumpFaceRight,       // MOVEMENT_ACTION_ACRO_BUMP_FACE_RIGHT
+    gMovementActionFuncs_AcroWheelieHopFaceDown,  // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN
+    gMovementActionFuncs_AcroWheelieHopFaceUp,    // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP
+    gMovementActionFuncs_AcroWheelieHopFaceLeft,  // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT
+    gMovementActionFuncs_AcroWheelieHopFaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT
+    gMovementActionFuncs_AcroWheelieHopDown,      // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN
+    gMovementActionFuncs_AcroWheelieHopUp,        // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP
+    gMovementActionFuncs_AcroWheelieHopLeft,      // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT
+    gMovementActionFuncs_AcroWheelieHopRight,     // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT
+    gMovementActionFuncs_AcroWheelieJumpDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN
+    gMovementActionFuncs_AcroWheelieJumpUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP
+    gMovementActionFuncs_AcroWheelieJumpLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT
+    gMovementActionFuncs_AcroWheelieJumpRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT
+    gMovementActionFuncs_AcroWheelieInPlaceDown,  // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN
+    gMovementActionFuncs_AcroWheelieInPlaceUp,    // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP
+    gMovementActionFuncs_AcroWheelieInPlaceLeft,  // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT
+    gMovementActionFuncs_AcroWheelieInPlaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT
+    gMovementActionFuncs_AcroPopWheelieMoveDown,  // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN
+    gMovementActionFuncs_AcroPopWheelieMoveUp,    // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP
+    gMovementActionFuncs_AcroPopWheelieMoveLeft,  // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT
+    gMovementActionFuncs_AcroPopWheelieMoveRight, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT
+    gMovementActionFuncs_AcroWheelieMoveDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN
+    gMovementActionFuncs_AcroWheelieMoveUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP
+    gMovementActionFuncs_AcroWheelieMoveLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT
+    gMovementActionFuncs_AcroWheelieMoveRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT
+    gMovementActionFuncs_AcroBumpMoveDown,        // MOVEMENT_ACTION_ACRO_BUMP_MOVE_DOWN
+    gMovementActionFuncs_AcroBumpMoveUp,          // MOVEMENT_ACTION_ACRO_BUMP_MOVE_UP
+    gMovementActionFuncs_AcroBumpMoveLeft,        // MOVEMENT_ACTION_ACRO_BUMP_MOVE_LEFT
+    gMovementActionFuncs_AcroBumpMoveRight,       // MOVEMENT_ACTION_ACRO_BUMP_MOVE_RIGHT
 };
 
 
@@ -863,529 +863,530 @@ u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct MapObject *, struct S
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375BFC[])(struct MapObject *, struct Sprite *) = {
-    sub_8061CF8,
-    sub_8061D18,
+u8 (*const gMovementActionFuncs_SlideDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_SlideDown_Step0,
+    MovementAction_SlideDown_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375C08[])(struct MapObject *, struct Sprite *) = {
-    sub_8061D38,
-    sub_8061D58,
+u8 (*const gMovementActionFuncs_SlideUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_SlideUp_Step0,
+    MovementAction_SlideUp_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375C14[])(struct MapObject *, struct Sprite *) = {
-    sub_8061D78,
-    sub_8061D98,
+u8 (*const gMovementActionFuncs_SlideLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_SlideLeft_Step0,
+    MovementAction_SlideLeft_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375C20[])(struct MapObject *, struct Sprite *) = {
-    sub_8061DB8,
-    sub_8061DD8,
+u8 (*const gMovementActionFuncs_SlideRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_SlideRight_Step0,
+    MovementAction_SlideRight_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375C2C[])(struct MapObject *, struct Sprite *) = {
-    do_run_south_anim,
-    sub_8061E18,
+u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_PlayerRunDown_Step0,
+    MovementAction_PlayerRunDown_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375C38[])(struct MapObject *, struct Sprite *) = {
-    do_run_north_anim,
-    sub_8061E58,
+u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_PlayerRunUp_Step0,
+    MovementAction_PlayerRunUp_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375C44[])(struct MapObject *, struct Sprite *) = {
-    do_run_west_anim,
-    sub_8061E98,
+u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_PlayerRunLeft_Step0,
+    MovementAction_PlayerRunLeft_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375C50[])(struct MapObject *, struct Sprite *) = {
-    do_run_east_anim,
-    sub_8061ED8,
+u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_PlayerRunRight_Step0,
+    MovementAction_PlayerRunRight_Step1,
     MovementAction_PauseSpriteAnim
 };
 
 u8 (*const Unknown_8375C5C[])(struct MapObject *, struct Sprite *) = {
     sub_8061F24,
-    sub_8061F3C,
+    MovementAction_WaitSpriteAnim,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375C68[])(struct MapObject *, struct Sprite *) = {
-    sub_8061F90,
-    sub_8061FB0,
+u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpSpecialDown_Step0,
+    MovementAction_JumpSpecialDown_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375C74[])(struct MapObject *, struct Sprite *) = {
-    sub_8061FD8,
-    sub_8061FF8,
+u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpSpecialUp_Step0,
+    MovementAction_JumpSpecialUp_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375C80[])(struct MapObject *, struct Sprite *) = {
-    sub_8062020,
-    sub_8062040,
+u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpSpecialLeft_Step0,
+    MovementAction_JumpSpecialLeft_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375C8C[])(struct MapObject *, struct Sprite *) = {
-    sub_8062068,
-    sub_8062088,
+u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpSpecialRight_Step0,
+    MovementAction_JumpSpecialRight_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375C98[])(struct MapObject *, struct Sprite *) = {
-    sub_80620B0,
+u8 (*const gMovementActionFuncs_FacePlayer[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_FacePlayer_Step0,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375CA0[])(struct MapObject *, struct Sprite *) = {
-    sub_806210C,
+u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_FaceAwayPlayer_Step0,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375CA8[])(struct MapObject *, struct Sprite *) = {
-    sub_8062170,
+u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_LockFacingDirection_Step0,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375CB0[])(struct MapObject *, struct Sprite *) = {
-    sub_8062180,
+u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_UnlockFacingDirection_Step0,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375CB8[])(struct MapObject *, struct Sprite *) = {
-    sub_8062190,
-    sub_80621BC,
+u8 (*const gMovementActionFuncs_JumpDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpDown_Step0,
+    MovementAction_JumpDown_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375CC4[])(struct MapObject *, struct Sprite *) = {
-    sub_80621E8,
-    sub_8062214,
+u8 (*const gMovementActionFuncs_JumpUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpUp_Step0,
+    MovementAction_JumpUp_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375CD0[])(struct MapObject *, struct Sprite *) = {
-    sub_8062240,
-    sub_806226C,
+u8 (*const gMovementActionFuncs_JumpLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpLeft_Step0,
+    MovementAction_JumpLeft_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375CDC[])(struct MapObject *, struct Sprite *) = {
-    sub_8062298,
-    sub_80622C4,
+u8 (*const gMovementActionFuncs_JumpRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpRight_Step0,
+    MovementAction_JumpRight_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375CE8[])(struct MapObject *, struct Sprite *) = {
-    sub_80622F0,
-    sub_806231C,
+u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceDown_Step0,
+    MovementAction_JumpInPlaceDown_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375CF4[])(struct MapObject *, struct Sprite *) = {
-    sub_8062348,
-    sub_8062374,
+u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceUp_Step0,
+    MovementAction_JumpInPlaceUp_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375D00[])(struct MapObject *, struct Sprite *) = {
-    sub_80623A0,
-    sub_80623CC,
+u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceLeft_Step0,
+    MovementAction_JumpInPlaceLeft_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375D0C[])(struct MapObject *, struct Sprite *) = {
-    sub_80623F8,
-    sub_8062424,
+u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceRight_Step0,
+    MovementAction_JumpInPlaceRight_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375D18[])(struct MapObject *, struct Sprite *) = {
-    sub_8062450,
-    sub_806247C,
+u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceDownUp_Step0,
+    MovementAction_JumpInPlaceDownUp_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375D24[])(struct MapObject *, struct Sprite *) = {
-    sub_80624A8,
-    sub_80624D4,
+u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceUpDown_Step0,
+    MovementAction_JumpInPlaceUpDown_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375D30[])(struct MapObject *, struct Sprite *) = {
-    sub_8062500,
-    sub_806252C,
+u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceLeftRight_Step0,
+    MovementAction_JumpInPlaceLeftRight_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375D3C[])(struct MapObject *, struct Sprite *) = {
-    sub_8062558,
-    sub_8062584,
+u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceRightLeft_Step0,
+    MovementAction_JumpInPlaceRightLeft_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375D48[])(struct MapObject *, struct Sprite *) = {
-    sub_80625B0,
+u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_FaceOriginalDirection_Step0,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375D50[])(struct MapObject *, struct Sprite *) = {
-    sub_80625C8,
-    sub_8061F3C,
+u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_NurseJoyBowDown_Step0,
+    MovementAction_WaitSpriteAnim,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375D5C[])(struct MapObject *, struct Sprite *) = {
-    sub_80625D8,
+u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_EnableJumpLandingGroundEffect_Step0,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375D64[])(struct MapObject *, struct Sprite *) = {
-    sub_80625E8,
+u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_DisableJumpLandingGroundEffect_Step0,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375D6C[])(struct MapObject *, struct Sprite *) = {
-    sub_80625F8,
+u8 (*const gMovementActionFuncs_DisableAnimation[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_DisableAnimation_Step0,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375D74[])(struct MapObject *, struct Sprite *) = {
-    sub_8062608,
+u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_RestoreAnimation_Step0,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375D7C[])(struct MapObject *, struct Sprite *) = {
-    sub_8062634,
+u8 (*const gMovementActionFuncs_SetInvisible[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_SetInvisible_Step0,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375D84[])(struct MapObject *, struct Sprite *) = {
-    sub_8062644,
+u8 (*const gMovementActionFuncs_SetVisible[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_SetVisible_Step0,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375D8C[])(struct MapObject *, struct Sprite *) = {
-    do_exclamation_mark_bubble_1,
+u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_EmoteExclamationMark_Step0,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375D94[])(struct MapObject *, struct Sprite *) = {
-    do_exclamation_mark_bubble_2,
+u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_EmoteQuestionMark_Step0,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375D9C[])(struct MapObject *, struct Sprite *) = {
-    do_heart_bubble,
+u8 (*const gMovementActionFuncs_EmoteHeart[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_EmoteHeart_Step0,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375DA4[])(struct MapObject *, struct Sprite *) = {
-    sub_80626C0,
-    sub_8062704,
+u8 (*const gMovementActionFuncs_RevealTrainer[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_RevealTrainer_Step0,
+    MovementAction_RevealTrainer_Step1,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375DB0[])(struct MapObject *, struct Sprite *) = {
-    sub_8062724,
-    sub_8062740,
-    sub_8062764,
+u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_RockSmashBreak_Step0,
+    MovementAction_RockSmashBreak_Step1,
+    MovementAction_RockSmashBreak_Step2,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375DC0[])(struct MapObject *, struct Sprite *) = {
-    sub_80627A0,
-    sub_80627BC,
-    sub_80627E0,
+u8 (*const gMovementActionFuncs_CutTree[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_CutTree_Step0,
+    MovementAction_CutTree_Step1,
+    MovementAction_CutTree_Step2,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375DD0[])(struct MapObject *, struct Sprite *) = {
-    sub_806281C,
+u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_SetFixedPriority_Step0,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375DD8[])(struct MapObject *, struct Sprite *) = {
-    sub_806282C,
+u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_ClearFixedPriority_Step0,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375DE0[])(struct MapObject *, struct Sprite *) = {
-    sub_806283C,
+u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_InitAffineAnim_Step0,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375DE8[])(struct MapObject *, struct Sprite *) = {
-    sub_806286C,
+u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_ClearAffineAnim_Step0,
     MovementAction_Finish
 };
 
-u8 (*const Unknown_8375DF0[])(struct MapObject *, struct Sprite *) = {
-    sub_806289C,
-    sub_80628D0,
+u8 (*const gMovementActionFuncs_WalkDownAffine0[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkDownAffine0_Step0,
+    MovementAction_WalkDownAffine0_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375DFC[])(struct MapObject *, struct Sprite *) = {
-    sub_80628FC,
-    sub_8062930,
+u8 (*const gMovementActionFuncs_WalkDownAffine1[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_WalkDownAffine1_Step0,
+    MovementAction_WalkDownAffine1_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375E08[])(struct MapObject *, struct Sprite *) = {
-    sub_806299C,
+u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieFaceDown_Step0,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375E10[])(struct MapObject *, struct Sprite *) = {
-    sub_80629AC,
+u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieFaceUp_Step0,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375E18[])(struct MapObject *, struct Sprite *) = {
-    sub_80629BC,
+u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieFaceLeft_Step0,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375E20[])(struct MapObject *, struct Sprite *) = {
-    sub_80629CC,
+u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieFaceRight_Step0,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375E28[])(struct MapObject *, struct Sprite *) = {
-    sub_80629DC,
-    sub_8061F3C,
+u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieDown_Step0,
+    MovementAction_WaitSpriteAnim,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375E34[])(struct MapObject *, struct Sprite *) = {
-    sub_8062A00,
-    sub_8061F3C,
+u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieUp_Step0,
+    MovementAction_WaitSpriteAnim,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375E40[])(struct MapObject *, struct Sprite *) = {
-    sub_8062A24,
-    sub_8061F3C,
+u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieLeft_Step0,
+    MovementAction_WaitSpriteAnim,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375E4C[])(struct MapObject *, struct Sprite *) = {
-    sub_8062A48,
-    sub_8061F3C,
+u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieRight_Step0,
+    MovementAction_WaitSpriteAnim,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375E58[])(struct MapObject *, struct Sprite *) = {
-    sub_8062A6C,
-    sub_8061F3C,
+u8 (*const gMovementActionFuncs_AcroBumpFaceDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroBumpFaceDown_Step0,
+    MovementAction_WaitSpriteAnim,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375E64[])(struct MapObject *, struct Sprite *) = {
-    sub_8062A90,
-    sub_8061F3C,
+u8 (*const gMovementActionFuncs_AcroBumpFaceUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroBumpFaceUp_Step0,
+    MovementAction_WaitSpriteAnim,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375E70[])(struct MapObject *, struct Sprite *) = {
-    sub_8062AB4,
-    sub_8061F3C,
+u8 (*const gMovementActionFuncs_AcroBumpFaceLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroBumpFaceLeft_Step0,
+    MovementAction_WaitSpriteAnim,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375E7C[])(struct MapObject *, struct Sprite *) = {
-    sub_8062AD8,
-    sub_8061F3C,
+u8 (*const gMovementActionFuncs_AcroBumpFaceRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroBumpFaceRight_Step0,
+    MovementAction_WaitSpriteAnim,
     MovementAction_PauseSpriteAnim,
+    // The rest in this array are unreachable acro-bike-related actions
     sub_8062AFC,
-    sub_8061F3C,
+    MovementAction_WaitSpriteAnim,
     MovementAction_PauseSpriteAnim,
     sub_8062B20,
-    sub_8061F3C,
+    MovementAction_WaitSpriteAnim,
     MovementAction_PauseSpriteAnim,
     sub_8062B44,
-    sub_8061F3C,
+    MovementAction_WaitSpriteAnim,
     MovementAction_PauseSpriteAnim,
     sub_8062B68,
-    sub_8061F3C,
+    MovementAction_WaitSpriteAnim,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375EB8[])(struct MapObject *, struct Sprite *) = {
-    sub_8062BD0,
-    sub_8062BFC,
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopFaceDown_Step0,
+    MovementAction_AcroWheelieHopFaceDown_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375EC4[])(struct MapObject *, struct Sprite *) = {
-    sub_8062C28,
-    sub_8062C54,
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopFaceUp_Step0,
+    MovementAction_AcroWheelieHopFaceUp_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375ED0[])(struct MapObject *, struct Sprite *) = {
-    sub_8062C80,
-    sub_8062CAC,
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopFaceLeft_Step0,
+    MovementAction_AcroWheelieHopFaceLeft_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375EDC[])(struct MapObject *, struct Sprite *) = {
-    sub_8062CD8,
-    sub_8062D04,
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopFaceRight_Step0,
+    MovementAction_AcroWheelieHopFaceRight_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375EE8[])(struct MapObject *, struct Sprite *) = {
-    sub_8062D30,
-    sub_8062D5C,
+u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopDown_Step0,
+    MovementAction_AcroWheelieHopDown_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375EF4[])(struct MapObject *, struct Sprite *) = {
-    sub_8062D88,
-    sub_8062DB4,
+u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopUp_Step0,
+    MovementAction_AcroWheelieHopUp_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375F00[])(struct MapObject *, struct Sprite *) = {
-    sub_8062DE0,
-    sub_8062E0C,
+u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopLeft_Step0,
+    MovementAction_AcroWheelieHopLeft_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375F0C[])(struct MapObject *, struct Sprite *) = {
-    sub_8062E38,
-    sub_8062E64,
+u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopRight_Step0,
+    MovementAction_AcroWheelieHopRight_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375F18[])(struct MapObject *, struct Sprite *) = {
-    sub_8062E90,
-    sub_8062EBC,
+u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieJumpDown_Step0,
+    MovementAction_AcroWheelieJumpDown_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375F24[])(struct MapObject *, struct Sprite *) = {
-    sub_8062EE8,
-    sub_8062F14,
+u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieJumpUp_Step0,
+    MovementAction_AcroWheelieJumpUp_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375F30[])(struct MapObject *, struct Sprite *) = {
-    sub_8062F40,
-    sub_8062F6C,
+u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieJumpLeft_Step0,
+    MovementAction_AcroWheelieJumpLeft_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375F3C[])(struct MapObject *, struct Sprite *) = {
-    sub_8062F98,
-    sub_8062FC4,
+u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieJumpRight_Step0,
+    MovementAction_AcroWheelieJumpRight_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375F48[])(struct MapObject *, struct Sprite *) = {
-    sub_8062FF0,
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieInPlaceDown_Step0,
     MovementAction_WalkInPlace_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375F54[])(struct MapObject *, struct Sprite *) = {
-    sub_8063028,
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieInPlaceUp_Step0,
     MovementAction_WalkInPlace_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375F60[])(struct MapObject *, struct Sprite *) = {
-    sub_8063060,
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieInPlaceLeft_Step0,
     MovementAction_WalkInPlace_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375F6C[])(struct MapObject *, struct Sprite *) = {
-    sub_8063098,
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieInPlaceRight_Step0,
     MovementAction_WalkInPlace_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375F78[])(struct MapObject *, struct Sprite *) = {
-    sub_8063108,
-    sub_8063128,
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieMoveDown_Step0,
+    MovementAction_AcroPopWheelieMoveDown_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375F84[])(struct MapObject *, struct Sprite *) = {
-    sub_8063148,
-    sub_8063168,
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieMoveUp_Step0,
+    MovementAction_AcroPopWheelieMoveUp_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375F90[])(struct MapObject *, struct Sprite *) = {
-    sub_8063188,
-    sub_80631A8,
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieMoveLeft_Step0,
+    MovementAction_AcroPopWheelieMoveLeft_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375F9C[])(struct MapObject *, struct Sprite *) = {
-    sub_80631C8,
-    sub_80631E8,
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieMoveRight_Step0,
+    MovementAction_AcroPopWheelieMoveRight_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375FA8[])(struct MapObject *, struct Sprite *) = {
-    sub_8063238,
-    sub_8063258,
+u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieMoveDown_Step0,
+    MovementAction_AcroWheelieMoveDown_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375FB4[])(struct MapObject *, struct Sprite *) = {
-    sub_8063278,
-    sub_8063298,
+u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieMoveUp_Step0,
+    MovementAction_AcroWheelieMoveUp_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375FC0[])(struct MapObject *, struct Sprite *) = {
-    sub_80632B8,
-    sub_80632D8,
+u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieMoveLeft_Step0,
+    MovementAction_AcroWheelieMoveLeft_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375FCC[])(struct MapObject *, struct Sprite *) = {
-    sub_80632F8,
-    sub_8063318,
+u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieMoveRight_Step0,
+    MovementAction_AcroWheelieMoveRight_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375FD8[])(struct MapObject *, struct Sprite *) = {
-    sub_8063370,
-    sub_8063390,
+u8 (*const gMovementActionFuncs_AcroBumpMoveDown[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroBumpMoveDown_Step0,
+    MovementAction_AcroBumpMoveDown_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375FE4[])(struct MapObject *, struct Sprite *) = {
-    sub_80633B0,
-    sub_80633D0,
+u8 (*const gMovementActionFuncs_AcroBumpMoveUp[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroBumpMoveUp_Step0,
+    MovementAction_AcroBumpMoveUp_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375FF0[])(struct MapObject *, struct Sprite *) = {
-    sub_80633F0,
-    sub_8063410,
+u8 (*const gMovementActionFuncs_AcroBumpMoveLeft[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroBumpMoveLeft_Step0,
+    MovementAction_AcroBumpMoveLeft_Step1,
     MovementAction_PauseSpriteAnim
 };
 
-u8 (*const Unknown_8375FFC[])(struct MapObject *, struct Sprite *) = {
-    sub_8063430,
-    sub_8063450,
+u8 (*const gMovementActionFuncs_AcroBumpMoveRight[])(struct MapObject *, struct Sprite *) = {
+    MovementAction_AcroBumpMoveRight_Step0,
+    MovementAction_AcroBumpMoveRight_Step1,
     MovementAction_PauseSpriteAnim
 };
 
diff --git a/src/data/field_map_obj/callback_subroutine_pointers.h b/src/data/field_map_obj/callback_subroutine_pointers.h
index e9b648b88..04bbb2479 100644
--- a/src/data/field_map_obj/callback_subroutine_pointers.h
+++ b/src/data/field_map_obj/callback_subroutine_pointers.h
@@ -401,7 +401,7 @@ u8 (*const gCopyPlayerMovementFuncs[])(struct MapObject *, struct Sprite *, u8,
     CopyablePlayerMovement_GoSpeed0,
     CopyablePlayerMovement_GoSpeed1,
     CopyablePlayerMovement_GoSpeed2,
-    CopyablePlayerMovement_GoSpeed3,
+    CopyablePlayerMovement_Slide,
     cph_IM_DIFFERENT,
     CopyablePlayerMovement_GoSpeed4,
     CopyablePlayerMovement_Jump,
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 8613f1f03..85714e1c2 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -2103,8 +2103,20 @@ const u8 gWalkFastestMovementActions[] = {
 	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 gSlideMovementActions[] = {
+	MOVEMENT_ACTION_SLIDE_DOWN,
+	MOVEMENT_ACTION_SLIDE_DOWN,
+	MOVEMENT_ACTION_SLIDE_UP,
+	MOVEMENT_ACTION_SLIDE_LEFT,
+	MOVEMENT_ACTION_SLIDE_RIGHT,
+};
+const u8 gPlayerRunMovementActions[] = {
+	MOVEMENT_ACTION_PLAYER_RUN_DOWN,
+	MOVEMENT_ACTION_PLAYER_RUN_DOWN,
+	MOVEMENT_ACTION_PLAYER_RUN_UP,
+	MOVEMENT_ACTION_PLAYER_RUN_LEFT,
+	MOVEMENT_ACTION_PLAYER_RUN_RIGHT,
+};
 const u8 gJump2MovementActions[] = {
 	MOVEMENT_ACTION_JUMP_2_DOWN,
 	MOVEMENT_ACTION_JUMP_2_DOWN,
@@ -2112,10 +2124,34 @@ const u8 gJump2MovementActions[] = {
 	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 gJumpInPlaceMovementActions[] = {
+	MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN,
+	MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN,
+	MOVEMENT_ACTION_JUMP_IN_PLACE_UP,
+	MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT,
+	MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT,
+};
+const u8 gJumpInPlaceTurnAroundMovementActions[] = {
+	MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN,
+	MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN,
+	MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP,
+	MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT,
+	MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT,
+};
+const u8 gJumpMovementActions[] = {
+	MOVEMENT_ACITON_JUMP_DOWN,
+	MOVEMENT_ACITON_JUMP_DOWN,
+	MOVEMENT_ACITON_JUMP_UP,
+	MOVEMENT_ACITON_JUMP_LEFT,
+	MOVEMENT_ACITON_JUMP_RIGHT,
+};
+const u8 gJumpSpecialMovementActions[] = {
+	MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,
+	MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,
+	MOVEMENT_ACTION_JUMP_SPECIAL_UP,
+	MOVEMENT_ACTION_JUMP_SPECIAL_LEFT,
+	MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT,
+};
 const u8 gWalkInPlaceSlowMovementActions[] = {
 	MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,
 	MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,
@@ -5248,7 +5284,7 @@ bool8 CopyablePlayerMovement_GoSpeed2(struct MapObject *mapObject, struct Sprite
     return TRUE;
 }
 
-bool8 CopyablePlayerMovement_GoSpeed3(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
+bool8 CopyablePlayerMovement_Slide(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
 {
     u32 direction;
     s16 x;
@@ -5257,7 +5293,7 @@ bool8 CopyablePlayerMovement_GoSpeed3(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_80607C8(direction));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetSlideMovementAction(direction));
     if (GetCollisionAtCoords(mapObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
     {
         FieldObjectSetSingleMovement(mapObject, sprite, GetFaceDirectionMovementAction(direction));
@@ -5273,7 +5309,7 @@ bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 pl
 
     direction = playerDirection;
     direction = state_to_direction(gInitialMovementTypeFacingDirections[mapObject->movementType], mapObject->directionSequenceIndex, direction);
-    FieldObjectSetSingleMovement(mapObject, sprite, sub_806084C(direction));
+    FieldObjectSetSingleMovement(mapObject, sprite, GetJumpInPlaceMovementAction(direction));
     mapObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
@@ -5572,21 +5608,15 @@ void sub_805FE64(struct MapObject *mapObject, struct Sprite *sprite, u8 movement
     }
 }
 
-u8 sub_805FE90(s16 a0, s16 a1, s16 a2, s16 a3)
+static u8 GetDirectionToFace(s16 x1, s16 y1, s16 x2, s16 y2)
 {
-    if (a0 > a2)
-    {
+    if (x1 > x2)
         return DIR_WEST;
-    } else if (a0 < a2)
-    {
+    if (x1 < x2)
         return DIR_EAST;
-    } else if (a1 > a3)
-    {
+    if (y1 > y2)
         return DIR_NORTH;
-    } else
-    {
-        return DIR_SOUTH;
-    }
+    return DIR_SOUTH;
 }
 
 void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 movementType)
@@ -5950,13 +5980,13 @@ 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(GetSlideMovementAction, gSlideMovementActions)
+dirn_to_anim(GetPlayerRunMovementAction, gPlayerRunMovementActions)
 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(GetJumpInPlaceMovementAction, gJumpInPlaceMovementActions)
+dirn_to_anim(GetJumpInPlaceTurnAroundMovementAction, gJumpInPlaceTurnAroundMovementActions)
+dirn_to_anim(sub_80608A4, gJumpMovementActions)
+dirn_to_anim(GetJumpSpecialMovementAction, gJumpSpecialMovementActions)
 dirn_to_anim(GetWalkInPlaceSlowMovementAction, gWalkInPlaceSlowMovementActions)
 dirn_to_anim(GetWalkInPlaceNormalMovementAction, gWalkInPlaceNormalMovementActions)
 dirn_to_anim(GetWalkInPlaceFastMovementAction, gWalkInPlaceFastMovementActions)
@@ -6945,15 +6975,15 @@ bool8 MovementAction_WalkFastestRight_Step1(struct MapObject *mapObject, struct
     return FALSE;
 }
 
-bool8 sub_8061D18(struct MapObject *, struct Sprite *);
+bool8 MovementAction_SlideDown_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8061CF8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_SOUTH, 4);
-    return sub_8061D18(mapObject, sprite);
+    return MovementAction_SlideDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061D18(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6963,15 +6993,15 @@ bool8 sub_8061D18(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061D58(struct MapObject *, struct Sprite *);
+bool8 MovementAction_SlideUp_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8061D38(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_NORTH, 4);
-    return sub_8061D58(mapObject, sprite);
+    return MovementAction_SlideUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061D58(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -6982,15 +7012,15 @@ bool8 sub_8061D58(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 
-bool8 sub_8061D98(struct MapObject *, struct Sprite *);
+bool8 MovementAction_SlideLeft_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8061D78(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_WEST, 4);
-    return sub_8061D98(mapObject, sprite);
+    return MovementAction_SlideLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061D98(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -7001,15 +7031,15 @@ bool8 sub_8061D98(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 
-bool8 sub_8061DD8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_SlideRight_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8061DB8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_go_anim(mapObject, sprite, DIR_EAST, 4);
-    return sub_8061DD8(mapObject, sprite);
+    return MovementAction_SlideRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061DD8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -7019,15 +7049,15 @@ bool8 sub_8061DD8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061E18(struct MapObject *, struct Sprite *);
+bool8 MovementAction_PlayerRunDown_Step1(struct MapObject *, struct Sprite *);
 
-bool8 do_run_south_anim(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_run_anim(mapObject, sprite, DIR_SOUTH);
-    return sub_8061E18(mapObject, sprite);
+    return MovementAction_PlayerRunDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061E18(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -7037,15 +7067,15 @@ bool8 sub_8061E18(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061E58(struct MapObject *, struct Sprite *);
+bool8 MovementAction_PlayerRunUp_Step1(struct MapObject *, struct Sprite *);
 
-bool8 do_run_north_anim(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_run_anim(mapObject, sprite, DIR_NORTH);
-    return sub_8061E58(mapObject, sprite);
+    return MovementAction_PlayerRunUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061E58(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -7055,15 +7085,15 @@ bool8 sub_8061E58(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061E98(struct MapObject *, struct Sprite *);
+bool8 MovementAction_PlayerRunLeft_Step1(struct MapObject *, struct Sprite *);
 
-bool8 do_run_west_anim(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_run_anim(mapObject, sprite, DIR_WEST);
-    return sub_8061E98(mapObject, sprite);
+    return MovementAction_PlayerRunLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061E98(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -7073,15 +7103,15 @@ bool8 sub_8061E98(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061ED8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_PlayerRunRight_Step1(struct MapObject *, struct Sprite *);
 
-bool8 do_run_east_anim(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     do_run_anim(mapObject, sprite, DIR_EAST);
-    return sub_8061ED8(mapObject, sprite);
+    return MovementAction_PlayerRunRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061ED8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -7091,22 +7121,22 @@ bool8 sub_8061ED8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-void npc_set_direction_and_anim__an_proceed(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 animNum)
+void StartSpriteAnimInDirection(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 animNum)
 {
-    obj_anim_image_set_and_seek(sprite, animNum, 0);
+    SetAndStartSpriteAnim(sprite, animNum, 0);
     FieldObjectSetDirection(mapObject, direction);
     sprite->data[2] = 1;
 }
 
 bool8 sub_8061F24(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, mapObject->movementDirection, sprite->animNum);
+    StartSpriteAnimInDirection(mapObject, sprite, mapObject->movementDirection, sprite->animNum);
     return FALSE;
 }
 
 bool8 SpriteAnimEnded(struct Sprite *);
 
-bool8 sub_8061F3C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WaitSpriteAnim(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (SpriteAnimEnded(sprite))
     {
@@ -7122,15 +7152,15 @@ void sub_8061F5C(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     StartSpriteAnim(sprite, GetWalkFastMovementAction_Extended(direction));
 }
 
-bool8 sub_8061FB0(struct MapObject *, struct Sprite *);
+bool8 MovementAction_JumpSpecialDown_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8061F90(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8061F5C(mapObject, sprite, DIR_SOUTH);
-    return sub_8061FB0(mapObject, sprite);
+    return MovementAction_JumpSpecialDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061FB0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061340(mapObject, sprite))
     {
@@ -7141,15 +7171,15 @@ bool8 sub_8061FB0(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061FF8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_JumpSpecialUp_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8061FD8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8061F5C(mapObject, sprite, DIR_NORTH);
-    return sub_8061FF8(mapObject, sprite);
+    return MovementAction_JumpSpecialUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_8061FF8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061340(mapObject, sprite))
     {
@@ -7160,15 +7190,15 @@ bool8 sub_8061FF8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062040(struct MapObject *, struct Sprite *);
+bool8 MovementAction_JumpSpecialLeft_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8062020(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8061F5C(mapObject, sprite, DIR_WEST);
-    return sub_8062040(mapObject, sprite);
+    return MovementAction_JumpSpecialLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062040(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061340(mapObject, sprite))
     {
@@ -7179,15 +7209,15 @@ bool8 sub_8062040(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062088(struct MapObject *, struct Sprite *);
+bool8 MovementAction_JumpSpecialRight_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8062068(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8061F5C(mapObject, sprite, DIR_EAST);
-    return sub_8062088(mapObject, sprite);
+    return MovementAction_JumpSpecialRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062088(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061340(mapObject, sprite))
     {
@@ -7198,51 +7228,51 @@ bool8 sub_8062088(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80620B0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_FacePlayer_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    u8 objectId;
-    if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), &objectId))
+    u8 playerObjectId;
+    if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId))
     {
-        FaceDirection(mapObject, sprite, sub_805FE90(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[objectId].currentCoords.x, gMapObjects[objectId].currentCoords.y));
+        FaceDirection(mapObject, sprite, GetDirectionToFace(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[playerObjectId].currentCoords.x, gMapObjects[playerObjectId].currentCoords.y));
     }
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_806210C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_FaceAwayPlayer_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    u8 objectId;
-    if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), &objectId))
+    u8 playerObjectId;
+    if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId))
     {
-        FaceDirection(mapObject, sprite, GetOppositeDirection(sub_805FE90(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[objectId].currentCoords.x, gMapObjects[objectId].currentCoords.y)));
+        FaceDirection(mapObject, sprite, GetOppositeDirection(GetDirectionToFace(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[playerObjectId].currentCoords.x, gMapObjects[playerObjectId].currentCoords.y)));
     }
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8062170(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_LockFacingDirection_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->facingDirectionLocked = 1;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8062180(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_UnlockFacingDirection_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->facingDirectionLocked = 0;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_80621BC(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpDown_Step1(struct MapObject *mapObject, struct Sprite *sprite);
 
-bool8 sub_8062190(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_SOUTH, 1, 2);
-    return sub_80621BC(mapObject, sprite);
+    return MovementAction_JumpDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_80621BC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7253,15 +7283,15 @@ bool8 sub_80621BC(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062214(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpUp_Step1(struct MapObject *mapObject, struct Sprite *sprite);
 
-bool8 sub_80621E8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_NORTH, 1, 2);
-    return sub_8062214(mapObject, sprite);
+    return MovementAction_JumpUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062214(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7272,15 +7302,15 @@ bool8 sub_8062214(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806226C(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite);
 
-bool8 sub_8062240(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_WEST, 1, 2);
-    return sub_806226C(mapObject, sprite);
+    return MovementAction_JumpLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_806226C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7291,15 +7321,15 @@ bool8 sub_806226C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80622C4(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpRight_Step1(struct MapObject *mapObject, struct Sprite *sprite);
 
-bool8 sub_8062298(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_EAST, 1, 2);
-    return sub_80622C4(mapObject, sprite);
+    return MovementAction_JumpRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_80622C4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7310,15 +7340,15 @@ bool8 sub_80622C4(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806231C(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceDown_Step1(struct MapObject *mapObject, struct Sprite *sprite);
 
-bool8 sub_80622F0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_SOUTH, 0, 0);
-    return sub_806231C(mapObject, sprite);
+    return MovementAction_JumpInPlaceDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_806231C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7329,15 +7359,15 @@ bool8 sub_806231C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062374(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceUp_Step1(struct MapObject *mapObject, struct Sprite *sprite);
 
-bool8 sub_8062348(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_NORTH, 0, 0);
-    return sub_8062374(mapObject, sprite);
+    return MovementAction_JumpInPlaceUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062374(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7348,15 +7378,15 @@ bool8 sub_8062374(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80623CC(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite);
 
-bool8 sub_80623A0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_WEST, 0, 0);
-    return sub_80623CC(mapObject, sprite);
+    return MovementAction_JumpInPlaceLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_80623CC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7367,15 +7397,15 @@ bool8 sub_80623CC(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062424(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceRight_Step1(struct MapObject *mapObject, struct Sprite *sprite);
 
-bool8 sub_80623F8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_EAST, 0, 0);
-    return sub_8062424(mapObject, sprite);
+    return MovementAction_JumpInPlaceRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062424(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7386,15 +7416,15 @@ bool8 sub_8062424(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806247C(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceDownUp_Step1(struct MapObject *mapObject, struct Sprite *sprite);
 
-bool8 sub_8062450(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceDownUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_SOUTH, 0, 2);
-    return sub_806247C(mapObject, sprite);
+    return MovementAction_JumpInPlaceDownUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_806247C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceDownUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061358(mapObject, sprite))
     {
@@ -7405,15 +7435,15 @@ bool8 sub_806247C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80624D4(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceUpDown_Step1(struct MapObject *mapObject, struct Sprite *sprite);
 
-bool8 sub_80624A8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceUpDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_NORTH, 0, 2);
-    return sub_80624D4(mapObject, sprite);
+    return MovementAction_JumpInPlaceUpDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_80624D4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceUpDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061358(mapObject, sprite))
     {
@@ -7424,15 +7454,15 @@ bool8 sub_80624D4(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806252C(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct MapObject *mapObject, struct Sprite *sprite);
 
-bool8 sub_8062500(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceLeftRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_WEST, 0, 2);
-    return sub_806252C(mapObject, sprite);
+    return MovementAction_JumpInPlaceLeftRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_806252C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061358(mapObject, sprite))
     {
@@ -7443,15 +7473,15 @@ bool8 sub_806252C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062584(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite);
 
-bool8 sub_8062558(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceRightLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     maybe_shadow_1(mapObject, sprite, DIR_EAST, 0, 2);
-    return sub_8062584(mapObject, sprite);
+    return MovementAction_JumpInPlaceRightLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062584(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061358(mapObject, sprite))
     {
@@ -7462,77 +7492,77 @@ bool8 sub_8062584(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80625B0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_FaceOriginalDirection_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FaceDirection(mapObject, sprite, gInitialMovementTypeFacingDirections[mapObject->movementType]);
     return TRUE;
 }
 
-bool8 sub_80625C8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_NurseJoyBowDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, 0x14);
+    StartSpriteAnimInDirection(mapObject, sprite, DIR_SOUTH, 0x14);
     return FALSE;
 }
 
-bool8 sub_80625D8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->disableJumpLandingGroundEffect = 0;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_80625E8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->disableJumpLandingGroundEffect = 1;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_80625F8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_DisableAnimation_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->inanimate = 1;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8062608(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RestoreAnimation_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->inanimate = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8062634(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SetInvisible_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->invisible = 1;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8062644(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SetVisible_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->invisible = 0;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_EmoteExclamationMark_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON);
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_EmoteQuestionMark_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2);
+    FieldEffectStart(FLDEFF_QUESTION_MARK_ICON);
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_EmoteHeart_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_HEART_ICON);
@@ -7540,9 +7570,9 @@ bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite)
     return TRUE;
 }
 
-bool8 sub_8062704(struct MapObject *, struct Sprite *);
+bool8 MovementAction_RevealTrainer_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_80626C0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RevealTrainer_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (mapObject->movementType == MOVEMENT_TYPE_HIDDEN)
     {
@@ -7558,11 +7588,11 @@ bool8 sub_80626C0(struct MapObject *mapObject, struct Sprite *sprite)
     {
         sub_812869C(mapObject);
         sprite->data[2] = 1;
-        return sub_8062704(mapObject, sprite);
+        return MovementAction_RevealTrainer_Step1(mapObject, sprite);
     }
 }
 
-bool8 sub_8062704(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RevealTrainer_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_81286C4(mapObject))
     {
@@ -7572,14 +7602,14 @@ bool8 sub_8062704(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062724(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RockSmashBreak_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    obj_anim_image_set_and_seek(sprite, 1, 0);
+    SetAndStartSpriteAnim(sprite, 1, 0);
     sprite->data[2] = 1;
     return FALSE;
 }
 
-bool8 sub_8062740(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RockSmashBreak_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (SpriteAnimEnded(sprite))
     {
@@ -7589,7 +7619,7 @@ bool8 sub_8062740(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062764(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RockSmashBreak_Step2(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->invisible ^= 1;
     if (WaitForMovementDelay(sprite))
@@ -7600,14 +7630,14 @@ bool8 sub_8062764(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80627A0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_CutTree_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    obj_anim_image_set_and_seek(sprite, 1, 0);
+    SetAndStartSpriteAnim(sprite, 1, 0);
     sprite->data[2] = 1;
     return FALSE;
 }
 
-bool8 sub_80627BC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_CutTree_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (SpriteAnimEnded(sprite))
     {
@@ -7617,7 +7647,7 @@ bool8 sub_80627BC(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80627E0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_CutTree_Step2(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->invisible ^= 1;
     if (WaitForMovementDelay(sprite))
@@ -7628,48 +7658,48 @@ bool8 sub_80627E0(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806281C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SetFixedPriority_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->fixedPriority = 1;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_806282C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_ClearFixedPriority_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->fixedPriority = 0;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_806283C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_InitAffineAnim_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sprite->oam.affineMode = 3;
+    sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
     InitSpriteAffineAnim(sprite);
     sprite->affineAnimPaused = 1;
     sprite->subspriteMode = 0;
     return TRUE;
 }
 
-bool8 sub_806286C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_ClearAffineAnim_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FreeOamMatrix(sprite->oam.matrixNum);
-    sprite->oam.affineMode = 0;
+    sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
     CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
     return TRUE;
 }
 
-bool8 sub_80628D0(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkDownAffine0_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_806289C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownAffine0_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8060ED8(mapObject, sprite, DIR_SOUTH);
     sprite->affineAnimPaused = 0;
     StartSpriteAffineAnimIfDifferent(sprite, 0);
-    return sub_80628D0(mapObject, sprite);
+    return MovementAction_WalkDownAffine0_Step1(mapObject, sprite);
 }
 
-bool8 sub_80628D0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownAffine0_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (an_walk_any_2(mapObject, sprite))
     {
@@ -7680,17 +7710,17 @@ bool8 sub_80628D0(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062930(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkDownAffine1_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_80628FC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownAffine1_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8060ED8(mapObject, sprite, DIR_SOUTH);
     sprite->affineAnimPaused = 0;
     ChangeSpriteAffineAnimIfDifferent(sprite, 1);
-    return sub_8062930(mapObject, sprite);
+    return MovementAction_WalkDownAffine1_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062930(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownAffine1_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (an_walk_any_2(mapObject, sprite))
     {
@@ -7710,99 +7740,99 @@ void sub_806295C(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     sprite->data[2] = 1;
 }
 
-bool8 sub_806299C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieFaceDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_806295C(mapObject, sprite, DIR_SOUTH);
     return TRUE;
 }
 
-bool8 sub_80629AC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieFaceUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_806295C(mapObject, sprite, DIR_NORTH);
     return TRUE;
 }
 
-bool8 sub_80629BC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_806295C(mapObject, sprite, DIR_WEST);
     return TRUE;
 }
 
-bool8 sub_80629CC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieFaceRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_806295C(mapObject, sprite, DIR_EAST);
     return TRUE;
 }
 
-bool8 sub_80629DC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, GetWalkFastMovementAction_Extended2(DIR_SOUTH));
+    StartSpriteAnimInDirection(mapObject, sprite, DIR_SOUTH, GetWalkFastMovementAction_Extended2(DIR_SOUTH));
     return FALSE;
 }
 
-bool8 sub_8062A00(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_NORTH, GetWalkFastMovementAction_Extended2(DIR_NORTH));
+    StartSpriteAnimInDirection(mapObject, sprite, DIR_NORTH, GetWalkFastMovementAction_Extended2(DIR_NORTH));
     return FALSE;
 }
 
-bool8 sub_8062A24(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_WEST, GetWalkFastMovementAction_Extended2(DIR_WEST));
+    StartSpriteAnimInDirection(mapObject, sprite, DIR_WEST, GetWalkFastMovementAction_Extended2(DIR_WEST));
     return FALSE;
 }
 
-bool8 sub_8062A48(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_EAST, GetWalkFastMovementAction_Extended2(DIR_EAST));
+    StartSpriteAnimInDirection(mapObject, sprite, DIR_EAST, GetWalkFastMovementAction_Extended2(DIR_EAST));
     return FALSE;
 }
 
-bool8 sub_8062A6C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroBumpFaceDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, sub_805FDB8(DIR_SOUTH));
+    StartSpriteAnimInDirection(mapObject, sprite, DIR_SOUTH, sub_805FDB8(DIR_SOUTH));
     return FALSE;
 }
 
-bool8 sub_8062A90(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroBumpFaceUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_NORTH, sub_805FDB8(DIR_NORTH));
+    StartSpriteAnimInDirection(mapObject, sprite, DIR_NORTH, sub_805FDB8(DIR_NORTH));
     return FALSE;
 }
 
-bool8 sub_8062AB4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroBumpFaceLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_WEST, sub_805FDB8(DIR_WEST));
+    StartSpriteAnimInDirection(mapObject, sprite, DIR_WEST, sub_805FDB8(DIR_WEST));
     return FALSE;
 }
 
-bool8 sub_8062AD8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroBumpFaceRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_EAST, sub_805FDB8(DIR_EAST));
+    StartSpriteAnimInDirection(mapObject, sprite, DIR_EAST, sub_805FDB8(DIR_EAST));
     return FALSE;
 }
 
 bool8 sub_8062AFC(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, sub_805FDC8(DIR_SOUTH));
+    StartSpriteAnimInDirection(mapObject, sprite, DIR_SOUTH, sub_805FDC8(DIR_SOUTH));
     return FALSE;
 }
 
 bool8 sub_8062B20(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_NORTH, sub_805FDC8(DIR_NORTH));
+    StartSpriteAnimInDirection(mapObject, sprite, DIR_NORTH, sub_805FDC8(DIR_NORTH));
     return FALSE;
 }
 
 bool8 sub_8062B44(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_WEST, sub_805FDC8(DIR_WEST));
+    StartSpriteAnimInDirection(mapObject, sprite, DIR_WEST, sub_805FDC8(DIR_WEST));
     return FALSE;
 }
 
 bool8 sub_8062B68(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_EAST, sub_805FDC8(DIR_EAST));
+    StartSpriteAnimInDirection(mapObject, sprite, DIR_EAST, sub_805FDC8(DIR_EAST));
     return FALSE;
 }
 
@@ -7813,15 +7843,15 @@ void sub_8062B8C(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     DoShadowFieldEffect(mapObject);
 }
 
-bool8 sub_8062BFC(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8062BD0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8062B8C(mapObject, sprite, DIR_SOUTH, 0, 1);
-    return sub_8062BFC(mapObject, sprite);
+    return MovementAction_AcroWheelieHopFaceDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062BFC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7832,15 +7862,15 @@ bool8 sub_8062BFC(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062C54(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8062C28(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8062B8C(mapObject, sprite, DIR_NORTH, 0, 1);
-    return sub_8062C54(mapObject, sprite);
+    return MovementAction_AcroWheelieHopFaceUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062C54(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7851,15 +7881,15 @@ bool8 sub_8062C54(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062CAC(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8062C80(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8062B8C(mapObject, sprite, DIR_WEST, 0, 1);
-    return sub_8062CAC(mapObject, sprite);
+    return MovementAction_AcroWheelieHopFaceLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062CAC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7870,15 +7900,15 @@ bool8 sub_8062CAC(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062D04(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8062CD8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8062B8C(mapObject, sprite, DIR_EAST, 0, 1);
-    return sub_8062D04(mapObject, sprite);
+    return MovementAction_AcroWheelieHopFaceRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062D04(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7889,15 +7919,15 @@ bool8 sub_8062D04(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062D5C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopDown_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8062D30(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8062B8C(mapObject, sprite, DIR_SOUTH, 1, 1);
-    return sub_8062D5C(mapObject, sprite);
+    return MovementAction_AcroWheelieHopDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062D5C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7908,15 +7938,15 @@ bool8 sub_8062D5C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062DB4(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopUp_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8062D88(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8062B8C(mapObject, sprite, DIR_NORTH, 1, 1);
-    return sub_8062DB4(mapObject, sprite);
+    return MovementAction_AcroWheelieHopUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062DB4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7927,15 +7957,15 @@ bool8 sub_8062DB4(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062E0C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopLeft_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8062DE0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8062B8C(mapObject, sprite, DIR_WEST, 1, 1);
-    return sub_8062E0C(mapObject, sprite);
+    return MovementAction_AcroWheelieHopLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062E0C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7946,15 +7976,15 @@ bool8 sub_8062E0C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062E64(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopRight_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8062E38(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8062B8C(mapObject, sprite, DIR_EAST, 1, 1);
-    return sub_8062E64(mapObject, sprite);
+    return MovementAction_AcroWheelieHopRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062E64(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7965,15 +7995,15 @@ bool8 sub_8062E64(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062EBC(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieJumpDown_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8062E90(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8062B8C(mapObject, sprite, DIR_SOUTH, 2, 0);
-    return sub_8062EBC(mapObject, sprite);
+    return MovementAction_AcroWheelieJumpDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062EBC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -7984,15 +8014,15 @@ bool8 sub_8062EBC(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062F14(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieJumpUp_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8062EE8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8062B8C(mapObject, sprite, DIR_NORTH, 2, 0);
-    return sub_8062F14(mapObject, sprite);
+    return MovementAction_AcroWheelieJumpUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062F14(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -8003,15 +8033,15 @@ bool8 sub_8062F14(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062F6C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8062F40(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8062B8C(mapObject, sprite, DIR_WEST, 2, 0);
-    return sub_8062F6C(mapObject, sprite);
+    return MovementAction_AcroWheelieJumpLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062F6C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -8022,15 +8052,15 @@ bool8 sub_8062F6C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062FC4(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieJumpRight_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8062F98(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8062B8C(mapObject, sprite, DIR_EAST, 2, 0);
-    return sub_8062FC4(mapObject, sprite);
+    return MovementAction_AcroWheelieJumpRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_8062FC4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061328(mapObject, sprite))
     {
@@ -8041,25 +8071,25 @@ bool8 sub_8062FC4(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062FF0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_80616CC(mapObject, sprite, DIR_SOUTH, sub_805FDD8(DIR_SOUTH), 8);
     return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_8063028(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_80616CC(mapObject, sprite, DIR_NORTH, sub_805FDD8(DIR_NORTH), 8);
     return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_8063060(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_80616CC(mapObject, sprite, DIR_WEST, sub_805FDD8(DIR_WEST), 8);
     return MovementAction_WalkInPlace_Step1(mapObject, sprite);
 }
 
-bool8 sub_8063098(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_80616CC(mapObject, sprite, DIR_EAST, sub_805FDD8(DIR_EAST), 8);
     return MovementAction_WalkInPlace_Step1(mapObject, sprite);
@@ -8072,15 +8102,15 @@ void sub_80630D0(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     SeekSpriteAnim(sprite, 0);
 }
 
-bool8 sub_8063128(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8063108(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_80630D0(mapObject, sprite, DIR_SOUTH, 1);
-    return sub_8063128(mapObject, sprite);
+    return MovementAction_AcroPopWheelieMoveDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_8063128(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -8090,15 +8120,15 @@ bool8 sub_8063128(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8063168(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8063148(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_80630D0(mapObject, sprite, DIR_NORTH, 1);
-    return sub_8063168(mapObject, sprite);
+    return MovementAction_AcroPopWheelieMoveUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_8063168(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -8108,15 +8138,15 @@ bool8 sub_8063168(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80631A8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8063188(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_80630D0(mapObject, sprite, DIR_WEST, 1);
-    return sub_80631A8(mapObject, sprite);
+    return MovementAction_AcroPopWheelieMoveLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_80631A8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -8126,15 +8156,15 @@ bool8 sub_80631A8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80631E8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_80631C8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_80630D0(mapObject, sprite, DIR_EAST, 1);
-    return sub_80631E8(mapObject, sprite);
+    return MovementAction_AcroPopWheelieMoveRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_80631E8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -8150,15 +8180,15 @@ void sub_8063208(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     sub_805FE28(mapObject, sprite, sub_805FDD8(mapObject->facingDirection));
 }
 
-bool8 sub_8063258(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieMoveDown_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8063238(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8063208(mapObject, sprite, DIR_SOUTH, 1);
-    return sub_8063258(mapObject, sprite);
+    return MovementAction_AcroWheelieMoveDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_8063258(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -8168,15 +8198,15 @@ bool8 sub_8063258(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8063298(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieMoveUp_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8063278(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8063208(mapObject, sprite, DIR_NORTH, 1);
-    return sub_8063298(mapObject, sprite);
+    return MovementAction_AcroWheelieMoveUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_8063298(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -8186,15 +8216,15 @@ bool8 sub_8063298(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80632D8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_80632B8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8063208(mapObject, sprite, DIR_WEST, 1);
-    return sub_80632D8(mapObject, sprite);
+    return MovementAction_AcroWheelieMoveLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_80632D8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -8204,15 +8234,15 @@ bool8 sub_80632D8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8063318(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieMoveRight_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_80632F8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8063208(mapObject, sprite, DIR_EAST, 1);
-    return sub_8063318(mapObject, sprite);
+    return MovementAction_AcroWheelieMoveRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_8063318(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -8229,15 +8259,15 @@ void sub_8063338(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     SeekSpriteAnim(sprite, 0);
 }
 
-bool8 sub_8063390(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroBumpMoveDown_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8063370(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroBumpMoveDown_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8063338(mapObject, sprite, DIR_SOUTH, 1);
-    return sub_8063390(mapObject, sprite);
+    return MovementAction_AcroBumpMoveDown_Step1(mapObject, sprite);
 }
 
-bool8 sub_8063390(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroBumpMoveDown_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -8247,15 +8277,15 @@ bool8 sub_8063390(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80633D0(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroBumpMoveUp_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_80633B0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroBumpMoveUp_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8063338(mapObject, sprite, DIR_NORTH, 1);
-    return sub_80633D0(mapObject, sprite);
+    return MovementAction_AcroBumpMoveUp_Step1(mapObject, sprite);
 }
 
-bool8 sub_80633D0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroBumpMoveUp_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -8265,15 +8295,15 @@ bool8 sub_80633D0(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8063410(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroBumpMoveLeft_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_80633F0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroBumpMoveLeft_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8063338(mapObject, sprite, DIR_WEST, 1);
-    return sub_8063410(mapObject, sprite);
+    return MovementAction_AcroBumpMoveLeft_Step1(mapObject, sprite);
 }
 
-bool8 sub_8063410(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroBumpMoveLeft_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -8283,15 +8313,15 @@ bool8 sub_8063410(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8063450(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroBumpMoveRight_Step1(struct MapObject *, struct Sprite *);
 
-bool8 sub_8063430(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroBumpMoveRight_Step0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8063338(mapObject, sprite, DIR_EAST, 1);
-    return sub_8063450(mapObject, sprite);
+    return MovementAction_AcroBumpMoveRight_Step1(mapObject, sprite);
 }
 
-bool8 sub_8063450(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroBumpMoveRight_Step1(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
@@ -9563,7 +9593,7 @@ static bool8 WaitForMovementDelay(struct Sprite *sprite)
         return FALSE;
 }
 
-void obj_anim_image_set_and_seek(struct Sprite *sprite, u8 a2, u8 a3)
+void SetAndStartSpriteAnim(struct Sprite *sprite, u8 a2, u8 a3)
 {
     sprite->animNum = a2;
     sprite->animPaused = 0 ;
diff --git a/src/field_effect.c b/src/field_effect.c
index 02b42c6f7..bf8324d9a 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2861,7 +2861,7 @@ void sub_8088A78(struct Task *task)
         mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
         sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
         FieldObjectClearHeldMovementIfFinished(mapObject);
-        FieldObjectSetHeldMovement(mapObject, sub_80608D0(mapObject->movementDirection));
+        FieldObjectSetHeldMovement(mapObject, GetJumpSpecialMovementAction(mapObject->movementDirection));
         gFieldEffectArguments[0] = task->data[1];
         gFieldEffectArguments[1] = task->data[2];
         gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId;
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 26e43eb28..df9e5a47e 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -1364,7 +1364,7 @@ void sub_812869C(struct MapObject *mapObject)
 {
     if (mapObject->directionSequenceIndex == 1)
     {
-        gSprites[mapObject->fieldEffectSpriteId].data[0] ++;
+        gSprites[mapObject->fieldEffectSpriteId].data[0]++;
     }
 }
 
@@ -1384,7 +1384,7 @@ bool8 sub_81286C4(struct MapObject *mapObject)
     if (sprite->data[7])
     {
         mapObject->directionSequenceIndex = 2;
-        sprite->data[0] ++;
+        sprite->data[0]++;
         return TRUE;
     }
     return FALSE;
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 521a5f80b..39dce3fdb 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -796,7 +796,7 @@ void PlayerGoSpeed4(u8 a)
 
 void sub_805940C(u8 a)
 {
-    PlayerSetAnimId(sub_80607F4(a), 2);
+    PlayerSetAnimId(GetPlayerRunMovementAction(a), 2);
 }
 
 void PlayerOnBikeCollide(u8 a)
@@ -879,7 +879,7 @@ void PlayerLedgeHoppingWheelie(u8 a)
 void PlayerAcroTurnJump(u8 direction)
 {
     PlaySE(SE_JITE_PYOKO);
-    PlayerSetAnimId(sub_8060878(direction), 1);
+    PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1);
 }
 
 void sub_80595DC(u8 direction)
@@ -1291,7 +1291,7 @@ u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct MapObject *mapObje
     if (FieldObjectClearHeldMovementIfFinished(mapObject))
     {
         PlaySE(SE_DANSA);
-        FieldObjectSetHeldMovement(mapObject, sub_806084C(mapObject->facingDirection));
+        FieldObjectSetHeldMovement(mapObject, GetJumpInPlaceMovementAction(mapObject->facingDirection));
         task->data[1]++;
         if (task->data[1] > 1)
         {
@@ -1402,7 +1402,7 @@ static void taskFF_0805D1D4(u8 taskId)
             return;
     }
     sub_8127ED0(playerMapObj->fieldEffectSpriteId, 2);
-    FieldObjectSetHeldMovement(playerMapObj, sub_80608D0((u8)gTasks[taskId].data[0]));
+    FieldObjectSetHeldMovement(playerMapObj, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0]));
     gTasks[taskId].func = sub_805A2D0;
 }
 
diff --git a/src/rom6.c b/src/rom6.c
index c5c77fd39..3a31f3145 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -91,7 +91,7 @@ static void sub_810B3DC(u8 taskId)
 
 static void sub_810B428(u8 taskId)
 {
-    if (!FieldEffectActiveListContains(6))
+    if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
         gFieldEffectArguments[1] = GetPlayerFacingDirection();
         if (gFieldEffectArguments[1] == 1)
diff --git a/src/trainer_see.c b/src/trainer_see.c
index ff074d7b7..9d98d067b 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -264,7 +264,7 @@ static bool8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainer
     u8 direction;
 
     FieldObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON);
     direction = GetFaceDirectionMovementAction(trainerObj->facingDirection);
     FieldObjectSetHeldMovement(trainerObj, direction);
     task->data[0]++;
@@ -273,7 +273,7 @@ static bool8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainer
 
 static bool8 sub_80843DC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
-    if (FieldEffectActiveListContains(0))
+    if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON))
     {
         return FALSE;
     }
@@ -342,7 +342,7 @@ static bool8 sub_8084578(u8 taskId, struct Task *task, struct MapObject *trainer
     if (!FieldObjectIsMovementOverridden(trainerObj)
      || FieldObjectClearHeldMovementIfFinished(trainerObj))
     {
-        FieldObjectSetHeldMovement(trainerObj, 0x59);
+        FieldObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER);
         task->data[0]++;
     }
     return FALSE;
@@ -361,7 +361,7 @@ static bool8 sub_80845C8(u8 taskId, struct Task *task, struct MapObject *trainer
     if (!FieldObjectIsMovementOverridden(trainerObj)
      || FieldObjectClearHeldMovementIfFinished(trainerObj))
     {
-        FieldObjectSetHeldMovement(trainerObj, 0x3E);
+        FieldObjectSetHeldMovement(trainerObj, MOVEMENT_ACITON_FACE_PLAYER);
         task->data[0]++;
     }
     return FALSE;
@@ -393,7 +393,7 @@ static bool8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainer
         sprite = &gSprites[trainerObj->spriteId];
         sprite->oam.priority = 2;
         FieldObjectClearHeldMovementIfFinished(trainerObj);
-        FieldObjectSetHeldMovement(trainerObj, sub_806084C(trainerObj->facingDirection));
+        FieldObjectSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection));
         task->data[0]++;
     }
     return FALSE;
@@ -401,7 +401,7 @@ static bool8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainer
 
 static bool8 sub_80846C8(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
-    if (!FieldEffectActiveListContains(49))
+    if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
         task->data[0] = 3;
 
     return FALSE;
@@ -428,7 +428,7 @@ void sub_80846E4(u8 taskId)
         task->data[7]++;
     }
     gTrainerSeeFuncList2[task->data[0]](taskId, task, mapObj);
-    if (task->data[0] == 3 && !FieldEffectActiveListContains(49))
+    if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
     {
         npc_set_running_behaviour_etc(mapObj, npc_running_behaviour_by_direction(mapObj->facingDirection));
         sub_805C774(mapObj, npc_running_behaviour_by_direction(mapObj->facingDirection));
@@ -493,7 +493,7 @@ static const struct SpriteTemplate gSpriteTemplate_839B528 = {
     0xffff, 4100, &gOamData_839B4D8, gSpriteAnimTable_839B508, gSpriteImageTable_839B4F0, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably
 };
 
-u8 FldEff_ExclamationMarkIcon1(void)
+u8 FldEff_ExclamationMarkIcon(void)
 {
     u8 spriteId = CreateSpriteAtEnd(&gSpriteTemplate_839B510, 0, 0, 0x53);
 
@@ -503,7 +503,7 @@ u8 FldEff_ExclamationMarkIcon1(void)
     return 0;
 }
 
-u8 FldEff_ExclamationMarkIcon2(void)
+u8 FldEff_QuestionMarkIcon(void)
 {
     u8 spriteId = CreateSpriteAtEnd(&gSpriteTemplate_839B510, 0, 0, 0x52);