summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/data/object_events/movement_action_func_tables.h8
-rw-r--r--src/event_object_movement.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/data/object_events/movement_action_func_tables.h b/src/data/object_events/movement_action_func_tables.h
index 729b4fe23..aa55c31ef 100755
--- a/src/data/object_events/movement_action_func_tables.h
+++ b/src/data/object_events/movement_action_func_tables.h
@@ -602,14 +602,6 @@ u8 (*const gMovementActionFuncs_FaceRight[])(struct ObjectEvent *, struct Sprite
MovementAction_PauseSpriteAnim,
};
-enum {
- MOVE_SPEED_NORMAL, // walking
- MOVE_SPEED_FAST_1, // running / surfing / sliding (ice tile)
- MOVE_SPEED_FAST_2, // water current / acro bike
- MOVE_SPEED_FASTER, // mach bike's max speed
- MOVE_SPEED_FASTEST,
-};
-
static u8 (*const sDirectionAnimFuncsBySpeed[])(u8) = {
[MOVE_SPEED_NORMAL] = GetMoveDirectionAnimNum,
[MOVE_SPEED_FAST_1] = GetMoveDirectionFastAnimNum,
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index cddad9aa0..1bb4991ab 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -32,6 +32,14 @@
// this file was known as evobjmv.c in Game Freak's original source
+enum {
+ MOVE_SPEED_NORMAL, // walking
+ MOVE_SPEED_FAST_1, // running / surfing / sliding (ice tile)
+ MOVE_SPEED_FAST_2, // water current / acro bike
+ MOVE_SPEED_FASTER, // mach bike's max speed
+ MOVE_SPEED_FASTEST,
+};
+
// Sprite data used throughout
#define sObjEventId data[0]
#define sTypeFuncId data[1] // Index into corresponding gMovementTypeFuncs_* table