Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim

asm/macros/movement.inc

@@ -1,136 +1,177 @@
-	.macro create_movement name
+	.macro create_movement_action name:req, value:req
-	enum _\name
 	.macro \name
-	.byte _\name
+	.byte \value
 	.endm
 	.endm
 
-	enum_start 0
+	create_movement_action face_down, MOVEMENT_ACTION_FACE_DOWN
-	create_movement face_down
+	create_movement_action face_up, MOVEMENT_ACTION_FACE_UP
-	create_movement face_up
+	create_movement_action face_left, MOVEMENT_ACTION_FACE_LEFT
-	create_movement face_left
+	create_movement_action face_right, MOVEMENT_ACTION_FACE_RIGHT
-	create_movement face_right
+	create_movement_action face_down_fast, MOVEMENT_ACTION_FACE_DOWN_FAST
-	create_movement face_down_fast
+	create_movement_action face_up_fast, MOVEMENT_ACTION_FACE_UP_FAST
-	create_movement face_up_fast
+	create_movement_action face_left_fast, MOVEMENT_ACTION_FACE_LEFT_FAST
-	create_movement face_left_fast
+	create_movement_action face_right_fast, MOVEMENT_ACTION_FACE_RIGHT_FAST
-	create_movement face_right_fast
+	create_movement_action walk_slower_down, MOVEMENT_ACTION_WALK_SLOWER_DOWN
-	create_movement walk_slower_down
+	create_movement_action walk_slower_up, MOVEMENT_ACTION_WALK_SLOWER_UP
-	create_movement walk_slower_up
+	create_movement_action walk_slower_left, MOVEMENT_ACTION_WALK_SLOWER_LEFT
-	create_movement walk_slower_left
+	create_movement_action walk_slower_right, MOVEMENT_ACTION_WALK_SLOWER_RIGHT
-	create_movement walk_slower_right
+	create_movement_action walk_slow_down, MOVEMENT_ACTION_WALK_SLOW_DOWN
-	create_movement walk_slow_down
+	create_movement_action walk_slow_up, MOVEMENT_ACTION_WALK_SLOW_UP
-	create_movement walk_slow_up
+	create_movement_action walk_slow_left, MOVEMENT_ACTION_WALK_SLOW_LEFT
-	create_movement walk_slow_left
+	create_movement_action walk_slow_right, MOVEMENT_ACTION_WALK_SLOW_RIGHT
-	create_movement walk_slow_right
+	create_movement_action walk_down, MOVEMENT_ACTION_WALK_NORMAL_DOWN
-	create_movement walk_down
+	create_movement_action walk_up, MOVEMENT_ACTION_WALK_NORMAL_UP
-	create_movement walk_up
+	create_movement_action walk_left, MOVEMENT_ACTION_WALK_NORMAL_LEFT
-	create_movement walk_left
+	create_movement_action walk_right, MOVEMENT_ACTION_WALK_NORMAL_RIGHT
-	create_movement walk_right
+	create_movement_action jump_2_down, MOVEMENT_ACTION_JUMP_2_DOWN
-	create_movement jump_2_down
+	create_movement_action jump_2_up, MOVEMENT_ACTION_JUMP_2_UP
-	create_movement jump_2_up
+	create_movement_action jump_2_left, MOVEMENT_ACTION_JUMP_2_LEFT
-	create_movement jump_2_left
+	create_movement_action jump_2_right, MOVEMENT_ACTION_JUMP_2_RIGHT
-	create_movement jump_2_right
+	create_movement_action delay_1, MOVEMENT_ACTION_DELAY_1
-	create_movement delay_1
+	create_movement_action delay_2, MOVEMENT_ACTION_DELAY_2
-	create_movement delay_2
+	create_movement_action delay_4, MOVEMENT_ACTION_DELAY_4
-	create_movement delay_4
+	create_movement_action delay_8, MOVEMENT_ACTION_DELAY_8
-	create_movement delay_8
+	create_movement_action delay_16, MOVEMENT_ACTION_DELAY_16
-	create_movement delay_16
+	create_movement_action walk_fast_down, MOVEMENT_ACTION_WALK_FAST_DOWN
-	create_movement walk_fast_down
+	create_movement_action walk_fast_up, MOVEMENT_ACTION_WALK_FAST_UP
-	create_movement walk_fast_up
+	create_movement_action walk_fast_left, MOVEMENT_ACTION_WALK_FAST_LEFT
-	create_movement walk_fast_left
+	create_movement_action walk_fast_right, MOVEMENT_ACTION_WALK_FAST_RIGHT
-	create_movement walk_fast_right
+	create_movement_action walk_in_place_slow_down, MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN
-	create_movement walk_in_place_slow_down
+	create_movement_action walk_in_place_slow_up, MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP
-	create_movement walk_in_place_slow_up
+	create_movement_action walk_in_place_slow_left, MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT
-	create_movement walk_in_place_slow_left
+	create_movement_action walk_in_place_slow_right, MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT
-	create_movement walk_in_place_slow_right
+	create_movement_action walk_in_place_down, MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN
-	create_movement walk_in_place_down
+	create_movement_action walk_in_place_up, MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP
-	create_movement walk_in_place_up
+	create_movement_action walk_in_place_left, MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT
-	create_movement walk_in_place_left
+	create_movement_action walk_in_place_right, MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT
-	create_movement walk_in_place_right
+	create_movement_action walk_in_place_fast_down, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN
-	create_movement walk_in_place_fast_down
+	create_movement_action walk_in_place_fast_up, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP
-	create_movement walk_in_place_fast_up
+	create_movement_action walk_in_place_fast_left, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT
-	create_movement walk_in_place_fast_left
+	create_movement_action walk_in_place_fast_right, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT
-	create_movement walk_in_place_fast_right
+	create_movement_action walk_in_place_faster_down, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN
-	create_movement walk_in_place_fastest_down
+	create_movement_action walk_in_place_faster_up, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_UP
-	create_movement walk_in_place_fastest_up
+	create_movement_action walk_in_place_faster_left, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_LEFT
-	create_movement walk_in_place_fastest_left
+	create_movement_action walk_in_place_faster_right, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT
-	create_movement walk_in_place_fastest_right
+	create_movement_action ride_water_current_down, MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN
-	create_movement ride_water_current_down
+	create_movement_action ride_water_current_up, MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP
-	create_movement ride_water_current_up
+	create_movement_action ride_water_current_lefft, MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT
-	create_movement ride_water_current_lefft
+	create_movement_action ride_water_current_right, MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT
-	create_movement ride_water_current_right
+	create_movement_action walk_faster_down, MOVEMENT_ACTION_WALK_FASTER_DOWN
-	create_movement walk_fastest_down
+	create_movement_action walk_faster_up, MOVEMENT_ACTION_WALK_FASTER_UP
-	create_movement walk_fastest_up
+	create_movement_action walk_faster_left, MOVEMENT_ACTION_WALK_FASTER_LEFT
-	create_movement walk_fastest_left
+	create_movement_action walk_faster_right, MOVEMENT_ACTION_WALK_FASTER_RIGHT
-	create_movement walk_fastest_right
+	create_movement_action slide_down, MOVEMENT_ACTION_SLIDE_DOWN
-	create_movement slide_down
+	create_movement_action slide_up, MOVEMENT_ACTION_SLIDE_UP
-	create_movement slide_up
+	create_movement_action slide_left, MOVEMENT_ACTION_SLIDE_LEFT
-	create_movement slide_left
+	create_movement_action slide_right, MOVEMENT_ACTION_SLIDE_RIGHT
-	create_movement slide_right
+	create_movement_action player_run_down, MOVEMENT_ACTION_PLAYER_RUN_DOWN
-	create_movement player_run_down
+	create_movement_action player_run_up, MOVEMENT_ACTION_PLAYER_RUN_UP
-	create_movement player_run_up
+	create_movement_action player_run_left, MOVEMENT_ACTION_PLAYER_RUN_LEFT
-	create_movement player_run_left
+	create_movement_action player_run_right, MOVEMENT_ACTION_PLAYER_RUN_RIGHT
-	create_movement player_run_right
+	create_movement_action player_run_down_slow, MOVEMENT_ACTION_PLAYER_RUN_DOWN_SLOW
-	create_movement player_run_down_slow
+	create_movement_action player_run_up_slow, MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW
-	create_movement player_run_up_slow
+	create_movement_action player_run_left_slow, MOVEMENT_ACTION_PLAYER_RUN_LEFT_SLOW
-	create_movement player_run_left_slow
+	create_movement_action player_run_right_slow, MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW
-	create_movement player_run_right_slow
+	create_movement_action start_anim_in_direction, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION
-	create_movement step_45
+	create_movement_action jump_special_down, MOVEMENT_ACTION_JUMP_SPECIAL_DOWN
-	create_movement jump_down_run
+	create_movement_action jump_special_up, MOVEMENT_ACTION_JUMP_SPECIAL_UP
-	create_movement jump_up_run
+	create_movement_action jump_special_left, MOVEMENT_ACTION_JUMP_SPECIAL_LEFT
-	create_movement jump_left_run
+	create_movement_action jump_special_right, MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT
-	create_movement jump_right_run
+	create_movement_action face_player, MOVEMENT_ACTION_FACE_PLAYER
-	create_movement face_player
+	create_movement_action face_away_player, MOVEMENT_ACTION_FACE_AWAY_PLAYER
-	create_movement face_away_player
+	create_movement_action lock_facing_direction, MOVEMENT_ACTION_LOCK_FACING_DIRECTION
-	create_movement lock_facing_direction
+	create_movement_action unlock_facing_direction, MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION
-	create_movement unlock_facing_direction
+	create_movement_action jump_down, MOVEMENT_ACTION_JUMP_DOWN
-	create_movement jump_down
+	create_movement_action jump_up, MOVEMENT_ACTION_JUMP_UP
-	create_movement jump_up
+	create_movement_action jump_left, MOVEMENT_ACTION_JUMP_LEFT
-	create_movement jump_left
+	create_movement_action jump_right, MOVEMENT_ACTION_JUMP_RIGHT
-	create_movement jump_right
+	create_movement_action jump_in_place_down, MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN
-	create_movement jump_in_place_down
+	create_movement_action jump_in_place_up, MOVEMENT_ACTION_JUMP_IN_PLACE_UP
-	create_movement jump_in_place_up
+	create_movement_action jump_in_place_left, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT
-	create_movement jump_in_place_left
+	create_movement_action jump_in_place_right, MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT
-	create_movement jump_in_place_right
+	create_movement_action jump_in_place_down_up, MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP
-	create_movement jump_in_place_down_up
+	create_movement_action jump_in_place_up_down, MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN
-	create_movement jump_in_place_up_down
+	create_movement_action jump_in_place_left_right, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT
-	create_movement jump_in_place_left_right
+	create_movement_action jump_in_place_right_left, MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT
-	create_movement jump_in_place_right_left
+	create_movement_action face_original_direction, MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION
-	create_movement face_original_direction
+	create_movement_action nurse_joy_bow, MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN
-	create_movement nurse_joy_bow
+	create_movement_action enable_jump_landing_ground_effect, MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT
-	create_movement enable_jump_landing_ground_effect
+	create_movement_action disable_jump_landing_ground_effect, MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT
-	create_movement disable_jump_landing_ground_effect
+	create_movement_action disable_anim, MOVEMENT_ACTION_DISABLE_ANIMATION
-	create_movement disable_anim
+	create_movement_action restore_anim, MOVEMENT_ACTION_RESTORE_ANIMATION
-	create_movement restore_anim
+	create_movement_action set_invisible, MOVEMENT_ACTION_SET_INVISIBLE
-	create_movement set_invisible
+	create_movement_action set_visible, MOVEMENT_ACTION_SET_VISIBLE
-	create_movement set_visible
+	create_movement_action emote_exclamation_mark, MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK
-	create_movement emote_exclamation_mark
+	create_movement_action emote_question_mark, MOVEMENT_ACTION_EMOTE_QUESTION_MARK
-	create_movement emote_question_mark
+	create_movement_action emote_x, MOVEMENT_ACTION_EMOTE_X
-	create_movement emote_x
+	create_movement_action emote_double_exclamation_mark, MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK
-	create_movement emote_double_exclamation_mark
+	create_movement_action emote_smile, MOVEMENT_ACTION_EMOTE_SMILE
-	create_movement emote_smile
+	create_movement_action reveal_trainer, MOVEMENT_ACTION_REVEAL_TRAINER
-	create_movement reveal_trainer
+	create_movement_action rock_smash_break, MOVEMENT_ACTION_ROCK_SMASH_BREAK
-	create_movement rock_smash_break
+	create_movement_action cut_tree, MOVEMENT_ACTION_CUT_TREE
-	create_movement cut_tree
+	create_movement_action set_fixed_priority, MOVEMENT_ACTION_SET_FIXED_PRIORITY
-
+	create_movement_action clear_fixed_priority, MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY
-	enum_start 0x94
+	create_movement_action init_affine_anim, MOVEMENT_ACTION_INIT_AFFINE_ANIM
-	create_movement spin_down
+	create_movement_action clear_affine_anim, MOVEMENT_ACTION_CLEAR_AFFINE_ANIM
-	create_movement spin_up
+	create_movement_action walk_down_start_affine, MOVEMENT_ACTION_WALK_DOWN_START_AFFINE
-	create_movement spin_left
+	create_movement_action walk_down_affine, MOVEMENT_ACTION_WALK_DOWN_AFFINE
-	create_movement spin_right
+	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
-	enum_start 0x9b
+	create_movement_action acro_wheelie_face_left, MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT
-	create_movement walk_slowest_down
+	create_movement_action acro_wheelie_face_right, MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT
-	create_movement walk_slowest_up
+	create_movement_action acro_pop_wheelie_down, MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN
-	create_movement walk_slowest_left
+	create_movement_action acro_pop_wheelie_up, MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP
-	create_movement walk_slowest_right
+	create_movement_action acro_pop_wheelie_left, MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT
-	create_movement shake_head_or_walk_in_place
+	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
-	enum_start 0xa6
+	create_movement_action acro_end_wheelie_face_up, MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP
-	create_movement jump_special_with_effect_down
+	create_movement_action acro_end_wheelie_face_left, MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT
-	create_movement jump_special_with_effect_up
+	create_movement_action acro_end_wheelie_face_right, MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT
-	create_movement jump_special_with_effect_left
+	create_movement_action acro_wheelie_hop_face_down, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN
-	create_movement jump_special_with_effect_right
+	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
-	enum_start 0xfe
+	create_movement_action acro_wheelie_hop_face_right, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT
-	create_movement step_end
+	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 raise_hand_and_stop, MOVEMENT_ACTION_RAISE_HAND_AND_STOP
+	create_movement_action raise_hand_and_jump, MOVEMENT_ACTION_RAISE_HAND_AND_JUMP
+	create_movement_action raise_hand_and_swim, MOVEMENT_ACTION_RAISE_HAND_AND_SWIM
+	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 glide_down, MOVEMENT_ACTION_GLIDE_DOWN
+	create_movement_action glide_up, MOVEMENT_ACTION_GLIDE_UP
+	create_movement_action glide_left, MOVEMENT_ACTION_GLIDE_LEFT
+	create_movement_action glide_right, MOVEMENT_ACTION_GLIDE_RIGHT
+	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

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

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

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

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

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::

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

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

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::

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

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::

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::

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

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

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

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

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 LOCALID_BILL, Movement_WalkInPlaceFasterDown
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
+	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

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 LOCALID_SIGN_LADY, Movement_WalkInPlaceFasterRight
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	call PalletTown_EventScript_SignLadyShowSign
 	releaseall

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 OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
-	applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
+	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 OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
-	applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
+	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 LOCALID_RIVAL, Movement_WalkInPlaceFasterUp
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
+	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::

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

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
 

