Rename WalkFastest functions to WalkFaster

2022-08-11 12:21:28 +08:00
parent 84848deb14
commit 7233b2ed0a
65 changed files with 408 additions and 408 deletions
@@ -49,18 +49,18 @@
 	create_movement_action walk_in_place_fast_up, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP
 	create_movement_action walk_in_place_fast_left, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT
 	create_movement_action walk_in_place_fast_right, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT
-	create_movement_action walk_in_place_fastest_down, MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN
+	create_movement_action walk_in_place_faster_down, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN
-	create_movement_action walk_in_place_fastest_up, MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP
+	create_movement_action walk_in_place_faster_up, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_UP
-	create_movement_action walk_in_place_fastest_left, MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT
+	create_movement_action walk_in_place_faster_left, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_LEFT
-	create_movement_action walk_in_place_fastest_right, MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT
+	create_movement_action walk_in_place_faster_right, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT
 	create_movement_action ride_water_current_down, MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN
 	create_movement_action ride_water_current_up, MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP
 	create_movement_action ride_water_current_lefft, MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT
 	create_movement_action ride_water_current_right, MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT
-	create_movement_action walk_fastest_down, MOVEMENT_ACTION_WALK_FASTEST_DOWN
+	create_movement_action walk_faster_down, MOVEMENT_ACTION_WALK_FASTER_DOWN
-	create_movement_action walk_fastest_up, MOVEMENT_ACTION_WALK_FASTEST_UP
+	create_movement_action walk_faster_up, MOVEMENT_ACTION_WALK_FASTER_UP
-	create_movement_action walk_fastest_left, MOVEMENT_ACTION_WALK_FASTEST_LEFT
+	create_movement_action walk_faster_left, MOVEMENT_ACTION_WALK_FASTER_LEFT
-	create_movement_action walk_fastest_right, MOVEMENT_ACTION_WALK_FASTEST_RIGHT
+	create_movement_action walk_faster_right, MOVEMENT_ACTION_WALK_FASTER_RIGHT
 	create_movement_action slide_down, MOVEMENT_ACTION_SLIDE_DOWN
 	create_movement_action slide_up, MOVEMENT_ACTION_SLIDE_UP
 	create_movement_action slide_left, MOVEMENT_ACTION_SLIDE_LEFT
@@ -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
@@ -105,17 +105,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::
@@ -211,9 +211,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
@@ -221,9 +221,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
@@ -113,12 +113,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
@@ -130,7 +130,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
@@ -181,13 +181,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::
@@ -278,7 +278,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::
@@ -301,7 +301,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
@@ -319,7 +319,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
@@ -276,13 +276,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
@@ -372,13 +372,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::
@@ -437,13 +437,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
@@ -513,13 +513,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
@@ -589,13 +589,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
@@ -665,13 +665,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
@@ -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::
@@ -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
@@ -57,10 +57,10 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade::
 	removeitem ITEM_LEMONADE, 1
 	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 0
 	msgbox FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis
@@ -73,7 +73,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
@@ -22,7 +22,7 @@ FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene::
 	textcolor 1
 	msgbox FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow
 	closemessage
-	applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestUp
+	applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	opendoor 39, 8
 	waitdooranim
@@ -47,7 +47,7 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
 	waitmovement 0
 	textcolor 0
 	msgbox FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady
-	applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestUp
+	applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	textcolor 1
 	msgbox FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation
@@ -73,25 +73,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
@@ -122,13 +122,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::
@@ -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
@@ -101,7 +101,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
@@ -149,7 +149,7 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1::
 FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1::
 	compare PLAYER_X_POS, 27
 	goto_if_eq EventScript_Return
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
 	waitmovement 0
 	return
@@ -164,27 +164,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
@@ -30,7 +30,7 @@ FourIsland_OnFrame::
 FourIsland_EventScript_RivalScene::
 	lockall
 	textcolor 0
-	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	playbgm MUS_ENCOUNTER_RIVAL, 0
 	applymovement LOCALID_RIVAL, Movement_ExclamationMark
@@ -68,7 +68,7 @@ FourIsland_Movement_RivalExit::
 FourIsland_Movement_PlayerWatchRivalExit::
 	walk_left
