summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/cable_club.inc2
-rw-r--r--data/scripts/cave_of_origin.inc2
-rw-r--r--data/scripts/elite_four.inc4
-rw-r--r--data/scripts/gabby_and_ty.inc4
-rw-r--r--data/scripts/movement.inc33
-rw-r--r--data/scripts/pkmn_center_nurse.inc4
-rw-r--r--data/scripts/players_house.inc34
7 files changed, 41 insertions, 42 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 3fcb25807..693860be4 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -312,7 +312,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5
OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0
lockall
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT
closemessage
diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc
index f534afaff..da4a97761 100644
--- a/data/scripts/cave_of_origin.inc
+++ b/data/scripts/cave_of_origin.inc
@@ -45,4 +45,4 @@ CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1:: @ 82722C1
setvar VAR_TEMP_3, 1
setvar VAR_TEMP_4, 1
setvar VAR_TEMP_5, 1
- return \ No newline at end of file
+ return
diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc
index c6b8d5578..c60e3889e 100644
--- a/data/scripts/elite_four.inc
+++ b/data/scripts/elite_four.inc
@@ -3,7 +3,7 @@ EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8
EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8
EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8
PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
- applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725C6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_DOOR
setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
@@ -25,7 +25,7 @@ EverGrandeCity_DrakesRoom_EventScript_272475:: @ 8272475
EverGrandeCity_GlaciasRoom_EventScript_272475:: @ 8272475
EverGrandeCity_PhoebesRoom_EventScript_272475:: @ 8272475
EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475
- applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725BA
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6
waitmovement 0
playse SE_TRACK_DOOR
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 31000539c..af9688f55 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -232,13 +232,13 @@ Route111_EventScript_28CF94:: @ 828CF94
Route111_EventScript_28CF9F:: @ 828CF9F
applymovement VAR_0x8004, Route111_Movement_28D04F
- applymovement VAR_0x8005, Common_Movement_WalkInPlaceUp
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
Route111_EventScript_28CFB1:: @ 828CFB1
applymovement VAR_0x8004, Route111_Movement_28D051
- applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc
index b7abceae4..3dd1a8144 100644
--- a/data/scripts/movement.inc
+++ b/data/scripts/movement.inc
@@ -1,4 +1,4 @@
-SlateportCity_Movement_272596: @ 8272596
+Common_Movement_QuestionMark: @ 8272596
emote_question_mark
step_end
@@ -24,27 +24,27 @@ Common_Movement_FaceOriginalDirection: @ 82725A2
face_original_direction
step_end
-Common_Movement_WalkInPlaceLeft: @ 82725A4
+Common_Movement_WalkInPlaceFastestLeft: @ 82725A4
walk_in_place_fastest_left
step_end
-Common_Movement_WalkInPlaceUp: @ 82725A6
+Common_Movement_WalkInPlaceFastestUp: @ 82725A6
walk_in_place_fastest_up
step_end
-Common_Movement_WalkInPlaceRight: @ 82725A8
+Common_Movement_WalkInPlaceFastestRight: @ 82725A8
walk_in_place_fastest_right
step_end
-Common_Movement_WalkInPlaceDown: @ 82725AA
+Common_Movement_WalkInPlaceFastestDown: @ 82725AA
walk_in_place_fastest_down
step_end
-RustboroCity_Movement_2725AC: @ 82725AC
+Common_Movement_FaceRight: @ 82725AC
face_right
step_end
-RustboroCity_Movement_2725AE: @ 82725AE
+Common_Movement_FaceLeft: @ 82725AE
face_left
step_end
@@ -56,21 +56,19 @@ Common_Movement_FaceUp: @ 82725B2
face_up
step_end
-BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4
-MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4
+Common_Movement_WalkInPlaceDown: @ 82725B4
walk_in_place_down
step_end
-BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6
-BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6
+Common_Movement_WalkInPlaceLeft: @ 82725B6
walk_in_place_left
step_end
-Route121_Movement_2725B8: @ 82725B8
+Common_Movement_WalkInPlaceRight: @ 82725B8
walk_in_place_right
step_end
-EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA
+Common_Movement_WalkUp6: @ 82725BA
walk_up
walk_up
walk_up
@@ -79,23 +77,24 @@ EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA
walk_up
step_end
-EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1
+Common_Movement_WalkUp4: @ 82725C1
walk_up
walk_up
walk_up
walk_up
step_end
-EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6
+Common_Movement_Delay32: @ 82725C6
delay_16
delay_16
step_end
-Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9
+Common_Movement_WalkUp: @ 82725C9
walk_up
step_end
-Movement_2725CB:: @ 82725CB
+@ Unused
+Common_Movement_WalkUp2:: @ 82725CB
walk_up
walk_up
step_end
diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc
index bfeba79e3..0d4be2c0d 100644
--- a/data/scripts/pkmn_center_nurse.inc
+++ b/data/scripts/pkmn_center_nurse.inc
@@ -38,11 +38,11 @@ EventScript_PkmnCenterNurse_IllTakeYourPkmn2:: @ 827198D
return
EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 8271993
- applymovement VAR_0x800B, Common_Movement_WalkInPlaceLeft
+ applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
dofieldeffect FLDEFF_POKECENTER_HEAL
waitfieldeffect FLDEFF_POKECENTER_HEAL
- applymovement VAR_0x800B, Common_Movement_WalkInPlaceDown
+ applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
special HealPlayerParty
return
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 741b7f41e..f88d3af6c 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -16,18 +16,18 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704
closemessage
setvar VAR_LITTLEROOT_INTRO_STATE, 4
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763
- applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp
+ applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
releaseall
end
LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
@@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765
LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT
closemessage
- applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp
+ applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0
waitmovement 0
releaseall
@@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF
addobject VAR_0x8008
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
closemessage
@@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F
addobject VAR_0x8008
applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
closemessage
@@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866
end
LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
- applymovement VAR_0x8005, Common_Movement_WalkInPlaceRight
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_29294B
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0
@@ -167,7 +167,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6
waitmovement 0
call LittlerootTown_BrendansHouse_1F_EventScript_29296C
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
@@ -179,7 +179,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
end
LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
- applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft
+ applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
call LittlerootTown_MaysHouse_1F_EventScript_29294B
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8
@@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE
waitmovement 0
call LittlerootTown_MaysHouse_1F_EventScript_29296C
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
@@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B
LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C
LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT
fadedefaultbgm
@@ -586,28 +586,28 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13
LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7
waitmovement 0
- applymovement VAR_0x800A, Common_Movement_WalkInPlaceLeft
+ applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE
waitmovement 0
- applymovement VAR_0x800A, Common_Movement_WalkInPlaceRight
+ applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
@@ -624,14 +624,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D
LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D
applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 22:58:30 +0000