data/maps/PewterCity_Gym/text.inc

@@ -16,7 +16,7 @@ PewterCity_Gym_Text_BrockIntro::
 
 @ NOTE: This defeat text actually causes a buffer overflow. It's too long for the gDisplayedStringBattle
 @ buffer that it's put into, and it stomps all over the gBattleTextBuffs after, as well as the otherwise
-@ unused array after that, gUnknown_2022AE8. Perhaps that's the reason why said array exists.
+@ unused array after that, sFlickerArray. Perhaps that's the reason why said array exists.
 PewterCity_Gym_Text_BrockDefeat::
     .string "I took you for granted, and so\n"
     .string "I lost.\p"

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

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

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_PROF_OAK, Movement_WalkInPlaceFasterRight
-	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestLeft
+	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

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 LOCALID_PROF_OAK, Movement_WalkInPlaceFasterLeft
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	delay 18
 	msgbox PokemonLeague_HallOfFame_Text_OakCongratulations
 	closemessage
-	applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestUp
+	applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterUp
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	delay 20
 	dofieldeffect FLDEFF_HALL_OF_FAME_RECORD

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

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 LOCALID_RIVAL, Movement_WalkInPlaceFasterRight
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	return
 
 PokemonTower_2F_EventScript_RivalFacePlayerDown::
-	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
+	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

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::

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

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

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::

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::

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::

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

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

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

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

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::

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
 

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

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::

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::

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
 

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

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

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::

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::

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_BIKER4, Movement_WalkInPlaceFasterDown
-	applymovement LOCALID_BIKER5, Movement_WalkInPlaceFastestDown
+	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::

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::

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

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::

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 LOCALID_FERRY_SAILOR, Movement_WalkInPlaceFasterLeft
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
+	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

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

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::

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

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

data/scripts/movement.inc

@@ -25,20 +25,20 @@ Movement_FaceOriginalDirection::
 	face_original_direction
 	step_end
 
-Movement_WalkInPlaceFastestLeft::
+Movement_WalkInPlaceFasterLeft::
-	walk_in_place_fastest_left
+	walk_in_place_faster_left
 	step_end
 
-Movement_WalkInPlaceFastestUp::
+Movement_WalkInPlaceFasterUp::
-	walk_in_place_fastest_up
+	walk_in_place_faster_up
 	step_end
 
-Movement_WalkInPlaceFastestRight::
+Movement_WalkInPlaceFasterRight::
-	walk_in_place_fastest_right
+	walk_in_place_faster_right
 	step_end
 
-Movement_WalkInPlaceFastestDown::
+Movement_WalkInPlaceFasterDown::
-	walk_in_place_fastest_down
+	walk_in_place_faster_down
 	step_end
 
 Movement_FaceRight::

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

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

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

include/battle.h

@@ -188,7 +188,7 @@ struct ProtectStruct
     u32 confusionSelfDmg:1;
     u32 targetNotAffected:1;
     u32 chargingTurn:1;
-    u32 fleeFlag:2; // for RunAway and Smoke Ball
+    u32 fleeType:2; // for RunAway and Smoke Ball
     u32 usedImprisonedMove:1;
     u32 loveImmobility:1;
     u32 usedDisabledMove:1;