-	walk_in_place_fastest_right
+	walk_in_place_faster_right
 	step_end
 FourIsland_EventScript_DaycareMan::
@@ -28,17 +28,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 1
 	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
@@ -82,7 +82,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 1
 	msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful
@@ -101,10 +101,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::
@@ -163,7 +163,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::
@@ -182,10 +182,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::
@@ -101,7 +101,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerLeft::
 FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone::
 	textcolor 0
 	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, 0
 	msgbox FuchsiaCity_SafariZone_Entrance_Text_PlaySafariGameFor500, MSGBOX_YESNO
@@ -104,12 +104,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
@@ -121,7 +121,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::
@@ -134,7 +134,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::
@@ -145,7 +145,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::
@@ -163,7 +163,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
@@ -174,7 +174,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
@@ -99,14 +99,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
@@ -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
@@ -67,46 +67,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
@@ -118,9 +118,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
@@ -158,7 +158,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::
@@ -169,7 +169,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
@@ -180,7 +180,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::
@@ -360,7 +360,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
@@ -383,7 +383,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
@@ -470,30 +470,30 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
 	call_if_eq 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
@@ -534,7 +534,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::
@@ -544,14 +544,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
@@ -559,7 +559,7 @@ Movement_17131F::
 	delay_16
 	delay_16
 	delay_4
-	walk_in_place_fastest_left
+	walk_in_place_faster_left
 	step_end
@ Unused
@@ -117,7 +117,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::
@@ -152,7 +152,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::
@@ -194,7 +194,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
@@ -298,7 +298,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::
@@ -306,7 +306,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::
@@ -394,12 +394,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::
@@ -434,8 +434,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
@@ -161,7 +161,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
@@ -171,18 +171,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
@@ -212,7 +212,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
@@ -236,7 +236,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
@@ -317,9 +317,9 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight::
 PalletTown_ProfessorOaksLab_EventScript_RivalBattle::
 	textcolor 0
 	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
@@ -576,17 +576,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::
@@ -701,7 +701,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
@@ -784,7 +784,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::
@@ -823,20 +823,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::
@@ -844,7 +844,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::
@@ -946,27 +946,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
@@ -1043,7 +1043,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
@@ -1052,7 +1052,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
@@ -1061,7 +1061,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
@@ -1069,8 +1069,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
@@ -1078,26 +1078,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
@@ -1113,24 +1113,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::
@@ -1299,7 +1299,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::
@@ -1307,7 +1307,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::
@@ -147,7 +147,7 @@ PalletTown_RivalsHouse_EventScript_GiveTownMap::
 	checkitemspace ITEM_TOWN_MAP, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq 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
@@ -170,7 +170,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::
@@ -207,14 +207,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::
@@ -228,7 +228,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::
@@ -242,7 +242,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::
@@ -372,7 +372,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
@@ -399,14 +399,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::
@@ -414,7 +414,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::
@@ -429,7 +429,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::
@@ -550,13 +550,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::
@@ -565,7 +565,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::
@@ -573,33 +573,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::
@@ -749,7 +749,7 @@ PewterCity_EventScript_AideGiveRunningShoes::
 	return
 PewterCity_EventScript_AideNoticePlayer::
-	applymovement LOCALID_AIDE, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_AIDE, Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	return
@@ -761,7 +761,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
@@ -769,7 +769,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
@@ -777,7 +777,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
@@ -42,7 +42,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
@@ -50,7 +50,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
@@ -58,7 +58,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
@@ -109,16 +109,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
@@ -81,12 +81,12 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
 	specialvar VAR_RESULT, GetStarterSpecies
 	getspeciesname 0, 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
@@ -186,7 +186,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
@@ -194,7 +194,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::
@@ -208,7 +208,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
@@ -234,5 +234,5 @@ PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter::
 	delay_16
 	delay_16
 	delay_16
-	walk_in_place_fastest_left
+	walk_in_place_faster_left
 	step_end
@@ -22,14 +22,14 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom::
 	textcolor 0
 	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
@@ -159,10 +159,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
@@ -54,14 +54,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
@@ -95,7 +95,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::
@@ -106,5 +106,5 @@ PokemonTower_2F_Movement_RivalExitDown::
 	walk_down
 	walk_down
 	walk_down
-	walk_in_place_fastest_right
+	walk_in_place_faster_right
 	step_end
