summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/berry_blender.inc2
-rw-r--r--data/scripts/cable_club.inc2
-rw-r--r--data/scripts/contest_hall.inc40
-rw-r--r--data/scripts/gabby_and_ty.inc4
-rw-r--r--data/scripts/movement.inc16
-rw-r--r--data/scripts/pkmn_center_nurse.inc4
-rw-r--r--data/scripts/players_house.inc68
7 files changed, 68 insertions, 68 deletions
diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc
index 1e4f55169..1d833f470 100644
--- a/data/scripts/berry_blender.inc
+++ b/data/scripts/berry_blender.inc
@@ -567,7 +567,7 @@ BerryBlender_EventScript_ExpertMGiveBerry:
end
BerryBlender_Movement_BlendLeaderWalkInPlace:
- walk_in_place_fastest_right
+ walk_in_place_faster_right
step_end
BerryBlender_EventScript_BerryBlenderLink::
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index ab7642899..d6ea1a707 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -245,7 +245,7 @@ CableClub_EventScript_PlayerExitLinkRoom::
CableClub_EventScript_Tutorial::
lockall
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox CableClub_Text_FirstTimeRightThisWay, MSGBOX_DEFAULT
closemessage
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 0d9e02337..17364559b 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -1285,7 +1285,7 @@ ContestHall_Movement_MCBackUp:
step_end
ContestHall_Movement_MCFaceJudge:
- walk_in_place_fastest_right
+ walk_in_place_faster_right
step_end
ContestHall_Movement_Heart:
@@ -1293,24 +1293,24 @@ ContestHall_Movement_Heart:
step_end
ContestHall_Movement_FaceContestants:
- walk_in_place_fastest_down
+ walk_in_place_faster_down
step_end
ContestHall_Movement_WalkStageLeft:
walk_left
walk_left
- walk_in_place_fastest_down
+ walk_in_place_faster_down
step_end
ContestHall_Movement_WalkStageRight:
walk_right
walk_right
- walk_in_place_fastest_down
+ walk_in_place_faster_down
step_end
ContestHall_Movement_WinningPlayerWalkUp:
walk_up
- walk_in_place_fastest_down
+ walk_in_place_faster_down
step_end
ContestHall_Movement_ContestantDelay32:
@@ -1319,15 +1319,15 @@ ContestHall_Movement_ContestantDelay32:
step_end
ContestHall_Movement_MCFaceJudge2:
- walk_in_place_fastest_right
+ walk_in_place_faster_right
step_end
ContestHall_Movement_JudgeFaceMC:
- walk_in_place_fastest_left
+ walk_in_place_faster_left
step_end
ContestHall_Movement_FaceContestants2:
- walk_in_place_fastest_down
+ walk_in_place_faster_down
step_end
ContestHall_Movement_Player3ApproachForPrize:
@@ -1375,20 +1375,20 @@ ContestHall_Movement_Player4FaceUp:
ContestHall_Movement_MCLookAtJudge:
face_up
delay_16
- walk_in_place_fastest_right
+ walk_in_place_faster_right
step_end
ContestHall_Movement_JudgeLookAtMC:
- 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
ContestHall_Movement_MCWalkInPlaceDown:
delay_16
delay_16
- walk_in_place_fastest_down
+ walk_in_place_faster_down
step_end
ContestHall_Movement_Player1WalkToCenter:
@@ -1396,7 +1396,7 @@ ContestHall_Movement_Player1WalkToCenter:
walk_right
walk_right
walk_right
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
ContestHall_Movement_Player1WalkBack:
@@ -1404,31 +1404,31 @@ ContestHall_Movement_Player1WalkBack:
walk_fast_left
walk_fast_left
walk_fast_down
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
ContestHall_Movement_Player2WalkToCenter:
walk_up
walk_right
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
ContestHall_Movement_Player2WalkBack:
walk_fast_left
walk_fast_down
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
ContestHall_Movement_Player3WalkToCenter:
walk_up
walk_left
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
ContestHall_Movement_Player3WalkBack:
walk_fast_right
walk_fast_down
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
ContestHall_Movement_Player4WalkToCenter:
@@ -1436,7 +1436,7 @@ ContestHall_Movement_Player4WalkToCenter:
walk_left
walk_left
walk_left
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
ContestHall_Movement_Player4WalkBack:
@@ -1444,7 +1444,7 @@ ContestHall_Movement_Player4WalkBack:
walk_fast_right
walk_fast_right
walk_fast_down
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
ContestHall_Movement_Player1ApproachForPrize:
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index baee6c96f..68be27a02 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -217,13 +217,13 @@ GabbyAndTy_EventScript_FacePlayerNorth::
GabbyAndTy_EventScript_FacePlayerSouth::
applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceUp
- applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
GabbyAndTy_EventScript_FacePlayerEast::
applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceLeft
- applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc
index 3f75d30dd..383c01413 100644
--- a/data/scripts/movement.inc
+++ b/data/scripts/movement.inc
@@ -24,20 +24,20 @@ Common_Movement_FaceOriginalDirection:
face_original_direction
step_end
-Common_Movement_WalkInPlaceFastestLeft:
- walk_in_place_fastest_left
+Common_Movement_WalkInPlaceFasterLeft:
+ walk_in_place_faster_left
step_end
-Common_Movement_WalkInPlaceFastestUp:
- walk_in_place_fastest_up
+Common_Movement_WalkInPlaceFasterUp:
+ walk_in_place_faster_up
step_end
-Common_Movement_WalkInPlaceFastestRight:
- walk_in_place_fastest_right
+Common_Movement_WalkInPlaceFasterRight:
+ walk_in_place_faster_right
step_end
-Common_Movement_WalkInPlaceFastestDown:
- walk_in_place_fastest_down
+Common_Movement_WalkInPlaceFasterDown:
+ walk_in_place_faster_down
step_end
Common_Movement_FaceRight:
diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc
index 7797b3061..21f2abe0a 100644
--- a/data/scripts/pkmn_center_nurse.inc
+++ b/data/scripts/pkmn_center_nurse.inc
@@ -38,11 +38,11 @@ EventScript_PkmnCenterNurse_IllTakeYourPkmn2::
return
EventScript_PkmnCenterNurse_TakeAndHealPkmn::
- applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestLeft
+ applymovement VAR_0x800B, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
dofieldeffect FLDEFF_POKECENTER_HEAL
waitfieldeffect FLDEFF_POKECENTER_HEAL
- applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestDown
+ applymovement VAR_0x800B, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
special HealPlayerParty
return
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index e7e862039..571b61e62 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -19,18 +19,18 @@ PlayersHouse_1F_EventScript_EnterHouseMovingIn::
closemessage
setvar VAR_LITTLEROOT_INTRO_STATE, 4
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn
- applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
+ applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
releaseall
end
PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale::
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale::
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
@@ -41,7 +41,7 @@ PlayersHouse_1F_Movement_PlayerWalkIn:
PlayersHouse_1F_EventScript_MomGoSeeRoom::
msgbox PlayersHouse_1F_Text_ArentYouInterestedInRoom, MSGBOX_DEFAULT
closemessage
- applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
+ applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor
waitmovement 0
releaseall
@@ -83,7 +83,7 @@ PlayersHouse_2F_EventScript_MomComesUpstairsMale::
addobject VAR_0x8008
applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersMale
waitmovement 0
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT
closemessage
@@ -96,7 +96,7 @@ PlayersHouse_2F_EventScript_MomComesUpstairsFemale::
addobject VAR_0x8008
applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersFemale
waitmovement 0
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT
closemessage
@@ -121,7 +121,7 @@ PlayersHouse_2F_EventScript_SetWallClock::
PlayersHouse_2F_Movement_MomEntersMale:
delay_8
walk_down
- walk_in_place_fastest_left
+ walk_in_place_faster_left
delay_16
delay_8
walk_left
@@ -136,7 +136,7 @@ PlayersHouse_2F_Movement_MomExitsMale:
PlayersHouse_2F_Movement_MomEntersFemale:
delay_8
walk_down
- walk_in_place_fastest_right
+ walk_in_place_faster_right
delay_16
delay_8
walk_right
@@ -154,7 +154,7 @@ PlayersHouse_1F_EventScript_SetWatchedBroadcast::
end
PlayersHouse_1F_EventScript_PetalburgGymReportMale::
- applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale
@@ -167,7 +167,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale::
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale
waitmovement 0
call PlayersHouse_1F_EventScript_WatchGymBroadcast
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT
@@ -179,7 +179,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale::
end
PlayersHouse_1F_EventScript_PetalburgGymReportFemale::
- applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale
@@ -192,7 +192,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportFemale::
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale
waitmovement 0
call PlayersHouse_1F_EventScript_WatchGymBroadcast
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT
msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT
@@ -214,7 +214,7 @@ PlayersHouse_1F_EventScript_MomNoticeGymBroadcast::
return
PlayersHouse_1F_EventScript_WatchGymBroadcast::
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT
fadedefaultbgm
@@ -230,7 +230,7 @@ PlayersHouse_1F_Movement_MomApproachDadMale:
walk_right
walk_right
walk_down
- walk_in_place_fastest_right
+ walk_in_place_faster_right
step_end
PlayersHouse_1F_Movement_MomApproachDadFemale:
@@ -240,7 +240,7 @@ PlayersHouse_1F_Movement_MomApproachDadFemale:
walk_left
walk_left
walk_down
- walk_in_place_fastest_left
+ walk_in_place_faster_left
step_end
PlayersHouse_1F_Movement_MomApproachPlayerMale:
@@ -252,23 +252,23 @@ PlayersHouse_1F_Movement_MomApproachPlayerFemale:
step_end
PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale:
- walk_in_place_fastest_left
+ walk_in_place_faster_left
delay_16
delay_16
delay_16
delay_16
- walk_in_place_fastest_right
+ walk_in_place_faster_right
delay_16
delay_16
step_end
PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale:
- walk_in_place_fastest_right
+ walk_in_place_faster_right
delay_16
delay_16
delay_16
delay_16
- walk_in_place_fastest_left
+ walk_in_place_faster_left
delay_16
delay_16
step_end
@@ -287,24 +287,24 @@ PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale:
PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale:
walk_left
- walk_in_place_fastest_right
+ walk_in_place_faster_right
step_end
PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale:
walk_right
- walk_in_place_fastest_left
+ walk_in_place_faster_left
step_end
PlayersHouse_1F_Movement_MomReturnToSeatMale:
walk_left
walk_down
- walk_in_place_fastest_right
+ walk_in_place_faster_right
step_end
PlayersHouse_1F_Movement_MomReturnToSeatFemale:
walk_right
walk_down
- walk_in_place_fastest_left
+ walk_in_place_faster_left
step_end
PlayersHouse_1F_EventScript_Mom::
@@ -580,28 +580,28 @@ PlayersHouse_1F_EventScript_PlayerEnterRoomFemale::
PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale::
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale
waitmovement 0
- applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft
+ applymovement VAR_0x800A, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale::
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale
waitmovement 0
- applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight
+ applymovement VAR_0x800A, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
PlayersHouse_1F_EventScript_MomApproachPlayerMale::
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerMale
waitmovement 0
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PlayersHouse_1F_EventScript_MomApproachPlayerFemale::
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerFemale
waitmovement 0
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
@@ -618,14 +618,14 @@ PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale::
PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale::
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale
waitmovement 0
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale::
applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale
waitmovement 0
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
@@ -666,14 +666,14 @@ PlayersHouse_1F_Movement_PlayerEnterRoomMale:
walk_down
walk_down
walk_down
- walk_in_place_fastest_left
+ walk_in_place_faster_left
step_end
PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit:
delay_8
delay_16
delay_16
- walk_in_place_fastest_down
+ walk_in_place_faster_down
step_end
PlayersHouse_1F_Movement_PlayerEnterRoomFemale:
@@ -681,7 +681,7 @@ PlayersHouse_1F_Movement_PlayerEnterRoomFemale:
walk_down
walk_down
walk_down
- walk_in_place_fastest_right
+ walk_in_place_faster_right
step_end
PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale:
@@ -690,7 +690,7 @@ PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale:
walk_left
walk_left
walk_left
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale:
@@ -699,7 +699,7 @@ PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale:
walk_right
walk_right
walk_right
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
EventScript_RunningShoesManual::
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 20:33:39 +0000