@@ -361,7 +361,7 @@ struct BattleResults
 
 extern struct BattleResults gBattleResults;
 
-struct LinkPartnerHeader
+struct LinkBattlerHeader
 {
     u8 versionSignatureLo;
     u8 versionSignatureHi;
@@ -452,7 +452,7 @@ struct BattleStruct
     u8 field_182;
     // align 4
     union {
-        struct LinkPartnerHeader linkPartnerHeader;
+        struct LinkBattlerHeader linkBattlerHeader;
         struct MultiBattlePokemonTx multiBattleMons[3];
     } multiBuffer;
     u8 padding_1E4[0x1C];
@@ -681,8 +681,8 @@ extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
 extern void (*gPreBattleCallback1)(void);
 extern bool8 gDoingBattleAnim;
 extern struct PokedudeBattlerState *gPokedudeBattlerStates[MAX_BATTLERS_COUNT];
-extern u8 *gBattleAnimMons_BgTilesBuffer;
+extern u8 *gBattleAnimBgTileBuffer;
-extern u8 *gBattleAnimMons_BgTilemapBuffer;
+extern u8 *gBattleAnimBgTilemapBuffer;
 extern void (*gBattleMainFunc)(void);
 extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
 extern u32 gUnknown_2022B54;

include/battle_controllers.h

@@ -101,6 +101,8 @@ enum {
 
 #define INSTANT_HP_BAR_DROP     0x7FFF
 
+#define PARTY_SUMM_SKIP_DRAW_DELAY (1 << 7)
+
 // Special return values in gBattleBufferB from Battle Controller functions.
 #define RET_VALUE_LEVELED_UP   11
 

include/battle_main.h

@@ -73,10 +73,10 @@ u32 GetBattleBgTemplateData(u8 arrayId, u8 caseId);
 void SpriteCB_EnemyMon(struct Sprite *sprite);
 void SpriteCallbackDummy_2(struct Sprite *sprite);
 void SpriteCB_FaintOpponentMon(struct Sprite *sprite);
-void SpriteCb_ShowAsMoveTarget(struct Sprite *sprite);
+void SpriteCB_ShowAsMoveTarget(struct Sprite *sprite);
-void SpriteCb_HideAsMoveTarget(struct Sprite *sprite);
+void SpriteCB_HideAsMoveTarget(struct Sprite *sprite);
 void SpriteCB_AllyMon(struct Sprite *sprite);
-void SpriteCB_SetToDummy3(struct Sprite *sprite);
+void SetIdleSpriteCallback(struct Sprite *sprite);
 void SpriteCB_FaintSlideAnim(struct Sprite *sprite);
 void DoBounceEffect(u8 battler, u8 which, s8 delta, s8 amplitude);
 void EndBounceEffect(u8 battler, u8 which);

include/battle_util.h

@@ -9,6 +9,7 @@
 #define MOVE_LIMITATION_TORMENTED               (1 << 3)
 #define MOVE_LIMITATION_TAUNT                   (1 << 4)
 #define MOVE_LIMITATION_IMPRISON                (1 << 5)
+#define MOVE_LIMITATIONS_ALL                    0xFF
 
 #define ABILITYEFFECT_ON_SWITCHIN                0
 #define ABILITYEFFECT_ENDTURN                    1
@@ -38,9 +39,12 @@
 #define ABILITY_ON_FIELD(abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, abilityId, 0, 0))
 #define ABILITY_ON_FIELD2(abilityId)(AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, abilityId, 0, 0))
 
-#define ITEMEFFECT_ON_SWITCH_IN                 0x0
+// For the first argument of ItemBattleEffects, to deteremine which block of item effects to try
-#define ITEMEFFECT_MOVE_END                     0x3
+#define ITEMEFFECT_ON_SWITCH_IN                 0
-#define ITEMEFFECT_KINGSROCK_SHELLBELL          0x4
+#define ITEMEFFECT_NORMAL                       1
+#define ITEMEFFECT_DUMMY                        2 // Unused, empty
+#define ITEMEFFECT_MOVE_END                     3
+#define ITEMEFFECT_KINGSROCK_SHELLBELL          4
 
 #define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0)))
 #define WEATHER_HAS_EFFECT2 ((!AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_AIR_LOCK, 0, 0)))
@@ -58,7 +62,6 @@ u8 GetBattlerForBattleScript(u8 caseId);
 void PressurePPLose(u8 target, u8 attacker, u16 move);
 void PressurePPLoseOnUsingImprison(u8 attacker);
 void PressurePPLoseOnUsingPerishSong(u8 attacker);
-void MarkAllBattlersForControllerExec(void);
 void MarkBattlerForControllerExec(u8 battlerId);
 void MarkBattlerReceivedLinkData(u8 battlerId);
 void CancelMultiTurnMoves(u8 battler);

include/constants/battle.h

@@ -316,6 +316,9 @@
 #define NUM_CASTFORM_FORMS  4
 #define CASTFORM_SUBSTITUTE (1 << 7)
 
+#define FLEE_ITEM    1
+#define FLEE_ABILITY 2
+
 // Return value for IsRunningFromBattleImpossible.
 #define BATTLE_RUN_SUCCESS        0
 #define BATTLE_RUN_FORBIDDEN      1
@@ -351,4 +354,7 @@
 #define B_TEXT_FLAG_NPC_CONTEXT_FONT    (1 << 6)
 #define B_TEXT_FLAG_WINDOW_CLEAR        (1 << 7)
 
+// Indicator for the party summary bar to display an empty slot.
+#define HP_EMPTY_SLOT 0xFFFF
+
 #endif // GUARD_CONSTANTS_BATTLE_H

include/constants/event_object_movement.h

@@ -79,9 +79,9 @@
 #define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT                0x4A
 #define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT               0x4B
 #define MOVEMENT_TYPE_INVISIBLE                        0x4C
-#define MOVEMENT_TYPE_VS_SEEKER_4D                     0x4D
+#define MOVEMENT_TYPE_RAISE_HAND_AND_STOP              0x4D
-#define MOVEMENT_TYPE_VS_SEEKER_4E                     0x4E
+#define MOVEMENT_TYPE_RAISE_HAND_AND_JUMP              0x4E
-#define MOVEMENT_TYPE_VS_SEEKER_4F                     0x4F
+#define MOVEMENT_TYPE_RAISE_HAND_AND_SWIM              0x4F
 #define MOVEMENT_TYPE_WANDER_AROUND_SLOWER             0x50
 #define MOVEMENT_TYPES_COUNT                           0x51
 
@@ -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_FASTER_DOWN       0x2D
-#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP        0x2E
+#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_UP         0x2E
-#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT      0x2F
+#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_LEFT       0x2F
-#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT     0x30
+#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_FASTER_DOWN                0x35
-#define MOVEMENT_ACTION_WALK_FASTEST_UP                 0x36
+#define MOVEMENT_ACTION_WALK_FASTER_UP                  0x36
-#define MOVEMENT_ACTION_WALK_FASTEST_LEFT               0x37
+#define MOVEMENT_ACTION_WALK_FASTER_LEFT                0x37
-#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT              0x38
+#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
@@ -240,18 +240,18 @@
 #define MOVEMENT_ACTION_SPIN_UP                         0x95
 #define MOVEMENT_ACTION_SPIN_LEFT                       0x96
 #define MOVEMENT_ACTION_SPIN_RIGHT                      0x97
-#define MOVEMENT_ACTION_0x98                            0x98
+#define MOVEMENT_ACTION_RAISE_HAND_AND_STOP             0x98
-#define MOVEMENT_ACTION_0x99                            0x99
+#define MOVEMENT_ACTION_RAISE_HAND_AND_JUMP             0x99
-#define MOVEMENT_ACTION_0x9A                            0x9A
+#define MOVEMENT_ACTION_RAISE_HAND_AND_SWIM             0x9A
 #define MOVEMENT_ACTION_WALK_SLOWEST_DOWN               0x9B
 #define MOVEMENT_ACTION_WALK_SLOWEST_UP                 0x9C
 #define MOVEMENT_ACTION_WALK_SLOWEST_LEFT               0x9D
 #define MOVEMENT_ACTION_WALK_SLOWEST_RIGHT              0x9E
 #define MOVEMENT_ACTION_SHAKE_HEAD_OR_WALK_IN_PLACE     0x9F
-#define MOVEMENT_ACTION_0xA0                            0xA0
+#define MOVEMENT_ACTION_GLIDE_DOWN                      0xA0
-#define MOVEMENT_ACTION_0xA1                            0xA1
+#define MOVEMENT_ACTION_GLIDE_UP                        0xA1
-#define MOVEMENT_ACTION_0xA2                            0xA2
+#define MOVEMENT_ACTION_GLIDE_LEFT                      0xA2
-#define MOVEMENT_ACTION_0xA3                            0xA3
+#define MOVEMENT_ACTION_GLIDE_RIGHT                     0xA3
 #define MOVEMENT_ACTION_FLY_UP                          0xA4
 #define MOVEMENT_ACTION_FLY_DOWN                        0xA5
 #define MOVEMENT_ACTION_JUMP_SPECIAL_WITH_EFFECT_DOWN   0xA6

include/constants/pokemon.h

@@ -224,7 +224,6 @@
 #define EV_ITEM_RAISE_LIMIT 100
 
 #define PARTY_SIZE 6
-#define UNOWN_FORM_COUNT 28
 #define BOX_NAME_LENGTH 8
 
 #define EVO_MODE_NORMAL     0

include/data.h

@@ -20,10 +20,6 @@ struct MonCoords
 
 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
 extern const u8 gMoveNames[][13];
-extern const u16 gUnknown_8251CB8[];
-extern const u16 gUnknown_8251FEE[];
-extern const u16 gUnknown_8252324[];
-extern const u16 gUnknown_82539D4[];
 
 extern const u8 gTrainerClassNames[][13];
 
@@ -36,6 +32,7 @@ extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
 extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
 extern const struct MonCoords gTrainerFrontPicCoords[];
 extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
+extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[];
 extern const struct MonCoords gTrainerBackPicCoords[];
@@ -49,15 +46,13 @@ extern const u8 gEnemyMonElevation[NUM_SPECIES];
 extern const u8 *const gBattleAnims_General[];
 extern const u8 *const gBattleAnims_Special[];
 
-extern const struct OamData gUnknown_824F010;
+extern const union AnimCmd *const gAnims_MonPic[];
-extern const struct OamData gUnknown_824F018;
+extern const union AffineAnimCmd *const gAffineAnims_BattleSpritePlayerSide[];
-extern const union AnimCmd *const gSpriteAnimTable_82349BC[];
+extern const union AffineAnimCmd *const gAffineAnims_BattleSpriteOpponentSide[];
-extern const union AffineAnimCmd *const gSpriteAffineAnimTable_BattlerPlayer[];
+extern const struct SpriteFrameImage gBattlerPicTable_PlayerLeft[];
-extern const union AffineAnimCmd *const gSpriteAffineAnimTable_BattlerOpponent[];
+extern const struct SpriteFrameImage gBattlerPicTable_OpponentLeft[];
-extern const struct SpriteFrameImage gSpriteImages_BattlerPlayerLeft[];
+extern const struct SpriteFrameImage gBattlerPicTable_PlayerRight[];
-extern const struct SpriteFrameImage gSpriteImages_BattlerOpponentLeft[];
+extern const struct SpriteFrameImage gBattlerPicTable_OpponentRight[];
-extern const struct SpriteFrameImage gSpriteImages_BattlerPlayerRight[];
-extern const struct SpriteFrameImage gSpriteImages_BattlerOpponentRight[];
 extern const struct SpriteFrameImage gTrainerBackPicTable_Red[];
 extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[];
 extern const struct SpriteFrameImage gTrainerBackPicTable_Pokedude[];

include/pokemon.h

@@ -314,6 +314,15 @@ struct Evolution
 
 #define EVOS_PER_MON 5
 
+#define NUM_UNOWN_FORMS 28
+
+#define GET_UNOWN_LETTER(personality) ((   \
+      (((personality) & 0x03000000) >> 18) \
+    | (((personality) & 0x00030000) >> 12) \
+    | (((personality) & 0x00000300) >> 6)  \
+    | (((personality) & 0x00000003) >> 0)  \
+) % NUM_UNOWN_FORMS)
+
 extern u8 gPlayerPartyCount;
 extern struct Pokemon gPlayerParty[PARTY_SIZE];
 extern u8 gEnemyPartyCount;