@@ -103,7 +103,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::
@@ -49,7 +49,7 @@ Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger::
 	textcolor 0
 	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
 	compare VAR_0x8008, 1
@@ -49,7 +49,7 @@ Route18_EastEntrance_1F_EventScript_NeedBikeTrigger::
 	textcolor 0
 	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
 	compare VAR_0x8008, 1
@@ -148,7 +148,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::
@@ -160,7 +160,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::
@@ -44,7 +44,7 @@ Route24_EventScript_RocketTrigger::
 	call_if_eq Route24_EventScript_RocketApproachPlayer
 	compare VAR_TEMP_1, 1
 	call_if_eq 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, 1
@@ -72,7 +72,7 @@ Route24_EventScript_RocketApproachPlayer::
 	return
 Route24_EventScript_RocketMotionToPlayer::
-	applymovement LOCALID_ROCKET, Movement_WalkInPlaceFastestLeft
+	applymovement LOCALID_ROCKET, Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	return
@@ -97,7 +97,7 @@ Route24_Movement_RocketApproachPlayer::
 Route24_Movement_RocketWalkBackToPos::
 	walk_right
-	walk_in_place_fastest_left
+	walk_in_place_faster_left
 	step_end
 Route24_Movement_WalkDown::
@@ -149,7 +149,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::
@@ -25,7 +25,7 @@ Route5_SouthEntrance_EventScript_GuardTriggerRight::
 Route5_SouthEntrance_EventScript_GuardTrigger::
 	textcolor 0
-	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
@@ -25,7 +25,7 @@ Route6_NorthEntrance_EventScript_GuardTriggerRight::
 Route6_NorthEntrance_EventScript_GuardTrigger::
 	textcolor 0
-	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
@@ -25,7 +25,7 @@ Route7_EastEntrance_EventScript_GuardTriggerBottom::
 Route7_EastEntrance_EventScript_GuardTrigger::
 	textcolor 0
-	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
@@ -25,7 +25,7 @@ Route8_WestEntrance_EventScript_GuardTriggerBottom::
 Route8_WestEntrance_EventScript_GuardTrigger::
 	textcolor 0
-	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
@@ -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
 	compare VAR_TEMP_1, 0
@@ -110,7 +110,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::
@@ -118,7 +118,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::
@@ -132,7 +132,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::
@@ -40,7 +40,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
@@ -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
 	drawmonpic 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 0
 	msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO
@@ -47,7 +47,7 @@ SaffronCity_Dojo_EventScript_HitmonchanBall::
 	goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
 	drawmonpic 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 0
 	msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO
@@ -19,7 +19,7 @@ SaffronCity_PokemonTrainerFanClub_OnFrame::
 SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans::
 	lockall
 	textcolor 1
-	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::
@@ -41,7 +41,7 @@ SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle::
 	applymovement LOCALID_OLD_WOMAN, SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer
 	waitmovement 0
 	moveobjectoffscreen LOCALID_OLD_WOMAN
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
 	call_if_eq SevenIsland_House_Room1_EventScript_BattleWonComment
@@ -72,7 +72,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::
@@ -174,12 +174,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::
@@ -36,7 +36,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
@@ -62,13 +62,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
@@ -64,7 +64,7 @@ SilphCo_11F_EventScript_GiovanniTriggerRight::
 SilphCo_11F_EventScript_BattleGiovanni::
 	textcolor 0
-	applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	delay 25
 	msgbox SilphCo_11F_Text_GiovanniIntro
@@ -104,7 +104,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::
@@ -119,7 +119,7 @@ SilphCo_11F_Movement_PlayerFaceGiovanni::
 	delay_16
 	delay_8
 	delay_4
-	walk_in_place_fastest_right
+	walk_in_place_faster_right
 	step_end
@ Unused
@@ -38,7 +38,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
@@ -80,22 +80,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
@@ -122,28 +122,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
@@ -174,13 +174,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::
@@ -236,7 +236,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::
@@ -23,7 +23,7 @@ SixIsland_PokemonCenter_1F_OnFrame::
 SixIsland_PokemonCenter_1F_EventScript_RivalScene::
 	lockall
 	textcolor 0
-	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	playbgm MUS_ENCOUNTER_RIVAL, 0
 	applymovement LOCALID_RIVAL, Movement_ExclamationMark
