diff options
| -rw-r--r-- | asm/macros/movement.inc | 38 | ||||
| -rw-r--r-- | include/constants/movement_commands.h | 34 |
2 files changed, 36 insertions, 36 deletions
diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index c5178be3a..c4ca78010 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -10,10 +10,10 @@ create_movement face_up create_movement face_left create_movement face_right - create_movement face_down_2 @ TODO: distinction between this and above set - create_movement face_up_2 - create_movement face_left_2 - create_movement face_right_2 + create_movement face_down_fast + create_movement face_up_fast + create_movement face_left_fast + create_movement face_right_fast create_movement walk_slowest_down create_movement walk_slowest_up create_movement walk_slowest_left @@ -55,10 +55,10 @@ create_movement walk_in_place_fastest_up create_movement walk_in_place_fastest_left create_movement walk_in_place_fastest_right - create_movement ride_water_current_down - create_movement ride_water_current_up - create_movement ride_water_current_left - create_movement ride_water_current_right + create_movement face_down_slow + create_movement face_up_slow + create_movement face_left_slow + create_movement face_right_slow create_movement walk_fastest_down create_movement walk_fastest_up create_movement walk_fastest_left @@ -71,15 +71,15 @@ create_movement player_run_up create_movement player_run_left create_movement player_run_right - create_movement step_41 - create_movement step_42 - create_movement step_43 - create_movement step_44 + create_movement player_run_down_slow + create_movement player_run_up_slow + create_movement player_run_left_slow + create_movement player_run_right_slow create_movement step_45 - create_movement step_46 - create_movement step_47 - create_movement step_48 - create_movement step_49 + create_movement jump_down_run + create_movement jump_up_run + create_movement jump_left_run + create_movement jump_right_run create_movement face_player create_movement face_away_player create_movement lock_facing_direction @@ -98,8 +98,8 @@ create_movement jump_in_place_right_left create_movement face_original_direction create_movement nurse_joy_bow - create_movement step_5c - create_movement step_5d + create_movement enable_jump_landing_ground_effect + create_movement disable_jump_landing_ground_effect create_movement disable_anim create_movement restore_anim create_movement set_invisible @@ -108,7 +108,7 @@ create_movement emote_question_mark create_movement emote_x create_movement emote_double_exclamation_mark - create_movement step_66 + create_movement emote_smile create_movement step_67 create_movement rock_smash_break create_movement cut_tree diff --git a/include/constants/movement_commands.h b/include/constants/movement_commands.h index 0f90405dd..8556ba951 100644 --- a/include/constants/movement_commands.h +++ b/include/constants/movement_commands.h @@ -7,10 +7,10 @@ enum face_up, face_left, face_right, - face_down_2, - face_up_2, - face_left_2, - face_right_2, + face_down_fast, + face_up_fast, + face_left_fast, + face_right_fast, walk_slowest_down, walk_slowest_up, walk_slowest_left, @@ -52,10 +52,10 @@ enum walk_in_place_fastest_up, walk_in_place_fastest_left, walk_in_place_fastest_right, - ride_water_current_down, - ride_water_current_up, - ride_water_current_left, - ride_water_current_right, + face_down_slow, + face_up_slow, + face_left_slow, + face_right_slow, walk_fastest_down, walk_fastest_up, walk_fastest_left, @@ -68,15 +68,15 @@ enum player_run_up, player_run_left, player_run_right, - step_41, - step_42, - step_43, - step_44, + player_run_down_slow, + player_run_up_slow, + player_run_left_slow, + player_run_right_slow, step_45, - step_46, - step_47, - step_48, - step_49, + jump_down_run, + jump_up_run, + jump_left_run, + jump_right_run, face_player, face_away_player, lock_facing_direction, @@ -105,7 +105,7 @@ enum emote_question_mark, emote_x, emote_double_exclamation_mark, - step_66, + emote_smile, step_67, rock_smash_break, cut_tree, |