1 files changed, 2 insertions, 95 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index a399ddf5e..42e203ada 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -95,101 +95,6 @@ static u8 sub_8063304(struct ObjectEvent *, struct Sprite *);
 static u8 sub_8063324(struct ObjectEvent *, struct Sprite *);
 static u8 sub_8063344(struct ObjectEvent *, struct Sprite *);
 static void sub_8064544(struct ObjectEvent *, struct Sprite *);
-u8 MovementActionFunc_x9B_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementActionFunc_x9C_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementActionFunc_x9D_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementActionFunc_x9E_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementActionFunc_x08_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementActionFunc_x09_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementActionFunc_x0A_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementActionFunc_x0B_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementActionFunc_x0D_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementActionFunc_x0C_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementActionFunc_x0E_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementActionFunc_x0F_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_WalkNormalDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_WalkNormalUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_WalkNormalLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_WalkNormalRight_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_Jump2Down_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_Jump2Up_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_Jump2Left_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_Jump2Right_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_WalkFastDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_WalkFastUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_WalkFastLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_WalkFastRight_Step1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_xA0_1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_xA1_1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_xA2_1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_xA3_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_RideWaterCurrentDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_RideWaterCurrentUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_SlideDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_SlideUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_SlideLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_SlideRight_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_PlayerRunDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_PlayerRunUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_PlayerRunLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_PlayerRunRight_Step1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_x41_1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_x42_1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_x43_1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_x44_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpSpecialDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpSpecialUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpSpecialLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpSpecialRight_Step1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_xA6_1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_xA7_1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_xA8_1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_xA9_1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpRight_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpInPlaceDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpInPlaceUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpInPlaceLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpInPlaceRight_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpInPlaceDownUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpInPlaceUpDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpInPlaceLeftRight_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_JumpInPlaceRightLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_WalkDownStartAffine_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_WalkDownAffine_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieHopFaceDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieHopFaceUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieHopFaceRight_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieHopDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieHopUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieHopLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieHopRight_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieJumpDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieJumpUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieJumpLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroPopWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroPopWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroPopWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *);
-u8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *);;
-bool8 MovementActionFunc_x94_1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_x95_1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_x96_1(struct ObjectEvent *, struct Sprite *);
-bool8 MovementActionFunc_x97_1(struct ObjectEvent *, struct Sprite *);
 static void DoObjectUnionRoomWarpYDisplacement(struct Sprite * sprite);
 
 #define movement_type_def(setup, table)                                                          \
@@ -386,6 +291,8 @@ extern const s16 gUnknown_83A695E[3];
 
 #define OBJ_EVENT_PAL_TAG_NONE 0x11FF
 
+#include "data/object_events/movement_action_func_tables.h"
+
 static void ClearObjectEvent(struct ObjectEvent *objectEvent)
 {
     *objectEvent = (struct ObjectEvent){};