summaryrefslogtreecommitdiff
path: root/data/maps/PetalburgCity/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/PetalburgCity/scripts.inc')
-rw-r--r--data/maps/PetalburgCity/scripts.inc54
1 files changed, 27 insertions, 27 deletions
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
index 49f1efadb..a77939c4d 100644
--- a/data/maps/PetalburgCity/scripts.inc
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -50,7 +50,7 @@ PetalburgCity_EventScript_WallyTutorial::
special StartWallyTutorialBattle
waitstate
msgbox Route102_Text_WallyIDidIt, MSGBOX_DEFAULT
- applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestLeft, MAP_PETALBURG_CITY
+ applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFasterLeft, MAP_PETALBURG_CITY
waitmovement LOCALID_WALLY, MAP_PETALBURG_CITY
msgbox Route102_Text_LetsGoBack, MSGBOX_DEFAULT
closemessage
@@ -186,7 +186,7 @@ PetalburgCity_Movement_WallyTutorialPlayer:
walk_right
walk_up
walk_up
- walk_in_place_fastest_right
+ walk_in_place_faster_right
step_end
PetalburgCity_Movement_WallyTutorialWally:
@@ -222,10 +222,10 @@ PetalburgCity_Movement_WallyTutorialWally:
walk_up
walk_right
delay_16
- walk_in_place_fastest_up
+ walk_in_place_faster_up
delay_16
delay_16
- walk_in_place_fastest_right
+ walk_in_place_faster_right
step_end
PetalburgCity_EventScript_GymSign::
@@ -296,8 +296,8 @@ PetalburgCity_EventScript_ShowGymToPlayer::
compare VAR_0x8008, 3
call_if_eq PetalburgCity_EventScript_LeadPlayerToGym3
msgbox PetalburgCity_Text_ThisIsPetalburgGym, MSGBOX_DEFAULT
- applymovement LOCALID_GYM_BOY, Common_Movement_WalkInPlaceFastestRight
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
+ applymovement LOCALID_GYM_BOY, Common_Movement_WalkInPlaceFasterRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox PetalburgCity_Text_ThisIsGymSign, MSGBOX_DEFAULT
closemessage
@@ -310,7 +310,7 @@ PetalburgCity_EventScript_ShowGymToPlayer::
PetalburgCity_EventScript_BoyApproachPlayer0::
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer0
waitmovement 0
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -322,14 +322,14 @@ PetalburgCity_EventScript_BoyApproachPlayer1::
PetalburgCity_EventScript_BoyApproachPlayer2::
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer2
waitmovement 0
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
PetalburgCity_EventScript_BoyApproachPlayer3::
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer3
waitmovement 0
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
@@ -368,7 +368,7 @@ PetalburgCity_Movement_BoyApproachPlayer0:
walk_right
walk_right
walk_right
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
PetalburgCity_Movement_BoyApproachPlayer1:
@@ -380,7 +380,7 @@ PetalburgCity_Movement_BoyApproachPlayer2:
walk_right
walk_right
walk_right
- walk_in_place_fastest_down
+ walk_in_place_faster_down
step_end
PetalburgCity_Movement_BoyApproachPlayer3:
@@ -388,7 +388,7 @@ PetalburgCity_Movement_BoyApproachPlayer3:
walk_right
walk_right
walk_right
- walk_in_place_fastest_down
+ walk_in_place_faster_down
step_end
PetalburgCity_Movement_BoyWalkToGym0:
@@ -401,7 +401,7 @@ PetalburgCity_Movement_BoyWalkToGym0:
walk_right
walk_up
walk_right
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
PetalburgCity_Movement_BoyWalkToGym1:
@@ -417,7 +417,7 @@ PetalburgCity_Movement_BoyWalkToGym1:
walk_up
walk_up
walk_right
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
PetalburgCity_Movement_BoyWalkToGym2:
@@ -430,7 +430,7 @@ PetalburgCity_Movement_BoyWalkToGym2:
walk_right
walk_up
walk_right
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
PetalburgCity_Movement_BoyWalkToGym3:
@@ -444,7 +444,7 @@ PetalburgCity_Movement_BoyWalkToGym3:
walk_up
walk_up
walk_right
- walk_in_place_fastest_up
+ walk_in_place_faster_up
step_end
PetalburgCity_Movement_BoyWalkAway:
@@ -556,17 +556,17 @@ PetalburgCity_EventScript_Scott::
waitmovement 0
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottApproachPlayer
waitmovement 0
- applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
setvar VAR_SCOTT_STATE, 1
msgbox PetalburgCity_Text_AreYouATrainer, MSGBOX_DEFAULT
closemessage
- applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestRight
+ applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
delay 30
msgbox PetalburgCity_Text_WellMaybeNot, MSGBOX_DEFAULT
closemessage
- applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestLeft
+ applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
delay 30
msgbox PetalburgCity_Text_ImLookingForTalentedTrainers, MSGBOX_DEFAULT
@@ -640,11 +640,11 @@ PetalburgCity_Movement_ScottExit0:
PetalburgCity_Movement_PlayerWatchScottExit0:
delay_16
- walk_in_place_fastest_down
+ walk_in_place_faster_down
delay_16
delay_16
delay_8
- walk_in_place_fastest_left
+ walk_in_place_faster_left
step_end
PetalburgCity_Movement_ScottExit1:
@@ -664,10 +664,10 @@ PetalburgCity_Movement_ScottExit1:
PetalburgCity_Movement_PlayerWatchScottExit1:
delay_16
- walk_in_place_fastest_down
+ walk_in_place_faster_down
delay_16
delay_8
- walk_in_place_fastest_left
+ walk_in_place_faster_left
step_end
PetalburgCity_Movement_ScottExit2:
@@ -687,10 +687,10 @@ PetalburgCity_Movement_ScottExit2:
PetalburgCity_Movement_PlayerWatchScottExit2:
delay_16
- walk_in_place_fastest_down
+ walk_in_place_faster_down
delay_16
delay_8
- walk_in_place_fastest_left
+ walk_in_place_faster_left
step_end
PetalburgCity_Movement_ScottExit3:
@@ -710,10 +710,10 @@ PetalburgCity_Movement_ScottExit3:
PetalburgCity_Movement_PlayerWatchScottExit3:
delay_16
- walk_in_place_fastest_up
+ walk_in_place_faster_up
delay_16
delay_8
- walk_in_place_fastest_left
+ walk_in_place_faster_left
step_end
PetalburgCity_EventScript_GymBoy::