diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-29 17:42:33 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-05-29 17:53:49 -0500 |
| commit | 9680b95bdde1226e12485a84e47c6a7c32932048 (patch) | |
| tree | 61ee8faf9f1fc7569efa086f2108b7f886e49127 | |
| parent | 5df6fa5c08a19fb89308f6131dceef721cc5a3d0 (diff) | |
Flesh out applymovement command names
92 files changed, 4636 insertions, 4636 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 226024ac1..f8733305e 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1044,8 +1044,8 @@ EventScript_19F8E5: return Movement_19F8F0:: - step_59 - step_end + reveal_trainer + end_movement EventScript_19F8F2: special ScrSpecial_ShowTrainerIntroSpeech @@ -1489,9 +1489,9 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA return OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 - step_4f - step_12 - step_end + nurse_joy_bow + delay_4 + end_movement Std_ObtainItem: @ 819FDF7 giveitem VAR_SPECIAL_0, VAR_SPECIAL_1 @@ -2234,14 +2234,14 @@ SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E return SlateportCity_Harbor_Movement_1A041C:: @ 81A041C - slow_step_right - slow_step_right - slow_step_right - step_right - step_right - step_right - step_right - step_end + walk_slow_right + walk_slow_right + walk_slow_right + walk_right + walk_right + walk_right + walk_right + end_movement PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN @@ -2276,8 +2276,8 @@ EventScript_1A0457: @ unreferenced? return Movement_1A047A: - step_up - step_end + walk_up + end_movement BattleTower_Outside_EventScript_1A047C:: @ 81A047C SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C @@ -2502,28 +2502,28 @@ Route119_EventScript_1A065E:: @ 81A065E FortreeCity_Movement_1A0662:: @ 81A0662 Route119_Movement_1A0662:: @ 81A0662 Route120_Movement_1A0662:: @ 81A0662 - step_55 - step_12 - step_54 - step_12 - step_55 - step_12 - step_54 - step_12 - step_55 - step_13 - step_54 - step_13 - step_55 - step_13 - step_54 - step_13 - step_55 - step_14 - step_54 - step_14 - step_55 - step_end + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_16 + set_invisible + delay_16 + set_visible + end_movement LittlerootTown_ProfessorBirchsLab_EventScript_1A0678:: @ 81A0678 MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678 @@ -2621,8 +2621,8 @@ EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA return SlateportCity_Movement_1A0831:: @ 81A0831 - step_57 - step_end + emote_question_mark + end_movement AquaHideout_B2F_Movement_1A0833:: @ 81A0833 EverGrandeCity_ChampionsRoom_Movement_1A0833:: @ 81A0833 @@ -2651,8 +2651,8 @@ SlateportCity_Movement_1A0833:: @ 81A0833 SlateportCity_OceanicMuseum_1F_Movement_1A0833:: @ 81A0833 SlateportCity_PokemonFanClub_Movement_1A0833:: @ 81A0833 SootopolisCity_Movement_1A0833:: @ 81A0833 - step_56 - step_end + emote_exclamation_mark + end_movement EverGrandeCity_ChampionsRoom_Movement_1A0835:: @ 81A0835 LavaridgeTown_Movement_1A0835:: @ 81A0835 @@ -2678,10 +2678,10 @@ SlateportCity_Movement_1A0835:: @ 81A0835 SlateportCity_OceanicMuseum_1F_Movement_1A0835:: @ 81A0835 SlateportCity_PokemonFanClub_Movement_1A0835:: @ 81A0835 SootopolisCity_Movement_1A0835:: @ 81A0835 - step_14 - step_14 - step_14 - step_end + delay_16 + delay_16 + delay_16 + end_movement AquaHideout_B2F_Movement_1A0839:: @ 81A0839 EverGrandeCity_PokemonLeague_Movement_1A0839:: @ 81A0839 @@ -2713,12 +2713,12 @@ SeafloorCavern_Room9_Movement_1A0839:: @ 81A0839 SlateportCity_ContestLobby_Movement_1A0839:: @ 81A0839 SlateportCity_Movement_1A0839:: @ 81A0839 SlateportCity_SternsShipyard_1F_Movement_1A0839:: @ 81A0839 - step_3e - step_end + face_player + end_movement @ 81A083B - step_3f - step_end + face_away_player + end_movement EverGrandeCity_PokemonLeague_Movement_1A083D:: @ 81A083D LilycoveCity_ContestHall_Movement_1A083D:: @ 81A083D @@ -2749,8 +2749,8 @@ SlateportCity_Movement_1A083D:: @ 81A083D SlateportCity_OceanicMuseum_2F_Movement_1A083D:: @ 81A083D SlateportCity_SternsShipyard_1F_Movement_1A083D:: @ 81A083D VerdanturfTown_Movement_1A083D:: @ 81A083D - step_4e - step_end + face_original_direction + end_movement Movement_1A083F:: @ 81A083F DewfordTown_Hall_Movement_1A083F:: @ 81A083F @@ -2783,8 +2783,8 @@ SlateportCity_OceanicMuseum_1F_Movement_1A083F:: @ 81A083F SlateportCity_OceanicMuseum_2F_Movement_1A083F:: @ 81A083F SootopolisCity_Movement_1A083F:: @ 81A083F VictoryRoad_1F_Movement_1A083F:: @ 81A083F - step_27 - step_end + walk_in_place_fastest_left + end_movement AquaHideout_B2F_Movement_1A0841:: @ 81A0841 CaveOfOrigin_B4F_Movement_1A0841:: @ 81A0841 @@ -2814,8 +2814,8 @@ SeafloorCavern_Room9_Movement_1A0841:: @ 81A0841 SlateportCity_Harbor_Movement_1A0841:: @ 81A0841 SlateportCity_Movement_1A0841:: @ 81A0841 SlateportCity_OceanicMuseum_2F_Movement_1A0841:: @ 81A0841 - step_26 - step_end + walk_in_place_fastest_up + end_movement AquaHideout_B2F_Movement_1A0843:: @ 81A0843 DewfordTown_Hall_Movement_1A0843:: @ 81A0843 @@ -2846,8 +2846,8 @@ SlateportCity_Movement_1A0843:: @ 81A0843 SlateportCity_OceanicMuseum_1F_Movement_1A0843:: @ 81A0843 SlateportCity_OceanicMuseum_2F_Movement_1A0843:: @ 81A0843 SootopolisCity_Movement_1A0843:: @ 81A0843 - step_28 - step_end + walk_in_place_fastest_right + end_movement BattleTower_Outside_Movement_1A0845:: @ 81A0845 DewfordTown_Hall_Movement_1A0845:: @ 81A0845 @@ -2878,38 +2878,38 @@ SlateportCity_Movement_1A0845:: @ 81A0845 SlateportCity_OceanicMuseum_2F_Movement_1A0845:: @ 81A0845 SootopolisCity_Movement_1A0845:: @ 81A0845 SouthernIsland_Exterior_Movement_1A0845:: @ 81A0845 - step_25 - step_end + walk_in_place_fastest_down + end_movement EverGrandeCity_SidneysRoom_Movement_1A0847:: @ 81A0847 - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement EverGrandeCity_ChampionsRoom_Movement_1A084E:: @ 81A084E - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + end_movement EverGrandeCity_SidneysRoom_Movement_1A0853:: @ 81A0853 - step_14 - step_14 - step_end + delay_16 + delay_16 + end_movement Route110_TrickHouseEntrance_Movement_1A0856:: @ 81A0856 - step_up - step_end + walk_up + end_movement @ 81A0858 - step_up - step_up - step_end + walk_up + walk_up + end_movement PictureBookShelfScript:: @ 81A085B msgbox PictureBookShelfText, 3 @@ -3761,9 +3761,9 @@ SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08 end SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 - step_up - step_up - step_end + walk_up + walk_up + end_movement gUnknown_081A2E14:: @ 81A2E14 lockall @@ -4907,8 +4907,8 @@ gUnknown_081C6BDE:: @ 81C6BDE end GraniteCave_B1F_Movement_1C6BF7:: @ 81C6BF7 - step_54 - step_end + set_invisible + end_movement @ 81C6BF9 msgbox Text_1C6C2B, 2 diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc index 63240a9fb..ef06df21f 100644 --- a/data-de/field_move_scripts.inc +++ b/data-de/field_move_scripts.inc @@ -32,8 +32,8 @@ DoTreeCutMovement: @ 81B0E21 end TreeCutMovement: @ 81B0E30 - step_5b - step_end + cut_tree + end_movement CannotUseCut: @ 81B0E32 msgbox CannotUseCutText, 3 @@ -103,8 +103,8 @@ DoRockSmashMovement_Done: @ 81B0F3A end RockSmashMovement: @ 81B0F3C - step_5a - step_end + rock_smash_break + end_movement CannotUseRockSmash: @ 81B0F3E msgbox CannotUseRockSmashText, 3 diff --git a/data/event_scripts.s b/data/event_scripts.s index 091a81f49..68e287939 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1038,8 +1038,8 @@ EventScript_19F8E5: return Movement_19F8F0:: - step_59 - step_end + reveal_trainer + end_movement EventScript_19F8F2: special ScrSpecial_ShowTrainerIntroSpeech @@ -1483,9 +1483,9 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA return OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 - step_4f - step_12 - step_end + nurse_joy_bow + delay_4 + end_movement Std_ObtainItem: @ 819FDF7 giveitem VAR_SPECIAL_0, VAR_SPECIAL_1 @@ -2228,14 +2228,14 @@ SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E return SlateportCity_Harbor_Movement_1A041C:: @ 81A041C - slow_step_right - slow_step_right - slow_step_right - step_right - step_right - step_right - step_right - step_end + walk_slow_right + walk_slow_right + walk_slow_right + walk_right + walk_right + walk_right + walk_right + end_movement PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN @@ -2270,8 +2270,8 @@ EventScript_1A0457: @ unreferenced? return Movement_1A047A: - step_up - step_end + walk_up + end_movement BattleTower_Outside_EventScript_1A047C:: @ 81A047C SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C @@ -2496,28 +2496,28 @@ Route119_EventScript_1A065E:: @ 81A065E FortreeCity_Movement_1A0662:: @ 81A0662 Route119_Movement_1A0662:: @ 81A0662 Route120_Movement_1A0662:: @ 81A0662 - step_55 - step_12 - step_54 - step_12 - step_55 - step_12 - step_54 - step_12 - step_55 - step_13 - step_54 - step_13 - step_55 - step_13 - step_54 - step_13 - step_55 - step_14 - step_54 - step_14 - step_55 - step_end + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_16 + set_invisible + delay_16 + set_visible + end_movement LittlerootTown_ProfessorBirchsLab_EventScript_1A0678:: @ 81A0678 MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678 @@ -2615,8 +2615,8 @@ EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA return SlateportCity_Movement_1A0831:: @ 81A0831 - step_57 - step_end + emote_question_mark + end_movement AquaHideout_B2F_Movement_1A0833:: @ 81A0833 EverGrandeCity_ChampionsRoom_Movement_1A0833:: @ 81A0833 @@ -2645,8 +2645,8 @@ SlateportCity_Movement_1A0833:: @ 81A0833 SlateportCity_OceanicMuseum_1F_Movement_1A0833:: @ 81A0833 SlateportCity_PokemonFanClub_Movement_1A0833:: @ 81A0833 SootopolisCity_Movement_1A0833:: @ 81A0833 - step_56 - step_end + emote_exclamation_mark + end_movement EverGrandeCity_ChampionsRoom_Movement_1A0835:: @ 81A0835 LavaridgeTown_Movement_1A0835:: @ 81A0835 @@ -2672,10 +2672,10 @@ SlateportCity_Movement_1A0835:: @ 81A0835 SlateportCity_OceanicMuseum_1F_Movement_1A0835:: @ 81A0835 SlateportCity_PokemonFanClub_Movement_1A0835:: @ 81A0835 SootopolisCity_Movement_1A0835:: @ 81A0835 - step_14 - step_14 - step_14 - step_end + delay_16 + delay_16 + delay_16 + end_movement AquaHideout_B2F_Movement_1A0839:: @ 81A0839 EverGrandeCity_PokemonLeague_Movement_1A0839:: @ 81A0839 @@ -2707,12 +2707,12 @@ SeafloorCavern_Room9_Movement_1A0839:: @ 81A0839 SlateportCity_ContestLobby_Movement_1A0839:: @ 81A0839 SlateportCity_Movement_1A0839:: @ 81A0839 SlateportCity_SternsShipyard_1F_Movement_1A0839:: @ 81A0839 - step_3e - step_end + face_player + end_movement @ 81A083B - step_3f - step_end + face_away_player + end_movement EverGrandeCity_PokemonLeague_Movement_1A083D:: @ 81A083D LilycoveCity_ContestHall_Movement_1A083D:: @ 81A083D @@ -2743,8 +2743,8 @@ SlateportCity_Movement_1A083D:: @ 81A083D SlateportCity_OceanicMuseum_2F_Movement_1A083D:: @ 81A083D SlateportCity_SternsShipyard_1F_Movement_1A083D:: @ 81A083D VerdanturfTown_Movement_1A083D:: @ 81A083D - step_4e - step_end + face_original_direction + end_movement Movement_1A083F:: @ 81A083F DewfordTown_Hall_Movement_1A083F:: @ 81A083F @@ -2777,8 +2777,8 @@ SlateportCity_OceanicMuseum_1F_Movement_1A083F:: @ 81A083F SlateportCity_OceanicMuseum_2F_Movement_1A083F:: @ 81A083F SootopolisCity_Movement_1A083F:: @ 81A083F VictoryRoad_1F_Movement_1A083F:: @ 81A083F - step_27 - step_end + walk_in_place_fastest_left + end_movement AquaHideout_B2F_Movement_1A0841:: @ 81A0841 CaveOfOrigin_B4F_Movement_1A0841:: @ 81A0841 @@ -2808,8 +2808,8 @@ SeafloorCavern_Room9_Movement_1A0841:: @ 81A0841 SlateportCity_Harbor_Movement_1A0841:: @ 81A0841 SlateportCity_Movement_1A0841:: @ 81A0841 SlateportCity_OceanicMuseum_2F_Movement_1A0841:: @ 81A0841 - step_26 - step_end + walk_in_place_fastest_up + end_movement AquaHideout_B2F_Movement_1A0843:: @ 81A0843 DewfordTown_Hall_Movement_1A0843:: @ 81A0843 @@ -2840,8 +2840,8 @@ SlateportCity_Movement_1A0843:: @ 81A0843 SlateportCity_OceanicMuseum_1F_Movement_1A0843:: @ 81A0843 SlateportCity_OceanicMuseum_2F_Movement_1A0843:: @ 81A0843 SootopolisCity_Movement_1A0843:: @ 81A0843 - step_28 - step_end + walk_in_place_fastest_right + end_movement BattleTower_Outside_Movement_1A0845:: @ 81A0845 DewfordTown_Hall_Movement_1A0845:: @ 81A0845 @@ -2872,38 +2872,38 @@ SlateportCity_Movement_1A0845:: @ 81A0845 SlateportCity_OceanicMuseum_2F_Movement_1A0845:: @ 81A0845 SootopolisCity_Movement_1A0845:: @ 81A0845 SouthernIsland_Exterior_Movement_1A0845:: @ 81A0845 - step_25 - step_end + walk_in_place_fastest_down + end_movement EverGrandeCity_SidneysRoom_Movement_1A0847:: @ 81A0847 - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement EverGrandeCity_ChampionsRoom_Movement_1A084E:: @ 81A084E - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + end_movement EverGrandeCity_SidneysRoom_Movement_1A0853:: @ 81A0853 - step_14 - step_14 - step_end + delay_16 + delay_16 + end_movement Route110_TrickHouseEntrance_Movement_1A0856:: @ 81A0856 - step_up - step_end + walk_up + end_movement @ 81A0858 - step_up - step_up - step_end + walk_up + walk_up + end_movement PictureBookShelfScript:: @ 81A085B msgbox PictureBookShelfText, 3 @@ -3740,9 +3740,9 @@ SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08 end SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 - step_up - step_up - step_end + walk_up + walk_up + end_movement gUnknown_081A2E14:: @ 81A2E14 lockall @@ -4875,8 +4875,8 @@ gUnknown_081C6BDE:: @ 81C6BDE end GraniteCave_B1F_Movement_1C6BF7:: @ 81C6BF7 - step_54 - step_end + set_invisible + end_movement @ 81C6BF9 msgbox Text_1C6C2B, 2 diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 5ce6c7fb9..5b474fdcf 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -32,8 +32,8 @@ DoTreeCutMovement: @ 81B0E21 end TreeCutMovement: @ 81B0E30 - step_5b - step_end + cut_tree + end_movement CannotUseCut: @ 81B0E32 msgbox CannotUseCutText, 3 @@ -100,8 +100,8 @@ DoRockSmashMovement_Done: @ 81B0F3A end RockSmashMovement: @ 81B0F3C - step_5a - step_end + rock_smash_break + end_movement CannotUseRockSmash: @ 81B0F3E msgbox CannotUseRockSmashText, 3 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 0e2012de9..a6fa56078 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -566,31 +566,31 @@ OldaleTown_PokemonCenter_2F_EventScript_1A434B:: @ 81A434B end OldaleTown_PokemonCenter_2F_Movement_1A4354:: @ 81A4354 - step_00 - step_end + face_down + end_movement OldaleTown_PokemonCenter_2F_Movement_1A4356:: @ 81A4356 - step_03 - step_end + face_right + end_movement OldaleTown_PokemonCenter_2F_Movement_1A4358:: @ 81A4358 - step_down - step_down - step_end + walk_down + walk_down + end_movement OldaleTown_PokemonCenter_2F_Movement_1A435B:: @ 81A435B - step_right - step_up - step_up - step_end + walk_right + walk_up + walk_up + end_movement OldaleTown_PokemonCenter_2F_Movement_1A435F:: @ 81A435F - step_up - step_end + walk_up + end_movement OldaleTown_PokemonCenter_2F_Movement_1A4361:: @ 81A4361 - step_02 - step_end + face_left + end_movement gUnknown_081A4363:: @ 81A4363 lockall diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 7f0f6b710..ec603257d 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1152,184 +1152,184 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B return LinkContestRoom1_Movement_1A5D85:: @ 81A5D85 - step_down - step_end + walk_down + end_movement LinkContestRoom1_Movement_1A5D87:: @ 81A5D87 - step_40 - step_up - step_41 - step_end + lock_facing_direction + walk_up + unlock_facing_direction + end_movement LinkContestRoom1_Movement_1A5D8B:: @ 81A5D8B - step_28 - step_end + walk_in_place_fastest_right + end_movement LinkContestRoom1_Movement_1A5D8D:: @ 81A5D8D - step_58 - step_end + emote_heart + end_movement LinkContestRoom1_Movement_1A5D8F:: @ 81A5D8F - step_25 - step_end + walk_in_place_fastest_down + end_movement LinkContestRoom1_Movement_1A5D91:: @ 81A5D91 - step_left - step_left - step_25 - step_end + walk_left + walk_left + walk_in_place_fastest_down + end_movement LinkContestRoom1_Movement_1A5D95:: @ 81A5D95 - step_right - step_right - step_25 - step_end + walk_right + walk_right + walk_in_place_fastest_down + end_movement LinkContestRoom1_Movement_1A5D99:: @ 81A5D99 - step_up - step_25 - step_end + walk_up + walk_in_place_fastest_down + end_movement LinkContestRoom1_Movement_1A5D9C:: @ 81A5D9C - step_14 - step_14 - step_end + delay_16 + delay_16 + end_movement LinkContestRoom1_Movement_1A5D9F:: @ 81A5D9F - step_28 - step_end + walk_in_place_fastest_right + end_movement LinkContestRoom1_Movement_1A5DA1:: @ 81A5DA1 - step_27 - step_end + walk_in_place_fastest_left + end_movement LinkContestRoom1_Movement_1A5DA3:: @ 81A5DA3 - step_25 - step_end + walk_in_place_fastest_down + end_movement LinkContestRoom1_Movement_1A5DA5:: @ 81A5DA5 - step_left - step_left - step_up - step_end + walk_left + walk_left + walk_up + end_movement LinkContestRoom1_Movement_1A5DA9:: @ 81A5DA9 - step_left - step_left - step_left - step_left - step_up - step_end + walk_left + walk_left + walk_left + walk_left + walk_up + end_movement LinkContestRoom1_Movement_1A5DAF:: @ 81A5DAF - step_02 - step_14 - step_4e - step_end + face_left + delay_16 + face_original_direction + end_movement LinkContestRoom1_Movement_1A5DB3:: @ 81A5DB3 - step_01 - step_14 - step_4e - step_end + face_up + delay_16 + face_original_direction + end_movement LinkContestRoom1_Movement_1A5DB7:: @ 81A5DB7 - step_03 - step_14 - step_4e - step_end + face_right + delay_16 + face_original_direction + end_movement LinkContestRoom1_Movement_1A5DBB:: @ 81A5DBB - step_00 - step_14 - step_4e - step_end + face_down + delay_16 + face_original_direction + end_movement LinkContestRoom1_Movement_1A5DBF:: @ 81A5DBF - step_01 - step_end + face_up + end_movement LinkContestRoom1_Movement_1A5DC1:: @ 81A5DC1 - step_01 - step_14 - step_28 - step_end + face_up + delay_16 + walk_in_place_fastest_right + end_movement LinkContestRoom1_Movement_1A5DC5:: @ 81A5DC5 - step_27 - step_14 - step_14 - step_25 - step_end + walk_in_place_fastest_left + delay_16 + delay_16 + walk_in_place_fastest_down + end_movement LinkContestRoom1_Movement_1A5DCA:: @ 81A5DCA - step_14 - step_14 - step_25 - step_end + delay_16 + delay_16 + walk_in_place_fastest_down + end_movement LinkContestRoom1_Movement_1A5DCE:: @ 81A5DCE - step_up - step_right - step_right - step_right - step_26 - step_end + walk_up + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DD4:: @ 81A5DD4 - step_17 - step_17 - step_17 - step_15 - step_26 - step_end + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_down + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DDA:: @ 81A5DDA - step_up - step_right - step_26 - step_end + walk_up + walk_right + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DDE:: @ 81A5DDE - step_17 - step_15 - step_26 - step_end + walk_fast_left + walk_fast_down + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DE2:: @ 81A5DE2 - step_up - step_left - step_26 - step_end + walk_up + walk_left + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DE6:: @ 81A5DE6 - step_18 - step_15 - step_26 - step_end + walk_fast_right + walk_fast_down + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DEA:: @ 81A5DEA - step_up - step_left - step_left - step_left - step_26 - step_end + walk_up + walk_left + walk_left + walk_left + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DF0:: @ 81A5DF0 - step_18 - step_18 - step_18 - step_15 - step_26 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DF6:: @ 81A5DF6 - step_right - step_right - step_up - step_end + walk_right + walk_right + walk_up + end_movement LinkContestRoom1_Movement_1A5DFA:: @ 81A5DFA - step_up - step_end + walk_up + end_movement diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index fc5df6abe..8d226887e 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -233,26 +233,26 @@ Route117_PokemonDayCare_EventScript_1B2539:: @ 81B2539 end Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543 - step_14 - step_14 - step_02 - step_14 - step_14 - step_03 - step_14 - step_14 - step_01 - slow_step_up - step_54 - step_14 - step_14 - step_14 - step_14 - step_14 - step_00 - step_55 - slow_step_down - step_end + delay_16 + delay_16 + face_left + delay_16 + delay_16 + face_right + delay_16 + delay_16 + face_up + walk_slow_up + set_invisible + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + face_down + set_visible + walk_slow_down + end_movement @ 81B2557 end diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 4615752ce..957d56609 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -256,16 +256,16 @@ Route120_EventScript_1AE60F:: @ 81AE60F end Route111_Movement_1AE699:: @ 81AE699 - step_1d - step_end + walk_in_place_down + end_movement Route111_Movement_1AE69B:: @ 81AE69B - step_1e - step_end + walk_in_place_up + end_movement Route111_Movement_1AE69D:: @ 81AE69D - step_1f - step_end + walk_in_place_left + end_movement Route111_EventScript_1AE69F:: @ 81AE69F msgbox Route111_Text_1AC60B, MSGBOX_YESNO diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index d7b47cdfd..37830a00e 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -70,18 +70,18 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD end AquaHideout_B2F_Movement_15D958:: @ 815D958 - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + end_movement AquaHideout_B2F_Movement_15D95D:: @ 815D95D - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + end_movement AquaHideout_B2F_EventScript_15D962:: @ 815D962 MagmaHideout_B2F_EventScript_15D962:: @ 815D962 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index ce7d7c0e9..f540777ee 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -120,46 +120,46 @@ BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1 end BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7 - step_up - step_up - step_up - step_03 - step_end + walk_up + walk_up + walk_up + face_right + end_movement BattleTower_BattleRoom_Movement_160ABC:: @ 8160ABC - step_00 - step_end + face_down + end_movement BattleTower_BattleRoom_Movement_160ABE:: @ 8160ABE - step_03 - step_end + face_right + end_movement BattleTower_BattleRoom_Movement_160AC0:: @ 8160AC0 - step_down - step_down - step_down - step_down - step_02 - step_end + walk_down + walk_down + walk_down + walk_down + face_left + end_movement BattleTower_BattleRoom_Movement_160AC6:: @ 8160AC6 - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + end_movement BattleTower_BattleRoom_Movement_160ACB:: @ 8160ACB - step_right - step_right - step_right - step_up - step_end + walk_right + walk_right + walk_right + walk_up + end_movement BattleTower_BattleRoom_Movement_160AD0:: @ 8160AD0 - step_down - step_left - step_left - step_left - step_03 - step_end + walk_down + walk_left + walk_left + walk_left + face_right + end_movement diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 965da8d9c..d9d73b832 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -40,19 +40,19 @@ BattleTower_Corridor_EventScript_1608C2:: @ 81608C2 end BattleTower_Corridor_Movement_1608D1:: @ 81608D1 - step_right + walk_right BattleTower_Corridor_Movement_1608D2:: @ 81608D2 - step_right - step_right + walk_right + walk_right BattleTower_Corridor_Movement_1608D4:: @ 81608D4 - step_right + walk_right BattleTower_Corridor_Movement_1608D5:: @ 81608D5 - step_right - step_right - step_right - step_up - step_54 - step_end + walk_right + walk_right + walk_right + walk_up + set_invisible + end_movement diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index 6749c5623..f3373ee6e 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -33,25 +33,25 @@ BattleTower_Elevator_EventScript_16082B:: @ 816082B end BattleTower_Elevator_Movement_160835:: @ 8160835 - step_up - step_right - step_00 - step_end + walk_up + walk_right + face_down + end_movement BattleTower_Elevator_Movement_160839:: @ 8160839 - step_up - step_up - step_00 - step_end + walk_up + walk_up + face_down + end_movement BattleTower_Elevator_Movement_16083D:: @ 816083D - step_down - step_down - step_54 - step_end + walk_down + walk_down + set_invisible + end_movement BattleTower_Elevator_Movement_160841:: @ 8160841 - step_right - step_down - step_down - step_end + walk_right + walk_down + walk_down + end_movement diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 5e07c6b48..24637ee75 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -304,30 +304,30 @@ BattleTower_Lobby_EventScript_160664:: @ 8160664 return BattleTower_Lobby_Movement_160693:: @ 8160693 - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + end_movement BattleTower_Lobby_Movement_160697:: @ 8160697 - step_up - step_54 - step_end + walk_up + set_invisible + end_movement BattleTower_Lobby_Movement_16069A:: @ 816069A - step_up - step_up - step_54 - step_end + walk_up + walk_up + set_invisible + end_movement @ 816069E - step_16 - step_16 - step_16 - step_16 - step_16 - step_54 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + set_invisible + end_movement BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 lock diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index bba6d89bc..aeec7023f 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -89,9 +89,9 @@ CaveOfOrigin_B4F_EventScript_15DE73:: @ 815DE73 return CaveOfOrigin_B4F_Movement_15DE7D:: @ 815DE7D - step_5e - step_60 - step_14 - step_14 - step_61 - step_end + init_affine_anim + walk_down_affine_0 + delay_16 + delay_16 + walk_down_affine_1 + end_movement diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index e7aeccbd0..63f8c45b9 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -193,402 +193,402 @@ DewfordTown_EventScript_14E28A:: @ 814E28A return DewfordTown_Movement_14E293:: @ 814E293 - step_up - step_up - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_up - step_up - step_left - step_left - step_17 - step_17 - step_17 - step_17 - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_17 - step_17 - step_17 - step_17 - step_16 - step_16 - step_16 - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_16 - step_16 - step_16 - step_16 - step_17 - step_17 - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_17 - step_17 - step_16 - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_16 - step_16 - step_16 - step_16 - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_up + walk_up + walk_left + walk_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_up + walk_up + walk_up + walk_up + end_movement DewfordTown_Movement_14E356:: @ 814E356 - step_right - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_16 - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_right + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement DewfordTown_Movement_14E402:: @ 814E402 - step_right - step_up - step_end + walk_right + walk_up + end_movement DewfordTown_Movement_14E405:: @ 814E405 - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + end_movement DewfordTown_Movement_14E409:: @ 814E409 - step_up - step_up - step_up - step_25 - step_end + walk_up + walk_up + walk_up + walk_in_place_fastest_down + end_movement DewfordTown_Movement_14E40E:: @ 814E40E - step_up - step_end + walk_up + end_movement DewfordTown_Movement_14E410:: @ 814E410 - step_up - step_up - step_end + walk_up + walk_up + end_movement DewfordTown_EventScript_14E413:: @ 814E413 lock diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 45d389b28..602c4776e 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -241,12 +241,12 @@ DewfordTown_Hall_EventScript_153583:: @ 8153583 return DewfordTown_Hall_Movement_153599:: @ 8153599 - step_1f - step_end + walk_in_place_left + end_movement DewfordTown_Hall_Movement_15359B:: @ 815359B - step_20 - step_end + walk_in_place_right + end_movement DewfordTown_Hall_EventScript_15359D:: @ 815359D lock diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 78009271b..a4406c8e6 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -33,9 +33,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE end EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 - step_up - step_up - step_end + walk_up + walk_up + end_movement EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 playbgm BGM_DAIGO, FALSE @@ -163,64 +163,64 @@ EverGrandeCity_ChampionsRoom_EventScript_15B9D2:: @ 815B9D2 return EverGrandeCity_ChampionsRoom_Movement_15B9DD:: @ 815B9DD - step_up - step_up - step_end + walk_up + walk_up + end_movement EverGrandeCity_ChampionsRoom_Movement_15B9E0:: @ 815B9E0 - step_up - step_14 - step_up - step_13 - step_54 - step_end + walk_up + delay_16 + walk_up + delay_8 + set_invisible + end_movement EverGrandeCity_ChampionsRoom_Movement_15B9E6:: @ 815B9E6 - step_up - step_up - step_up - step_up - step_up - step_left - step_up - step_28 - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_in_place_fastest_right + end_movement EverGrandeCity_ChampionsRoom_Movement_15B9EF:: @ 815B9EF - step_26 - step_14 - step_28 - step_14 - step_26 - step_13 - step_28 - step_14 - step_end + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_right + delay_16 + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_right + delay_16 + end_movement EverGrandeCity_ChampionsRoom_Movement_15B9F8:: @ 815B9F8 - step_right - step_up - step_end + walk_right + walk_up + end_movement EverGrandeCity_ChampionsRoom_Movement_15B9FB:: @ 815B9FB - step_up - step_up - step_25 - step_end + walk_up + walk_up + walk_in_place_fastest_down + end_movement EverGrandeCity_ChampionsRoom_Movement_15B9FF:: @ 815B9FF - step_up - step_13 - step_54 - step_end + walk_up + delay_8 + set_invisible + end_movement EverGrandeCity_ChampionsRoom_Movement_15BA03:: @ 815BA03 - step_up - step_up - step_up - step_up - step_up - step_right - step_up - step_27 - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_in_place_fastest_left + end_movement diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index c57f311b2..6cfc5ae27 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -67,18 +67,18 @@ EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D end EverGrandeCity_HallOfFame_Movement_15BC59:: @ 815BC59 - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement EverGrandeCity_HallOfFame_Movement_15BC60:: @ 815BC60 - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index a8eb820ea..0138f99f1 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -99,23 +99,23 @@ EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57 end EverGrandeCity_PokemonLeague_Movement_15BB76:: @ 815BB76 - step_down - step_left - step_26 - step_end + walk_down + walk_left + walk_in_place_fastest_up + end_movement EverGrandeCity_PokemonLeague_Movement_15BB7A:: @ 815BB7A - step_down - step_right - step_26 - step_end + walk_down + walk_right + walk_in_place_fastest_up + end_movement EverGrandeCity_PokemonLeague_Movement_15BB7E:: @ 815BB7E - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement EverGrandeCity_PokemonLeague_Movement_15BB81:: @ 815BB81 - step_right - step_25 - step_end + walk_right + walk_in_place_fastest_down + end_movement diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 11dd6159e..5386fec4f 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -46,46 +46,46 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 return FallarborTown_ContestLobby_Movement_153A70:: @ 8153A70 - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement FallarborTown_ContestLobby_Movement_153A7A:: @ 8153A7A - step_27 - step_end + walk_in_place_fastest_left + end_movement FallarborTown_ContestLobby_Movement_153A7C:: @ 8153A7C - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement FallarborTown_ContestLobby_Movement_153A7F:: @ 8153A7F - step_down - step_down - step_26 - step_end + walk_down + walk_down + walk_in_place_fastest_up + end_movement FallarborTown_ContestLobby_Movement_153A83:: @ 8153A83 - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement FallarborTown_ContestLobby_Movement_153A8C:: @ 8153A8C - step_28 - step_end + walk_in_place_fastest_right + end_movement FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E msgbox FallarborTown_ContestLobby_Text_177141, 2 diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 93a5115af..6ae897ec8 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -53,29 +53,29 @@ FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 end FallarborTown_PokemonCenter_1F_Movement_153B74:: @ 8153B74 - step_right - step_down - step_down - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_13 - step_end + walk_right + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + delay_8 + end_movement FallarborTown_PokemonCenter_1F_Movement_153B81:: @ 8153B81 - step_down - step_down - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_13 - step_end + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + delay_8 + end_movement diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index e576df5bd..342e2fdc3 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -86,5 +86,5 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 end FortreeCity_Movement_14CA13:: @ 814CA13 - step_right - step_end + walk_right + end_movement diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 490ef0c9b..77e43be34 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -46,12 +46,12 @@ FortreeCity_House4_EventScript_158204:: @ 8158204 end FortreeCity_House4_Movement_158218:: @ 8158218 - step_15 - step_15 - step_18 - step_25 - step_13 - step_end + walk_fast_down + walk_fast_down + walk_fast_right + walk_in_place_fastest_down + delay_8 + end_movement FortreeCity_House4_EventScript_15821E:: @ 815821E lock diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index d33813680..013703e92 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -42,21 +42,21 @@ GraniteCave_StevensRoom_EventScript_15CC83:: @ 815CC83 return GraniteCave_StevensRoom_Movement_15CC8C:: @ 815CC8C - step_up - step_up - step_up - step_up - step_up - step_13 - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + delay_8 + end_movement GraniteCave_StevensRoom_Movement_15CC93:: @ 815CC93 - step_left - step_up - step_up - step_up - step_right - step_up - step_up - step_13 - step_end + walk_left + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + delay_8 + end_movement diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 05ea54cf7..f14601747 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -185,54 +185,54 @@ LavaridgeTown_EventScript_14E6DD:: @ 814E6DD return LavaridgeTown_Movement_14E6E8:: @ 814E6E8 - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement LavaridgeTown_Movement_14E6EF:: @ 814E6EF - step_18 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement LavaridgeTown_Movement_14E6FA:: @ 814E6FA - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement LavaridgeTown_Movement_14E703:: @ 814E703 - step_15 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_end + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement LavaridgeTown_Movement_14E70E:: @ 814E70E - step_down - step_end + walk_down + end_movement LavaridgeTown_EventScript_14E710:: @ 814E710 specialvar RESULT, GetPlayerFacingDirection diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index a04629903..4784a4903 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -145,46 +145,46 @@ LilycoveCity_ContestLobby_EventScript_158A37:: @ 8158A37 return LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_end + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement LilycoveCity_ContestLobby_Movement_158A43:: @ 8158A43 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement LilycoveCity_ContestLobby_Movement_158A4C:: @ 8158A4C - step_27 - step_end + walk_in_place_fastest_left + end_movement LilycoveCity_ContestLobby_Movement_158A4E:: @ 8158A4E - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + end_movement LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 - step_14 - step_14 - step_14 - step_14 - step_16 - step_16 - step_16 - step_28 - step_end + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_right + end_movement LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158A6A @@ -258,47 +258,47 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 return LilycoveCity_ContestLobby_Movement_158B64:: @ 8158B64 - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_end + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement LilycoveCity_ContestLobby_Movement_158B6D:: @ 8158B6D - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement LilycoveCity_ContestLobby_Movement_158B76:: @ 8158B76 - step_28 - step_end + walk_in_place_fastest_right + end_movement LilycoveCity_ContestLobby_Movement_158B78:: @ 8158B78 - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + end_movement LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C - step_14 - step_14 - step_14 - step_14 - step_16 - step_16 - step_16 - step_27 - step_end + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_left + end_movement LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 lockall @@ -518,50 +518,50 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B return LilycoveCity_ContestLobby_Movement_158E8E:: @ 8158E8E - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement LilycoveCity_ContestLobby_Movement_158E99:: @ 8158E99 - step_28 - step_right - step_end + walk_in_place_fastest_right + walk_right + end_movement LilycoveCity_ContestLobby_Movement_158E9C:: @ 8158E9C - step_right - step_right - step_25 - step_end + walk_right + walk_right + walk_in_place_fastest_down + end_movement LilycoveCity_ContestLobby_Movement_158EA0:: @ 8158EA0 - step_down - step_down - step_26 - step_end + walk_down + walk_down + walk_in_place_fastest_up + end_movement LilycoveCity_ContestLobby_Movement_158EA4:: @ 8158EA4 - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE - step_27 - step_end + walk_in_place_fastest_left + end_movement LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialvar RESULT, sub_80C5044 @@ -655,48 +655,48 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 return LilycoveCity_ContestLobby_Movement_158FFE:: @ 8158FFE - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement LilycoveCity_ContestLobby_Movement_159008:: @ 8159008 - step_27 - step_left - step_end + walk_in_place_fastest_left + walk_left + end_movement LilycoveCity_ContestLobby_Movement_15900B:: @ 815900B - step_left - step_left - step_25 - step_end + walk_left + walk_left + walk_in_place_fastest_down + end_movement LilycoveCity_ContestLobby_Movement_15900F:: @ 815900F - step_down - step_down - step_26 - step_end + walk_down + walk_down + walk_in_place_fastest_up + end_movement LilycoveCity_ContestLobby_Movement_159013:: @ 8159013 - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement LilycoveCity_ContestLobby_Movement_15901C:: @ 815901C - step_28 - step_end + walk_in_place_fastest_right + end_movement LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E msgbox LilycoveCity_ContestLobby_Text_188D3C, 2 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index b80b0873b..c3eca04f4 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -57,18 +57,18 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D end LilycoveCity_CoveLilyMotel_1F_Movement_158395:: @ 8158395 - step_03 - step_40 - step_left - step_41 - step_end + face_right + lock_facing_direction + walk_left + unlock_facing_direction + end_movement LilycoveCity_CoveLilyMotel_1F_Movement_15839A:: @ 815839A - step_up - step_end + walk_up + end_movement LilycoveCity_CoveLilyMotel_1F_Movement_15839C:: @ 815839C - step_00 - step_down - step_01 - step_end + face_down + walk_down + face_up + end_movement diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index d32107396..57ad4b85b 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -140,17 +140,17 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE end LilycoveCity_Harbor_Movement_159A86:: @ 8159A86 - step_right - step_26 - step_end + walk_right + walk_in_place_fastest_up + end_movement LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 - step_up - step_end + walk_up + end_movement @ 8159A8B - step_up - step_end + walk_up + end_movement LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 95338f231..b45261aca 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -70,23 +70,23 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7 end LilycoveCity_LilycoveMuseum_1F_Movement_1584FC:: @ 81584FC - step_up - step_end + walk_up + end_movement LilycoveCity_LilycoveMuseum_1F_Movement_1584FE:: @ 81584FE - step_left - step_up - step_end + walk_left + walk_up + end_movement LilycoveCity_LilycoveMuseum_1F_Movement_158501:: @ 8158501 - step_right - step_up - step_end + walk_right + walk_up + end_movement LilycoveCity_LilycoveMuseum_1F_Movement_158504:: @ 8158504 - step_up - step_up - step_end + walk_up + walk_up + end_movement LilycoveCity_LilycoveMuseum_1F_EventScript_158507:: @ 8158507 msgbox LilycoveCity_LilycoveMuseum_1F_Text_18757F, 3 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 9cf3ecbd7..1643c3a8b 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -81,13 +81,13 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A end LilycoveCity_LilycoveMuseum_2F_Movement_1586D3:: @ 81586D3 - step_27 - step_end + walk_in_place_fastest_left + end_movement LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5 - step_01 - step_14 - step_end + face_up + delay_16 + end_movement LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 85ee953ac..bab091a0e 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -29,36 +29,36 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F end LilycoveCity_PokemonTrainerFanClub_Movement_1593FA:: @ 81593FA - step_13 - step_25 - step_down - step_down - step_down - step_left - step_left - step_end + delay_8 + walk_in_place_fastest_down + walk_down + walk_down + walk_down + walk_left + walk_left + end_movement LilycoveCity_PokemonTrainerFanClub_Movement_159402:: @ 8159402 - step_17 - step_17 - step_15 - step_15 - step_17 - step_15 - step_end + walk_fast_left + walk_fast_left + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down + end_movement LilycoveCity_PokemonTrainerFanClub_Movement_159409:: @ 8159409 - step_down - step_28 - step_end + walk_down + walk_in_place_fastest_right + end_movement LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C - step_49 - step_16 - step_16 - step_18 - step_25 - step_end + jump_in_place_right + walk_fast_up + walk_fast_up + walk_fast_right + walk_in_place_fastest_down + end_movement LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 compare VAR_LILYCOVE_FAN_CLUB_STATE, 1 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 57ad9aae5..9f328bc4a 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -131,43 +131,43 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B return LittlerootTown_Movement_14D6AC:: @ 814D6AC - step_down - step_end + walk_down + end_movement LittlerootTown_Movement_14D6AE:: @ 814D6AE - step_down - step_27 - step_end + walk_down + walk_in_place_fastest_left + end_movement LittlerootTown_Movement_14D6B1:: @ 814D6B1 - step_14 - step_13 - step_up - step_end + delay_16 + delay_8 + walk_up + end_movement LittlerootTown_Movement_14D6B5:: @ 814D6B5 - step_up - step_54 - step_end + walk_up + set_invisible + end_movement LittlerootTown_Movement_14D6B8:: @ 814D6B8 - step_14 - step_13 - step_right - step_26 - step_end + delay_16 + delay_8 + walk_right + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14D6BD:: @ 814D6BD - step_up - step_up - step_end + walk_up + walk_up + end_movement LittlerootTown_Movement_14D6C0:: @ 814D6C0 - step_45 - step_14 - step_14 - step_14 - step_end + jump_right + delay_16 + delay_16 + delay_16 + end_movement LittlerootTown_EventScript_14D6C5:: @ 814D6C5 lockall @@ -235,42 +235,42 @@ LittlerootTown_EventScript_14D755:: @ 814D755 return LittlerootTown_Movement_14D779:: @ 814D779 - step_03 - step_13 - step_51 - step_49 - step_13 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 - step_17 - step_00 - step_end + face_right + delay_8 + disable_jump_landing_ground_effect + jump_in_place_right + delay_8 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_left + face_down + end_movement LittlerootTown_Movement_14D787:: @ 814D787 - step_down - step_end + walk_down + end_movement LittlerootTown_Movement_14D789:: @ 814D789 - step_right - step_down - step_down - step_left - step_left - step_left - step_left - step_up - step_25 - step_end + walk_right + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_up + walk_in_place_fastest_down + end_movement LittlerootTown_Movement_14D793:: @ 814D793 - step_40 - step_down - step_41 - step_end + lock_facing_direction + walk_down + unlock_facing_direction + end_movement LittlerootTown_EventScript_14D797:: @ 814D797 lockall @@ -283,28 +283,28 @@ LittlerootTown_EventScript_14D797:: @ 814D797 end LittlerootTown_Movement_14D7B3:: @ 814D7B3 - step_03 - step_13 - step_51 - step_49 - step_13 - step_18 - step_18 - step_18 - step_16 - step_16 - step_18 - step_00 - step_end + face_right + delay_8 + disable_jump_landing_ground_effect + jump_in_place_right + delay_8 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_right + face_down + end_movement LittlerootTown_Movement_14D7C0:: @ 814D7C0 - step_left - step_down - step_left - step_left - step_left - step_25 - step_end + walk_left + walk_down + walk_left + walk_left + walk_left + walk_in_place_fastest_down + end_movement LittlerootTown_EventScript_14D7C7:: @ 814D7C7 lockall @@ -686,154 +686,154 @@ LittlerootTown_EventScript_14DC50:: @ 814DC50 return LittlerootTown_Movement_14DC76:: @ 814DC76 - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement LittlerootTown_Movement_14DC7D:: @ 814DC7D - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement LittlerootTown_Movement_14DC84:: @ 814DC84 - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + end_movement LittlerootTown_Movement_14DC89:: @ 814DC89 - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement LittlerootTown_Movement_14DC8F:: @ 814DC8F - step_right - step_right - step_end + walk_right + walk_right + end_movement LittlerootTown_Movement_14DC92:: @ 814DC92 - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + end_movement LittlerootTown_Movement_14DC96:: @ 814DC96 - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + end_movement LittlerootTown_Movement_14DC9A:: @ 814DC9A - step_left - step_left - step_end + walk_left + walk_left + end_movement LittlerootTown_Movement_14DC9D:: @ 814DC9D - step_left - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement LittlerootTown_Movement_14DCA3:: @ 814DCA3 - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + end_movement LittlerootTown_Movement_14DCA8:: @ 814DCA8 - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement LittlerootTown_Movement_14DCAE:: @ 814DCAE - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement LittlerootTown_Movement_14DCB4:: @ 814DCB4 - step_left - step_left - step_left - step_left - step_26 - step_end + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCBA:: @ 814DCBA - step_left - step_left - step_left - step_left - step_left - step_26 - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCC1:: @ 814DCC1 - step_left - step_left - step_26 - step_end + walk_left + walk_left + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCC5:: @ 814DCC5 - step_left - step_left - step_left - step_26 - step_end + walk_left + walk_left + walk_left + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCCA:: @ 814DCCA - step_right - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCCF:: @ 814DCCF - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCD3:: @ 814DCD3 - step_right - step_right - step_right - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCDA:: @ 814DCDA - step_right - step_right - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCE0:: @ 814DCE0 - step_up - step_end + walk_up + end_movement LittlerootTown_EventScript_14DCE2:: @ 814DCE2 lock diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 1de2e91a4..340f50894 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -70,8 +70,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA end LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720 - step_up - step_end + walk_up + end_movement LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 lockall @@ -105,13 +105,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 end LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782 - step_down - step_right - step_right - step_right - step_right - step_right - step_end + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 lockall diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 8096589aa..ad7257e0b 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -70,8 +70,8 @@ LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 end LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E - step_up - step_end + walk_up + end_movement LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960 lockall @@ -105,13 +105,13 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 end LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 - step_down - step_left - step_left - step_left - step_left - step_left - step_end + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement @ 81529C7 lockall diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index ede58e7a5..e716962b7 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -138,52 +138,52 @@ LittlerootTown_BrendansHouse_2F_EventScript_152C08:: @ 8152C08 return LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_13 - step_end + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + delay_8 + end_movement LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_13 - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + delay_8 + end_movement LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25 - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_13 - step_end + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + delay_8 + end_movement LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30 - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_13 - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + delay_8 + end_movement gUnknown_08152C39:: @ 8152C39 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 7608ba65d..6b2867f54 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -73,14 +73,14 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A end LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock @@ -174,9 +174,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E8E:: @ 8152E8E return LittlerootTown_ProfessorBirchsLab_Movement_152E97:: @ 8152E97 - step_down - step_27 - step_end + walk_down + walk_in_place_fastest_left + end_movement LittlerootTown_ProfessorBirchsLab_EventScript_152E9A:: @ 8152E9A msgbox LittlerootTown_ProfessorBirchsLab_Text_1746A2, 3 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 852f24f2a..bd4f8ab3d 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -186,96 +186,96 @@ MauvilleCity_EventScript_14C292:: @ 814C292 end MauvilleCity_Movement_14C2AA:: @ 814C2AA - step_left - step_left - step_down - step_down - step_left - step_end + walk_left + walk_left + walk_down + walk_down + walk_left + end_movement MauvilleCity_Movement_14C2B0:: @ 814C2B0 - step_down - step_down - step_left - step_left - step_left - step_end + walk_down + walk_down + walk_left + walk_left + walk_left + end_movement MauvilleCity_Movement_14C2B6:: @ 814C2B6 - step_14 - step_14 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement MauvilleCity_Movement_14C2C1:: @ 814C2C1 - step_14 - step_14 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement MauvilleCity_Movement_14C2CC:: @ 814C2CC - step_left - step_left - step_left - step_down - step_down - step_end + walk_left + walk_left + walk_left + walk_down + walk_down + end_movement MauvilleCity_Movement_14C2D2:: @ 814C2D2 - step_left - step_down - step_down - step_left - step_left - step_end + walk_left + walk_down + walk_down + walk_left + walk_left + end_movement MauvilleCity_Movement_14C2D8:: @ 814C2D8 - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_in_place_fastest_up + end_movement MauvilleCity_Movement_14C2DC:: @ 814C2DC - step_right - step_up - step_end + walk_right + walk_up + end_movement MauvilleCity_Movement_14C2DF:: @ 814C2DF - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement MauvilleCity_Movement_14C2E8:: @ 814C2E8 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement MauvilleCity_EventScript_14C2F2:: @ 814C2F2 lock diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 272d7ed6e..ee2c5b1dc 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -83,134 +83,134 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C end MeteorFalls_1F_1R_Movement_15C5EE:: @ 815C5EE - step_right - step_right - step_end + walk_right + walk_right + end_movement MeteorFalls_1F_1R_Movement_15C5F1:: @ 815C5F1 - step_16 - step_16 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_end + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement MeteorFalls_1F_1R_Movement_15C5FC:: @ 815C5FC - step_16 - step_16 - step_16 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement MeteorFalls_1F_1R_Movement_15C608:: @ 815C608 - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement MeteorFalls_1F_1R_Movement_15C60F:: @ 815C60F - step_14 - step_14 - step_right - step_right - step_right - step_right - step_right - step_end + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement MeteorFalls_1F_1R_Movement_15C617:: @ 815C617 - step_14 - step_14 - step_right - step_right - step_right - step_right - step_right - step_end + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement MeteorFalls_1F_1R_Movement_15C61F:: @ 815C61F - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement MeteorFalls_1F_1R_Movement_15C628:: @ 815C628 - step_right - step_right - step_up - step_up - step_27 - step_end + walk_right + walk_right + walk_up + walk_up + walk_in_place_fastest_left + end_movement MeteorFalls_1F_1R_Movement_15C62E:: @ 815C62E - step_up - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement MeteorFalls_1F_1R_Movement_15C639:: @ 815C639 - step_right - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement MeteorFalls_1F_1R_Movement_15C63E:: @ 815C63E - step_up - step_up - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement MeteorFalls_1F_1R_Movement_15C64A:: @ 815C64A - step_right - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F - step_25 - step_12 - step_28 - step_40 - step_left - step_41 - step_end + walk_in_place_fastest_down + delay_4 + walk_in_place_fastest_right + lock_facing_direction + walk_left + unlock_facing_direction + end_movement MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656 lock diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 364778613..4d9989d82 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -73,13 +73,13 @@ MossdeepCity_GameCorner_1F_EventScript_15AD34:: @ 815AD34 return MossdeepCity_GameCorner_1F_Movement_15AD3D:: @ 815AD3D - step_down - step_end + walk_down + end_movement MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F - step_right - step_25 - step_end + walk_right + walk_in_place_fastest_down + end_movement MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 lock @@ -154,32 +154,32 @@ MossdeepCity_GameCorner_1F_EventScript_15AE28:: @ 815AE28 return MossdeepCity_GameCorner_1F_Movement_15AE3A:: @ 815AE3A - step_14 - step_up - step_up - step_end + delay_16 + walk_up + walk_up + end_movement MossdeepCity_GameCorner_1F_Movement_15AE3E:: @ 815AE3E - step_14 - step_right - step_up - step_end + delay_16 + walk_right + walk_up + end_movement MossdeepCity_GameCorner_1F_Movement_15AE42:: @ 815AE42 - step_14 - step_left - step_up - step_end + delay_16 + walk_left + walk_up + end_movement MossdeepCity_GameCorner_1F_Movement_15AE46:: @ 815AE46 - step_left - step_28 - step_end + walk_left + walk_in_place_fastest_right + end_movement MossdeepCity_GameCorner_1F_Movement_15AE49:: @ 815AE49 - step_right - step_27 - step_end + walk_right + walk_in_place_fastest_left + end_movement MossdeepCity_GameCorner_1F_EventScript_15AE4C:: @ 815AE4C msgbox MossdeepCity_GameCorner_1F_Text_18E631, 3 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index f62693756..0af775590 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -59,19 +59,19 @@ MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE return MossdeepCity_GameCorner_B1F_Movement_15AEF9:: @ 815AEF9 - step_down - step_down - step_down - step_right - step_right - step_end + walk_down + walk_down + walk_down + walk_right + walk_right + end_movement MossdeepCity_GameCorner_B1F_Movement_15AEFF:: @ 815AEFF - step_left - step_left - step_up - step_up - step_up - step_up - step_13 - step_end + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + delay_8 + end_movement diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 0ae02fba4..a17d09e10 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -212,9 +212,9 @@ MossdeepCity_Gym_EventScript_15A7ED:: @ 815A7ED end MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 - step_14 - step_14 - step_end + delay_16 + delay_16 + end_movement MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 415dbfc33..c8bccdd52 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -38,17 +38,17 @@ MossdeepCity_House2_EventScript_15A8B9:: @ 815A8B9 return MossdeepCity_House2_Movement_15A8C4:: @ 815A8C4 - step_18 - step_15 - step_15 - step_17 - step_15 - step_13 - step_end + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down + delay_8 + end_movement MossdeepCity_House2_Movement_15A8CB:: @ 815A8CB - step_15 - step_15 - step_15 - step_13 - step_end + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 + end_movement diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 0f1aace1d..d415e7fc9 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -51,22 +51,22 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B end MossdeepCity_StevensHouse_Movement_15AA6E:: @ 815AA6E - step_left - step_left - step_left - step_left - step_left - step_left - step_25 - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down + end_movement MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 - step_up - step_right - step_right - step_right - step_26 - step_end + walk_up + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C lockall diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index ac7c00013..f13850570 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -59,250 +59,250 @@ MtChimney_EventScript_15D018:: @ 815D018 end MtChimney_Movement_15D025:: @ 815D025 - step_up - step_up - step_up - step_up - step_up - step_up - step_right - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + end_movement MtChimney_Movement_15D02D:: @ 815D02D - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement MtChimney_Movement_15D036:: @ 815D036 - step_up - step_up - step_up - step_up - step_up - step_right - step_right - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + end_movement MtChimney_Movement_15D03E:: @ 815D03E - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement @ 815D048 - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + end_movement @ 815D05A - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + end_movement @ 815D063 - step_right - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_end + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + end_movement @ 815D072 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_left - step_left - step_down - step_down - step_down - step_left - step_left - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_end + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + end_movement @ 815D08B - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_left - step_left - step_left - step_down - step_end + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + end_movement @ 815D096 - step_14 - step_left - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_end + delay_16 + walk_left + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + end_movement @ 815D0A6 - step_14 - step_left - step_left - step_down - step_down - step_down - step_left - step_left - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_end + delay_16 + walk_left + walk_left + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + end_movement @ 815D0B7 - step_14 - step_down - step_left - step_left - step_left - step_left - step_25 - step_end + delay_16 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down + end_movement @ 815D0BF - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + end_movement @ 815D0CD - step_down - step_end + walk_down + end_movement @ 815D0CF - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement @ 815D0D7 - step_14 - step_14 - step_27 - step_14 - step_down - step_down - step_down - step_down - step_down - step_end + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement @ 815D0E1 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_27 - step_14 - step_down - step_down - step_end + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + walk_down + walk_down + end_movement @ 815D0EC - step_40 - step_17 - step_41 - step_03 - step_end + lock_facing_direction + walk_fast_left + unlock_facing_direction + face_right + end_movement @ 815D0F1 - step_left - step_28 - step_14 - step_end + walk_left + walk_in_place_fastest_right + delay_16 + end_movement MtChimney_EventScript_15D0F5:: @ 815D0F5 .ifdef SAPPHIRE diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 1f98778d6..7161e8800 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -59,29 +59,29 @@ MtChimney_CableCarStation_EventScript_15C19B:: @ 815C19B end MtChimney_CableCarStation_Movement_15C1A5:: @ 815C1A5 - step_up - step_up - step_left - step_28 - step_end + walk_up + walk_up + walk_left + walk_in_place_fastest_right + end_movement MtChimney_CableCarStation_Movement_15C1AA:: @ 815C1AA - step_14 - step_right - step_down - step_down - step_end + delay_16 + walk_right + walk_down + walk_down + end_movement MtChimney_CableCarStation_Movement_15C1AF:: @ 815C1AF - step_up - step_up - step_up - step_14 - step_end + walk_up + walk_up + walk_up + delay_16 + end_movement MtChimney_CableCarStation_Movement_15C1B4:: @ 815C1B4 - step_down - step_down - step_down - step_14 - step_end + walk_down + walk_down + walk_down + delay_16 + end_movement diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index d37100938..36b72ad12 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -110,30 +110,30 @@ MtPyre_Summit_EventScript_15D5CA:: @ 815D5CA return MtPyre_Summit_Movement_15D5DF:: @ 815D5DF - step_down - step_down - step_27 - step_end + walk_down + walk_down + walk_in_place_fastest_left + end_movement MtPyre_Summit_Movement_15D5E3:: @ 815D5E3 - step_down - step_end + walk_down + end_movement MtPyre_Summit_Movement_15D5E5:: @ 815D5E5 - step_down - step_down - step_28 - step_end + walk_down + walk_down + walk_in_place_fastest_right + end_movement MtPyre_Summit_Movement_15D5E9:: @ 815D5E9 - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement MtPyre_Summit_Movement_15D5EC:: @ 815D5EC - step_right - step_25 - step_end + walk_right + walk_in_place_fastest_down + end_movement MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF lock @@ -319,47 +319,47 @@ MtPyre_Summit_EventScript_15D795:: @ 815D795 return MtPyre_Summit_Movement_15D7A0:: @ 815D7A0 - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement MtPyre_Summit_Movement_15D7A3:: @ 815D7A3 - step_end + end_movement MtPyre_Summit_Movement_15D7A4:: @ 815D7A4 - step_right - step_25 - step_end + walk_right + walk_in_place_fastest_down + end_movement MtPyre_Summit_Movement_15D7A7:: @ 815D7A7 - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement MtPyre_Summit_Movement_15D7B0:: @ 815D7B0 - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement MtPyre_Summit_Movement_15D7B9:: @ 815D7B9 - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 9b1c9dd80..5385272b8 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -91,101 +91,101 @@ OldaleTown_EventScript_14DE83:: @ 814DE83 end OldaleTown_Movement_14DE8E:: @ 814DE8E - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_25 - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down + end_movement OldaleTown_Movement_14DE97:: @ 814DE97 - step_left - step_up - step_up - step_right - step_up - step_up - step_up - step_up - step_up - step_25 - step_end + walk_left + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down + end_movement OldaleTown_Movement_14DEA2:: @ 814DEA2 - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_25 - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down + end_movement @ 814DEAB - step_up - step_up - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_up - step_up - step_13 - step_25 - step_end + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + delay_8 + walk_in_place_fastest_down + end_movement OldaleTown_Movement_14DEB9:: @ 814DEB9 - step_right - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement OldaleTown_Movement_14DEC1:: @ 814DEC1 - step_14 - step_14 - step_14 - step_14 - step_up - step_up - step_up - step_up - step_up - step_end + delay_16 + delay_16 + delay_16 + delay_16 + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement OldaleTown_Movement_14DECB:: @ 814DECB - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement @ 814DED3 - step_left - step_up - step_up - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_up - step_end + walk_left + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + end_movement OldaleTown_EventScript_14DEDF:: @ 814DEDF lock @@ -278,41 +278,41 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6 end OldaleTown_Movement_14DFDE:: @ 814DFDE - step_left - step_left - step_end + walk_left + walk_left + end_movement OldaleTown_Movement_14DFE1:: @ 814DFE1 - step_left - step_end + walk_left + end_movement OldaleTown_Movement_14DFE3:: @ 814DFE3 - step_02 - step_end + face_left + end_movement OldaleTown_Movement_14DFE5:: @ 814DFE5 - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement OldaleTown_Movement_14DFEC:: @ 814DFEC - step_13 - step_right - step_end + delay_8 + walk_right + end_movement OldaleTown_Movement_14DFEF:: @ 814DFEF - step_16 - step_27 - step_40 - step_right - step_41 - step_end + walk_fast_up + walk_in_place_fastest_left + lock_facing_direction + walk_right + unlock_facing_direction + end_movement OldaleTown_Movement_14DFF5:: @ 814DFF5 - step_down - step_left - step_end + walk_down + walk_left + end_movement diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index cb47a0edd..03013f66c 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -65,78 +65,78 @@ PetalburgCity_EventScript_14B7C3:: @ 814B7C3 end PetalburgCity_Movement_14B7CC:: @ 814B7CC - step_13 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_28 - step_end + delay_8 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_in_place_fastest_right + end_movement PetalburgCity_Movement_14B7ED:: @ 814B7ED - step_13 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_right - step_14 - step_26 - step_14 - step_14 - step_28 - step_end + delay_8 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right + end_movement PetalburgCity_EventScript_14B812:: @ 814B812 msgbox PetalburgCity_Text_1645BB, 3 @@ -268,160 +268,160 @@ PetalburgCity_EventScript_14B99B:: @ 814B99B return @ 814B9AD - step_14 - step_14 - step_14 - step_end + delay_16 + delay_16 + delay_16 + end_movement PetalburgCity_Movement_14B9B1:: @ 814B9B1 - step_right - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement PetalburgCity_Movement_14B9B6:: @ 814B9B6 - step_right - step_right - step_end + walk_right + walk_right + end_movement PetalburgCity_Movement_14B9B9:: @ 814B9B9 - step_right - step_right - step_right - step_25 - step_end + walk_right + walk_right + walk_right + walk_in_place_fastest_down + end_movement PetalburgCity_Movement_14B9BE:: @ 814B9BE - step_down - step_right - step_right - step_right - step_25 - step_end + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_down + end_movement PetalburgCity_Movement_14B9C4:: @ 814B9C4 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_in_place_fastest_up + end_movement PetalburgCity_Movement_14B9CF:: @ 814B9CF - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_right - step_26 - step_end + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + walk_in_place_fastest_up + end_movement PetalburgCity_Movement_14B9DD:: @ 814B9DD - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_in_place_fastest_up + end_movement PetalburgCity_Movement_14B9E8:: @ 814B9E8 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + walk_in_place_fastest_up + end_movement PetalburgCity_Movement_14B9F4:: @ 814B9F4 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement PetalburgCity_Movement_14BA01:: @ 814BA01 - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_end + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + end_movement PetalburgCity_Movement_14BA0B:: @ 814BA0B - step_14 - step_14 - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_end + delay_16 + delay_16 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + end_movement PetalburgCity_Movement_14BA18:: @ 814BA18 - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_end + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + end_movement PetalburgCity_Movement_14BA22:: @ 814BA22 - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_end + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + end_movement PetalburgCity_EventScript_14BA2D:: @ 814BA2D msgbox PetalburgCity_Text_16438A, 2 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 1dc1a77ec..59828c28d 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -88,11 +88,11 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C end PetalburgCity_Gym_Movement_1545B4:: @ 81545B4 - step_down - step_down - step_down - step_14 - step_end + walk_down + walk_down + walk_down + delay_16 + end_movement PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 lock @@ -471,109 +471,109 @@ PetalburgCity_Gym_EventScript_154B09:: @ 8154B09 return @ 8154B14 - step_26 - step_14 - step_14 - step_14 - step_14 - step_14 - step_13 - step_25 - step_end + walk_in_place_fastest_up + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_down + end_movement PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D - step_14 - step_up - step_14 - step_13 - step_up - step_right - step_up - step_up - step_27 - step_end + delay_16 + walk_up + delay_16 + delay_8 + walk_up + walk_right + walk_up + walk_up + walk_in_place_fastest_left + end_movement PetalburgCity_Gym_Movement_154B27:: @ 8154B27 - step_14 - step_up - step_14 - step_13 - step_up - step_up - step_end + delay_16 + walk_up + delay_16 + delay_8 + walk_up + walk_up + end_movement PetalburgCity_Gym_Movement_154B2E:: @ 8154B2E - step_down - step_down - step_down - step_down - step_26 - step_14 - step_1d - step_end + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down + end_movement PetalburgCity_Gym_Movement_154B36:: @ 8154B36 - step_down - step_down - step_right - step_down - step_26 - step_14 - step_1d - step_end + walk_down + walk_down + walk_right + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down + end_movement PetalburgCity_Gym_Movement_154B3E:: @ 8154B3E - step_down - step_down - step_down - step_26 - step_14 - step_1d - step_end + walk_down + walk_down + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down + end_movement PetalburgCity_Gym_Movement_154B45:: @ 8154B45 - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_13 - step_end + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + delay_8 + end_movement PetalburgCity_Gym_Movement_154B4D:: @ 8154B4D - step_14 - step_14 - step_right - step_down - step_down - step_down - step_down - step_down - step_13 - step_end + delay_16 + delay_16 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + delay_8 + end_movement PetalburgCity_Gym_Movement_154B57:: @ 8154B57 - step_14 - step_14 - step_down - step_down - step_down - step_down - step_13 - step_end + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_down + delay_8 + end_movement PetalburgCity_Gym_Movement_154B5F:: @ 8154B5F - step_25 - step_14 - step_14 - step_down - step_down - step_down - step_right - step_down - step_13 - step_end + walk_in_place_fastest_down + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_right + walk_down + delay_8 + end_movement PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 msgbox PetalburgCity_Gym_Text_17AB17, 4 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 17908440c..1d5fbeaf2 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -116,119 +116,119 @@ PetalburgWoods_EventScript_15CE69:: @ 815CE69 end PetalburgWoods_Movement_15CE73:: @ 815CE73 - step_01 - step_14 - step_03 - step_14 - step_02 - step_14 - step_00 - step_14 - step_03 - step_14 - step_01 - step_14 - step_end + face_up + delay_16 + face_right + delay_16 + face_left + delay_16 + face_down + delay_16 + face_right + delay_16 + face_up + delay_16 + end_movement PetalburgWoods_Movement_15CE80:: @ 815CE80 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement PetalburgWoods_Movement_15CE89:: @ 815CE89 - step_14 - step_3e - step_down - step_down - step_end + delay_16 + face_player + walk_down + walk_down + end_movement PetalburgWoods_Movement_15CE8E:: @ 815CE8E - step_14 - step_3e - step_down - step_down - step_down - step_28 - step_end + delay_16 + face_player + walk_down + walk_down + walk_down + walk_in_place_fastest_right + end_movement PetalburgWoods_Movement_15CE95:: @ 815CE95 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement PetalburgWoods_Movement_15CE9E:: @ 815CE9E - step_18 - step_15 - step_15 - step_17 - step_26 - step_end + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_in_place_fastest_up + end_movement PetalburgWoods_Movement_15CEA4:: @ 815CEA4 - step_15 - step_18 - step_26 - step_end + walk_fast_down + walk_fast_right + walk_in_place_fastest_up + end_movement PetalburgWoods_Movement_15CEA8:: @ 815CEA8 - step_25 - step_14 - step_14 - step_14 - step_14 - step_14 - step_01 - step_end + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + face_up + end_movement PetalburgWoods_Movement_15CEB0:: @ 815CEB0 - step_15 - step_15 - step_end + walk_fast_down + walk_fast_down + end_movement PetalburgWoods_Movement_15CEB3:: @ 815CEB3 - step_40 - step_up - step_41 - step_end + lock_facing_direction + walk_up + unlock_facing_direction + end_movement PetalburgWoods_Movement_15CEB7:: @ 815CEB7 - step_16 - step_16 - step_16 - step_16 - step_16 - step_14 - step_14 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + delay_16 + delay_16 + end_movement PetalburgWoods_Movement_15CEBF:: @ 815CEBF - step_15 - step_15 - step_15 - step_end + walk_fast_down + walk_fast_down + walk_fast_down + end_movement PetalburgWoods_Movement_15CEC3:: @ 815CEC3 - step_down - step_down - step_14 - step_14 - step_end + walk_down + walk_down + delay_16 + delay_16 + end_movement PetalburgWoods_Movement_15CEC8:: @ 815CEC8 - step_down - step_end + walk_down + end_movement PetalburgWoods_EventScript_15CECA:: @ 815CECA msgbox PetalburgWoods_Text_1953AC, 2 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 6840c45f4..a4af7ceb4 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -69,138 +69,138 @@ Route101_EventScript_14E9E4:: @ 814E9E4 end Route101_Movement_14E9FA:: @ 814E9FA - step_up - step_end + walk_up + end_movement Route101_Movement_14E9FC:: @ 814E9FC - step_right - step_end + walk_right + end_movement Route101_Movement_14E9FE:: @ 814E9FE - step_down - step_end + walk_down + end_movement Route101_Movement_14EA00:: @ 814EA00 - step_16 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + end_movement Route101_Movement_14EA1F:: @ 814EA1F - step_16 - step_18 - step_18 - step_18 - step_18 - step_16 - step_end + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + end_movement @ 814EA26 - step_end + end_movement Route101_Movement_14EA27:: @ 814EA27 - step_23 - step_23 - step_23 - step_23 - step_end + walk_in_place_fast_left + walk_in_place_fast_left + walk_in_place_fast_left + walk_in_place_fast_left + end_movement Route101_Movement_14EA2C:: @ 814EA2C - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement Route101_Movement_14EA31:: @ 814EA31 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_end + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + end_movement Route101_Movement_14EA50:: @ 814EA50 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + end_movement @ 814EA57 - step_end + end_movement Route101_Movement_14EA58:: @ 814EA58 - step_24 - step_24 - step_24 - step_24 - step_end + walk_in_place_fast_right + walk_in_place_fast_right + walk_in_place_fast_right + walk_in_place_fast_right + end_movement @ 814EA5D - step_up - step_up - step_end + walk_up + walk_up + end_movement @ 814EA60 - step_up - step_left - step_up - step_end + walk_up + walk_left + walk_up + end_movement Route101_EventScript_14EA64:: @ 814EA64 msgbox Route101_Text_16D25E, 2 @@ -242,5 +242,5 @@ Route101_EventScript_14EA7F:: @ 814EA7F end Route101_Movement_14EAD7:: @ 814EAD7 - step_right - step_end + walk_right + end_movement diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 22c3fa391..94d0aa8d6 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -129,30 +129,30 @@ Route103_EventScript_14ED46:: @ 814ED46 end Route103_Movement_14ED67:: @ 814ED67 - step_left - step_down - step_down - step_end + walk_left + walk_down + walk_down + end_movement Route103_Movement_14ED6B:: @ 814ED6B - fast_step_down - step_14 - step_down - step_down - step_down - step_end + jump_2_down + delay_16 + walk_down + walk_down + walk_down + end_movement Route103_Movement_14ED71:: @ 814ED71 - step_down - step_down - step_end + walk_down + walk_down + end_movement Route103_Movement_14ED74:: @ 814ED74 - fast_step_down - step_14 - step_down - step_down - step_end + jump_2_down + delay_16 + walk_down + walk_down + end_movement Route103_EventScript_14ED79:: @ 814ED79 msgbox Route103_Text_16D950, 2 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 2d44d4dfd..8fda04ea5 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -168,227 +168,227 @@ Route104_EventScript_14F095:: @ 814F095 end Route104_Movement_14F09F:: @ 814F09F - step_down - step_down - step_down - step_down - step_15 - step_15 - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_15 - step_15 - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_15 - step_15 - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_15 - step_15 - step_18 - step_18 - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_18 - step_18 - step_right - step_right - step_down - step_down - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_right + walk_right + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_down + walk_down + end_movement Route104_Movement_14F162:: @ 814F162 - step_left - step_down - step_down - step_end + walk_left + walk_down + walk_down + end_movement Route104_Movement_14F166:: @ 814F166 - step_down - step_end + walk_down + end_movement Route104_Movement_14F168:: @ 814F168 - step_down - step_left - step_28 - step_end + walk_down + walk_left + walk_in_place_fastest_right + end_movement Route104_Movement_14F16C:: @ 814F16C - step_down - step_down - step_end + walk_down + walk_down + end_movement Route104_Movement_14F16F:: @ 814F16F - step_down - step_27 - step_end + walk_down + walk_in_place_fastest_left + end_movement Route104_EventScript_14F172:: @ 814F172 trainerbattle 0, OPPONENT_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index c70365b6a..6f24b2142 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -62,211 +62,211 @@ Route109_EventScript_14F548:: @ 814F548 end Route109_Movement_14F5BF:: @ 814F5BF - step_25 - step_down - step_down - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_17 - step_17 - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_left - step_left - step_25 - step_end + walk_in_place_fastest_down + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_left + walk_left + walk_in_place_fastest_down + end_movement Route109_Movement_14F66D:: @ 814F66D - step_down - step_down - step_end + walk_down + walk_down + end_movement Route109_Movement_14F670:: @ 814F670 - step_down - step_down - step_left - step_28 - step_end + walk_down + walk_down + walk_left + walk_in_place_fastest_right + end_movement Route109_Movement_14F675:: @ 814F675 - step_right - step_down - step_end + walk_right + walk_down + end_movement Route109_Movement_14F678:: @ 814F678 - step_left - step_down - step_end + walk_left + walk_down + end_movement Route109_Movement_14F67B:: @ 814F67B - step_down - step_end + walk_down + end_movement Route109_Movement_14F67D:: @ 814F67D - step_down - step_27 - step_end + walk_down + walk_in_place_fastest_left + end_movement Route109_EventScript_14F680:: @ 814F680 lock diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 070340760..8245b3107 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -492,48 +492,48 @@ Route110_EventScript_14FF66:: @ 814FF66 return Route110_Movement_14FF6E:: @ 814FF6E - step_down - step_left - step_25 - step_end + walk_down + walk_left + walk_in_place_fastest_down + end_movement Route110_Movement_14FF72:: @ 814FF72 - step_down - step_end + walk_down + end_movement Route110_Movement_14FF74:: @ 814FF74 - step_down - step_right - step_25 - step_end + walk_down + walk_right + walk_in_place_fastest_down + end_movement Route110_Movement_14FF78:: @ 814FF78 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement Route110_Movement_14FF80:: @ 814FF80 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_15 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_down + end_movement Route110_Movement_14FF89:: @ 814FF89 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index f05e2caa2..8d6465c89 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -48,8 +48,8 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523 end Route110_SeasideCyclingRoadNorthEntrance_Movement_163538:: @ 8163538 - step_left - step_end + walk_left + end_movement Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A @ Coord event directly in front of the gatesman heading right to left diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 2f54753ab..edae49291 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -27,8 +27,8 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6:: @ 81634A6 end Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB - step_left - step_end + walk_left + end_movement Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD lockall diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 2c2215a42..ca992427c 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -243,9 +243,9 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 end Route110_TrickHouseEnd_Movement_161CE8:: @ 8161CE8 - step_down - step_end + walk_down + end_movement Route110_TrickHouseEnd_Movement_161CEA:: @ 8161CEA - step_48 - step_end + jump_in_place_left + end_movement diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index e7468ec4f..a14ce2e2d 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -298,27 +298,27 @@ Route110_TrickHouseEntrance_EventScript_16130C:: @ 816130C Route110_TrickHouseEnd_Movement_161315:: @ 8161315 Route110_TrickHouseEntrance_Movement_161315:: @ 8161315 - step_01 - step_12 - step_02 - step_12 - step_00 - step_12 - step_03 - step_12 - step_end + face_up + delay_4 + face_left + delay_4 + face_down + delay_4 + face_right + delay_4 + end_movement Route110_TrickHouseEnd_Movement_16131E:: @ 816131E Route110_TrickHouseEntrance_Movement_16131E:: @ 816131E - step_01 - step_52 - step_32 - step_32 - step_32 - step_32 - step_32 - step_32 - step_end + face_up + disable_anim + slide_up + slide_up + slide_up + slide_up + slide_up + slide_up + end_movement Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327 msgbox Route110_TrickHouseEntrance_Text_19BCFD, 4 @@ -513,8 +513,8 @@ Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD end Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E - step_54 - step_end + set_invisible + end_movement Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660 warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 5ec1a4d64..a7f283b2d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -646,80 +646,80 @@ Route110_TrickHousePuzzle5_EventScript_163082:: @ 8163082 return Route110_TrickHousePuzzle5_Movement_16308D:: @ 816308D - step_left - step_end + walk_left + end_movement Route110_TrickHousePuzzle5_Movement_16308F:: @ 816308F - step_left - step_left - step_end + walk_left + walk_left + end_movement Route110_TrickHousePuzzle5_Movement_163092:: @ 8163092 - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + end_movement Route110_TrickHousePuzzle5_Movement_163096:: @ 8163096 - step_right - step_end + walk_right + end_movement Route110_TrickHousePuzzle5_Movement_163098:: @ 8163098 - step_right - step_right - step_end + walk_right + walk_right + end_movement Route110_TrickHousePuzzle5_Movement_16309B:: @ 816309B - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + end_movement Route110_TrickHouseEntrance_Movement_16309F:: @ 816309F Route110_TrickHousePuzzle5_Movement_16309F:: @ 816309F - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_00 - step_end + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_down + end_movement diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 99fa29efb..3e1570aff 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -92,28 +92,28 @@ Route111_EventScript_1500A5:: @ 81500A5 end Route111_Movement_1500AF:: @ 81500AF - step_55 - step_12 - step_54 - step_12 - step_55 - step_12 - step_54 - step_12 - step_55 - step_13 - step_54 - step_13 - step_55 - step_13 - step_54 - step_13 - step_55 - step_14 - step_54 - step_14 - step_55 - step_end + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_16 + set_invisible + delay_16 + set_visible + end_movement Route111_EventScript_1500C5:: @ 81500C5 lock @@ -202,20 +202,20 @@ Route111_EventScript_1501A9:: @ 81501A9 return Route111_Movement_1501B4:: @ 81501B4 - step_up - step_end + walk_up + end_movement Route111_Movement_1501B6:: @ 81501B6 - step_down - step_end + walk_down + end_movement Route111_Movement_1501B8:: @ 81501B8 - step_left - step_end + walk_left + end_movement Route111_Movement_1501BA:: @ 81501BA - step_right - step_end + walk_right + end_movement Route111_EventScript_1501BC:: @ 81501BC setweather WEATHER_SUNNY @@ -321,19 +321,19 @@ Route111_EventScript_15034F:: @ 815034F return Route111_Movement_150356:: @ 8150356 - step_26 - step_up - step_end + walk_in_place_fastest_up + walk_up + end_movement Route111_Movement_150359:: @ 8150359 - step_down - step_end + walk_down + end_movement Route111_Movement_15035B:: @ 815035B - step_14 - step_14 - step_14 - step_end + delay_16 + delay_16 + delay_16 + end_movement Route111_EventScript_15035F:: @ 815035F msgbox Route111_Text_16FC9C, 3 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 570075078..a593ccccc 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -60,29 +60,29 @@ Route112_CableCarStation_EventScript_15C0DC:: @ 815C0DC end Route112_CableCarStation_Movement_15C0E6:: @ 815C0E6 - step_up - step_up - step_right - step_27 - step_end + walk_up + walk_up + walk_right + walk_in_place_fastest_left + end_movement Route112_CableCarStation_Movement_15C0EB:: @ 815C0EB - step_14 - step_left - step_down - step_down - step_end + delay_16 + walk_left + walk_down + walk_down + end_movement Route112_CableCarStation_Movement_15C0F0:: @ 815C0F0 - step_up - step_up - step_up - step_14 - step_end + walk_up + walk_up + walk_up + delay_16 + end_movement Route112_CableCarStation_Movement_15C0F5:: @ 815C0F5 - step_down - step_down - step_down - step_14 - step_end + walk_down + walk_down + walk_down + delay_16 + end_movement diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index eea14e25d..77fbf57a4 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -79,28 +79,28 @@ Route116_EventScript_150B12:: @ 8150B12 end Route116_Movement_150B1C:: @ 8150B1C - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement Route116_Movement_150B25:: @ 8150B25 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement Route116_EventScript_150B30:: @ 8150B30 msgbox Route116_Text_170A46, 3 @@ -200,29 +200,29 @@ Route116_EventScript_150C42:: @ 8150C42 return Route116_Movement_150C4D:: @ 8150C4D - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement Route116_Movement_150C57:: @ 8150C57 - step_up - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement Route116_EventScript_150C62:: @ 8150C62 trainerbattle 0, OPPONENT_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 569a7103e..b938d0cc2 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -109,54 +109,54 @@ Route118_EventScript_15105E:: @ 815105E return Route118_Movement_151069:: @ 8151069 - step_left - step_end + walk_left + end_movement Route118_Movement_15106B:: @ 815106B - step_right - step_end + walk_right + end_movement Route118_Movement_15106D:: @ 815106D - fast_step_down - step_14 - step_down - step_end + jump_2_down + delay_16 + walk_down + end_movement Route118_Movement_151071:: @ 8151071 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement Route118_Movement_15107C:: @ 815107C - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement Route118_Movement_151086:: @ 8151086 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 30eed9cc0..b1f2d33bf 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -202,54 +202,54 @@ Route119_EventScript_1513E1:: @ 81513E1 return Route119_Movement_1513F0:: @ 81513F0 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_16 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + end_movement Route119_Movement_1513FA:: @ 81513FA - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_16 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + end_movement Route119_Movement_151405:: @ 8151405 - step_18 - step_16 - step_16 - step_16 - step_18 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement Route119_Movement_15140F:: @ 815140F - step_17 - step_16 - step_16 - step_16 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement Route119_EventScript_15141A:: @ 815141A msgbox Route119_Text_171698, 2 diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 81037941f..32c264acc 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -79,10 +79,10 @@ Route119_WeatherInstitute_2F_EventScript_163DBE:: @ 8163DBE end Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8 - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + end_movement Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC lock diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index eb696b45b..6f561391f 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -263,9 +263,9 @@ Route120_EventScript_15198A:: @ 815198A return Route120_Movement_151995:: @ 8151995 - step_down - step_left - step_end + walk_down + walk_left + end_movement Route120_EventScript_151998:: @ 8151998 msgbox Route120_Text_171B93, 2 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 6108b129d..5fe7f6330 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -34,37 +34,37 @@ Route121_EventScript_151B25:: @ 8151B25 end Route121_Movement_151B57:: @ 8151B57 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement Route121_Movement_151B60:: @ 8151B60 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement Route121_Movement_151B69:: @ 8151B69 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement Route121_EventScript_151B72:: @ 8151B72 trainerbattle 0, OPPONENT_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 2648e19ce..6e9ae80fd 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -16,15 +16,15 @@ Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333 end Route121_SafariZoneEntrance_Movement_15C348:: @ 815C348 - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement Route121_SafariZoneEntrance_EventScript_15C351:: @ 815C351 msgbox Route121_SafariZoneEntrance_Text_1C35D0, 2 @@ -119,19 +119,19 @@ Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C end Route121_SafariZoneEntrance_Movement_15C47C:: @ 815C47C - step_right - step_end + walk_right + end_movement Route121_SafariZoneEntrance_Movement_15C47E:: @ 815C47E - step_left - step_left - step_left - step_left - step_left - step_left - step_down - step_14 - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + delay_16 + end_movement Route121_SafariZoneEntrance_EventScript_15C487:: @ 815C487 msgbox Route121_SafariZoneEntrance_Text_1C3E4B, 3 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index f580a7e0b..ec4fb954e 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -86,98 +86,98 @@ Route128_EventScript_15213F:: @ 815213F end @ 815225E - step_17 - step_end + walk_fast_left + end_movement @ 8152260 - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement Route128_Movement_15226D:: @ 815226D - step_up - step_end + walk_up + end_movement Route128_Movement_15226F:: @ 815226F - step_17 - step_end + walk_fast_left + end_movement Route128_Movement_152271:: @ 8152271 - step_15 - step_27 - step_14 - step_28 - step_14 - step_14 - step_25 - step_end + walk_fast_down + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_down + end_movement Route128_Movement_152279:: @ 8152279 - step_40 - slow_step_up - step_14 - step_41 - step_end + lock_facing_direction + walk_slow_up + delay_16 + unlock_facing_direction + end_movement Route128_Movement_15227E:: @ 815227E - step_17 - step_17 - step_17 - step_28 - step_end + walk_fast_left + walk_fast_left + walk_fast_left + walk_in_place_fastest_right + end_movement Route128_Movement_152283:: @ 8152283 - step_14 - step_14 - step_16 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + delay_16 + delay_16 + walk_fast_up + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement Route128_Movement_152290:: @ 8152290 - step_left - step_left - step_end + walk_left + walk_left + end_movement Route128_Movement_152293:: @ 8152293 - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement Route128_Movement_152296:: @ 8152296 - step_17 - step_17 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement Route128_Movement_1522A1:: @ 81522A1 - step_right - step_25 - step_end + walk_right + walk_in_place_fastest_down + end_movement Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 415138d67..72699ab79 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -224,101 +224,101 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 return @ 814C5B0 - step_30 - step_30 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement RustboroCity_Movement_14C5C2:: @ 814C5C2 - step_30 - step_30 - step_18 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement RustboroCity_Movement_14C5D3:: @ 814C5D3 - step_right - step_right - step_right - step_right - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement RustboroCity_Movement_14C5DB:: @ 814C5DB - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement RustboroCity_Movement_14C5E3:: @ 814C5E3 - step_down - step_right - step_right - step_end + walk_down + walk_right + walk_right + end_movement RustboroCity_Movement_14C5E7:: @ 814C5E7 - step_down - step_down - step_right - step_right - step_end + walk_down + walk_down + walk_right + walk_right + end_movement RustboroCity_Movement_14C5EC:: @ 814C5EC - step_down - step_down - step_right - step_right - step_end + walk_down + walk_down + walk_right + walk_right + end_movement RustboroCity_Movement_14C5F1:: @ 814C5F1 - step_down - step_down - step_down - step_right - step_right - step_end + walk_down + walk_down + walk_down + walk_right + walk_right + end_movement RustboroCity_Movement_14C5F7:: @ 814C5F7 - step_down - step_down - step_down - step_right - step_right - step_right - step_25 - step_end + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_down + end_movement RustboroCity_EventScript_14C5FF:: @ 814C5FF lock @@ -425,8 +425,8 @@ RustboroCity_EventScript_14C715:: @ 814C715 return RustboroCity_Movement_14C74B:: @ 814C74B - step_down - step_end + walk_down + end_movement RustboroCity_EventScript_14C74D:: @ 814C74D lockall diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 0b71effee..e68269437 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -69,79 +69,79 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 end @ 81577FE - step_up - step_up - step_up - step_27 - step_end + walk_up + walk_up + walk_up + walk_in_place_fastest_left + end_movement RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803 - step_right - step_right - step_right - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_27 - step_end + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_left + end_movement RustboroCity_DevonCorp_3F_Movement_157812:: @ 8157812 - step_14 - step_25 - step_end + delay_16 + walk_in_place_fastest_down + end_movement RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815 - step_right - step_right - step_right - step_down - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E - step_left - step_left - step_left - step_left - step_up - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + end_movement RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827 - step_right - step_right - step_right - step_right - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 - step_14 - step_14 - step_down - step_down - step_28 - step_end + delay_16 + delay_16 + walk_down + walk_down + walk_in_place_fastest_right + end_movement RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B lock diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 155df8de5..f8193cbb8 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -112,53 +112,53 @@ RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34 end RustboroCity_PokemonSchool_Movement_157B49:: @ 8157B49 - step_left - step_down - step_down - step_right - step_25 - step_14 - step_14 - step_14 - step_down - step_27 - step_14 - step_14 - step_right - step_14 - step_14 - step_13 - step_up - step_left - step_left - step_up - step_up - step_right - step_end + walk_left + walk_down + walk_down + walk_right + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + walk_down + walk_in_place_fastest_left + delay_16 + delay_16 + walk_right + delay_16 + delay_16 + delay_8 + walk_up + walk_left + walk_left + walk_up + walk_up + walk_right + end_movement RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60 - step_right - step_right - step_down - step_down - step_left - step_left - step_25 - step_14 - step_14 - step_14 - step_down - step_27 - step_14 - step_14 - step_right - step_14 - step_14 - step_13 - step_up - step_right - step_up - step_up - step_left - step_left - step_end + walk_right + walk_right + walk_down + walk_down + walk_left + walk_left + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + walk_down + walk_in_place_fastest_left + delay_16 + delay_16 + walk_right + delay_16 + delay_16 + delay_8 + walk_up + walk_right + walk_up + walk_up + walk_left + walk_left + end_movement diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 06f2dfa82..1aae9faba 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -155,114 +155,114 @@ RusturfTunnel_EventScript_15C92D:: @ 815C92D return RusturfTunnel_Movement_15C945:: @ 815C945 - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement RusturfTunnel_Movement_15C951:: @ 815C951 - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement @ 815C95D - step_left - step_28 - step_end + walk_left + walk_in_place_fastest_right + end_movement @ 815C960 - step_down - step_26 - step_13 - step_28 - step_end + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_right + end_movement @ 815C965 - step_up - step_25 - step_13 - step_28 - step_end + walk_up + walk_in_place_fastest_down + delay_8 + walk_in_place_fastest_right + end_movement RusturfTunnel_Movement_15C96A:: @ 815C96A - step_left - step_28 - step_end + walk_left + walk_in_place_fastest_right + end_movement RusturfTunnel_Movement_15C96D:: @ 815C96D - step_right - step_27 - step_end + walk_right + walk_in_place_fastest_left + end_movement RusturfTunnel_Movement_15C970:: @ 815C970 - step_up - step_28 - step_end + walk_up + walk_in_place_fastest_right + end_movement RusturfTunnel_Movement_15C973:: @ 815C973 - step_right - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement RusturfTunnel_Movement_15C980:: @ 815C980 - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement RusturfTunnel_Movement_15C98D:: @ 815C98D - step_right - step_end + walk_right + end_movement RusturfTunnel_Movement_15C98F:: @ 815C98F - step_22 - step_22 - step_16 - step_18 - step_end + walk_in_place_fast_up + walk_in_place_fast_up + walk_fast_up + walk_fast_right + end_movement RusturfTunnel_Movement_15C994:: @ 815C994 - step_24 - step_24 - step_18 - step_26 - step_end + walk_in_place_fast_right + walk_in_place_fast_right + walk_fast_right + walk_in_place_fastest_up + end_movement RusturfTunnel_EventScript_15C999:: @ 815C999 setvar VAR_TEMP_1, 1 @@ -290,10 +290,10 @@ RusturfTunnel_EventScript_15C9AB:: @ 815C9AB end RusturfTunnel_Movement_15C9D3:: @ 815C9D3 - step_40 - step_right - step_41 - step_end + lock_facing_direction + walk_right + unlock_facing_direction + end_movement RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 lock @@ -349,70 +349,70 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA end RusturfTunnel_Movement_15CA99:: @ 815CA99 - step_00 - step_40 - step_up - step_41 - step_27 - step_end + face_down + lock_facing_direction + walk_up + unlock_facing_direction + walk_in_place_fastest_left + end_movement RusturfTunnel_Movement_15CA9F:: @ 815CA9F - step_down - step_26 - step_end + walk_down + walk_in_place_fastest_up + end_movement RusturfTunnel_Movement_15CAA2:: @ 815CAA2 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_end + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + end_movement RusturfTunnel_Movement_15CAAC:: @ 815CAAC - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement RusturfTunnel_Movement_15CAB4:: @ 815CAB4 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement RusturfTunnel_Movement_15CAC0:: @ 815CAC0 - step_14 - step_right - step_end + delay_16 + walk_right + end_movement RusturfTunnel_Movement_15CAC3:: @ 815CAC3 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement RusturfTunnel_EventScript_15CACD:: @ 815CACD trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 493aa55a1..d7d581891 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -29,13 +29,13 @@ SafariZone_Southeast_EventScript_16007F:: @ 816007F return SafariZone_Southeast_Movement_160087:: @ 8160087 - step_down - step_end + walk_down + end_movement SafariZone_Southeast_Movement_160089:: @ 8160089 - step_right - step_25 - step_end + walk_right + walk_in_place_fastest_down + end_movement SafariZone_Southeast_EventScript_16008C:: @ 816008C msgbox SafariZone_Southeast_Text_1C3B71, 2 @@ -99,20 +99,20 @@ SafariZone_Southeast_EventScript_160139:: @ 8160139 end SafariZone_Southeast_Movement_16014B:: @ 816014B - step_up - step_end + walk_up + end_movement SafariZone_Southeast_Movement_16014D:: @ 816014D - step_right - step_26 - step_end + walk_right + walk_in_place_fastest_up + end_movement SafariZone_Southeast_Movement_160150:: @ 8160150 - step_left - step_28 - step_end + walk_left + walk_in_place_fastest_right + end_movement SafariZone_Southeast_Movement_160153:: @ 8160153 - step_down - step_26 - step_end + walk_down + walk_in_place_fastest_up + end_movement diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index f9cd83cac..eb46278dd 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -216,76 +216,76 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA end SeafloorCavern_Room9_Movement_15DD36:: @ 815DD36 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement @ 815DD3E - step_left - step_left - step_end + walk_left + walk_left + end_movement SeafloorCavern_Room9_Movement_15DD41:: @ 815DD41 - step_left - step_14 - step_end + walk_left + delay_16 + end_movement @ 815DD44 - step_right - step_end + walk_right + end_movement SeafloorCavern_Room9_Movement_15DD46:: @ 815DD46 - step_01 - step_40 - step_down - step_41 - step_28 - step_end + face_up + lock_facing_direction + walk_down + unlock_facing_direction + walk_in_place_fastest_right + end_movement SeafloorCavern_Room9_Movement_15DD4C:: @ 815DD4C - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 - step_end + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 + end_movement SeafloorCavern_Room9_Movement_15DD57:: @ 815DD57 - step_32 - step_32 - step_end + slide_up + slide_up + end_movement SeafloorCavern_Room9_Movement_15DD5A:: @ 815DD5A - step_18 - step_18 - step_18 - step_18 - step_18 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement SeafloorCavern_Room9_Movement_15DD60:: @ 815DD60 - step_right - step_right - step_end + walk_right + walk_right + end_movement SeafloorCavern_Room9_Movement_15DD63:: @ 815DD63 - step_18 - step_18 - step_18 - step_18 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement SeafloorCavern_Room9_Movement_15DD68:: @ 815DD68 - step_14 - step_14 - step_end + delay_16 + delay_16 + end_movement diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 5819aa10e..7d244e633 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -537,96 +537,96 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC end SlateportCity_Movement_14BFCD:: @ 814BFCD - step_14 - step_14 - step_57 - step_28 - step_14 - step_14 - step_27 - step_end + delay_16 + delay_16 + emote_question_mark + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_left + end_movement SlateportCity_Movement_14BFD5:: @ 814BFD5 - step_57 - step_26 - step_14 - step_25 - step_14 - step_14 - step_27 - step_end + emote_question_mark + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_down + delay_16 + delay_16 + walk_in_place_fastest_left + end_movement SlateportCity_Movement_14BFDD:: @ 814BFDD - step_14 - step_left - step_left - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + delay_16 + walk_left + walk_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement SlateportCity_Movement_14BFEA:: @ 814BFEA - step_down - step_left - step_left - step_left - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_down + walk_left + walk_left + walk_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement @ 814BFF8 - step_down - step_26 - step_end + walk_down + walk_in_place_fastest_up + end_movement SlateportCity_Movement_14BFFB:: @ 814BFFB - step_right - step_up - step_up - step_54 - step_end + walk_right + walk_up + walk_up + set_invisible + end_movement SlateportCity_Movement_14C000:: @ 814C000 - step_14 - step_14 - step_14 - step_14 - step_14 - step_down - step_left - step_end + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_left + end_movement SlateportCity_Movement_14C008:: @ 814C008 - step_28 - step_14 - step_14 - step_right - step_up - step_end + walk_in_place_fastest_right + delay_16 + delay_16 + walk_right + walk_up + end_movement SlateportCity_Movement_14C00E:: @ 814C00E - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_25 - step_end + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_down + end_movement SlateportCity_EventScript_14C017:: @ 814C017 msgbox SlateportCity_Text_165425, 3 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 22f797968..fd26671dd 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -46,46 +46,46 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 return SlateportCity_ContestLobby_Movement_1554C0:: @ 81554C0 - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement SlateportCity_ContestLobby_Movement_1554CA:: @ 81554CA - step_27 - step_end + walk_in_place_fastest_left + end_movement SlateportCity_ContestLobby_Movement_1554CC:: @ 81554CC - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement SlateportCity_ContestLobby_Movement_1554CF:: @ 81554CF - step_down - step_down - step_26 - step_end + walk_down + walk_down + walk_in_place_fastest_up + end_movement SlateportCity_ContestLobby_Movement_1554D3:: @ 81554D3 - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement SlateportCity_ContestLobby_Movement_1554DC:: @ 81554DC - step_28 - step_end + walk_in_place_fastest_right + end_movement SlateportCity_ContestLobby_EventScript_1554DE:: @ 81554DE msgbox SlateportCity_ContestLobby_Text_17C937, 2 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 82a17b0a6..8ab61661a 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -101,59 +101,59 @@ SlateportCity_Harbor_EventScript_156086:: @ 8156086 return SlateportCity_Harbor_Movement_15609B:: @ 815609B - step_14 - step_14 - step_43 - step_54 - step_end + delay_16 + delay_16 + jump_up + set_invisible + end_movement @ 81560A0 - step_14 - step_14 - step_43 - step_54 - step_end + delay_16 + delay_16 + jump_up + set_invisible + end_movement SlateportCity_Harbor_Movement_1560A5:: @ 81560A5 - step_14 - step_14 - step_14 - step_14 - step_right - step_right - step_right - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_end + delay_16 + delay_16 + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement SlateportCity_Harbor_Movement_1560B3:: @ 81560B3 - step_left - step_left - step_left - step_left - step_up - step_end + walk_left + walk_left + walk_left + walk_left + walk_up + end_movement SlateportCity_Harbor_Movement_1560B9:: @ 81560B9 - step_left - step_left - step_up - step_left - step_end + walk_left + walk_left + walk_up + walk_left + end_movement SlateportCity_Harbor_Movement_1560BE:: @ 81560BE - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + end_movement SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 - step_up - step_end + walk_up + end_movement SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock @@ -247,13 +247,13 @@ SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF return SlateportCity_Harbor_Movement_1561FA:: @ 81561FA - step_right - step_26 - step_end + walk_right + walk_in_place_fastest_up + end_movement SlateportCity_Harbor_Movement_1561FD:: @ 81561FD - step_up - step_end + walk_up + end_movement SlateportCity_Harbor_EventScript_1561FF:: @ 81561FF msgbox SlateportCity_Harbor_Text_17FC07, 2 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 4fef509c0..cb65f1be5 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -74,8 +74,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B end SlateportCity_OceanicMuseum_1F_Movement_155B8D:: @ 8155B8D - step_down - step_end + walk_down + end_movement SlateportCity_OceanicMuseum_1F_EventScript_155B8F:: @ 8155B8F msgbox SlateportCity_OceanicMuseum_1F_Text_17E2BB, 2 @@ -199,19 +199,19 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CC2:: @ 8155CC2 end SlateportCity_OceanicMuseum_1F_Movement_155CCC:: @ 8155CCC - step_00 - step_15 - step_15 - step_15 - step_15 - step_13 - step_end + face_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 + end_movement SlateportCity_OceanicMuseum_1F_Movement_155CD3:: @ 8155CD3 - step_18 - step_15 - step_15 - step_15 - step_15 - step_13 - step_end + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 + end_movement diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index d84982e2e..6947d52b1 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -114,104 +114,104 @@ SlateportCity_OceanicMuseum_2F_EventScript_155E83:: @ 8155E83 return SlateportCity_OceanicMuseum_2F_Movement_155E8E:: @ 8155E8E - step_left - step_down - step_27 - step_end + walk_left + walk_down + walk_in_place_fastest_left + end_movement SlateportCity_OceanicMuseum_2F_Movement_155E92:: @ 8155E92 - step_up - step_left - step_left - step_down - step_27 - step_end + walk_up + walk_left + walk_left + walk_down + walk_in_place_fastest_left + end_movement SlateportCity_OceanicMuseum_2F_Movement_155E98:: @ 8155E98 - step_up - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_left - step_left - step_up - step_up - step_13 - step_end + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_left + walk_left + walk_up + walk_up + delay_8 + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EA6:: @ 8155EA6 - step_right - step_end + walk_right + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EA8:: @ 8155EA8 - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EB2:: @ 8155EB2 - step_right - step_end + walk_right + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EB4:: @ 8155EB4 - step_down - step_right - step_25 - step_end + walk_down + walk_right + walk_in_place_fastest_down + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EB8:: @ 8155EB8 - step_down - step_down - step_down - step_right - step_right - step_right - step_end + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EBF:: @ 8155EBF - step_40 - step_left - step_41 - step_end + lock_facing_direction + walk_left + unlock_facing_direction + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EC3:: @ 8155EC3 - step_down - step_end + walk_down + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EC5:: @ 8155EC5 - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_end + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement SlateportCity_OceanicMuseum_2F_Movement_155ECE:: @ 8155ECE - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_13 - step_15 - step_26 - step_end + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_fast_down + walk_in_place_fastest_up + end_movement SlateportCity_OceanicMuseum_2F_EventScript_155EDA:: @ 8155EDA msgbox SlateportCity_OceanicMuseum_2F_Text_17F572, 3 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 6222d3774..f5452a7bb 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -282,146 +282,146 @@ SootopolisCity_EventScript_14D308:: @ 814D308 end SootopolisCity_Movement_14D413:: @ 814D413 - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + end_movement SootopolisCity_Movement_14D417:: @ 814D417 - step_right - step_right - step_right - step_up - step_25 - step_end + walk_right + walk_right + walk_right + walk_up + walk_in_place_fastest_down + end_movement SootopolisCity_Movement_14D41D:: @ 814D41D - step_down - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_left - step_left - step_end + walk_down + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + end_movement SootopolisCity_Movement_14D42D:: @ 814D42D - step_left - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement SootopolisCity_Movement_14D440:: @ 814D440 - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + end_movement SootopolisCity_Movement_14D445:: @ 814D445 - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_end + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement SootopolisCity_Movement_14D457:: @ 814D457 - step_14 - step_14 - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_end + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement SootopolisCity_Movement_14D46A:: @ 814D46A - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement SootopolisCity_Movement_14D47C:: @ 814D47C - step_14 - step_14 - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_end + delay_16 + delay_16 + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement SootopolisCity_EventScript_14D48F:: @ 814D48F .ifdef SAPPHIRE diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 0ad6aa027..a404013e0 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -82,8 +82,8 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 end SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD - step_54 - step_end + set_invisible + end_movement SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 874e3e901..13e4774e2 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -41,13 +41,13 @@ BattleTower_Outside_EventScript_160B3A:: @ 8160B3A return BattleTower_Outside_Movement_160B45:: @ 8160B45 - step_down - step_end + walk_down + end_movement BattleTower_Outside_Movement_160B47:: @ 8160B47 - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement SouthernIsland_Exterior_EventScript_160B4A:: @ 8160B4A msgbox SouthernIsland_Exterior_Text_1C52FB, 3 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index b7578cb5d..7094ebed8 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -76,35 +76,35 @@ SouthernIsland_Interior_EventScript_160C08:: @ 8160C08 end SouthernIsland_Interior_Movement_160C12:: @ 8160C12 - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + end_movement SouthernIsland_Interior_Movement_160C16:: @ 8160C16 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_26 - step_end + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_up + end_movement SouthernIsland_Interior_Movement_160C22:: @ 8160C22 - step_down - step_down - step_down - step_down - step_down - step_14 - step_14 - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_down + end_movement diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 3aef08e94..32661485d 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -46,46 +46,46 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 return VerdanturfTown_ContestLobby_Movement_153E19:: @ 8153E19 - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement VerdanturfTown_ContestLobby_Movement_153E23:: @ 8153E23 - step_27 - step_end + walk_in_place_fastest_left + end_movement VerdanturfTown_ContestLobby_Movement_153E25:: @ 8153E25 - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement VerdanturfTown_ContestLobby_Movement_153E28:: @ 8153E28 - step_down - step_down - step_26 - step_end + walk_down + walk_down + walk_in_place_fastest_up + end_movement VerdanturfTown_ContestLobby_Movement_153E2C:: @ 8153E2C - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement VerdanturfTown_ContestLobby_Movement_153E35:: @ 8153E35 - step_28 - step_end + walk_in_place_fastest_right + end_movement VerdanturfTown_ContestLobby_EventScript_153E37:: @ 8153E37 lockall diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 4f3180318..045189759 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -48,43 +48,43 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 end VictoryRoad_1F_Movement_15DF07:: @ 815DF07 - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_right - step_right - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + end_movement VictoryRoad_1F_Movement_15DF13:: @ 815DF13 - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_right - step_right - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + end_movement VictoryRoad_1F_Movement_15DF1E:: @ 815DF1E - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_right - step_right - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + end_movement VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 msgbox VictoryRoad_1F_Text_197967, 2 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 3d8f5532f..a1a99fa89 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -32,8 +32,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA return LittlerootTown_BrendansHouse_1F_Movement_1B69B5:: @ 81B69B5 - step_up - step_end + walk_up + end_movement LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 @@ -118,34 +118,34 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B:: @ 81B6A9B return LittlerootTown_BrendansHouse_2F_Movement_1B6AA2:: @ 81B6AA2 - step_13 - step_down - step_27 - step_14 - step_13 - step_left - step_end + delay_8 + walk_down + walk_in_place_fastest_left + delay_16 + delay_8 + walk_left + end_movement LittlerootTown_BrendansHouse_2F_Movement_1B6AA9:: @ 81B6AA9 - step_right - step_up - step_13 - step_end + walk_right + walk_up + delay_8 + end_movement LittlerootTown_BrendansHouse_2F_Movement_1B6AAD:: @ 81B6AAD - step_13 - step_down - step_28 - step_14 - step_13 - step_right - step_end + delay_8 + walk_down + walk_in_place_fastest_right + delay_16 + delay_8 + walk_right + end_movement LittlerootTown_BrendansHouse_2F_Movement_1B6AB4:: @ 81B6AB4 - step_left - step_up - step_13 - step_end + walk_left + walk_up + delay_8 + end_movement LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 @@ -226,26 +226,26 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE return LittlerootTown_BrendansHouse_1F_Movement_1B6BDB:: @ 81B6BDB - step_left - step_28 - step_end + walk_left + walk_in_place_fastest_right + end_movement LittlerootTown_MaysHouse_1F_Movement_1B6BDE:: @ 81B6BDE - step_right - step_27 - step_end + walk_right + walk_in_place_fastest_left + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6BE1:: @ 81B6BE1 - step_left - step_down - step_28 - step_end + walk_left + walk_down + walk_in_place_fastest_right + end_movement LittlerootTown_MaysHouse_1F_Movement_1B6BE5:: @ 81B6BE5 - step_right - step_down - step_27 - step_end + walk_right + walk_down + walk_in_place_fastest_left + end_movement LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 @@ -327,32 +327,32 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CB9:: @ 81B6CB9 end LittlerootTown_BrendansHouse_1F_Movement_1B6CCC:: @ 81B6CCC - step_down - step_down - step_left - step_left - step_left - step_end + walk_down + walk_down + walk_left + walk_left + walk_left + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6CD2:: @ 81B6CD2 - step_left - step_end + walk_left + end_movement LittlerootTown_MaysHouse_1F_Movement_1B6CD4:: @ 81B6CD4 - step_down - step_down - step_right - step_right - step_right - step_end + walk_down + walk_down + walk_right + walk_right + walk_right + end_movement LittlerootTown_MaysHouse_1F_Movement_1B6CDA:: @ 81B6CDA - step_right - step_end + walk_right + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6CDC:: @ 81B6CDC - step_up - step_end + walk_up + end_movement LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE @@ -455,58 +455,58 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6E28:: @ 81B6E28 return LittlerootTown_BrendansHouse_1F_Movement_1B6E33:: @ 81B6E33 - step_right - step_right - step_end + walk_right + walk_right + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E36:: @ 81B6E36 - step_left - step_left - step_end + walk_left + walk_left + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E39:: @ 81B6E39 - step_left - step_end + walk_left + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E3B:: @ 81B6E3B - step_right - step_end + walk_right + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E3D:: @ 81B6E3D - step_down - step_right - step_right - step_down - step_13 - step_end + walk_down + walk_right + walk_right + walk_down + delay_8 + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E43:: @ 81B6E43 - step_down - step_left - step_left - step_down - step_13 - step_end + walk_down + walk_left + walk_left + walk_down + delay_8 + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E49:: @ 81B6E49 - step_14 - step_down - step_down - step_down - step_27 - step_end + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_left + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E4F:: @ 81B6E4F - step_14 - step_14 - step_14 - step_25 - step_end + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_down + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E54:: @ 81B6E54 - step_14 - step_down - step_down - step_down - step_28 - step_end + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_right + end_movement diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 4b21aa99b..6f8cb1176 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -182,8 +182,8 @@ FallarborTown_ContestLobby_Movement_1B7821:: @ 81B7821 LilycoveCity_ContestLobby_Movement_1B7821:: @ 81B7821 SlateportCity_ContestLobby_Movement_1B7821:: @ 81B7821 VerdanturfTown_ContestLobby_Movement_1B7821:: @ 81B7821 - step_28 - step_end + walk_in_place_fastest_right + end_movement 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 6fe9e9a6e..49b8c5286 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -42,29 +42,29 @@ Route111_EventScript_1A38D9:: @ 81A38D9 end Route111_Movement_1A38E3:: @ 81A38E3 - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + end_movement Route111_Movement_1A38EF:: @ 81A38EF - step_left - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_down - step_down - step_end + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + walk_down + end_movement diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 790437f54..7ae04dfa6 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -84,144 +84,144 @@ enum { }; enum { - MOVEMENT_ACTION_FACE_DOWN, // 0x0 - MOVEMENT_ACTION_FACE_UP, // 0x1 - MOVEMENT_ACTION_FACE_LEFT, // 0x2 - MOVEMENT_ACTION_FACE_RIGHT, // 0x3 - MOVEMENT_ACTION_WALK_SLOW_DOWN, // 0x4 - MOVEMENT_ACTION_WALK_SLOW_UP, // 0x5 - MOVEMENT_ACTION_WALK_SLOW_LEFT, // 0x6 - MOVEMENT_ACTION_WALK_SLOW_RIGHT, // 0x7 - MOVEMENT_ACTION_WALK_NORMAL_DOWN, // 0x8 - MOVEMENT_ACTION_WALK_NORMAL_UP, // 0x9 - MOVEMENT_ACTION_WALK_NORMAL_LEFT, // 0xA - MOVEMENT_ACTION_WALK_NORMAL_RIGHT, // 0xB - MOVEMENT_ACTION_JUMP_2_DOWN, // 0xC - MOVEMENT_ACTION_JUMP_2_UP, // 0xD - MOVEMENT_ACTION_JUMP_2_LEFT, // 0xE - MOVEMENT_ACTION_JUMP_2_RIGHT, // 0xF - MOVEMENT_ACTION_DELAY_1, // 0x10 - MOVEMENT_ACTION_DELAY_2, // 0x11 - MOVEMENT_ACTION_DELAY_4, // 0x12 - MOVEMENT_ACTION_DELAY_8, // 0x13 - MOVEMENT_ACTION_DELAY_16, // 0x14 - MOVEMENT_ACTION_WALK_FAST_DOWN, // 0x15 - MOVEMENT_ACTION_WALK_FAST_UP, // 0x16 - MOVEMENT_ACTION_WALK_FAST_LEFT, // 0x17 - MOVEMENT_ACTION_WALK_FAST_RIGHT, // 0x18 - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN, // 0x19 - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP, // 0x1A - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT, // 0x1B - MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT, // 0x1C - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN, // 0x1D - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP, // 0x1E - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT, // 0x1F - MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT, // 0x20 - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN, // 0x21 - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP, // 0x22 - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT, // 0x23 - MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT, // 0x24 - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, // 0x25 - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP, // 0x26 - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT, // 0x27 - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT,// 0x28 - MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN, // 0x29 - MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP, // 0x2A - MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT, // 0x2B - MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT, // 0x2C - MOVEMENT_ACTION_WALK_FASTEST_DOWN, // 0x2D - MOVEMENT_ACTION_WALK_FASTEST_UP, // 0x2E - MOVEMENT_ACTION_WALK_FASTEST_LEFT, // 0x2F - MOVEMENT_ACTION_WALK_FASTEST_RIGHT, // 0x30 - MOVEMENT_ACTION_SLIDE_DOWN, // 0x31 - MOVEMENT_ACTION_SLIDE_UP, // 0x32 - MOVEMENT_ACTION_SLIDE_LEFT, // 0x33 - MOVEMENT_ACTION_SLIDE_RIGHT, // 0x34 - MOVEMENT_ACTION_PLAYER_RUN_DOWN, // 0x35 - MOVEMENT_ACTION_PLAYER_RUN_UP, // 0x36 - MOVEMENT_ACTION_PLAYER_RUN_LEFT, // 0x37 - MOVEMENT_ACTION_PLAYER_RUN_RIGHT, // 0x38 - MOVEMENT_ACTION_START_ANIM_IN_DIRECTION, // 0x39 - MOVEMENT_ACTION_JUMP_SPECIAL_DOWN, // 0x3A - MOVEMENT_ACTION_JUMP_SPECIAL_UP, // 0x3B - MOVEMENT_ACTION_JUMP_SPECIAL_LEFT , // 0x3C - MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT, // 0x3D - MOVEMENT_ACITON_FACE_PLAYER, // 0x3E - MOVEMENT_ACITON_FACE_AWAY_PLAYER, // 0x3F - MOVEMENT_ACTION_LOCK_FACING_DIRECTION, // 0x40 - MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION, // 0x41 - MOVEMENT_ACITON_JUMP_DOWN, // 0x42 - MOVEMENT_ACITON_JUMP_UP, // 0x43 - MOVEMENT_ACITON_JUMP_LEFT, // 0x44 - MOVEMENT_ACITON_JUMP_RIGHT, // 0x45 - MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN, // 0x46 - MOVEMENT_ACTION_JUMP_IN_PLACE_UP, // 0x47 - MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT, // 0x48 - MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT, // 0x49 - MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP, // 0x4A - MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN, // 0x4B - MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT, // 0x4C - MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT, // 0x4D - MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION, // 0x4E - MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN, // 0x4F - MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT, // 0x50 - MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT, // 0x51 - MOVEMENT_ACTION_DISABLE_ANIMATION, // 0x52 - MOVEMENT_ACTION_RESTORE_ANIMATION, // 0x53 - MOVEMENT_ACTION_SET_INVISIBLE, // 0x54 - MOVEMENT_ACTION_SET_VISIBLE, // 0x55 - MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK, // 0x56 - MOVEMENT_ACTION_EMOTE_QUESTION_MARK, // 0x57 - MOVEMENT_ACTION_EMOTE_HEART, // 0x58 - MOVEMENT_ACTION_REVEAL_TRAINER, // 0x59 - MOVEMENT_ACTION_ROCK_SMASH_BREAK, // 0x5A - MOVEMENT_ACTION_CUT_TREE, // 0x5B - MOVEMENT_ACTION_SET_FIXED_PRIORITY, // 0x5C - MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY, // 0x5D - MOVEMENT_ACTION_INIT_AFFINE_ANIM, // 0x5E - MOVEMENT_ACTION_CLEAR_AFFINE_ANIM, // 0x5F - MOVEMENT_ACTION_WALK_DOWN_AFFINE_0, // 0x60 - MOVEMENT_ACTION_WALK_DOWN_AFFINE_1, // 0x61 - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN, // 0x62 - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP, // 0x63 - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT, // 0x64 - MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT, // 0x65 - MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN, // 0x66 - MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP, // 0x67 - MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT, // 0x68 - MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT, // 0x69 - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN, // 0x6A - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP, // 0x6B - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT, // 0x6C - MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT,// 0x6D - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN, // 0x6E - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP, // 0x6F - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT, // 0x70 - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT,// 0x71 - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN, // 0x72 - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP, // 0x73 - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT, // 0x74 - MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT, // 0x75 - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN, // 0x76 - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP, // 0x77 - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT, // 0x78 - MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT, // 0x79 - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN, // 0x7A - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP, // 0x7B - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT, // 0x7C - MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT,// 0x7D - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN, // 0x7E - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP, // 0x7F - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT, // 0x80 - MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT,// 0x81 - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN, // 0x82 - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP, // 0x83 - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT, // 0x84 - MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT, // 0x85 - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN, // 0x86 - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP, // 0x87 - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT, // 0x88 - MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT,// 0x89 + MOVEMENT_ACTION_FACE_DOWN, + MOVEMENT_ACTION_FACE_UP, + MOVEMENT_ACTION_FACE_LEFT, + MOVEMENT_ACTION_FACE_RIGHT, + MOVEMENT_ACTION_WALK_SLOW_DOWN, + MOVEMENT_ACTION_WALK_SLOW_UP, + MOVEMENT_ACTION_WALK_SLOW_LEFT, + MOVEMENT_ACTION_WALK_SLOW_RIGHT, + MOVEMENT_ACTION_WALK_NORMAL_DOWN, + MOVEMENT_ACTION_WALK_NORMAL_UP, + MOVEMENT_ACTION_WALK_NORMAL_LEFT, + MOVEMENT_ACTION_WALK_NORMAL_RIGHT, + MOVEMENT_ACTION_JUMP_2_DOWN, + MOVEMENT_ACTION_JUMP_2_UP, + MOVEMENT_ACTION_JUMP_2_LEFT, + MOVEMENT_ACTION_JUMP_2_RIGHT, + MOVEMENT_ACTION_DELAY_1, + MOVEMENT_ACTION_DELAY_2, + MOVEMENT_ACTION_DELAY_4, + MOVEMENT_ACTION_DELAY_8, + MOVEMENT_ACTION_DELAY_16, + MOVEMENT_ACTION_WALK_FAST_DOWN, + MOVEMENT_ACTION_WALK_FAST_UP, + MOVEMENT_ACTION_WALK_FAST_LEFT, + MOVEMENT_ACTION_WALK_FAST_RIGHT, + MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP, + MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT, + MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT, + MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP, + MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT, + MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT, + MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP, + MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT, + MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT, + MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP, + MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT, + MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT, + MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN, + MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP, + MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT, + MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT, + MOVEMENT_ACTION_WALK_FASTEST_DOWN, + MOVEMENT_ACTION_WALK_FASTEST_UP, + MOVEMENT_ACTION_WALK_FASTEST_LEFT, + MOVEMENT_ACTION_WALK_FASTEST_RIGHT, + MOVEMENT_ACTION_SLIDE_DOWN, + MOVEMENT_ACTION_SLIDE_UP, + MOVEMENT_ACTION_SLIDE_LEFT, + MOVEMENT_ACTION_SLIDE_RIGHT, + MOVEMENT_ACTION_PLAYER_RUN_DOWN, + MOVEMENT_ACTION_PLAYER_RUN_UP, + MOVEMENT_ACTION_PLAYER_RUN_LEFT, + MOVEMENT_ACTION_PLAYER_RUN_RIGHT, + MOVEMENT_ACTION_START_ANIM_IN_DIRECTION, + MOVEMENT_ACTION_JUMP_SPECIAL_DOWN, + MOVEMENT_ACTION_JUMP_SPECIAL_UP, + MOVEMENT_ACTION_JUMP_SPECIAL_LEFT , + MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT, + MOVEMENT_ACITON_FACE_PLAYER, + MOVEMENT_ACITON_FACE_AWAY_PLAYER, + MOVEMENT_ACTION_LOCK_FACING_DIRECTION, + MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION, + MOVEMENT_ACITON_JUMP_DOWN, + MOVEMENT_ACITON_JUMP_UP, + MOVEMENT_ACITON_JUMP_LEFT, + MOVEMENT_ACITON_JUMP_RIGHT, + MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN, + MOVEMENT_ACTION_JUMP_IN_PLACE_UP, + MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT, + MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT, + MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP, + MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN, + MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT, + MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT, + MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION, + MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN, + MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT, + MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT, + MOVEMENT_ACTION_DISABLE_ANIMATION, + MOVEMENT_ACTION_RESTORE_ANIMATION, + MOVEMENT_ACTION_SET_INVISIBLE, + MOVEMENT_ACTION_SET_VISIBLE, + MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK, + MOVEMENT_ACTION_EMOTE_QUESTION_MARK, + MOVEMENT_ACTION_EMOTE_HEART, + MOVEMENT_ACTION_REVEAL_TRAINER, + MOVEMENT_ACTION_ROCK_SMASH_BREAK, + MOVEMENT_ACTION_CUT_TREE, + MOVEMENT_ACTION_SET_FIXED_PRIORITY, + MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY, + MOVEMENT_ACTION_INIT_AFFINE_ANIM, + MOVEMENT_ACTION_CLEAR_AFFINE_ANIM, + MOVEMENT_ACTION_WALK_DOWN_AFFINE_0, + MOVEMENT_ACTION_WALK_DOWN_AFFINE_1, + MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT, + MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN, + MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP, + MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT, + MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT, + MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT, + MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT, + MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT, + MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN, + MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP, + MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT, + MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT, + MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN, + MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP, + MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT, + MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT, }; #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN (1 << 0) diff --git a/include/macros/movement.inc b/include/macros/movement.inc index a4bba7a17..80a5b5dca 100644 --- a/include/macros/movement.inc +++ b/include/macros/movement.inc @@ -1,4 +1,4 @@ - .macro create_movement name + .macro create_movement_action name enum _\name .macro \name .byte _\name @@ -6,104 +6,104 @@ .endm enum_start - create_movement step_00 - create_movement step_01 - create_movement step_02 - create_movement step_03 - create_movement slow_step_down - create_movement slow_step_up - create_movement slow_step_left - create_movement slow_step_right - create_movement step_down - create_movement step_up - create_movement step_left - create_movement step_right - create_movement fast_step_down - create_movement fast_step_up - create_movement fast_step_left - create_movement fast_step_right - create_movement step_10 - create_movement step_11 - create_movement step_12 - create_movement step_13 - create_movement step_14 - create_movement step_15 - create_movement step_16 - create_movement step_17 - create_movement step_18 - create_movement step_19 - create_movement step_1a - create_movement step_1b - create_movement step_1c - create_movement step_1d - create_movement step_1e - create_movement step_1f - create_movement step_20 - create_movement step_21 - create_movement step_22 - create_movement step_23 - create_movement step_24 - create_movement step_25 - create_movement step_26 - create_movement step_27 - create_movement step_28 - create_movement step_29 - create_movement step_2a - create_movement step_2b - create_movement step_2c - create_movement step_2d - create_movement step_2e - create_movement step_2f - create_movement step_30 - create_movement step_31 - create_movement step_32 - create_movement step_33 - create_movement step_34 - create_movement step_35 - create_movement step_36 - create_movement step_37 - create_movement step_38 - create_movement step_39 - create_movement step_3a - create_movement step_3b - create_movement step_3c - create_movement step_3d - create_movement step_3e - create_movement step_3f - create_movement step_40 - create_movement step_41 - create_movement step_42 - create_movement step_43 - create_movement step_44 - create_movement step_45 - create_movement step_46 - create_movement step_47 - create_movement step_48 - create_movement step_49 - create_movement step_4a - create_movement step_4b - create_movement step_4c - create_movement step_4d - create_movement step_4e - create_movement step_4f - create_movement step_50 - create_movement step_51 - create_movement step_52 - create_movement step_53 - create_movement step_54 - create_movement step_55 - create_movement step_56 - create_movement step_57 - create_movement step_58 - create_movement step_59 - create_movement step_5a - create_movement step_5b - create_movement step_5c - create_movement step_5d - create_movement step_5e - create_movement step_5f - create_movement step_60 - create_movement step_61 + create_movement_action face_down + create_movement_action face_up + create_movement_action face_left + create_movement_action face_right + create_movement_action walk_slow_down + create_movement_action walk_slow_up + create_movement_action walk_slow_left + create_movement_action walk_slow_right + create_movement_action walk_down + create_movement_action walk_up + create_movement_action walk_left + create_movement_action walk_right + create_movement_action jump_2_down + create_movement_action jump_2_up + create_movement_action jump_2_left + create_movement_action jump_2_right + create_movement_action delay_1 + create_movement_action delay_2 + create_movement_action delay_4 + create_movement_action delay_8 + create_movement_action delay_16 + create_movement_action walk_fast_down + create_movement_action walk_fast_up + create_movement_action walk_fast_left + create_movement_action walk_fast_right + create_movement_action walk_in_place_slow_down + create_movement_action walk_in_place_slow_up + create_movement_action walk_in_place_slow_left + create_movement_action walk_in_place_slow_right + create_movement_action walk_in_place_down + create_movement_action walk_in_place_up + create_movement_action walk_in_place_left + create_movement_action walk_in_place_right + create_movement_action walk_in_place_fast_down + create_movement_action walk_in_place_fast_up + create_movement_action walk_in_place_fast_left + create_movement_action walk_in_place_fast_right + create_movement_action walk_in_place_fastest_down + create_movement_action walk_in_place_fastest_up + create_movement_action walk_in_place_fastest_left + create_movement_action walk_in_place_fastest_right + create_movement_action ride_water_current_down + create_movement_action ride_water_current_up + create_movement_action ride_water_current_left + create_movement_action ride_water_current_right + create_movement_action walk_fastest_down + create_movement_action walk_fastest_up + create_movement_action walk_fastest_left + create_movement_action walk_fastest_right + create_movement_action slide_down + create_movement_action slide_up + create_movement_action slide_left + create_movement_action slide_right + create_movement_action player_run_down + create_movement_action player_run_up + create_movement_action player_run_left + create_movement_action player_run_right + create_movement_action start_anim_in_direction + create_movement_action jump_special_down + create_movement_action jump_special_up + create_movement_action jump_special_left + create_movement_action jump_special_right + create_movement_action face_player + create_movement_action face_away_player + create_movement_action lock_facing_direction + create_movement_action unlock_facing_direction + create_movement_action jump_down + create_movement_action jump_up + create_movement_action jump_left + create_movement_action jump_right + create_movement_action jump_in_place_down + create_movement_action jump_in_place_up + create_movement_action jump_in_place_left + create_movement_action jump_in_place_right + create_movement_action jump_in_place_down_up + create_movement_action jump_in_place_up_down + create_movement_action jump_in_place_left_right + create_movement_action jump_in_place_right_left + create_movement_action face_original_direction + create_movement_action nurse_joy_bow + create_movement_action enable_jump_landing_ground_effect + create_movement_action disable_jump_landing_ground_effect + create_movement_action disable_anim + create_movement_action restore_anim + create_movement_action set_invisible + create_movement_action set_visible + create_movement_action emote_exclamation_mark + create_movement_action emote_question_mark + create_movement_action emote_heart + create_movement_action reveal_trainer + create_movement_action rock_smash_break + create_movement_action cut_tree + create_movement_action set_fixed_priority + create_movement_action clear_fixed_priority + create_movement_action init_affine_anim + create_movement_action clear_affine_anim + create_movement_action walk_down_affine_0 + create_movement_action walk_down_affine_1 enum_start 0xfe - create_movement step_end + create_movement_action end_movement |