@@ -62,7 +62,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::
@@ -109,23 +109,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
@@ -221,7 +221,7 @@ ThreeIsland_EventScript_BattleBikersTriggerRight::
 ThreeIsland_EventScript_BattleBikersScene::
 	textcolor 0
-	applymovement LOCALID_BIKER1, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_BIKER1, Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	playse SE_PIN
 	applymovement LOCALID_BIKER1, Movement_ExclamationMark
@@ -257,10 +257,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
@@ -295,33 +295,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
@@ -348,7 +348,7 @@ ThreeIsland_Movement_BikerApproach::
 ThreeIsland_Movement_Biker1ReturnToPack::
 	walk_up
-	walk_in_place_fastest_left
+	walk_in_place_faster_left
 	step_end
 ThreeIsland_Movement_BikerSpeak::
@@ -358,7 +358,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::
@@ -368,20 +368,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::
@@ -389,7 +389,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::
@@ -49,11 +49,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::
@@ -71,7 +71,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
@@ -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::
@@ -200,8 +200,8 @@ VermilionCity_EventScript_ExitedTicketCheck::
 VermilionCity_EventScript_CheckTicket::
 	textcolor 0
-	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
 	compare VAR_MAP_SCENE_VERMILION_CITY, 3
 	goto_if_eq VermilionCity_EventScript_CheckSeagallopPresentTrigger
@@ -47,7 +47,7 @@ ViridianCity_EventScript_TryUnlockGym::
 ViridianCity_EventScript_GymDoorLocked::
 	lockall
 	textcolor 3
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	delay 20
 	msgbox ViridianCity_Text_GymDoorsAreLocked
@@ -218,9 +218,9 @@ ViridianCity_Movement_WalkDown::
 ViridianCity_EventScript_TutorialTriggerLeft::
 	lockall
 	textcolor 0
-	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
@@ -229,9 +229,9 @@ ViridianCity_EventScript_TutorialTriggerLeft::
 ViridianCity_EventScript_TutorialTriggerRight::
 	lockall
 	textcolor 0
-	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
@@ -21,7 +21,7 @@ ViridianCity_Mart_OnFrame::
 ViridianCity_Mart_EventScript_ParcelScene::
 	lockall
 	textcolor 0
-	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::
@@ -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
@@ -39,7 +39,7 @@ ViridianCity_School_EventScript_Notebook::
 	compare VAR_RESULT, NO
 	goto_if_eq ViridianCity_School_EventScript_StopReadingNotebook
 	msgbox ViridianCity_School_Text_NotebookFourthPage
-	applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp
+	applymovement LOCALID_LASS, Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	textcolor 1
 	msgbox ViridianCity_School_Text_HeyDontLookAtMyNotes
@@ -193,7 +193,7 @@ CableClub_EventScript_PlayerExitLinkRoom::
 CableClub_EventScript_Tutorial::
 	lockall
 	textcolor 1
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
 	waitmovement 0
 	msgbox CableClub_Text_FirstTimeRightThisWay
 	closemessage
@@ -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::
@@ -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
@@ -116,7 +116,7 @@ Route23_EventScript_RecognizeBadge::
 Route23_EventScript_BadgeGuardTrigger::
 	textcolor 0
-	applymovement VAR_0x8009, Movement_WalkInPlaceFastestLeft
+	applymovement VAR_0x8009, Movement_WalkInPlaceFasterLeft
 	waitmovement 0
 	switch VAR_TEMP_1
 	case 1, Route23_EventScript_CheckBoulderBadgeTrigger
@@ -175,7 +175,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
@@ -188,7 +188,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
@@ -24,7 +24,7 @@ EventScript_AfterWhiteOutHealMsg::
 EventScript_AfterWhiteOutMomHeal::
 	lockall
 	textcolor 1
-	applymovement LOCALID_MOM, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_MOM, Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	msgbox Text_HadQuiteAnExperienceTakeRest
 	call EventScript_OutOfCenterPartyHeal
@@ -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
@@ -45,10 +45,10 @@ static bool8 MovementAction_WalkInPlaceFastDown_Step0(struct ObjectEvent *, stru
 static bool8 MovementAction_WalkInPlaceFastUp_Step0(struct ObjectEvent *, struct Sprite *);
 static bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct ObjectEvent *, struct Sprite *);
 static bool8 MovementAction_WalkInPlaceFastRight_Step0(struct ObjectEvent *, struct Sprite *);
