summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/cable_club.inc12
-rw-r--r--data/scripts/contest_hall.inc64
-rw-r--r--data/scripts/day_care.inc2
-rw-r--r--data/scripts/gabby_and_ty.inc6
-rw-r--r--data/scripts/players_house.inc46
-rw-r--r--data/scripts/pokeblocks.inc2
-rw-r--r--data/scripts/secret_power_tm.inc4
-rw-r--r--data/scripts/trainer_battle.inc2
8 files changed, 69 insertions, 69 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index caf02fe7b..121f33754 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -567,30 +567,30 @@ OldaleTown_PokemonCenter_2F_EventScript_1A434B:: @ 81A434B
OldaleTown_PokemonCenter_2F_Movement_1A4354:: @ 81A4354
face_down
- end_movement
+ step_end
OldaleTown_PokemonCenter_2F_Movement_1A4356:: @ 81A4356
face_right
- end_movement
+ step_end
OldaleTown_PokemonCenter_2F_Movement_1A4358:: @ 81A4358
walk_down
walk_down
- end_movement
+ step_end
OldaleTown_PokemonCenter_2F_Movement_1A435B:: @ 81A435B
walk_right
walk_up
walk_up
- end_movement
+ step_end
OldaleTown_PokemonCenter_2F_Movement_1A435F:: @ 81A435F
walk_up
- end_movement
+ step_end
OldaleTown_PokemonCenter_2F_Movement_1A4361:: @ 81A4361
face_left
- end_movement
+ step_end
gUnknown_081A4363:: @ 81A4363
lockall
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 9053e3c59..a99c33492 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -1153,65 +1153,65 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
LinkContestRoom1_Movement_1A5D85:: @ 81A5D85
walk_down
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5D87:: @ 81A5D87
lock_facing_direction
walk_up
unlock_facing_direction
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5D8B:: @ 81A5D8B
walk_in_place_fastest_right
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5D8D:: @ 81A5D8D
emote_heart
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5D8F:: @ 81A5D8F
walk_in_place_fastest_down
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5D91:: @ 81A5D91
walk_left
walk_left
walk_in_place_fastest_down
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5D95:: @ 81A5D95
walk_right
walk_right
walk_in_place_fastest_down
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5D99:: @ 81A5D99
walk_up
walk_in_place_fastest_down
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5D9C:: @ 81A5D9C
delay_16
delay_16
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5D9F:: @ 81A5D9F
walk_in_place_fastest_right
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DA1:: @ 81A5DA1
walk_in_place_fastest_left
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DA3:: @ 81A5DA3
walk_in_place_fastest_down
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DA5:: @ 81A5DA5
walk_left
walk_left
walk_up
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DA9:: @ 81A5DA9
walk_left
@@ -1219,54 +1219,54 @@ LinkContestRoom1_Movement_1A5DA9:: @ 81A5DA9
walk_left
walk_left
walk_up
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DAF:: @ 81A5DAF
face_left
delay_16
face_original_direction
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DB3:: @ 81A5DB3
face_up
delay_16
face_original_direction
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DB7:: @ 81A5DB7
face_right
delay_16
face_original_direction
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DBB:: @ 81A5DBB
face_down
delay_16
face_original_direction
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DBF:: @ 81A5DBF
face_up
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DC1:: @ 81A5DC1
face_up
delay_16
walk_in_place_fastest_right
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DC5:: @ 81A5DC5
walk_in_place_fastest_left
delay_16
delay_16
walk_in_place_fastest_down
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DCA:: @ 81A5DCA
delay_16
delay_16
walk_in_place_fastest_down
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DCE:: @ 81A5DCE
walk_up
@@ -1274,7 +1274,7 @@ LinkContestRoom1_Movement_1A5DCE:: @ 81A5DCE
walk_right
walk_right
walk_in_place_fastest_up
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DD4:: @ 81A5DD4
walk_fast_left
@@ -1282,31 +1282,31 @@ LinkContestRoom1_Movement_1A5DD4:: @ 81A5DD4
walk_fast_left
walk_fast_down
walk_in_place_fastest_up
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DDA:: @ 81A5DDA
walk_up
walk_right
walk_in_place_fastest_up
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DDE:: @ 81A5DDE
walk_fast_left
walk_fast_down
walk_in_place_fastest_up
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DE2:: @ 81A5DE2
walk_up
walk_left
walk_in_place_fastest_up
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DE6:: @ 81A5DE6
walk_fast_right
walk_fast_down
walk_in_place_fastest_up
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DEA:: @ 81A5DEA
walk_up
@@ -1314,7 +1314,7 @@ LinkContestRoom1_Movement_1A5DEA:: @ 81A5DEA
walk_left
walk_left
walk_in_place_fastest_up
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DF0:: @ 81A5DF0
walk_fast_right
@@ -1322,14 +1322,14 @@ LinkContestRoom1_Movement_1A5DF0:: @ 81A5DF0
walk_fast_right
walk_fast_down
walk_in_place_fastest_up
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DF6:: @ 81A5DF6
walk_right
walk_right
walk_up
- end_movement
+ step_end
LinkContestRoom1_Movement_1A5DFA:: @ 81A5DFA
walk_up
- end_movement
+ step_end
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index c60ec488d..7c12343d4 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -252,7 +252,7 @@ Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543
face_down
set_visible
walk_slow_down
- end_movement
+ step_end
@ 81B2557
end
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index b8bc05b3b..867e41661 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -257,15 +257,15 @@ Route120_EventScript_1AE60F:: @ 81AE60F
Route111_Movement_1AE699:: @ 81AE699
walk_in_place_down
- end_movement
+ step_end
Route111_Movement_1AE69B:: @ 81AE69B
walk_in_place_up
- end_movement
+ step_end
Route111_Movement_1AE69D:: @ 81AE69D
walk_in_place_left
- end_movement
+ step_end
Route111_EventScript_1AE69F:: @ 81AE69F
msgbox Route111_Text_1AC60B, MSGBOX_YESNO
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index b64d86a70..d86ef0b03 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -33,7 +33,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA
LittlerootTown_BrendansHouse_1F_Movement_1B69B5:: @ 81B69B5
walk_up
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7
LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7
@@ -124,13 +124,13 @@ LittlerootTown_BrendansHouse_2F_Movement_1B6AA2:: @ 81B6AA2
delay_16
delay_8
walk_left
- end_movement
+ step_end
LittlerootTown_BrendansHouse_2F_Movement_1B6AA9:: @ 81B6AA9
walk_right
walk_up
delay_8
- end_movement
+ step_end
LittlerootTown_BrendansHouse_2F_Movement_1B6AAD:: @ 81B6AAD
delay_8
@@ -139,13 +139,13 @@ LittlerootTown_BrendansHouse_2F_Movement_1B6AAD:: @ 81B6AAD
delay_16
delay_8
walk_right
- end_movement
+ step_end
LittlerootTown_BrendansHouse_2F_Movement_1B6AB4:: @ 81B6AB4
walk_left
walk_up
delay_8
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8:: @ 81B6AB8
LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8
@@ -228,24 +228,24 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
LittlerootTown_BrendansHouse_1F_Movement_1B6BDB:: @ 81B6BDB
walk_left
walk_in_place_fastest_right
- end_movement
+ step_end
LittlerootTown_MaysHouse_1F_Movement_1B6BDE:: @ 81B6BDE
walk_right
walk_in_place_fastest_left
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_Movement_1B6BE1:: @ 81B6BE1
walk_left
walk_down
walk_in_place_fastest_right
- end_movement
+ step_end
LittlerootTown_MaysHouse_1F_Movement_1B6BE5:: @ 81B6BE5
walk_right
walk_down
walk_in_place_fastest_left
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
@@ -332,11 +332,11 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6CCC:: @ 81B6CCC
walk_left
walk_left
walk_left
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_Movement_1B6CD2:: @ 81B6CD2
walk_left
- end_movement
+ step_end
LittlerootTown_MaysHouse_1F_Movement_1B6CD4:: @ 81B6CD4
walk_down
@@ -344,15 +344,15 @@ LittlerootTown_MaysHouse_1F_Movement_1B6CD4:: @ 81B6CD4
walk_right
walk_right
walk_right
- end_movement
+ step_end
LittlerootTown_MaysHouse_1F_Movement_1B6CDA:: @ 81B6CDA
walk_right
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_Movement_1B6CDC:: @ 81B6CDC
walk_up
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
@@ -457,20 +457,20 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6E28:: @ 81B6E28
LittlerootTown_BrendansHouse_1F_Movement_1B6E33:: @ 81B6E33
walk_right
walk_right
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_Movement_1B6E36:: @ 81B6E36
walk_left
walk_left
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_Movement_1B6E39:: @ 81B6E39
walk_left
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_Movement_1B6E3B:: @ 81B6E3B
walk_right
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_Movement_1B6E3D:: @ 81B6E3D
walk_down
@@ -478,7 +478,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6E3D:: @ 81B6E3D
walk_right
walk_down
delay_8
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_Movement_1B6E43:: @ 81B6E43
walk_down
@@ -486,7 +486,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6E43:: @ 81B6E43
walk_left
walk_down
delay_8
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_Movement_1B6E49:: @ 81B6E49
delay_16
@@ -494,14 +494,14 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6E49:: @ 81B6E49
walk_down
walk_down
walk_in_place_fastest_left
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_Movement_1B6E4F:: @ 81B6E4F
delay_16
delay_16
delay_16
walk_in_place_fastest_down
- end_movement
+ step_end
LittlerootTown_BrendansHouse_1F_Movement_1B6E54:: @ 81B6E54
delay_16
@@ -509,4 +509,4 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6E54:: @ 81B6E54
walk_down
walk_down
walk_in_place_fastest_right
- end_movement
+ step_end
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 1b1f3a333..0622da0cc 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -183,7 +183,7 @@ LilycoveCity_ContestLobby_Movement_1B7821:: @ 81B7821
SlateportCity_ContestLobby_Movement_1B7821:: @ 81B7821
VerdanturfTown_ContestLobby_Movement_1B7821:: @ 81B7821
walk_in_place_fastest_right
- end_movement
+ step_end
FallarborTown_ContestLobby_EventScript_1B7823:: @ 81B7823
goto FallarborTown_ContestLobby_EventScript_1B783B
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index b13eeca6d..5042bd211 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -53,7 +53,7 @@ Route111_Movement_1A38E3:: @ 81A38E3
walk_left
walk_down
walk_down
- end_movement
+ step_end
Route111_Movement_1A38EF:: @ 81A38EF
walk_left
@@ -67,4 +67,4 @@ Route111_Movement_1A38EF:: @ 81A38EF
walk_left
walk_down
walk_down
- end_movement
+ step_end
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc
index 95dc54c88..4615435d1 100644
--- a/data/scripts/trainer_battle.inc
+++ b/data/scripts/trainer_battle.inc
@@ -103,7 +103,7 @@ EventScript_RevealTrainer:
Movement_RevealTrainer::
reveal_trainer
- end_movement
+ step_end
EventScript_DoTrainerBattle:
special ShowTrainerIntroSpeech
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 12:36:51 +0000