diff options
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/object_events/movement_action_func_tables.h | 42 | ||||
| -rw-r--r-- | src/data/object_events/movement_type_func_tables.h | 6 |
2 files changed, 24 insertions, 24 deletions
diff --git a/src/data/object_events/movement_action_func_tables.h b/src/data/object_events/movement_action_func_tables.h index b91cd8284..e55687c03 100644 --- a/src/data/object_events/movement_action_func_tables.h +++ b/src/data/object_events/movement_action_func_tables.h @@ -471,10 +471,10 @@ bool8 (*const *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite [MOVEMENT_ACTION_FACE_UP_FAST] = sMovementActionFuncs_x05, [MOVEMENT_ACTION_FACE_LEFT_FAST] = sMovementActionFuncs_x06, [MOVEMENT_ACTION_FACE_RIGHT_FAST] = sMovementActionFuncs_x07, - [MOVEMENT_ACTION_WALK_SLOWEST_DOWN] = sMovementActionFuncs_x08, - [MOVEMENT_ACTION_WALK_SLOWEST_UP] = sMovementActionFuncs_x09, - [MOVEMENT_ACTION_WALK_SLOWEST_LEFT] = sMovementActionFuncs_x0A, - [MOVEMENT_ACTION_WALK_SLOWEST_RIGHT] = sMovementActionFuncs_x0B, + [MOVEMENT_ACTION_WALK_SLOWER_DOWN] = sMovementActionFuncs_x08, + [MOVEMENT_ACTION_WALK_SLOWER_UP] = sMovementActionFuncs_x09, + [MOVEMENT_ACTION_WALK_SLOWER_LEFT] = sMovementActionFuncs_x0A, + [MOVEMENT_ACTION_WALK_SLOWER_RIGHT] = sMovementActionFuncs_x0B, [MOVEMENT_ACTION_WALK_SLOW_DOWN] = sMovementActionFuncs_x0C, [MOVEMENT_ACTION_WALK_SLOW_UP] = sMovementActionFuncs_x0D, [MOVEMENT_ACTION_WALK_SLOW_LEFT] = sMovementActionFuncs_x0E, @@ -512,10 +512,10 @@ bool8 (*const *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP] = sMovementActionFuncs_x2E, [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT] = sMovementActionFuncs_x2F, [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT] = sMovementActionFuncs_x30, - [MOVEMENT_ACTION_FACE_DOWN_SLOW] = sMovementActionFuncs_x31, - [MOVEMENT_ACTION_FACE_UP_SLOW] = sMovementActionFuncs_x32, - [MOVEMENT_ACTION_FACE_LEFT_SLOW] = sMovementActionFuncs_x33, - [MOVEMENT_ACTION_FACE_RIGHT_SLOW] = sMovementActionFuncs_x34, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN] = sMovementActionFuncs_x31, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP] = sMovementActionFuncs_x32, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT] = sMovementActionFuncs_x33, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT] = sMovementActionFuncs_x34, [MOVEMENT_ACTION_WALK_FASTEST_DOWN] = sMovementActionFuncs_x35, [MOVEMENT_ACTION_WALK_FASTEST_UP] = sMovementActionFuncs_x36, [MOVEMENT_ACTION_WALK_FASTEST_LEFT] = sMovementActionFuncs_x37, @@ -611,28 +611,28 @@ bool8 (*const *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP] = sMovementActionFuncs_x91, [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT] = sMovementActionFuncs_x92, [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT] = sMovementActionFuncs_x93, - [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN] = sMovementActionFuncs_x94, - [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP] = sMovementActionFuncs_x95, - [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT] = sMovementActionFuncs_x96, - [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT] = sMovementActionFuncs_x97, + [MOVEMENT_ACTION_SPIN_DOWN] = sMovementActionFuncs_x94, + [MOVEMENT_ACTION_SPIN_UP] = sMovementActionFuncs_x95, + [MOVEMENT_ACTION_SPIN_LEFT] = sMovementActionFuncs_x96, + [MOVEMENT_ACTION_SPIN_RIGHT] = sMovementActionFuncs_x97, [MOVEMENT_ACTION_0x98] = sMovementActionFuncs_x98, [MOVEMENT_ACTION_0x99] = sMovementActionFuncs_x99, [MOVEMENT_ACTION_0x9A] = sMovementActionFuncs_x9A, - [MOVEMENT_ACTION_0x9B] = sMovementActionFuncs_x9B, - [MOVEMENT_ACTION_0x9C] = sMovementActionFuncs_x9C, - [MOVEMENT_ACTION_0x9D] = sMovementActionFuncs_x9D, - [MOVEMENT_ACTION_0x9E] = sMovementActionFuncs_x9E, - [MOVEMENT_ACTION_0x9F] = sMovementActionFuncs_x9F, + [MOVEMENT_ACTION_WALK_SLOWEST_DOWN] = sMovementActionFuncs_x9B, + [MOVEMENT_ACTION_WALK_SLOWEST_UP] = sMovementActionFuncs_x9C, + [MOVEMENT_ACTION_WALK_SLOWEST_LEFT] = sMovementActionFuncs_x9D, + [MOVEMENT_ACTION_WALK_SLOWEST_RIGHT] = sMovementActionFuncs_x9E, + [MOVEMENT_ACTION_SHAKE_HEAD] = sMovementActionFuncs_x9F, [MOVEMENT_ACTION_0xA0] = sMovementActionFuncs_xA0, [MOVEMENT_ACTION_0xA1] = sMovementActionFuncs_xA1, [MOVEMENT_ACTION_0xA2] = sMovementActionFuncs_xA2, [MOVEMENT_ACTION_0xA3] = sMovementActionFuncs_xA3, [MOVEMENT_ACTION_FLY_UP] = sMovementActionFuncs_xA4, [MOVEMENT_ACTION_FLY_DOWN] = sMovementActionFuncs_xA5, - [MOVEMENT_ACTION_0xA6] = sMovementActionFuncs_xA6, - [MOVEMENT_ACTION_0xA7] = sMovementActionFuncs_xA7, - [MOVEMENT_ACTION_0xA8] = sMovementActionFuncs_xA8, - [MOVEMENT_ACTION_0xA9] = sMovementActionFuncs_xA9, + [MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_DOWN] = sMovementActionFuncs_xA6, + [MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_UP] = sMovementActionFuncs_xA7, + [MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_LEFT] = sMovementActionFuncs_xA8, + [MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_RIGHT] = sMovementActionFuncs_xA9, }; static bool8 (*const sMovementActionFuncs_x00[])(struct ObjectEvent *, struct Sprite *) = { diff --git a/src/data/object_events/movement_type_func_tables.h b/src/data/object_events/movement_type_func_tables.h index 572a9b390..627d1bc51 100644 --- a/src/data/object_events/movement_type_func_tables.h +++ b/src/data/object_events/movement_type_func_tables.h @@ -4,7 +4,7 @@ static bool8 MovementType_WanderAround_Step2(struct ObjectEvent *objectEvent, st static bool8 MovementType_WanderAround_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite); static bool8 MovementType_WanderAround_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite); static bool8 MovementType_WanderAround_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite); -static bool8 MovementType_WanderAround_Step5Slowest(struct ObjectEvent *objectEvent, struct Sprite *sprite); +static bool8 MovementType_WanderAround_Step5Slower(struct ObjectEvent *objectEvent, struct Sprite *sprite); static bool8 MovementType_WanderAround_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite); static bool8 MovementType_LookAround_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite); static bool8 MovementType_LookAround_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); @@ -170,13 +170,13 @@ u8 (*const gMovementTypeFuncs_WanderAround[])(struct ObjectEvent *, struct Sprit MovementType_WanderAround_Step6, }; -u8 (*const gMovementTypeFuncs_WanderAroundSlowest[])(struct ObjectEvent *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WanderAroundSlower[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WanderAround_Step0, MovementType_WanderAround_Step1, MovementType_WanderAround_Step2, MovementType_WanderAround_Step3, MovementType_WanderAround_Step4, - MovementType_WanderAround_Step5Slowest, + MovementType_WanderAround_Step5Slower, MovementType_WanderAround_Step6, }; |