diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-27 16:53:59 -0400 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-27 16:53:59 -0400 |
commit | 625f62139721a7ddc1f2625b8609b415bec419fb (patch) | |
tree | ef4702b0568c5e22b3eb2d9fff219872206316b8 | |
parent | b9560c155ec5db1ea43562df736ffcf0c10ae087 (diff) |
Sync movement.inc
82 files changed, 562 insertions, 1069 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 449fd3b65..2a112633f 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1574,7 +1574,7 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442 EventScript_1A0457: @ unreferenced? delay 30 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 showobjectat 255, MAP_PETALBURG_CITY delay 30 @@ -1750,7 +1750,7 @@ Route119_EventScript_1A05AE:: @ 81A05AE Route119_EventScript_1A05C3:: @ 81A05C3 msgbox Route119_Text_171BF6, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_1A0839 + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 applymovement VAR_LAST_TALKED, Route119_Movement_1A0662 waitmovement 0 @@ -1858,7 +1858,7 @@ EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_GlaciasRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_PhoebesRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 - applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853 + applymovement 255, Common_Movement_Delay32 waitmovement 0 playse SE_DOOR setmetatile 6, 1, 836, 0 @@ -1880,7 +1880,7 @@ EverGrandeCity_DrakesRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_GlaciasRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_PhoebesRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 - applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847 + applymovement 255, Common_Movement_WalkUp6 waitmovement 0 playse SE_TRACK_DOOR setmetatile 5, 12, 518, 1 @@ -1928,296 +1928,7 @@ EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA setmetatile 7, 13, 526, 1 return -SlateportCity_Movement_1A0831:: @ 81A0831 - emote_question_mark - step_end - -AquaHideout_B2F_Movement_1A0833:: @ 81A0833 -EverGrandeCity_ChampionsRoom_Movement_1A0833:: @ 81A0833 -LavaridgeTown_Movement_1A0833:: @ 81A0833 -LilycoveCity_ContestLobby_Movement_1A0833:: @ 81A0833 -LilycoveCity_CoveLilyMotel_1F_Movement_1A0833:: @ 81A0833 -LittlerootTown_BrendansHouse_1F_Movement_1A0833:: @ 81A0833 -LittlerootTown_BrendansHouse_2F_Movement_1A0833:: @ 81A0833 -LittlerootTown_MaysHouse_1F_Movement_1A0833:: @ 81A0833 -MauvilleCity_House2_Movement_1A0833:: @ 81A0833 -MauvilleCity_Movement_1A0833:: @ 81A0833 -MeteorFalls_1F_1R_Movement_1A0833:: @ 81A0833 -MossdeepCity_StevensHouse_Movement_1A0833:: @ 81A0833 -MtChimney_Movement_1A0833:: @ 81A0833 -PetalburgCity_Movement_1A0833:: @ 81A0833 -Route103_Movement_1A0833:: @ 81A0833 -Route110_Movement_1A0833:: @ 81A0833 -Route110_TrickHouseEnd_Movement_1A0833:: @ 81A0833 -Route110_TrickHouseEntrance_Movement_1A0833:: @ 81A0833 -Route110_TrickHousePuzzle5_Movement_1A0833:: @ 81A0833 -RustboroCity_DevonCorp_2F_Movement_1A0833:: @ 81A0833 -RustboroCity_Movement_1A0833:: @ 81A0833 -RusturfTunnel_Movement_1A0833:: @ 81A0833 -SeafloorCavern_Room9_Movement_1A0833:: @ 81A0833 -SlateportCity_Movement_1A0833:: @ 81A0833 -SlateportCity_OceanicMuseum_1F_Movement_1A0833:: @ 81A0833 -SlateportCity_PokemonFanClub_Movement_1A0833:: @ 81A0833 -SootopolisCity_Movement_1A0833:: @ 81A0833 - emote_exclamation_mark - step_end - -EverGrandeCity_ChampionsRoom_Movement_1A0835:: @ 81A0835 -LavaridgeTown_Movement_1A0835:: @ 81A0835 -LilycoveCity_CoveLilyMotel_1F_Movement_1A0835:: @ 81A0835 -LittlerootTown_BrendansHouse_1F_Movement_1A0835:: @ 81A0835 -LittlerootTown_BrendansHouse_2F_Movement_1A0835:: @ 81A0835 -LittlerootTown_MaysHouse_1F_Movement_1A0835:: @ 81A0835 -MauvilleCity_House2_Movement_1A0835:: @ 81A0835 -MauvilleCity_Movement_1A0835:: @ 81A0835 -MeteorFalls_1F_1R_Movement_1A0835:: @ 81A0835 -MossdeepCity_StevensHouse_Movement_1A0835:: @ 81A0835 -MtChimney_Movement_1A0835:: @ 81A0835 -PetalburgCity_Movement_1A0835:: @ 81A0835 -Route103_Movement_1A0835:: @ 81A0835 -Route110_Movement_1A0835:: @ 81A0835 -Route110_TrickHouseEntrance_Movement_1A0835:: @ 81A0835 -Route110_TrickHousePuzzle5_Movement_1A0835:: @ 81A0835 -RustboroCity_DevonCorp_2F_Movement_1A0835:: @ 81A0835 -RustboroCity_Movement_1A0835:: @ 81A0835 -RusturfTunnel_Movement_1A0835:: @ 81A0835 -SeafloorCavern_Room9_Movement_1A0835:: @ 81A0835 -SlateportCity_Movement_1A0835:: @ 81A0835 -SlateportCity_OceanicMuseum_1F_Movement_1A0835:: @ 81A0835 -SlateportCity_PokemonFanClub_Movement_1A0835:: @ 81A0835 -SootopolisCity_Movement_1A0835:: @ 81A0835 - delay_16 - delay_16 - delay_16 - step_end - -AquaHideout_B2F_Movement_1A0839:: @ 81A0839 -EverGrandeCity_PokemonLeague_Movement_1A0839:: @ 81A0839 -FallarborTown_House2_Movement_1A0839:: @ 81A0839 -FortreeCity_House4_Movement_1A0839:: @ 81A0839 -LilycoveCity_ContestHall_Movement_1A0839:: @ 81A0839 -LilycoveCity_CoveLilyMotel_1F_Movement_1A0839:: @ 81A0839 -LilycoveCity_DepartmentStore_1F_Movement_1A0839:: @ 81A0839 -LilycoveCity_Harbor_Movement_1A0839:: @ 81A0839 -LilycoveCity_LilycoveMuseum_1F_Movement_1A0839:: @ 81A0839 -LilycoveCity_LilycoveMuseum_2F_Movement_1A0839:: @ 81A0839 -LilycoveCity_MoveDeletersHouse_Movement_1A0839:: @ 81A0839 -LilycoveCity_Movement_1A0839:: @ 81A0839 -LittlerootTown_BrendansHouse_1F_Movement_1A0839:: @ 81A0839 -LittlerootTown_BrendansHouse_2F_Movement_1A0839:: @ 81A0839 -MauvilleCity_Movement_1A0839:: @ 81A0839 -MtChimney_Movement_1A0839:: @ 81A0839 -MtPyre_Summit_Movement_1A0839:: @ 81A0839 -OldaleTown_Movement_1A0839:: @ 81A0839 -PetalburgCity_Gym_Movement_1A0839:: @ 81A0839 -PetalburgCity_Movement_1A0839:: @ 81A0839 -Route103_Movement_1A0839:: @ 81A0839 -Route110_TrickHouseEnd_Movement_1A0839:: @ 81A0839 -Route110_TrickHouseEntrance_Movement_1A0839:: @ 81A0839 -Route110_TrickHousePuzzle5_Movement_1A0839:: @ 81A0839 -Route119_Movement_1A0839:: @ 81A0839 -RusturfTunnel_Movement_1A0839:: @ 81A0839 -SeafloorCavern_Room9_Movement_1A0839:: @ 81A0839 -SlateportCity_ContestLobby_Movement_1A0839:: @ 81A0839 -SlateportCity_Movement_1A0839:: @ 81A0839 -SlateportCity_SternsShipyard_1F_Movement_1A0839:: @ 81A0839 - face_player - step_end - -@ 81A083B - face_away_player - step_end - -EverGrandeCity_PokemonLeague_Movement_1A083D:: @ 81A083D -LilycoveCity_ContestHall_Movement_1A083D:: @ 81A083D -LilycoveCity_ContestLobby_Movement_1A083D:: @ 81A083D -LilycoveCity_CoveLilyMotel_1F_Movement_1A083D:: @ 81A083D -LilycoveCity_House3_Movement_1A083D:: @ 81A083D -LilycoveCity_LilycoveMuseum_1F_Movement_1A083D:: @ 81A083D -LilycoveCity_Movement_1A083D:: @ 81A083D -LittlerootTown_Movement_1A083D:: @ 81A083D -MauvilleCity_GameCorner_Movement_1A083D:: @ 81A083D -MauvilleCity_Movement_1A083D:: @ 81A083D -MossdeepCity_Movement_1A083D:: @ 81A083D -MossdeepCity_SpaceCenter_1F_Movement_1A083D:: @ 81A083D -MtChimney_Movement_1A083D:: @ 81A083D -OldaleTown_Movement_1A083D:: @ 81A083D -PetalburgCity_Movement_1A083D:: @ 81A083D -Route109_Movement_1A083D:: @ 81A083D -Route110_Movement_1A083D:: @ 81A083D -Route111_WinstrateFamilysHouse_Movement_1A083D:: @ 81A083D -Route119_Movement_1A083D:: @ 81A083D -RustboroCity_DevonCorp_3F_Movement_1A083D:: @ 81A083D -RustboroCity_Movement_1A083D:: @ 81A083D -RusturfTunnel_Movement_1A083D:: @ 81A083D -SlateportCity_ContestHall_Movement_1A083D:: @ 81A083D -SlateportCity_ContestLobby_Movement_1A083D:: @ 81A083D -SlateportCity_Harbor_Movement_1A083D:: @ 81A083D -SlateportCity_Movement_1A083D:: @ 81A083D -SlateportCity_OceanicMuseum_2F_Movement_1A083D:: @ 81A083D -SlateportCity_SternsShipyard_1F_Movement_1A083D:: @ 81A083D -VerdanturfTown_Movement_1A083D:: @ 81A083D - face_original_direction - step_end - -Movement_1A083F:: @ 81A083F -DewfordTown_Hall_Movement_1A083F:: @ 81A083F -EverGrandeCity_ChampionsRoom_Movement_1A083F:: @ 81A083F -EverGrandeCity_HallOfFame_Movement_1A083F:: @ 81A083F -LavaridgeTown_Movement_1A083F:: @ 81A083F -LilycoveCity_PokemonTrainerFanClub_Movement_1A083F:: @ 81A083F -LittlerootTown_BrendansHouse_1F_Movement_1A083F:: @ 81A083F -LittlerootTown_BrendansHouse_2F_Movement_1A083F:: @ 81A083F -LittlerootTown_MaysHouse_1F_Movement_1A083F:: @ 81A083F -LittlerootTown_Movement_1A083F:: @ 81A083F -MeteorFalls_1F_1R_Movement_1A083F:: @ 81A083F -MossdeepCity_StevensHouse_Movement_1A083F:: @ 81A083F -MtChimney_Movement_1A083F:: @ 81A083F -MtPyre_Summit_Movement_1A083F:: @ 81A083F -OldaleTown_PokemonCenter_1F_Movement_1A083F:: @ 81A083F -PetalburgCity_Gym_Movement_1A083F:: @ 81A083F -PetalburgCity_Movement_1A083F:: @ 81A083F -PetalburgWoods_Movement_1A083F:: @ 81A083F -Route101_Movement_1A083F:: @ 81A083F -Route110_TrickHouseEnd_Movement_1A083F:: @ 81A083F -Route111_Movement_1A083F:: @ 81A083F -Route116_Movement_1A083F:: @ 81A083F -Route120_Movement_1A083F:: @ 81A083F -Route128_Movement_1A083F:: @ 81A083F -RustboroCity_Movement_1A083F:: @ 81A083F -SeafloorCavern_Room9_Movement_1A083F:: @ 81A083F -SlateportCity_Movement_1A083F:: @ 81A083F -SlateportCity_OceanicMuseum_1F_Movement_1A083F:: @ 81A083F -SlateportCity_OceanicMuseum_2F_Movement_1A083F:: @ 81A083F -SootopolisCity_Movement_1A083F:: @ 81A083F -VictoryRoad_1F_Movement_1A083F:: @ 81A083F - walk_in_place_fastest_left - step_end - -AquaHideout_B2F_Movement_1A0841:: @ 81A0841 -CaveOfOrigin_B4F_Movement_1A0841:: @ 81A0841 -DewfordTown_Hall_Movement_1A0841:: @ 81A0841 -EverGrandeCity_ChampionsRoom_Movement_1A0841:: @ 81A0841 -EverGrandeCity_HallOfFame_Movement_1A0841:: @ 81A0841 -LilycoveCity_Harbor_Movement_1A0841:: @ 81A0841 -LittlerootTown_BrendansHouse_1F_Movement_1A0841:: @ 81A0841 -LittlerootTown_Movement_1A0841:: @ 81A0841 -MeteorFalls_1F_1R_Movement_1A0841:: @ 81A0841 -MossdeepCity_GameCorner_1F_Movement_1A0841:: @ 81A0841 -MtPyre_Summit_Movement_1A0841:: @ 81A0841 -NewMauville_Entrance_Movement_1A0841:: @ 81A0841 -PetalburgCity_Gym_Movement_1A0841:: @ 81A0841 -PetalburgCity_Movement_1A0841:: @ 81A0841 -PetalburgWoods_Movement_1A0841:: @ 81A0841 -Route110_TrickHouseEnd_Movement_1A0841:: @ 81A0841 -Route110_TrickHouseEntrance_Movement_1A0841:: @ 81A0841 -Route111_Movement_1A0841:: @ 81A0841 -Route118_Movement_1A0841:: @ 81A0841 -Route120_Movement_1A0841:: @ 81A0841 -Route121_SafariZoneEntrance_Movement_1A0841:: @ 81A0841 -Route128_Movement_1A0841:: @ 81A0841 -RustboroCity_Movement_1A0841:: @ 81A0841 -RusturfTunnel_Movement_1A0841:: @ 81A0841 -SeafloorCavern_Room9_Movement_1A0841:: @ 81A0841 -SlateportCity_Harbor_Movement_1A0841:: @ 81A0841 -SlateportCity_Movement_1A0841:: @ 81A0841 -SlateportCity_OceanicMuseum_2F_Movement_1A0841:: @ 81A0841 - walk_in_place_fastest_up - step_end - -AquaHideout_B2F_Movement_1A0843:: @ 81A0843 -DewfordTown_Hall_Movement_1A0843:: @ 81A0843 -EverGrandeCity_ChampionsRoom_Movement_1A0843:: @ 81A0843 -EverGrandeCity_HallOfFame_Movement_1A0843:: @ 81A0843 -LavaridgeTown_Movement_1A0843:: @ 81A0843 -LilycoveCity_DepartmentStore_1F_Movement_1A0843:: @ 81A0843 -LilycoveCity_PokemonTrainerFanClub_Movement_1A0843:: @ 81A0843 -LittlerootTown_BrendansHouse_1F_Movement_1A0843:: @ 81A0843 -LittlerootTown_BrendansHouse_2F_Movement_1A0843:: @ 81A0843 -LittlerootTown_MaysHouse_1F_Movement_1A0843:: @ 81A0843 -LittlerootTown_Movement_1A0843:: @ 81A0843 -LittlerootTown_ProfessorBirchsLab_Movement_1A0843:: @ 81A0843 -MauvilleCity_Movement_1A0843:: @ 81A0843 -MtPyre_Summit_Movement_1A0843:: @ 81A0843 -OldaleTown_Movement_1A0843:: @ 81A0843 -PetalburgCity_Gym_Movement_1A0843:: @ 81A0843 -PetalburgCity_Movement_1A0843:: @ 81A0843 -Route101_Movement_1A0843:: @ 81A0843 -Route110_Movement_1A0843:: @ 81A0843 -Route110_TrickHouseEnd_Movement_1A0843:: @ 81A0843 -Route116_Movement_1A0843:: @ 81A0843 -Route120_Movement_1A0843:: @ 81A0843 -Route128_Movement_1A0843:: @ 81A0843 -RustboroCity_Movement_1A0843:: @ 81A0843 -SlateportCity_Harbor_Movement_1A0843:: @ 81A0843 -SlateportCity_Movement_1A0843:: @ 81A0843 -SlateportCity_OceanicMuseum_1F_Movement_1A0843:: @ 81A0843 -SlateportCity_OceanicMuseum_2F_Movement_1A0843:: @ 81A0843 -SootopolisCity_Movement_1A0843:: @ 81A0843 - walk_in_place_fastest_right - step_end - -BattleTower_Outside_Movement_1A0845:: @ 81A0845 -DewfordTown_Hall_Movement_1A0845:: @ 81A0845 -EverGrandeCity_ChampionsRoom_Movement_1A0845:: @ 81A0845 -LilycoveCity_CoveLilyMotel_1F_Movement_1A0845:: @ 81A0845 -LilycoveCity_DepartmentStoreElevator_Movement_1A0845:: @ 81A0845 -LilycoveCity_Movement_1A0845:: @ 81A0845 -LilycoveCity_PokemonTrainerFanClub_Movement_1A0845:: @ 81A0845 -LittlerootTown_Movement_1A0845:: @ 81A0845 -MauvilleCity_Movement_1A0845:: @ 81A0845 -MeteorFalls_1F_1R_Movement_1A0845:: @ 81A0845 -MtPyre_Summit_Movement_1A0845:: @ 81A0845 -OldaleTown_PokemonCenter_1F_Movement_1A0845:: @ 81A0845 -PetalburgCity_Gym_Movement_1A0845:: @ 81A0845 -PetalburgCity_Movement_1A0845:: @ 81A0845 -PetalburgWoods_Movement_1A0845:: @ 81A0845 -Route110_Movement_1A0845:: @ 81A0845 -Route110_TrickHouseEnd_Movement_1A0845:: @ 81A0845 -Route119_Movement_1A0845:: @ 81A0845 -Route120_Movement_1A0845:: @ 81A0845 -Route128_Movement_1A0845:: @ 81A0845 -RustboroCity_Movement_1A0845:: @ 81A0845 -RustboroCity_PokemonSchool_Movement_1A0845:: @ 81A0845 -RusturfTunnel_Movement_1A0845:: @ 81A0845 -SeafloorCavern_Room9_Movement_1A0845:: @ 81A0845 -SlateportCity_Harbor_Movement_1A0845:: @ 81A0845 -SlateportCity_Movement_1A0845:: @ 81A0845 -SlateportCity_OceanicMuseum_2F_Movement_1A0845:: @ 81A0845 -SootopolisCity_Movement_1A0845:: @ 81A0845 -SouthernIsland_Exterior_Movement_1A0845:: @ 81A0845 - walk_in_place_fastest_down - step_end - -EverGrandeCity_SidneysRoom_Movement_1A0847:: @ 81A0847 - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -EverGrandeCity_ChampionsRoom_Movement_1A084E:: @ 81A084E - walk_up - walk_up - walk_up - walk_up - step_end - -EverGrandeCity_SidneysRoom_Movement_1A0853:: @ 81A0853 - delay_16 - delay_16 - step_end - -Route110_TrickHouseEntrance_Movement_1A0856:: @ 81A0856 - walk_up - step_end - -@ 81A0858 - walk_up - walk_up - step_end + .include "data/scripts/movement.inc" PictureBookShelfScript:: @ 81A085B msgbox PictureBookShelfText, MSGBOX_SIGN diff --git a/data/event_scripts.s b/data/event_scripts.s index a216dcce7..c0b92f5cd 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1573,7 +1573,7 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442 EventScript_1A0457: @ unreferenced? delay 30 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 showobjectat 255, MAP_PETALBURG_CITY delay 30 @@ -1749,7 +1749,7 @@ Route119_EventScript_1A05AE:: @ 81A05AE Route119_EventScript_1A05C3:: @ 81A05C3 msgbox Route119_Text_171BF6, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_1A0839 + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 applymovement VAR_LAST_TALKED, Route119_Movement_1A0662 waitmovement 0 @@ -1857,7 +1857,7 @@ EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_GlaciasRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_PhoebesRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 - applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853 + applymovement 255, Common_Movement_Delay32 waitmovement 0 playse SE_DOOR setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 @@ -1879,7 +1879,7 @@ EverGrandeCity_DrakesRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_GlaciasRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_PhoebesRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 - applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847 + applymovement 255, Common_Movement_WalkUp6 waitmovement 0 playse SE_TRACK_DOOR setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 @@ -1927,296 +1927,7 @@ EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 return -SlateportCity_Movement_1A0831:: @ 81A0831 - emote_question_mark - step_end - -AquaHideout_B2F_Movement_1A0833:: @ 81A0833 -EverGrandeCity_ChampionsRoom_Movement_1A0833:: @ 81A0833 -LavaridgeTown_Movement_1A0833:: @ 81A0833 -LilycoveCity_ContestLobby_Movement_1A0833:: @ 81A0833 -LilycoveCity_CoveLilyMotel_1F_Movement_1A0833:: @ 81A0833 -LittlerootTown_BrendansHouse_1F_Movement_1A0833:: @ 81A0833 -LittlerootTown_BrendansHouse_2F_Movement_1A0833:: @ 81A0833 -LittlerootTown_MaysHouse_1F_Movement_1A0833:: @ 81A0833 -MauvilleCity_House2_Movement_1A0833:: @ 81A0833 -MauvilleCity_Movement_1A0833:: @ 81A0833 -MeteorFalls_1F_1R_Movement_1A0833:: @ 81A0833 -MossdeepCity_StevensHouse_Movement_1A0833:: @ 81A0833 -MtChimney_Movement_1A0833:: @ 81A0833 -PetalburgCity_Movement_1A0833:: @ 81A0833 -Route103_Movement_1A0833:: @ 81A0833 -Route110_Movement_1A0833:: @ 81A0833 -Route110_TrickHouseEnd_Movement_1A0833:: @ 81A0833 -Route110_TrickHouseEntrance_Movement_1A0833:: @ 81A0833 -Route110_TrickHousePuzzle5_Movement_1A0833:: @ 81A0833 -RustboroCity_DevonCorp_2F_Movement_1A0833:: @ 81A0833 -RustboroCity_Movement_1A0833:: @ 81A0833 -RusturfTunnel_Movement_1A0833:: @ 81A0833 -SeafloorCavern_Room9_Movement_1A0833:: @ 81A0833 -SlateportCity_Movement_1A0833:: @ 81A0833 -SlateportCity_OceanicMuseum_1F_Movement_1A0833:: @ 81A0833 -SlateportCity_PokemonFanClub_Movement_1A0833:: @ 81A0833 -SootopolisCity_Movement_1A0833:: @ 81A0833 - emote_exclamation_mark - step_end - -EverGrandeCity_ChampionsRoom_Movement_1A0835:: @ 81A0835 -LavaridgeTown_Movement_1A0835:: @ 81A0835 -LilycoveCity_CoveLilyMotel_1F_Movement_1A0835:: @ 81A0835 -LittlerootTown_BrendansHouse_1F_Movement_1A0835:: @ 81A0835 -LittlerootTown_BrendansHouse_2F_Movement_1A0835:: @ 81A0835 -LittlerootTown_MaysHouse_1F_Movement_1A0835:: @ 81A0835 -MauvilleCity_House2_Movement_1A0835:: @ 81A0835 -MauvilleCity_Movement_1A0835:: @ 81A0835 -MeteorFalls_1F_1R_Movement_1A0835:: @ 81A0835 -MossdeepCity_StevensHouse_Movement_1A0835:: @ 81A0835 -MtChimney_Movement_1A0835:: @ 81A0835 -PetalburgCity_Movement_1A0835:: @ 81A0835 -Route103_Movement_1A0835:: @ 81A0835 -Route110_Movement_1A0835:: @ 81A0835 -Route110_TrickHouseEntrance_Movement_1A0835:: @ 81A0835 -Route110_TrickHousePuzzle5_Movement_1A0835:: @ 81A0835 -RustboroCity_DevonCorp_2F_Movement_1A0835:: @ 81A0835 -RustboroCity_Movement_1A0835:: @ 81A0835 -RusturfTunnel_Movement_1A0835:: @ 81A0835 -SeafloorCavern_Room9_Movement_1A0835:: @ 81A0835 -SlateportCity_Movement_1A0835:: @ 81A0835 -SlateportCity_OceanicMuseum_1F_Movement_1A0835:: @ 81A0835 -SlateportCity_PokemonFanClub_Movement_1A0835:: @ 81A0835 -SootopolisCity_Movement_1A0835:: @ 81A0835 - delay_16 - delay_16 - delay_16 - step_end - -AquaHideout_B2F_Movement_1A0839:: @ 81A0839 -EverGrandeCity_PokemonLeague_Movement_1A0839:: @ 81A0839 -FallarborTown_House2_Movement_1A0839:: @ 81A0839 -FortreeCity_House4_Movement_1A0839:: @ 81A0839 -LilycoveCity_ContestHall_Movement_1A0839:: @ 81A0839 -LilycoveCity_CoveLilyMotel_1F_Movement_1A0839:: @ 81A0839 -LilycoveCity_DepartmentStore_1F_Movement_1A0839:: @ 81A0839 -LilycoveCity_Harbor_Movement_1A0839:: @ 81A0839 -LilycoveCity_LilycoveMuseum_1F_Movement_1A0839:: @ 81A0839 -LilycoveCity_LilycoveMuseum_2F_Movement_1A0839:: @ 81A0839 -LilycoveCity_MoveDeletersHouse_Movement_1A0839:: @ 81A0839 -LilycoveCity_Movement_1A0839:: @ 81A0839 -LittlerootTown_BrendansHouse_1F_Movement_1A0839:: @ 81A0839 -LittlerootTown_BrendansHouse_2F_Movement_1A0839:: @ 81A0839 -MauvilleCity_Movement_1A0839:: @ 81A0839 -MtChimney_Movement_1A0839:: @ 81A0839 -MtPyre_Summit_Movement_1A0839:: @ 81A0839 -OldaleTown_Movement_1A0839:: @ 81A0839 -PetalburgCity_Gym_Movement_1A0839:: @ 81A0839 -PetalburgCity_Movement_1A0839:: @ 81A0839 -Route103_Movement_1A0839:: @ 81A0839 -Route110_TrickHouseEnd_Movement_1A0839:: @ 81A0839 -Route110_TrickHouseEntrance_Movement_1A0839:: @ 81A0839 -Route110_TrickHousePuzzle5_Movement_1A0839:: @ 81A0839 -Route119_Movement_1A0839:: @ 81A0839 -RusturfTunnel_Movement_1A0839:: @ 81A0839 -SeafloorCavern_Room9_Movement_1A0839:: @ 81A0839 -SlateportCity_ContestLobby_Movement_1A0839:: @ 81A0839 -SlateportCity_Movement_1A0839:: @ 81A0839 -SlateportCity_SternsShipyard_1F_Movement_1A0839:: @ 81A0839 - face_player - step_end - -@ 81A083B - face_away_player - step_end - -EverGrandeCity_PokemonLeague_Movement_1A083D:: @ 81A083D -LilycoveCity_ContestHall_Movement_1A083D:: @ 81A083D -LilycoveCity_ContestLobby_Movement_1A083D:: @ 81A083D -LilycoveCity_CoveLilyMotel_1F_Movement_1A083D:: @ 81A083D -LilycoveCity_House3_Movement_1A083D:: @ 81A083D -LilycoveCity_LilycoveMuseum_1F_Movement_1A083D:: @ 81A083D -LilycoveCity_Movement_1A083D:: @ 81A083D -LittlerootTown_Movement_1A083D:: @ 81A083D -MauvilleCity_GameCorner_Movement_1A083D:: @ 81A083D -MauvilleCity_Movement_1A083D:: @ 81A083D -MossdeepCity_Movement_1A083D:: @ 81A083D -MossdeepCity_SpaceCenter_1F_Movement_1A083D:: @ 81A083D -MtChimney_Movement_1A083D:: @ 81A083D -OldaleTown_Movement_1A083D:: @ 81A083D -PetalburgCity_Movement_1A083D:: @ 81A083D -Route109_Movement_1A083D:: @ 81A083D -Route110_Movement_1A083D:: @ 81A083D -Route111_WinstrateFamilysHouse_Movement_1A083D:: @ 81A083D -Route119_Movement_1A083D:: @ 81A083D -RustboroCity_DevonCorp_3F_Movement_1A083D:: @ 81A083D -RustboroCity_Movement_1A083D:: @ 81A083D -RusturfTunnel_Movement_1A083D:: @ 81A083D -SlateportCity_ContestHall_Movement_1A083D:: @ 81A083D -SlateportCity_ContestLobby_Movement_1A083D:: @ 81A083D -SlateportCity_Harbor_Movement_1A083D:: @ 81A083D -SlateportCity_Movement_1A083D:: @ 81A083D -SlateportCity_OceanicMuseum_2F_Movement_1A083D:: @ 81A083D -SlateportCity_SternsShipyard_1F_Movement_1A083D:: @ 81A083D -VerdanturfTown_Movement_1A083D:: @ 81A083D - face_original_direction - step_end - -Movement_1A083F:: @ 81A083F -DewfordTown_Hall_Movement_1A083F:: @ 81A083F -EverGrandeCity_ChampionsRoom_Movement_1A083F:: @ 81A083F -EverGrandeCity_HallOfFame_Movement_1A083F:: @ 81A083F -LavaridgeTown_Movement_1A083F:: @ 81A083F -LilycoveCity_PokemonTrainerFanClub_Movement_1A083F:: @ 81A083F -LittlerootTown_BrendansHouse_1F_Movement_1A083F:: @ 81A083F -LittlerootTown_BrendansHouse_2F_Movement_1A083F:: @ 81A083F -LittlerootTown_MaysHouse_1F_Movement_1A083F:: @ 81A083F -LittlerootTown_Movement_1A083F:: @ 81A083F -MeteorFalls_1F_1R_Movement_1A083F:: @ 81A083F -MossdeepCity_StevensHouse_Movement_1A083F:: @ 81A083F -MtChimney_Movement_1A083F:: @ 81A083F -MtPyre_Summit_Movement_1A083F:: @ 81A083F -OldaleTown_PokemonCenter_1F_Movement_1A083F:: @ 81A083F -PetalburgCity_Gym_Movement_1A083F:: @ 81A083F -PetalburgCity_Movement_1A083F:: @ 81A083F -PetalburgWoods_Movement_1A083F:: @ 81A083F -Route101_Movement_1A083F:: @ 81A083F -Route110_TrickHouseEnd_Movement_1A083F:: @ 81A083F -Route111_Movement_1A083F:: @ 81A083F -Route116_Movement_1A083F:: @ 81A083F -Route120_Movement_1A083F:: @ 81A083F -Route128_Movement_1A083F:: @ 81A083F -RustboroCity_Movement_1A083F:: @ 81A083F -SeafloorCavern_Room9_Movement_1A083F:: @ 81A083F -SlateportCity_Movement_1A083F:: @ 81A083F -SlateportCity_OceanicMuseum_1F_Movement_1A083F:: @ 81A083F -SlateportCity_OceanicMuseum_2F_Movement_1A083F:: @ 81A083F -SootopolisCity_Movement_1A083F:: @ 81A083F -VictoryRoad_1F_Movement_1A083F:: @ 81A083F - walk_in_place_fastest_left - step_end - -AquaHideout_B2F_Movement_1A0841:: @ 81A0841 -CaveOfOrigin_B4F_Movement_1A0841:: @ 81A0841 -DewfordTown_Hall_Movement_1A0841:: @ 81A0841 -EverGrandeCity_ChampionsRoom_Movement_1A0841:: @ 81A0841 -EverGrandeCity_HallOfFame_Movement_1A0841:: @ 81A0841 -LilycoveCity_Harbor_Movement_1A0841:: @ 81A0841 -LittlerootTown_BrendansHouse_1F_Movement_1A0841:: @ 81A0841 -LittlerootTown_Movement_1A0841:: @ 81A0841 -MeteorFalls_1F_1R_Movement_1A0841:: @ 81A0841 -MossdeepCity_GameCorner_1F_Movement_1A0841:: @ 81A0841 -MtPyre_Summit_Movement_1A0841:: @ 81A0841 -NewMauville_Entrance_Movement_1A0841:: @ 81A0841 -PetalburgCity_Gym_Movement_1A0841:: @ 81A0841 -PetalburgCity_Movement_1A0841:: @ 81A0841 -PetalburgWoods_Movement_1A0841:: @ 81A0841 -Route110_TrickHouseEnd_Movement_1A0841:: @ 81A0841 -Route110_TrickHouseEntrance_Movement_1A0841:: @ 81A0841 -Route111_Movement_1A0841:: @ 81A0841 -Route118_Movement_1A0841:: @ 81A0841 -Route120_Movement_1A0841:: @ 81A0841 -Route121_SafariZoneEntrance_Movement_1A0841:: @ 81A0841 -Route128_Movement_1A0841:: @ 81A0841 -RustboroCity_Movement_1A0841:: @ 81A0841 -RusturfTunnel_Movement_1A0841:: @ 81A0841 -SeafloorCavern_Room9_Movement_1A0841:: @ 81A0841 -SlateportCity_Harbor_Movement_1A0841:: @ 81A0841 -SlateportCity_Movement_1A0841:: @ 81A0841 -SlateportCity_OceanicMuseum_2F_Movement_1A0841:: @ 81A0841 - walk_in_place_fastest_up - step_end - -AquaHideout_B2F_Movement_1A0843:: @ 81A0843 -DewfordTown_Hall_Movement_1A0843:: @ 81A0843 -EverGrandeCity_ChampionsRoom_Movement_1A0843:: @ 81A0843 -EverGrandeCity_HallOfFame_Movement_1A0843:: @ 81A0843 -LavaridgeTown_Movement_1A0843:: @ 81A0843 -LilycoveCity_DepartmentStore_1F_Movement_1A0843:: @ 81A0843 -LilycoveCity_PokemonTrainerFanClub_Movement_1A0843:: @ 81A0843 -LittlerootTown_BrendansHouse_1F_Movement_1A0843:: @ 81A0843 -LittlerootTown_BrendansHouse_2F_Movement_1A0843:: @ 81A0843 -LittlerootTown_MaysHouse_1F_Movement_1A0843:: @ 81A0843 -LittlerootTown_Movement_1A0843:: @ 81A0843 -LittlerootTown_ProfessorBirchsLab_Movement_1A0843:: @ 81A0843 -MauvilleCity_Movement_1A0843:: @ 81A0843 -MtPyre_Summit_Movement_1A0843:: @ 81A0843 -OldaleTown_Movement_1A0843:: @ 81A0843 -PetalburgCity_Gym_Movement_1A0843:: @ 81A0843 -PetalburgCity_Movement_1A0843:: @ 81A0843 -Route101_Movement_1A0843:: @ 81A0843 -Route110_Movement_1A0843:: @ 81A0843 -Route110_TrickHouseEnd_Movement_1A0843:: @ 81A0843 -Route116_Movement_1A0843:: @ 81A0843 -Route120_Movement_1A0843:: @ 81A0843 -Route128_Movement_1A0843:: @ 81A0843 -RustboroCity_Movement_1A0843:: @ 81A0843 -SlateportCity_Harbor_Movement_1A0843:: @ 81A0843 -SlateportCity_Movement_1A0843:: @ 81A0843 -SlateportCity_OceanicMuseum_1F_Movement_1A0843:: @ 81A0843 -SlateportCity_OceanicMuseum_2F_Movement_1A0843:: @ 81A0843 -SootopolisCity_Movement_1A0843:: @ 81A0843 - walk_in_place_fastest_right - step_end - -BattleTower_Outside_Movement_1A0845:: @ 81A0845 -DewfordTown_Hall_Movement_1A0845:: @ 81A0845 -EverGrandeCity_ChampionsRoom_Movement_1A0845:: @ 81A0845 -LilycoveCity_CoveLilyMotel_1F_Movement_1A0845:: @ 81A0845 -LilycoveCity_DepartmentStoreElevator_Movement_1A0845:: @ 81A0845 -LilycoveCity_Movement_1A0845:: @ 81A0845 -LilycoveCity_PokemonTrainerFanClub_Movement_1A0845:: @ 81A0845 -LittlerootTown_Movement_1A0845:: @ 81A0845 -MauvilleCity_Movement_1A0845:: @ 81A0845 -MeteorFalls_1F_1R_Movement_1A0845:: @ 81A0845 -MtPyre_Summit_Movement_1A0845:: @ 81A0845 -OldaleTown_PokemonCenter_1F_Movement_1A0845:: @ 81A0845 -PetalburgCity_Gym_Movement_1A0845:: @ 81A0845 -PetalburgCity_Movement_1A0845:: @ 81A0845 -PetalburgWoods_Movement_1A0845:: @ 81A0845 -Route110_Movement_1A0845:: @ 81A0845 -Route110_TrickHouseEnd_Movement_1A0845:: @ 81A0845 -Route119_Movement_1A0845:: @ 81A0845 -Route120_Movement_1A0845:: @ 81A0845 -Route128_Movement_1A0845:: @ 81A0845 -RustboroCity_Movement_1A0845:: @ 81A0845 -RustboroCity_PokemonSchool_Movement_1A0845:: @ 81A0845 -RusturfTunnel_Movement_1A0845:: @ 81A0845 -SeafloorCavern_Room9_Movement_1A0845:: @ 81A0845 -SlateportCity_Harbor_Movement_1A0845:: @ 81A0845 -SlateportCity_Movement_1A0845:: @ 81A0845 -SlateportCity_OceanicMuseum_2F_Movement_1A0845:: @ 81A0845 -SootopolisCity_Movement_1A0845:: @ 81A0845 -SouthernIsland_Exterior_Movement_1A0845:: @ 81A0845 - walk_in_place_fastest_down - step_end - -EverGrandeCity_SidneysRoom_Movement_1A0847:: @ 81A0847 - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -EverGrandeCity_ChampionsRoom_Movement_1A084E:: @ 81A084E - walk_up - walk_up - walk_up - walk_up - step_end - -EverGrandeCity_SidneysRoom_Movement_1A0853:: @ 81A0853 - delay_16 - delay_16 - step_end - -Route110_TrickHouseEntrance_Movement_1A0856:: @ 81A0856 - walk_up - step_end - -@ 81A0858 - walk_up - walk_up - step_end + .include "data/scripts/movement.inc" PictureBookShelfScript:: @ 81A085B msgbox PictureBookShelfText, MSGBOX_SIGN diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 1b71cd138..24984d455 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -11,12 +11,12 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall setvar VAR_0x8008, 1 playse SE_PIN - applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0833 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 .ifdef SAPPHIRE - applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_0x8008, Common_Movement_FacePlayer .else - applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0841 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestUp .endif waitmovement 0 setvar VAR_TEMP_1, 1 @@ -38,20 +38,20 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD setvar VAR_0x8009, 3 .endif .ifdef SAPPHIRE - applymovement VAR_0x8008, Movement_1A083F + applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft .else - applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestRight .endif waitmovement 0 delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 msgbox AquaHideout_B2F_Text_197162, MSGBOX_DEFAULT closemessage .ifdef SAPPHIRE - applymovement VAR_0x8008, Movement_1A083F + applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft .else - applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestRight .endif .ifdef SAPPHIRE applymovement VAR_0x8009, AquaHideout_B2F_Movement_15D958 @@ -61,7 +61,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD waitmovement 0 removeobject VAR_0x8009 delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, MSGBOX_DEFAULT setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE diff --git a/data/maps/BattleTower_Outside/scripts.inc b/data/maps/BattleTower_Outside/scripts.inc index a7a9301d4..cb21e1d25 100644 --- a/data/maps/BattleTower_Outside/scripts.inc +++ b/data/maps/BattleTower_Outside/scripts.inc @@ -64,7 +64,7 @@ BattleTower_Outside_EventScript_160226:: @ 8160226 BattleTower_Outside_EventScript_160232:: @ 8160232 closemessage - applymovement VAR_LAST_TALKED, BattleTower_Outside_Movement_1A0845 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE diff --git a/data/maps/CaveOfOrigin_B4F/scripts.inc b/data/maps/CaveOfOrigin_B4F/scripts.inc index 5ff159e31..e5feefe7d 100644 --- a/data/maps/CaveOfOrigin_B4F/scripts.inc +++ b/data/maps/CaveOfOrigin_B4F/scripts.inc @@ -23,7 +23,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 lockall - applymovement 255, CaveOfOrigin_B4F_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4F03, MSGBOX_DEFAULT diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index b502b95d2..aa20fca9c 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -53,7 +53,7 @@ DewfordTown_Hall_EventScript_15330A:: @ 815330A call DewfordTown_Hall_EventScript_1A0102 msgbox DewfordTown_Hall_Text_17570D, MSGBOX_DEFAULT closemessage - applymovement 4, DewfordTown_Hall_Movement_1A0841 + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end @@ -64,7 +64,7 @@ DewfordTown_Hall_EventScript_153326:: @ 8153326 call DewfordTown_Hall_EventScript_1A0102 msgbox DewfordTown_Hall_Text_17574C, MSGBOX_DEFAULT closemessage - applymovement 5, DewfordTown_Hall_Movement_1A0841 + applymovement 5, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end @@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1534FD:: @ 81534FD DewfordTown_Hall_EventScript_15351E:: @ 815351E compare VAR_FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1534FC - applymovement 255, DewfordTown_Hall_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_153556:: @ 8153556 return DewfordTown_Hall_EventScript_15356D:: @ 815356D - applymovement 255, DewfordTown_Hall_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return DewfordTown_Hall_EventScript_153578:: @ 8153578 - applymovement 255, DewfordTown_Hall_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return DewfordTown_Hall_EventScript_153583:: @ 8153583 compare VAR_FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1534FC - applymovement 255, DewfordTown_Hall_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 678f09714..d946850bd 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -22,7 +22,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4 EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE lockall - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A084E + applymovement 255, Common_Movement_WalkUp4 waitmovement 0 delay 40 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B802 @@ -78,9 +78,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 msgbox EverGrandeCity_ChampionsRoom_Text_191225, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 + applymovement 2, Common_Movement_Delay48 waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_15B9D2 msgbox EverGrandeCity_ChampionsRoom_Text_191268, MSGBOX_DEFAULT @@ -91,9 +91,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 + applymovement 2, Common_Movement_Delay48 waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_15B9D2 msgbox EverGrandeCity_ChampionsRoom_Text_191305, MSGBOX_DEFAULT @@ -105,26 +105,26 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03 waitmovement 0 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_19134D, MSGBOX_DEFAULT call EverGrandeCity_ChampionsRoom_EventScript_1A03B0 msgbox EverGrandeCity_ChampionsRoom_Text_1914C6, MSGBOX_DEFAULT - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0841 + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0845 + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191512, MSGBOX_DEFAULT closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD - applymovement 3, EverGrandeCity_ChampionsRoom_Movement_1A0841 + applymovement 3, Common_Movement_WalkInPlaceFastestUp applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8 waitmovement 0 delay 20 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, MSGBOX_DEFAULT checkplayergender @@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B9B4:: @ 815B9B4 EverGrandeCity_ChampionsRoom_EventScript_15B9BD:: @ 815B9BD applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9E6 waitmovement 0 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 9884edb27..1946a92f1 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -20,8 +20,8 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC59 applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC59 waitmovement 0 - applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0843 - applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_191841, MSGBOX_DEFAULT closemessage @@ -29,13 +29,13 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC60 waitmovement 0 delay 20 - applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0843 - applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_1918D7, MSGBOX_DEFAULT closemessage - applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0841 - applymovement 255, EverGrandeCity_HallOfFame_Movement_1A0841 + applymovement 1, Common_Movement_WalkInPlaceFastestUp + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 dofieldeffect FLDEFF_HALL_OF_FAME_RECORD diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc index 97e7d1f46..e876ec1b5 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -89,11 +89,11 @@ EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A end EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57 - applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839 + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox EverGrandeCity_PokemonLeague_Text_191804, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 2f573c08d..6ea37ea51 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -3,7 +3,7 @@ FallarborTown_House2_MapScripts:: @ 8153C90 FallarborTown_House2_EventScript_153C91:: @ 8153C91 lockall - applymovement 1, FallarborTown_House2_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_153CB6 msgbox FallarborTown_House2_Text_177AF4, MSGBOX_DEFAULT diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 5f72bf607..2ae998d40 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -21,14 +21,14 @@ FortreeCity_House4_EventScript_158188:: @ 8158188 end FortreeCity_House4_EventScript_1581C2:: @ 81581C2 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_1A0839 + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_18684E, MSGBOX_DEFAULT releaseall end FortreeCity_House4_EventScript_1581D6:: @ 81581D6 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_1A0839 + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_186881, MSGBOX_DEFAULT giveitem ITEM_MENTAL_HERB @@ -39,7 +39,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 end FortreeCity_House4_EventScript_158204:: @ 8158204 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_1A0839 + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_186924, MSGBOX_DEFAULT releaseall diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index cc036e073..74a936c4e 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -35,12 +35,12 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED waitmovement 0 closedoor 12, 15 waitdooranim - applymovement 8, LavaridgeTown_Movement_1A083F + applymovement 8, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 255, LavaridgeTown_Movement_1A0843 - applymovement 8, LavaridgeTown_Movement_1A0833 + applymovement 255, Common_Movement_WalkInPlaceFastestRight + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, LavaridgeTown_Movement_1A0835 + applymovement 8, Common_Movement_Delay48 waitmovement 0 checkplayergender compare VAR_RESULT, 0 diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 602abb06e..4d7b7be26 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -204,10 +204,10 @@ LilycoveCity_EventScript_14CCE5:: @ 814CCE5 lockall goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_14CD18 msgbox LilycoveCity_Text_16864A, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_1A0839 + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_Text_168675, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_MET_WAILMER_TRAINER releaseall @@ -393,7 +393,7 @@ LilycoveCity_EventScript_14CF62:: @ 814CF62 LilycoveCity_EventScript_14CF6B:: @ 814CF6B closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_1A0845 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc index 8eff4731c..42efd2f18 100644 --- a/data/maps/LilycoveCity_ContestHall/scripts.inc +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -22,7 +22,7 @@ LilycoveCity_ContestHall_EventScript_1590B6:: @ 81590B6 LilycoveCity_ContestHall_EventScript_1590BF:: @ 81590BF msgbox LilycoveCity_ContestHall_Text_189301, MSGBOX_NPC lockall - applymovement 4, LilycoveCity_ContestHall_Movement_1A083D + applymovement 4, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -30,7 +30,7 @@ LilycoveCity_ContestHall_EventScript_1590BF:: @ 81590BF LilycoveCity_ContestHall_EventScript_1590D4:: @ 81590D4 msgbox LilycoveCity_ContestHall_Text_189366, MSGBOX_NPC lockall - applymovement 5, LilycoveCity_ContestHall_Movement_1A083D + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -38,7 +38,7 @@ LilycoveCity_ContestHall_EventScript_1590D4:: @ 81590D4 LilycoveCity_ContestHall_EventScript_1590E9:: @ 81590E9 msgbox LilycoveCity_ContestHall_Text_1893CE, MSGBOX_NPC lockall - applymovement 6, LilycoveCity_ContestHall_Movement_1A083D + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -46,7 +46,7 @@ LilycoveCity_ContestHall_EventScript_1590E9:: @ 81590E9 LilycoveCity_ContestHall_EventScript_1590FE:: @ 81590FE msgbox LilycoveCity_ContestHall_Text_189463, MSGBOX_NPC lockall - applymovement 7, LilycoveCity_ContestHall_Movement_1A083D + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -54,7 +54,7 @@ LilycoveCity_ContestHall_EventScript_1590FE:: @ 81590FE LilycoveCity_ContestHall_EventScript_159113:: @ 8159113 msgbox LilycoveCity_ContestHall_Text_189512, MSGBOX_NPC lockall - applymovement 8, LilycoveCity_ContestHall_Movement_1A083D + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -62,7 +62,7 @@ LilycoveCity_ContestHall_EventScript_159113:: @ 8159113 LilycoveCity_ContestHall_EventScript_159128:: @ 8159128 msgbox LilycoveCity_ContestHall_Text_18956B, MSGBOX_NPC lockall - applymovement 9, LilycoveCity_ContestHall_Movement_1A083D + applymovement 9, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -74,7 +74,7 @@ LilycoveCity_ContestHall_EventScript_15913D:: @ 815913D LilycoveCity_ContestHall_EventScript_159146:: @ 8159146 msgbox LilycoveCity_ContestHall_Text_189617, MSGBOX_NPC lockall - applymovement 12, LilycoveCity_ContestHall_Movement_1A083D + applymovement 12, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -82,7 +82,7 @@ LilycoveCity_ContestHall_EventScript_159146:: @ 8159146 LilycoveCity_ContestHall_EventScript_15915B:: @ 815915B msgbox LilycoveCity_ContestHall_Text_1896BE, MSGBOX_NPC lockall - applymovement 22, LilycoveCity_ContestHall_Movement_1A083D + applymovement 22, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -90,7 +90,7 @@ LilycoveCity_ContestHall_EventScript_15915B:: @ 815915B LilycoveCity_ContestHall_EventScript_159170:: @ 8159170 msgbox LilycoveCity_ContestHall_Text_1896FE, MSGBOX_NPC lockall - applymovement 11, LilycoveCity_ContestHall_Movement_1A083D + applymovement 11, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -98,7 +98,7 @@ LilycoveCity_ContestHall_EventScript_159170:: @ 8159170 LilycoveCity_ContestHall_EventScript_159185:: @ 8159185 msgbox LilycoveCity_ContestHall_Text_189771, MSGBOX_NPC lockall - applymovement 13, LilycoveCity_ContestHall_Movement_1A083D + applymovement 13, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -106,7 +106,7 @@ LilycoveCity_ContestHall_EventScript_159185:: @ 8159185 LilycoveCity_ContestHall_EventScript_15919A:: @ 815919A msgbox LilycoveCity_ContestHall_Text_1897AA, MSGBOX_NPC lockall - applymovement 14, LilycoveCity_ContestHall_Movement_1A083D + applymovement 14, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -114,7 +114,7 @@ LilycoveCity_ContestHall_EventScript_15919A:: @ 815919A LilycoveCity_ContestHall_EventScript_1591AF:: @ 81591AF msgbox LilycoveCity_ContestHall_Text_18980B, MSGBOX_NPC lockall - applymovement 15, LilycoveCity_ContestHall_Movement_1A083D + applymovement 15, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -122,7 +122,7 @@ LilycoveCity_ContestHall_EventScript_1591AF:: @ 81591AF LilycoveCity_ContestHall_EventScript_1591C4:: @ 81591C4 msgbox LilycoveCity_ContestHall_Text_189874, MSGBOX_NPC lockall - applymovement 16, LilycoveCity_ContestHall_Movement_1A083D + applymovement 16, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -130,7 +130,7 @@ LilycoveCity_ContestHall_EventScript_1591C4:: @ 81591C4 LilycoveCity_ContestHall_EventScript_1591D9:: @ 81591D9 msgbox LilycoveCity_ContestHall_Text_18990A, MSGBOX_NPC lockall - applymovement 17, LilycoveCity_ContestHall_Movement_1A083D + applymovement 17, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -138,7 +138,7 @@ LilycoveCity_ContestHall_EventScript_1591D9:: @ 81591D9 LilycoveCity_ContestHall_EventScript_1591EE:: @ 81591EE msgbox LilycoveCity_ContestHall_Text_189981, MSGBOX_NPC lockall - applymovement 18, LilycoveCity_ContestHall_Movement_1A083D + applymovement 18, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -146,7 +146,7 @@ LilycoveCity_ContestHall_EventScript_1591EE:: @ 81591EE LilycoveCity_ContestHall_EventScript_159203:: @ 8159203 msgbox LilycoveCity_ContestHall_Text_189A1D, MSGBOX_NPC lockall - applymovement 19, LilycoveCity_ContestHall_Movement_1A083D + applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -154,7 +154,7 @@ LilycoveCity_ContestHall_EventScript_159203:: @ 8159203 LilycoveCity_ContestHall_EventScript_159218:: @ 8159218 msgbox LilycoveCity_ContestHall_Text_189A82, MSGBOX_NPC lockall - applymovement 21, LilycoveCity_ContestHall_Movement_1A083D + applymovement 21, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -162,7 +162,7 @@ LilycoveCity_ContestHall_EventScript_159218:: @ 8159218 LilycoveCity_ContestHall_EventScript_15922D:: @ 815922D msgbox LilycoveCity_ContestHall_Text_189AE1, MSGBOX_NPC lockall - applymovement 20, LilycoveCity_ContestHall_Movement_1A083D + applymovement 20, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -170,7 +170,7 @@ LilycoveCity_ContestHall_EventScript_15922D:: @ 815922D LilycoveCity_ContestHall_EventScript_159242:: @ 8159242 msgbox LilycoveCity_ContestHall_Text_189B4E, MSGBOX_NPC lockall - applymovement 23, LilycoveCity_ContestHall_Movement_1A083D + applymovement 23, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -178,7 +178,7 @@ LilycoveCity_ContestHall_EventScript_159242:: @ 8159242 LilycoveCity_ContestHall_EventScript_159257:: @ 8159257 msgbox LilycoveCity_ContestHall_Text_189BBF, MSGBOX_NPC lockall - applymovement 24, LilycoveCity_ContestHall_Movement_1A083D + applymovement 24, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -186,7 +186,7 @@ LilycoveCity_ContestHall_EventScript_159257:: @ 8159257 LilycoveCity_ContestHall_EventScript_15926C:: @ 815926C msgbox LilycoveCity_ContestHall_Text_189C29, MSGBOX_NPC lockall - applymovement 25, LilycoveCity_ContestHall_Movement_1A083D + applymovement 25, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -194,7 +194,7 @@ LilycoveCity_ContestHall_EventScript_15926C:: @ 815926C LilycoveCity_ContestHall_EventScript_159281:: @ 8159281 msgbox LilycoveCity_ContestHall_Text_189C67, MSGBOX_NPC lockall - applymovement 26, LilycoveCity_ContestHall_Movement_1A083D + applymovement 26, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -202,7 +202,7 @@ LilycoveCity_ContestHall_EventScript_159281:: @ 8159281 LilycoveCity_ContestHall_EventScript_159296:: @ 8159296 msgbox LilycoveCity_ContestHall_Text_189CB3, MSGBOX_NPC lockall - applymovement 27, LilycoveCity_ContestHall_Movement_1A083D + applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -210,17 +210,17 @@ LilycoveCity_ContestHall_EventScript_159296:: @ 8159296 LilycoveCity_ContestHall_EventScript_1592AB:: @ 81592AB msgbox LilycoveCity_ContestHall_Text_189D11, MSGBOX_NPC lockall - applymovement 28, LilycoveCity_ContestHall_Movement_1A083D + applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1592C0:: @ 81592C0 lockall - applymovement 29, LilycoveCity_ContestHall_Movement_1A0839 + applymovement 29, Common_Movement_FacePlayer waitmovement 0 delay 25 - applymovement 29, LilycoveCity_ContestHall_Movement_1A083D + applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 msgbox LilycoveCity_ContestHall_Text_189DA2, MSGBOX_SIGN releaseall @@ -229,7 +229,7 @@ LilycoveCity_ContestHall_EventScript_1592C0:: @ 81592C0 LilycoveCity_ContestHall_EventScript_1592E2:: @ 81592E2 msgbox LilycoveCity_ContestHall_Text_189E5F, MSGBOX_NPC lockall - applymovement 31, LilycoveCity_ContestHall_Movement_1A083D + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -237,7 +237,7 @@ LilycoveCity_ContestHall_EventScript_1592E2:: @ 81592E2 LilycoveCity_ContestHall_EventScript_1592F7:: @ 81592F7 msgbox LilycoveCity_ContestHall_Text_189DF3, MSGBOX_NPC lockall - applymovement 30, LilycoveCity_ContestHall_Movement_1A083D + applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 2e7127fa2..ba39131a4 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -72,7 +72,7 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E waitmovement 0 playse SE_PIN - applymovement 4, LilycoveCity_ContestLobby_Movement_1A0833 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 applymovement 4, LilycoveCity_ContestLobby_Movement_158A52 waitmovement 0 @@ -244,7 +244,7 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B78 waitmovement 0 playse SE_PIN - applymovement 11, LilycoveCity_ContestLobby_Movement_1A0833 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C waitmovement 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index dbd9e11e6..84fbc2440 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -6,33 +6,33 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_158326 goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186C2B, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF:: @ 81582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CCE, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186D7F, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186E57, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186F09, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -40,11 +40,11 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326 LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D lockall playse SE_PIN - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0833 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0835 + applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CA6, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index 5a157eadd..eca853db4 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -71,7 +71,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1:: @ 815A4B1 LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 erasebox 0, 0, 29, 19 - applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 special ShakeScreenInElevator waitstate diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index 0958c23e6..db7c2363a 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E copyvar VAR_0x8008, VAR_RESULT special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, MSGBOX_DEFAULT - applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PC_ON special DoLotteryCornerComputerEffect @@ -30,7 +30,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E delay 220 special EndLotteryCornerComputerEffect delay 10 - applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 70ccfc7f4..edc833be9 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -75,7 +75,7 @@ LilycoveCity_Harbor_EventScript_15997E:: @ 815997E LilycoveCity_Harbor_EventScript_15998A:: @ 815998A msgbox LilycoveCity_Harbor_Text_18B4B3, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR @@ -110,18 +110,18 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 - applymovement 4, LilycoveCity_Harbor_Movement_1A0839 + applymovement 4, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_Harbor_Text_1C5120, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_Harbor_Movement_1A0841 + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 removeobject 4 diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 9642b68b6..a149f6891 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -15,7 +15,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -23,7 +23,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 LilycoveCity_House3_EventScript_159C1D:: @ 8159C1D msgbox LilycoveCity_House3_Text_18B9DC, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -33,7 +33,7 @@ LilycoveCity_House3_EventScript_159C32:: @ 8159C32 faceplayer msgbox LilycoveCity_House3_Text_18BD64, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index c878e1b7f..34638de44 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15841C:: @ 815841C LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 lockall - applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1A0839 + applymovement 2, Common_Movement_FacePlayer message LilycoveCity_LilycoveMuseum_1F_Text_1873B9 waitmessage multichoice 20, 8, 16, 1 @@ -152,7 +152,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158585:: @ 8158585 LilycoveCity_LilycoveMuseum_1F_EventScript_15858E:: @ 815858E msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B04, MSGBOX_NPC lockall - applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_1A083D + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index a8ded84ed..3974dfc74 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -62,7 +62,7 @@ LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670 LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A lockall - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C42, MSGBOX_SIGN @@ -71,7 +71,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C64, MSGBOX_SIGN - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 waitmovement 0 @@ -107,7 +107,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15872C:: @ 815872C end LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18802F, MSGBOX_DEFAULT applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 @@ -116,7 +116,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 end LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, MSGBOX_DEFAULT givedecoration DECOR_GLASS_ORNAMENT compare VAR_RESULT, 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 30a8596c0..c6cdc00bc 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -3,7 +3,7 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 8159AAD LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE lockall - applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, MSGBOX_YESNO switch VAR_RESULT diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 890f4d1dc..d87087c89 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -9,18 +9,18 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_159395:: @ 8159395 LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F lockall - applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_1A0845 + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1D6, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159402 applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_1593FA waitmovement 0 - applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1E8, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159409 waitmovement 0 - applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_15940C waitmovement 0 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 0000e8b4a..8ea09719b 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -197,7 +197,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF LittlerootTown_EventScript_14D708:: @ 814D708 msgbox LittlerootTown_Text_16AD82, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_1A083D + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setvar VAR_LITTLEROOT_STATE, 2 release @@ -308,13 +308,13 @@ LittlerootTown_Movement_14D7C0:: @ 814D7C0 LittlerootTown_EventScript_14D7C7:: @ 814D7C7 lockall - applymovement 1, LittlerootTown_Movement_1A0843 + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 255, LittlerootTown_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_Text_16AD82, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_1A083D + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setvar VAR_LITTLEROOT_STATE, 2 releaseall @@ -440,12 +440,12 @@ LittlerootTown_EventScript_14D931:: @ 814D931 return LittlerootTown_EventScript_14D93C:: @ 814D93C - applymovement 4, LittlerootTown_Movement_1A0843 + applymovement 4, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return LittlerootTown_EventScript_14D947:: @ 814D947 - applymovement 4, LittlerootTown_Movement_1A083F + applymovement 4, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -480,70 +480,70 @@ LittlerootTown_EventScript_14D995:: @ 814D995 return LittlerootTown_EventScript_14D9D8:: @ 814D9D8 - applymovement 255, LittlerootTown_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC76 waitmovement 0 return LittlerootTown_EventScript_14D9ED:: @ 814D9ED - applymovement 255, LittlerootTown_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC7D waitmovement 0 return LittlerootTown_EventScript_14DA02:: @ 814DA02 - applymovement 255, LittlerootTown_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC84 waitmovement 0 return LittlerootTown_EventScript_14DA17:: @ 814DA17 - applymovement 255, LittlerootTown_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC89 waitmovement 0 return LittlerootTown_EventScript_14DA2C:: @ 814DA2C - applymovement 255, LittlerootTown_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC8F waitmovement 0 return LittlerootTown_EventScript_14DA41:: @ 814DA41 - applymovement 255, LittlerootTown_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC92 waitmovement 0 return LittlerootTown_EventScript_14DA56:: @ 814DA56 - applymovement 255, LittlerootTown_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC96 waitmovement 0 return LittlerootTown_EventScript_14DA6B:: @ 814DA6B - applymovement 255, LittlerootTown_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC9A waitmovement 0 return LittlerootTown_EventScript_14DA80:: @ 814DA80 - applymovement 255, LittlerootTown_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_14DC9D waitmovement 0 return LittlerootTown_EventScript_14DA95:: @ 814DA95 - applymovement 255, LittlerootTown_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_14DCA3 waitmovement 0 @@ -844,7 +844,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 compare VAR_RESULT, 1 call_if_eq LittlerootTown_EventScript_14D931 call LittlerootTown_EventScript_14DD38 - applymovement 4, LittlerootTown_Movement_1A0841 + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 81cf11ced..2548e815c 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -90,11 +90,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 lockall playse SE_PIN - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_152782 waitmovement 0 special GetRivalSonDaughterString @@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A083F + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 end diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 9a2251396..a679b6fc3 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -90,11 +90,11 @@ LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 lockall playse SE_PIN - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0833 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0835 + applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1529C0 waitmovement 0 special GetRivalSonDaughterString @@ -162,7 +162,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - applymovement VAR_0x8004, LittlerootTown_MaysHouse_1F_Movement_1A0843 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestRight waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7 end diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 7efdfd21c..660f68e5e 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -47,11 +47,11 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, MSGBOX_DEFAULT playbgm MUS_GIRL_SUP, TRUE - applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 + applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 + applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, MSGBOX_DEFAULT closemessage @@ -81,11 +81,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, MSGBOX_DEFAULT playbgm MUS_BOY_SUP, TRUE - applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 + applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 + applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, MSGBOX_DEFAULT closemessage @@ -108,7 +108,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BAA:: @ 8152BAA return LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 - applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 checkplayergender compare VAR_RESULT, 0 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 52a93dc85..40baf0f81 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -119,7 +119,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA msgbox LittlerootTown_ProfessorBirchsLab_Text_174248, MSGBOX_DEFAULT applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_152E97 waitmovement 0 - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 checkplayergender compare VAR_RESULT, 0 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index fa9833d97..52709499a 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -68,7 +68,7 @@ MauvilleCity_EventScript_14C0C4:: @ 814C0C4 goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C0E4 msgbox MauvilleCity_Text_165B76, MSGBOX_DEFAULT closemessage - applymovement 7, MauvilleCity_Movement_1A083D + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -76,7 +76,7 @@ MauvilleCity_EventScript_14C0C4:: @ 814C0C4 MauvilleCity_EventScript_14C0E4:: @ 814C0E4 msgbox MauvilleCity_Text_165E45, MSGBOX_DEFAULT closemessage - applymovement 7, MauvilleCity_Movement_1A083D + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -84,17 +84,17 @@ MauvilleCity_EventScript_14C0E4:: @ 814C0E4 MauvilleCity_EventScript_14C0F9:: @ 814C0F9 lockall goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C292 - applymovement 6, MauvilleCity_Movement_1A0843 + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox MauvilleCity_Text_165BE3, MSGBOX_DEFAULT msgbox MauvilleCity_Text_165C57, MSGBOX_DEFAULT msgbox MauvilleCity_Text_165D01, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_1A0839 + applymovement 6, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 6, MauvilleCity_Movement_1A0833 + applymovement 6, Common_Movement_ExclamationMark waitmovement 0 - applymovement 6, MauvilleCity_Movement_1A0835 + applymovement 6, Common_Movement_Delay48 waitmovement 0 msgbox MauvilleCity_Text_165D50, MSGBOX_YESNO goto MauvilleCity_EventScript_14C154 @@ -115,12 +115,12 @@ MauvilleCity_EventScript_14C187:: @ 814C187 applymovement 6, MauvilleCity_Movement_14C2AA applymovement 7, MauvilleCity_Movement_14C2CC waitmovement 0 - applymovement 6, MauvilleCity_Movement_1A0843 + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 applymovement 7, MauvilleCity_Movement_14C2D8 waitmovement 0 - applymovement 255, MauvilleCity_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox MauvilleCity_Text_1660FA, MSGBOX_DEFAULT closemessage @@ -134,12 +134,12 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 applymovement 6, MauvilleCity_Movement_14C2B0 applymovement 7, MauvilleCity_Movement_14C2D2 waitmovement 0 - applymovement 6, MauvilleCity_Movement_1A0843 + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 applymovement 7, MauvilleCity_Movement_14C2DC waitmovement 0 - applymovement 255, MauvilleCity_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox MauvilleCity_Text_1660FA, MSGBOX_DEFAULT closemessage @@ -161,13 +161,13 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B MauvilleCity_EventScript_14C23C:: @ 814C23C msgbox MauvilleCity_Text_165F0D, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_165F38 - applymovement 6, MauvilleCity_Movement_1A0843 + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox MauvilleCity_Text_165F85, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_1A0839 + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MauvilleCity_Text_165FB3, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_1A0843 + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox MauvilleCity_Text_166050, MSGBOX_DEFAULT return @@ -179,7 +179,7 @@ MauvilleCity_EventScript_14C285:: @ 814C285 end MauvilleCity_EventScript_14C292:: @ 814C292 - applymovement 6, MauvilleCity_Movement_1A0839 + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MauvilleCity_Text_165EE2, MSGBOX_YESNO goto MauvilleCity_EventScript_14C154 diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index e3f29307f..fccbee66f 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -498,7 +498,7 @@ MauvilleCity_GameCorner_EventScript_1570F8:: @ 81570F8 MauvilleCity_GameCorner_EventScript_157108:: @ 8157108 closemessage - applymovement VAR_LAST_TALKED, MauvilleCity_GameCorner_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index c47951a68..28b71f3ca 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -14,9 +14,9 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 playse SE_PIN - applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_1A0833 + applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_1A0835 + applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox MauvilleCity_House2_Text_1824D8, MSGBOX_YESNO compare VAR_RESULT, YES diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 39e6e2077..be33f7821 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -8,20 +8,20 @@ MeteorFalls_1F_1R_MapScript1_15C496:: @ 815C496 MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C lockall - applymovement 255, MeteorFalls_1F_1R_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 - applymovement 5, MeteorFalls_1F_1R_Movement_1A0845 + applymovement 5, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193237, MSGBOX_DEFAULT closemessage - applymovement 5, MeteorFalls_1F_1R_Movement_1A0841 - applymovement 6, MeteorFalls_1F_1R_Movement_1A0841 + applymovement 5, Common_Movement_WalkInPlaceFastestUp + applymovement 6, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN - applymovement 5, MeteorFalls_1F_1R_Movement_1A0833 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_1A0835 + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193268, MSGBOX_DEFAULT closemessage @@ -29,9 +29,9 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C waitmovement 0 msgbox MeteorFalls_1F_1R_Text_1932C5, MSGBOX_DEFAULT closemessage - applymovement 255, MeteorFalls_1F_1R_Movement_1A083F - applymovement 5, MeteorFalls_1F_1R_Movement_1A083F - applymovement 6, MeteorFalls_1F_1R_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft + applymovement 5, Common_Movement_WalkInPlaceFastestLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 addobject 7 addobject 8 @@ -40,8 +40,8 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 8, MeteorFalls_1F_1R_Movement_15C60F applymovement 9, MeteorFalls_1F_1R_Movement_15C617 waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_1A083F - applymovement 6, MeteorFalls_1F_1R_Movement_1A083F + applymovement 5, Common_Movement_WalkInPlaceFastestLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193320, MSGBOX_DEFAULT closemessage @@ -63,10 +63,10 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 9, MeteorFalls_1F_1R_Movement_15C64A waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193720, MSGBOX_DEFAULT - applymovement 7, MeteorFalls_1F_1R_Movement_1A0845 + applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193747, MSGBOX_DEFAULT - applymovement 7, MeteorFalls_1F_1R_Movement_1A083F + applymovement 7, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_1937AA, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 6aa9eff7f..ccbed407a 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -59,7 +59,7 @@ MossdeepCity_EventScript_14D011:: @ 814D011 lock faceplayer msgbox MossdeepCity_Text_16944E, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index ad244d3f3..a5f676dba 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -47,7 +47,7 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 applymovement 1, MossdeepCity_GameCorner_1F_Movement_15AD3F waitmovement 0 moveobjectoffscreen 1 - applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 compare VAR_GAME_CORNER_STATE, 1 call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD22 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index c9c24b44b..439d74035 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -12,7 +12,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B compare VAR_RESULT, 1 call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -56,7 +56,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AC1F:: @ 815AC1F faceplayer msgbox MossdeepCity_SpaceCenter_1F_Text_18E427, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 2a9e7566d..26ab6aed3 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -28,12 +28,12 @@ MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01 MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B lockall - applymovement 1, MossdeepCity_StevensHouse_Movement_1A083F + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN - applymovement 1, MossdeepCity_StevensHouse_Movement_1A0833 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, MossdeepCity_StevensHouse_Movement_1A0835 + applymovement 1, Common_Movement_Delay48 waitmovement 0 applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E waitmovement 0 diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index eec6cf720..113d071e8 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -25,9 +25,9 @@ MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 end MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 - applymovement 255, MtPyre_Summit_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_1A0845 + applymovement 2, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 compare VAR_0x8008, 0 @@ -93,7 +93,7 @@ MtPyre_Summit_EventScript_15D59F:: @ 815D59F MtPyre_Summit_EventScript_15D5AA:: @ 815D5AA applymovement 3, MtPyre_Summit_Movement_15D5DF waitmovement 0 - applymovement 255, MtPyre_Summit_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -105,7 +105,7 @@ MtPyre_Summit_EventScript_15D5BF:: @ 815D5BF MtPyre_Summit_EventScript_15D5CA:: @ 815D5CA applymovement 3, MtPyre_Summit_Movement_15D5E5 waitmovement 0 - applymovement 255, MtPyre_Summit_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -196,10 +196,10 @@ MtPyre_Summit_EventScript_15D669:: @ 815D669 setvar VAR_0x8004, ITEM_RED_OR_BLUE_ORB call MtPyre_Summit_EventScript_1A067F closemessage - applymovement VAR_LAST_TALKED, MtPyre_Summit_Movement_1A0841 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 40 - applymovement VAR_LAST_TALKED, MtPyre_Summit_Movement_1A0839 + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 delay 10 .ifdef SAPPHIRE @@ -260,9 +260,9 @@ MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 end MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 - applymovement 255, MtPyre_Summit_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_1A0845 + applymovement 2, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 compare VAR_0x8008, 0 diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 6325fec67..b1d1a8548 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -23,7 +23,7 @@ NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8 NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC lockall - applymovement 255, NewMauville_Entrance_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox NewMauville_Entrance_Text_1982C0, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 8955bc134..9dad90b1f 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -193,7 +193,7 @@ OldaleTown_EventScript_14DEDF:: @ 814DEDF goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DF26 msgbox OldaleTown_Text_16B0CC, MSGBOX_DEFAULT closemessage - applymovement 3, OldaleTown_Movement_1A083D + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -217,7 +217,7 @@ OldaleTown_EventScript_14DF26:: @ 814DF26 OldaleTown_EventScript_14DF30:: @ 814DF30 lockall - applymovement 4, OldaleTown_Movement_1A0839 + applymovement 4, Common_Movement_FacePlayer waitmovement 0 goto OldaleTown_EventScript_14DF92 end @@ -226,7 +226,7 @@ OldaleTown_EventScript_14DF41:: @ 814DF41 lockall applymovement 4, OldaleTown_Movement_14DFDE waitmovement 0 - applymovement 255, OldaleTown_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 goto OldaleTown_EventScript_14DF92 end @@ -235,7 +235,7 @@ OldaleTown_EventScript_14DF5C:: @ 814DF5C lockall applymovement 4, OldaleTown_Movement_14DFE1 waitmovement 0 - applymovement 255, OldaleTown_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 goto OldaleTown_EventScript_14DF92 end @@ -244,7 +244,7 @@ OldaleTown_EventScript_14DF77:: @ 814DF77 lockall applymovement 4, OldaleTown_Movement_14DFE3 waitmovement 0 - applymovement 255, OldaleTown_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 goto OldaleTown_EventScript_14DF92 end diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 18b886301..352910894 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -35,7 +35,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 special ScrSpecial_StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_16D3DE, MSGBOX_DEFAULT - applymovement 2, PetalburgCity_Movement_1A083F, MAP_PETALBURG_CITY + applymovement 2, Common_Movement_WalkInPlaceFastestLeft, MAP_PETALBURG_CITY @ Local id and map num were swapped here (0, 0, 2 vs 2, 0, 0). Fixed to waitmovement 2, MAP_PETALBURG_CITY in Emerald waitmovement 0, MAP_MAUVILLE_CITY msgbox PetalburgCity_Text_16D408, MSGBOX_DEFAULT @@ -56,7 +56,7 @@ PetalburgCity_EventScript_14B7AC:: @ 814B7AC faceplayer msgbox PetalburgCity_Text_164490, MSGBOX_DEFAULT closemessage - applymovement 3, PetalburgCity_Movement_1A083D + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -180,13 +180,13 @@ PetalburgCity_EventScript_14B85A:: @ 814B85A end PetalburgCity_EventScript_14B866:: @ 814B866 - applymovement 9, PetalburgCity_Movement_1A0839 + applymovement 9, Common_Movement_FacePlayer waitmovement 0 playbgm MUS_TSURETEK, FALSE playse SE_PIN - applymovement 9, PetalburgCity_Movement_1A0833 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, PetalburgCity_Movement_1A0835 + applymovement 9, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 call_if_eq PetalburgCity_EventScript_14B91B @@ -207,8 +207,8 @@ PetalburgCity_EventScript_14B866:: @ 814B866 compare VAR_0x8008, 3 call_if_eq PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, MSGBOX_DEFAULT - applymovement 9, PetalburgCity_Movement_1A0843 - applymovement 255, PetalburgCity_Movement_1A0843 + applymovement 9, Common_Movement_WalkInPlaceFastestRight + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox PetalburgCity_Text_164449, MSGBOX_DEFAULT closemessage @@ -221,7 +221,7 @@ PetalburgCity_EventScript_14B866:: @ 814B866 PetalburgCity_EventScript_14B91B:: @ 814B91B applymovement 9, PetalburgCity_Movement_14B9B1 waitmovement 0 - applymovement 255, PetalburgCity_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -233,14 +233,14 @@ PetalburgCity_EventScript_14B930:: @ 814B930 PetalburgCity_EventScript_14B93B:: @ 814B93B applymovement 9, PetalburgCity_Movement_14B9B9 waitmovement 0 - applymovement 255, PetalburgCity_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_EventScript_14B950:: @ 814B950 applymovement 9, PetalburgCity_Movement_14B9BE waitmovement 0 - applymovement 255, PetalburgCity_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 8cf19cdb7..657d129d8 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -73,14 +73,14 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C msgbox PetalburgCity_Gym_Text_17A196, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_17A1B0, MSGBOX_DEFAULT closemessage - applymovement 255, PetalburgCity_Gym_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_1545B4 waitmovement 0 playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_WALLY_PETALBURG delay 30 - applymovement 255, PetalburgCity_Gym_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PetalburgCity_Gym_Text_17A2A4, MSGBOX_DEFAULT setvar VAR_PETALBURG_GYM_STATE, 2 @@ -210,7 +210,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 end PetalburgCity_Gym_EventScript_1547EE:: @ 81547EE - applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 1, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_154B27 waitmovement 0 return @@ -218,20 +218,20 @@ PetalburgCity_Gym_EventScript_1547EE:: @ 81547EE PetalburgCity_Gym_EventScript_154800:: @ 8154800 applymovement 10, PetalburgCity_Gym_Movement_154B1D waitmovement 0 - applymovement 1, PetalburgCity_Gym_Movement_1A0843 - applymovement 255, PetalburgCity_Gym_Movement_1A0843 + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PetalburgCity_Gym_EventScript_15481C:: @ 815481C - applymovement 1, PetalburgCity_Gym_Movement_1A0845 - applymovement 255, PetalburgCity_Gym_Movement_1A0845 + applymovement 1, Common_Movement_WalkInPlaceFastestDown + applymovement 255, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_154B27 waitmovement 0 return PetalburgCity_Gym_EventScript_154835:: @ 8154835 - applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 1, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_154B3E applymovement 255, PetalburgCity_Gym_Movement_154B4D waitmovement 0 @@ -256,55 +256,55 @@ PetalburgCity_Gym_EventScript_154872:: @ 8154872 return PetalburgCity_Gym_EventScript_154884:: @ 8154884 - applymovement 1, PetalburgCity_Gym_Movement_1A0841 + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_Gym_EventScript_15488F:: @ 815488F - applymovement 1, PetalburgCity_Gym_Movement_1A0845 - applymovement 255, PetalburgCity_Gym_Movement_1A0841 + applymovement 1, Common_Movement_WalkInPlaceFastestDown + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_Gym_EventScript_1548A1:: @ 81548A1 - applymovement 1, PetalburgCity_Gym_Movement_1A0843 - applymovement 255, PetalburgCity_Gym_Movement_1A083F + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return PetalburgCity_Gym_EventScript_1548B3:: @ 81548B3 - applymovement 1, PetalburgCity_Gym_Movement_1A083F - applymovement 255, PetalburgCity_Gym_Movement_1A0843 + applymovement 1, Common_Movement_WalkInPlaceFastestLeft + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PetalburgCity_Gym_EventScript_1548C5:: @ 81548C5 - applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return PetalburgCity_Gym_EventScript_1548D0:: @ 81548D0 - applymovement 1, PetalburgCity_Gym_Movement_1A0843 + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PetalburgCity_Gym_EventScript_1548DB:: @ 81548DB - applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return PetalburgCity_Gym_EventScript_1548E6:: @ 81548E6 - applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return PetalburgCity_Gym_EventScript_1548F1:: @ 81548F1 - applymovement 10, PetalburgCity_Gym_Movement_1A0839 + applymovement 10, Common_Movement_FacePlayer waitmovement 0 return PetalburgCity_Gym_EventScript_1548FC:: @ 81548FC - applymovement 10, PetalburgCity_Gym_Movement_1A0845 + applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -332,7 +332,7 @@ PetalburgCity_Gym_EventScript_15492F:: @ 815492F return PetalburgCity_Gym_EventScript_154930:: @ 8154930 - applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -431,42 +431,42 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C end PetalburgCity_Gym_EventScript_154ABC:: @ 8154ABC - applymovement 1, PetalburgCity_Gym_Movement_1A0841 + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_Gym_EventScript_154AC7:: @ 8154AC7 - applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return PetalburgCity_Gym_EventScript_154AD2:: @ 8154AD2 - applymovement 1, PetalburgCity_Gym_Movement_1A083F + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return PetalburgCity_Gym_EventScript_154ADD:: @ 8154ADD - applymovement 1, PetalburgCity_Gym_Movement_1A0843 + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PetalburgCity_Gym_EventScript_154AE8:: @ 8154AE8 - applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return PetalburgCity_Gym_EventScript_154AF3:: @ 8154AF3 - applymovement 1, PetalburgCity_Gym_Movement_1A0841 + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_Gym_EventScript_154AFE:: @ 8154AFE - applymovement 1, PetalburgCity_Gym_Movement_1A0843 + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PetalburgCity_Gym_EventScript_154B09:: @ 8154B09 - applymovement 1, PetalburgCity_Gym_Movement_1A083F + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 6c40d7b96..6b2266064 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -20,7 +20,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 closemessage applymovement 3, PetalburgWoods_Movement_15CEB0 waitmovement 0 - applymovement 4, PetalburgWoods_Movement_1A0841 + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PetalburgWoods_Text_194E6B, MSGBOX_DEFAULT closemessage @@ -44,7 +44,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 call PetalburgWoods_EventScript_15CDE6 applymovement 4, PetalburgWoods_Movement_15CE8E waitmovement 0 - applymovement 255, PetalburgWoods_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox PetalburgWoods_Text_194D92, MSGBOX_DEFAULT closemessage @@ -55,14 +55,14 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 closemessage applymovement 3, PetalburgWoods_Movement_15CEBF waitmovement 0 - applymovement 4, PetalburgWoods_Movement_1A0841 + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PetalburgWoods_Text_194E6B, MSGBOX_DEFAULT closemessage applymovement 4, PetalburgWoods_Movement_15CEA4 waitmovement 0 msgbox PetalburgWoods_Text_194E9A, MSGBOX_DEFAULT - applymovement 255, PetalburgWoods_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PetalburgWoods_Text_194EE8, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_PETALBURG_WOODS_GRUNT, PetalburgWoods_Text_194F83 @@ -87,7 +87,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA applymovement 3, PetalburgWoods_Movement_15CEB7 waitmovement 0 removeobject 3 - applymovement 255, PetalburgWoods_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox PetalburgWoods_Text_19507E, MSGBOX_DEFAULT giveitem ITEM_GREAT_BALL diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 4c698a113..3b6152c36 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -30,7 +30,7 @@ Route101_EventScript_14E948:: @ 814E948 applymovement 4, Route101_Movement_14EA00 applymovement 2, Route101_Movement_14EA31 waitmovement 0 - applymovement 2, Route101_Movement_1A0843 + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, Route101_Movement_14EA27 applymovement 2, Route101_Movement_14EA58 @@ -222,7 +222,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F fadescreen 1 removeobject 4 setobjectxy 255, 6, 13 - applymovement 255, Route101_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 special ScrSpecial_ChooseStarter waitstate diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 1245e73b8..44d245370 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -19,11 +19,11 @@ Route103_EventScript_14EB92:: @ 814EB92 Route103_EventScript_14EBAB:: @ 814EBAB msgbox Route103_Text_16D57A, MSGBOX_DEFAULT playbgm MUS_GIRL_SUP, TRUE - applymovement 2, Route103_Movement_1A0839 + applymovement 2, Common_Movement_FacePlayer waitmovement 0 - applymovement 2, Route103_Movement_1A0833 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route103_Movement_1A0835 + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox Route103_Text_16D5B6, MSGBOX_DEFAULT switch VAR_STARTER_MON @@ -35,11 +35,11 @@ Route103_EventScript_14EBAB:: @ 814EBAB Route103_EventScript_14EC04:: @ 814EC04 msgbox Route103_Text_16D762, MSGBOX_DEFAULT playbgm MUS_BOY_SUP, TRUE - applymovement 2, Route103_Movement_1A0839 + applymovement 2, Common_Movement_FacePlayer waitmovement 0 - applymovement 2, Route103_Movement_1A0833 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route103_Movement_1A0835 + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox Route103_Text_16D7A9, MSGBOX_DEFAULT switch VAR_STARTER_MON diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index fe3a2fb45..1ed12bbb5 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -318,7 +318,7 @@ Route109_EventScript_14F70E:: @ 814F70E faceplayer msgbox Route109_Text_16E405, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route109_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -333,7 +333,7 @@ Route109_EventScript_14F725:: @ 814F725 compare VAR_RESULT, 0 goto_if_eq Route109_EventScript_1A029B closemessage - applymovement VAR_LAST_TALKED, Route109_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_RECEIVED_SOFT_SAND release @@ -341,7 +341,7 @@ Route109_EventScript_14F725:: @ 814F725 Route109_EventScript_14F762:: @ 814F762 msgbox Route109_Text_16E446, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route109_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 92d529767..ee8a4117c 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -33,7 +33,7 @@ Route110_EventScript_14F946:: @ 814F946 lock faceplayer msgbox Route110_Text_16E6C0, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -42,7 +42,7 @@ Route110_EventScript_14F95C:: @ 814F95C lock faceplayer msgbox Route110_Text_16E6F2, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -51,7 +51,7 @@ Route110_EventScript_14F972:: @ 814F972 lock faceplayer msgbox Route110_Text_16E729, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -60,7 +60,7 @@ Route110_EventScript_14F988:: @ 814F988 lock faceplayer msgbox Route110_Text_16E76A, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -254,7 +254,7 @@ Route110_EventScript_14FC10:: @ 814FC10 Route110_EventScript_14FC27:: @ 814FC27 lockall - applymovement 21, Route110_Movement_1A0843 + applymovement 21, Common_Movement_WalkInPlaceFastestRight waitmovement 0 call Route110_EventScript_14FC39 releaseall @@ -330,11 +330,11 @@ Route110_EventScript_14FD34:: @ 814FD34 call_if_eq Route110_EventScript_14FDA7 compare VAR_RESULT, 1 call_if_eq Route110_EventScript_14FDAC - applymovement 28, Route110_Movement_1A0845 + applymovement 28, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 28, Route110_Movement_1A0833 + applymovement 28, Common_Movement_ExclamationMark waitmovement 0 - applymovement 28, Route110_Movement_1A0835 + applymovement 28, Common_Movement_Delay48 waitmovement 0 delay 30 compare VAR_0x8008, 1 diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 813c4f245..157f11ffe 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -161,7 +161,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF delay 30 msgbox Route110_TrickHouseEnd_Text_19C602, MSGBOX_DEFAULT closemessage - applymovement 1, Route110_TrickHouseEnd_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 delay 30 msgbox Route110_TrickHouseEnd_Text_19C691, MSGBOX_DEFAULT @@ -202,22 +202,22 @@ Route110_TrickHouseEnd_EventScript_161C61:: @ 8161C61 return Route110_TrickHouseEnd_EventScript_161C74:: @ 8161C74 - applymovement 1, Route110_TrickHouseEnd_Movement_1A0845 + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return Route110_TrickHouseEnd_EventScript_161C7F:: @ 8161C7F - applymovement 1, Route110_TrickHouseEnd_Movement_1A0841 + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return Route110_TrickHouseEnd_EventScript_161C8A:: @ 8161C8A - applymovement 1, Route110_TrickHouseEnd_Movement_1A083F + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95 - applymovement 1, Route110_TrickHouseEnd_Movement_1A0843 + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -225,13 +225,13 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 lockall turnobject 1, 3 playse SE_PIN - applymovement 1, Route110_TrickHouseEnd_Movement_1A0833 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 delay 20 applymovement 1, Route110_TrickHouseEnd_Movement_161CEA waitmovement 0 playse SE_W153 - applymovement 255, Route110_TrickHouseEnd_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_19CA8B, MSGBOX_DEFAULT closemessage diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index b6331e25d..616049f04 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -237,9 +237,9 @@ Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D playse SE_PIN - applymovement 255, Route110_TrickHouseEntrance_Movement_1A0833 + applymovement 255, Common_Movement_ExclamationMark waitmovement 0 - applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 + applymovement 255, Common_Movement_Delay48 waitmovement 0 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_1612CD @@ -327,21 +327,21 @@ Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327 Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330 msgbox Route110_TrickHouseEntrance_Text_19BF19, MSGBOX_DEFAULT closemessage - applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 1, Route110_TrickHouseEntrance_Movement_1A0833 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Route110_TrickHouseEntrance_Movement_1A0835 + applymovement 1, Common_Movement_Delay48 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19BFAB, MSGBOX_DEFAULT - applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841 + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E - applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C07E, MSGBOX_DEFAULT compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 @@ -433,13 +433,13 @@ Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 Route110_TrickHouseEntrance_EventScript_161502:: @ 8161502 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 - applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841 + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 - applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C128, MSGBOX_DEFAULT .ifdef SAPPHIRE @@ -497,7 +497,7 @@ Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0 special DrawWholeMapView delay 20 - applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856 + applymovement 255, Common_Movement_WalkUp waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_16165E waitmovement 0 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index c7f97622b..6836211bd 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -25,7 +25,7 @@ Route110_TrickHousePuzzle5_EventScript_1627E7:: @ 81627E7 Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 lockall - applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_1, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 @@ -35,7 +35,7 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 lockall - applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0839 + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_2, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 @@ -45,7 +45,7 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 lockall - applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0839 + applymovement 3, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_3, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 @@ -55,7 +55,7 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 lockall - applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0839 + applymovement 4, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_4, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 @@ -65,7 +65,7 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 lockall - applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0839 + applymovement 5, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_5, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 @@ -161,9 +161,9 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F setvar VAR_TEMP_1, 1 setvar VAR_TEMP_8, 1 playse SE_PIN - applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0833 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 + applymovement 1, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 @@ -183,9 +183,9 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 setvar VAR_TEMP_2, 1 setvar VAR_TEMP_8, 2 playse SE_PIN - applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0833 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 + applymovement 2, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B @@ -205,9 +205,9 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_8, 3 playse SE_PIN - applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0833 + applymovement 3, Common_Movement_ExclamationMark waitmovement 0 - applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 + applymovement 3, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 @@ -227,9 +227,9 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B setvar VAR_TEMP_4, 1 setvar VAR_TEMP_8, 4 playse SE_PIN - applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0833 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 + applymovement 4, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 @@ -249,9 +249,9 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F setvar VAR_TEMP_5, 1 setvar VAR_TEMP_8, 5 playse SE_PIN - applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0833 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 + applymovement 5, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 9edcaaccc..0f8244d8a 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -244,7 +244,7 @@ Route111_EventScript_1501D1:: @ 81501D1 Route111_EventScript_1501F3:: @ 81501F3 msgbox Route111_Text_16F7B3, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_16F7D2 - applymovement 1, Route111_Movement_1A0841 + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F7FF, MSGBOX_DEFAULT @@ -262,7 +262,7 @@ Route111_EventScript_1501F3:: @ 81501F3 call Route111_EventScript_15034F msgbox Route111_Text_16F82D, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_16F8A6 - applymovement 2, Route111_Movement_1A0841 + applymovement 2, Common_Movement_WalkInPlaceFastestUp waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F8D5, MSGBOX_DEFAULT @@ -280,7 +280,7 @@ Route111_EventScript_1501F3:: @ 81501F3 call Route111_EventScript_15034F msgbox Route111_Text_16F90E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VIVI, Route111_Text_16F956 - applymovement 3, Route111_Movement_1A0841 + applymovement 3, Common_Movement_WalkInPlaceFastestUp waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F96C, MSGBOX_DEFAULT @@ -300,7 +300,7 @@ Route111_EventScript_1501F3:: @ 81501F3 trainerbattle_no_intro TRAINER_VICKY, Route111_Text_16F9EC msgbox Route111_Text_16FA22, MSGBOX_DEFAULT closemessage - applymovement 4, Route111_Movement_1A0841 + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 call Route111_EventScript_150348 applymovement 4, Route111_Movement_150356 diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index 24eee1218..b05451651 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -52,7 +52,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6 Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 closemessage - applymovement VAR_0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D + applymovement VAR_0x8008, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 28d85c83f..60e5f247f 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -132,8 +132,8 @@ Route116_EventScript_150B5D:: @ 8150B5D Route116_EventScript_150B6E:: @ 8150B6E lockall - applymovement 11, Route116_Movement_1A0843 - applymovement 255, Route116_Movement_1A083F + applymovement 11, Common_Movement_WalkInPlaceFastestRight + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox Route116_Text_17032A, MSGBOX_DEFAULT setvar VAR_ROUTE116_STATE, 2 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 6edf333c4..69b3609dd 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -50,7 +50,7 @@ Route118_EventScript_150FA5:: @ 8150FA5 Route118_EventScript_150FAE:: @ 8150FAE lockall setvar VAR_0x8008, 0 - applymovement 255, Route118_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement 19, Route118_Movement_151069 waitmovement 0 @@ -60,7 +60,7 @@ Route118_EventScript_150FAE:: @ 8150FAE Route118_EventScript_150FCE:: @ 8150FCE lockall setvar VAR_0x8008, 1 - applymovement 255, Route118_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto Route118_EventScript_151004 end @@ -68,7 +68,7 @@ Route118_EventScript_150FCE:: @ 8150FCE Route118_EventScript_150FE4:: @ 8150FE4 lockall setvar VAR_0x8008, 2 - applymovement 255, Route118_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement 19, Route118_Movement_15106B waitmovement 0 diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index c9218f459..d59624ae5 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -60,7 +60,7 @@ Route119_EventScript_1511DB:: @ 81511DB call_if_eq Route119_EventScript_1513A6 compare VAR_TEMP_1, 2 call_if_eq Route119_EventScript_1513B1 - applymovement 255, Route119_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 compare VAR_TEMP_1, 1 @@ -354,7 +354,7 @@ Route119_EventScript_1515C5:: @ 81515C5 faceplayer msgbox Route119_Text_171520, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -364,7 +364,7 @@ Route119_EventScript_1515DC:: @ 81515DC faceplayer msgbox Route119_Text_17157C, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 79d9be171..bd0b71051 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -206,12 +206,12 @@ Route120_EventScript_15189D:: @ 815189D call_if_eq Route120_EventScript_15197F compare VAR_FACING, 3 call_if_eq Route120_EventScript_15198A - applymovement 31, Route120_Movement_1A083F + applymovement 31, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 msgbox Route120_Text_1719D4, MSGBOX_DEFAULT closemessage - applymovement 30, Route120_Movement_1A0843 + applymovement 30, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 30, Route120_Movement_1A0662 waitmovement 0 @@ -228,15 +228,15 @@ Route120_EventScript_15189D:: @ 815189D end Route120_EventScript_151908:: @ 8151908 - applymovement 31, Route120_Movement_1A0845 - applymovement 255, Route120_Movement_1A0841 + applymovement 31, Common_Movement_WalkInPlaceFastestDown + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route120_Text_171A40, MSGBOX_DEFAULT giveitem ITEM_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_171B0E, MSGBOX_DEFAULT closemessage - applymovement 31, Route120_Movement_1A0845 + applymovement 31, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 @@ -253,7 +253,7 @@ Route120_EventScript_151908:: @ 8151908 end Route120_EventScript_15197F:: @ 815197F - applymovement 255, Route120_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index aaa7a19b2..5556af87b 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -47,7 +47,7 @@ Route121_SafariZoneEntrance_EventScript_15C379:: @ 815C379 Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 lockall - applymovement 255, Route121_SafariZoneEntrance_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 showmoneybox 0, 0 nop diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 6309039cd..451d3e3e0 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -28,18 +28,18 @@ Route128_EventScript_15213F:: @ 815213F closemessage applymovement 5, Route128_Movement_152293 waitmovement 0 - applymovement 4, Route128_Movement_1A0841 + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route128_Text_171F4B, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1522A1 waitmovement 0 - applymovement 255, Route128_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route128_Text_172008, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_15227E - applymovement 255, Route128_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft applymovement 5, Route128_Movement_152290 waitmovement 0 msgbox Route128_Text_17210B, MSGBOX_DEFAULT @@ -57,23 +57,23 @@ Route128_EventScript_15213F:: @ 815213F addobject 3 applymovement 3, Route128_Movement_15226F waitmovement 0 - applymovement 255, Route128_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox Route128_Text_172181, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_15226D - applymovement 255, Route128_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 .ifdef SAPPHIRE msgbox Route128_Text_1721A2, MSGBOX_DEFAULT .else msgbox Route128_Text_1722A1, MSGBOX_DEFAULT .endif - applymovement 3, Route128_Movement_1A0845 + applymovement 3, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route128_Text_1723BE, MSGBOX_DEFAULT closemessage - applymovement 3, Route128_Movement_1A0845 + applymovement 3, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index f1e3a1fef..5c6307df6 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -98,7 +98,7 @@ RustboroCity_EventScript_14C449:: @ 814C449 lock faceplayer msgbox RustboroCity_Text_166D59, MSGBOX_DEFAULT - applymovement 7, RustboroCity_Movement_1A083D + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -107,7 +107,7 @@ RustboroCity_EventScript_14C45F:: @ 814C45F lock faceplayer msgbox RustboroCity_Text_166DB0, MSGBOX_DEFAULT - applymovement 8, RustboroCity_Movement_1A083D + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -219,7 +219,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 @ 814C59B applymovement 9, RustboroCity_Movement_14C5F7 waitmovement 0 - applymovement 255, RustboroCity_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -375,52 +375,52 @@ RustboroCity_EventScript_14C650:: @ 814C650 end RustboroCity_EventScript_14C691:: @ 814C691 - applymovement 9, RustboroCity_Movement_1A0841 + applymovement 9, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_1A0833 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_1A0835 + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 255, RustboroCity_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return RustboroCity_EventScript_14C6BD:: @ 814C6BD - applymovement 9, RustboroCity_Movement_1A083F + applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_1A0833 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_1A0835 + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 255, RustboroCity_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return RustboroCity_EventScript_14C6E9:: @ 814C6E9 - applymovement 9, RustboroCity_Movement_1A0845 + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_1A0833 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_1A0835 + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 255, RustboroCity_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return RustboroCity_EventScript_14C715:: @ 814C715 - applymovement 9, RustboroCity_Movement_1A0845 + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_1A0833 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_1A0835 + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, RustboroCity_Movement_14C74B waitmovement 0 - applymovement 255, RustboroCity_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -483,62 +483,62 @@ RustboroCity_EventScript_14C7F5:: @ 814C7F5 return RustboroCity_EventScript_14C7FE:: @ 814C7FE - applymovement 9, RustboroCity_Movement_1A0841 + applymovement 9, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_1A0833 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_1A0835 + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 255, RustboroCity_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return RustboroCity_EventScript_14C82A:: @ 814C82A - applymovement 9, RustboroCity_Movement_1A0843 + applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_1A0833 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_1A0835 + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 255, RustboroCity_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return RustboroCity_EventScript_14C856:: @ 814C856 - applymovement 9, RustboroCity_Movement_1A0845 + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_1A0833 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_1A0835 + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 255, RustboroCity_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return RustboroCity_EventScript_14C882:: @ 814C882 - applymovement 9, RustboroCity_Movement_1A0845 + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_1A0833 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_1A0835 + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, RustboroCity_Movement_14C74B waitmovement 0 - applymovement 255, RustboroCity_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return RustboroCity_EventScript_14C8B8:: @ 814C8B8 - applymovement 9, RustboroCity_Movement_1A083F + applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_1A0833 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_1A0835 + applymovement 9, Common_Movement_Delay48 waitmovement 0 return diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 3d93a7ee5..33a25c7ca 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -79,9 +79,9 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 closemessage playse SE_PIN - applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO compare VAR_RESULT, NO @@ -97,9 +97,9 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE closemessage playse SE_PIN - applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO compare VAR_RESULT, NO diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index ca98b651e..c25951a04 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -150,7 +150,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -163,7 +163,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_1835B3, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -171,7 +171,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B msgbox RustboroCity_DevonCorp_3F_Text_18368D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 9ea437792..f5da355e2 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -87,7 +87,7 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE compare VAR_RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 setflag FLAG_RECEIVED_QUICK_CLAW release @@ -106,7 +106,7 @@ RustboroCity_PokemonSchool_EventScript_157B29:: @ 8157B29 RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34 msgbox RustboroCity_PokemonSchool_Text_184737, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 release end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index b244eb0bf..3152d082f 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -24,7 +24,7 @@ RusturfTunnel_EventScript_15C782:: @ 815C782 faceplayer msgbox RusturfTunnel_Text_194766, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -36,7 +36,7 @@ RusturfTunnel_EventScript_15C799:: @ 815C799 setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_1944C5, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -44,7 +44,7 @@ RusturfTunnel_EventScript_15C799:: @ 815C799 RusturfTunnel_EventScript_15C7BC:: @ 815C7BC msgbox RusturfTunnel_Text_1945B2, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -95,7 +95,7 @@ RusturfTunnel_EventScript_15C892:: @ 815C892 applymovement 255, RusturfTunnel_Movement_15C96D applymovement 1, RusturfTunnel_Movement_15C994 waitmovement 0 - applymovement 10, RusturfTunnel_Movement_1A0845 + applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -103,14 +103,14 @@ RusturfTunnel_EventScript_15C8AE:: @ 815C8AE applymovement 255, RusturfTunnel_Movement_15C96D applymovement 1, RusturfTunnel_Movement_15C994 waitmovement 0 - applymovement 10, RusturfTunnel_Movement_1A0845 + applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return RusturfTunnel_EventScript_15C8CA:: @ 815C8CA - applymovement 1, RusturfTunnel_Movement_1A0841 + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 255, RusturfTunnel_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -148,9 +148,9 @@ RusturfTunnel_EventScript_15C91B:: @ 815C91B RusturfTunnel_EventScript_15C92D:: @ 815C92D playse SE_PIN - applymovement 1, RusturfTunnel_Movement_1A0833 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, RusturfTunnel_Movement_1A0835 + applymovement 1, Common_Movement_Delay48 waitmovement 0 return @@ -326,7 +326,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA applymovement 5, RusturfTunnel_Movement_15CAC0 waitmovement 0 msgbox RusturfTunnel_Text_19432A, MSGBOX_DEFAULT - applymovement 5, RusturfTunnel_Movement_1A0839 + applymovement 5, Common_Movement_FacePlayer waitmovement 0 message RusturfTunnel_Text_19434F waitmessage diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 24e0c037d..bd39cb6b4 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -18,7 +18,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 - applymovement 255, SeafloorCavern_Room9_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement 255, SeafloorCavern_Room9_Movement_15DD68 waitmovement 0 @@ -29,7 +29,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .endif closemessage addobject VAR_0x8004 - applymovement 255, SeafloorCavern_Room9_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_15DD36 waitmovement 0 @@ -38,14 +38,14 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B486C, MSGBOX_DEFAULT .endif - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0841 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4201, MSGBOX_DEFAULT .else msgbox SeafloorCavern_Room9_Text_1B4897, MSGBOX_DEFAULT .endif - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0839 + applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4289, MSGBOX_DEFAULT @@ -92,8 +92,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80818A4 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0841 - applymovement 255, SeafloorCavern_Room9_Movement_1A0841 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 150 removeobject 7 @@ -127,7 +127,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4A89, MSGBOX_DEFAULT .endif playse SE_PC_LOGON - applymovement 255, SeafloorCavern_Room9_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4443, MSGBOX_DEFAULT @@ -145,7 +145,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA closemessage playse SE_PC_OFF delay 20 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0845 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestDown waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B45C6, MSGBOX_DEFAULT @@ -160,7 +160,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_15DD63 applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_15DD5A waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A083F + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B464D, MSGBOX_DEFAULT @@ -168,9 +168,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4D02, MSGBOX_DEFAULT .endif playse SE_PIN - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0833 + applymovement VAR_0x8004, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0835 + applymovement VAR_0x8004, Common_Movement_Delay48 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4723, MSGBOX_DEFAULT diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 7c977dfce..4eca5a985 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -303,7 +303,7 @@ SlateportCity_EventScript_14BD3A:: @ 814BD3A faceplayer msgbox SlateportCity_Text_164C64, MSGBOX_DEFAULT closemessage - applymovement 5, SlateportCity_Movement_1A083D + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -313,7 +313,7 @@ SlateportCity_EventScript_14BD51:: @ 814BD51 faceplayer msgbox SlateportCity_Text_164C9F, MSGBOX_DEFAULT closemessage - applymovement 19, SlateportCity_Movement_1A083D + applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -323,7 +323,7 @@ SlateportCity_EventScript_14BD68:: @ 814BD68 faceplayer msgbox SlateportCity_Text_164CE8, MSGBOX_DEFAULT closemessage - applymovement 20, SlateportCity_Movement_1A083D + applymovement 20, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -333,7 +333,7 @@ SlateportCity_EventScript_14BD7F:: @ 814BD7F faceplayer msgbox SlateportCity_Text_164D2B, MSGBOX_DEFAULT closemessage - applymovement 27, SlateportCity_Movement_1A083D + applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -343,7 +343,7 @@ SlateportCity_EventScript_14BD96:: @ 814BD96 faceplayer msgbox SlateportCity_Text_164D92, MSGBOX_DEFAULT closemessage - applymovement 28, SlateportCity_Movement_1A083D + applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -353,7 +353,7 @@ SlateportCity_EventScript_14BDAD:: @ 814BDAD faceplayer msgbox SlateportCity_Text_164DD5, MSGBOX_DEFAULT closemessage - applymovement 29, SlateportCity_Movement_1A083D + applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -363,7 +363,7 @@ SlateportCity_EventScript_14BDC4:: @ 814BDC4 faceplayer msgbox SlateportCity_Text_164DF4, MSGBOX_DEFAULT closemessage - applymovement 30, SlateportCity_Movement_1A083D + applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -373,7 +373,7 @@ SlateportCity_EventScript_14BDDB:: @ 814BDDB faceplayer msgbox SlateportCity_Text_164E46, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_1A083D + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -484,10 +484,10 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC msgbox SlateportCity_Text_165498, MSGBOX_DEFAULT msgbox SlateportCity_Text_1654E0, MSGBOX_DEFAULT closemessage - applymovement 10, SlateportCity_Movement_1A0843 + applymovement 10, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 10 - applymovement 9, SlateportCity_Movement_1A0845 + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 25 applymovement 11, SlateportCity_Movement_14C000 @@ -498,27 +498,27 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC removeobject 10 removeobject 9 msgbox SlateportCity_Text_16558D, MSGBOX_DEFAULT - applymovement 11, SlateportCity_Movement_1A0841 + applymovement 11, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_Text_1655E7, MSGBOX_DEFAULT playbgm MUS_EVIL_TEAM, FALSE msgbox SlateportCity_Text_1656BC, MSGBOX_DEFAULT - applymovement 6, SlateportCity_Movement_1A083F - applymovement 1, SlateportCity_Movement_1A083F + applymovement 6, Common_Movement_WalkInPlaceFastestLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft applymovement 7, SlateportCity_Movement_14BFCD - applymovement 3, SlateportCity_Movement_1A0831 + applymovement 3, Common_Movement_QuestionMark applymovement 2, SlateportCity_Movement_14BFD5 waitmovement 0 - applymovement 11, SlateportCity_Movement_1A0845 + applymovement 11, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox SlateportCity_Text_16578F, MSGBOX_DEFAULT playse SE_PIN - applymovement 11, SlateportCity_Movement_1A0833 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 - applymovement 11, SlateportCity_Movement_1A0835 + applymovement 11, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_Text_1657FA, MSGBOX_DEFAULT - applymovement 11, SlateportCity_Movement_1A0839 + applymovement 11, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_Text_16583A, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SlateportCity_ContestHall/scripts.inc b/data/maps/SlateportCity_ContestHall/scripts.inc index 84b32703f..1fb6f046d 100644 --- a/data/maps/SlateportCity_ContestHall/scripts.inc +++ b/data/maps/SlateportCity_ContestHall/scripts.inc @@ -30,7 +30,7 @@ SlateportCity_ContestHall_EventScript_155595:: @ 8155595 SlateportCity_ContestHall_EventScript_15559F:: @ 815559F msgbox SlateportCity_ContestHall_Text_17CEF3, MSGBOX_NPC lockall - applymovement 3, SlateportCity_ContestHall_Movement_1A083D + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -38,7 +38,7 @@ SlateportCity_ContestHall_EventScript_15559F:: @ 815559F SlateportCity_ContestHall_EventScript_1555B4:: @ 81555B4 msgbox SlateportCity_ContestHall_Text_17CFA7, MSGBOX_NPC lockall - applymovement 4, SlateportCity_ContestHall_Movement_1A083D + applymovement 4, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -46,7 +46,7 @@ SlateportCity_ContestHall_EventScript_1555B4:: @ 81555B4 SlateportCity_ContestHall_EventScript_1555C9:: @ 81555C9 msgbox SlateportCity_ContestHall_Text_17D054, MSGBOX_NPC lockall - applymovement 5, SlateportCity_ContestHall_Movement_1A083D + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -54,7 +54,7 @@ SlateportCity_ContestHall_EventScript_1555C9:: @ 81555C9 SlateportCity_ContestHall_EventScript_1555DE:: @ 81555DE msgbox SlateportCity_ContestHall_Text_17D07F, MSGBOX_NPC lockall - applymovement 6, SlateportCity_ContestHall_Movement_1A083D + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -62,7 +62,7 @@ SlateportCity_ContestHall_EventScript_1555DE:: @ 81555DE SlateportCity_ContestHall_EventScript_1555F3:: @ 81555F3 msgbox SlateportCity_ContestHall_Text_17D0F9, MSGBOX_NPC lockall - applymovement 7, SlateportCity_ContestHall_Movement_1A083D + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -70,7 +70,7 @@ SlateportCity_ContestHall_EventScript_1555F3:: @ 81555F3 SlateportCity_ContestHall_EventScript_155608:: @ 8155608 msgbox SlateportCity_ContestHall_Text_17D222, MSGBOX_NPC lockall - applymovement 8, SlateportCity_ContestHall_Movement_1A083D + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -78,7 +78,7 @@ SlateportCity_ContestHall_EventScript_155608:: @ 8155608 SlateportCity_ContestHall_EventScript_15561D:: @ 815561D msgbox SlateportCity_ContestHall_Text_17D39A, MSGBOX_NPC lockall - applymovement 9, SlateportCity_ContestHall_Movement_1A083D + applymovement 9, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -86,7 +86,7 @@ SlateportCity_ContestHall_EventScript_15561D:: @ 815561D SlateportCity_ContestHall_EventScript_155632:: @ 8155632 msgbox SlateportCity_ContestHall_Text_17D3F0, MSGBOX_NPC lockall - applymovement 10, SlateportCity_ContestHall_Movement_1A083D + applymovement 10, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -94,7 +94,7 @@ SlateportCity_ContestHall_EventScript_155632:: @ 8155632 SlateportCity_ContestHall_EventScript_155647:: @ 8155647 msgbox SlateportCity_ContestHall_Text_17D300, MSGBOX_NPC lockall - applymovement 12, SlateportCity_ContestHall_Movement_1A083D + applymovement 12, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -102,7 +102,7 @@ SlateportCity_ContestHall_EventScript_155647:: @ 8155647 SlateportCity_ContestHall_EventScript_15565C:: @ 815565C msgbox SlateportCity_ContestHall_Text_17D27F, MSGBOX_NPC lockall - applymovement 11, SlateportCity_ContestHall_Movement_1A083D + applymovement 11, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc index 5e649c2e9..2d253d91c 100644 --- a/data/maps/SlateportCity_ContestLobby/scripts.inc +++ b/data/maps/SlateportCity_ContestLobby/scripts.inc @@ -102,7 +102,7 @@ SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0 SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 lockall goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, SlateportCity_ContestLobby_EventScript_155526 - applymovement 7, SlateportCity_ContestLobby_Movement_1A0839 + applymovement 7, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_ContestLobby_Text_17CA67, MSGBOX_DEFAULT giveitem ITEM_POKEBLOCK_CASE diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 3b43aed9f..2c467332c 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -48,9 +48,9 @@ SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF end SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 - applymovement 7, SlateportCity_Harbor_Movement_1A0845 + applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_Harbor_Text_17FD7D, MSGBOX_DEFAULT closemessage @@ -82,21 +82,21 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 SlateportCity_Harbor_EventScript_15605C:: @ 815605C applymovement 4, SlateportCity_Harbor_Movement_1560B3 waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_1A0845 + applymovement 255, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return SlateportCity_Harbor_EventScript_156071:: @ 8156071 applymovement 4, SlateportCity_Harbor_Movement_1560B9 waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return SlateportCity_Harbor_EventScript_156086:: @ 8156086 applymovement 4, SlateportCity_Harbor_Movement_1560BE waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -217,7 +217,7 @@ SlateportCity_Harbor_EventScript_15618A:: @ 815618A SlateportCity_Harbor_EventScript_156196:: @ 8156196 msgbox SlateportCity_Harbor_Text_17FBB6, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR @@ -273,7 +273,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index f4a8fa088..ed3e8a8c4 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -18,14 +18,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_155ADB:: @ 8155ADB SlateportCity_OceanicMuseum_1F_EventScript_155AE4:: @ 8155AE4 lockall - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 end SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5 lockall - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 end @@ -158,9 +158,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A faceplayer delay 8 playse SE_PIN - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0833 + applymovement 13, Common_Movement_ExclamationMark waitmovement 0 - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 + applymovement 13, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, MSGBOX_DEFAULT giveitem ITEM_TM46_THIEF diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 560165838..ab91ca006 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -49,8 +49,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 trainerbattle_no_intro TRAINER_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Text_17EED6 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF waitmovement 0 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845 - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_1A0841 + applymovement 3, Common_Movement_WalkInPlaceFastestDown + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, MSGBOX_DEFAULT closemessage @@ -75,7 +75,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 fadescreen 0 delay 30 setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, MSGBOX_DEFAULT setvar VAR_0x8004, 269 @@ -94,12 +94,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 end SlateportCity_OceanicMuseum_2F_EventScript_155E62:: @ 8155E62 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_155E6D:: @ 8155E6D - applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_1A083F + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -266,7 +266,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 14609b557..d2f43976f 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -196,9 +196,9 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A playse SE_PIN - applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0833 + applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 + applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_17DF57, MSGBOX_DEFAULT giveitem ITEM_SOOTHE_BELL diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index 07b5eab68..083d8e993 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -8,11 +8,11 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553CF goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553B0 msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, MSGBOX_DEFAULT - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C1EC, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_DOCK_REJECTED_DEVON_GOODS setflag FLAG_HIDE_EVIL_TEAM_SLATEPORT @@ -20,31 +20,31 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 end SlateportCity_SternsShipyard_1F_EventScript_155388:: @ 8155388 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C472, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_15539C:: @ 815539C - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C3F7, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_1553B0:: @ 81553B0 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C2F2, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end SlateportCity_SternsShipyard_1F_EventScript_1553CF:: @ 81553CF - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C360, MSGBOX_DEFAULT releaseall diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index ab4407fb3..c580876ad 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -202,13 +202,13 @@ ClosedSootopolisDoorScript:: @ 814D2FF SootopolisCity_EventScript_14D308:: @ 814D308 lockall - applymovement 10, SootopolisCity_Movement_1A083F - applymovement 255, SootopolisCity_Movement_1A0843 + applymovement 10, Common_Movement_WalkInPlaceFastestLeft + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PIN - applymovement 10, SootopolisCity_Movement_1A0833 + applymovement 10, Common_Movement_ExclamationMark waitmovement 0 - applymovement 10, SootopolisCity_Movement_1A0835 + applymovement 10, Common_Movement_Delay48 waitmovement 0 applymovement 10, SootopolisCity_Movement_14D413 waitmovement 0 @@ -227,9 +227,9 @@ SootopolisCity_EventScript_14D308:: @ 814D308 msgbox SootopolisCity_Text_169E82, MSGBOX_DEFAULT .endif playse SE_PIN - applymovement 5, SootopolisCity_Movement_1A0833 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, SootopolisCity_Movement_1A0835 + applymovement 5, Common_Movement_Delay48 waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169AB7, MSGBOX_DEFAULT @@ -242,11 +242,11 @@ SootopolisCity_EventScript_14D308:: @ 814D308 applymovement 10, SootopolisCity_Movement_14D41D applymovement 255, SootopolisCity_Movement_14D445 waitmovement 0 - applymovement 5, SootopolisCity_Movement_1A0843 - applymovement 255, SootopolisCity_Movement_1A0843 + applymovement 5, Common_Movement_WalkInPlaceFastestRight + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 - applymovement 10, SootopolisCity_Movement_1A0845 + applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169AE7, MSGBOX_DEFAULT @@ -259,14 +259,14 @@ SootopolisCity_EventScript_14D308:: @ 814D308 applymovement 255, SootopolisCity_Movement_14D457 applymovement 10, SootopolisCity_Movement_14D42D waitmovement 0 - applymovement 5, SootopolisCity_Movement_1A083F + applymovement 5, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169BC7, MSGBOX_DEFAULT .else msgbox SootopolisCity_Text_16A06C, MSGBOX_DEFAULT .endif - applymovement 255, SootopolisCity_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169C99, MSGBOX_DEFAULT @@ -446,7 +446,7 @@ SootopolisCity_EventScript_14D498:: @ 814D498 SootopolisCity_EventScript_14D4AD:: @ 814D4AD msgbox SootopolisCity_Text_16A33E, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SootopolisCity_Movement_1A0845 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index d1d0f5487..b161cfb8c 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -14,7 +14,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 07d0ddd27..24e6eb6c6 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -13,14 +13,14 @@ VerdanturfTown_EventScript_14E866:: @ 814E866 faceplayer goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E885 msgbox VerdanturfTown_Text_16CAEB, MSGBOX_DEFAULT - applymovement 2, VerdanturfTown_Movement_1A083D + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end VerdanturfTown_EventScript_14E885:: @ 814E885 msgbox VerdanturfTown_Text_16CBCE, MSGBOX_DEFAULT - applymovement 2, VerdanturfTown_Movement_1A083D + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index cc76426e5..4b592d9c0 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -35,7 +35,7 @@ VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF end VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 - applymovement 255, VictoryRoad_1F_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox VictoryRoad_1F_Text_19782B, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_197943 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 867e41661..60852bf2f 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -220,13 +220,13 @@ Route111_EventScript_1AE5E0:: @ 81AE5E0 Route111_EventScript_1AE5EB:: @ 81AE5EB applymovement VAR_0x8004, Route111_Movement_1AE69B - applymovement VAR_0x8005, Route111_Movement_1A0841 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return Route111_EventScript_1AE5FD:: @ 81AE5FD applymovement VAR_0x8004, Route111_Movement_1AE69D - applymovement VAR_0x8005, Route111_Movement_1A083F + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 11837cbc6..5b946fbdb 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -4,7 +4,7 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95 call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CB9 call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CC2 closemessage - applymovement 1, MtChimney_Movement_1A083D + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_EVIL_LEADER_PLEASE_STOP release @@ -33,12 +33,12 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB .else msgbox MtChimney_Text_1B37BB, MSGBOX_DEFAULT .endif - applymovement 2, MtChimney_Movement_1A0839 + applymovement 2, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 2, MtChimney_Movement_1A0833 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, MtChimney_Movement_1A0835 + applymovement 2, Common_Movement_Delay48 waitmovement 0 .ifdef SAPPHIRE msgbox MtChimney_Text_1B2ED9, MSGBOX_DEFAULT @@ -69,7 +69,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB call_if_eq MtChimney_EventScript_1B2D7D compare VAR_FACING, 2 call_if_eq MtChimney_EventScript_1B2D88 - applymovement 255, MtChimney_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 .ifdef SAPPHIRE msgbox MtChimney_Text_1B3608, MSGBOX_DEFAULT diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc new file mode 100644 index 000000000..fb2d1ae2c --- /dev/null +++ b/data/scripts/movement.inc @@ -0,0 +1,71 @@ +Common_Movement_QuestionMark:: @ 81A0831 + emote_question_mark + step_end + +Common_Movement_ExclamationMark:: @ 81A0833 + emote_exclamation_mark + step_end + +Common_Movement_Delay48:: @ 81A0835 + delay_16 + delay_16 + delay_16 + step_end + +Common_Movement_FacePlayer:: @ 81A0839 + face_player + step_end + +Common_Movement_FaceAwayPlayer:: @ 81A083B + face_away_player + step_end + +Common_Movement_FaceOriginalDirection:: @ 81A083D + face_original_direction + step_end + +Common_Movement_WalkInPlaceFastestLeft:: @ 81A083F + walk_in_place_fastest_left + step_end + +Common_Movement_WalkInPlaceFastestUp:: @ 81A0841 + walk_in_place_fastest_up + step_end + +Common_Movement_WalkInPlaceFastestRight:: @ 81A0843 + walk_in_place_fastest_right + step_end + +Common_Movement_WalkInPlaceFastestDown:: @ 81A0845 + walk_in_place_fastest_down + step_end + +Common_Movement_WalkUp6:: @ 81A0847 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +Common_Movement_WalkUp4:: @ 81A084E + walk_up + walk_up + walk_up + walk_up + step_end + +Common_Movement_Delay32:: @ 81A0853 + delay_16 + delay_16 + step_end + +Common_Movement_WalkUp:: @ 81A0856 + walk_up + step_end + +Common_Movement_WalkUp2:: @ 81A0858 + walk_up + walk_up + step_end diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index 27a3a0aba..79359ae55 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -12,11 +12,11 @@ EventScript_PkmnCenterNurse_HealPkmn:: @ 819FD7C incrementgamestat GAME_STAT_USED_POKECENTER message gText_NurseJoy_OkayIllTakeYourPokemon waitmessage - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_1A083F + applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 dofieldeffect FLDEFF_POKECENTER_HEAL waitfieldeffect FLDEFF_POKECENTER_HEAL - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_1A0845 + applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestDown waitmovement 0 special ScrSpecial_HealPlayerParty goto_if_unset FLAG_POKERUS_EXPLAINED, EventScript_PkmnCenterNurse_CheckPokerus diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index d86ef0b03..a74342b7b 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -6,7 +6,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B6950:: @ 81B6950 LittlerootTown_BrendansHouse_1F_EventScript_1B6956:: @ 81B6956 LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 msgbox LittlerootTown_BrendansHouse_1F_Text_172429, MSGBOX_DEFAULT - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8005, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B699F @@ -16,18 +16,18 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_1B699F:: @ 81B699F - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 msgbox LittlerootTown_BrendansHouse_1F_Text_172531, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC waitmovement 0 releaseall @@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT closemessage @@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT closemessage @@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 end LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0843 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC @@ -167,7 +167,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F + applymovement 255, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_1F_Text_172644, MSGBOX_DEFAULT @@ -179,7 +179,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF end LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E - applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1A083F + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 @@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CDA waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_1B6BBE - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1A0843 + applymovement 255, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_1F_Text_172644, MSGBOX_DEFAULT @@ -206,9 +206,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D:: @ 81B6B9D LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D playse SE_PIN - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement VAR_0x8005, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement VAR_0x8005, Common_Movement_Delay48 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, MSGBOX_DEFAULT closemessage @@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE:: @ 81B6BBE LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement 255, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_172841, MSGBOX_DEFAULT fadedefaultbgm @@ -366,12 +366,12 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + applymovement VAR_0x8009, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement VAR_0x8009, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement VAR_0x8009, Common_Movement_Delay48 waitmovement 0 delay 20 compare VAR_0x8008, 0 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 0622da0cc..b764a2274 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -9,7 +9,7 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E setvar VAR_0x8008, 2 setvar VAR_0x8009, 2 - applymovement 6, SlateportCity_ContestLobby_Movement_1A083D + applymovement 6, Common_Movement_FaceOriginalDirection applymovement VAR_0x8008, SlateportCity_ContestLobby_Movement_1B7821 waitmovement 0 goto SlateportCity_ContestLobby_EventScript_1B7681 @@ -26,8 +26,8 @@ VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659 setvar VAR_0x8008, 3 setvar VAR_0x8009, 3 - applymovement 9, LilycoveCity_ContestLobby_Movement_1A083D - applymovement 10, LilycoveCity_ContestLobby_Movement_1A083D + applymovement 9, Common_Movement_FaceOriginalDirection + applymovement 10, Common_Movement_FaceOriginalDirection applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_1B7821 waitmovement 0 goto LilycoveCity_ContestLobby_EventScript_1B7681 |