-static bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct ObjectEvent *, struct Sprite *);
+static bool8 MovementAction_WalkInPlaceFasterDown_Step0(struct ObjectEvent *, struct Sprite *);
-static bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct ObjectEvent *, struct Sprite *);
+static bool8 MovementAction_WalkInPlaceFasterUp_Step0(struct ObjectEvent *, struct Sprite *);
-static bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct ObjectEvent *, struct Sprite *);
+static bool8 MovementAction_WalkInPlaceFasterLeft_Step0(struct ObjectEvent *, struct Sprite *);
-static bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *, struct Sprite *);
+static bool8 MovementAction_WalkInPlaceFasterRight_Step0(struct ObjectEvent *, struct Sprite *);
 static bool8 MovementAction_Jump2Down_Step0(struct ObjectEvent *, struct Sprite *);
 static bool8 MovementAction_Jump2Down_Step1(struct ObjectEvent *, struct Sprite *);
 static bool8 MovementAction_Jump2Up_Step0(struct ObjectEvent *, struct Sprite *);
@@ -79,14 +79,14 @@ static bool8 MovementAction_RideWaterCurrentLeft_Step0(struct ObjectEvent *, str
 static bool8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *, struct Sprite *);
 static bool8 MovementAction_RideWaterCurrentRight_Step0(struct ObjectEvent *, struct Sprite *);
 static bool8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *, struct Sprite *);
-static bool8 MovementAction_WalkFastestDown_Step0(struct ObjectEvent *, struct Sprite *);
+static bool8 MovementAction_WalkFasterDown_Step0(struct ObjectEvent *, struct Sprite *);
-static bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *, struct Sprite *);
+static bool8 MovementAction_WalkFasterDown_Step1(struct ObjectEvent *, struct Sprite *);
-static bool8 MovementAction_WalkFastestUp_Step0(struct ObjectEvent *, struct Sprite *);
+static bool8 MovementAction_WalkFasterUp_Step0(struct ObjectEvent *, struct Sprite *);
-static bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *, struct Sprite *);
+static bool8 MovementAction_WalkFasterUp_Step1(struct ObjectEvent *, struct Sprite *);
-static bool8 MovementAction_WalkFastestLeft_Step0(struct ObjectEvent *, struct Sprite *);
+static bool8 MovementAction_WalkFasterLeft_Step0(struct ObjectEvent *, struct Sprite *);
-static bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *, struct Sprite *);
+static bool8 MovementAction_WalkFasterLeft_Step1(struct ObjectEvent *, struct Sprite *);
-static bool8 MovementAction_WalkFastestRight_Step0(struct ObjectEvent *, struct Sprite *);
+static bool8 MovementAction_WalkFasterRight_Step0(struct ObjectEvent *, struct Sprite *);
-static bool8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *, struct Sprite *);
+static bool8 MovementAction_WalkFasterRight_Step1(struct ObjectEvent *, struct Sprite *);
 static bool8 MovementAction_SlideDown_Step0(struct ObjectEvent *, struct Sprite *);
 static bool8 MovementAction_SlideDown_Step1(struct ObjectEvent *, struct Sprite *);
 static bool8 MovementAction_SlideUp_Step0(struct ObjectEvent *, struct Sprite *);