include/pokemon_summary_screen.h

@@ -3,8 +3,8 @@
 
 #include "main.h"
 
-extern const u8 * const gMoveDescriptionPointers[];
+extern const u8 *const gMoveDescriptionPointers[];
-extern const u8 * const gNatureNamePointers[];
+extern const u8 *const gNatureNamePointers[];
 
 void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
 u8 GetMoveSlotToReplace(void);

spritesheet_rules.mk

@@ -13,6 +13,9 @@ $(OBJEVENTGFXDIR)/misc/surf_blob.4bpp: %.4bpp: %.png
 $(OBJEVENTGFXDIR)/misc/ss_anne.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 8 -mheight 4
 
+$(OBJEVENTGFXDIR)/misc/town_map.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
 $(OBJEVENTGFXDIR)/people/agatha.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 

src/battle_anim_mons.c

@@ -9,13 +9,6 @@
 #include "util.h"
 #include "constants/battle_anim.h"
 
-#define GET_UNOWN_LETTER(personality) ((        \
-      (((personality & 0x03000000) >> 24) << 6) \
-    | (((personality & 0x00030000) >> 16) << 4) \
-    | (((personality & 0x00000300) >> 8) << 2)  \
-    | (((personality & 0x00000003) >> 0) << 0)  \
-) % 28)
-
 #define IS_DOUBLE_BATTLE() (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
 
 static u8 GetBattlerSpriteFinal_Y(u8 battlerId, u16 species, bool8 a3);
@@ -874,8 +867,8 @@ bool8 IsDoubleBattle(void)
 
 void GetBattleAnimBg1Data(struct BattleAnimBgData *animBgData)
 {
-    animBgData->bgTiles = gBattleAnimMons_BgTilesBuffer;
+    animBgData->bgTiles = gBattleAnimBgTileBuffer;
-    animBgData->bgTilemap = (u16 *)gBattleAnimMons_BgTilemapBuffer;
+    animBgData->bgTilemap = (u16 *)gBattleAnimBgTilemapBuffer;
     animBgData->paletteId = BG_ANIM_PAL_1;
     animBgData->bgId = 1;
     animBgData->tilesOffset = 0x200;
@@ -890,8 +883,8 @@ void GetBattleAnimBgData(struct BattleAnimBgData *animBgData, u32 bgId)
     }
     else
     {
-        animBgData->bgTiles = gBattleAnimMons_BgTilesBuffer;
+        animBgData->bgTiles = gBattleAnimBgTileBuffer;
-        animBgData->bgTilemap = (u16 *)gBattleAnimMons_BgTilemapBuffer;
+        animBgData->bgTilemap = (u16 *)gBattleAnimBgTilemapBuffer;
         animBgData->paletteId = BG_ANIM_PAL_2;
         animBgData->bgId = 2;
         animBgData->tilesOffset = 0x300;
@@ -901,8 +894,8 @@ void GetBattleAnimBgData(struct BattleAnimBgData *animBgData, u32 bgId)
 
 void GetBattleAnimBgDataByPriorityRank(struct BattleAnimBgData *animBgData, u8 unused)
 {
-    animBgData->bgTiles = gBattleAnimMons_BgTilesBuffer;
+    animBgData->bgTiles = gBattleAnimBgTileBuffer;
-    animBgData->bgTilemap = (u16 *)gBattleAnimMons_BgTilemapBuffer;
+    animBgData->bgTilemap = (u16 *)gBattleAnimBgTilemapBuffer;
     if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1)
     {
         animBgData->paletteId = BG_ANIM_PAL_1;
@@ -932,9 +925,9 @@ void InitBattleAnimBg(u32 bgId)
 
 void AnimLoadCompressedBgGfx(u32 bgId, const u32 *src, u32 tilesOffset)
 {
-    CpuFill32(0, gBattleAnimMons_BgTilesBuffer, 0x2000);
+    CpuFill32(0, gBattleAnimBgTileBuffer, 0x2000);
-    LZDecompressWram(src, gBattleAnimMons_BgTilesBuffer);
+    LZDecompressWram(src, gBattleAnimBgTileBuffer);
-    LoadBgTiles(bgId, gBattleAnimMons_BgTilesBuffer, 0x2000, tilesOffset);
+    LoadBgTiles(bgId, gBattleAnimBgTileBuffer, 0x2000, tilesOffset);
 }
 
 void InitAnimBgTilemapBuffer(u32 bgId, const void *src)

src/battle_controller_player.c

@@ -337,7 +337,7 @@ static void HandleInputChooseTarget(void)
     if (JOY_NEW(A_BUTTON))
     {
         PlaySE(SE_SELECT);
-        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_HideAsMoveTarget;
         BtlController_EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | (gMultiUsePlayerCursor << 8));
         EndBounceEffect(gMultiUsePlayerCursor, BOUNCE_HEALTHBOX);
         PlayerBufferExecCompleted();
@@ -345,7 +345,7 @@ static void HandleInputChooseTarget(void)
     else if (JOY_NEW(B_BUTTON))
     {
         PlaySE(SE_SELECT);
-        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_HideAsMoveTarget;
         gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseMove;
         DoBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX, 7, 1);
         DoBounceEffect(gActiveBattler, BOUNCE_MON, 7, 1);
@@ -354,7 +354,7 @@ static void HandleInputChooseTarget(void)
     else if (JOY_NEW(DPAD_LEFT | DPAD_UP))
     {
         PlaySE(SE_SELECT);
-        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_HideAsMoveTarget;
 
         do
         {
@@ -389,12 +389,12 @@ static void HandleInputChooseTarget(void)
                 i = 0;
         }
         while (i == 0);
-        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_ShowAsMoveTarget;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_ShowAsMoveTarget;
     }
     else if (JOY_NEW(DPAD_RIGHT | DPAD_DOWN))
     {
         PlaySE(SE_SELECT);
-        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_HideAsMoveTarget;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_HideAsMoveTarget;
 
         do
         {
@@ -429,7 +429,7 @@ static void HandleInputChooseTarget(void)
                 i = 0;
         }
         while (i == 0);
-        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_ShowAsMoveTarget;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_ShowAsMoveTarget;
     }
 }
 
@@ -496,7 +496,7 @@ void HandleInputChooseMove(void)
                 gMultiUsePlayerCursor = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
             else
                 gMultiUsePlayerCursor = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
-            gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCb_ShowAsMoveTarget;
+            gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_ShowAsMoveTarget;
         }
     }
     else if (JOY_NEW(B_BUTTON))

src/battle_controllers.c

@@ -1100,13 +1100,13 @@ void BtlController_EmitIntroTrainerBallThrow(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4);
 }
 
