diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index 7cbd1ffc4..dbe3811a9 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -1,136 +1,177 @@ - .macro create_movement name - enum _\name + .macro create_movement_action name:req, value:req .macro \name - .byte _\name + .byte \value .endm .endm - enum_start 0 - create_movement face_down - create_movement face_up - create_movement face_left - create_movement face_right - create_movement face_down_fast - create_movement face_up_fast - create_movement face_left_fast - create_movement face_right_fast - create_movement walk_slower_down - create_movement walk_slower_up - create_movement walk_slower_left - create_movement walk_slower_right - create_movement walk_slow_down - create_movement walk_slow_up - create_movement walk_slow_left - create_movement walk_slow_right - create_movement walk_down - create_movement walk_up - create_movement walk_left - create_movement walk_right - create_movement jump_2_down - create_movement jump_2_up - create_movement jump_2_left - create_movement jump_2_right - create_movement delay_1 - create_movement delay_2 - create_movement delay_4 - create_movement delay_8 - create_movement delay_16 - create_movement walk_fast_down - create_movement walk_fast_up - create_movement walk_fast_left - create_movement walk_fast_right - create_movement walk_in_place_slow_down - create_movement walk_in_place_slow_up - create_movement walk_in_place_slow_left - create_movement walk_in_place_slow_right - create_movement walk_in_place_down - create_movement walk_in_place_up - create_movement walk_in_place_left - create_movement walk_in_place_right - create_movement walk_in_place_fast_down - create_movement walk_in_place_fast_up - create_movement walk_in_place_fast_left - create_movement walk_in_place_fast_right - create_movement walk_in_place_fastest_down - 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_lefft - create_movement ride_water_current_right - create_movement walk_fastest_down - create_movement walk_fastest_up - create_movement walk_fastest_left - create_movement walk_fastest_right - create_movement slide_down - create_movement slide_up - create_movement slide_left - create_movement slide_right - create_movement player_run_down - create_movement player_run_up - create_movement player_run_left - create_movement player_run_right - 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 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 - create_movement unlock_facing_direction - create_movement jump_down - create_movement jump_up - create_movement jump_left - create_movement jump_right - create_movement jump_in_place_down - create_movement jump_in_place_up - create_movement jump_in_place_left - create_movement jump_in_place_right - create_movement jump_in_place_down_up - create_movement jump_in_place_up_down - create_movement jump_in_place_left_right - create_movement jump_in_place_right_left - create_movement face_original_direction - create_movement nurse_joy_bow - 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 - create_movement set_visible - create_movement emote_exclamation_mark - create_movement emote_question_mark - create_movement emote_x - create_movement emote_double_exclamation_mark - create_movement emote_smile - create_movement reveal_trainer - create_movement rock_smash_break - create_movement cut_tree - - enum_start 0x94 - create_movement spin_down - create_movement spin_up - create_movement spin_left - create_movement spin_right - - enum_start 0x9b - create_movement walk_slowest_down - create_movement walk_slowest_up - create_movement walk_slowest_left - create_movement walk_slowest_right - create_movement shake_head_or_walk_in_place - - enum_start 0xa6 - create_movement jump_special_with_effect_down - create_movement jump_special_with_effect_up - create_movement jump_special_with_effect_left - create_movement jump_special_with_effect_right - - enum_start 0xfe - create_movement step_end + create_movement_action face_down, MOVEMENT_ACTION_FACE_DOWN + create_movement_action face_up, MOVEMENT_ACTION_FACE_UP + create_movement_action face_left, MOVEMENT_ACTION_FACE_LEFT + create_movement_action face_right, MOVEMENT_ACTION_FACE_RIGHT + create_movement_action face_down_fast, MOVEMENT_ACTION_FACE_DOWN_FAST + create_movement_action face_up_fast, MOVEMENT_ACTION_FACE_UP_FAST + create_movement_action face_left_fast, MOVEMENT_ACTION_FACE_LEFT_FAST + create_movement_action face_right_fast, MOVEMENT_ACTION_FACE_RIGHT_FAST + create_movement_action walk_slower_down, MOVEMENT_ACTION_WALK_SLOWER_DOWN + create_movement_action walk_slower_up, MOVEMENT_ACTION_WALK_SLOWER_UP + create_movement_action walk_slower_left, MOVEMENT_ACTION_WALK_SLOWER_LEFT + create_movement_action walk_slower_right, MOVEMENT_ACTION_WALK_SLOWER_RIGHT + create_movement_action walk_slow_down, MOVEMENT_ACTION_WALK_SLOW_DOWN + create_movement_action walk_slow_up, MOVEMENT_ACTION_WALK_SLOW_UP + create_movement_action walk_slow_left, MOVEMENT_ACTION_WALK_SLOW_LEFT + create_movement_action walk_slow_right, MOVEMENT_ACTION_WALK_SLOW_RIGHT + create_movement_action walk_down, MOVEMENT_ACTION_WALK_NORMAL_DOWN + create_movement_action walk_up, MOVEMENT_ACTION_WALK_NORMAL_UP + create_movement_action walk_left, MOVEMENT_ACTION_WALK_NORMAL_LEFT + create_movement_action walk_right, MOVEMENT_ACTION_WALK_NORMAL_RIGHT + create_movement_action jump_2_down, MOVEMENT_ACTION_JUMP_2_DOWN + create_movement_action jump_2_up, MOVEMENT_ACTION_JUMP_2_UP + create_movement_action jump_2_left, MOVEMENT_ACTION_JUMP_2_LEFT + create_movement_action jump_2_right, MOVEMENT_ACTION_JUMP_2_RIGHT + create_movement_action delay_1, MOVEMENT_ACTION_DELAY_1 + create_movement_action delay_2, MOVEMENT_ACTION_DELAY_2 + create_movement_action delay_4, MOVEMENT_ACTION_DELAY_4 + create_movement_action delay_8, MOVEMENT_ACTION_DELAY_8 + create_movement_action delay_16, MOVEMENT_ACTION_DELAY_16 + create_movement_action walk_fast_down, MOVEMENT_ACTION_WALK_FAST_DOWN + create_movement_action walk_fast_up, MOVEMENT_ACTION_WALK_FAST_UP + create_movement_action walk_fast_left, MOVEMENT_ACTION_WALK_FAST_LEFT + create_movement_action walk_fast_right, MOVEMENT_ACTION_WALK_FAST_RIGHT + create_movement_action walk_in_place_slow_down, MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN + create_movement_action walk_in_place_slow_up, MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP + create_movement_action walk_in_place_slow_left, MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT + create_movement_action walk_in_place_slow_right, MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT + create_movement_action walk_in_place_down, MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN + create_movement_action walk_in_place_up, MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP + create_movement_action walk_in_place_left, MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT + create_movement_action walk_in_place_right, MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT + create_movement_action walk_in_place_fast_down, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN + create_movement_action walk_in_place_fast_up, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP + create_movement_action walk_in_place_fast_left, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT + create_movement_action walk_in_place_fast_right, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT + create_movement_action walk_in_place_faster_down, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN + create_movement_action walk_in_place_faster_up, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_UP + create_movement_action walk_in_place_faster_left, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_LEFT + create_movement_action walk_in_place_faster_right, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT + create_movement_action ride_water_current_down, MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN + create_movement_action ride_water_current_up, MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP + create_movement_action ride_water_current_lefft, MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT + create_movement_action ride_water_current_right, MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT + create_movement_action walk_faster_down, MOVEMENT_ACTION_WALK_FASTER_DOWN + create_movement_action walk_faster_up, MOVEMENT_ACTION_WALK_FASTER_UP + create_movement_action walk_faster_left, MOVEMENT_ACTION_WALK_FASTER_LEFT + create_movement_action walk_faster_right, MOVEMENT_ACTION_WALK_FASTER_RIGHT + create_movement_action slide_down, MOVEMENT_ACTION_SLIDE_DOWN + create_movement_action slide_up, MOVEMENT_ACTION_SLIDE_UP + create_movement_action slide_left, MOVEMENT_ACTION_SLIDE_LEFT + create_movement_action slide_right, MOVEMENT_ACTION_SLIDE_RIGHT + create_movement_action player_run_down, MOVEMENT_ACTION_PLAYER_RUN_DOWN + create_movement_action player_run_up, MOVEMENT_ACTION_PLAYER_RUN_UP + create_movement_action player_run_left, MOVEMENT_ACTION_PLAYER_RUN_LEFT + create_movement_action player_run_right, MOVEMENT_ACTION_PLAYER_RUN_RIGHT + create_movement_action player_run_down_slow, MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW + create_movement_action player_run_up_slow, MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW + create_movement_action player_run_left_slow, MOVEMENT_ACTION_PLAYER_RUN_LEFT_SLOW + create_movement_action player_run_right_slow, MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW + create_movement_action start_anim_in_direction, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION + create_movement_action jump_special_down, MOVEMENT_ACTION_JUMP_SPECIAL_DOWN + create_movement_action jump_special_up, MOVEMENT_ACTION_JUMP_SPECIAL_UP + create_movement_action jump_special_left, MOVEMENT_ACTION_JUMP_SPECIAL_LEFT + create_movement_action jump_special_right, MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT + create_movement_action face_player, MOVEMENT_ACTION_FACE_PLAYER + create_movement_action face_away_player, MOVEMENT_ACTION_FACE_AWAY_PLAYER + create_movement_action lock_facing_direction, MOVEMENT_ACTION_LOCK_FACING_DIRECTION + create_movement_action unlock_facing_direction, MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION + create_movement_action jump_down, MOVEMENT_ACTION_JUMP_DOWN + create_movement_action jump_up, MOVEMENT_ACTION_JUMP_UP + create_movement_action jump_left, MOVEMENT_ACTION_JUMP_LEFT + create_movement_action jump_right, MOVEMENT_ACTION_JUMP_RIGHT + create_movement_action jump_in_place_down, MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN + create_movement_action jump_in_place_up, MOVEMENT_ACTION_JUMP_IN_PLACE_UP + create_movement_action jump_in_place_left, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT + create_movement_action jump_in_place_right, MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT + create_movement_action jump_in_place_down_up, MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP + create_movement_action jump_in_place_up_down, MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN + create_movement_action jump_in_place_left_right, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT + create_movement_action jump_in_place_right_left, MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT + create_movement_action face_original_direction, MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION + create_movement_action nurse_joy_bow, MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN + create_movement_action enable_jump_landing_ground_effect, MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT + create_movement_action disable_jump_landing_ground_effect, MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT + create_movement_action disable_anim, MOVEMENT_ACTION_DISABLE_ANIMATION + create_movement_action restore_anim, MOVEMENT_ACTION_RESTORE_ANIMATION + create_movement_action set_invisible, MOVEMENT_ACTION_SET_INVISIBLE + create_movement_action set_visible, MOVEMENT_ACTION_SET_VISIBLE + create_movement_action emote_exclamation_mark, MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK + create_movement_action emote_question_mark, MOVEMENT_ACTION_EMOTE_QUESTION_MARK + create_movement_action emote_x, MOVEMENT_ACTION_EMOTE_X + create_movement_action emote_double_exclamation_mark, MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK + create_movement_action emote_smile, MOVEMENT_ACTION_EMOTE_SMILE + create_movement_action reveal_trainer, MOVEMENT_ACTION_REVEAL_TRAINER + create_movement_action rock_smash_break, MOVEMENT_ACTION_ROCK_SMASH_BREAK + create_movement_action cut_tree, MOVEMENT_ACTION_CUT_TREE + create_movement_action set_fixed_priority, MOVEMENT_ACTION_SET_FIXED_PRIORITY + create_movement_action clear_fixed_priority, MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY + create_movement_action init_affine_anim, MOVEMENT_ACTION_INIT_AFFINE_ANIM + create_movement_action clear_affine_anim, MOVEMENT_ACTION_CLEAR_AFFINE_ANIM + create_movement_action walk_down_start_affine, MOVEMENT_ACTION_WALK_DOWN_START_AFFINE + create_movement_action walk_down_affine, MOVEMENT_ACTION_WALK_DOWN_AFFINE + create_movement_action acro_wheelie_face_down, MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN + create_movement_action acro_wheelie_face_up, MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP + create_movement_action acro_wheelie_face_left, MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT + create_movement_action acro_wheelie_face_right, MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT + create_movement_action acro_pop_wheelie_down, MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN + create_movement_action acro_pop_wheelie_up, MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP + create_movement_action acro_pop_wheelie_left, MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT + create_movement_action acro_pop_wheelie_right, MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT + create_movement_action acro_end_wheelie_face_down, MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN + create_movement_action acro_end_wheelie_face_up, MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP + create_movement_action acro_end_wheelie_face_left, MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT + create_movement_action acro_end_wheelie_face_right, MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT + create_movement_action acro_wheelie_hop_face_down, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN + create_movement_action acro_wheelie_hop_face_up, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP + create_movement_action acro_wheelie_hop_face_left, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT + create_movement_action acro_wheelie_hop_face_right, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT + create_movement_action acro_wheelie_hop_down, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN + create_movement_action acro_wheelie_hop_up, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP + create_movement_action acro_wheelie_hop_left, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT + create_movement_action acro_wheelie_hop_right, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT + create_movement_action acro_wheelie_jump_down, MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN + create_movement_action acro_wheelie_jump_up, MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP + create_movement_action acro_wheelie_jump_left, MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT + create_movement_action acro_wheelie_jump_right, MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT + create_movement_action acro_wheelie_in_place_down, MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN + create_movement_action acro_wheelie_in_place_up, MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP + create_movement_action acro_wheelie_in_place_left, MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT + create_movement_action acro_wheelie_in_place_right, MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT + create_movement_action acro_pop_wheelie_move_down, MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN + create_movement_action acro_pop_wheelie_move_up, MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP + create_movement_action acro_pop_wheelie_move_left, MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT + create_movement_action acro_pop_wheelie_move_right, MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT + create_movement_action acro_wheelie_move_down, MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN + create_movement_action acro_wheelie_move_up, MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP + create_movement_action acro_wheelie_move_left, MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT + create_movement_action acro_wheelie_move_right, MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT + create_movement_action spin_down, MOVEMENT_ACTION_SPIN_DOWN + create_movement_action spin_up, MOVEMENT_ACTION_SPIN_UP + create_movement_action spin_left, MOVEMENT_ACTION_SPIN_LEFT + create_movement_action spin_right, MOVEMENT_ACTION_SPIN_RIGHT + create_movement_action movement_action_x98, MOVEMENT_ACTION_0x98 + create_movement_action movement_action_x99, MOVEMENT_ACTION_0x99 + create_movement_action movement_action_x9a, MOVEMENT_ACTION_0x9A + create_movement_action walk_slowest_down, MOVEMENT_ACTION_WALK_SLOWEST_DOWN + create_movement_action walk_slowest_up, MOVEMENT_ACTION_WALK_SLOWEST_UP + create_movement_action walk_slowest_left, MOVEMENT_ACTION_WALK_SLOWEST_LEFT + create_movement_action walk_slowest_right, MOVEMENT_ACTION_WALK_SLOWEST_RIGHT + create_movement_action shake_head_or_walk_in_place, MOVEMENT_ACTION_SHAKE_HEAD_OR_WALK_IN_PLACE + create_movement_action movement_action_xa0, MOVEMENT_ACTION_0xA0 + create_movement_action movement_action_xa1, MOVEMENT_ACTION_0xA1 + create_movement_action movement_action_xa2, MOVEMENT_ACTION_0xA2 + create_movement_action movement_action_xa3, MOVEMENT_ACTION_0xA3 + create_movement_action fly_up, MOVEMENT_ACTION_FLY_UP + create_movement_action fly_down, MOVEMENT_ACTION_FLY_DOWN + create_movement_action jump_special_with_effect_down, MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_DOWN + create_movement_action jump_special_with_effect_up, MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_UP + create_movement_action jump_special_with_effect_left, MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_LEFT + create_movement_action jump_special_with_effect_right, MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_RIGHT + create_movement_action step_end, MOVEMENT_ACTION_STEP_END diff --git a/data/event_scripts.s b/data/event_scripts.s index 5b2f933ff..e76eb50f5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1175,16 +1175,16 @@ EventScript_ReleaseEnd:: @ Unused EventScript_DelayedLookAround:: lockall - applymovement VAR_0x8004, Movement_WalkInPlaceFastestLeft + applymovement VAR_0x8004, Movement_WalkInPlaceFasterLeft waitmovement 0 delay 20 - applymovement VAR_0x8004, Movement_WalkInPlaceFastestUp + applymovement VAR_0x8004, Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 - applymovement VAR_0x8004, Movement_WalkInPlaceFastestRight + applymovement VAR_0x8004, Movement_WalkInPlaceFasterRight waitmovement 0 delay 20 - applymovement VAR_0x8004, Movement_WalkInPlaceFastestDown + applymovement VAR_0x8004, Movement_WalkInPlaceFasterDown waitmovement 0 delay 20 releaseall diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index f8b145240..be2405292 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -99,17 +99,17 @@ CeruleanCity_EventScript_RivalStartExitRight:: CeruleanCity_Movement_PlayerWatchRivalExit:: delay_16 delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end CeruleanCity_Movement_PlayerWatchRivalExitRight:: delay_16 delay_8 - walk_in_place_fastest_left + walk_in_place_faster_left delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end CeruleanCity_Movement_RivalEnter:: @@ -204,9 +204,9 @@ CeruleanCity_EventScript_NoRoomForTM28:: CeruleanCity_EventScript_GruntTriggerTop:: lockall setvar VAR_TEMP_1, 0 - applymovement LOCALID_GRUNT, Movement_WalkInPlaceFastestUp + applymovement LOCALID_GRUNT, Movement_WalkInPlaceFasterUp waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 goto CeruleanCity_EventScript_GruntTrigger end @@ -214,9 +214,9 @@ CeruleanCity_EventScript_GruntTriggerTop:: CeruleanCity_EventScript_GruntTriggerBottom:: lockall setvar VAR_TEMP_1, 1 - applymovement LOCALID_GRUNT, Movement_WalkInPlaceFastestDown + applymovement LOCALID_GRUNT, Movement_WalkInPlaceFasterDown waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 goto CeruleanCity_EventScript_GruntTrigger end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 1adc8c339..7746af9a7 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -107,12 +107,12 @@ CinnabarIsland_EventScript_BillScene:: end CinnabarIsland_EventScript_BillFacePlayer1:: - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterUp waitmovement 0 return CinnabarIsland_EventScript_BillFacePlayer2:: - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterLeft waitmovement 0 return @@ -124,7 +124,7 @@ CinnabarIsland_EventScript_BillApproachPlayer1:: CinnabarIsland_EventScript_BillApproachPlayer2:: applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer2 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 return @@ -175,13 +175,13 @@ CinnabarIsland_EventScript_BillReturnToPokeCenter:: CinnabarIsland_Movement_PlayerWatchBillExit:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end CinnabarIsland_Movement_BillApproachDoor:: delay_16 walk_left - walk_in_place_fastest_up + walk_in_place_faster_up step_end CinnabarIsland_Movement_BillReEnterPokeCenter:: @@ -272,7 +272,7 @@ CinnabarIsland_Movement_BillFaceBoat:: delay_16 delay_16 delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right step_end CinnabarIsland_Movement_ApproachShore:: @@ -295,7 +295,7 @@ CinnabarIsland_Movement_PlayerBoardBoat:: walk_right walk_down walk_down - walk_in_place_fastest_right + walk_in_place_faster_right delay_4 walk_right delay_4 @@ -313,7 +313,7 @@ CinnabarIsland_Movement_PlayerBoardBoatFromShore:: @ Triggered when VAR_TEMP_1 is 0 CinnabarIsland_EventScript_GymDoorLocked:: lockall - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 msgbox CinnabarIsland_Text_DoorIsLocked diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index e9df5511b..58da8ac3f 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -271,13 +271,13 @@ CinnabarIsland_Gym_EventScript_BattleQuinn:: end CinnabarIsland_Gym_EventScript_QuinnApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_QuinnApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachRight waitmovement 0 return @@ -363,13 +363,13 @@ CinnabarIsland_Gym_Movement_AveryApproachLeft:: CinnabarIsland_Gym_Movement_AveryApproachRight:: walk_up walk_up - walk_in_place_fastest_left + walk_in_place_faster_left step_end CinnabarIsland_Gym_Movement_PlayerFaceAvery:: delay_16 delay_16 - walk_in_place_fastest_right + walk_in_place_faster_right step_end CinnabarIsland_Gym_EventScript_Quiz3Left:: @@ -424,13 +424,13 @@ CinnabarIsland_Gym_EventScript_BattleRamon:: end CinnabarIsland_Gym_EventScript_RamonApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_RamonApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachRight waitmovement 0 return @@ -496,13 +496,13 @@ CinnabarIsland_Gym_EventScript_BattleDerek:: end CinnabarIsland_Gym_EventScript_DerekApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_DerekApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachRight waitmovement 0 return @@ -568,13 +568,13 @@ CinnabarIsland_Gym_EventScript_BattleDusty:: end CinnabarIsland_Gym_EventScript_DustyApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_DustyApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachRight waitmovement 0 return @@ -640,13 +640,13 @@ CinnabarIsland_Gym_EventScript_BattleZac:: end CinnabarIsland_Gym_EventScript_ZacApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_ZacApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachRight waitmovement 0 return diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 21909c63e..646136ff4 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -54,9 +54,9 @@ FiveIsland_LostCave_Room10_Movement_SelphyWander:: delay_16 walk_right delay_16 - walk_in_place_fastest_up + walk_in_place_faster_up delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end FiveIsland_LostCave_Room10_Movement_SelphyApproach:: diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 40e3fe73a..336b45902 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -13,7 +13,7 @@ FiveIsland_MemorialPillar_EventScript_MemorialMan:: waitmovement 0 delay 45 msgbox FiveIsland_MemorialPillar_Text_YourMonsLookHealthy - applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestUp + applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox FiveIsland_MemorialPillar_Text_ThisIsWhereIBuriedMyOnix release @@ -54,10 +54,10 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade:: removeitem ITEM_LEMONADE msgbox FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade closemessage - applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestRight + applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterRight waitmovement 0 delay 45 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 textcolor NPC_TEXT_COLOR_MALE msgbox FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis @@ -69,7 +69,7 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade:: FiveIsland_MemorialPillar_EventScript_ReceivedTM42:: msgbox FiveIsland_MemorialPillar_Text_BeGoodToYourMonsToo - applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestUp + applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterUp waitmovement 0 setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR return diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index 2d18332cd..a9ad66461 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -22,7 +22,7 @@ FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene:: textcolor NPC_TEXT_COLOR_FEMALE msgbox FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow closemessage - applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestUp + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterUp waitmovement 0 opendoor 39, 8 waitdooranim diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 2b98afca2..36ada6601 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -44,7 +44,7 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon:: waitmovement 0 textcolor NPC_TEXT_COLOR_MALE msgbox FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady - applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestUp + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterUp waitmovement 0 textcolor NPC_TEXT_COLOR_FEMALE msgbox FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation @@ -65,25 +65,25 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon:: end FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth:: - applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestDown + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterDown applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth:: applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast:: - applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterLeft applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return @@ -114,13 +114,13 @@ FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth:: walk_down walk_down walk_down - walk_in_place_fastest_right + walk_in_place_faster_right step_end FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth:: walk_left walk_left - walk_in_place_fastest_down + walk_in_place_faster_down step_end FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast:: diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index f4933655d..a5b30422f 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -43,7 +43,7 @@ FiveIsland_RocketWarehouse_EventScript_Computer:: FiveIsland_RocketWarehouse_EventScript_Admin2Trigger:: lockall - applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFasterLeft waitmovement 0 setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 releaseall @@ -100,7 +100,7 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2:: end FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 return @@ -138,7 +138,7 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1:: FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1:: goto_if_eq PLAYER_X_POS, 27, EventScript_Return - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 return @@ -153,27 +153,27 @@ FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch:: return FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch:: - applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestUp + applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterUp waitmovement 0 return FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft:: - applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterLeft waitmovement 0 return FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown:: - applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterDown waitmovement 0 return FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar:: walk_right walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch:: walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 3e60c34b4..be6dcd7cf 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -29,7 +29,7 @@ FourIsland_OnFrame:: FourIsland_EventScript_RivalScene:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown waitmovement 0 playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_ExclamationMark @@ -67,7 +67,7 @@ FourIsland_Movement_RivalExit:: FourIsland_Movement_PlayerWatchRivalExit:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end FourIsland_EventScript_DaycareMan:: diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 2603e25e1..987a08764 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -27,17 +27,17 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: playse SE_PIN applymovement LOCALID_LORELEI, Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterDown waitmovement 0 applymovement LOCALID_LORELEI, Movement_Delay48 waitmovement 0 textcolor NPC_TEXT_COLOR_FEMALE msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut closemessage - applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestRight + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterRight waitmovement 0 delay 18 - applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterDown waitmovement 0 delay 35 applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei @@ -81,7 +81,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: delay 50 applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 textcolor NPC_TEXT_COLOR_FEMALE msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful @@ -100,10 +100,10 @@ FourIsland_IcefallCave_Back_Movement_PlayerToRockets:: FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit:: delay_16 - walk_in_place_fastest_left + walk_in_place_faster_left delay_16 delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown:: @@ -162,7 +162,7 @@ FourIsland_IcefallCave_Back_Movement_Rocket3Exit:: FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei:: delay_16 delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right step_end FourIsland_IcefallCave_Back_Movement_UnusedWalkLeft:: @@ -181,10 +181,10 @@ FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp:: FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit:: delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right delay_16 delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer:: diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index da846862a..474f29023 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -100,7 +100,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerLeft:: FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone:: textcolor NPC_TEXT_COLOR_MALE msgbox FuchsiaCity_SafariZone_Entrance_Text_WelcomeToSafariZone - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 showmoneybox 0, 0 msgbox FuchsiaCity_SafariZone_Entrance_Text_PlaySafariGameFor500, MSGBOX_YESNO diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index a3226e121..6c46913d7 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -103,12 +103,12 @@ IndigoPlateau_Exterior_Movement_PlayerExitBuilding:: IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave:: delay_16 delay_4 - walk_in_place_fastest_down + walk_in_place_faster_down step_end IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave:: delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right delay_16 delay_16 delay_16 @@ -120,7 +120,7 @@ IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave:: delay_16 delay_16 delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end IndigoPlateau_Exterior_Movement_PlayerBeginLeave:: @@ -133,7 +133,7 @@ IndigoPlateau_Exterior_Movement_PlayerBeginLeave:: step_end IndigoPlateau_Exterior_Movement_PlayerTurnAround:: - walk_in_place_fastest_down + walk_in_place_faster_down step_end IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay:: @@ -144,7 +144,7 @@ IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay:: step_end IndigoPlateau_Exterior_Movement_PlayerFaceLeague:: - walk_in_place_fastest_up + walk_in_place_faster_up step_end IndigoPlateau_Exterior_Movement_RivalLeave:: @@ -162,7 +162,7 @@ IndigoPlateau_Exterior_Movement_RivalExitBuilding:: step_end IndigoPlateau_Exterior_Movement_OakLeave:: - walk_in_place_fastest_left + walk_in_place_faster_left delay_16 delay_16 delay_16 @@ -173,7 +173,7 @@ IndigoPlateau_Exterior_Movement_OakLeave:: delay_16 delay_16 delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down delay_16 walk_down walk_down diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index bca9934ee..d5519c96a 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -95,14 +95,14 @@ MtEmber_Exterior_EventScript_RocketPasswordScene:: waitmovement 0 waitbuttonpress msgbox MtEmber_Exterior_Text_FirstPasswordGoldeen - applymovement LOCALID_GRUNT1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_GRUNT1, Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN applymovement LOCALID_GRUNT1, Movement_ExclamationMark waitmovement 0 applymovement LOCALID_GRUNT1, Movement_Delay48 waitmovement 0 - applymovement LOCALID_GRUNT2, Movement_WalkInPlaceFastestDown + applymovement LOCALID_GRUNT2, Movement_WalkInPlaceFasterDown waitmovement 0 call MtEmber_Exterior_EventScript_RocketsFaceDown msgbox MtEmber_Exterior_Text_SnoopsBeenListeningIn diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 201a9636f..32213a5b4 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -17,7 +17,7 @@ MtMoon_B2F_EventScript_ShowFossils:: MtMoon_B2F_EventScript_MiguelTrigger:: lockall - applymovement LOCALID_MIGUEL, Movement_WalkInPlaceFastestRight + applymovement LOCALID_MIGUEL, Movement_WalkInPlaceFasterRight waitmovement 0 call MtMoon_B2F_EventScript_BattleMiguel releaseall diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index eb3c47d44..05c082315 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -63,46 +63,46 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 playse SE_PIN applymovement LOCALID_CELIO, Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterLeft waitmovement 0 applymovement LOCALID_CELIO, Movement_Delay48 waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut msgbox OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestRight + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterRight waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 call_if_set FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerChamp call_if_unset FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestDown + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterDown waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioThatsReallyImpressive msgbox OneIsland_PokemonCenter_1F_Text_BillBringMeUpToSpeed - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterLeft waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioPCsCantLinkWithYours closemessage - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_OBTAIN_KEY_ITEM additem ITEM_METEORITE - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestDown + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterDown waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_OBTAIN_KEY_ITEM @@ -112,9 +112,9 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: setflag FLAG_SYS_SEVII_MAP_123 msgbox OneIsland_PokemonCenter_1F_Text_BillCatchYouLater closemessage - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterUp waitmovement 0 - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterUp waitmovement 0 setflag FLAG_SYS_PC_STORAGE_DISABLED setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 @@ -152,7 +152,7 @@ OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio:: walk_right walk_right walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio:: @@ -163,7 +163,7 @@ OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio:: walk_right walk_right walk_up - walk_in_place_fastest_right + walk_in_place_faster_right step_end @ Unused @@ -174,7 +174,7 @@ Movement_170E8F:: @ Unused Movement_170E91:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end OneIsland_PokemonCenter_1F_EventScript_Nurse:: @@ -344,7 +344,7 @@ OneIsland_PokemonCenter_1F_EventScript_CelioWaitingForRuby:: OneIsland_PokemonCenter_1F_EventScript_CelioRequestRuby:: msgbox OneIsland_PokemonCenter_1F_Text_CelioCaughtMoreMonMaybeICanBeUseful - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_YoullBeTradingFromTrainersFarAway applymovement LOCALID_CELIO, Movement_FacePlayer @@ -367,7 +367,7 @@ OneIsland_PokemonCenter_1F_Movement_CelioCheckMachine:: step_end OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine:: - walk_in_place_fastest_up + walk_in_place_faster_up walk_in_place_up delay_16 walk_in_place_up @@ -450,30 +450,30 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: call_if_eq VAR_TEMP_1, 4, OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom delay 10 msgbox OneIsland_PokemonCenter_1F_Text_BillWeGotItDone - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown waitmovement 0 - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_BillYouveLearnedALot msgbox OneIsland_PokemonCenter_1F_Text_CelioOhReallyEhehe closemessage - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterLeft waitmovement 0 delay 10 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 delay 15 msgbox OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto closemessage - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown waitmovement 0 delay 15 - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioPromiseIllShowYouAroundSometime closemessage @@ -514,7 +514,7 @@ OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom:: OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop:: walk_right walk_down - walk_in_place_fastest_right + walk_in_place_faster_right step_end OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop:: @@ -524,14 +524,14 @@ OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop:: OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom:: walk_right walk_up - walk_in_place_fastest_right + walk_in_place_faster_right step_end OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom:: walk_right walk_up walk_up - walk_in_place_fastest_right + walk_in_place_faster_right step_end @ Unused @@ -539,7 +539,7 @@ Movement_17131F:: delay_16 delay_16 delay_4 - walk_in_place_fastest_left + walk_in_place_faster_left step_end @ Unused diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index eff134734..00202f054 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -113,7 +113,7 @@ PalletTown_Movement_OakWalkToPlayersDoor:: walk_left walk_left walk_left - walk_in_place_fastest_up + walk_in_place_faster_up step_end PalletTown_Movement_OakExit:: @@ -148,7 +148,7 @@ PalletTown_Movement_OakWalkToLabFromHouse:: walk_right walk_right walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end PalletTown_Movement_PlayerWalkToLabFromHouse:: @@ -190,7 +190,7 @@ PalletTown_EventScript_OakTrigger:: waitmessage delay 85 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN applymovement OBJ_EVENT_ID_PLAYER, Movement_ExclamationMark @@ -290,7 +290,7 @@ PalletTown_Movement_OakWalkToLabLeft:: walk_down walk_to_lab walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end PalletTown_Movement_OakWalkToLabRight:: @@ -298,7 +298,7 @@ PalletTown_Movement_OakWalkToLabRight:: walk_left walk_to_lab walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end PalletTown_Movement_OakEnterLab:: @@ -381,12 +381,12 @@ PalletTown_EventScript_SignLadyJustShowedSign:: PalletTown_Movement_SignLadyMoveOutOfWayRight:: walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PalletTown_Movement_SignLadyMoveOutOfWayLeft:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end PalletTown_EventScript_FatMan:: @@ -421,8 +421,8 @@ PalletTown_EventScript_TrainerTips:: PalletTown_EventScript_SignLadyTrigger:: lockall - applymovement LOCALID_SIGN_LADY, Movement_WalkInPlaceFastestRight - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_SIGN_LADY, Movement_WalkInPlaceFasterRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 call PalletTown_EventScript_SignLadyShowSign releaseall diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 69dd2c790..8b646176d 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -140,7 +140,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 @@ -150,18 +150,18 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth:: setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return @@ -191,7 +191,7 @@ PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest:: PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk:: walk_up walk_left - walk_in_place_fastest_up + walk_in_place_faster_up delay_16 delay_4 step_end @@ -215,7 +215,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene:: clearflag FLAG_HIDE_OAK_IN_HIS_LAB applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter waitmovement 0 - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterUp waitmovement 0 clearflag FLAG_DONT_TRANSITION_MUSIC savebgm MUS_DUMMY @@ -296,9 +296,9 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight:: PalletTown_ProfessorOaksLab_EventScript_RivalBattle:: textcolor NPC_TEXT_COLOR_MALE playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons closemessage @@ -540,17 +540,17 @@ PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid:: PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle:: delay_16 delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight:: delay_16 delay_8 - walk_in_place_fastest_left + walk_in_place_faster_left delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end PalletTown_ProfessorOaksLab_EventScript_Rival:: @@ -644,7 +644,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: delay 40 msgbox PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou closemessage - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestUp + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterUp waitmovement 0 removeobject LOCALID_POKEDEX_1 delay 10 @@ -715,7 +715,7 @@ PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest:: PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast:: delay_16 delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right step_end PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver:: @@ -754,20 +754,20 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest:: PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast:: delay_16 delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up step_end PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk:: delay_16 delay_8 - walk_in_place_fastest_left + walk_in_place_faster_left step_end PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk:: walk_up walk_left delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth:: @@ -775,7 +775,7 @@ PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth:: walk_left walk_up delay_16 - walk_in_place_fastest_right + walk_in_place_faster_right step_end PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls:: @@ -872,27 +872,27 @@ PalletTown_ProfessorOaksLab_Movement_OakExcitedWest:: @ Unused Movement_1699AC:: walk_left - walk_in_place_fastest_down + walk_in_place_faster_down delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up delay_8 - walk_in_place_fastest_left + walk_in_place_faster_left delay_8 - walk_in_place_fastest_down + walk_in_place_faster_down delay_8 walk_right walk_right - walk_in_place_fastest_up + walk_in_place_faster_up delay_8 - walk_in_place_fastest_left + walk_in_place_faster_left delay_8 - walk_in_place_fastest_down + walk_in_place_faster_down delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up delay_8 walk_left step_end @@ -966,7 +966,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth:: PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest:: setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 @@ -975,7 +975,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest:: PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth:: setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return @@ -984,7 +984,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth:: applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -992,8 +992,8 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest:: applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -1001,26 +1001,26 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast:: applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth:: applymovement LOCALID_RIVAL, Movement_FacePlayer - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth:: - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest:: applymovement LOCALID_RIVAL, Movement_FacePlayer - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -1036,24 +1036,24 @@ PalletTown_ProfessorOaksLab_EventScript_RivalExit:: return PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest:: delay_4 - walk_in_place_fastest_down + walk_in_place_faster_down step_end PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth:: - walk_in_place_fastest_down + walk_in_place_faster_down delay_16 delay_16 delay_16 delay_16 delay_16 delay_8 - walk_in_place_fastest_left + walk_in_place_faster_left step_end PalletTown_ProfessorOaksLab_Movement_RivalEnter:: @@ -1206,7 +1206,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle:: walk_right walk_right walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: @@ -1214,7 +1214,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: walk_right walk_right walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end PalletTown_ProfessorOaksLab_EventScript_SquirtleBall:: diff --git a/data/maps/PalletTown_RivalsHouse/scripts.inc b/data/maps/PalletTown_RivalsHouse/scripts.inc index 17eeef81e..7dbca25da 100644 --- a/data/maps/PalletTown_RivalsHouse/scripts.inc +++ b/data/maps/PalletTown_RivalsHouse/scripts.inc @@ -136,7 +136,7 @@ PalletTown_RivalsHouse_EventScript_GiveTownMap:: closemessage checkitemspace ITEM_TOWN_MAP goto_if_eq VAR_RESULT, FALSE, PalletTown_RivalsHouse_EventScript_NoRoomForTownMap - applymovement LOCALID_DAISY, Movement_WalkInPlaceFastestRight + applymovement LOCALID_DAISY, Movement_WalkInPlaceFasterRight waitmovement 0 removeobject LOCALID_TOWN_MAP setvar VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index b79424090..e559e3322 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -169,7 +169,7 @@ PewterCity_Movement_PlayerWaitForGuideEast:: delay_16 delay_16 delay_4 - walk_in_place_fastest_down + walk_in_place_faster_down step_end PewterCity_Movement_PlayerWalkToGymEast:: @@ -206,14 +206,14 @@ PewterCity_Movement_PlayerWalkToGymNorth:: PewterCity_Movement_GuideMoveToLeadEast:: walk_down walk_left - walk_in_place_fastest_up + walk_in_place_faster_up walk_in_place_up step_end PewterCity_Movement_GuideWalkToGymEast:: walk_to_gym walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PewterCity_Movement_GuideMoveToLeadWest:: @@ -227,7 +227,7 @@ PewterCity_Movement_GuideWalkToGymWest:: walk_left walk_to_gym_alt walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PewterCity_Movement_GuideMoveToLeadNorth:: @@ -241,7 +241,7 @@ PewterCity_Movement_GuideWalkToGymNorth:: walk_left walk_to_gym_alt walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PewterCity_Movement_GymGuideExit:: @@ -368,7 +368,7 @@ PewterCity_Movement_PlayerWalkToGymRight:: PewterCity_Movement_GuideMoveToLeadTop:: walk_left walk_down - walk_in_place_fastest_right + walk_in_place_faster_right walk_in_place_right step_end @@ -395,14 +395,14 @@ PewterCity_Movement_GuideApproachPlayerRight:: PewterCity_Movement_GuideWalkToGymTop:: walk_to_gym walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PewterCity_Movement_GuideWalkToGymMid:: walk_left walk_to_gym walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PewterCity_Movement_GuideWalkToGymBottom:: @@ -410,7 +410,7 @@ PewterCity_Movement_GuideWalkToGymBottom:: walk_left walk_to_gym walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PewterCity_Movement_GuideWalkToGymRight:: @@ -425,7 +425,7 @@ PewterCity_Movement_GuideWalkToGymRight:: walk_up walk_to_gym_alt walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PewterCity_EventScript_Lass:: @@ -541,13 +541,13 @@ PewterCity_Movement_PlayerWalkToMuseumNorth:: walk_up walk_to_museum delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_GuideWalkToMuseumNorth:: walk_to_museum walk_left - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_PlayerWalkToMuseumSouth:: @@ -556,7 +556,7 @@ PewterCity_Movement_PlayerWalkToMuseumSouth:: walk_left walk_to_museum_south delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_GuideWalkToMuseumSouth:: @@ -564,33 +564,33 @@ PewterCity_Movement_GuideWalkToMuseumSouth:: walk_up walk_to_museum_south walk_left - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_PlayerWalkToMuseumWest:: walk_left walk_to_museum delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_GuideWalkToMuseumWest:: walk_to_museum walk_left - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_PlayerWalkToMuseumEast:: walk_right walk_to_museum delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_GuideWalkToMuseumEast:: walk_to_museum walk_left - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_MuseumGuideExit:: @@ -728,7 +728,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: return PewterCity_EventScript_AideNoticePlayer:: - applymovement LOCALID_AIDE, Movement_WalkInPlaceFastestDown + applymovement LOCALID_AIDE, Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -740,7 +740,7 @@ PewterCity_EventScript_AideApproachPlayer0:: PewterCity_EventScript_AideApproachPlayer1:: closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return @@ -748,7 +748,7 @@ PewterCity_EventScript_AideApproachPlayer2:: closemessage applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerMid waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return @@ -756,7 +756,7 @@ PewterCity_EventScript_AideApproachPlayer3:: closemessage applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerBottom waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 6410a53b4..e41feef0d 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -37,7 +37,7 @@ PewterCity_Museum_1F_EventScript_ExplainAmber:: PewterCity_Museum_1F_EventScript_EntranceTriggerLeft:: lockall setvar VAR_TEMP_1, 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 goto PewterCity_Museum_1F_EventScript_EntranceTrigger end @@ -45,7 +45,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerLeft:: PewterCity_Museum_1F_EventScript_EntranceTriggerMid:: lockall setvar VAR_TEMP_1, 1 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 goto PewterCity_Museum_1F_EventScript_EntranceTrigger end @@ -53,7 +53,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerMid:: PewterCity_Museum_1F_EventScript_EntranceTriggerRight:: lockall setvar VAR_TEMP_1, 2 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 goto PewterCity_Museum_1F_EventScript_EntranceTrigger end diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 00bed0983..a54266d4e 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -100,16 +100,16 @@ PokemonLeague_BrunosRoom_EventScript_DefeatedBruno:: end PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft:: - applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_BRUNO, Movement_WalkInPlaceFasterLeft waitmovement 0 return PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight:: - applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestRight + applymovement LOCALID_BRUNO, Movement_WalkInPlaceFasterRight waitmovement 0 return PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown:: - applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BRUNO, Movement_WalkInPlaceFasterDown waitmovement 0 return diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 7282a2547..c45d61e8b 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -78,12 +78,12 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: specialvar VAR_RESULT, GetStarterSpecies bufferspeciesname STR_VAR_1, VAR_RESULT msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestRight - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterRight + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterLeft waitmovement 0 msgbox PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival closemessage - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown waitmovement 0 delay 20 msgbox PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe @@ -177,7 +177,7 @@ PokemonLeague_ChampionsRoom_Movement_PlayerExit:: PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter:: delay_8 - walk_in_place_fastest_down + walk_in_place_faster_down delay_16 delay_16 delay_16 @@ -185,7 +185,7 @@ PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter:: delay_16 delay_16 delay_16 - walk_in_place_fastest_left + walk_in_place_faster_left step_end PokemonLeague_ChampionsRoom_Movement_OakEnter:: @@ -199,7 +199,7 @@ PokemonLeague_ChampionsRoom_Movement_OakEnter:: walk_left walk_up walk_up - walk_in_place_fastest_down + walk_in_place_faster_down delay_16 step_end @@ -225,5 +225,5 @@ PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter:: delay_16 delay_16 delay_16 - walk_in_place_fastest_left + walk_in_place_faster_left step_end diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 3181cd7ba..426f594b9 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -22,14 +22,14 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom:: textcolor NPC_TEXT_COLOR_MALE applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom waitmovement 0 - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestLeft - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 delay 18 msgbox PokemonLeague_HallOfFame_Text_OakCongratulations closemessage - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestUp - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 dofieldeffect FLDEFF_HALL_OF_FAME_RECORD diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 985f89f98..908c7a5d1 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -158,10 +158,10 @@ PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayRight:: PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight:: walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 142f48c9c..3d7a6b715 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -47,14 +47,14 @@ PokemonTower_2F_EventScript_Rival:: end PokemonTower_2F_EventScript_RivalFacePlayerRight:: - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestRight - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return PokemonTower_2F_EventScript_RivalFacePlayerDown:: - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return @@ -88,7 +88,7 @@ PokemonTower_2F_Movement_RivalExitRight:: walk_down walk_down walk_down - walk_in_place_fastest_right + walk_in_place_faster_right step_end PokemonTower_2F_Movement_RivalExitDown:: @@ -99,5 +99,5 @@ PokemonTower_2F_Movement_RivalExitDown:: walk_down walk_down walk_down - walk_in_place_fastest_right + walk_in_place_faster_right step_end diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index af4a8e3ce..f3a4d9b8e 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -100,7 +100,7 @@ PokemonTower_7F_Movement_Grunt1ExitLeft:: walk_right walk_down walk_down - walk_in_place_fastest_left + walk_in_place_faster_left step_end PokemonTower_7F_EventScript_Grunt2:: diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index 4d4080b16..b7e9fcfcc 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -49,7 +49,7 @@ Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger:: textcolor NPC_TEXT_COLOR_MALE msgbox Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 call_if_eq VAR_0x8008, 1, Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 740a778a5..0c05c8beb 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -49,7 +49,7 @@ Route18_EastEntrance_1F_EventScript_NeedBikeTrigger:: textcolor NPC_TEXT_COLOR_MALE msgbox Route18_EastEntrance_1F_Text_ExcuseMe closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 call_if_eq VAR_0x8008, 1, Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 6db0a69fd..6f45b8518 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -139,7 +139,7 @@ Route22_Movement_RivalApproachBottom:: walk_right walk_right walk_right - walk_in_place_fastest_down + walk_in_place_faster_down step_end Route22_Movement_PlayerFaceRival:: @@ -151,7 +151,7 @@ Route22_Movement_PlayerFaceRival:: delay_16 delay_16 delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up step_end Route22_EventScript_LateRivalTriggerTop:: diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 06f260fe9..bf8c685da 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -40,7 +40,7 @@ Route24_EventScript_RocketTrigger:: textcolor NPC_TEXT_COLOR_MALE call_if_eq VAR_TEMP_1, 0, Route24_EventScript_RocketApproachPlayer call_if_eq VAR_TEMP_1, 1, Route24_EventScript_RocketMotionToPlayer - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 msgbox Route24_Text_JustEarnedFabulousPrize checkitemspace ITEM_NUGGET @@ -67,7 +67,7 @@ Route24_EventScript_RocketApproachPlayer:: return Route24_EventScript_RocketMotionToPlayer:: - applymovement LOCALID_ROCKET, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_ROCKET, Movement_WalkInPlaceFasterLeft waitmovement 0 return @@ -91,7 +91,7 @@ Route24_Movement_RocketApproachPlayer:: Route24_Movement_RocketWalkBackToPos:: walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end Route24_Movement_WalkDown:: diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 2ba918a4a..b8f39b063 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -137,7 +137,7 @@ Route25_SeaCottage_Movement_BillWalkToTeleporterSouth:: walk_up walk_up walk_left - walk_in_place_fastest_up + walk_in_place_faster_up step_end Route25_SeaCottage_Movement_BillEnterTeleporter:: diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index 60d5a5748..fe8e06607 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -25,7 +25,7 @@ Route5_SouthEntrance_EventScript_GuardTriggerRight:: Route5_SouthEntrance_EventScript_GuardTrigger:: textcolor NPC_TEXT_COLOR_MALE - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 goto_if_set FLAG_GOT_TEA, Route5_SouthEntrance_EventScript_GiveTea msgbox Route5_SouthEntrance_Text_ThirstyOnGuardDuty diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 00961fb86..9f27430d6 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -25,7 +25,7 @@ Route6_NorthEntrance_EventScript_GuardTriggerRight:: Route6_NorthEntrance_EventScript_GuardTrigger:: textcolor NPC_TEXT_COLOR_MALE - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 goto_if_set FLAG_GOT_TEA, Route6_NorthEntrance_EventScript_GiveTea msgbox Route6_NorthEntrance_Text_ThirstyOnGuardDuty diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index a5dadcddd..30c776d0b 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -25,7 +25,7 @@ Route7_EastEntrance_EventScript_GuardTriggerBottom:: Route7_EastEntrance_EventScript_GuardTrigger:: textcolor NPC_TEXT_COLOR_MALE - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 goto_if_set FLAG_GOT_TEA, Route7_EastEntrance_EventScript_GiveTea msgbox Route7_EastEntrance_Text_ThirstyOnGuardDuty diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index 6f4b752dd..1ef74df1b 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -25,7 +25,7 @@ Route8_WestEntrance_EventScript_GuardTriggerBottom:: Route8_WestEntrance_EventScript_GuardTrigger:: textcolor NPC_TEXT_COLOR_MALE - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 goto_if_set FLAG_GOT_TEA, Route8_WestEntrance_EventScript_GiveTea msgbox Route8_WestEntrance_Text_ThirstyOnGuardDuty diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index fb2e10931..e3d30efe1 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -28,7 +28,7 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger:: playbgm MUS_ENCOUNTER_RIVAL, 0 addobject LOCALID_RIVAL delay 10 - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown waitmovement 0 delay 20 call_if_eq VAR_TEMP_1, 0, SSAnne_2F_Corridor_EventScript_RivalApproachLeft @@ -101,7 +101,7 @@ SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight:: delay_16 delay_16 delay_16 - walk_in_place_fastest_left + walk_in_place_faster_left step_end SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid:: @@ -109,7 +109,7 @@ SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid:: delay_16 delay_16 delay_16 - walk_in_place_fastest_left + walk_in_place_faster_left step_end SSAnne_2F_Corridor_Movement_RivalApproachLeft:: @@ -123,7 +123,7 @@ SSAnne_2F_Corridor_Movement_RivalApproachMid:: walk_down walk_down walk_down - walk_in_place_fastest_right + walk_in_place_faster_right step_end SSAnne_2F_Corridor_Movement_RivalApproachRight:: diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 28c220936..e6043855d 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -38,7 +38,7 @@ SSAnne_Exterior_WalkDown:: return SSAnne_Exterior_WalkInPlaceDown:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index cc58ae3a6..680dc871e 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -6,7 +6,7 @@ SaffronCity_Dojo_MapScripts:: SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterLeft waitmovement 0 releaseall end @@ -14,7 +14,7 @@ SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: SaffronCity_Dojo_EventScript_TriggerMasterBattleRight:: lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestRight + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterRight waitmovement 0 releaseall end @@ -25,7 +25,7 @@ SaffronCity_Dojo_EventScript_HitmonleeBall:: goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon showmonpic SPECIES_HITMONLEE, 10, 3 setvar VAR_TEMP_1, SPECIES_HITMONLEE - applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterUp waitmovement 0 textcolor NPC_TEXT_COLOR_MALE msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO @@ -46,7 +46,7 @@ SaffronCity_Dojo_EventScript_HitmonchanBall:: goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon showmonpic SPECIES_HITMONCHAN, 10, 3 setvar VAR_TEMP_1, SPECIES_HITMONCHAN - applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterUp waitmovement 0 textcolor NPC_TEXT_COLOR_MALE msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 767ac508f..d4979c25c 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -19,7 +19,7 @@ SaffronCity_PokemonTrainerFanClub_OnFrame:: SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: lockall textcolor NPC_TEXT_COLOR_FEMALE - applymovement LOCALID_BATTLE_GIRL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BATTLE_GIRL, Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN applymovement LOCALID_BATTLE_GIRL, Movement_ExclamationMark @@ -30,7 +30,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: closemessage applymovement LOCALID_BATTLE_GIRL, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 msgbox SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 @@ -50,7 +50,7 @@ SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ Unused, leftover from RS LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: delay_8 - walk_in_place_fastest_down + walk_in_place_faster_down walk_down walk_down walk_down @@ -71,7 +71,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer:: @ Unused, leftover from RS LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer:: walk_down - walk_in_place_fastest_right + walk_in_place_faster_right step_end @ Unused, leftover from RS @@ -80,7 +80,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:: walk_fast_up walk_fast_up walk_fast_right - walk_in_place_fastest_down + walk_in_place_faster_down step_end SaffronCity_PokemonTrainerFanClub_OnTransition:: diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 5982f4a83..d9da2eca2 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -39,7 +39,7 @@ SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle:: applymovement LOCALID_OLD_WOMAN, SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer waitmovement 0 copyobjectxytoperm LOCALID_OLD_WOMAN - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 call_if_eq VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, SevenIsland_House_Room1_EventScript_BattleWonComment call_if_eq VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, SevenIsland_House_Room1_EventScript_BattleLostComment @@ -67,7 +67,7 @@ SevenIsland_House_Room1_Movement_PlayerReEnterRoom:: SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer:: walk_right - walk_in_place_fastest_down + walk_in_place_faster_down step_end SevenIsland_House_Room1_EventScript_OldWoman:: @@ -160,12 +160,12 @@ SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest:: SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight:: walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end SevenIsland_House_Room1_EventScript_Box:: diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index ce831f140..f8b966a94 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -34,7 +34,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: end SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -60,13 +60,13 @@ SevenIsland_SevaultCanyon_House_Movement_ChanseyDance:: delay_16 walk_in_place_down delay_16 - walk_in_place_fastest_right + walk_in_place_faster_right delay_4 - walk_in_place_fastest_up + walk_in_place_faster_up delay_4 - walk_in_place_fastest_left + walk_in_place_faster_left delay_4 - walk_in_place_fastest_down + walk_in_place_faster_down delay_4 step_end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 81ba1095c..08411f199 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -61,7 +61,7 @@ SilphCo_11F_EventScript_GiovanniTriggerRight:: SilphCo_11F_EventScript_BattleGiovanni:: textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFastestDown + applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFasterDown waitmovement 0 delay 25 msgbox SilphCo_11F_Text_GiovanniIntro @@ -99,7 +99,7 @@ SilphCo_11F_Movement_GiovanniApproachLeft:: walk_down walk_down walk_down - walk_in_place_fastest_left + walk_in_place_faster_left step_end SilphCo_11F_Movement_GiovanniApproachRight:: @@ -114,7 +114,7 @@ SilphCo_11F_Movement_PlayerFaceGiovanni:: delay_16 delay_8 delay_4 - walk_in_place_fastest_right + walk_in_place_faster_right step_end @ Unused diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 3e3f35e93..afa40c8fb 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -37,7 +37,7 @@ SilphCo_7F_EventScript_RivalScene:: playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown applymovement LOCALID_RIVAL, Movement_Delay48 waitmovement 0 msgbox SilphCo_7F_Text_RivalWhatKeptYou diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index 419ba04d4..59c3a7e17 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -60,22 +60,22 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ Lots of redundant scripts below SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -102,28 +102,28 @@ SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest:: SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return @@ -154,13 +154,13 @@ SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest:: SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft:: walk_up walk_up - walk_in_place_fastest_right + walk_in_place_faster_right step_end SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow:: walk_right walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft:: @@ -216,7 +216,7 @@ SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn:: SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit:: delay_16 - walk_in_place_fastest_right + walk_in_place_faster_right step_end SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage:: diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 853fd36f7..3e23e6839 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -22,7 +22,7 @@ SixIsland_PokemonCenter_1F_OnFrame:: SixIsland_PokemonCenter_1F_EventScript_RivalScene:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown waitmovement 0 playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_ExclamationMark @@ -61,7 +61,7 @@ SixIsland_PokemonCenter_1F_Movement_RivalExit:: SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end SixIsland_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 0d7c53e07..c88307195 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -95,23 +95,23 @@ ThreeIsland_EventScript_BikerArgumentScene:: return ThreeIsland_EventScript_PlayerFaceUp:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return @ Unused ThreeIsland_EventScript_PlayerFaceDown:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return ThreeIsland_EventScript_PlayerFaceLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return ThreeIsland_EventScript_PlayerFaceRight:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 return @@ -204,7 +204,7 @@ ThreeIsland_EventScript_BattleBikersTriggerRight:: ThreeIsland_EventScript_BattleBikersScene:: textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_BIKER1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER1, Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN applymovement LOCALID_BIKER1, Movement_ExclamationMark @@ -239,10 +239,10 @@ ThreeIsland_EventScript_BattleBikersScene:: msgbox ThreeIsland_Text_Biker3Intro setvar VAR_LAST_TALKED, LOCALID_BIKER3 trainerbattle_no_intro TRAINER_BIKER_GOON_3, ThreeIsland_Text_Biker3Defeat - applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterLeft waitmovement 0 - applymovement LOCALID_BIKER4, Movement_WalkInPlaceFastestDown - applymovement LOCALID_BIKER5, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER4, Movement_WalkInPlaceFasterDown + applymovement LOCALID_BIKER5, Movement_WalkInPlaceFasterDown waitmovement 0 msgbox ThreeIsland_Text_Biker3PostBattle closemessage @@ -272,33 +272,33 @@ ThreeIsland_EventScript_BattleBikersScene:: end ThreeIsland_EventScript_PaxtonApproachLeft:: - applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachLeft waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachMidLeft:: - applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidLeft waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachMid:: - applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMid applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachMidRight:: - applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidRight waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachRight:: - applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachRight waitmovement 0 @@ -325,7 +325,7 @@ ThreeIsland_Movement_BikerApproach:: ThreeIsland_Movement_Biker1ReturnToPack:: walk_up - walk_in_place_fastest_left + walk_in_place_faster_left step_end ThreeIsland_Movement_BikerSpeak:: @@ -335,7 +335,7 @@ ThreeIsland_Movement_BikerSpeak:: ThreeIsland_Movement_PaxtonApproachLeft:: walk_down walk_left - walk_in_place_fastest_down + walk_in_place_faster_down step_end ThreeIsland_Movement_PaxtonApproachMidLeft:: @@ -345,20 +345,20 @@ ThreeIsland_Movement_PaxtonApproachMidLeft:: ThreeIsland_Movement_PaxtonApproachMid:: walk_down walk_down - walk_in_place_fastest_right + walk_in_place_faster_right step_end ThreeIsland_Movement_PlayerFacePaxton:: delay_16 delay_16 - walk_in_place_fastest_left + walk_in_place_faster_left step_end ThreeIsland_Movement_PaxtonApproachMidRight:: walk_down walk_down walk_right - walk_in_place_fastest_right + walk_in_place_faster_right step_end ThreeIsland_Movement_PaxtonApproachRight:: @@ -366,7 +366,7 @@ ThreeIsland_Movement_PaxtonApproachRight:: walk_down walk_right walk_right - walk_in_place_fastest_right + walk_in_place_faster_right step_end ThreeIsland_EventScript_Woman:: diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 9b7fc032c..c5e8841de 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -48,11 +48,11 @@ ThreeIsland_BerryForest_EventScript_NoRoomForBerry:: return ThreeIsland_BerryForest_Movement_LostelleLookAround:: - walk_in_place_fastest_left + walk_in_place_faster_left delay_16 - walk_in_place_fastest_right + walk_in_place_faster_right delay_8 - walk_in_place_fastest_left + walk_in_place_faster_left step_end ThreeIsland_BerryForest_EventScript_WelcomeSign:: diff --git a/data/maps/TrainerTower_Elevator/scripts.inc b/data/maps/TrainerTower_Elevator/scripts.inc index 659394b14..07dd791f3 100644 --- a/data/maps/TrainerTower_Elevator/scripts.inc +++ b/data/maps/TrainerTower_Elevator/scripts.inc @@ -70,7 +70,7 @@ TrainerTower_Elevator_EventScript_MoveElevator:: return TrainerTower_Elevator_Movement_ExitElevator:: - walk_in_place_fastest_down + walk_in_place_faster_down delay_16 walk_down walk_right diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index d70199be5..ab2e4a8bf 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -43,7 +43,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: special BufferBigGuyOrBigGirlString msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy closemessage - applymovement LOCALID_LOSTELLE, Movement_WalkInPlaceFastestDown + applymovement LOCALID_LOSTELLE, Movement_WalkInPlaceFasterDown waitmovement 0 setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 releaseall @@ -56,7 +56,7 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo closemessage - applymovement LOCALID_DADDY, Movement_WalkInPlaceFastestDown + applymovement LOCALID_DADDY, Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN applymovement LOCALID_DADDY, Movement_ExclamationMark @@ -65,7 +65,7 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: waitmovement 0 applymovement LOCALID_DADDY, Movement_171527 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle closemessage @@ -78,12 +78,12 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: applymovement LOCALID_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland - applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestRight + applymovement LOCALID_BIKER, Movement_WalkInPlaceFasterRight waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt msgbox TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing closemessage - applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER, Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_EXIT removeobject LOCALID_BIKER @@ -101,7 +101,7 @@ Movement_171520:: walk_right walk_right delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up delay_16 step_end @@ -109,20 +109,20 @@ Movement_171527:: walk_down walk_down walk_down - walk_in_place_fastest_left + walk_in_place_faster_left step_end Movement_17152C:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end TwoIsland_JoyfulGameCorner_Movement_BikerLookAround:: - walk_in_place_fastest_left + walk_in_place_faster_left delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up step_end TwoIsland_JoyfulGameCorner_EventScript_InfoMan:: diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index c8f7f9d75..9b7028145 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -191,8 +191,8 @@ VermilionCity_EventScript_ExitedTicketCheck:: VermilionCity_EventScript_CheckTicket:: textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_FERRY_SAILOR, Movement_WalkInPlaceFastestLeft - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement LOCALID_FERRY_SAILOR, Movement_WalkInPlaceFasterLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 goto_if_eq VAR_MAP_SCENE_VERMILION_CITY, 3, VermilionCity_EventScript_CheckSeagallopPresentTrigger msgbox VermilionCity_Text_DoYouHaveATicket diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 824aae6fa..85edc6686 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -43,7 +43,7 @@ ViridianCity_EventScript_TryUnlockGym:: ViridianCity_EventScript_GymDoorLocked:: lockall textcolor NPC_TEXT_COLOR_NEUTRAL - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 msgbox ViridianCity_Text_GymDoorsAreLocked @@ -206,9 +206,9 @@ ViridianCity_Movement_WalkDown:: ViridianCity_EventScript_TutorialTriggerLeft:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFasterLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 call ViridianCity_EventScript_DoTutorialBattle release @@ -217,9 +217,9 @@ ViridianCity_EventScript_TutorialTriggerLeft:: ViridianCity_EventScript_TutorialTriggerRight:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestRight + applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFasterRight waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 call ViridianCity_EventScript_DoTutorialBattle release diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 9d30f53ee..6ff805858 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -21,7 +21,7 @@ ViridianCity_Mart_OnFrame:: ViridianCity_Mart_EventScript_ParcelScene:: lockall textcolor NPC_TEXT_COLOR_MALE - applymovement LOCALID_CLERK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_CLERK, Movement_WalkInPlaceFasterDown waitmovement 0 msgbox ViridianCity_Mart_Text_YouCameFromPallet closemessage @@ -40,7 +40,7 @@ ViridianCity_Mart_Movement_ApproachCounter:: walk_up walk_up walk_up - walk_in_place_fastest_left + walk_in_place_faster_left step_end ViridianCity_Mart_Movement_FacePlayer:: @@ -48,7 +48,7 @@ ViridianCity_Mart_Movement_FacePlayer:: delay_16 delay_16 delay_16 - walk_in_place_fastest_right + walk_in_place_faster_right step_end ViridianCity_Mart_EventScript_Clerk:: diff --git a/data/maps/ViridianCity_School/scripts.inc b/data/maps/ViridianCity_School/scripts.inc index 7f72fb83c..658dfdf0c 100644 --- a/data/maps/ViridianCity_School/scripts.inc +++ b/data/maps/ViridianCity_School/scripts.inc @@ -9,7 +9,7 @@ ViridianCity_School_EventScript_Lass:: faceplayer msgbox ViridianCity_School_Text_TryingToMemorizeNotes closemessage - applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp + applymovement LOCALID_LASS, Movement_WalkInPlaceFasterUp waitmovement 0 release end @@ -36,7 +36,7 @@ ViridianCity_School_EventScript_Notebook:: msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, ViridianCity_School_EventScript_StopReadingNotebook msgbox ViridianCity_School_Text_NotebookFourthPage - applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp + applymovement LOCALID_LASS, Movement_WalkInPlaceFasterUp waitmovement 0 textcolor NPC_TEXT_COLOR_FEMALE msgbox ViridianCity_School_Text_HeyDontLookAtMyNotes diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index a577534bf..b225958a3 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -181,7 +181,7 @@ CableClub_EventScript_PlayerExitLinkRoom:: CableClub_EventScript_Tutorial:: lockall textcolor NPC_TEXT_COLOR_FEMALE - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox CableClub_Text_FirstTimeRightThisWay closemessage diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc index 61960d26a..52e5a2c96 100644 --- a/data/scripts/movement.inc +++ b/data/scripts/movement.inc @@ -25,20 +25,20 @@ Movement_FaceOriginalDirection:: face_original_direction step_end -Movement_WalkInPlaceFastestLeft:: - walk_in_place_fastest_left +Movement_WalkInPlaceFasterLeft:: + walk_in_place_faster_left step_end -Movement_WalkInPlaceFastestUp:: - walk_in_place_fastest_up +Movement_WalkInPlaceFasterUp:: + walk_in_place_faster_up step_end -Movement_WalkInPlaceFastestRight:: - walk_in_place_fastest_right +Movement_WalkInPlaceFasterRight:: + walk_in_place_faster_right step_end -Movement_WalkInPlaceFastestDown:: - walk_in_place_fastest_down +Movement_WalkInPlaceFasterDown:: + walk_in_place_faster_down step_end Movement_FaceRight:: diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index 53875fc5f..bec40c40c 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -19,11 +19,11 @@ EventScript_PkmnCenterNurse_HealPkmn:: end EventScript_PkmnCenterNurse_TakeAndHealPkmn:: - applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestLeft + applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFasterLeft waitmovement 0 dofieldeffect FLDEFF_POKECENTER_HEAL waitfieldeffect FLDEFF_POKECENTER_HEAL - applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestDown + applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFasterDown waitmovement 0 special HealPlayerParty return diff --git a/data/scripts/route23.inc b/data/scripts/route23.inc index dc47d5cc8..7a7b838a0 100644 --- a/data/scripts/route23.inc +++ b/data/scripts/route23.inc @@ -114,7 +114,7 @@ Route23_EventScript_RecognizeBadge:: Route23_EventScript_BadgeGuardTrigger:: textcolor NPC_TEXT_COLOR_MALE - applymovement VAR_0x8009, Movement_WalkInPlaceFastestLeft + applymovement VAR_0x8009, Movement_WalkInPlaceFasterLeft waitmovement 0 switch VAR_TEMP_1 case 1, Route23_EventScript_CheckBoulderBadgeTrigger @@ -173,7 +173,7 @@ Route23_EventScript_MissingBoulderBadgeTrigger:: msgbox Text_CantLetYouPass closemessage applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown - applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown + applymovement VAR_0x8009, Movement_WalkInPlaceFasterDown waitmovement 0 releaseall end @@ -186,7 +186,7 @@ Route23_EventScript_MissingBadgeTrigger:: closemessage waitse applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown - applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown + applymovement VAR_0x8009, Movement_WalkInPlaceFasterDown waitmovement 0 releaseall end diff --git a/data/scripts/white_out.inc b/data/scripts/white_out.inc index 6541d7a21..cbf593c82 100644 --- a/data/scripts/white_out.inc +++ b/data/scripts/white_out.inc @@ -24,7 +24,7 @@ EventScript_AfterWhiteOutHealMsg:: EventScript_AfterWhiteOutMomHeal:: lockall textcolor NPC_TEXT_COLOR_FEMALE - applymovement LOCALID_MOM, Movement_WalkInPlaceFastestDown + applymovement LOCALID_MOM, Movement_WalkInPlaceFasterDown waitmovement 0 msgbox Text_HadQuiteAnExperienceTakeRest call EventScript_OutOfCenterPartyHeal diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index 88056783e..b5ce788bc 100644 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -130,18 +130,18 @@ #define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x2A #define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x2B #define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x2C -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x2D -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x2E -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x2F -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x30 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN 0x2D +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_UP 0x2E +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_LEFT 0x2F +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT 0x30 #define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x31 #define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x32 #define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x33 #define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x34 -#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x35 -#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x36 -#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x37 -#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x38 +#define MOVEMENT_ACTION_WALK_FASTER_DOWN 0x35 +#define MOVEMENT_ACTION_WALK_FASTER_UP 0x36 +#define MOVEMENT_ACTION_WALK_FASTER_LEFT 0x37 +#define MOVEMENT_ACTION_WALK_FASTER_RIGHT 0x38 #define MOVEMENT_ACTION_SLIDE_DOWN 0x39 #define MOVEMENT_ACTION_SLIDE_UP 0x3A #define MOVEMENT_ACTION_SLIDE_LEFT 0x3B diff --git a/src/data/object_events/movement_action_func_tables.h b/src/data/object_events/movement_action_func_tables.h index 9abd6452a..e1222285c 100644 --- a/src/data/object_events/movement_action_func_tables.h +++ b/src/data/object_events/movement_action_func_tables.h @@ -1,87 +1,28 @@ -static bool8 MovementActionFunc_x04_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x05_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x06_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x07_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x08_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x08_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x09_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x09_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x0A_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x0A_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x0B_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x0B_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x0C_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x0C_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x0D_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x0D_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x0E_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x0E_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x0F_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x0F_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x41_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x41_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x42_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x42_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x43_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x43_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x44_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x44_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x70_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x71_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x72_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x73_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x88_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x89_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x8A_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x8B_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x94_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x94_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x95_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x95_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x96_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x96_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x97_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x97_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x98_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x98_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x99_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x9A_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x9B_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x9B_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x9C_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x9C_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x9D_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x9D_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x9E_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x9E_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x9F_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_x9F_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA0_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA0_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA1_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA1_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA2_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA2_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA3_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA3_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA4_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA4_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA4_2(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA5_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA5_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA6_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA6_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA7_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA7_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA8_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA8_1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA9_0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementActionFunc_xA9_1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_FaceDown_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_FaceUp_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_FaceLeft_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_FaceRight_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_PauseSpriteAnim(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_FaceDownFast_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_FaceUpFast_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_FaceLeftFast_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_FaceRightFast_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowerDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowerDown_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowerUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowerUp_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowerLeft_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowerLeft_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowerRight_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowerRight_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowDown_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowUp_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowLeft_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowLeft_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowRight_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowRight_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WalkNormalDown_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WalkNormalDown_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WalkNormalUp_Step0(struct ObjectEvent *, struct Sprite *); @@ -104,10 +45,10 @@ static bool8 MovementAction_WalkInPlaceFastDown_Step0(struct ObjectEvent *, stru static bool8 MovementAction_WalkInPlaceFastUp_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WalkInPlaceFastRight_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkInPlaceFasterDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkInPlaceFasterUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkInPlaceFasterLeft_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkInPlaceFasterRight_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_Jump2Down_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_Jump2Down_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_Jump2Up_Step0(struct ObjectEvent *, struct Sprite *); @@ -116,6 +57,12 @@ static bool8 MovementAction_Jump2Left_Step0(struct ObjectEvent *, struct Sprite static bool8 MovementAction_Jump2Left_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_Jump2Right_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_Jump2Right_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_Delay1_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_Delay2_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_Delay4_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_Delay8_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_Delay16_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_Delay_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WalkFastDown_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WalkFastDown_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WalkFastUp_Step0(struct ObjectEvent *, struct Sprite *); @@ -132,14 +79,14 @@ static bool8 MovementAction_RideWaterCurrentLeft_Step0(struct ObjectEvent *, str static bool8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_RideWaterCurrentRight_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestDown_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestUp_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestLeft_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestRight_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterDown_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterUp_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterLeft_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterLeft_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterRight_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterRight_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_SlideDown_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_SlideDown_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_SlideUp_Step0(struct ObjectEvent *, struct Sprite *); @@ -156,6 +103,15 @@ static bool8 MovementAction_PlayerRunLeft_Step0(struct ObjectEvent *, struct Spr static bool8 MovementAction_PlayerRunLeft_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_PlayerRunRight_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_PlayerRunRight_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_RunDownSlow_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_RunDownSlow_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_RunUpSlow_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_RunUpSlow_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_RunLeftSlow_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_RunLeftSlow_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_RunRightSlow_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_RunRightSlow_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_StartAnimInDirection_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_JumpSpecialDown_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_JumpSpecialDown_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_JumpSpecialUp_Step0(struct ObjectEvent *, struct Sprite *); @@ -164,6 +120,10 @@ static bool8 MovementAction_JumpSpecialLeft_Step0(struct ObjectEvent *, struct S static bool8 MovementAction_JumpSpecialLeft_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_JumpSpecialRight_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_JumpSpecialRight_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_FacePlayer_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_FaceAwayPlayer_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_LockFacingDirection_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_UnlockFacingDirection_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_JumpDown_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_JumpDown_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_JumpUp_Step0(struct ObjectEvent *, struct Sprite *); @@ -188,12 +148,55 @@ static bool8 MovementAction_JumpInPlaceLeftRight_Step0(struct ObjectEvent *, str static bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_JumpInPlaceRightLeft_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_FaceOriginalDirection_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_NurseJoyBowDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_DisableAnimation_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_RestoreAnimation_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_SetInvisible_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_SetVisible_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_EmoteExclamationMark_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_EmoteQuestionMark_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_EmoteX_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_EmoteDoubleExclamationMark_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_EmoteSmile_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_RevealTrainer_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_RockSmashBreak_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_RockSmashBreak_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_RockSmashBreak_Step2(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_CutTree_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_CutTree_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_CutTree_Step2(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_SetFixedPriority_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_ClearFixedPriority_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_InitAffineAnim_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_ClearAffineAnim_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WalkDownStartAffine_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WalkDownStartAffine_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WalkDownAffine_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WalkDownAffine_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroWheelieFaceDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroWheelieFaceUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroWheelieFaceRight_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroPopWheelieDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroPopWheelieDown_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroPopWheelieUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroPopWheelieUp_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroPopWheelieLeft_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroPopWheelieLeft_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroPopWheelieRight_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroPopWheelieRight_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroEndWheelieFaceDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroEndWheelieFaceUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_UnusedAcroActionDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_UnusedAcroActionUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_UnusedAcroActionLeft_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct ObjectEvent *, struct Sprite *); @@ -218,14 +221,10 @@ static bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct ObjectEvent *, stru static bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_AcroWheelieJumpRight_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_AcroPopWheelieDown_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_AcroPopWheelieDown_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_AcroPopWheelieUp_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_AcroPopWheelieUp_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_AcroPopWheelieLeft_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_AcroPopWheelieLeft_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_AcroPopWheelieRight_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_AcroPopWheelieRight_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct ObjectEvent *, struct Sprite *); @@ -242,1404 +241,1426 @@ static bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct ObjectEvent *, stru static bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_AcroWheelieMoveRight_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_AcroEndWheelieFaceDown_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_AcroEndWheelieFaceUp_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_UnusedAcroActionDown_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_UnusedAcroActionUp_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_UnusedAcroActionLeft_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_RockSmashBreak_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_RockSmashBreak_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_RockSmashBreak_Step2(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_CutTree_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_CutTree_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_CutTree_Step2(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_SpinDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_SpinDown_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_SpinUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_SpinUp_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_SpinLeft_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_SpinLeft_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_SpinRight_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_SpinRight_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_x98_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_x98_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_x99_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_x9A_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowestDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowestDown_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowestUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowestUp_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowestLeft_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowestLeft_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowestRight_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkSlowestRight_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_ShakeHeadOrWalkInPlace_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_ShakeHeadOrWalkInPlace_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_xA0_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_xA0_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_xA1_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_xA1_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_xA2_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_xA2_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_xA3_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_xA3_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_FlyUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_FlyUp_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_FlyUp_Step2(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_FlyDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_FlyDown_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_JumpSpecialWithEffectDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_JumpSpecialWithEffectDown_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_JumpSpecialWithEffectUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_JumpSpecialWithEffectUp_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_JumpSpecialWithEffectLeft_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_JumpSpecialWithEffectLeft_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_JumpSpecialWithEffectRight_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_JumpSpecialWithEffectRight_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WaitSpriteAnim(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_Finish(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_Delay_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_Delay1_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_Delay2_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_Delay4_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_Delay8_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_Delay16_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_FacePlayer_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_FaceAwayPlayer_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_FaceOriginalDirection_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_LockFacingDirection_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_UnlockFacingDirection_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_DisableAnimation_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_RestoreAnimation_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_SetInvisible_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_SetVisible_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_StartAnimInDirection_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_NurseJoyBowDown_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_EmoteExclamationMark_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_EmoteQuestionMark_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_EmoteHeart_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 do_double_excl_bubble(struct ObjectEvent *, struct Sprite *); -static bool8 do_smile_bubble(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_SetFixedPriority_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_ClearFixedPriority_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_InitAffineAnim_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_ClearAffineAnim_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x00[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x01[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x02[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x03[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x04[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x05[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x06[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x07[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x08[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x09[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x0A[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x0B[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x0D[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x0C[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x0E[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x0F[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x10[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x11[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x12[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x13[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x14[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x15[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x16[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x17[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x18[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x19[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x1A[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x1B[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x1C[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x1D[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x1E[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x1F[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x20[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x21[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x22[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x23[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x24[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x25[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x26[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x27[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x28[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x29[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x2A[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x2B[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x2C[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x2D[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x2E[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x2F[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x30[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x31[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x32[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x33[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x34[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x35[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x36[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x37[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x38[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x39[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x3A[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x3B[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x3C[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x3D[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x3E[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x3F[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x40[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x41[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x42[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x43[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x44[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x45[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x46[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x47[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x48[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x49[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x4A[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x4B[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x4C[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x4D[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x4E[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x4F[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x50[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x51[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x52[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x53[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x54[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x55[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x56[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x57[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x58[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x59[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x5A[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x5B[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x5C[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x5D[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x5E[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x5F[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x60[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x61[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x62[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x63[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x64[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x65[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x66[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x67[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x68[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x69[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x6A[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x6B[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x6C[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x6D[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x6E[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x6F[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x70[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x71[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x72[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x73[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x74[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x75[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x76[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x77[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x78[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x79[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x7A[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x7B[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x7C[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x7D[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x7E[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x7F[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x80[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x81[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x82[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x83[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x84[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x85[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x86[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x87[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x88[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x89[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x8A[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x8B[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x8C[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x8D[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x8E[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x8F[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x90[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x91[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x92[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x93[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x94[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x95[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x96[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x97[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_FaceDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_FaceUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_FaceLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_FaceRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_FaceDownFast[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_FaceUpFast[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_FaceLeftFast[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_FaceRightFast[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkSlowerDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkSlowerUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkSlowerLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkSlowerRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkSlowUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkSlowDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkSlowLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkSlowRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkNormalDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkNormalUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkNormalLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkNormalRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_Jump2Down[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_Jump2Up[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_Jump2Left[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_Jump2Right[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_Delay1[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_Delay2[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_Delay4[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_Delay8[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_Delay16[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkFastDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkFastUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkFastLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkFastRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceSlowDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceSlowUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceSlowLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceSlowRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceNormalDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceNormalUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceNormalLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceNormalRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceFastDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceFastUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceFastLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceFastRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_RideWaterCurrentDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_RideWaterCurrentUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_RideWaterCurrentLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_RideWaterCurrentRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkFasterDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkFasterUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkFasterLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkFasterRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_SlideDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_SlideUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_SlideLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_SlideRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_PlayerRunDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_PlayerRunUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_PlayerRunLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_PlayerRunRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_PlayerRunDownSlow[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_PlayerRunUpSlow[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_PlayerRunLeftSlow[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_PlayerRunRightSlow[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_StartAnimInDirection[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpSpecialDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpSpecialUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpSpecialLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpSpecialRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_FacePlayer[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_FaceAwayPlayer[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_LockFacingDirection[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_UnlockFacingDirection[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpInPlaceDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpInPlaceUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpInPlaceLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpInPlaceRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpInPlaceDownUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpInPlaceUpDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpInPlaceLeftRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpInPlaceRightLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_FaceOriginalDirection[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_NurseJoyBowDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_DisableAnimation[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_RestoreAnimation[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_SetInvisible[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_SetVisible[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_EmoteExclamationMark[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_EmoteQuestionMark[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_EmoteX[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_EmoteDoubleExclMark[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_EmoteSmile[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_RevealTrainer[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_RockSmashBreak[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_CutTree[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_SetFixedPriority[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_ClearFixedPriority[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_InitAffineAnim[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_ClearAffineAnim[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkDownStartAffine[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkDownAffine[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroPopWheelieDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroPopWheelieUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroPopWheelieLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroPopWheelieRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroEndWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroEndWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroEndWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieHopFaceDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieHopFaceUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieHopFaceRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieHopDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieHopUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieHopLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieHopRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieJumpDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieJumpUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieJumpLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieJumpRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieInPlaceDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieInPlaceUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieInPlaceRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroPopWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroPopWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroPopWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_AcroWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_SpinDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_SpinUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_SpinLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_SpinRight[])(struct ObjectEvent *, struct Sprite *); static bool8 (*const sMovementActionFuncs_x98[])(struct ObjectEvent *, struct Sprite *); static bool8 (*const sMovementActionFuncs_x99[])(struct ObjectEvent *, struct Sprite *); static bool8 (*const sMovementActionFuncs_x9A[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x9B[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x9C[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x9D[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x9E[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_x9F[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkSlowestDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkSlowestUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkSlowestLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkSlowestRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_ShakeHeadOrWalkInPlace[])(struct ObjectEvent *, struct Sprite *); static bool8 (*const sMovementActionFuncs_xA0[])(struct ObjectEvent *, struct Sprite *); static bool8 (*const sMovementActionFuncs_xA1[])(struct ObjectEvent *, struct Sprite *); static bool8 (*const sMovementActionFuncs_xA2[])(struct ObjectEvent *, struct Sprite *); static bool8 (*const sMovementActionFuncs_xA3[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_xA4[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_xA5[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_xA6[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_xA7[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_xA8[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_xA9[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_FlyUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_FlyDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpSpecialWithEffectDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpSpecialWithEffectUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpSpecialWithEffectLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_JumpSpecialWithEffectRight[])(struct ObjectEvent *, struct Sprite *); static u8 GetMoveDirectionFastAnimNum(u8 direction); static u8 GetMoveDirectionFasterAnimNum(u8 direction); static u8 GetMoveDirectionFastestAnimNum(u8 direction); -bool8 (*const *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite *) = { - [MOVEMENT_ACTION_FACE_DOWN] = sMovementActionFuncs_x00, - [MOVEMENT_ACTION_FACE_UP] = sMovementActionFuncs_x01, - [MOVEMENT_ACTION_FACE_LEFT] = sMovementActionFuncs_x02, - [MOVEMENT_ACTION_FACE_RIGHT] = sMovementActionFuncs_x03, - [MOVEMENT_ACTION_FACE_DOWN_FAST] = sMovementActionFuncs_x04, - [MOVEMENT_ACTION_FACE_UP_FAST] = sMovementActionFuncs_x05, - [MOVEMENT_ACTION_FACE_LEFT_FAST] = sMovementActionFuncs_x06, - [MOVEMENT_ACTION_FACE_RIGHT_FAST] = sMovementActionFuncs_x07, - [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, - [MOVEMENT_ACTION_WALK_SLOW_RIGHT] = sMovementActionFuncs_x0F, - [MOVEMENT_ACTION_WALK_NORMAL_DOWN] = sMovementActionFuncs_x10, - [MOVEMENT_ACTION_WALK_NORMAL_UP] = sMovementActionFuncs_x11, - [MOVEMENT_ACTION_WALK_NORMAL_LEFT] = sMovementActionFuncs_x12, - [MOVEMENT_ACTION_WALK_NORMAL_RIGHT] = sMovementActionFuncs_x13, - [MOVEMENT_ACTION_JUMP_2_DOWN] = sMovementActionFuncs_x14, - [MOVEMENT_ACTION_JUMP_2_UP] = sMovementActionFuncs_x15, - [MOVEMENT_ACTION_JUMP_2_LEFT] = sMovementActionFuncs_x16, - [MOVEMENT_ACTION_JUMP_2_RIGHT] = sMovementActionFuncs_x17, - [MOVEMENT_ACTION_DELAY_1] = sMovementActionFuncs_x18, - [MOVEMENT_ACTION_DELAY_2] = sMovementActionFuncs_x19, - [MOVEMENT_ACTION_DELAY_4] = sMovementActionFuncs_x1A, - [MOVEMENT_ACTION_DELAY_8] = sMovementActionFuncs_x1B, - [MOVEMENT_ACTION_DELAY_16] = sMovementActionFuncs_x1C, - [MOVEMENT_ACTION_WALK_FAST_DOWN] = sMovementActionFuncs_x1D, - [MOVEMENT_ACTION_WALK_FAST_UP] = sMovementActionFuncs_x1E, - [MOVEMENT_ACTION_WALK_FAST_LEFT] = sMovementActionFuncs_x1F, - [MOVEMENT_ACTION_WALK_FAST_RIGHT] = sMovementActionFuncs_x20, - [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN] = sMovementActionFuncs_x21, - [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP] = sMovementActionFuncs_x22, - [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT] = sMovementActionFuncs_x23, - [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT] = sMovementActionFuncs_x24, - [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN] = sMovementActionFuncs_x25, - [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP] = sMovementActionFuncs_x26, - [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT] = sMovementActionFuncs_x27, - [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT] = sMovementActionFuncs_x28, - [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN] = sMovementActionFuncs_x29, - [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP] = sMovementActionFuncs_x2A, - [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT] = sMovementActionFuncs_x2B, - [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT] = sMovementActionFuncs_x2C, - [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN] = sMovementActionFuncs_x2D, - [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_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, - [MOVEMENT_ACTION_WALK_FASTEST_RIGHT] = sMovementActionFuncs_x38, - [MOVEMENT_ACTION_SLIDE_DOWN] = sMovementActionFuncs_x39, - [MOVEMENT_ACTION_SLIDE_UP] = sMovementActionFuncs_x3A, - [MOVEMENT_ACTION_SLIDE_LEFT] = sMovementActionFuncs_x3B, - [MOVEMENT_ACTION_SLIDE_RIGHT] = sMovementActionFuncs_x3C, - [MOVEMENT_ACTION_PLAYER_RUN_DOWN] = sMovementActionFuncs_x3D, - [MOVEMENT_ACTION_PLAYER_RUN_UP] = sMovementActionFuncs_x3E, - [MOVEMENT_ACTION_PLAYER_RUN_LEFT] = sMovementActionFuncs_x3F, - [MOVEMENT_ACTION_PLAYER_RUN_RIGHT] = sMovementActionFuncs_x40, - [MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW] = sMovementActionFuncs_x41, - [MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW] = sMovementActionFuncs_x42, - [MOVEMENT_ACTION_PLAYER_RUN_LEFT_SLOW] = sMovementActionFuncs_x43, - [MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW] = sMovementActionFuncs_x44, - [MOVEMENT_ACTION_START_ANIM_IN_DIRECTION] = sMovementActionFuncs_x45, - [MOVEMENT_ACTION_JUMP_SPECIAL_DOWN] = sMovementActionFuncs_x46, - [MOVEMENT_ACTION_JUMP_SPECIAL_UP] = sMovementActionFuncs_x47, - [MOVEMENT_ACTION_JUMP_SPECIAL_LEFT] = sMovementActionFuncs_x48, - [MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT] = sMovementActionFuncs_x49, - [MOVEMENT_ACTION_FACE_PLAYER] = sMovementActionFuncs_x4A, - [MOVEMENT_ACTION_FACE_AWAY_PLAYER] = sMovementActionFuncs_x4B, - [MOVEMENT_ACTION_LOCK_FACING_DIRECTION] = sMovementActionFuncs_x4C, - [MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION] = sMovementActionFuncs_x4D, - [MOVEMENT_ACTION_JUMP_DOWN] = sMovementActionFuncs_x4E, - [MOVEMENT_ACTION_JUMP_UP] = sMovementActionFuncs_x4F, - [MOVEMENT_ACTION_JUMP_LEFT] = sMovementActionFuncs_x50, - [MOVEMENT_ACTION_JUMP_RIGHT] = sMovementActionFuncs_x51, - [MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN] = sMovementActionFuncs_x52, - [MOVEMENT_ACTION_JUMP_IN_PLACE_UP] = sMovementActionFuncs_x53, - [MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT] = sMovementActionFuncs_x54, - [MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT] = sMovementActionFuncs_x55, - [MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP] = sMovementActionFuncs_x56, - [MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN] = sMovementActionFuncs_x57, - [MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT] = sMovementActionFuncs_x58, - [MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT] = sMovementActionFuncs_x59, - [MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION] = sMovementActionFuncs_x5A, - [MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN] = sMovementActionFuncs_x5B, - [MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT] = sMovementActionFuncs_x5C, - [MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT] = sMovementActionFuncs_x5D, - [MOVEMENT_ACTION_DISABLE_ANIMATION] = sMovementActionFuncs_x5E, - [MOVEMENT_ACTION_RESTORE_ANIMATION] = sMovementActionFuncs_x5F, - [MOVEMENT_ACTION_SET_INVISIBLE] = sMovementActionFuncs_x60, - [MOVEMENT_ACTION_SET_VISIBLE] = sMovementActionFuncs_x61, - [MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK] = sMovementActionFuncs_x62, - [MOVEMENT_ACTION_EMOTE_QUESTION_MARK] = sMovementActionFuncs_x63, - [MOVEMENT_ACTION_EMOTE_X] = sMovementActionFuncs_x64, - [MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK] = sMovementActionFuncs_x65, - [MOVEMENT_ACTION_EMOTE_SMILE] = sMovementActionFuncs_x66, - [MOVEMENT_ACTION_REVEAL_TRAINER] = sMovementActionFuncs_x67, - [MOVEMENT_ACTION_ROCK_SMASH_BREAK] = sMovementActionFuncs_x68, - [MOVEMENT_ACTION_CUT_TREE] = sMovementActionFuncs_x69, - [MOVEMENT_ACTION_SET_FIXED_PRIORITY] = sMovementActionFuncs_x6A, - [MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY] = sMovementActionFuncs_x6B, - [MOVEMENT_ACTION_INIT_AFFINE_ANIM] = sMovementActionFuncs_x6C, - [MOVEMENT_ACTION_CLEAR_AFFINE_ANIM] = sMovementActionFuncs_x6D, - [MOVEMENT_ACTION_WALK_DOWN_START_AFFINE] = sMovementActionFuncs_x6E, - [MOVEMENT_ACTION_WALK_DOWN_AFFINE] = sMovementActionFuncs_x6F, - [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN] = sMovementActionFuncs_x70, - [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP] = sMovementActionFuncs_x71, - [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT] = sMovementActionFuncs_x72, - [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT] = sMovementActionFuncs_x73, - [MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN] = sMovementActionFuncs_x74, - [MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP] = sMovementActionFuncs_x75, - [MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT] = sMovementActionFuncs_x76, - [MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT] = sMovementActionFuncs_x77, - [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN] = sMovementActionFuncs_x78, - [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP] = sMovementActionFuncs_x79, - [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT] = sMovementActionFuncs_x7A, - [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT] = sMovementActionFuncs_x7B, - [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN] = sMovementActionFuncs_x7C, - [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP] = sMovementActionFuncs_x7D, - [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT] = sMovementActionFuncs_x7E, - [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT] = sMovementActionFuncs_x7F, - [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN] = sMovementActionFuncs_x80, - [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP] = sMovementActionFuncs_x81, - [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT] = sMovementActionFuncs_x82, - [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT] = sMovementActionFuncs_x83, - [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN] = sMovementActionFuncs_x84, - [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP] = sMovementActionFuncs_x85, - [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT] = sMovementActionFuncs_x86, - [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT] = sMovementActionFuncs_x87, - [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN] = sMovementActionFuncs_x88, - [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP] = sMovementActionFuncs_x89, - [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT] = sMovementActionFuncs_x8A, - [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT] = sMovementActionFuncs_x8B, - [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN] = sMovementActionFuncs_x8C, - [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP] = sMovementActionFuncs_x8D, - [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT] = sMovementActionFuncs_x8E, - [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT] = sMovementActionFuncs_x8F, - [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN] = sMovementActionFuncs_x90, - [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_SPIN_DOWN] = sMovementActionFuncs_x94, - [MOVEMENT_ACTION_SPIN_UP] = sMovementActionFuncs_x95, - [MOVEMENT_ACTION_SPIN_LEFT] = sMovementActionFuncs_x96, - [MOVEMENT_ACTION_SPIN_RIGHT] = sMovementActionFuncs_x97, +static bool8 (*const *const sMovementActionFuncs[])(struct ObjectEvent *, struct Sprite *) = { + [MOVEMENT_ACTION_FACE_DOWN] = sMovementActionFuncs_FaceDown, + [MOVEMENT_ACTION_FACE_UP] = sMovementActionFuncs_FaceUp, + [MOVEMENT_ACTION_FACE_LEFT] = sMovementActionFuncs_FaceLeft, + [MOVEMENT_ACTION_FACE_RIGHT] = sMovementActionFuncs_FaceRight, + [MOVEMENT_ACTION_FACE_DOWN_FAST] = sMovementActionFuncs_FaceDownFast, + [MOVEMENT_ACTION_FACE_UP_FAST] = sMovementActionFuncs_FaceUpFast, + [MOVEMENT_ACTION_FACE_LEFT_FAST] = sMovementActionFuncs_FaceLeftFast, + [MOVEMENT_ACTION_FACE_RIGHT_FAST] = sMovementActionFuncs_FaceRightFast, + [MOVEMENT_ACTION_WALK_SLOWER_DOWN] = sMovementActionFuncs_WalkSlowerDown, + [MOVEMENT_ACTION_WALK_SLOWER_UP] = sMovementActionFuncs_WalkSlowerUp, + [MOVEMENT_ACTION_WALK_SLOWER_LEFT] = sMovementActionFuncs_WalkSlowerLeft, + [MOVEMENT_ACTION_WALK_SLOWER_RIGHT] = sMovementActionFuncs_WalkSlowerRight, + [MOVEMENT_ACTION_WALK_SLOW_DOWN] = sMovementActionFuncs_WalkSlowDown, + [MOVEMENT_ACTION_WALK_SLOW_UP] = sMovementActionFuncs_WalkSlowUp, + [MOVEMENT_ACTION_WALK_SLOW_LEFT] = sMovementActionFuncs_WalkSlowLeft, + [MOVEMENT_ACTION_WALK_SLOW_RIGHT] = sMovementActionFuncs_WalkSlowRight, + [MOVEMENT_ACTION_WALK_NORMAL_DOWN] = sMovementActionFuncs_WalkNormalDown, + [MOVEMENT_ACTION_WALK_NORMAL_UP] = sMovementActionFuncs_WalkNormalUp, + [MOVEMENT_ACTION_WALK_NORMAL_LEFT] = sMovementActionFuncs_WalkNormalLeft, + [MOVEMENT_ACTION_WALK_NORMAL_RIGHT] = sMovementActionFuncs_WalkNormalRight, + [MOVEMENT_ACTION_JUMP_2_DOWN] = sMovementActionFuncs_Jump2Down, + [MOVEMENT_ACTION_JUMP_2_UP] = sMovementActionFuncs_Jump2Up, + [MOVEMENT_ACTION_JUMP_2_LEFT] = sMovementActionFuncs_Jump2Left, + [MOVEMENT_ACTION_JUMP_2_RIGHT] = sMovementActionFuncs_Jump2Right, + [MOVEMENT_ACTION_DELAY_1] = sMovementActionFuncs_Delay1, + [MOVEMENT_ACTION_DELAY_2] = sMovementActionFuncs_Delay2, + [MOVEMENT_ACTION_DELAY_4] = sMovementActionFuncs_Delay4, + [MOVEMENT_ACTION_DELAY_8] = sMovementActionFuncs_Delay8, + [MOVEMENT_ACTION_DELAY_16] = sMovementActionFuncs_Delay16, + [MOVEMENT_ACTION_WALK_FAST_DOWN] = sMovementActionFuncs_WalkFastDown, + [MOVEMENT_ACTION_WALK_FAST_UP] = sMovementActionFuncs_WalkFastUp, + [MOVEMENT_ACTION_WALK_FAST_LEFT] = sMovementActionFuncs_WalkFastLeft, + [MOVEMENT_ACTION_WALK_FAST_RIGHT] = sMovementActionFuncs_WalkFastRight, + [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN] = sMovementActionFuncs_WalkInPlaceSlowDown, + [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP] = sMovementActionFuncs_WalkInPlaceSlowUp, + [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT] = sMovementActionFuncs_WalkInPlaceSlowLeft, + [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT] = sMovementActionFuncs_WalkInPlaceSlowRight, + [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN] = sMovementActionFuncs_WalkInPlaceNormalDown, + [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP] = sMovementActionFuncs_WalkInPlaceNormalUp, + [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT] = sMovementActionFuncs_WalkInPlaceNormalLeft, + [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT] = sMovementActionFuncs_WalkInPlaceNormalRight, + [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN] = sMovementActionFuncs_WalkInPlaceFastDown, + [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP] = sMovementActionFuncs_WalkInPlaceFastUp, + [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT] = sMovementActionFuncs_WalkInPlaceFastLeft, + [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT] = sMovementActionFuncs_WalkInPlaceFastRight, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN] = sMovementActionFuncs_WalkInPlaceFasterDown, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_UP] = sMovementActionFuncs_WalkInPlaceFasterUp, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_LEFT] = sMovementActionFuncs_WalkInPlaceFasterLeft, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT] = sMovementActionFuncs_WalkInPlaceFasterRight, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN] = sMovementActionFuncs_RideWaterCurrentDown, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP] = sMovementActionFuncs_RideWaterCurrentUp, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT] = sMovementActionFuncs_RideWaterCurrentLeft, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT] = sMovementActionFuncs_RideWaterCurrentRight, + [MOVEMENT_ACTION_WALK_FASTER_DOWN] = sMovementActionFuncs_WalkFasterDown, + [MOVEMENT_ACTION_WALK_FASTER_UP] = sMovementActionFuncs_WalkFasterUp, + [MOVEMENT_ACTION_WALK_FASTER_LEFT] = sMovementActionFuncs_WalkFasterLeft, + [MOVEMENT_ACTION_WALK_FASTER_RIGHT] = sMovementActionFuncs_WalkFasterRight, + [MOVEMENT_ACTION_SLIDE_DOWN] = sMovementActionFuncs_SlideDown, + [MOVEMENT_ACTION_SLIDE_UP] = sMovementActionFuncs_SlideUp, + [MOVEMENT_ACTION_SLIDE_LEFT] = sMovementActionFuncs_SlideLeft, + [MOVEMENT_ACTION_SLIDE_RIGHT] = sMovementActionFuncs_SlideRight, + [MOVEMENT_ACTION_PLAYER_RUN_DOWN] = sMovementActionFuncs_PlayerRunDown, + [MOVEMENT_ACTION_PLAYER_RUN_UP] = sMovementActionFuncs_PlayerRunUp, + [MOVEMENT_ACTION_PLAYER_RUN_LEFT] = sMovementActionFuncs_PlayerRunLeft, + [MOVEMENT_ACTION_PLAYER_RUN_RIGHT] = sMovementActionFuncs_PlayerRunRight, + [MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW] = sMovementActionFuncs_PlayerRunDownSlow, + [MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW] = sMovementActionFuncs_PlayerRunUpSlow, + [MOVEMENT_ACTION_PLAYER_RUN_LEFT_SLOW] = sMovementActionFuncs_PlayerRunLeftSlow, + [MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW] = sMovementActionFuncs_PlayerRunRightSlow, + [MOVEMENT_ACTION_START_ANIM_IN_DIRECTION] = sMovementActionFuncs_StartAnimInDirection, + [MOVEMENT_ACTION_JUMP_SPECIAL_DOWN] = sMovementActionFuncs_JumpSpecialDown, + [MOVEMENT_ACTION_JUMP_SPECIAL_UP] = sMovementActionFuncs_JumpSpecialUp, + [MOVEMENT_ACTION_JUMP_SPECIAL_LEFT] = sMovementActionFuncs_JumpSpecialLeft, + [MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT] = sMovementActionFuncs_JumpSpecialRight, + [MOVEMENT_ACTION_FACE_PLAYER] = sMovementActionFuncs_FacePlayer, + [MOVEMENT_ACTION_FACE_AWAY_PLAYER] = sMovementActionFuncs_FaceAwayPlayer, + [MOVEMENT_ACTION_LOCK_FACING_DIRECTION] = sMovementActionFuncs_LockFacingDirection, + [MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION] = sMovementActionFuncs_UnlockFacingDirection, + [MOVEMENT_ACTION_JUMP_DOWN] = sMovementActionFuncs_JumpDown, + [MOVEMENT_ACTION_JUMP_UP] = sMovementActionFuncs_JumpUp, + [MOVEMENT_ACTION_JUMP_LEFT] = sMovementActionFuncs_JumpLeft, + [MOVEMENT_ACTION_JUMP_RIGHT] = sMovementActionFuncs_JumpRight, + [MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN] = sMovementActionFuncs_JumpInPlaceDown, + [MOVEMENT_ACTION_JUMP_IN_PLACE_UP] = sMovementActionFuncs_JumpInPlaceUp, + [MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT] = sMovementActionFuncs_JumpInPlaceLeft, + [MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT] = sMovementActionFuncs_JumpInPlaceRight, + [MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP] = sMovementActionFuncs_JumpInPlaceDownUp, + [MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN] = sMovementActionFuncs_JumpInPlaceUpDown, + [MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT] = sMovementActionFuncs_JumpInPlaceLeftRight, + [MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT] = sMovementActionFuncs_JumpInPlaceRightLeft, + [MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION] = sMovementActionFuncs_FaceOriginalDirection, + [MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN] = sMovementActionFuncs_NurseJoyBowDown, + [MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT] = sMovementActionFuncs_EnableJumpLandingGroundEffect, + [MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT] = sMovementActionFuncs_DisableJumpLandingGroundEffect, + [MOVEMENT_ACTION_DISABLE_ANIMATION] = sMovementActionFuncs_DisableAnimation, + [MOVEMENT_ACTION_RESTORE_ANIMATION] = sMovementActionFuncs_RestoreAnimation, + [MOVEMENT_ACTION_SET_INVISIBLE] = sMovementActionFuncs_SetInvisible, + [MOVEMENT_ACTION_SET_VISIBLE] = sMovementActionFuncs_SetVisible, + [MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK] = sMovementActionFuncs_EmoteExclamationMark, + [MOVEMENT_ACTION_EMOTE_QUESTION_MARK] = sMovementActionFuncs_EmoteQuestionMark, + [MOVEMENT_ACTION_EMOTE_X] = sMovementActionFuncs_EmoteX, + [MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK] = sMovementActionFuncs_EmoteDoubleExclMark, + [MOVEMENT_ACTION_EMOTE_SMILE] = sMovementActionFuncs_EmoteSmile, + [MOVEMENT_ACTION_REVEAL_TRAINER] = sMovementActionFuncs_RevealTrainer, + [MOVEMENT_ACTION_ROCK_SMASH_BREAK] = sMovementActionFuncs_RockSmashBreak, + [MOVEMENT_ACTION_CUT_TREE] = sMovementActionFuncs_CutTree, + [MOVEMENT_ACTION_SET_FIXED_PRIORITY] = sMovementActionFuncs_SetFixedPriority, + [MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY] = sMovementActionFuncs_ClearFixedPriority, + [MOVEMENT_ACTION_INIT_AFFINE_ANIM] = sMovementActionFuncs_InitAffineAnim, + [MOVEMENT_ACTION_CLEAR_AFFINE_ANIM] = sMovementActionFuncs_ClearAffineAnim, + [MOVEMENT_ACTION_WALK_DOWN_START_AFFINE] = sMovementActionFuncs_WalkDownStartAffine, + [MOVEMENT_ACTION_WALK_DOWN_AFFINE] = sMovementActionFuncs_WalkDownAffine, + [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN] = sMovementActionFuncs_AcroWheelieFaceDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP] = sMovementActionFuncs_AcroWheelieFaceUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT] = sMovementActionFuncs_AcroWheelieFaceLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT] = sMovementActionFuncs_AcroWheelieFaceRight, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN] = sMovementActionFuncs_AcroPopWheelieDown, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP] = sMovementActionFuncs_AcroPopWheelieUp, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT] = sMovementActionFuncs_AcroPopWheelieLeft, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT] = sMovementActionFuncs_AcroPopWheelieRight, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN] = sMovementActionFuncs_AcroEndWheelieFaceDown, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP] = sMovementActionFuncs_AcroEndWheelieFaceUp, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT] = sMovementActionFuncs_AcroEndWheelieFaceLeft, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT] = sMovementActionFuncs_AcroEndWheelieFaceRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN] = sMovementActionFuncs_AcroWheelieHopFaceDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP] = sMovementActionFuncs_AcroWheelieHopFaceUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT] = sMovementActionFuncs_AcroWheelieHopFaceLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT] = sMovementActionFuncs_AcroWheelieHopFaceRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN] = sMovementActionFuncs_AcroWheelieHopDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP] = sMovementActionFuncs_AcroWheelieHopUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT] = sMovementActionFuncs_AcroWheelieHopLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT] = sMovementActionFuncs_AcroWheelieHopRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN] = sMovementActionFuncs_AcroWheelieJumpDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP] = sMovementActionFuncs_AcroWheelieJumpUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT] = sMovementActionFuncs_AcroWheelieJumpLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT] = sMovementActionFuncs_AcroWheelieJumpRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN] = sMovementActionFuncs_AcroWheelieInPlaceDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP] = sMovementActionFuncs_AcroWheelieInPlaceUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT] = sMovementActionFuncs_AcroWheelieInPlaceLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT] = sMovementActionFuncs_AcroWheelieInPlaceRight, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN] = sMovementActionFuncs_AcroPopWheelieMoveDown, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP] = sMovementActionFuncs_AcroPopWheelieMoveUp, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT] = sMovementActionFuncs_AcroPopWheelieMoveLeft, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT] = sMovementActionFuncs_AcroPopWheelieMoveRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN] = sMovementActionFuncs_AcroWheelieMoveDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP] = sMovementActionFuncs_AcroWheelieMoveUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT] = sMovementActionFuncs_AcroWheelieMoveLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT] = sMovementActionFuncs_AcroWheelieMoveRight, + [MOVEMENT_ACTION_SPIN_DOWN] = sMovementActionFuncs_SpinDown, + [MOVEMENT_ACTION_SPIN_UP] = sMovementActionFuncs_SpinUp, + [MOVEMENT_ACTION_SPIN_LEFT] = sMovementActionFuncs_SpinLeft, + [MOVEMENT_ACTION_SPIN_RIGHT] = sMovementActionFuncs_SpinRight, [MOVEMENT_ACTION_0x98] = sMovementActionFuncs_x98, [MOVEMENT_ACTION_0x99] = sMovementActionFuncs_x99, [MOVEMENT_ACTION_0x9A] = sMovementActionFuncs_x9A, - [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_OR_WALK_IN_PLACE] = sMovementActionFuncs_x9F, + [MOVEMENT_ACTION_WALK_SLOWEST_DOWN] = sMovementActionFuncs_WalkSlowestDown, + [MOVEMENT_ACTION_WALK_SLOWEST_UP] = sMovementActionFuncs_WalkSlowestUp, + [MOVEMENT_ACTION_WALK_SLOWEST_LEFT] = sMovementActionFuncs_WalkSlowestLeft, + [MOVEMENT_ACTION_WALK_SLOWEST_RIGHT] = sMovementActionFuncs_WalkSlowestRight, + [MOVEMENT_ACTION_SHAKE_HEAD_OR_WALK_IN_PLACE] = sMovementActionFuncs_ShakeHeadOrWalkInPlace, [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_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, + [MOVEMENT_ACTION_FLY_UP] = sMovementActionFuncs_FlyUp, + [MOVEMENT_ACTION_FLY_DOWN] = sMovementActionFuncs_FlyDown, + [MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_DOWN] = sMovementActionFuncs_JumpSpecialWithEffectDown, + [MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_UP] = sMovementActionFuncs_JumpSpecialWithEffectUp, + [MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_LEFT] = sMovementActionFuncs_JumpSpecialWithEffectLeft, + [MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_RIGHT] = sMovementActionFuncs_JumpSpecialWithEffectRight, }; -static bool8 (*const sMovementActionFuncs_x00[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_FaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceDown_Step0, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x01[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_FaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceUp_Step0, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x02[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_FaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceLeft_Step0, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x03[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_FaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceRight_Step0, MovementAction_PauseSpriteAnim, }; -static bool8 (*const gUnknown_83A6884[])(u8) = { - GetMoveDirectionAnimNum, - GetMoveDirectionFastAnimNum, - GetMoveDirectionFastAnimNum, - GetMoveDirectionFasterAnimNum, - GetMoveDirectionFastestAnimNum, +static bool8 (*const sDirectionAnimFuncsBySpeed[])(u8) = { + [MOVE_SPEED_NORMAL] = GetMoveDirectionAnimNum, + [MOVE_SPEED_FAST_1] = GetMoveDirectionFastAnimNum, + [MOVE_SPEED_FAST_2] = GetMoveDirectionFastAnimNum, + [MOVE_SPEED_FASTER] = GetMoveDirectionFasterAnimNum, + [MOVE_SPEED_FASTEST] = GetMoveDirectionFastestAnimNum, }; -static bool8 (*const sMovementActionFuncs_x9B[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x9B_0, - MovementActionFunc_x9B_1, +static bool8 (*const sMovementActionFuncs_WalkSlowestDown[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkSlowestDown_Step0, + MovementAction_WalkSlowestDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x9C[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x9C_0, - MovementActionFunc_x9C_1, +static bool8 (*const sMovementActionFuncs_WalkSlowestUp[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkSlowestUp_Step0, + MovementAction_WalkSlowestUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x9D[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x9D_0, - MovementActionFunc_x9D_1, +static bool8 (*const sMovementActionFuncs_WalkSlowestLeft[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkSlowestLeft_Step0, + MovementAction_WalkSlowestLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x9E[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x9E_0, - MovementActionFunc_x9E_1, +static bool8 (*const sMovementActionFuncs_WalkSlowestRight[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkSlowestRight_Step0, + MovementAction_WalkSlowestRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x08[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x08_0, - MovementActionFunc_x08_1, +static bool8 (*const sMovementActionFuncs_WalkSlowerDown[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkSlowerDown_Step0, + MovementAction_WalkSlowerDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x09[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x09_0, - MovementActionFunc_x09_1, +static bool8 (*const sMovementActionFuncs_WalkSlowerUp[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkSlowerUp_Step0, + MovementAction_WalkSlowerUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x0A[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x0A_0, - MovementActionFunc_x0A_1, +static bool8 (*const sMovementActionFuncs_WalkSlowerLeft[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkSlowerLeft_Step0, + MovementAction_WalkSlowerLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x0B[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x0B_0, - MovementActionFunc_x0B_1, +static bool8 (*const sMovementActionFuncs_WalkSlowerRight[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkSlowerRight_Step0, + MovementAction_WalkSlowerRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x0D[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x0D_0, - MovementActionFunc_x0D_1, +static bool8 (*const sMovementActionFuncs_WalkSlowUp[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkSlowUp_Step0, + MovementAction_WalkSlowUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x0C[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x0C_0, - MovementActionFunc_x0C_1, +static bool8 (*const sMovementActionFuncs_WalkSlowDown[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkSlowDown_Step0, + MovementAction_WalkSlowDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x0E[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x0E_0, - MovementActionFunc_x0E_1, +static bool8 (*const sMovementActionFuncs_WalkSlowLeft[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkSlowLeft_Step0, + MovementAction_WalkSlowLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x0F[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x0F_0, - MovementActionFunc_x0F_1, +static bool8 (*const sMovementActionFuncs_WalkSlowRight[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkSlowRight_Step0, + MovementAction_WalkSlowRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x10[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkNormalDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDown_Step0, MovementAction_WalkNormalDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x11[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkNormalUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalUp_Step0, MovementAction_WalkNormalUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x12[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkNormalLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalLeft_Step0, MovementAction_WalkNormalLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x13[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkNormalRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalRight_Step0, MovementAction_WalkNormalRight_Step1, MovementAction_PauseSpriteAnim, }; -const s16 gUnknown_83A6958[] = {0, 1, 1}; -const s16 gUnknown_83A695E[] = {0, 0, 1}; +static const s16 sJumpInitDisplacements[] = { + [JUMP_DISTANCE_IN_PLACE] = 0, + [JUMP_DISTANCE_NORMAL] = 1, + [JUMP_DISTANCE_FAR] = 1, +}; -static bool8 (*const sMovementActionFuncs_x14[])(struct ObjectEvent *, struct Sprite *) = { +static const s16 sJumpDisplacements[] = { + [JUMP_DISTANCE_IN_PLACE] = 0, + [JUMP_DISTANCE_NORMAL] = 0, + [JUMP_DISTANCE_FAR] = 1, +}; + +static bool8 (*const sMovementActionFuncs_Jump2Down[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Down_Step0, MovementAction_Jump2Down_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x15[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_Jump2Up[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Up_Step0, MovementAction_Jump2Up_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x16[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_Jump2Left[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Left_Step0, MovementAction_Jump2Left_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x17[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_Jump2Right[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Right_Step0, MovementAction_Jump2Right_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x18[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_Delay1[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay1_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x19[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_Delay2[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay2_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x1A[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_Delay4[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay4_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x1B[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_Delay8[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay8_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x1C[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_Delay16[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay16_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x1D[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkFastDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastDown_Step0, MovementAction_WalkFastDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x1E[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkFastUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastUp_Step0, MovementAction_WalkFastUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x1F[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkFastLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastLeft_Step0, MovementAction_WalkFastLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x20[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkFastRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastRight_Step0, MovementAction_WalkFastRight_Step1, MovementAction_PauseSpriteAnim, }; static bool8 (*const sMovementActionFuncs_xA0[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_xA0_0, - MovementActionFunc_xA0_1, + MovementAction_xA0_Step0, + MovementAction_xA0_Step1, MovementAction_Finish, }; static bool8 (*const sMovementActionFuncs_xA1[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_xA1_0, - MovementActionFunc_xA1_1, + MovementAction_xA1_Step0, + MovementAction_xA1_Step1, MovementAction_Finish, }; static bool8 (*const sMovementActionFuncs_xA2[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_xA2_0, - MovementActionFunc_xA2_1, + MovementAction_xA2_Step0, + MovementAction_xA2_Step1, MovementAction_Finish, }; static bool8 (*const sMovementActionFuncs_xA3[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_xA3_0, - MovementActionFunc_xA3_1, + MovementAction_xA3_Step0, + MovementAction_xA3_Step1, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x04[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x04_0, +static bool8 (*const sMovementActionFuncs_FaceDownFast[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_FaceDownFast_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x05[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x05_0, +static bool8 (*const sMovementActionFuncs_FaceUpFast[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_FaceUpFast_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x06[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x06_0, +static bool8 (*const sMovementActionFuncs_FaceLeftFast[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_FaceLeftFast_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x07[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x07_0, +static bool8 (*const sMovementActionFuncs_FaceRightFast[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_FaceRightFast_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x21[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkInPlaceSlowDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowDown_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x22[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkInPlaceSlowUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowUp_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x23[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkInPlaceSlowLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowLeft_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x24[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkInPlaceSlowRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowRight_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x25[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkInPlaceNormalDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x26[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkInPlaceNormalUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x27[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkInPlaceNormalLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x28[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkInPlaceNormalRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x29[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkInPlaceFastDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x2A[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkInPlaceFastUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x2B[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkInPlaceFastLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x2C[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkInPlaceFastRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x2D[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestDown_Step0, +static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterDown[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkInPlaceFasterDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x2E[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestUp_Step0, +static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterUp[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkInPlaceFasterUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x2F[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestLeft_Step0, +static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterLeft[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkInPlaceFasterLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x30[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestRight_Step0, +static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterRight[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkInPlaceFasterRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x31[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_RideWaterCurrentDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentDown_Step0, MovementAction_RideWaterCurrentDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x32[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_RideWaterCurrentUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentUp_Step0, MovementAction_RideWaterCurrentUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x33[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_RideWaterCurrentLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentLeft_Step0, MovementAction_RideWaterCurrentLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x34[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_RideWaterCurrentRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentRight_Step0, MovementAction_RideWaterCurrentRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x35[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkFastestDown_Step0, - MovementAction_WalkFastestDown_Step1, +static bool8 (*const sMovementActionFuncs_WalkFasterDown[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkFasterDown_Step0, + MovementAction_WalkFasterDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x36[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkFastestUp_Step0, - MovementAction_WalkFastestUp_Step1, +static bool8 (*const sMovementActionFuncs_WalkFasterUp[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkFasterUp_Step0, + MovementAction_WalkFasterUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x37[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkFastestLeft_Step0, - MovementAction_WalkFastestLeft_Step1, +static bool8 (*const sMovementActionFuncs_WalkFasterLeft[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkFasterLeft_Step0, + MovementAction_WalkFasterLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x38[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkFastestRight_Step0, - MovementAction_WalkFastestRight_Step1, +static bool8 (*const sMovementActionFuncs_WalkFasterRight[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkFasterRight_Step0, + MovementAction_WalkFasterRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x39[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_SlideDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideDown_Step0, MovementAction_SlideDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x3A[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_SlideUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideUp_Step0, MovementAction_SlideUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x3B[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_SlideLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideLeft_Step0, MovementAction_SlideLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x3C[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_SlideRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideRight_Step0, MovementAction_SlideRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x3D[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_PlayerRunDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunDown_Step0, MovementAction_PlayerRunDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x3E[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_PlayerRunUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunUp_Step0, MovementAction_PlayerRunUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x3F[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_PlayerRunLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunLeft_Step0, MovementAction_PlayerRunLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x40[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_PlayerRunRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunRight_Step0, MovementAction_PlayerRunRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x41[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x41_0, - MovementActionFunc_x41_1, +static bool8 (*const sMovementActionFuncs_PlayerRunDownSlow[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_RunDownSlow_Step0, + MovementAction_RunDownSlow_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x42[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x42_0, - MovementActionFunc_x42_1, +static bool8 (*const sMovementActionFuncs_PlayerRunUpSlow[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_RunUpSlow_Step0, + MovementAction_RunUpSlow_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x43[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x43_0, - MovementActionFunc_x43_1, +static bool8 (*const sMovementActionFuncs_PlayerRunLeftSlow[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_RunLeftSlow_Step0, + MovementAction_RunLeftSlow_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x44[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x44_0, - MovementActionFunc_x44_1, +static bool8 (*const sMovementActionFuncs_PlayerRunRightSlow[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_RunRightSlow_Step0, + MovementAction_RunRightSlow_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x45[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_StartAnimInDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_StartAnimInDirection_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x46[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpSpecialDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialDown_Step0, MovementAction_JumpSpecialDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x47[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpSpecialUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialUp_Step0, MovementAction_JumpSpecialUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x48[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpSpecialLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialLeft_Step0, MovementAction_JumpSpecialLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x49[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpSpecialRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialRight_Step0, MovementAction_JumpSpecialRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_xA6[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_xA6_0, - MovementActionFunc_xA6_1, +static bool8 (*const sMovementActionFuncs_JumpSpecialWithEffectDown[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_JumpSpecialWithEffectDown_Step0, + MovementAction_JumpSpecialWithEffectDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_xA7[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_xA7_0, - MovementActionFunc_xA7_1, +static bool8 (*const sMovementActionFuncs_JumpSpecialWithEffectUp[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_JumpSpecialWithEffectUp_Step0, + MovementAction_JumpSpecialWithEffectUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_xA8[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_xA8_0, - MovementActionFunc_xA8_1, +static bool8 (*const sMovementActionFuncs_JumpSpecialWithEffectLeft[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_JumpSpecialWithEffectLeft_Step0, + MovementAction_JumpSpecialWithEffectLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_xA9[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_xA9_0, - MovementActionFunc_xA9_1, +static bool8 (*const sMovementActionFuncs_JumpSpecialWithEffectRight[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_JumpSpecialWithEffectRight_Step0, + MovementAction_JumpSpecialWithEffectRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x4A[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_FacePlayer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FacePlayer_Step0, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x4B[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_FaceAwayPlayer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceAwayPlayer_Step0, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x4C[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_LockFacingDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_LockFacingDirection_Step0, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x4D[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_UnlockFacingDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnlockFacingDirection_Step0, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x4E[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpDown_Step0, MovementAction_JumpDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x4F[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpUp_Step0, MovementAction_JumpUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x50[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpLeft_Step0, MovementAction_JumpLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x51[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpRight_Step0, MovementAction_JumpRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x52[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpInPlaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceDown_Step0, MovementAction_JumpInPlaceDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x53[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpInPlaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceUp_Step0, MovementAction_JumpInPlaceUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x54[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpInPlaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceLeft_Step0, MovementAction_JumpInPlaceLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x55[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpInPlaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceRight_Step0, MovementAction_JumpInPlaceRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x56[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpInPlaceDownUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceDownUp_Step0, MovementAction_JumpInPlaceDownUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x57[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpInPlaceUpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceUpDown_Step0, MovementAction_JumpInPlaceUpDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x58[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpInPlaceLeftRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceLeftRight_Step0, MovementAction_JumpInPlaceLeftRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x59[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_JumpInPlaceRightLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceRightLeft_Step0, MovementAction_JumpInPlaceRightLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x5A[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_FaceOriginalDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceOriginalDirection_Step0, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x5B[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_NurseJoyBowDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_NurseJoyBowDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x5C[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EnableJumpLandingGroundEffect_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x5D[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_DisableJumpLandingGroundEffect_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x5E[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_DisableAnimation[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_DisableAnimation_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x5F[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_RestoreAnimation[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RestoreAnimation_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x60[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_SetInvisible[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetInvisible_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x61[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_SetVisible[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetVisible_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x62[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_EmoteExclamationMark[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EmoteExclamationMark_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x63[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_EmoteQuestionMark[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EmoteQuestionMark_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x64[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_EmoteHeart_Step0, +static bool8 (*const sMovementActionFuncs_EmoteX[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_EmoteX_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x65[])(struct ObjectEvent *, struct Sprite *) = { - do_double_excl_bubble, +static bool8 (*const sMovementActionFuncs_EmoteDoubleExclMark[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_EmoteDoubleExclamationMark_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x66[])(struct ObjectEvent *, struct Sprite *) = { - do_smile_bubble, +static bool8 (*const sMovementActionFuncs_EmoteSmile[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_EmoteSmile_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x67[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_RevealTrainer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RevealTrainer_Step0, MovementAction_RevealTrainer_Step1, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x68[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_RockSmashBreak[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RockSmashBreak_Step0, MovementAction_RockSmashBreak_Step1, MovementAction_RockSmashBreak_Step2, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x69[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_CutTree[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_CutTree_Step0, MovementAction_CutTree_Step1, MovementAction_CutTree_Step2, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x6A[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_SetFixedPriority[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetFixedPriority_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x6B[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_ClearFixedPriority[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_ClearFixedPriority_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x6C[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_InitAffineAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_InitAffineAnim_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x6D[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_ClearAffineAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_ClearAffineAnim_Step0, MovementAction_Finish, }; -static bool8 (*const sMovementActionFuncs_x6E[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkDownStartAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkDownStartAffine_Step0, MovementAction_WalkDownStartAffine_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x6F[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_WalkDownAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkDownAffine_Step0, MovementAction_WalkDownAffine_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x70[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x70_0, +static bool8 (*const sMovementActionFuncs_AcroWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_AcroWheelieFaceDown_Step0, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x71[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x71_0, +static bool8 (*const sMovementActionFuncs_AcroWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_AcroWheelieFaceUp_Step0, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x72[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x72_0, +static bool8 (*const sMovementActionFuncs_AcroWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_AcroWheelieFaceLeft_Step0, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x73[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x73_0, +static bool8 (*const sMovementActionFuncs_AcroWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_AcroWheelieFaceRight_Step0, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x74[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroPopWheelieDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x75[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroPopWheelieUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x76[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroPopWheelieLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x77[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroPopWheelieRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x78[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroEndWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x79[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroEndWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x7A[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x7B[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroEndWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, +}; + +static bool8 (*const MovementActionFuncs_UnusedAcroActionDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, +}; + +static bool8 (*const MovementActionFuncs_UnusedAcroActionUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, +}; + +static bool8 (*const MovementActionFuncs_UnusedAcroActionLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, +}; + +static bool8 (*const MovementActionFuncs_UnusedAcroActionRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x7C[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieHopFaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceDown_Step0, MovementAction_AcroWheelieHopFaceDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x7D[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieHopFaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceUp_Step0, MovementAction_AcroWheelieHopFaceUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x7E[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceLeft_Step0, MovementAction_AcroWheelieHopFaceLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x7F[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieHopFaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceRight_Step0, MovementAction_AcroWheelieHopFaceRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x80[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieHopDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopDown_Step0, MovementAction_AcroWheelieHopDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x81[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieHopUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopUp_Step0, MovementAction_AcroWheelieHopUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x82[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieHopLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopLeft_Step0, MovementAction_AcroWheelieHopLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x83[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieHopRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopRight_Step0, MovementAction_AcroWheelieHopRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x84[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieJumpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpDown_Step0, MovementAction_AcroWheelieJumpDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x85[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieJumpUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpUp_Step0, MovementAction_AcroWheelieJumpUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x86[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieJumpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpLeft_Step0, MovementAction_AcroWheelieJumpLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x87[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieJumpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpRight_Step0, MovementAction_AcroWheelieJumpRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x88[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x88_0, +static bool8 (*const sMovementActionFuncs_AcroWheelieInPlaceDown[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_AcroWheelieInPlaceDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x89[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x89_0, +static bool8 (*const sMovementActionFuncs_AcroWheelieInPlaceUp[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_AcroWheelieInPlaceUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x8A[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x8A_0, +static bool8 (*const sMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_AcroWheelieInPlaceLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x8B[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x8B_0, +static bool8 (*const sMovementActionFuncs_AcroWheelieInPlaceRight[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_AcroWheelieInPlaceRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x8C[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroPopWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveDown_Step0, MovementAction_AcroPopWheelieMoveDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x8D[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroPopWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveUp_Step0, MovementAction_AcroPopWheelieMoveUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x8E[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveLeft_Step0, MovementAction_AcroPopWheelieMoveLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x8F[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroPopWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveRight_Step0, MovementAction_AcroPopWheelieMoveRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x90[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveDown_Step0, MovementAction_AcroWheelieMoveDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x91[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveUp_Step0, MovementAction_AcroWheelieMoveUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x92[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveLeft_Step0, MovementAction_AcroWheelieMoveLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x93[])(struct ObjectEvent *, struct Sprite *) = { +static bool8 (*const sMovementActionFuncs_AcroWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveRight_Step0, MovementAction_AcroWheelieMoveRight_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x94[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x94_0, - MovementActionFunc_x94_1, +static bool8 (*const sMovementActionFuncs_SpinDown[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_SpinDown_Step0, + MovementAction_SpinDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x95[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x95_0, - MovementActionFunc_x95_1, +static bool8 (*const sMovementActionFuncs_SpinUp[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_SpinUp_Step0, + MovementAction_SpinUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x96[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x96_0, - MovementActionFunc_x96_1, +static bool8 (*const sMovementActionFuncs_SpinLeft[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_SpinLeft_Step0, + MovementAction_SpinLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_x97[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x97_0, - MovementActionFunc_x97_1, +static bool8 (*const sMovementActionFuncs_SpinRight[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_SpinRight_Step0, + MovementAction_SpinRight_Step1, MovementAction_PauseSpriteAnim, }; static bool8 (*const sMovementActionFuncs_x98[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x98_0, - MovementActionFunc_x98_1, + MovementAction_x98_Step0, + MovementAction_x98_Step1, }; static bool8 (*const sMovementActionFuncs_x99[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x98_0, - MovementActionFunc_x99_1, + MovementAction_x98_Step0, + MovementAction_x99_Step1, }; static bool8 (*const sMovementActionFuncs_x9A[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x98_0, - MovementActionFunc_x9A_1, + MovementAction_x98_Step0, + MovementAction_x9A_Step1, }; -static bool8 (*const sMovementActionFuncs_x9F[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_x9F_0, - MovementActionFunc_x9F_1, +static bool8 (*const sMovementActionFuncs_ShakeHeadOrWalkInPlace[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_ShakeHeadOrWalkInPlace_Step0, + MovementAction_ShakeHeadOrWalkInPlace_Step1, }; -static bool8 (*const sMovementActionFuncs_xA4[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_xA4_0, - MovementActionFunc_xA4_1, - MovementActionFunc_xA4_2, +static bool8 (*const sMovementActionFuncs_FlyUp[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_FlyUp_Step0, + MovementAction_FlyUp_Step1, + MovementAction_FlyUp_Step2, }; -static bool8 (*const sMovementActionFuncs_xA5[])(struct ObjectEvent *, struct Sprite *) = { - MovementActionFunc_xA5_0, - MovementActionFunc_xA5_1, - MovementActionFunc_xA4_2, +static bool8 (*const sMovementActionFuncs_FlyDown[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_FlyDown_Step0, + MovementAction_FlyDown_Step1, + MovementAction_FlyUp_Step2, }; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index acf21293b..797516c18 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -152,6 +152,20 @@ static void MovementType_VsSeeker4E(struct Sprite *); static void MovementType_VsSeeker4F(struct Sprite *); static void MovementType_WanderAroundSlower(struct Sprite *); +enum { + MOVE_SPEED_NORMAL, // walking + MOVE_SPEED_FAST_1, // running / surfing / sliding (ice tile) + MOVE_SPEED_FAST_2, // water current / bicycle + MOVE_SPEED_FASTER, // going down cycling road on bicycle + MOVE_SPEED_FASTEST, +}; + +enum { + JUMP_DISTANCE_IN_PLACE, + JUMP_DISTANCE_NORMAL, + JUMP_DISTANCE_FAR, +}; + #define movement_type_def(setup, table) \ static u8 setup##_callback(struct ObjectEvent *, struct Sprite *); \ void setup(struct Sprite *sprite) \ @@ -955,11 +969,11 @@ static const u8 gUnknown_83A6514[] = { }; static const u8 gUnknown_83A6519[] = { - [DIR_NONE] = MOVEMENT_ACTION_WALK_FASTEST_DOWN, - [DIR_SOUTH] = MOVEMENT_ACTION_WALK_FASTEST_DOWN, - [DIR_NORTH] = MOVEMENT_ACTION_WALK_FASTEST_UP, - [DIR_WEST] = MOVEMENT_ACTION_WALK_FASTEST_LEFT, - [DIR_EAST] = MOVEMENT_ACTION_WALK_FASTEST_RIGHT, + [DIR_NONE] = MOVEMENT_ACTION_WALK_FASTER_DOWN, + [DIR_SOUTH] = MOVEMENT_ACTION_WALK_FASTER_DOWN, + [DIR_NORTH] = MOVEMENT_ACTION_WALK_FASTER_UP, + [DIR_WEST] = MOVEMENT_ACTION_WALK_FASTER_LEFT, + [DIR_EAST] = MOVEMENT_ACTION_WALK_FASTER_RIGHT, }; static const u8 gUnknown_83A651E[] = { @@ -1067,11 +1081,11 @@ static const u8 gUnknown_83A655A[] = { }; static const u8 gUnknown_83A655F[] = { - [DIR_NONE] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, - [DIR_SOUTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, - [DIR_NORTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP, - [DIR_WEST] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT, - [DIR_EAST] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT, + [DIR_NONE] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN, + [DIR_SOUTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN, + [DIR_NORTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_UP, + [DIR_WEST] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_LEFT, + [DIR_EAST] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT, }; static const u8 gUnknown_83A6564[] = { @@ -5251,7 +5265,7 @@ static u32 GetCopyDirection(u8 copyInitDir, u32 playerInitDir, u32 playerMoveDir static void ObjectEventExecHeldMovementAction(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gMovementActionFuncs[objectEvent->movementActionId][sprite->data[2]](objectEvent, sprite)) + if (sMovementActionFuncs[objectEvent->movementActionId][sprite->data[2]](objectEvent, sprite)) { objectEvent->heldMovementFinished = TRUE; } @@ -5259,7 +5273,7 @@ static void ObjectEventExecHeldMovementAction(struct ObjectEvent *objectEvent, s static void sub_8064544(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gMovementActionFuncs[objectEvent->movementActionId][sprite->data[2]](objectEvent, sprite)) + if (sMovementActionFuncs[objectEvent->movementActionId][sprite->data[2]](objectEvent, sprite)) { objectEvent->heldMovementFinished = TRUE; if (objectEvent->graphicsId == OBJ_EVENT_GFX_PUSHABLE_BOULDER) @@ -5269,7 +5283,7 @@ static void sub_8064544(struct ObjectEvent *objectEvent, struct Sprite *sprite) static bool8 ObjectEventExecSingleMovementAction(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gMovementActionFuncs[objectEvent->movementActionId][sprite->data[2]](objectEvent, sprite)) + if (sMovementActionFuncs[objectEvent->movementActionId][sprite->data[2]](objectEvent, sprite)) { objectEvent->movementActionId = 0xFF; sprite->data[2] = 0; @@ -5340,16 +5354,15 @@ void InitNpcForMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite, void InitMovementNormal(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { - u8 (*functions[NELEMS(gUnknown_83A6884)])(u8); - - memcpy(functions, gUnknown_83A6884, sizeof gUnknown_83A6884); + u8 (*functions[NELEMS(sDirectionAnimFuncsBySpeed)])(u8); + memcpy(functions, sDirectionAnimFuncsBySpeed, sizeof sDirectionAnimFuncsBySpeed); InitNpcForMovement(objectEvent, sprite, direction, speed); SetStepAnimHandleAlternation(objectEvent, sprite, functions[speed](objectEvent->facingDirection)); } void StartRunningAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - InitNpcForMovement(objectEvent, sprite, direction, 1); + InitNpcForMovement(objectEvent, sprite, direction, MOVE_SPEED_FAST_1); SetStepAnimHandleAlternation(objectEvent, sprite, GetRunningDirectionAnimNum(objectEvent->facingDirection)); } @@ -5433,13 +5446,13 @@ bool8 UpdateWalkSlowest(struct ObjectEvent *objectEvent, struct Sprite *sprite) return FALSE; } -static bool8 MovementActionFunc_x9B_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitWalkSlowest(objectEvent, sprite, DIR_SOUTH); - return MovementActionFunc_x9B_1(objectEvent, sprite); + return MovementAction_WalkSlowestDown_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x9B_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowestDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateWalkSlowest(objectEvent, sprite)) { @@ -5449,13 +5462,13 @@ static bool8 MovementActionFunc_x9B_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x9C_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitWalkSlowest(objectEvent, sprite, DIR_NORTH); - return MovementActionFunc_x9C_1(objectEvent, sprite); + return MovementAction_WalkSlowestUp_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x9C_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowestUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateWalkSlowest(objectEvent, sprite)) { @@ -5465,13 +5478,13 @@ static bool8 MovementActionFunc_x9C_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x9D_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitWalkSlowest(objectEvent, sprite, DIR_WEST); - return MovementActionFunc_x9D_1(objectEvent, sprite); + return MovementAction_WalkSlowestLeft_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x9D_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowestLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateWalkSlowest(objectEvent, sprite)) { @@ -5481,13 +5494,13 @@ static bool8 MovementActionFunc_x9D_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x9E_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitWalkSlowest(objectEvent, sprite, DIR_EAST); - return MovementActionFunc_x9E_1(objectEvent, sprite); + return MovementAction_WalkSlowestRight_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x9E_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowestRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateWalkSlowest(objectEvent, sprite)) { @@ -5497,13 +5510,13 @@ static bool8 MovementActionFunc_x9E_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x08_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowerDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitWalkSlower(objectEvent, sprite, DIR_SOUTH); - return MovementActionFunc_x08_1(objectEvent, sprite); + return MovementAction_WalkSlowerDown_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x08_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowerDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateWalkSlower(objectEvent, sprite)) { @@ -5513,13 +5526,13 @@ static bool8 MovementActionFunc_x08_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x09_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowerUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitWalkSlower(objectEvent, sprite, DIR_NORTH); - return MovementActionFunc_x09_1(objectEvent, sprite); + return MovementAction_WalkSlowerUp_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x09_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowerUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateWalkSlower(objectEvent, sprite)) { @@ -5529,13 +5542,13 @@ static bool8 MovementActionFunc_x09_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x0A_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowerLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitWalkSlower(objectEvent, sprite, DIR_WEST); - return MovementActionFunc_x0A_1(objectEvent, sprite); + return MovementAction_WalkSlowerLeft_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x0A_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowerLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateWalkSlower(objectEvent, sprite)) { @@ -5545,13 +5558,13 @@ static bool8 MovementActionFunc_x0A_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x0B_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowerRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitWalkSlower(objectEvent, sprite, DIR_EAST); - return MovementActionFunc_x0B_1(objectEvent, sprite); + return MovementAction_WalkSlowerRight_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x0B_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowerRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateWalkSlower(objectEvent, sprite)) { @@ -5599,13 +5612,13 @@ bool8 UpdateWalkSlow(struct ObjectEvent *objectEvent, struct Sprite *sprite) return FALSE; } -static bool8 MovementActionFunc_x0D_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitWalkSlow(objectEvent, sprite, DIR_NORTH); - return MovementActionFunc_x0D_1(objectEvent, sprite); + return MovementAction_WalkSlowUp_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x0D_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateWalkSlow(objectEvent, sprite)) { @@ -5615,13 +5628,13 @@ static bool8 MovementActionFunc_x0D_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x0C_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitWalkSlow(objectEvent, sprite, DIR_SOUTH); - return MovementActionFunc_x0C_1(objectEvent, sprite); + return MovementAction_WalkSlowDown_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x0C_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateWalkSlow(objectEvent, sprite)) { @@ -5631,13 +5644,13 @@ static bool8 MovementActionFunc_x0C_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x0E_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitWalkSlow(objectEvent, sprite, DIR_WEST); - return MovementActionFunc_x0E_1(objectEvent, sprite); + return MovementAction_WalkSlowLeft_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x0E_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateWalkSlow(objectEvent, sprite)) { @@ -5647,13 +5660,13 @@ static bool8 MovementActionFunc_x0E_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x0F_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitWalkSlow(objectEvent, sprite, DIR_EAST); - return MovementActionFunc_x0F_1(objectEvent, sprite); + return MovementAction_WalkSlowRight_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x0F_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkSlowRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateWalkSlow(objectEvent, sprite)) { @@ -5665,7 +5678,7 @@ static bool8 MovementActionFunc_x0F_1(struct ObjectEvent *objectEvent, struct Sp static bool8 MovementAction_WalkNormalDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_SOUTH, 0); + InitMovementNormal(objectEvent, sprite, DIR_SOUTH, MOVE_SPEED_NORMAL); return MovementAction_WalkNormalDown_Step1(objectEvent, sprite); } @@ -5681,7 +5694,7 @@ static bool8 MovementAction_WalkNormalDown_Step1(struct ObjectEvent *objectEvent static bool8 MovementAction_WalkNormalUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_NORTH, 0); + InitMovementNormal(objectEvent, sprite, DIR_NORTH, MOVE_SPEED_NORMAL); return MovementAction_WalkNormalUp_Step1(objectEvent, sprite); } @@ -5697,7 +5710,7 @@ static bool8 MovementAction_WalkNormalUp_Step1(struct ObjectEvent *objectEvent, static bool8 MovementAction_WalkNormalLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_WEST, 0); + InitMovementNormal(objectEvent, sprite, DIR_WEST, MOVE_SPEED_NORMAL); return MovementAction_WalkNormalLeft_Step1(objectEvent, sprite); } @@ -5713,7 +5726,7 @@ static bool8 MovementAction_WalkNormalLeft_Step1(struct ObjectEvent *objectEvent static bool8 MovementAction_WalkNormalRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_EAST, 0); + InitMovementNormal(objectEvent, sprite, DIR_EAST, MOVE_SPEED_NORMAL); return MovementAction_WalkNormalRight_Step1(objectEvent, sprite); } @@ -5727,42 +5740,51 @@ static bool8 MovementAction_WalkNormalRight_Step1(struct ObjectEvent *objectEven return FALSE; } -void InitJump(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed, u8 a5) +#define JUMP_HALFWAY 1 +#define JUMP_FINISHED ((u8)-1) + +enum { + JUMP_TYPE_HIGH, + JUMP_TYPE_LOW, + JUMP_TYPE_NORMAL, +}; + +void InitJump(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 distance, u8 type) { - s16 displacements[NELEMS(gUnknown_83A6958)]; + s16 displacements[NELEMS(sJumpInitDisplacements)]; s16 x; s16 y; - memcpy(displacements, gUnknown_83A6958, sizeof gUnknown_83A6958); + memcpy(displacements, sJumpInitDisplacements, sizeof sJumpInitDisplacements); x = 0; y = 0; SetObjectEventDirection(objectEvent, direction); - MoveCoordsInDirection(direction, &x, &y, displacements[speed], displacements[speed]); + MoveCoordsInDirection(direction, &x, &y, displacements[distance], displacements[distance]); ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x + x, objectEvent->currentCoords.y + y); - SetJumpSpriteData(sprite, direction, speed, a5); + SetJumpSpriteData(sprite, direction, distance, type); sprite->data[2] = 1; sprite->animPaused = 0; objectEvent->triggerGroundEffectsOnMove = 1; objectEvent->disableCoveringGroundEffects = 1; } -void InitJumpRegular(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) +void InitJumpRegular(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 distance, u8 type) { - InitJump(objectEvent, sprite, direction, speed, a4); + InitJump(objectEvent, sprite, direction, distance, type); SetStepAnimHandleAlternation(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); DoShadowFieldEffect(objectEvent); } u8 UpdateJumpAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 callback(struct Sprite *)) { - s16 displacements[NELEMS(gUnknown_83A695E)]; + s16 displacements[NELEMS(sJumpDisplacements)]; s16 x; s16 y; u8 result; - memcpy(displacements, gUnknown_83A695E, sizeof gUnknown_83A695E); + memcpy(displacements, sJumpDisplacements, sizeof sJumpDisplacements); result = callback(sprite); - if (result == 1 && displacements[sprite->data[4]] != 0) + if (result == JUMP_HALFWAY && displacements[sprite->data[4]] != 0) { x = 0; y = 0; @@ -5771,7 +5793,7 @@ u8 UpdateJumpAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 cal objectEvent->triggerGroundEffectsOnMove = TRUE; objectEvent->disableCoveringGroundEffects = TRUE; } - else if (result == 0xFF) + else if (result == JUMP_FINISHED) { ShiftStillObjectEventCoords(objectEvent); objectEvent->triggerGroundEffectsOnStop = TRUE; @@ -5793,7 +5815,7 @@ u8 DoJumpSpecialAnimStep(struct ObjectEvent *objectEvent, struct Sprite *sprite) bool8 DoJumpAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (DoJumpAnimStep(objectEvent, sprite) == 0xFF) + if (DoJumpAnimStep(objectEvent, sprite) == JUMP_FINISHED) return TRUE; return FALSE; @@ -5801,7 +5823,7 @@ bool8 DoJumpAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) bool8 DoJumpSpecialAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (DoJumpSpecialAnimStep(objectEvent, sprite) == 0xFF) + if (DoJumpSpecialAnimStep(objectEvent, sprite) == JUMP_FINISHED) return TRUE; return FALSE; @@ -5811,9 +5833,9 @@ bool8 DoJumpInPlaceAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { switch (DoJumpAnimStep(objectEvent, sprite)) { - case 0xFF: + case JUMP_FINISHED: return TRUE; - case 1: + case JUMP_HALFWAY: SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); SetStepAnim(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); default: @@ -5823,7 +5845,7 @@ bool8 DoJumpInPlaceAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) static bool8 MovementAction_Jump2Down_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_SOUTH, 2, 0); + InitJumpRegular(objectEvent, sprite, DIR_SOUTH, JUMP_DISTANCE_FAR, JUMP_TYPE_HIGH); return MovementAction_Jump2Down_Step1(objectEvent, sprite); } @@ -5840,7 +5862,7 @@ static bool8 MovementAction_Jump2Down_Step1(struct ObjectEvent *objectEvent, str static bool8 MovementAction_Jump2Up_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_NORTH, 2, 0); + InitJumpRegular(objectEvent, sprite, DIR_NORTH, JUMP_DISTANCE_FAR, JUMP_TYPE_HIGH); return MovementAction_Jump2Up_Step1(objectEvent, sprite); } @@ -5857,7 +5879,7 @@ static bool8 MovementAction_Jump2Up_Step1(struct ObjectEvent *objectEvent, struc static bool8 MovementAction_Jump2Left_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_WEST, 2, 0); + InitJumpRegular(objectEvent, sprite, DIR_WEST, JUMP_DISTANCE_FAR, JUMP_TYPE_HIGH); return MovementAction_Jump2Left_Step1(objectEvent, sprite); } @@ -5874,7 +5896,7 @@ static bool8 MovementAction_Jump2Left_Step1(struct ObjectEvent *objectEvent, str static bool8 MovementAction_Jump2Right_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_EAST, 2, 0); + InitJumpRegular(objectEvent, sprite, DIR_EAST, JUMP_DISTANCE_FAR, JUMP_TYPE_HIGH); return MovementAction_Jump2Right_Step1(objectEvent, sprite); } @@ -5937,7 +5959,7 @@ static bool8 MovementAction_Delay16_Step0(struct ObjectEvent *objectEvent, struc static bool8 MovementAction_WalkFastDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_SOUTH, 1); + InitMovementNormal(objectEvent, sprite, DIR_SOUTH, MOVE_SPEED_FAST_1); return MovementAction_WalkFastDown_Step1(objectEvent, sprite); } @@ -5953,7 +5975,7 @@ static bool8 MovementAction_WalkFastDown_Step1(struct ObjectEvent *objectEvent, static bool8 MovementAction_WalkFastUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_NORTH, 1); + InitMovementNormal(objectEvent, sprite, DIR_NORTH, MOVE_SPEED_FAST_1); return MovementAction_WalkFastUp_Step1(objectEvent, sprite); } @@ -5969,7 +5991,7 @@ static bool8 MovementAction_WalkFastUp_Step1(struct ObjectEvent *objectEvent, st static bool8 MovementAction_WalkFastLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_WEST, 1); + InitMovementNormal(objectEvent, sprite, DIR_WEST, MOVE_SPEED_FAST_1); return MovementAction_WalkFastLeft_Step1(objectEvent, sprite); } @@ -5985,7 +6007,7 @@ static bool8 MovementAction_WalkFastLeft_Step1(struct ObjectEvent *objectEvent, static bool8 MovementAction_WalkFastRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_EAST, 1); + InitMovementNormal(objectEvent, sprite, DIR_EAST, MOVE_SPEED_FAST_1); return MovementAction_WalkFastRight_Step1(objectEvent, sprite); } @@ -6010,16 +6032,16 @@ bool8 sub_80653CC(struct ObjectEvent *objectEvent, struct Sprite *sprite) return FALSE; } -u8 MovementActionFunc_xA0_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +u8 MovementAction_xA0_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if(objectEvent->facingDirection != DIR_SOUTH) StartSpriteAnim(sprite, GetFaceDirectionAnimNum(DIR_SOUTH)); - InitNpcForMovement(objectEvent, sprite, DIR_SOUTH, 1); - return MovementActionFunc_xA0_1(objectEvent, sprite); + InitNpcForMovement(objectEvent, sprite, DIR_SOUTH, MOVE_SPEED_FAST_1); + return MovementAction_xA0_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_xA0_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_xA0_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { AnimateSprite(sprite); if (sub_80653CC(objectEvent, sprite)) @@ -6030,16 +6052,16 @@ static bool8 MovementActionFunc_xA0_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -u8 MovementActionFunc_xA1_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +u8 MovementAction_xA1_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if(objectEvent->facingDirection != DIR_NORTH) StartSpriteAnim(sprite, GetFaceDirectionAnimNum(DIR_NORTH)); - InitNpcForMovement(objectEvent, sprite, DIR_NORTH, 1); - return MovementActionFunc_xA1_1(objectEvent, sprite); + InitNpcForMovement(objectEvent, sprite, DIR_NORTH, MOVE_SPEED_FAST_1); + return MovementAction_xA1_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_xA1_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_xA1_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { AnimateSprite(sprite); if (sub_80653CC(objectEvent, sprite)) @@ -6050,16 +6072,16 @@ static bool8 MovementActionFunc_xA1_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -u8 MovementActionFunc_xA2_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +u8 MovementAction_xA2_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if(objectEvent->facingDirection != DIR_WEST) StartSpriteAnim(sprite, GetFaceDirectionAnimNum(DIR_WEST)); - InitNpcForMovement(objectEvent, sprite, DIR_WEST, 1); - return MovementActionFunc_xA2_1(objectEvent, sprite); + InitNpcForMovement(objectEvent, sprite, DIR_WEST, MOVE_SPEED_FAST_1); + return MovementAction_xA2_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_xA2_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_xA2_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { AnimateSprite(sprite); if (sub_80653CC(objectEvent, sprite)) @@ -6070,16 +6092,16 @@ static bool8 MovementActionFunc_xA2_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -u8 MovementActionFunc_xA3_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +u8 MovementAction_xA3_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if(objectEvent->facingDirection != DIR_EAST) StartSpriteAnim(sprite, GetFaceDirectionAnimNum(DIR_EAST)); - InitNpcForMovement(objectEvent, sprite, DIR_EAST, 1); - return MovementActionFunc_xA3_1(objectEvent, sprite); + InitNpcForMovement(objectEvent, sprite, DIR_EAST, MOVE_SPEED_FAST_1); + return MovementAction_xA3_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_xA3_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_xA3_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { AnimateSprite(sprite); if (sub_80653CC(objectEvent, sprite)) @@ -6098,7 +6120,7 @@ void sub_80655A8(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 dire sprite->data[2] = 1; } -u8 MovementActionFunc_x04_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +u8 MovementAction_FaceDownFast_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if(objectEvent->facingDirection != DIR_SOUTH) StartSpriteAnim(sprite, GetFaceDirectionAnimNum(DIR_SOUTH)); @@ -6108,7 +6130,7 @@ u8 MovementActionFunc_x04_0(struct ObjectEvent *objectEvent, struct Sprite *spri return TRUE; } -u8 MovementActionFunc_x05_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +u8 MovementAction_FaceUpFast_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if(objectEvent->facingDirection != DIR_NORTH) StartSpriteAnim(sprite, GetFaceDirectionAnimNum(DIR_NORTH)); @@ -6118,7 +6140,7 @@ u8 MovementActionFunc_x05_0(struct ObjectEvent *objectEvent, struct Sprite *spri return TRUE; } -u8 MovementActionFunc_x06_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +u8 MovementAction_FaceLeftFast_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if(objectEvent->facingDirection != DIR_WEST) StartSpriteAnim(sprite, GetFaceDirectionAnimNum(DIR_WEST)); @@ -6128,7 +6150,7 @@ u8 MovementActionFunc_x06_0(struct ObjectEvent *objectEvent, struct Sprite *spri return TRUE; } -u8 MovementActionFunc_x07_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +u8 MovementAction_FaceRightFast_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if(objectEvent->facingDirection != DIR_EAST) StartSpriteAnim(sprite, GetFaceDirectionAnimNum(DIR_EAST)); @@ -6238,25 +6260,25 @@ static bool8 MovementAction_WalkInPlaceFastRight_Step0(struct ObjectEvent *objec return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkInPlaceFasterDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMoveInPlace(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4); return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkInPlaceFasterUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMoveInPlace(objectEvent, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4); return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkInPlaceFasterLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMoveInPlace(objectEvent, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4); return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkInPlaceFasterRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMoveInPlace(objectEvent, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4); return MovementAction_WalkInPlace_Step1(objectEvent, sprite); @@ -6264,7 +6286,7 @@ static bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *ob static bool8 MovementAction_RideWaterCurrentDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_SOUTH, 2); + InitMovementNormal(objectEvent, sprite, DIR_SOUTH, MOVE_SPEED_FAST_2); return MovementAction_RideWaterCurrentDown_Step1(objectEvent, sprite); } @@ -6280,7 +6302,7 @@ static bool8 MovementAction_RideWaterCurrentDown_Step1(struct ObjectEvent *objec static bool8 MovementAction_RideWaterCurrentUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_NORTH, 2); + InitMovementNormal(objectEvent, sprite, DIR_NORTH, MOVE_SPEED_FAST_2); return MovementAction_RideWaterCurrentUp_Step1(objectEvent, sprite); } @@ -6296,7 +6318,7 @@ static bool8 MovementAction_RideWaterCurrentUp_Step1(struct ObjectEvent *objectE static bool8 MovementAction_RideWaterCurrentLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_WEST, 2); + InitMovementNormal(objectEvent, sprite, DIR_WEST, MOVE_SPEED_FAST_2); return MovementAction_RideWaterCurrentLeft_Step1(objectEvent, sprite); } @@ -6312,7 +6334,7 @@ static bool8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *objec static bool8 MovementAction_RideWaterCurrentRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_EAST, 2); + InitMovementNormal(objectEvent, sprite, DIR_EAST, MOVE_SPEED_FAST_2); return MovementAction_RideWaterCurrentRight_Step1(objectEvent, sprite); } @@ -6326,13 +6348,13 @@ static bool8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *obje return FALSE; } -static bool8 MovementAction_WalkFastestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_SOUTH, 3); - return MovementAction_WalkFastestDown_Step1(objectEvent, sprite); + InitMovementNormal(objectEvent, sprite, DIR_SOUTH, MOVE_SPEED_FASTER); + return MovementAction_WalkFasterDown_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateMovementNormal(objectEvent, sprite)) { @@ -6342,13 +6364,13 @@ static bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *objectEven return FALSE; } -static bool8 MovementAction_WalkFastestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_NORTH, 3); - return MovementAction_WalkFastestUp_Step1(objectEvent, sprite); + InitMovementNormal(objectEvent, sprite, DIR_NORTH, MOVE_SPEED_FASTER); + return MovementAction_WalkFasterUp_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateMovementNormal(objectEvent, sprite)) { @@ -6358,13 +6380,13 @@ static bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *objectEvent, return FALSE; } -static bool8 MovementAction_WalkFastestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_WEST, 3); - return MovementAction_WalkFastestLeft_Step1(objectEvent, sprite); + InitMovementNormal(objectEvent, sprite, DIR_WEST, MOVE_SPEED_FASTER); + return MovementAction_WalkFasterLeft_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateMovementNormal(objectEvent, sprite)) { @@ -6374,13 +6396,13 @@ static bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *objectEven return FALSE; } -static bool8 MovementAction_WalkFastestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_EAST, 3); - return MovementAction_WalkFastestRight_Step1(objectEvent, sprite); + InitMovementNormal(objectEvent, sprite, DIR_EAST, MOVE_SPEED_FASTER); + return MovementAction_WalkFasterRight_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateMovementNormal(objectEvent, sprite)) { @@ -6392,7 +6414,7 @@ static bool8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *objectEve static bool8 MovementAction_SlideDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_SOUTH, 4); + InitMovementNormal(objectEvent, sprite, DIR_SOUTH, MOVE_SPEED_FASTEST); return MovementAction_SlideDown_Step1(objectEvent, sprite); } @@ -6408,7 +6430,7 @@ static bool8 MovementAction_SlideDown_Step1(struct ObjectEvent *objectEvent, str static bool8 MovementAction_SlideUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_NORTH, 4); + InitMovementNormal(objectEvent, sprite, DIR_NORTH, MOVE_SPEED_FASTEST); return MovementAction_SlideUp_Step1(objectEvent, sprite); } @@ -6424,7 +6446,7 @@ static bool8 MovementAction_SlideUp_Step1(struct ObjectEvent *objectEvent, struc static bool8 MovementAction_SlideLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_WEST, 4); + InitMovementNormal(objectEvent, sprite, DIR_WEST, MOVE_SPEED_FASTEST); return MovementAction_SlideLeft_Step1(objectEvent, sprite); } @@ -6440,7 +6462,7 @@ static bool8 MovementAction_SlideLeft_Step1(struct ObjectEvent *objectEvent, str static bool8 MovementAction_SlideRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitMovementNormal(objectEvent, sprite, DIR_EAST, 4); + InitMovementNormal(objectEvent, sprite, DIR_EAST, MOVE_SPEED_FASTEST); return MovementAction_SlideRight_Step1(objectEvent, sprite); } @@ -6552,13 +6574,13 @@ bool8 UpdateRunSlow(struct ObjectEvent *objectEvent, struct Sprite *sprite) return FALSE; } -static bool8 MovementActionFunc_x41_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_RunDownSlow_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitRunSlow(objectEvent, sprite, DIR_SOUTH); - return MovementActionFunc_x41_1(objectEvent, sprite); + return MovementAction_RunDownSlow_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x41_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_RunDownSlow_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateRunSlow(objectEvent, sprite)) { @@ -6568,13 +6590,13 @@ static bool8 MovementActionFunc_x41_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x42_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_RunUpSlow_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitRunSlow(objectEvent, sprite, DIR_NORTH); - return MovementActionFunc_x42_1(objectEvent, sprite); + return MovementAction_RunUpSlow_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x42_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_RunUpSlow_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateRunSlow(objectEvent, sprite)) { @@ -6584,13 +6606,13 @@ static bool8 MovementActionFunc_x42_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x43_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_RunLeftSlow_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitRunSlow(objectEvent, sprite, DIR_WEST); - return MovementActionFunc_x43_1(objectEvent, sprite); + return MovementAction_RunLeftSlow_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x43_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_RunLeftSlow_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateRunSlow(objectEvent, sprite)) { @@ -6600,13 +6622,13 @@ static bool8 MovementActionFunc_x43_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x44_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_RunRightSlow_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitRunSlow(objectEvent, sprite, DIR_SOUTH); - return MovementActionFunc_x44_1(objectEvent, sprite); + return MovementAction_RunRightSlow_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x44_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_RunRightSlow_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateRunSlow(objectEvent, sprite)) { @@ -6641,7 +6663,7 @@ static bool8 MovementAction_WaitSpriteAnim(struct ObjectEvent *objectEvent, stru void InitJumpSpecial(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - InitJump(objectEvent, sprite, direction, 1, 0); + InitJump(objectEvent, sprite, direction, JUMP_DISTANCE_NORMAL, JUMP_TYPE_HIGH); StartSpriteAnim(sprite, GetJumpSpecialDirectionAnimNum(direction)); } @@ -6713,13 +6735,13 @@ static bool8 MovementAction_JumpSpecialRight_Step1(struct ObjectEvent *objectEve return FALSE; } -static bool8 MovementActionFunc_xA6_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_JumpSpecialWithEffectDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitJumpSpecial(objectEvent, sprite, DIR_SOUTH); - return MovementActionFunc_xA6_1(objectEvent, sprite); + return MovementAction_JumpSpecialWithEffectDown_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_xA6_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_JumpSpecialWithEffectDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (DoJumpSpecialAnim(objectEvent, sprite)) { @@ -6729,13 +6751,13 @@ static bool8 MovementActionFunc_xA6_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_xA7_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_JumpSpecialWithEffectUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitJumpSpecial(objectEvent, sprite, DIR_NORTH); - return MovementActionFunc_xA7_1(objectEvent, sprite); + return MovementAction_JumpSpecialWithEffectUp_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_xA7_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_JumpSpecialWithEffectUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (DoJumpSpecialAnim(objectEvent, sprite)) { @@ -6745,13 +6767,13 @@ static bool8 MovementActionFunc_xA7_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_xA8_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_JumpSpecialWithEffectLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitJumpSpecial(objectEvent, sprite, DIR_WEST); - return MovementActionFunc_xA8_1(objectEvent, sprite); + return MovementAction_JumpSpecialWithEffectLeft_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_xA8_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_JumpSpecialWithEffectLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (DoJumpSpecialAnim(objectEvent, sprite)) { @@ -6761,13 +6783,13 @@ static bool8 MovementActionFunc_xA8_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_xA9_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_JumpSpecialWithEffectRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitJumpSpecial(objectEvent, sprite, DIR_EAST); - return MovementActionFunc_xA9_1(objectEvent, sprite); + return MovementAction_JumpSpecialWithEffectRight_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_xA9_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_JumpSpecialWithEffectRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (DoJumpSpecialAnim(objectEvent, sprite)) { @@ -6817,7 +6839,7 @@ static bool8 MovementAction_UnlockFacingDirection_Step0(struct ObjectEvent *obje static bool8 MovementAction_JumpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_SOUTH, 1, 2); + InitJumpRegular(objectEvent, sprite, DIR_SOUTH, JUMP_DISTANCE_NORMAL, JUMP_TYPE_NORMAL); return MovementAction_JumpDown_Step1(objectEvent, sprite); } @@ -6834,7 +6856,7 @@ static bool8 MovementAction_JumpDown_Step1(struct ObjectEvent *objectEvent, stru static bool8 MovementAction_JumpUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_NORTH, 1, 2); + InitJumpRegular(objectEvent, sprite, DIR_NORTH, JUMP_DISTANCE_NORMAL, JUMP_TYPE_NORMAL); return MovementAction_JumpUp_Step1(objectEvent, sprite); } @@ -6851,7 +6873,7 @@ static bool8 MovementAction_JumpUp_Step1(struct ObjectEvent *objectEvent, struct static bool8 MovementAction_JumpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_WEST, 1, 2); + InitJumpRegular(objectEvent, sprite, DIR_WEST, JUMP_DISTANCE_NORMAL, JUMP_TYPE_NORMAL); return MovementAction_JumpLeft_Step1(objectEvent, sprite); } @@ -6868,7 +6890,7 @@ static bool8 MovementAction_JumpLeft_Step1(struct ObjectEvent *objectEvent, stru static bool8 MovementAction_JumpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_EAST, 1, 2); + InitJumpRegular(objectEvent, sprite, DIR_EAST, JUMP_DISTANCE_NORMAL, JUMP_TYPE_NORMAL); return MovementAction_JumpRight_Step1(objectEvent, sprite); } @@ -6885,7 +6907,7 @@ static bool8 MovementAction_JumpRight_Step1(struct ObjectEvent *objectEvent, str static bool8 MovementAction_JumpInPlaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_SOUTH, 0, 0); + InitJumpRegular(objectEvent, sprite, DIR_SOUTH, JUMP_DISTANCE_IN_PLACE, JUMP_TYPE_HIGH); return MovementAction_JumpInPlaceDown_Step1(objectEvent, sprite); } @@ -6902,7 +6924,7 @@ static bool8 MovementAction_JumpInPlaceDown_Step1(struct ObjectEvent *objectEven static bool8 MovementAction_JumpInPlaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_NORTH, 0, 0); + InitJumpRegular(objectEvent, sprite, DIR_NORTH, JUMP_DISTANCE_IN_PLACE, JUMP_TYPE_HIGH); return MovementAction_JumpInPlaceUp_Step1(objectEvent, sprite); } @@ -6919,7 +6941,7 @@ static bool8 MovementAction_JumpInPlaceUp_Step1(struct ObjectEvent *objectEvent, static bool8 MovementAction_JumpInPlaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_WEST, 0, 0); + InitJumpRegular(objectEvent, sprite, DIR_WEST, JUMP_DISTANCE_IN_PLACE, JUMP_TYPE_HIGH); return MovementAction_JumpInPlaceLeft_Step1(objectEvent, sprite); } @@ -6936,7 +6958,7 @@ static bool8 MovementAction_JumpInPlaceLeft_Step1(struct ObjectEvent *objectEven static bool8 MovementAction_JumpInPlaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_EAST, 0, 0); + InitJumpRegular(objectEvent, sprite, DIR_EAST, JUMP_DISTANCE_IN_PLACE, JUMP_TYPE_HIGH); return MovementAction_JumpInPlaceRight_Step1(objectEvent, sprite); } @@ -6953,7 +6975,7 @@ static bool8 MovementAction_JumpInPlaceRight_Step1(struct ObjectEvent *objectEve static bool8 MovementAction_JumpInPlaceDownUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_SOUTH, 0, 2); + InitJumpRegular(objectEvent, sprite, DIR_SOUTH, JUMP_DISTANCE_IN_PLACE, JUMP_TYPE_NORMAL); return MovementAction_JumpInPlaceDownUp_Step1(objectEvent, sprite); } @@ -6970,7 +6992,7 @@ static bool8 MovementAction_JumpInPlaceDownUp_Step1(struct ObjectEvent *objectEv static bool8 MovementAction_JumpInPlaceUpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_NORTH, 0, 2); + InitJumpRegular(objectEvent, sprite, DIR_NORTH, JUMP_DISTANCE_IN_PLACE, JUMP_TYPE_NORMAL); return MovementAction_JumpInPlaceUpDown_Step1(objectEvent, sprite); } @@ -6987,7 +7009,7 @@ static bool8 MovementAction_JumpInPlaceUpDown_Step1(struct ObjectEvent *objectEv static bool8 MovementAction_JumpInPlaceLeftRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_WEST, 0, 2); + InitJumpRegular(objectEvent, sprite, DIR_WEST, JUMP_DISTANCE_IN_PLACE, JUMP_TYPE_NORMAL); return MovementAction_JumpInPlaceLeftRight_Step1(objectEvent, sprite); } @@ -7004,7 +7026,7 @@ static bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct ObjectEvent *objec static bool8 MovementAction_JumpInPlaceRightLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitJumpRegular(objectEvent, sprite, DIR_EAST, 0, 2); + InitJumpRegular(objectEvent, sprite, DIR_EAST, JUMP_DISTANCE_IN_PLACE, JUMP_TYPE_NORMAL); return MovementAction_JumpInPlaceRightLeft_Step1(objectEvent, sprite); } @@ -7089,7 +7111,7 @@ static bool8 MovementAction_EmoteQuestionMark_Step0(struct ObjectEvent *objectEv return TRUE; } -static bool8 MovementAction_EmoteHeart_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_EmoteX_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_X_ICON); @@ -7097,7 +7119,7 @@ static bool8 MovementAction_EmoteHeart_Step0(struct ObjectEvent *objectEvent, st return TRUE; } -static bool8 do_double_excl_bubble(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_EmoteDoubleExclamationMark_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_DOUBLE_EXCL_MARK_ICON); @@ -7105,7 +7127,7 @@ static bool8 do_double_excl_bubble(struct ObjectEvent *objectEvent, struct Sprit return TRUE; } -static bool8 do_smile_bubble(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_EmoteSmile_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_SMILEY_FACE_ICON); @@ -7274,25 +7296,25 @@ void AcroWheelieFaceDirection(struct ObjectEvent *objectEvent, struct Sprite *sp sprite->data[2] = 1; } -static bool8 MovementActionFunc_x70_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_AcroWheelieFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { AcroWheelieFaceDirection(objectEvent, sprite, DIR_SOUTH); return TRUE; } -static bool8 MovementActionFunc_x71_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_AcroWheelieFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { AcroWheelieFaceDirection(objectEvent, sprite, DIR_NORTH); return TRUE; } -static bool8 MovementActionFunc_x72_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { AcroWheelieFaceDirection(objectEvent, sprite, DIR_WEST); return TRUE; } -static bool8 MovementActionFunc_x73_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_AcroWheelieFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { AcroWheelieFaceDirection(objectEvent, sprite, DIR_EAST); return TRUE; @@ -7370,16 +7392,16 @@ static bool8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *obje return FALSE; } -void InitAcroWheelieJump(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) +void InitAcroWheelieJump(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 distance, u8 type) { - InitJump(objectEvent, sprite, direction, speed, a4); + InitJump(objectEvent, sprite, direction, distance, type); StartSpriteAnimIfDifferent(sprite, GetAcroWheelieDirectionAnimNum(direction)); DoShadowFieldEffect(objectEvent); } static bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieJump(objectEvent, sprite, DIR_SOUTH, 0, 1); + InitAcroWheelieJump(objectEvent, sprite, DIR_SOUTH, JUMP_DISTANCE_IN_PLACE, JUMP_TYPE_LOW); return MovementAction_AcroWheelieHopFaceDown_Step1(objectEvent, sprite); } @@ -7396,7 +7418,7 @@ static bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct ObjectEvent *obj static bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieJump(objectEvent, sprite, DIR_NORTH, 0, 1); + InitAcroWheelieJump(objectEvent, sprite, DIR_NORTH, JUMP_DISTANCE_IN_PLACE, JUMP_TYPE_LOW); return MovementAction_AcroWheelieHopFaceUp_Step1(objectEvent, sprite); } @@ -7413,7 +7435,7 @@ static bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct ObjectEvent *objec static bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieJump(objectEvent, sprite, DIR_WEST, 0, 1); + InitAcroWheelieJump(objectEvent, sprite, DIR_WEST, JUMP_DISTANCE_IN_PLACE, JUMP_TYPE_LOW); return MovementAction_AcroWheelieHopFaceLeft_Step1(objectEvent, sprite); } @@ -7430,7 +7452,7 @@ static bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct ObjectEvent *obj static bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieJump(objectEvent, sprite, DIR_EAST, 0, 1); + InitAcroWheelieJump(objectEvent, sprite, DIR_EAST, JUMP_DISTANCE_IN_PLACE, JUMP_TYPE_LOW); return MovementAction_AcroWheelieHopFaceRight_Step1(objectEvent, sprite); } @@ -7447,7 +7469,7 @@ static bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct ObjectEvent *ob static bool8 MovementAction_AcroWheelieHopDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieJump(objectEvent, sprite, DIR_SOUTH, 1, 1); + InitAcroWheelieJump(objectEvent, sprite, DIR_SOUTH, JUMP_DISTANCE_NORMAL, JUMP_TYPE_LOW); return MovementAction_AcroWheelieHopDown_Step1(objectEvent, sprite); } @@ -7464,7 +7486,7 @@ static bool8 MovementAction_AcroWheelieHopDown_Step1(struct ObjectEvent *objectE static bool8 MovementAction_AcroWheelieHopUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieJump(objectEvent, sprite, DIR_NORTH, 1, 1); + InitAcroWheelieJump(objectEvent, sprite, DIR_NORTH, JUMP_DISTANCE_NORMAL, JUMP_TYPE_LOW); return MovementAction_AcroWheelieHopUp_Step1(objectEvent, sprite); } @@ -7481,7 +7503,7 @@ static bool8 MovementAction_AcroWheelieHopUp_Step1(struct ObjectEvent *objectEve static bool8 MovementAction_AcroWheelieHopLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieJump(objectEvent, sprite, DIR_WEST, 1, 1); + InitAcroWheelieJump(objectEvent, sprite, DIR_WEST, JUMP_DISTANCE_NORMAL, JUMP_TYPE_LOW); return MovementAction_AcroWheelieHopLeft_Step1(objectEvent, sprite); } @@ -7498,7 +7520,7 @@ static bool8 MovementAction_AcroWheelieHopLeft_Step1(struct ObjectEvent *objectE static bool8 MovementAction_AcroWheelieHopRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieJump(objectEvent, sprite, DIR_EAST, 1, 1); + InitAcroWheelieJump(objectEvent, sprite, DIR_EAST, JUMP_DISTANCE_NORMAL, JUMP_TYPE_LOW); return MovementAction_AcroWheelieHopRight_Step1(objectEvent, sprite); } @@ -7515,7 +7537,7 @@ static bool8 MovementAction_AcroWheelieHopRight_Step1(struct ObjectEvent *object static bool8 MovementAction_AcroWheelieJumpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieJump(objectEvent, sprite, DIR_SOUTH, 2, 0); + InitAcroWheelieJump(objectEvent, sprite, DIR_SOUTH, JUMP_DISTANCE_FAR, JUMP_TYPE_HIGH); return MovementAction_AcroWheelieJumpDown_Step1(objectEvent, sprite); } @@ -7532,7 +7554,7 @@ static bool8 MovementAction_AcroWheelieJumpDown_Step1(struct ObjectEvent *object static bool8 MovementAction_AcroWheelieJumpUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieJump(objectEvent, sprite, DIR_NORTH, 2, 0); + InitAcroWheelieJump(objectEvent, sprite, DIR_NORTH, JUMP_DISTANCE_FAR, JUMP_TYPE_HIGH); return MovementAction_AcroWheelieJumpUp_Step1(objectEvent, sprite); } @@ -7549,7 +7571,7 @@ static bool8 MovementAction_AcroWheelieJumpUp_Step1(struct ObjectEvent *objectEv static bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieJump(objectEvent, sprite, DIR_WEST, 2, 0); + InitAcroWheelieJump(objectEvent, sprite, DIR_WEST, JUMP_DISTANCE_FAR, JUMP_TYPE_HIGH); return MovementAction_AcroWheelieJumpLeft_Step1(objectEvent, sprite); } @@ -7566,7 +7588,7 @@ static bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct ObjectEvent *object static bool8 MovementAction_AcroWheelieJumpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieJump(objectEvent, sprite, DIR_EAST, 2, 0); + InitAcroWheelieJump(objectEvent, sprite, DIR_EAST, JUMP_DISTANCE_FAR, JUMP_TYPE_HIGH); return MovementAction_AcroWheelieJumpRight_Step1(objectEvent, sprite); } @@ -7581,25 +7603,25 @@ static bool8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *objec return FALSE; } -static bool8 MovementActionFunc_x88_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMoveInPlace(objectEvent, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8); return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x89_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMoveInPlace(objectEvent, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8); return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x8A_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMoveInPlace(objectEvent, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8); return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x8B_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMoveInPlace(objectEvent, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8); return MovementAction_WalkInPlace_Step1(objectEvent, sprite); @@ -7614,7 +7636,7 @@ void InitAcroPopWheelie(struct ObjectEvent *objectEvent, struct Sprite *sprite, static bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroPopWheelie(objectEvent, sprite, DIR_SOUTH, 1); + InitAcroPopWheelie(objectEvent, sprite, DIR_SOUTH, MOVE_SPEED_FAST_1); return MovementAction_AcroPopWheelieMoveDown_Step1(objectEvent, sprite); } @@ -7630,7 +7652,7 @@ static bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct ObjectEvent *obj static bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroPopWheelie(objectEvent, sprite, DIR_NORTH, 1); + InitAcroPopWheelie(objectEvent, sprite, DIR_NORTH, MOVE_SPEED_FAST_1); return MovementAction_AcroPopWheelieMoveUp_Step1(objectEvent, sprite); } @@ -7646,7 +7668,7 @@ static bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct ObjectEvent *objec static bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroPopWheelie(objectEvent, sprite, DIR_WEST, 1); + InitAcroPopWheelie(objectEvent, sprite, DIR_WEST, MOVE_SPEED_FAST_1); return MovementAction_AcroPopWheelieMoveLeft_Step1(objectEvent, sprite); } @@ -7662,7 +7684,7 @@ static bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct ObjectEvent *obj static bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroPopWheelie(objectEvent, sprite, DIR_EAST, 1); + InitAcroPopWheelie(objectEvent, sprite, DIR_EAST, MOVE_SPEED_FAST_1); return MovementAction_AcroPopWheelieMoveRight_Step1(objectEvent, sprite); } @@ -7684,7 +7706,7 @@ void InitAcroWheelieMove(struct ObjectEvent *objectEvent, struct Sprite *sprite, static bool8 MovementAction_AcroWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieMove(objectEvent, sprite, DIR_SOUTH, 1); + InitAcroWheelieMove(objectEvent, sprite, DIR_SOUTH, MOVE_SPEED_FAST_1); return MovementAction_AcroWheelieMoveDown_Step1(objectEvent, sprite); } @@ -7700,7 +7722,7 @@ static bool8 MovementAction_AcroWheelieMoveDown_Step1(struct ObjectEvent *object static bool8 MovementAction_AcroWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieMove(objectEvent, sprite, DIR_NORTH, 1); + InitAcroWheelieMove(objectEvent, sprite, DIR_NORTH, MOVE_SPEED_FAST_1); return MovementAction_AcroWheelieMoveUp_Step1(objectEvent, sprite); } @@ -7716,7 +7738,7 @@ static bool8 MovementAction_AcroWheelieMoveUp_Step1(struct ObjectEvent *objectEv static bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieMove(objectEvent, sprite, DIR_WEST, 1); + InitAcroWheelieMove(objectEvent, sprite, DIR_WEST, MOVE_SPEED_FAST_1); return MovementAction_AcroWheelieMoveLeft_Step1(objectEvent, sprite); } @@ -7732,7 +7754,7 @@ static bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct ObjectEvent *object static bool8 MovementAction_AcroWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitAcroWheelieMove(objectEvent, sprite, DIR_EAST, 1); + InitAcroWheelieMove(objectEvent, sprite, DIR_EAST, MOVE_SPEED_FAST_1); return MovementAction_AcroWheelieMoveRight_Step1(objectEvent, sprite); } @@ -7753,13 +7775,13 @@ void InitSpin(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 directi SeekSpriteAnim(sprite, 0); } -static bool8 MovementActionFunc_x94_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_SpinDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitSpin(objectEvent, sprite, DIR_SOUTH, 1); - return MovementActionFunc_x94_1(objectEvent, sprite); + InitSpin(objectEvent, sprite, DIR_SOUTH, MOVE_SPEED_FAST_1); + return MovementAction_SpinDown_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x94_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_SpinDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateMovementNormal(objectEvent, sprite)) { @@ -7769,13 +7791,13 @@ static bool8 MovementActionFunc_x94_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x95_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_SpinUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitSpin(objectEvent, sprite, DIR_NORTH, 1); - return MovementActionFunc_x95_1(objectEvent, sprite); + InitSpin(objectEvent, sprite, DIR_NORTH, MOVE_SPEED_FAST_1); + return MovementAction_SpinUp_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x95_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_SpinUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateMovementNormal(objectEvent, sprite)) { @@ -7785,13 +7807,13 @@ static bool8 MovementActionFunc_x95_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x96_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_SpinLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitSpin(objectEvent, sprite, DIR_WEST, 1); - return MovementActionFunc_x96_1(objectEvent, sprite); + InitSpin(objectEvent, sprite, DIR_WEST, MOVE_SPEED_FAST_1); + return MovementAction_SpinLeft_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x96_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_SpinLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateMovementNormal(objectEvent, sprite)) { @@ -7801,13 +7823,13 @@ static bool8 MovementActionFunc_x96_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x97_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_SpinRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - InitSpin(objectEvent, sprite, DIR_EAST, 1); - return MovementActionFunc_x97_1(objectEvent, sprite); + InitSpin(objectEvent, sprite, DIR_EAST, MOVE_SPEED_FAST_1); + return MovementAction_SpinRight_Step1(objectEvent, sprite); } -static bool8 MovementActionFunc_x97_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_SpinRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateMovementNormal(objectEvent, sprite)) { @@ -7817,7 +7839,7 @@ static bool8 MovementActionFunc_x97_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x98_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_x98_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { StartSpriteAnim(sprite, ANIM_RAISE_HAND); sprite->animPaused = FALSE; @@ -7830,12 +7852,12 @@ static bool8 MovementActionFunc_x98_0(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x98_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_x98_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { return sprite->animEnded; } -static bool8 MovementActionFunc_x99_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_x99_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { switch (sprite->data[7]) { @@ -7881,7 +7903,7 @@ static bool8 MovementActionFunc_x99_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x9A_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_x9A_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { bool8 ret; sprite->data[7] = (sprite->data[7] + 4) & 0xFF; @@ -7893,7 +7915,7 @@ static bool8 MovementActionFunc_x9A_1(struct ObjectEvent *objectEvent, struct Sp return ret; } -static bool8 MovementActionFunc_x9F_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_ShakeHeadOrWalkInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { StartSpriteAnim(sprite, ANIM_SHAKE_HEAD_OR_WALK_IN_PLACE); sprite->animPaused = FALSE; @@ -7902,7 +7924,7 @@ static bool8 MovementActionFunc_x9F_0(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_x9F_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_ShakeHeadOrWalkInPlace_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { return sprite->animEnded; } @@ -7918,14 +7940,14 @@ static bool8 MovementAction_PauseSpriteAnim(struct ObjectEvent *objectEvent, str return TRUE; } -static bool8 MovementActionFunc_xA4_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_FlyUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->y2 = 0; sprite->data[2]++; return FALSE; } -static bool8 MovementActionFunc_xA4_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_FlyUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->y2 -= 8; if (sprite->y2 == -160) @@ -7933,14 +7955,14 @@ static bool8 MovementActionFunc_xA4_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -static bool8 MovementActionFunc_xA5_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_FlyDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->y2 = -160; sprite->data[2]++; return FALSE; } -static bool8 MovementActionFunc_xA5_1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_FlyDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->y2 += 8; if (sprite->y2 == 0) @@ -7948,7 +7970,7 @@ static bool8 MovementActionFunc_xA5_1(struct ObjectEvent *objectEvent, struct Sp return FALSE; } -u8 MovementActionFunc_xA4_2(struct ObjectEvent *objectEvent, struct Sprite *sprite) +u8 MovementAction_FlyUp_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { return TRUE; } @@ -8840,31 +8862,31 @@ void UnfreezeObjectEvents(void) #define tSpeed data[4] #define tStepNo data[5] -static void little_step(struct Sprite *sprite, u8 direction) +static void Step1(struct Sprite *sprite, u8 direction) { sprite->x += sDirectionToVectors[direction].x; sprite->y += sDirectionToVectors[direction].y; } -static void double_little_steps(struct Sprite *sprite, u8 direction) +static void Step2(struct Sprite *sprite, u8 direction) { sprite->x += 2 * (u16)sDirectionToVectors[direction].x; sprite->y += 2 * (u16)sDirectionToVectors[direction].y; } -static void triple_little_steps(struct Sprite *sprite, u8 direction) +static void Step3(struct Sprite *sprite, u8 direction) { sprite->x += 2 * (u16)sDirectionToVectors[direction].x + (u16)sDirectionToVectors[direction].x; sprite->y += 2 * (u16)sDirectionToVectors[direction].y + (u16)sDirectionToVectors[direction].y; } -static void quad_little_steps(struct Sprite *sprite, u8 direction) +static void Step4(struct Sprite *sprite, u8 direction) { sprite->x += 4 * (u16)sDirectionToVectors[direction].x; sprite->y += 4 * (u16)sDirectionToVectors[direction].y; } -static void oct_little_steps(struct Sprite *sprite, u8 direction) +static void Step8(struct Sprite *sprite, u8 direction) { sprite->x += 8 * (u16)sDirectionToVectors[direction].x; sprite->y += 8 * (u16)sDirectionToVectors[direction].y; @@ -8879,83 +8901,83 @@ void SetSpriteDataForNormalStep(struct Sprite *sprite, u8 direction, u8 speed) typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 direction); -static const SpriteStepFunc sSpeed0[] = { - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step, - little_step +static const SpriteStepFunc sSpeedNormalStepFuncs[] = { + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1, + Step1 }; -static const SpriteStepFunc sSpeed1[] = { - double_little_steps, - double_little_steps, - double_little_steps, - double_little_steps, - double_little_steps, - double_little_steps, - double_little_steps, - double_little_steps +static const SpriteStepFunc sSpeedFast1StepFuncs[] = { + Step2, + Step2, + Step2, + Step2, + Step2, + Step2, + Step2, + Step2 }; -static const SpriteStepFunc sSpeed2[] = { - double_little_steps, - triple_little_steps, - triple_little_steps, - double_little_steps, - triple_little_steps, - triple_little_steps +static const SpriteStepFunc sSpeedFast2StepFuncs[] = { + Step2, + Step3, + Step3, + Step2, + Step3, + Step3 }; -static const SpriteStepFunc sSpeed3[] = { - quad_little_steps, - quad_little_steps, - quad_little_steps, - quad_little_steps +static const SpriteStepFunc sSpeedFasterStepFuncs[] = { + Step4, + Step4, + Step4, + Step4 }; -static const SpriteStepFunc sSpeed4[] = { - oct_little_steps, - oct_little_steps +static const SpriteStepFunc sSpeedFastestStepFuncs[] = { + Step8, + Step8 }; -static const SpriteStepFunc *const sSpriteStepFuncsBySpeed[] = { - sSpeed0, - sSpeed1, - sSpeed2, - sSpeed3, - sSpeed4 +static const SpriteStepFunc *const sNpcStepFuncTables[] = { + [MOVE_SPEED_NORMAL] = sSpeedNormalStepFuncs, + [MOVE_SPEED_FAST_1] = sSpeedFast1StepFuncs, + [MOVE_SPEED_FAST_2] = sSpeedFast2StepFuncs, + [MOVE_SPEED_FASTER] = sSpeedFasterStepFuncs, + [MOVE_SPEED_FASTEST] = sSpeedFastestStepFuncs, }; -static const s16 sSpriteStepCountsBySpeed[] = { - NELEMS(sSpeed0), - NELEMS(sSpeed1), - NELEMS(sSpeed2), - NELEMS(sSpeed3), - NELEMS(sSpeed4) +static const s16 sStepTimes[] = { + [MOVE_SPEED_NORMAL] = NELEMS(sSpeedNormalStepFuncs), + [MOVE_SPEED_FAST_1] = NELEMS(sSpeedFast1StepFuncs), + [MOVE_SPEED_FAST_2] = NELEMS(sSpeedFast2StepFuncs), + [MOVE_SPEED_FASTER] = NELEMS(sSpeedFasterStepFuncs), + [MOVE_SPEED_FASTEST] = NELEMS(sSpeedFastestStepFuncs), }; bool8 NpcTakeStep(struct Sprite *sprite) { - if (sprite->tStepNo >= sSpriteStepCountsBySpeed[sprite->tSpeed]) + if (sprite->tStepNo >= sStepTimes[sprite->tSpeed]) return FALSE; - sSpriteStepFuncsBySpeed[sprite->tSpeed][sprite->tStepNo](sprite, sprite->tDirection); + sNpcStepFuncTables[sprite->tSpeed][sprite->tStepNo](sprite, sprite->tDirection); sprite->tStepNo++; - if (sprite->tStepNo < sSpriteStepCountsBySpeed[sprite->tSpeed]) + if (sprite->tStepNo < sStepTimes[sprite->tSpeed]) return FALSE; return TRUE; @@ -8976,7 +8998,7 @@ bool8 UpdateWalkSlowerAnim(struct Sprite *sprite) { if (!(sprite->tDelay & 1)) { - little_step(sprite, sprite->tDirection); + Step1(sprite, sprite->tDirection); sprite->tStepNo++; } @@ -9001,7 +9023,7 @@ bool8 UpdateWalkSlowAnim(struct Sprite *sprite) { if (++sprite->tDelay < 3) { - little_step(sprite, sprite->tDirection); + Step1(sprite, sprite->tDirection); sprite->tStepNo++; } else @@ -9025,7 +9047,7 @@ bool8 UpdateWalkSlowestAnim(struct Sprite *sprite) if (++sprite->tDelay > 9) { sprite->tDelay = 0; - little_step(sprite, sprite->tDirection); + Step1(sprite, sprite->tDirection); sprite->tStepNo++; } @@ -9046,12 +9068,12 @@ bool8 UpdateRunSlowAnim(struct Sprite *sprite) { if ((++sprite->tDelay) & 1) { - little_step(sprite, sprite->tDirection); + Step1(sprite, sprite->tDirection); sprite->tStepNo++; } else { - double_little_steps(sprite, sprite->tDirection); + Step2(sprite, sprite->tDirection); sprite->tStepNo += 2; } @@ -9064,61 +9086,72 @@ bool8 UpdateRunSlowAnim(struct Sprite *sprite) #undef tStepNo #undef tDelay -#define tJumpSpeed data[4] -#define tJumpHeight data[5] -#define tStepNo data[6] - -static const s8 sJumpHeight12[] = { - -4, -6, -8, -10, -11, -12, -12, -12, -11, -10, -9, -8, -6, -4, 0, 0 +static const s8 sJumpY_High[] = { + -4, -6, -8, -10, -11, -12, -12, -12, + -11, -10, -9, -8, -6, -4, 0, 0 }; -static const s8 sJumpHeight6[] = { - 0, -2, -3, -4, -5, -6, -6, -6, -5, -5, -4, -3, -2, 0, 0, 0 +static const s8 sJumpY_Low[] = { + 0, -2, -3, -4, -5, -6, -6, -6, + -5, -5, -4, -3, -2, 0, 0, 0 }; -static const s8 sJumpHeight10[] = { - -2, -4, -6, -8, -9, -10, -10, -10, -9, -8, -6, -5, -3, -2, 0, 0 +static const s8 sJumpY_Normal[] = { + -2, -4, -6, -8, -9, -10, -10, -10, + -9, -8, -6, -5, -3, -2, 0, 0 }; -static const s8 *const sYDisplacementPtrs[] = { - sJumpHeight12, - sJumpHeight6, - sJumpHeight10 +#define sJumpDistance data[4] +#define sJumpType data[5] +#define sTimer data[6] + +static const s8 *const sJumpYTable[] = { + [JUMP_TYPE_HIGH] = sJumpY_High, + [JUMP_TYPE_LOW] = sJumpY_Low, + [JUMP_TYPE_NORMAL] = sJumpY_Normal, }; -static s16 GetJumpYDisplacement(s16 stepno, u8 jumpno) +static s16 GetJumpY(s16 i, u8 type) { - return sYDisplacementPtrs[jumpno][stepno]; + return sJumpYTable[type][i]; } -void SetJumpSpriteData(struct Sprite *sprite, u8 direction, u8 speed, u8 height) +void SetJumpSpriteData(struct Sprite *sprite, u8 direction, u8 distance, u8 type) { sprite->tDirection = direction; - sprite->tJumpSpeed = speed; - sprite->tJumpHeight = height; - sprite->tStepNo = 0; + sprite->sJumpDistance = distance; + sprite->sJumpType = type; + sprite->sTimer = 0; } u8 DoJumpSpriteMovement(struct Sprite *sprite) { - s16 duration[3] = {0x10, 0x10, 0x20}; - u8 shifts[3] = {0, 0, 1}; + s16 distanceToTime[] = { + [JUMP_DISTANCE_IN_PLACE] = 16, + [JUMP_DISTANCE_NORMAL] = 16, + [JUMP_DISTANCE_FAR] = 32, + }; + u8 distanceToShift[] = { + [JUMP_DISTANCE_IN_PLACE] = 0, + [JUMP_DISTANCE_NORMAL] = 0, + [JUMP_DISTANCE_FAR] = 1, + }; u8 jumpPhase = 0; - if (sprite->tJumpSpeed != 0) - little_step(sprite, sprite->tDirection); + if (sprite->sJumpDistance != JUMP_DISTANCE_IN_PLACE) + Step1(sprite, sprite->tDirection); - sprite->y2 = GetJumpYDisplacement(sprite->tStepNo >> shifts[sprite->tJumpSpeed], sprite->tJumpHeight); + sprite->y2 = GetJumpY(sprite->sTimer >> distanceToShift[sprite->sJumpDistance], sprite->sJumpType); - sprite->tStepNo++; + sprite->sTimer++; - if (sprite->tStepNo == (duration[sprite->tJumpSpeed] >> 1)) - jumpPhase = 1; + if (sprite->sTimer == (distanceToTime[sprite->sJumpDistance] >> 1)) + jumpPhase = JUMP_HALFWAY; - if (sprite->tStepNo >= duration[sprite->tJumpSpeed]) + if (sprite->sTimer >= distanceToTime[sprite->sJumpDistance]) { sprite->y2 = 0; - jumpPhase = -1; + jumpPhase = JUMP_FINISHED; } return jumpPhase; @@ -9130,28 +9163,28 @@ u8 DoJumpSpecialSpriteMovement(struct Sprite *sprite) u8 shifts[3] = {1, 1, 2}; u8 jumpPhase = 0; - if (sprite->tJumpSpeed != 0 && !(sprite->tStepNo & 1)) - little_step(sprite, sprite->tDirection); + if (sprite->sJumpDistance != JUMP_DISTANCE_IN_PLACE && !(sprite->sTimer & 1)) + Step1(sprite, sprite->tDirection); - sprite->y2 = GetJumpYDisplacement(sprite->tStepNo >> shifts[sprite->tJumpSpeed], sprite->tJumpHeight); + sprite->y2 = GetJumpY(sprite->sTimer >> shifts[sprite->sJumpDistance], sprite->sJumpType); - sprite->tStepNo++; + sprite->sTimer++; - if (sprite->tStepNo == (duration[sprite->tJumpSpeed] >> 1)) - jumpPhase = 1; + if (sprite->sTimer == (duration[sprite->sJumpDistance] >> 1)) + jumpPhase = JUMP_HALFWAY; - if (sprite->tStepNo >= duration[sprite->tJumpSpeed]) + if (sprite->sTimer >= duration[sprite->sJumpDistance]) { sprite->y2 = 0; - jumpPhase = -1; + jumpPhase = JUMP_FINISHED; } return jumpPhase; } -#undef tStepNo -#undef tJumpHeight -#undef tJumpSpeed +#undef sTimer +#undef sJumpType +#undef sJumpDistance #undef tDirection #define tDelay data[3] diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index b65942866..fd1c67ccd 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -767,7 +767,7 @@ static bool8 PlayerAnimIsMultiFrameStationary(void) if (movementActionId <= MOVEMENT_ACTION_FACE_RIGHT_FAST || (movementActionId >= MOVEMENT_ACTION_DELAY_1 && movementActionId <= MOVEMENT_ACTION_DELAY_16) - || (movementActionId >= MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN && movementActionId <= MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT) + || (movementActionId >= MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN && movementActionId <= MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT) || (movementActionId >= MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN && movementActionId <= MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT) || (movementActionId >= MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN && movementActionId <= MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT)) return TRUE; diff --git a/src/vs_seeker.c b/src/vs_seeker.c index c95c0da52..7ab569e57 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -575,7 +575,7 @@ static const u8 sMovementScript_TrainerNoRematch[] = { }; static const u8 sMovementScript_TrainerRematch[] = { - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN, MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK, MOVEMENT_ACTION_STEP_END };