@@ -340,10 +340,10 @@ static bool8 (*const sMovementActionFuncs_RideWaterCurrentDown[])(struct ObjectE
 static bool8 (*const sMovementActionFuncs_RideWaterCurrentUp[])(struct ObjectEvent *, struct Sprite *);
 static bool8 (*const sMovementActionFuncs_RideWaterCurrentLeft[])(struct ObjectEvent *, struct Sprite *);
 static bool8 (*const sMovementActionFuncs_RideWaterCurrentRight[])(struct ObjectEvent *, struct Sprite *);
-static bool8 (*const sMovementActionFuncs_WalkFastestDown[])(struct ObjectEvent *, struct Sprite *);
+static bool8 (*const sMovementActionFuncs_WalkFasterDown[])(struct ObjectEvent *, struct Sprite *);
-static bool8 (*const sMovementActionFuncs_WalkFastestUp[])(struct ObjectEvent *, struct Sprite *);
+static bool8 (*const sMovementActionFuncs_WalkFasterUp[])(struct ObjectEvent *, struct Sprite *);
-static bool8 (*const sMovementActionFuncs_WalkFastestLeft[])(struct ObjectEvent *, struct Sprite *);
+static bool8 (*const sMovementActionFuncs_WalkFasterLeft[])(struct ObjectEvent *, struct Sprite *);
-static bool8 (*const sMovementActionFuncs_WalkFastestRight[])(struct ObjectEvent *, struct Sprite *);
+static bool8 (*const sMovementActionFuncs_WalkFasterRight[])(struct ObjectEvent *, struct Sprite *);
 static bool8 (*const sMovementActionFuncs_SlideDown[])(struct ObjectEvent *, struct Sprite *);
 static bool8 (*const sMovementActionFuncs_SlideUp[])(struct ObjectEvent *, struct Sprite *);
 static bool8 (*const sMovementActionFuncs_SlideLeft[])(struct ObjectEvent *, struct Sprite *);
@@ -508,18 +508,18 @@ static bool8 (*const *const sMovementActionFuncs[])(struct ObjectEvent *, struct
    [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP]              = sMovementActionFuncs_WalkInPlaceFastUp,
    [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT]            = sMovementActionFuncs_WalkInPlaceFastLeft,
    [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT]           = sMovementActionFuncs_WalkInPlaceFastRight,
-    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN]         = sMovementActionFuncs_WalkInPlaceFasterDown,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN]          = sMovementActionFuncs_WalkInPlaceFasterDown,
-    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP]           = sMovementActionFuncs_WalkInPlaceFasterUp,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_UP]            = sMovementActionFuncs_WalkInPlaceFasterUp,
-    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT]         = sMovementActionFuncs_WalkInPlaceFasterLeft,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_LEFT]          = sMovementActionFuncs_WalkInPlaceFasterLeft,
-    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT]        = sMovementActionFuncs_WalkInPlaceFasterRight,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT]         = sMovementActionFuncs_WalkInPlaceFasterRight,
    [MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN]            = sMovementActionFuncs_RideWaterCurrentDown,
    [MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP]              = sMovementActionFuncs_RideWaterCurrentUp,
    [MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT]            = sMovementActionFuncs_RideWaterCurrentLeft,
    [MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT]           = sMovementActionFuncs_RideWaterCurrentRight,
-    [MOVEMENT_ACTION_WALK_FASTEST_DOWN]                  = sMovementActionFuncs_WalkFastestDown,
+    [MOVEMENT_ACTION_WALK_FASTER_DOWN]                   = sMovementActionFuncs_WalkFasterDown,
-    [MOVEMENT_ACTION_WALK_FASTEST_UP]                    = sMovementActionFuncs_WalkFastestUp,
+    [MOVEMENT_ACTION_WALK_FASTER_UP]                     = sMovementActionFuncs_WalkFasterUp,
-    [MOVEMENT_ACTION_WALK_FASTEST_LEFT]                  = sMovementActionFuncs_WalkFastestLeft,
+    [MOVEMENT_ACTION_WALK_FASTER_LEFT]                   = sMovementActionFuncs_WalkFasterLeft,
-    [MOVEMENT_ACTION_WALK_FASTEST_RIGHT]                 = sMovementActionFuncs_WalkFastestRight,
+    [MOVEMENT_ACTION_WALK_FASTER_RIGHT]                  = sMovementActionFuncs_WalkFasterRight,
    [MOVEMENT_ACTION_SLIDE_DOWN]                         = sMovementActionFuncs_SlideDown,
    [MOVEMENT_ACTION_SLIDE_UP]                           = sMovementActionFuncs_SlideUp,
    [MOVEMENT_ACTION_SLIDE_LEFT]                         = sMovementActionFuncs_SlideLeft,