-void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 param)
+void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 flags)
 {
     s32 i;
 
     sBattleBuffersTransferData[0] = CONTROLLER_DRAWPARTYSTATUSSUMMARY;
-    sBattleBuffersTransferData[1] = param & 0x7F;
+    sBattleBuffersTransferData[1] = flags & ~PARTY_SUMM_SKIP_DRAW_DELAY; // If true, skip player side
-    sBattleBuffersTransferData[2] = (param & 0x80) >> 7;
+    sBattleBuffersTransferData[2] = (flags & PARTY_SUMM_SKIP_DRAW_DELAY) >> 7; // If true, skip delay after drawing. True during intro
     sBattleBuffersTransferData[3] = CONTROLLER_DRAWPARTYSTATUSSUMMARY;
     for (i = 0; i < (s32)(sizeof(struct HpAndStatus) * PARTY_SIZE); ++i)
         sBattleBuffersTransferData[4 + i] = *(i + (u8 *)(hpAndStatus));

src/battle_gfx_sfx_util.c

@@ -140,7 +140,7 @@ void SpriteCB_WaitForBattlerBallReleaseAnim(struct Sprite *sprite)
         gSprites[spriteId].animPaused = 0;
     else if (gSprites[spriteId].animEnded)
     {
-        gSprites[spriteId].callback = SpriteCB_SetToDummy3;
+        gSprites[spriteId].callback = SetIdleSpriteCallback;
         StartSpriteAffineAnim(&gSprites[spriteId], 0);
         sprite->callback = SpriteCallbackDummy;
     }

src/battle_interface.c

@@ -1137,8 +1137,9 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
             {
-                if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg
+                if (partyInfo[i].hp == HP_EMPTY_SLOT) 
                 {
+                    // empty slot or an egg
                     gSprites[ballIconSpritesIds[i]].oam.tileNum += 1;
                     gSprites[ballIconSpritesIds[i]].data[7] = 1;
                 }
@@ -1153,17 +1154,20 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
             }
             else
             {
-                if (i >= nValidMons) // empty slot or an egg
+                if (i >= nValidMons) 
                 {
+                    // empty slot or an egg
                     gSprites[ballIconSpritesIds[i]].oam.tileNum += 1;
                     gSprites[ballIconSpritesIds[i]].data[7] = 1;
                 }
-                else if (partyInfo[i].hp == 0) // fainted mon
+                else if (partyInfo[i].hp == 0)
                 {
+                    // fainted mon
                     gSprites[ballIconSpritesIds[i]].oam.tileNum += 3;
                 }
-                else if (partyInfo[i].status != 0) // mon with major status
+                else if (partyInfo[i].status != 0)
                 {
+                    // mon with major status
                     gSprites[ballIconSpritesIds[i]].oam.tileNum += 2;
                 }
             }
@@ -1175,17 +1179,20 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
             {
-                if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg
+                if (partyInfo[i].hp == HP_EMPTY_SLOT)
                 {
+                    // empty slot or an egg
                     gSprites[ballIconSpritesIds[5 - i]].oam.tileNum += 1;
                     gSprites[ballIconSpritesIds[5 - i]].data[7] = 1;
                 }
-                else if (partyInfo[i].hp == 0) // fainted mon
+                else if (partyInfo[i].hp == 0)
                 {
+                    // fainted mon
                     gSprites[ballIconSpritesIds[5 - i]].oam.tileNum += 3;
                 }
-                else if (partyInfo[i].status != 0) // mon with major status
+                else if (partyInfo[i].status != 0)
                 {
+                    // mon with major status
                     gSprites[ballIconSpritesIds[5 - i]].oam.tileNum += 2;
                 }
             }

src/battle_util2.c

@@ -2,8 +2,8 @@
 #include "bg.h"
 #include "battle.h"
 #include "battle_anim.h"
-#include "pokemon.h"
 #include "malloc.h"
+#include "pokemon.h"
 #include "trainer_tower.h"
 
 void AllocateBattleResources(void)
@@ -14,10 +14,12 @@ void AllocateBattleResources(void)
     {
         s32 i;
 
-        for (i = 0; i < 4; ++i)
+        for (i = 0; i < 4; i++)
             gPokedudeBattlerStates[i] = AllocZeroed(sizeof(struct PokedudeBattlerState));
     }
+
     gBattleStruct = AllocZeroed(sizeof(*gBattleStruct));
+
     gBattleResources = AllocZeroed(sizeof(*gBattleResources));
     gBattleResources->secretBase = AllocZeroed(sizeof(*gBattleResources->secretBase));
     gBattleResources->flags = AllocZeroed(sizeof(*gBattleResources->flags));
@@ -27,12 +29,15 @@ void AllocateBattleResources(void)
     gBattleResources->ai = AllocZeroed(sizeof(*gBattleResources->ai));
     gBattleResources->battleHistory = AllocZeroed(sizeof(*gBattleResources->battleHistory));
     gBattleResources->AI_ScriptsStack = AllocZeroed(sizeof(*gBattleResources->AI_ScriptsStack));
+
     gLinkBattleSendBuffer = AllocZeroed(BATTLE_BUFFER_LINK_SIZE);
     gLinkBattleRecvBuffer = AllocZeroed(BATTLE_BUFFER_LINK_SIZE);
-    gBattleAnimMons_BgTilesBuffer = AllocZeroed(0x2000);
+
-    gBattleAnimMons_BgTilemapBuffer = AllocZeroed(0x1000);
+    gBattleAnimBgTileBuffer = AllocZeroed(0x2000);
-    SetBgTilemapBuffer(1, gBattleAnimMons_BgTilemapBuffer);
+    gBattleAnimBgTilemapBuffer = AllocZeroed(0x1000);
-    SetBgTilemapBuffer(2, gBattleAnimMons_BgTilemapBuffer);
+
+    SetBgTilemapBuffer(1, gBattleAnimBgTilemapBuffer);
+    SetBgTilemapBuffer(2, gBattleAnimBgTilemapBuffer);
 }
 
 void FreeBattleResources(void)
@@ -43,7 +48,7 @@ void FreeBattleResources(void)
     {
         s32 i;
 
-        for (i = 0; i < 4; ++i)
+        for (i = 0; i < 4; i++)
         {
             FREE_AND_SET_NULL(gPokedudeBattlerStates[i]);
         }
@@ -51,6 +56,7 @@ void FreeBattleResources(void)
     if (gBattleResources != NULL)
     {
         FREE_AND_SET_NULL(gBattleStruct);
+
         FREE_AND_SET_NULL(gBattleResources->secretBase);
         FREE_AND_SET_NULL(gBattleResources->flags);
         FREE_AND_SET_NULL(gBattleResources->battleScriptsStack);
@@ -60,21 +66,26 @@ void FreeBattleResources(void)
         FREE_AND_SET_NULL(gBattleResources->battleHistory);
         FREE_AND_SET_NULL(gBattleResources->AI_ScriptsStack);
         FREE_AND_SET_NULL(gBattleResources);
+
         FREE_AND_SET_NULL(gLinkBattleSendBuffer);
         FREE_AND_SET_NULL(gLinkBattleRecvBuffer);
-        FREE_AND_SET_NULL(gBattleAnimMons_BgTilesBuffer);
+
-        FREE_AND_SET_NULL(gBattleAnimMons_BgTilemapBuffer);
+        FREE_AND_SET_NULL(gBattleAnimBgTileBuffer);
+        FREE_AND_SET_NULL(gBattleAnimBgTilemapBuffer);
     }
 }
 
 void AdjustFriendshipOnBattleFaint(u8 battlerId)
 {
-    u8 opposingBattlerId, opposingBattlerId2;
+    u8 opposingBattlerId;
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
+        u8 opposingBattlerId2;
+
         opposingBattlerId = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
         opposingBattlerId2 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
+
         if (gBattleMons[opposingBattlerId2].level > gBattleMons[opposingBattlerId].level)
             opposingBattlerId = opposingBattlerId2;
     }
@@ -82,6 +93,7 @@ void AdjustFriendshipOnBattleFaint(u8 battlerId)
     {
         opposingBattlerId = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
     }
