diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-27 23:37:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-27 23:37:50 -0500 |
| commit | 01859a63ff4ce9043bb51dd95dd81b89171e5c11 (patch) | |
| tree | 54a8e7b1674bd3002902e9db94208ba544e9049b /src/data | |
| parent | e677a006766baba12add2678e9406b5e01c31fdf (diff) | |
| parent | c59c7b0518c17696b656c2fafaac297bee9077f1 (diff) | |
Merge pull request #1566 from cbt6/move-speed
Rename speed parameter to distance in jump functions
Diffstat (limited to 'src/data')
| -rwxr-xr-x | src/data/object_events/movement_action_func_tables.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/data/object_events/movement_action_func_tables.h b/src/data/object_events/movement_action_func_tables.h index f601cf82b..8070e9877 100755 --- a/src/data/object_events/movement_action_func_tables.h +++ b/src/data/object_events/movement_action_func_tables.h @@ -706,8 +706,16 @@ u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct ObjectEvent *, struct MovementAction_PauseSpriteAnim, }; -static const s16 sJumpInitDisplacements[] = {0, 1, 1}; -static const s16 sJumpDisplacements[] = {0, 0, 1}; +static const s16 sJumpInitDisplacements[] = { + [JUMP_DISTANCE_IN_PLACE] = 0, + [JUMP_DISTANCE_NORMAL] = 1, + [JUMP_DISTANCE_FAR] = 1, +}; +static const s16 sJumpDisplacements[] = { + [JUMP_DISTANCE_IN_PLACE] = 0, + [JUMP_DISTANCE_NORMAL] = 0, + [JUMP_DISTANCE_FAR] = 1, +}; u8 (*const gMovementActionFuncs_Jump2Down[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Down_Step0, |