@@ -966,25 +966,25 @@ static bool8 (*const sMovementActionFuncs_WalkInPlaceFastRight[])(struct ObjectE
 };
 static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterDown[])(struct ObjectEvent *, struct Sprite *) = {
-    MovementAction_WalkInPlaceFastestDown_Step0,
+    MovementAction_WalkInPlaceFasterDown_Step0,
    MovementAction_WalkInPlace_Step1,
    MovementAction_PauseSpriteAnim,
 };
 static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterUp[])(struct ObjectEvent *, struct Sprite *) = {
-    MovementAction_WalkInPlaceFastestUp_Step0,
+    MovementAction_WalkInPlaceFasterUp_Step0,
    MovementAction_WalkInPlace_Step1,
    MovementAction_PauseSpriteAnim,
 };
 static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterLeft[])(struct ObjectEvent *, struct Sprite *) = {
-    MovementAction_WalkInPlaceFastestLeft_Step0,
+    MovementAction_WalkInPlaceFasterLeft_Step0,
    MovementAction_WalkInPlace_Step1,
    MovementAction_PauseSpriteAnim,
 };
 static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterRight[])(struct ObjectEvent *, struct Sprite *) = {
-    MovementAction_WalkInPlaceFastestRight_Step0,
+    MovementAction_WalkInPlaceFasterRight_Step0,
    MovementAction_WalkInPlace_Step1,
    MovementAction_PauseSpriteAnim,
 };
@@ -1013,27 +1013,27 @@ static bool8 (*const sMovementActionFuncs_RideWaterCurrentRight[])(struct Object
    MovementAction_PauseSpriteAnim,
 };