+
     if (gBattleMons[opposingBattlerId].level > gBattleMons[battlerId].level)
     {
         if (gBattleMons[opposingBattlerId].level - gBattleMons[battlerId].level > 29)

src/data.c

@@ -8,36 +8,38 @@
 #include "constants/battle_ai.h"
 #include "constants/trainers.h"
 
-const struct SpriteFrameImage gSpriteImages_BattlerPlayerLeft[] =
+#define BATTLER_OFFSET(i) (gHeap + 0x8000 + MON_PIC_SIZE * (i))
+
+const struct SpriteFrameImage gBattlerPicTable_PlayerLeft[] =
 {
-    gHeap + 0x8000, 0x800,
+    BATTLER_OFFSET(0), MON_PIC_SIZE,
-    gHeap + 0x8800, 0x800,
+    BATTLER_OFFSET(1), MON_PIC_SIZE,
-    gHeap + 0x9000, 0x800,
+    BATTLER_OFFSET(2), MON_PIC_SIZE,
-    gHeap + 0x9800, 0x800,
+    BATTLER_OFFSET(3), MON_PIC_SIZE,
 };
 
-const struct SpriteFrameImage gSpriteImages_BattlerOpponentLeft[] =
+const struct SpriteFrameImage gBattlerPicTable_OpponentLeft[] =
 {
-    gHeap + 0xA000, 0x800,
+    BATTLER_OFFSET(4), MON_PIC_SIZE,
-    gHeap + 0xA800, 0x800,
+    BATTLER_OFFSET(5), MON_PIC_SIZE,
-    gHeap + 0xB000, 0x800,
+    BATTLER_OFFSET(6), MON_PIC_SIZE,
-    gHeap + 0xB800, 0x800,
+    BATTLER_OFFSET(7), MON_PIC_SIZE,
 };
 
-const struct SpriteFrameImage gSpriteImages_BattlerPlayerRight[] =
+const struct SpriteFrameImage gBattlerPicTable_PlayerRight[] =
 {
-    gHeap + 0xC000, 0x800,
+    BATTLER_OFFSET(8),  MON_PIC_SIZE,
-    gHeap + 0xC800, 0x800,
+    BATTLER_OFFSET(9),  MON_PIC_SIZE,
-    gHeap + 0xD000, 0x800,
+    BATTLER_OFFSET(10), MON_PIC_SIZE,
-    gHeap + 0xD800, 0x800,
+    BATTLER_OFFSET(11), MON_PIC_SIZE,
 };
 
-const struct SpriteFrameImage gSpriteImages_BattlerOpponentRight[] =
+const struct SpriteFrameImage gBattlerPicTable_OpponentRight[] =
 {
-    gHeap + 0xE000, 0x800,
+    BATTLER_OFFSET(12), MON_PIC_SIZE,
-    gHeap + 0xE800, 0x800,
+    BATTLER_OFFSET(13), MON_PIC_SIZE,
-    gHeap + 0xF000, 0x800,
+    BATTLER_OFFSET(14), MON_PIC_SIZE,
-    gHeap + 0xF800, 0x800,
+    BATTLER_OFFSET(15), MON_PIC_SIZE,
 };
 
 const struct SpriteFrameImage gTrainerBackPicTable_Red[] =
@@ -102,172 +104,177 @@ static const union AnimCmd sAnim_GeneralFrame3[] =
     ANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_82347F8[] =
+// Many of these affine anims seem to go unused, and
+// instead SetSpriteRotScale is used to manipulate
+// the battler sprites directly (for instance, in AnimTask_SwitchOutShrinkMon).
+// Those with explicit indexes are referenced elsewhere.
+
+static const union AffineAnimCmd sAffineAnim_Battler_Normal[] =
 {
-    AFFINEANIMCMD_FRAME(0x0100, 0x0100, 0x00, 0x00),
+    AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_8234808[] =
+static const union AffineAnimCmd sAffineAnim_Battler_Flipped[] =
 {
-    AFFINEANIMCMD_FRAME(0xff00, 0x0100, 0x00, 0x00),
+    AFFINEANIMCMD_FRAME(-0x100, 0x0100, 0, 0),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_8234818[] =
+static const union AffineAnimCmd sAffineAnim_Battler_Emerge[] =
 {
-    AFFINEANIMCMD_FRAME(0x0028, 0x0028, 0x00, 0x00),
+    AFFINEANIMCMD_FRAME(0x28, 0x28, 0, 0),
-    AFFINEANIMCMD_FRAME(0x0012, 0x0012, 0x00, 0x0c),
+    AFFINEANIMCMD_FRAME(0x12, 0x12, 0, 12),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_8234830[] =
+static const union AffineAnimCmd sAffineAnim_Battler_Return[] =
 {
-    AFFINEANIMCMD_FRAME(0xfffe, 0xfffe, 0x00, 0x12),
+    AFFINEANIMCMD_FRAME(-0x2, -0x2, 0, 18),
-    AFFINEANIMCMD_FRAME(0xfff0, 0xfff0, 0x00, 0x0f),
+    AFFINEANIMCMD_FRAME(-0x10, -0x10, 0, 15),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_8234848[] =
+static const union AffineAnimCmd sAffineAnim_Battler_HorizontalSquishLoop[] =
 {
-    AFFINEANIMCMD_FRAME(0x00a0, 0x0100, 0x00, 0x00),
+    AFFINEANIMCMD_FRAME(0xA0, 0x100, 0, 0),
-    AFFINEANIMCMD_FRAME(0x0004, 0x0000, 0x00, 0x08),
+    AFFINEANIMCMD_FRAME( 0x4,   0x0, 0, 8),
-    AFFINEANIMCMD_FRAME(0xfffc, 0x0000, 0x00, 0x08),
+    AFFINEANIMCMD_FRAME(-0x4,   0x0, 0, 8),
     AFFINEANIMCMD_JUMP(1),
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_8234868[] =
+static const union AffineAnimCmd sAffineAnim_Battler_Grow[] =
 {
-    AFFINEANIMCMD_FRAME(0x0002, 0x0002, 0x00, 0x14),
+    AFFINEANIMCMD_FRAME(0x2, 0x2, 0, 20),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_8234878[] =
+static const union AffineAnimCmd sAffineAnim_Battler_Shrink[] =
 {
-    AFFINEANIMCMD_FRAME(0xfffe, 0xfffe, 0x00, 0x14),
+    AFFINEANIMCMD_FRAME(-0x2, -0x2, 0, 20),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_8234888[] =
+static const union AffineAnimCmd sAffineAnim_Battler_BigToSmall[] =
 {
-    AFFINEANIMCMD_FRAME(0x0100, 0x0100, 0x00, 0000),
+    AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
-    AFFINEANIMCMD_FRAME(0xfff0, 0xfff0, 0x00, 0x09),
+    AFFINEANIMCMD_FRAME(-0x10, -0x10, 0, 9),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_82348A0[] =
+static const union AffineAnimCmd sAffineAnim_Battler_GrowLarge[] =
 {
-    AFFINEANIMCMD_FRAME(0x0004, 0x0004, 0x00, 0x3f),
+    AFFINEANIMCMD_FRAME(0x4, 0x4, 0, 63),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_82348B0[] =
+static const union AffineAnimCmd sAffineAnim_Battler_TipRight[] =
 {
-    AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfd, 0x05),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -3, 5),
-    AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x03, 0x05),
+    AFFINEANIMCMD_FRAME(0x0, 0x0,  3, 5),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gSpriteAffineAnimTable_BattlerPlayer[] =
+const union AffineAnimCmd *const gAffineAnims_BattleSpritePlayerSide[] =
 {
-    gSpriteAffineAnim_82347F8,
+    [BATTLER_AFFINE_NORMAL] = sAffineAnim_Battler_Normal,
-    gSpriteAffineAnim_8234818,
+    [BATTLER_AFFINE_EMERGE] = sAffineAnim_Battler_Emerge,
-    gSpriteAffineAnim_8234830,
+    [BATTLER_AFFINE_RETURN] = sAffineAnim_Battler_Return,
-    gSpriteAffineAnim_8234848,
+    sAffineAnim_Battler_HorizontalSquishLoop,
-    gSpriteAffineAnim_8234868,
+    sAffineAnim_Battler_Grow,
-    gSpriteAffineAnim_8234878,
+    sAffineAnim_Battler_Shrink,
-    gSpriteAffineAnim_82348A0,
+    sAffineAnim_Battler_GrowLarge,
-    gSpriteAffineAnim_82348B0,
+    sAffineAnim_Battler_TipRight,
-    gSpriteAffineAnim_8234888,
+    sAffineAnim_Battler_BigToSmall,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_82348EC[] =
+static const union AffineAnimCmd sAffineAnim_Battler_SpinShrink[] =
 {
-    AFFINEANIMCMD_FRAME(0xfffc, 0xfffc, 0x04, 0x3f),
+    AFFINEANIMCMD_FRAME(-0x4, -0x4, 4, 63),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_82348FC[] =
+static const union AffineAnimCmd sAffineAnim_Battler_TipLeft[] =
 {
-    AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x03, 0x05),
+    AFFINEANIMCMD_FRAME(0x0, 0x0,  3, 5),
-    AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfd, 0x05),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -3, 5),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_8234914[] =
+static const union AffineAnimCmd sAffineAnim_Battler_RotateUpAndBack[] =
 {
-    AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0xfb, 0x14),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -5, 20),
-    AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x00, 0x14),
+    AFFINEANIMCMD_FRAME(0x0, 0x0,  0, 20),
-    AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x05, 0x14),
+    AFFINEANIMCMD_FRAME(0x0, 0x0,  5, 20),
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_8234934[] =
+static const union AffineAnimCmd sAffineAnim_Battler_Spin[] =
 {
-    AFFINEANIMCMD_FRAME(0x0000, 0x0000, 0x09, 0x6e),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 9, 110),
     AFFINEANIMCMD_END,
 };
 
-const union AffineAnimCmd *const gSpriteAffineAnimTable_BattlerOpponent[] =
+const union AffineAnimCmd *const gAffineAnims_BattleSpriteOpponentSide[] =
 {
-    gSpriteAffineAnim_82347F8,
+    [BATTLER_AFFINE_NORMAL] = sAffineAnim_Battler_Normal,
-    gSpriteAffineAnim_8234818,
+    [BATTLER_AFFINE_EMERGE] = sAffineAnim_Battler_Emerge,
-    gSpriteAffineAnim_8234830,
+    [BATTLER_AFFINE_RETURN] = sAffineAnim_Battler_Return,
-    gSpriteAffineAnim_8234848,
+    sAffineAnim_Battler_HorizontalSquishLoop,
-    gSpriteAffineAnim_8234868,
+    sAffineAnim_Battler_Grow,
-    gSpriteAffineAnim_8234878,
+    sAffineAnim_Battler_Shrink,
-    gSpriteAffineAnim_82348EC,
+    sAffineAnim_Battler_SpinShrink,
-    gSpriteAffineAnim_82348FC,
+    sAffineAnim_Battler_TipLeft,
-    gSpriteAffineAnim_8234914,
+    sAffineAnim_Battler_RotateUpAndBack,
-    gSpriteAffineAnim_8234888,
+    sAffineAnim_Battler_BigToSmall,
-    gSpriteAffineAnim_8234934,
+    sAffineAnim_Battler_Spin,
 };
 
-const union AffineAnimCmd *const gSpriteAffineAnimTable_82349470[] =
+const union AffineAnimCmd *const gAffineAnims_BattleSpriteContest[] =
 {
-    gSpriteAffineAnim_8234808,
+    [BATTLER_AFFINE_NORMAL] = sAffineAnim_Battler_Flipped,
-    gSpriteAffineAnim_8234818,
+    [BATTLER_AFFINE_EMERGE] = sAffineAnim_Battler_Emerge,
-    gSpriteAffineAnim_8234830,
+    [BATTLER_AFFINE_RETURN] = sAffineAnim_Battler_Return,
-    gSpriteAffineAnim_8234848,
+    sAffineAnim_Battler_HorizontalSquishLoop,
-    gSpriteAffineAnim_8234868,
+    sAffineAnim_Battler_Grow,
-    gSpriteAffineAnim_8234878,
+    sAffineAnim_Battler_Shrink,
-    gSpriteAffineAnim_82348EC,
+    sAffineAnim_Battler_SpinShrink,
-    gSpriteAffineAnim_82348FC,
+    sAffineAnim_Battler_TipLeft,
-    gSpriteAffineAnim_8234914,
+    sAffineAnim_Battler_RotateUpAndBack,
-    gSpriteAffineAnim_8234888,
+    sAffineAnim_Battler_BigToSmall,
-    gSpriteAffineAnim_8234934,
+    sAffineAnim_Battler_Spin,
 };
 
-static const union AnimCmd gSpriteAnim_823499C[] =
+static const union AnimCmd sAnim_MonPic_0[] =
 {
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_END,
 };
 
-static const union AnimCmd gSpriteAnim_82349A4[] =
+static const union AnimCmd sAnim_MonPic_1[] =
 {
     ANIMCMD_FRAME(1, 0),
     ANIMCMD_END,
 };
 
-static const union AnimCmd gSpriteAnim_82349AC[] =
+static const union AnimCmd sAnim_MonPic_2[] =
 {
     ANIMCMD_FRAME(2, 0),
     ANIMCMD_END,
 };
 
-static const union AnimCmd gSpriteAnim_82349B4[] =
+static const union AnimCmd sAnim_MonPic_3[] =
 {
     ANIMCMD_FRAME(3, 0),
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gSpriteAnimTable_82349BC[] =
+const union AnimCmd *const gAnims_MonPic[] =
 {
-    gSpriteAnim_823499C,
+    sAnim_MonPic_0,
-    gSpriteAnim_82349A4,
+    sAnim_MonPic_1,
-    gSpriteAnim_82349AC,
+    sAnim_MonPic_2,
-    gSpriteAnim_82349B4,
+    sAnim_MonPic_3,
 };
 
 #define SPECIES_SPRITE(species, sprite) [SPECIES_##species] = {sprite, 0x800, SPECIES_##species}

src/data/object_events/movement_type_func_tables.h

@@ -141,12 +141,12 @@ static bool8 MovementType_MoveInPlace_Step1(struct ObjectEvent *objectEvent, str
 static bool8 MovementType_Invisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
 static bool8 MovementType_Invisible_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
 static bool8 MovementType_Invisible_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
-static bool8 MovementType_VsSeeker4D_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
+static bool8 MovementType_RaiseHandAndStop_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
-static bool8 MovementType_VsSeeker4D_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
+static bool8 MovementType_RaiseHandAndStop_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
-static bool8 MovementType_VsSeeker4D_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
+static bool8 MovementType_RaiseHandAndStop_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
-static bool8 MovementType_VsSeeker4E_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
+static bool8 MovementType_RaiseHandAndJump_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
-static bool8 MovementType_VsSeeker4F_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
+static bool8 MovementType_RaiseHandAndSwim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
-static bool8 MovementType_VsSeeker4E_VsSeeker4F_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
+static bool8 MovementType_RaiseHandAndMove_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
 
 static u8 GetVectorDirection(s16 dx, s16 dy, s16 absdx, s16 absdy);
 static u8 GetLimitedVectorDirection_SouthNorth(s16 dx, s16 dy, s16 absdx, s16 absdy);
@@ -596,18 +596,18 @@ u8 (*const gMovementTypeFuncs_Invisible[])(struct ObjectEvent *, struct Sprite *
     MovementType_Invisible_Step2,
 };
 
-u8 (*const gMovementTypeFuncs_VsSeeker4D[])(struct ObjectEvent *, struct Sprite *) = {
+u8 (*const gMovementTypeFuncs_RaiseHandAndStop[])(struct ObjectEvent *, struct Sprite *) = {
-    MovementType_VsSeeker4D_Step0,
+    MovementType_RaiseHandAndStop_Step0,
-    MovementType_VsSeeker4D_Step1,
+    MovementType_RaiseHandAndStop_Step1,
-    MovementType_VsSeeker4D_Step2,
+    MovementType_RaiseHandAndStop_Step2,
 };
 
-u8 (*const gMovementTypeFuncs_VsSeeker4E[])(struct ObjectEvent *, struct Sprite *) = {
+u8 (*const gMovementTypeFuncs_RaiseHandAndJump[])(struct ObjectEvent *, struct Sprite *) = {
-    MovementType_VsSeeker4E_Step0,
+    MovementType_RaiseHandAndJump_Step0,
-    MovementType_VsSeeker4E_VsSeeker4F_Step1,
+    MovementType_RaiseHandAndMove_Step1,
 };
 
-u8 (*const gMovementTypeFuncs_VsSeeker4F[])(struct ObjectEvent *, struct Sprite *) = {
+u8 (*const gMovementTypeFuncs_RaiseHandAndSwim[])(struct ObjectEvent *, struct Sprite *) = {
-    MovementType_VsSeeker4F_Step0,
+    MovementType_RaiseHandAndSwim_Step0,
-    MovementType_VsSeeker4E_VsSeeker4F_Step1,
+    MovementType_RaiseHandAndMove_Step1,
 };

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;

src/mail_data.c

@@ -5,6 +5,8 @@
 #include "constants/items.h"
 #include "pokemon_icon.h"
 
+#define UNOWN_OFFSET 30000
+
 void ClearMailData(void)
 {
     u8 i;
@@ -73,7 +75,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId)
 u16 SpeciesToMailSpecies(u16 species, u32 personality)
 {
     if (species == SPECIES_UNOWN) {
-        u32 mailSpecies = GetUnownLetterByPersonality(personality) + 30000;
+        u32 mailSpecies = GetUnownLetterByPersonality(personality) + UNOWN_OFFSET;
         return mailSpecies;
     }
     return species;
@@ -83,10 +85,10 @@ u16 MailSpeciesToSpecies(u16 mailSpecies, u16 *unownLetter)
 {
     u16 result;
 
-    if (mailSpecies >= 30000 && mailSpecies < (30000 + UNOWN_FORM_COUNT))
+    if (mailSpecies >= UNOWN_OFFSET && mailSpecies < (UNOWN_OFFSET + NUM_UNOWN_FORMS))
     {
         result = SPECIES_UNOWN;
-        *unownLetter = mailSpecies - 30000;
+        *unownLetter = mailSpecies - UNOWN_OFFSET;
     }
     else
     {

src/pokedex_screen.c

@@ -797,7 +797,7 @@ const u8 (*const sCategoryPageIconCoords[])[4] = {
     sPageIconCoords_4Mons,
 };
 
-static const u8 * const sDexCategoryNamePtrs[] = {
+static const u8 *const sDexCategoryNamePtrs[] = {
     gText_DexCategory_GrasslandPkmn,
     gText_DexCategory_ForestPkmn,
     gText_DexCategory_WatersEdgePkmn,

src/pokemon.c

@@ -1473,8 +1473,8 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] =
         .paletteTag = 0,
         .oam = &gOamData_BattlerPlayer,
         .anims = NULL, 
-        .images = gSpriteImages_BattlerPlayerLeft,
+        .images = gBattlerPicTable_PlayerLeft,
-        .affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
         .callback = SpriteCB_AllyMon,
     },
     [B_POSITION_OPPONENT_LEFT] = {
@@ -1482,8 +1482,8 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] =
         .paletteTag = 0,
         .oam = &gOamData_BattlerOpponent,
         .anims = NULL, 
-        .images = gSpriteImages_BattlerOpponentLeft,
+        .images = gBattlerPicTable_OpponentLeft,
-        .affineAnims = gSpriteAffineAnimTable_BattlerOpponent,
+        .affineAnims = gAffineAnims_BattleSpriteOpponentSide,
         .callback = SpriteCB_EnemyMon,
     },
     [B_POSITION_PLAYER_RIGHT] = {
@@ -1491,8 +1491,8 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] =
         .paletteTag = 0,
         .oam = &gOamData_BattlerPlayer,
         .anims = NULL, 
-        .images = gSpriteImages_BattlerPlayerRight,
+        .images = gBattlerPicTable_PlayerRight,
-        .affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
         .callback = SpriteCB_AllyMon,
     },
     [B_POSITION_OPPONENT_RIGHT] = {
@@ -1500,8 +1500,8 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] =
         .paletteTag = 0,
         .oam = &gOamData_BattlerOpponent,
         .anims = NULL, 
-        .images = gSpriteImages_BattlerOpponentRight,
+        .images = gBattlerPicTable_OpponentRight,
-        .affineAnims = gSpriteAffineAnimTable_BattlerOpponent,
+        .affineAnims = gAffineAnims_BattleSpriteOpponentSide,
         .callback = SpriteCB_EnemyMon,
     },
 };
@@ -1514,7 +1514,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
         .oam = &gOamData_BattlerPlayer,
         .anims = NULL, 
         .images = gTrainerBackPicTable_Red,
-        .affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
         .callback = SpriteCB_AllyMon,
     },
     {
@@ -1523,7 +1523,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
         .oam = &gOamData_BattlerPlayer,
         .anims = NULL, 
         .images = gTrainerBackPicTable_Leaf,
-        .affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
         .callback = SpriteCB_AllyMon,
     },
     {
@@ -1532,7 +1532,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
         .oam = &gOamData_BattlerPlayer,
         .anims = NULL, 
         .images = gTrainerBackPicTable_RSBrendan,
-        .affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
         .callback = SpriteCB_AllyMon,
     },
     {
@@ -1541,7 +1541,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
         .oam = &gOamData_BattlerPlayer,
         .anims = NULL, 
         .images = gTrainerBackPicTable_RSMay,
-        .affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
         .callback = SpriteCB_AllyMon,
     },
     {
@@ -1550,7 +1550,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
         .oam = &gOamData_BattlerPlayer,
         .anims = NULL, 
         .images = gTrainerBackPicTable_Pokedude,
-        .affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
         .callback = SpriteCB_AllyMon,
     },
     {
@@ -1559,7 +1559,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] =
         .oam = &gOamData_BattlerPlayer,
         .anims = NULL, 
         .images = gTrainerBackPicTable_OldMan,
-        .affineAnims = gSpriteAffineAnimTable_BattlerPlayer,
+        .affineAnims = gAffineAnims_BattleSpritePlayerSide,
         .callback = SpriteCB_AllyMon,
     },
 };
@@ -1856,7 +1856,7 @@ void CreateMonWithGenderNatureLetter(struct Pokemon *mon, u16 species, u8 level,
 {
     u32 personality;
 
-    if ((u8)(unownLetter - 1) < 28)
+    if ((u8)(unownLetter - 1) < NUM_UNOWN_FORMS)
     {
         u16 actualLetter;
 
@@ -2747,7 +2747,7 @@ void SetMultiuseSpriteTemplateToPokemon(u16 speciesTag, u8 battlerPosition)
         }
     }
     gMultiuseSpriteTemplate.paletteTag = speciesTag;
-    gMultiuseSpriteTemplate.anims = gSpriteAnimTable_82349BC;
+    gMultiuseSpriteTemplate.anims = gAnims_MonPic;
 }
 
 void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition)
@@ -3919,7 +3919,7 @@ static void CopyPlayerPartyMonToBattleData(u8 battlerId, u8 partyIndex)
     *hpSwitchout = gBattleMons[battlerId].hp;
 
     for (i = 0; i < 8; i++)
-        gBattleMons[battlerId].statStages[i] = 6;
+        gBattleMons[battlerId].statStages[i] = DEFAULT_STAT_STAGE;
 
     gBattleMons[battlerId].status2 = 0;
     UpdateSentPokesToOpponentValue(battlerId);
@@ -6125,7 +6125,7 @@ static void OakSpeechNidoranFSetupTemplateDummy(struct OakSpeechNidoranFStruct *
         for (j = 0; j < structPtr->frameCount; ++j)
             structPtr->frameImages[i * structPtr->spriteCount + j].data = &structPtr->bufferPtrs[i][j * 0x800];
         structPtr->templates[i].images = &structPtr->frameImages[i * structPtr->spriteCount]; // should be frameCount logically
-        structPtr->templates[i].anims = gSpriteAnimTable_82349BC;
+        structPtr->templates[i].anims = gAnims_MonPic;
         structPtr->templates[i].paletteTag = i;
     }
 }

src/pokemon_summary_screen.c

@@ -626,14 +626,14 @@ static const u32 sBgTilemap_MovesPage[] = INCBIN_U32( "graphics/interface/pokesu
 
 #include "data/text/nature_names.h"
 
-static const u8 * const sEggHatchTimeTexts[] = {
+static const u8 *const sEggHatchTimeTexts[] = {
     gText_PokeSum_EggHatch_LongTime,
     gText_PokeSum_EggHatch_SomeTime,
     gText_PokeSum_EggHatch_Soon, 
     gText_PokeSum_EggHatch_AlmostReady
 };
 
-static const u8 * const sEggOriginTexts[] = {
+static const u8 *const sEggOriginTexts[] = {
     gText_PokeSum_EggOrigin_DayCare,      
     gText_PokeSum_EggOrigin_Trade,
     gText_PokeSum_EggOrigin_TravelingMan, 

src/rom_header_gf.c

@@ -16,7 +16,7 @@ struct GFRomHeader
     const struct CompressedSpriteSheet * monBackPics;
     const struct CompressedSpritePalette * monNormalPalettes;
     const struct CompressedSpritePalette * monShinyPalettes;
-    const u8 * const * monIcons;
+    const u8 *const * monIcons;
     const u8 * monIconPaletteIds;
     const struct SpritePalette * monIconPalettes;
     const u8 (* monSpeciesNames)[];
@@ -63,7 +63,7 @@ struct GFRomHeader
     u32 unk18;
     const struct BaseStats * baseStats;
     const u8 (* abilityNames)[];
-    const u8 * const * abilityDescriptions;
+    const u8 *const * abilityDescriptions;
     const struct Item * items;
     const struct BattleMove * moves;
     const struct CompressedSpriteSheet * ballGfx;

src/trainer_pokemon_sprites.c

@@ -1,16 +1,7 @@
 #include "global.h"
 #include "gflib.h"
 #include "decompress.h"
-
+#include "data.h"
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-extern const struct CompressedSpriteSheet gMonBackPicTable[];
-extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
-extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
-extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
-extern const union AnimCmd *const gSpriteAnimTable_82349BC[];
-extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[];
-
-// Static type declarations
 
 struct PicData
 {
@@ -131,7 +122,7 @@ void LoadPicPaletteBySlot(u16 species, u32 otId, u32 personality, u8 paletteSlot
 void AssignSpriteAnimsTable(bool8 isTrainer)
 {
     if (!isTrainer)
-        sCreatingSpriteTemplate.anims = gSpriteAnimTable_82349BC;
+        sCreatingSpriteTemplate.anims = gAnims_MonPic;
     else
         sCreatingSpriteTemplate.anims = gTrainerFrontAnimsPtrTable[0];
 }

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
 };
@@ -640,9 +640,9 @@ void VsSeekerResetObjectMovementAfterChargeComplete(void)
     {
         if ((templates[i].trainerType == TRAINER_TYPE_NORMAL
           || templates[i].trainerType == TRAINER_TYPE_BURIED) 
-         && (templates[i].movementType == MOVEMENT_TYPE_VS_SEEKER_4D
+         && (templates[i].movementType == MOVEMENT_TYPE_RAISE_HAND_AND_STOP
-          || templates[i].movementType == MOVEMENT_TYPE_VS_SEEKER_4E
+          || templates[i].movementType == MOVEMENT_TYPE_RAISE_HAND_AND_JUMP
-          || templates[i].movementType == MOVEMENT_TYPE_VS_SEEKER_4F))
+          || templates[i].movementType == MOVEMENT_TYPE_RAISE_HAND_AND_SWIM))
         {
             movementType = GetRandomFaceDirectionMovementType();
             TryGetObjectEventIdByLocalIdAndMap(templates[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objEventId);
@@ -700,7 +700,9 @@ static void ResetMovementOfRematchableTrainers(void)
     for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
     {
         struct ObjectEvent * objectEvent = &gObjectEvents[i];
-        if (objectEvent->movementType == MOVEMENT_TYPE_VS_SEEKER_4D || objectEvent->movementType == MOVEMENT_TYPE_VS_SEEKER_4E || objectEvent->movementType == MOVEMENT_TYPE_VS_SEEKER_4F)
+        if (objectEvent->movementType == MOVEMENT_TYPE_RAISE_HAND_AND_STOP
+                || objectEvent->movementType == MOVEMENT_TYPE_RAISE_HAND_AND_JUMP
+                || objectEvent->movementType == MOVEMENT_TYPE_RAISE_HAND_AND_SWIM)
         {
             u8 movementType = GetRandomFaceDirectionMovementType();
             if (objectEvent->active && gSprites[objectEvent->spriteId].data[0] == i)
@@ -1142,13 +1144,13 @@ static u8 GetRunningBehaviorFromGraphicsId(u8 graphicsId)
         case OBJ_EVENT_GFX_BLACKBELT:
         case OBJ_EVENT_GFX_HIKER:
         case OBJ_EVENT_GFX_SAILOR:
-            return MOVEMENT_TYPE_VS_SEEKER_4E;
+            return MOVEMENT_TYPE_RAISE_HAND_AND_JUMP;
         case OBJ_EVENT_GFX_TUBER_M_WATER:
         case OBJ_EVENT_GFX_SWIMMER_M_WATER:
         case OBJ_EVENT_GFX_SWIMMER_F_WATER:
-            return MOVEMENT_TYPE_VS_SEEKER_4F;
+            return MOVEMENT_TYPE_RAISE_HAND_AND_SWIM;
         default:
-            return MOVEMENT_TYPE_VS_SEEKER_4D;
+            return MOVEMENT_TYPE_RAISE_HAND_AND_STOP;
     }
 }