-static bool8 (*const sMovementActionFuncs_WalkFastestDown[])(struct ObjectEvent *, struct Sprite *) = {
+static bool8 (*const sMovementActionFuncs_WalkFasterDown[])(struct ObjectEvent *, struct Sprite *) = {
-    MovementAction_WalkFastestDown_Step0,
+    MovementAction_WalkFasterDown_Step0,
-    MovementAction_WalkFastestDown_Step1,
+    MovementAction_WalkFasterDown_Step1,
    MovementAction_PauseSpriteAnim,
 };
-static bool8 (*const sMovementActionFuncs_WalkFastestUp[])(struct ObjectEvent *, struct Sprite *) = {
+static bool8 (*const sMovementActionFuncs_WalkFasterUp[])(struct ObjectEvent *, struct Sprite *) = {
-    MovementAction_WalkFastestUp_Step0,
+    MovementAction_WalkFasterUp_Step0,
-    MovementAction_WalkFastestUp_Step1,
+    MovementAction_WalkFasterUp_Step1,
    MovementAction_PauseSpriteAnim,
 };
-static bool8 (*const sMovementActionFuncs_WalkFastestLeft[])(struct ObjectEvent *, struct Sprite *) = {
+static bool8 (*const sMovementActionFuncs_WalkFasterLeft[])(struct ObjectEvent *, struct Sprite *) = {
-    MovementAction_WalkFastestLeft_Step0,
+    MovementAction_WalkFasterLeft_Step0,
-    MovementAction_WalkFastestLeft_Step1,
+    MovementAction_WalkFasterLeft_Step1,
    MovementAction_PauseSpriteAnim,
 };
-static bool8 (*const sMovementActionFuncs_WalkFastestRight[])(struct ObjectEvent *, struct Sprite *) = {
+static bool8 (*const sMovementActionFuncs_WalkFasterRight[])(struct ObjectEvent *, struct Sprite *) = {
-    MovementAction_WalkFastestRight_Step0,
+    MovementAction_WalkFasterRight_Step0,
-    MovementAction_WalkFastestRight_Step1,
+    MovementAction_WalkFasterRight_Step1,
    MovementAction_PauseSpriteAnim,
 };
@@ -969,11 +969,11 @@ static const u8 gUnknown_83A6514[] = {
 };
 static const u8 gUnknown_83A6519[] = {
-    [DIR_NONE]  = MOVEMENT_ACTION_WALK_FASTEST_DOWN,
+    [DIR_NONE]  = MOVEMENT_ACTION_WALK_FASTER_DOWN,
-    [DIR_SOUTH] = MOVEMENT_ACTION_WALK_FASTEST_DOWN,
+    [DIR_SOUTH] = MOVEMENT_ACTION_WALK_FASTER_DOWN,
-    [DIR_NORTH] = MOVEMENT_ACTION_WALK_FASTEST_UP,
+    [DIR_NORTH] = MOVEMENT_ACTION_WALK_FASTER_UP,
-    [DIR_WEST]  = MOVEMENT_ACTION_WALK_FASTEST_LEFT,
+    [DIR_WEST]  = MOVEMENT_ACTION_WALK_FASTER_LEFT,
-    [DIR_EAST]  = MOVEMENT_ACTION_WALK_FASTEST_RIGHT,
+    [DIR_EAST]  = MOVEMENT_ACTION_WALK_FASTER_RIGHT,
 };
 static const u8 gUnknown_83A651E[] = {
@@ -1081,11 +1081,11 @@ static const u8 gUnknown_83A655A[] = {
 };
 static const u8 gUnknown_83A655F[] = {
-    [DIR_NONE]  = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
+    [DIR_NONE]  = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN,
-    [DIR_SOUTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
+    [DIR_SOUTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN,
-    [DIR_NORTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP,
+    [DIR_NORTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_UP,
-    [DIR_WEST]  = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT,
+    [DIR_WEST]  = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_LEFT,
-    [DIR_EAST]  = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT,
+    [DIR_EAST]  = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT,
 };
 static const u8 gUnknown_83A6564[] = {
@@ -6260,25 +6260,25 @@ static bool8 MovementAction_WalkInPlaceFastRight_Step0(struct ObjectEvent *objec
    return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
 }
-static bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 MovementAction_WalkInPlaceFasterDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
    InitMoveInPlace(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4);
    return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
 }
-static bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 MovementAction_WalkInPlaceFasterUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
    InitMoveInPlace(objectEvent, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4);
    return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
 }
-static bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 MovementAction_WalkInPlaceFasterLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
    InitMoveInPlace(objectEvent, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4);
    return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
 }
-static bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 MovementAction_WalkInPlaceFasterRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
    InitMoveInPlace(objectEvent, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4);
    return MovementAction_WalkInPlace_Step1(objectEvent, sprite);
@@ -6348,13 +6348,13 @@ static bool8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *obje
    return FALSE;
 }
-static bool8 MovementAction_WalkFastestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 MovementAction_WalkFasterDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
    InitMovementNormal(objectEvent, sprite, DIR_SOUTH, MOVE_SPEED_FASTER);
-    return MovementAction_WalkFastestDown_Step1(objectEvent, sprite);
+    return MovementAction_WalkFasterDown_Step1(objectEvent, sprite);
 }
-static bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 MovementAction_WalkFasterDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
    if (UpdateMovementNormal(objectEvent, sprite))
    {
@@ -6364,13 +6364,13 @@ static bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *objectEven
    return FALSE;
 }
-static bool8 MovementAction_WalkFastestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 MovementAction_WalkFasterUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
    InitMovementNormal(objectEvent, sprite, DIR_NORTH, MOVE_SPEED_FASTER);
-    return MovementAction_WalkFastestUp_Step1(objectEvent, sprite);
+    return MovementAction_WalkFasterUp_Step1(objectEvent, sprite);
 }
-static bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 MovementAction_WalkFasterUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
    if (UpdateMovementNormal(objectEvent, sprite))
    {
@@ -6380,13 +6380,13 @@ static bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *objectEvent,
    return FALSE;
 }
-static bool8 MovementAction_WalkFastestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 MovementAction_WalkFasterLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
    InitMovementNormal(objectEvent, sprite, DIR_WEST, MOVE_SPEED_FASTER);
-    return MovementAction_WalkFastestLeft_Step1(objectEvent, sprite);
+    return MovementAction_WalkFasterLeft_Step1(objectEvent, sprite);
 }
-static bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 MovementAction_WalkFasterLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
    if (UpdateMovementNormal(objectEvent, sprite))
    {
@@ -6396,13 +6396,13 @@ static bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *objectEven
    return FALSE;
 }
-static bool8 MovementAction_WalkFastestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 MovementAction_WalkFasterRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
    InitMovementNormal(objectEvent, sprite, DIR_EAST, MOVE_SPEED_FASTER);
-    return MovementAction_WalkFastestRight_Step1(objectEvent, sprite);
+    return MovementAction_WalkFasterRight_Step1(objectEvent, sprite);
 }
-static bool8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 MovementAction_WalkFasterRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
    if (UpdateMovementNormal(objectEvent, sprite))
    {
@@ -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;
@@ -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
 };