diff options
111 files changed, 719 insertions, 1038 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 76b286698..415541475 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1280,11 +1280,11 @@ OldaleTown_PokemonCenter_1F_EventScript_27198D:: @ 827198D return OldaleTown_PokemonCenter_1F_EventScript_271993:: @ 8271993 - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725A4 + applymovement VAR_0x800B, Common_Movement_WalkInPlaceLeft waitmovement 0 dofieldeffect FLDEFF_POKECENTER_HEAL waitfieldeffect FLDEFF_POKECENTER_HEAL - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725AA + applymovement VAR_0x800B, Common_Movement_WalkInPlaceDown waitmovement 0 special HealPlayerParty return @@ -1348,9 +1348,9 @@ OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68 setflag FLAG_OLDALE_NURSE_MENTIONS_GOLD_CARD msgbox gUnknown_082727F5, MSGBOX_DEFAULT playse SE_PIN - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_272598 + applymovement VAR_0x800B, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_27259A + applymovement VAR_0x800B, Common_Movement_Delay48 waitmovement 0 msgbox gUnknown_08272860, MSGBOX_YESNO compare VAR_RESULT, 1 @@ -2080,7 +2080,7 @@ RusturfTunnel_EventScript_272216:: @ 8272216 EventScript_27222B:: @ 827222B delay 30 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 showobjectat 255, MAP_PETALBURG_CITY delay 30 @@ -2223,7 +2223,7 @@ Route119_EventScript_272350:: @ 8272350 Route119_EventScript_272365:: @ 8272365 msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 applymovement VAR_LAST_TALKED, Route119_Movement_2723C7 waitmovement 0 @@ -2370,354 +2370,41 @@ SlateportCity_Movement_272596: @ 8272596 emote_question_mark step_end -AquaHideout_B2F_Movement_272598: @ 8272598 -BattleFrontier_BattleTowerBattleRoom_Movement_272598: @ 8272598 -BattleFrontier_ReceptionGate_Movement_272598: @ 8272598 -CaveOfOrigin_B1F_Movement_272598: @ 8272598 -EverGrandeCity_ChampionsRoom_Movement_272598: @ 8272598 -FarawayIsland_Interior_Movement_272598: @ 8272598 -JaggedPass_Movement_272598: @ 8272598 -LavaridgeTown_Movement_272598: @ 8272598 -LilycoveCity_ContestLobby_Movement_272598: @ 8272598 -LilycoveCity_CoveLilyMotel_1F_Movement_272598: @ 8272598 -LilycoveCity_Harbor_Movement_272598: @ 8272598 -LittlerootTown_BrendansHouse_1F_Movement_272598: @ 8272598 -LittlerootTown_BrendansHouse_2F_Movement_272598: @ 8272598 -LittlerootTown_MaysHouse_1F_Movement_272598: @ 8272598 -LittlerootTown_MaysHouse_2F_Movement_272598: @ 8272598 -LittlerootTown_Movement_272598: @ 8272598 -MauvilleCity_House2_Movement_272598: @ 8272598 -MauvilleCity_Movement_272598: @ 8272598 -MeteorFalls_1F_1R_Movement_272598: @ 8272598 -MeteorFalls_StevensCave_Movement_272598: @ 8272598 -MossdeepCity_SpaceCenter_2F_Movement_272598: @ 8272598 -MossdeepCity_StevensHouse_Movement_272598: @ 8272598 -MtChimney_Movement_272598: @ 8272598 -MtPyre_Summit_Movement_272598: @ 8272598 -OldaleTown_PokemonCenter_1F_Movement_272598: @ 8272598 -PetalburgCity_Gym_Movement_272598: @ 8272598 -PetalburgCity_Movement_272598: @ 8272598 -Route103_Movement_272598: @ 8272598 -Route104_Movement_272598: @ 8272598 -Route110_Movement_272598: @ 8272598 -Route110_TrickHouseEnd_Movement_272598: @ 8272598 -Route110_TrickHouseEntrance_Movement_272598: @ 8272598 -Route110_TrickHousePuzzle5_Movement_272598: @ 8272598 -Route119_WeatherInstitute_2F_Movement_272598: @ 8272598 -RustboroCity_DevonCorp_2F_Movement_272598: @ 8272598 -RustboroCity_Movement_272598: @ 8272598 -RusturfTunnel_Movement_272598: @ 8272598 -SeafloorCavern_Entrance_Movement_272598: @ 8272598 -SeafloorCavern_Room9_Movement_272598: @ 8272598 -SlateportCity_Movement_272598: @ 8272598 -SlateportCity_OceanicMuseum_1F_Movement_272598: @ 8272598 -SlateportCity_PokemonFanClub_Movement_272598: @ 8272598 +Common_Movement_ExclamationMark: @ 8272598 emote_exclamation_mark step_end -BattleFrontier_BattleTowerBattleRoom_Movement_27259A: @ 827259A -BattleFrontier_ReceptionGate_Movement_27259A: @ 827259A -CaveOfOrigin_B1F_Movement_27259A: @ 827259A -EverGrandeCity_ChampionsRoom_Movement_27259A: @ 827259A -FarawayIsland_Interior_Movement_27259A: @ 827259A -JaggedPass_Movement_27259A: @ 827259A -LavaridgeTown_Movement_27259A: @ 827259A -LilycoveCity_CoveLilyMotel_1F_Movement_27259A: @ 827259A -LilycoveCity_Harbor_Movement_27259A: @ 827259A -LittlerootTown_BrendansHouse_1F_Movement_27259A: @ 827259A -LittlerootTown_BrendansHouse_2F_Movement_27259A: @ 827259A -LittlerootTown_MaysHouse_1F_Movement_27259A: @ 827259A -LittlerootTown_MaysHouse_2F_Movement_27259A: @ 827259A -MauvilleCity_House2_Movement_27259A: @ 827259A -MauvilleCity_Movement_27259A: @ 827259A -MeteorFalls_1F_1R_Movement_27259A: @ 827259A -MeteorFalls_StevensCave_Movement_27259A: @ 827259A -MossdeepCity_SpaceCenter_2F_Movement_27259A: @ 827259A -MossdeepCity_StevensHouse_Movement_27259A: @ 827259A -MtChimney_Movement_27259A: @ 827259A -MtPyre_Summit_Movement_27259A: @ 827259A -OldaleTown_PokemonCenter_1F_Movement_27259A: @ 827259A -PetalburgCity_Gym_Movement_27259A: @ 827259A -PetalburgCity_Movement_27259A: @ 827259A -Route103_Movement_27259A: @ 827259A -Route104_Movement_27259A: @ 827259A -Route110_Movement_27259A: @ 827259A -Route110_TrickHouseEntrance_Movement_27259A: @ 827259A -Route110_TrickHousePuzzle5_Movement_27259A: @ 827259A -Route119_WeatherInstitute_2F_Movement_27259A: @ 827259A -RustboroCity_DevonCorp_2F_Movement_27259A: @ 827259A -RustboroCity_Movement_27259A: @ 827259A -RusturfTunnel_Movement_27259A: @ 827259A -SeafloorCavern_Entrance_Movement_27259A: @ 827259A -SeafloorCavern_Room9_Movement_27259A: @ 827259A -SlateportCity_Movement_27259A: @ 827259A -SlateportCity_OceanicMuseum_1F_Movement_27259A: @ 827259A -SlateportCity_PokemonFanClub_Movement_27259A: @ 827259A +Common_Movement_Delay48: @ 827259A delay_16 delay_16 delay_16 step_end -AquaHideout_B2F_Movement_27259E: @ 827259E -BattleFrontier_BattlePyramidLobby_Movement_27259E: @ 827259E -BattleFrontier_ScottsHouse_Movement_27259E: @ 827259E -CaveOfOrigin_B1F_Movement_27259E: @ 827259E -EverGrandeCity_PokemonLeague_1F_Movement_27259E: @ 827259E -FallarborTown_House2_Movement_27259E: @ 827259E -FortreeCity_House4_Movement_27259E: @ 827259E -JaggedPass_Movement_27259E: @ 827259E -LilycoveCity_ContestHall_Movement_27259E: @ 827259E -LilycoveCity_CoveLilyMotel_1F_Movement_27259E: @ 827259E -LilycoveCity_DepartmentStore_1F_Movement_27259E: @ 827259E -LilycoveCity_DepartmentStore_5F_Movement_27259E: @ 827259E -LilycoveCity_Harbor_Movement_27259E: @ 827259E -LilycoveCity_LilycoveMuseum_1F_Movement_27259E: @ 827259E -LilycoveCity_LilycoveMuseum_2F_Movement_27259E: @ 827259E -LilycoveCity_MoveDeletersHouse_Movement_27259E: @ 827259E -LilycoveCity_Movement_27259E: @ 827259E -LittlerootTown_BrendansHouse_1F_Movement_27259E: @ 827259E -LittlerootTown_BrendansHouse_2F_Movement_27259E: @ 827259E -MagmaHideout_4F_Movement_27259E: @ 827259E -MauvilleCity_Movement_27259E: @ 827259E -MeteorFalls_StevensCave_Movement_27259E: @ 827259E -MossdeepCity_SpaceCenter_2F_Movement_27259E: @ 827259E -MtChimney_Movement_27259E: @ 827259E -OldaleTown_Movement_27259E: @ 827259E -PetalburgCity_Gym_Movement_27259E: @ 827259E -PetalburgCity_Movement_27259E: @ 827259E -Route103_Movement_27259E: @ 827259E -Route104_Movement_27259E: @ 827259E -Route110_TrickHouseEnd_Movement_27259E: @ 827259E -Route110_TrickHouseEntrance_Movement_27259E: @ 827259E -Route110_TrickHousePuzzle5_Movement_27259E: @ 827259E -Route111_Movement_27259E: @ 827259E -Route119_Movement_27259E: @ 827259E -RustboroCity_Flat1_2F_Movement_27259E: @ 827259E -RustboroCity_Movement_27259E: @ 827259E -RusturfTunnel_Movement_27259E: @ 827259E -SeafloorCavern_Room9_Movement_27259E: @ 827259E -SlateportCity_Movement_27259E: @ 827259E -SlateportCity_SternsShipyard_1F_Movement_27259E: @ 827259E -SootopolisCity_Movement_27259E: @ 827259E +Common_Movement_FacePlayer: @ 827259E face_player step_end -BattleFrontier_OutsideWest_Movement_2725A0: @ 82725A0 +Common_Movement_FaceAwayPlayer: @ 82725A0 face_away_player step_end -BattleFrontier_Lounge3_Movement_2725A2: @ 82725A2 -BattleFrontier_OutsideWest_Movement_2725A2: @ 82725A2 -EverGrandeCity_PokemonLeague_1F_Movement_2725A2: @ 82725A2 -JaggedPass_Movement_2725A2: @ 82725A2 -LilycoveCity_ContestHall_Movement_2725A2: @ 82725A2 -LilycoveCity_ContestLobby_Movement_2725A2: @ 82725A2 -LilycoveCity_CoveLilyMotel_1F_Movement_2725A2: @ 82725A2 -LilycoveCity_House3_Movement_2725A2: @ 82725A2 -LilycoveCity_LilycoveMuseum_1F_Movement_2725A2: @ 82725A2 -LilycoveCity_Movement_2725A2: @ 82725A2 -LittlerootTown_Movement_2725A2: @ 82725A2 -MauvilleCity_GameCorner_Movement_2725A2: @ 82725A2 -MauvilleCity_Movement_2725A2: @ 82725A2 -MossdeepCity_Movement_2725A2: @ 82725A2 -MossdeepCity_SpaceCenter_1F_Movement_2725A2: @ 82725A2 -MossdeepCity_SpaceCenter_2F_Movement_2725A2: @ 82725A2 -MtChimney_Movement_2725A2: @ 82725A2 -OldaleTown_Movement_2725A2: @ 82725A2 -PetalburgCity_Movement_2725A2: @ 82725A2 -Route109_Movement_2725A2: @ 82725A2 -Route110_Movement_2725A2: @ 82725A2 -Route111_Movement_2725A2: @ 82725A2 -Route111_WinstrateFamilysHouse_Movement_2725A2: @ 82725A2 -Route112_Movement_2725A2: @ 82725A2 -Route119_Movement_2725A2: @ 82725A2 -RustboroCity_DevonCorp_3F_Movement_2725A2: @ 82725A2 -RustboroCity_Movement_2725A2: @ 82725A2 -RusturfTunnel_Movement_2725A2: @ 82725A2 -SlateportCity_Harbor_Movement_2725A2: @ 82725A2 -SlateportCity_Movement_2725A2: @ 82725A2 -SlateportCity_OceanicMuseum_2F_Movement_2725A2: @ 82725A2 -SlateportCity_SternsShipyard_1F_Movement_2725A2: @ 82725A2 -SootopolisCity_Movement_2725A2: @ 82725A2 -VerdanturfTown_Movement_2725A2: @ 82725A2 +Common_Movement_FaceOriginalDirection: @ 82725A2 face_original_direction step_end -AquaHideout_B2F_Movement_2725A4: @ 82725A4 -BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4: @ 82725A4 -BattleFrontier_OutsideWest_Movement_2725A4: @ 82725A4 -BattleFrontier_ScottsHouse_Movement_2725A4: @ 82725A4 -DewfordTown_Hall_Movement_2725A4: @ 82725A4 -EverGrandeCity_ChampionsRoom_Movement_2725A4: @ 82725A4 -EverGrandeCity_HallOfFame_Movement_2725A4: @ 82725A4 -LavaridgeTown_Movement_2725A4: @ 82725A4 -LilycoveCity_Harbor_Movement_2725A4: @ 82725A4 -LilycoveCity_PokemonTrainerFanClub_Movement_2725A4: @ 82725A4 -LittlerootTown_BrendansHouse_1F_Movement_2725A4: @ 82725A4 -LittlerootTown_BrendansHouse_2F_Movement_2725A4: @ 82725A4 -LittlerootTown_MaysHouse_1F_Movement_2725A4: @ 82725A4 -LittlerootTown_MaysHouse_2F_Movement_2725A4: @ 82725A4 -LittlerootTown_Movement_2725A4: @ 82725A4 -LittlerootTown_ProfessorBirchsLab_Movement_2725A4: @ 82725A4 -MeteorFalls_1F_1R_Movement_2725A4: @ 82725A4 -MossdeepCity_SpaceCenter_2F_Movement_2725A4: @ 82725A4 -MossdeepCity_StevensHouse_Movement_2725A4: @ 82725A4 -MtChimney_Movement_2725A4: @ 82725A4 -MtPyre_Summit_Movement_2725A4: @ 82725A4 -OldaleTown_PokemonCenter_1F_Movement_2725A4: @ 82725A4 -PetalburgCity_Gym_Movement_2725A4: @ 82725A4 -PetalburgCity_Movement_2725A4: @ 82725A4 -PetalburgWoods_Movement_2725A4: @ 82725A4 -Route101_Movement_2725A4: @ 82725A4 -Route110_Movement_2725A4: @ 82725A4 -Route110_TrickHouseEnd_Movement_2725A4: @ 82725A4 -Route111_Movement_2725A4: @ 82725A4 -Route112_Movement_2725A4: @ 82725A4 -Route116_Movement_2725A4: @ 82725A4 -Route120_Movement_2725A4: @ 82725A4 -Route128_Movement_2725A4: @ 82725A4 -RustboroCity_Movement_2725A4: @ 82725A4 -SeafloorCavern_Entrance_Movement_2725A4: @ 82725A4 -SeafloorCavern_Room9_Movement_2725A4: @ 82725A4 -SkyPillar_Outside_Movement_2725A4: @ 82725A4 -SlateportCity_Movement_2725A4: @ 82725A4 -SlateportCity_OceanicMuseum_1F_Movement_2725A4: @ 82725A4 -SlateportCity_OceanicMuseum_2F_Movement_2725A4: @ 82725A4 -SootopolisCity_Movement_2725A4: @ 82725A4 +Common_Movement_WalkInPlaceLeft: @ 82725A4 walk_in_place_fastest_left step_end -BattleFrontier_BattleTowerCorridor2_Movement_2725A6: @ 82725A6 -BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6: @ 82725A6 -BattleFrontier_OutsideWest_Movement_2725A6: @ 82725A6 -BattleFrontier_ReceptionGate_Movement_2725A6: @ 82725A6 -BattleFrontier_ScottsHouse_Movement_2725A6: @ 82725A6 -CaveOfOrigin_B1F_Movement_2725A6: @ 82725A6 -DewfordTown_Hall_Movement_2725A6: @ 82725A6 -EverGrandeCity_ChampionsRoom_Movement_2725A6: @ 82725A6 -EverGrandeCity_HallOfFame_Movement_2725A6: @ 82725A6 -LavaridgeTown_Movement_2725A6: @ 82725A6 -LilycoveCity_DepartmentStore_5F_Movement_2725A6: @ 82725A6 -LilycoveCity_Harbor_Movement_2725A6: @ 82725A6 -LittlerootTown_BrendansHouse_1F_Movement_2725A6: @ 82725A6 -LittlerootTown_BrendansHouse_2F_Movement_2725A6: @ 82725A6 -LittlerootTown_MaysHouse_2F_Movement_2725A6: @ 82725A6 -LittlerootTown_Movement_2725A6: @ 82725A6 -LittlerootTown_ProfessorBirchsLab_Movement_2725A6: @ 82725A6 -MagmaHideout_4F_Movement_2725A6: @ 82725A6 -MeteorFalls_1F_1R_Movement_2725A6: @ 82725A6 -MossdeepCity_SpaceCenter_2F_Movement_2725A6: @ 82725A6 -MtPyre_Summit_Movement_2725A6: @ 82725A6 -NewMauville_Entrance_Movement_2725A6: @ 82725A6 -OldaleTown_PokemonCenter_2F_Movement_2725A6: @ 82725A6 -PetalburgCity_Gym_Movement_2725A6: @ 82725A6 -PetalburgCity_Movement_2725A6: @ 82725A6 -PetalburgWoods_Movement_2725A6: @ 82725A6 -Route104_Movement_2725A6: @ 82725A6 -Route110_TrickHouseEnd_Movement_2725A6: @ 82725A6 -Route110_TrickHouseEntrance_Movement_2725A6: @ 82725A6 -Route111_Movement_2725A6: @ 82725A6 -Route114_FossilManiacsTunnel_Movement_2725A6: @ 82725A6 -Route120_Movement_2725A6: @ 82725A6 -Route121_SafariZoneEntrance_Movement_2725A6: @ 82725A6 -Route128_Movement_2725A6: @ 82725A6 -RustboroCity_Movement_2725A6: @ 82725A6 -RusturfTunnel_Movement_2725A6: @ 82725A6 -SeafloorCavern_Entrance_Movement_2725A6: @ 82725A6 -SeafloorCavern_Room9_Movement_2725A6: @ 82725A6 -SlateportCity_BattleTentCorridor_Movement_2725A6: @ 82725A6 -SlateportCity_Harbor_Movement_2725A6: @ 82725A6 -SlateportCity_Movement_2725A6: @ 82725A6 -SlateportCity_OceanicMuseum_2F_Movement_2725A6: @ 82725A6 -SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6: @ 82725A6 -VerdanturfTown_BattleTentBattleRoom_Movement_2725A6: @ 82725A6 +Common_Movement_WalkInPlaceUp: @ 82725A6 walk_in_place_fastest_up step_end -BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8: @ 82725A8 -BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8: @ 82725A8 -BattleFrontier_OutsideWest_Movement_2725A8: @ 82725A8 -BattleFrontier_ScottsHouse_Movement_2725A8: @ 82725A8 -DewfordTown_Hall_Movement_2725A8: @ 82725A8 -EverGrandeCity_ChampionsRoom_Movement_2725A8: @ 82725A8 -EverGrandeCity_HallOfFame_Movement_2725A8: @ 82725A8 -LavaridgeTown_Movement_2725A8: @ 82725A8 -LilycoveCity_DepartmentStore_1F_Movement_2725A8: @ 82725A8 -LilycoveCity_PokemonTrainerFanClub_Movement_2725A8: @ 82725A8 -LittlerootTown_BrendansHouse_1F_Movement_2725A8: @ 82725A8 -LittlerootTown_BrendansHouse_2F_Movement_2725A8: @ 82725A8 -LittlerootTown_MaysHouse_1F_Movement_2725A8: @ 82725A8 -LittlerootTown_Movement_2725A8: @ 82725A8 -LittlerootTown_ProfessorBirchsLab_Movement_2725A8: @ 82725A8 -MagmaHideout_4F_Movement_2725A8: @ 82725A8 -MauvilleCity_Movement_2725A8: @ 82725A8 -MossdeepCity_SpaceCenter_1F_Movement_2725A8: @ 82725A8 -MossdeepCity_SpaceCenter_2F_Movement_2725A8: @ 82725A8 -MtPyre_Summit_Movement_2725A8: @ 82725A8 -OldaleTown_Movement_2725A8: @ 82725A8 -PetalburgCity_Gym_Movement_2725A8: @ 82725A8 -PetalburgCity_Movement_2725A8: @ 82725A8 -Route101_Movement_2725A8: @ 82725A8 -Route110_Movement_2725A8: @ 82725A8 -Route110_TrickHouseEnd_Movement_2725A8: @ 82725A8 -Route112_Movement_2725A8: @ 82725A8 -Route116_Movement_2725A8: @ 82725A8 -Route120_Movement_2725A8: @ 82725A8 -Route128_Movement_2725A8: @ 82725A8 -RustboroCity_Movement_2725A8: @ 82725A8 -SSTidalCorridor_Movement_2725A8: @ 82725A8 -SeafloorCavern_Entrance_Movement_2725A8: @ 82725A8 -SkyPillar_Outside_Movement_2725A8: @ 82725A8 -SlateportCity_Harbor_Movement_2725A8: @ 82725A8 -SlateportCity_Movement_2725A8: @ 82725A8 -SlateportCity_OceanicMuseum_1F_Movement_2725A8: @ 82725A8 -SlateportCity_OceanicMuseum_2F_Movement_2725A8: @ 82725A8 -SootopolisCity_Movement_2725A8: @ 82725A8 -VerdanturfTown_BattleTentBattleRoom_Movement_2725A8: @ 82725A8 +Common_Movement_WalkInPlaceRight: @ 82725A8 walk_in_place_fastest_right step_end -BattleFrontier_OutsideWest_Movement_2725AA: @ 82725AA -BattleFrontier_ScottsHouse_Movement_2725AA: @ 82725AA -BirthIsland_Harbor_Movement_2725AA: @ 82725AA -DewfordTown_Hall_Movement_2725AA: @ 82725AA -EverGrandeCity_ChampionsRoom_Movement_2725AA: @ 82725AA -FarawayIsland_Entrance_Movement_2725AA: @ 82725AA -LilycoveCity_CoveLilyMotel_1F_Movement_2725AA: @ 82725AA -LilycoveCity_DepartmentStoreElevator_Movement_2725AA: @ 82725AA -LilycoveCity_Harbor_Movement_2725AA: @ 82725AA -LilycoveCity_Movement_2725AA: @ 82725AA -LilycoveCity_PokemonTrainerFanClub_Movement_2725AA: @ 82725AA -LittlerootTown_BrendansHouse_1F_Movement_2725AA: @ 82725AA -LittlerootTown_MaysHouse_1F_Movement_2725AA: @ 82725AA -LittlerootTown_Movement_2725AA: @ 82725AA -MauvilleCity_Movement_2725AA: @ 82725AA -MeteorFalls_1F_1R_Movement_2725AA: @ 82725AA -MossdeepCity_SpaceCenter_2F_Movement_2725AA: @ 82725AA -MtPyre_Summit_Movement_2725AA: @ 82725AA -NavelRock_Harbor_Movement_2725AA: @ 82725AA -OldaleTown_PokemonCenter_1F_Movement_2725AA: @ 82725AA -PetalburgCity_Gym_Movement_2725AA: @ 82725AA -PetalburgCity_Movement_2725AA: @ 82725AA -PetalburgWoods_Movement_2725AA: @ 82725AA -Route110_Movement_2725AA: @ 82725AA -Route110_TrickHouseEnd_Movement_2725AA: @ 82725AA -Route114_FossilManiacsTunnel_Movement_2725AA: @ 82725AA -Route119_Movement_2725AA: @ 82725AA -Route120_Movement_2725AA: @ 82725AA -Route128_Movement_2725AA: @ 82725AA -RustboroCity_Movement_2725AA: @ 82725AA -RustboroCity_PokemonSchool_Movement_2725AA: @ 82725AA -RusturfTunnel_Movement_2725AA: @ 82725AA -SeafloorCavern_Entrance_Movement_2725AA: @ 82725AA -SeafloorCavern_Room9_Movement_2725AA: @ 82725AA -SkyPillar_Outside_Movement_2725AA: @ 82725AA -SlateportCity_Harbor_Movement_2725AA: @ 82725AA -SlateportCity_Movement_2725AA: @ 82725AA -SlateportCity_OceanicMuseum_2F_Movement_2725AA: @ 82725AA -SouthernIsland_Exterior_Movement_2725AA: @ 82725AA -VerdanturfTown_BattleTentBattleRoom_Movement_2725AA: @ 82725AA -VictoryRoad_1F_Movement_2725AA: @ 82725AA +Common_Movement_WalkInPlaceDown: @ 82725AA walk_in_place_fastest_down step_end @@ -2729,17 +2416,11 @@ RustboroCity_Movement_2725AE: @ 82725AE face_left step_end -BattleFrontier_Mart_Movement_2725B0: @ 82725B0 -MeteorFalls_1F_1R_Movement_2725B0: @ 82725B0 +Common_Movement_FaceDown: @ 82725B0 face_down step_end -MarineCave_End_Movement_2725B2: @ 82725B2 -MtPyre_Summit_Movement_2725B2: @ 82725B2 -Route118_Movement_2725B2: @ 82725B2 -SkyPillar_Top_Movement_2725B2: @ 82725B2 -SlateportCity_Movement_2725B2: @ 82725B2 -TerraCave_End_Movement_2725B2: @ 82725B2 +Common_Movement_FaceUp: @ 82725B2 face_up step_end @@ -3298,12 +2979,12 @@ EventScript_Questionnaire:: @ 827381B EventScript_27386D:: @ 827386D goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF - applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 + applymovement VAR_0x8008, Common_Movement_FaceDown waitmovement 0 playse SE_PIN - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_272598 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_27259A + applymovement VAR_0x8008, Common_Movement_Delay48 waitmovement 0 msgbox gUnknown_08273506, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_EVENT_ENABLE @@ -3314,12 +2995,12 @@ EventScript_27386D:: @ 827386D EventScript_2738B5:: @ 82738B5 goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF - applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 + applymovement VAR_0x8008, Common_Movement_FaceDown waitmovement 0 playse SE_PIN - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_272598 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_27259A + applymovement VAR_0x8008, Common_Movement_Delay48 waitmovement 0 msgbox gUnknown_08273446, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_GIFT_ENABLE @@ -3332,7 +3013,7 @@ EventScript_2738FD:: @ 82738FD end EventScript_2738FF:: @ 82738FF - applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 + applymovement VAR_0x8008, Common_Movement_FaceDown waitmovement 0 msgbox gUnknown_082733D8, MSGBOX_DEFAULT releaseall diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index ba20cb681..daa508d32 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -14,9 +14,9 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 lockall setvar VAR_0x8008, 1 playse SE_PIN - applymovement VAR_0x8008, AquaHideout_B2F_Movement_272598 + applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 setvar VAR_TEMP_1, 1 releaseall @@ -31,19 +31,19 @@ AquaHideout_B2F_EventScript_233E09:: @ 8233E09 AquaHideout_B2F_EventScript_233E25:: @ 8233E25 setvar VAR_0x8008, 1 setvar VAR_0x8009, 4 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80 waitmovement 0 removeobject VAR_0x8009 delay 20 - applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E + applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 8c22a9bc9..5ed2e97da 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -304,12 +304,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA end BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4 - applymovement 1, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 4, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8 - applymovement 5, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 - applymovement 6, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 - applymovement 7, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceRight + applymovement 4, Common_Movement_WalkInPlaceRight + applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 7, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 529bcd0c3..be11039df 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -280,8 +280,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 waitmovement 0 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 @@ -323,8 +323,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 waitmovement 0 - applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 - applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index bafe61ae6..14e1a5557 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -260,7 +260,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE lockall - applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidLobby_EventScript_250AF0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index b89d2e061..cf646a3d3 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -233,9 +233,9 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6 waitmovement 0 playse SE_PIN - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 73b14fc2e..545ea04b2 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -68,8 +68,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5 waitmovement 0 delay 40 - applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_2725A6 - applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp + applymovement 2, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 7, 1 waitdooranim diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 7dbfbbc13..ce0c9b3a4 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -64,7 +64,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 waitmovement 0 moveobjectoffscreen 1 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT special HealPlayerParty @@ -104,7 +104,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT closemessage - applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 10, 1 waitdooranim diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 6a817d50a..7977e75b4 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -198,7 +198,7 @@ BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1 BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1 closemessage - applymovement VAR_LAST_TALKED, BattleFrontier_Lounge3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index 725fce863..d84b2cb0a 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -36,7 +36,7 @@ BattleFrontier_Mart_EventScript_267B02:: @ 8267B02 BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B lock - applymovement 2, BattleFrontier_Mart_Movement_2725B0 + applymovement 2, Common_Movement_FaceDown waitmovement 0 msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT release diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index da5724259..b2b2a8d41 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -63,7 +63,7 @@ BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA closemessage - applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST @@ -105,7 +105,7 @@ BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518 faceplayer message BattleFrontier_OutsideWest_Text_23DA60 waitmessage - applymovement 18, BattleFrontier_OutsideWest_Movement_2725A0 + applymovement 18, Common_Movement_FaceAwayPlayer waitmovement 0 waitbuttonpress release @@ -126,16 +126,16 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D end BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544 - applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT - applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4 + applymovement 10, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT closemessage delay 25 - applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6 - applymovement 10, BattleFrontier_OutsideWest_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 10, Common_Movement_WalkInPlaceUp waitmovement 0 release end @@ -157,7 +157,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F end BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA - applymovement 14, BattleFrontier_OutsideWest_Movement_2725A6 + applymovement 14, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -298,7 +298,7 @@ BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7 faceplayer msgbox BattleFrontier_OutsideWest_Text_23E410, MSGBOX_DEFAULT closemessage - applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2 + applymovement 23, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 5ed97bd60..89f0ee8e9 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -15,9 +15,9 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 lockall setvar VAR_0x40D0, 1 playse SE_PIN - applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT closemessage @@ -38,14 +38,14 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT closemessage - applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6 - applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 2, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 - applymovement 2, BattleFrontier_ReceptionGate_Movement_272598 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark + applymovement 2, Common_Movement_ExclamationMark + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 6f8d6ee4b..9278252e6 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -181,7 +181,7 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 compare VAR_FACING, 3 call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34 msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT - applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT compare VAR_0x40D1, 13 @@ -227,22 +227,22 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8 end BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34 - applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 1a5ef87ec..5f850ed7b 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -9,7 +9,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D goto_if_eq BirthIsland_Harbor_EventScript_2680A2 msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index 371ea1ba5..c36b60111 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -6,16 +6,16 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9 faceplayer msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT closemessage - applymovement 1, CaveOfOrigin_B1F_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 delay 60 playse SE_PIN - applymovement 1, CaveOfOrigin_B1F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, CaveOfOrigin_B1F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 30 - applymovement 1, CaveOfOrigin_B1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 message CaveOfOrigin_B1F_Text_235ACE waitmessage diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index a89b7f024..22bf5ed6a 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -53,7 +53,7 @@ DewfordTown_Hall_EventScript_1FD547:: @ 81FD547 call DewfordTown_Hall_EventScript_271E8B msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT closemessage - applymovement 4, DewfordTown_Hall_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 release end @@ -64,7 +64,7 @@ DewfordTown_Hall_EventScript_1FD563:: @ 81FD563 call DewfordTown_Hall_EventScript_271E8B msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT closemessage - applymovement 5, DewfordTown_Hall_Movement_2725A6 + applymovement 5, Common_Movement_WalkInPlaceUp waitmovement 0 release end @@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B compare VAR_FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1FD739 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 return DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 compare VAR_FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1FD739 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index f1db8df84..31a9b91b8 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -78,9 +78,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT @@ -91,9 +91,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT @@ -105,26 +105,26 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT call EverGrandeCity_ChampionsRoom_EventScript_272184 msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 delay 20 - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D - applymovement 3, EverGrandeCity_ChampionsRoom_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38 waitmovement 0 delay 20 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT checkplayergender @@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4 EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index ddb9ade89..04134d30f 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -20,8 +20,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement 1, EverGrandeCity_HallOfFame_Movement_229901 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901 waitmovement 0 - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT closemessage @@ -29,13 +29,13 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908 waitmovement 0 delay 20 - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT closemessage - applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 20 dofieldeffect 62 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index ce4be66f8..4794fb99e 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -90,11 +90,11 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE end EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB - applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2 + 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 962c4f64e..2f2ec1b3f 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -3,7 +3,7 @@ FallarborTown_House2_MapScripts:: @ 8201382 FallarborTown_House2_EventScript_201383:: @ 8201383 lockall - applymovement 1, FallarborTown_House2_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_2013A8 msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 37c16885f..7c68dd246 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -24,7 +24,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 goto_if_eq FarawayIsland_Entrance_EventScript_267CE7 msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index a1038edac..b541ac081 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -56,9 +56,9 @@ FarawayIsland_Interior_MapScript2_267D98: @ 8267D98 FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2 lockall playse SE_PIN - applymovement 1, FarawayIsland_Interior_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, FarawayIsland_Interior_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 applymovement 1, FarawayIsland_Interior_Movement_267DCE waitmovement 0 diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 43db341d9..5dc9d769a 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -21,14 +21,14 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A end FortreeCity_House4_EventScript_217CC4:: @ 8217CC4 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217DD2, MSGBOX_DEFAULT releaseall end FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB @@ -39,7 +39,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 end FortreeCity_House4_EventScript_217D06:: @ 8217D06 - applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox FortreeCity_House4_Text_217EA8, MSGBOX_DEFAULT releaseall diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 93788a703..fd9947ac4 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -71,27 +71,27 @@ JaggedPass_EventScript_230718:: @ 8230718 goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766 waitse playse SE_PIN - applymovement 5, JaggedPass_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, JaggedPass_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 - applymovement 5, JaggedPass_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT closemessage trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS - applymovement 5, JaggedPass_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end JaggedPass_EventScript_230766:: @ 8230766 - applymovement 5, JaggedPass_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 msgbox JaggedPass_Text_230D65, MSGBOX_DEFAULT closemessage - applymovement 5, JaggedPass_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 9109008b2..aaf550d0d 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -110,12 +110,12 @@ LavaridgeTown_EventScript_1EA635:: @ 81EA635 return LavaridgeTown_EventScript_1EA63A:: @ 81EA63A - applymovement 8, LavaridgeTown_Movement_2725A6 + applymovement 8, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 8, LavaridgeTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, LavaridgeTown_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 return @@ -127,14 +127,14 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C waitmovement 0 closedoor 12, 15 waitdooranim - applymovement 8, LavaridgeTown_Movement_2725A4 + applymovement 8, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 8, LavaridgeTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, LavaridgeTown_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 5a4ef5d43..02d88bf5a 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -134,13 +134,13 @@ LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4 LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD lockall msgbox LilycoveCity_Text_1E494D, MSGBOX_NPC - applymovement 20, LilycoveCity_Movement_2725A2 + applymovement 20, Common_Movement_FaceOriginalDirection end LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE lockall msgbox LilycoveCity_Text_1E49F4, MSGBOX_NPC - applymovement 19, LilycoveCity_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection end LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF @@ -197,10 +197,10 @@ LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D lockall goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_1E2DB0 msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_MET_WAILMER_TRAINER releaseall @@ -387,7 +387,7 @@ LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD LilycoveCity_EventScript_1E3006:: @ 81E3006 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc index f6a53cc5e..5823b6da4 100644 --- a/data/maps/LilycoveCity_ContestHall/scripts.inc +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -22,7 +22,7 @@ LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9 faceplayer msgbox LilycoveCity_ContestHall_Text_21B977, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 4, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -32,7 +32,7 @@ LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0 faceplayer msgbox LilycoveCity_ContestHall_Text_21B9DC, MSGBOX_DEFAULT closemessage - applymovement 5, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -42,7 +42,7 @@ LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7 faceplayer msgbox LilycoveCity_ContestHall_Text_21BA44, MSGBOX_DEFAULT closemessage - applymovement 6, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -52,7 +52,7 @@ LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE faceplayer msgbox LilycoveCity_ContestHall_Text_21BAD5, MSGBOX_DEFAULT closemessage - applymovement 7, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -62,7 +62,7 @@ LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505 faceplayer msgbox LilycoveCity_ContestHall_Text_21BB84, MSGBOX_DEFAULT closemessage - applymovement 8, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -72,7 +72,7 @@ LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C faceplayer msgbox LilycoveCity_ContestHall_Text_21BBDD, MSGBOX_DEFAULT closemessage - applymovement 9, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 9, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -86,7 +86,7 @@ LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C faceplayer msgbox LilycoveCity_ContestHall_Text_21BC89, MSGBOX_DEFAULT closemessage - applymovement 12, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 12, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -96,7 +96,7 @@ LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553 faceplayer msgbox LilycoveCity_ContestHall_Text_21BD30, MSGBOX_DEFAULT closemessage - applymovement 22, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 22, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -106,7 +106,7 @@ LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A faceplayer msgbox LilycoveCity_ContestHall_Text_21BD70, MSGBOX_DEFAULT closemessage - applymovement 11, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 11, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -116,7 +116,7 @@ LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581 faceplayer msgbox LilycoveCity_ContestHall_Text_21BDDD, MSGBOX_DEFAULT closemessage - applymovement 13, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 13, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -126,7 +126,7 @@ LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598 faceplayer msgbox LilycoveCity_ContestHall_Text_21BE16, MSGBOX_DEFAULT closemessage - applymovement 14, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 14, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -136,7 +136,7 @@ LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF faceplayer msgbox LilycoveCity_ContestHall_Text_21BE77, MSGBOX_DEFAULT closemessage - applymovement 15, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 15, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -146,7 +146,7 @@ LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6 faceplayer msgbox LilycoveCity_ContestHall_Text_21BEDE, MSGBOX_DEFAULT closemessage - applymovement 16, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 16, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -156,7 +156,7 @@ LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD faceplayer msgbox LilycoveCity_ContestHall_Text_21BF6E, MSGBOX_DEFAULT closemessage - applymovement 17, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 17, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -166,7 +166,7 @@ LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4 faceplayer msgbox LilycoveCity_ContestHall_Text_21BFE3, MSGBOX_DEFAULT closemessage - applymovement 18, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 18, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -176,7 +176,7 @@ LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B faceplayer msgbox LilycoveCity_ContestHall_Text_21C07F, MSGBOX_DEFAULT closemessage - applymovement 19, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -186,7 +186,7 @@ LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622 faceplayer msgbox LilycoveCity_ContestHall_Text_21C0D8, MSGBOX_DEFAULT closemessage - applymovement 21, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 21, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -196,7 +196,7 @@ LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639 faceplayer msgbox LilycoveCity_ContestHall_Text_21C137, MSGBOX_DEFAULT closemessage - applymovement 20, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 20, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -206,7 +206,7 @@ LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650 faceplayer msgbox LilycoveCity_ContestHall_Text_21C1A4, MSGBOX_DEFAULT closemessage - applymovement 23, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 23, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -216,7 +216,7 @@ LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667 faceplayer msgbox LilycoveCity_ContestHall_Text_21C215, MSGBOX_DEFAULT closemessage - applymovement 24, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 24, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -226,7 +226,7 @@ LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E faceplayer msgbox LilycoveCity_ContestHall_Text_21C27F, MSGBOX_DEFAULT closemessage - applymovement 25, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 25, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -236,7 +236,7 @@ LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695 faceplayer msgbox LilycoveCity_ContestHall_Text_21C2BB, MSGBOX_DEFAULT closemessage - applymovement 26, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 26, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -246,7 +246,7 @@ LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC faceplayer msgbox LilycoveCity_ContestHall_Text_21C307, MSGBOX_DEFAULT closemessage - applymovement 27, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -256,18 +256,18 @@ LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3 faceplayer msgbox LilycoveCity_ContestHall_Text_21C365, MSGBOX_DEFAULT closemessage - applymovement 28, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 release end LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA lockall - applymovement 29, LilycoveCity_ContestHall_Movement_27259E + applymovement 29, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_ContestHall_Text_21C3F4, MSGBOX_DEFAULT closemessage - applymovement 29, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 delay 25 msgbox LilycoveCity_ContestHall_Text_21C411, MSGBOX_DEFAULT @@ -279,7 +279,7 @@ LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705 faceplayer msgbox LilycoveCity_ContestHall_Text_21C4B1, MSGBOX_DEFAULT closemessage - applymovement 31, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -289,7 +289,7 @@ LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C faceplayer msgbox LilycoveCity_ContestHall_Text_21C445, MSGBOX_DEFAULT closemessage - applymovement 30, LilycoveCity_ContestHall_Movement_2725A2 + applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index f57aae096..ae276cf9c 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -86,7 +86,7 @@ LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A waitmovement 0 playse SE_PIN - applymovement 4, LilycoveCity_ContestLobby_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E waitmovement 0 @@ -259,7 +259,7 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 applymovement 11, LilycoveCity_ContestLobby_Movement_21A547 waitmovement 0 playse SE_PIN - applymovement 11, LilycoveCity_ContestLobby_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B waitmovement 0 @@ -614,7 +614,7 @@ LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9 LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_ContestLobby_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 7ccc8b82f..87e4c0afd 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_218189:: @ 8218189 goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3 msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, MSGBOX_DEFAULT - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, MSGBOX_DEFAULT closemessage - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -40,11 +40,11 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 lockall playse SE_PIN - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index 80a93df47..18fc0404b 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -114,7 +114,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0 LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5 special sub_8139C10 closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 waitse special ShakeScreenInElevator diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index ffa2244f4..ec1d89b66 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_21F69C:: @ 821F69C copyvar VAR_0x8008, VAR_RESULT special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT - applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 playse SE_PC_ON special DoLotteryCornerComputerEffect @@ -30,7 +30,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C delay 220 special EndLotteryCornerComputerEffect delay 10 - applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index b278d3e14..899ea98f0 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -123,7 +123,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 lockall - applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_27259E + applymovement 7, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 0 goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C @@ -141,7 +141,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT closemessage - applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_2725A6 + applymovement 7, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 5e9157826..c1126d575 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -246,12 +246,12 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 call LilycoveCity_Harbor_EventScript_21E4EE msgbox LilycoveCity_Harbor_Text_2C68A5, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 4, LilycoveCity_Harbor_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LilycoveCity_Harbor_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 compare VAR_FACING, 2 call_if_eq LilycoveCity_Harbor_EventScript_21E656 @@ -328,12 +328,12 @@ LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 msgbox LilycoveCity_Harbor_Text_2A6A82, MSGBOX_DEFAULT closemessage - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 removeobject 4 delay 30 - applymovement 1, LilycoveCity_Harbor_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 showobjectat 1, MAP_LILYCOVE_CITY_HARBOR delay 30 @@ -342,19 +342,19 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 end LilycoveCity_Harbor_EventScript_21E4EE:: @ 821E4EE - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 - applymovement 4, LilycoveCity_Harbor_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 return LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 - applymovement 4, LilycoveCity_Harbor_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 removeobject 4 @@ -415,7 +415,7 @@ LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0 LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC msgbox LilycoveCity_Harbor_Text_21E89D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR @@ -494,22 +494,22 @@ LilycoveCity_Harbor_Movement_21E671: @ 821E671 step_end LilycoveCity_Harbor_EventScript_21E675:: @ 821E675 - applymovement 5, LilycoveCity_Harbor_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft waitmovement 0 return LilycoveCity_Harbor_EventScript_21E680:: @ 821E680 - applymovement 5, LilycoveCity_Harbor_Movement_2725AA + applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 return LilycoveCity_Harbor_EventScript_21E68B:: @ 821E68B - applymovement 5, LilycoveCity_Harbor_Movement_2725AA + applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 return LilycoveCity_Harbor_EventScript_21E696:: @ 821E696 - applymovement 5, LilycoveCity_Harbor_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 644c50113..3f5b349d2 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -15,7 +15,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B goto_if_eq LilycoveCity_House3_EventScript_21EE75 msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -23,7 +23,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B LilycoveCity_House3_EventScript_21EE75:: @ 821EE75 msgbox LilycoveCity_House3_Text_21F0A9, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -33,7 +33,7 @@ LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A faceplayer msgbox LilycoveCity_House3_Text_21F430, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 + 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 89ac90dc6..8f2cdde28 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_218CB9:: @ 8218CB9 LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 lockall - applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_27259E + applymovement 2, Common_Movement_FacePlayer message LilycoveCity_LilycoveMuseum_1F_Text_218EBC waitmessage multichoice 20, 8, 16, 1 @@ -154,7 +154,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B faceplayer msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, MSGBOX_DEFAULT closemessage - applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 204b2cee3..0669b7461 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_2197FE: @ 82197FE LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 lockall - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN @@ -71,7 +71,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 @@ -107,7 +107,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA end LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, MSGBOX_DEFAULT applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 @@ -116,7 +116,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 end LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA - applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT givedecoration_std 44 compare VAR_RESULT, 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index c5c2188e5..e94fa43f1 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -3,7 +3,7 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 821EA0A LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B lockall - applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, MSGBOX_YESNO switch VAR_RESULT diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 77bc40635..698ef95f2 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -9,18 +9,18 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A lockall - applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 waitmovement 0 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index c7bb25ba7..e4b69eb13 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -186,7 +186,7 @@ LittlerootTown_Movement_1E7FAC: @ 81E7FAC LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 lockall playse SE_PIN - applymovement 8, LittlerootTown_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 delay 80 msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT @@ -246,7 +246,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setvar VAR_0x4050, 2 release @@ -357,14 +357,14 @@ LittlerootTown_Movement_1E8118: @ 81E8118 LittlerootTown_EventScript_1E811F:: @ 81E811F lockall - applymovement 1, LittlerootTown_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setvar VAR_0x4050, 2 releaseall @@ -490,12 +490,12 @@ LittlerootTown_EventScript_1E828C:: @ 81E828C return LittlerootTown_EventScript_1E8297:: @ 81E8297 - applymovement 4, LittlerootTown_Movement_2725A8 + applymovement 4, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_EventScript_1E82A2:: @ 81E82A2 - applymovement 4, LittlerootTown_Movement_2725A4 + applymovement 4, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -530,70 +530,70 @@ LittlerootTown_EventScript_1E82F0:: @ 81E82F0 return LittlerootTown_EventScript_1E8333:: @ 81E8333 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D1 waitmovement 0 return LittlerootTown_EventScript_1E8348:: @ 81E8348 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D8 waitmovement 0 return LittlerootTown_EventScript_1E835D:: @ 81E835D - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85DF waitmovement 0 return LittlerootTown_EventScript_1E8372:: @ 81E8372 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85E4 waitmovement 0 return LittlerootTown_EventScript_1E8387:: @ 81E8387 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85EA waitmovement 0 return LittlerootTown_EventScript_1E839C:: @ 81E839C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85ED waitmovement 0 return LittlerootTown_EventScript_1E83B1:: @ 81E83B1 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F1 waitmovement 0 return LittlerootTown_EventScript_1E83C6:: @ 81E83C6 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F5 waitmovement 0 return LittlerootTown_EventScript_1E83DB:: @ 81E83DB - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F8 waitmovement 0 return LittlerootTown_EventScript_1E83F0:: @ 81E83F0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85FE waitmovement 0 @@ -894,7 +894,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E828C call LittlerootTown_EventScript_1E8693 - applymovement 4, LittlerootTown_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp 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 42cfe308b..13736130f 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_1F784D:: @ 81F784D LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E lockall playse SE_PIN - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C waitmovement 0 special GetRivalSonDaughterString @@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3 lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_292765 end @@ -146,9 +146,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 addobject 7 delay 30 playse SE_PIN - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement 7, Common_Movement_ExclamationMark waitmovement 0 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement 7, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981 @@ -181,7 +181,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 end LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index ca57959de..9758ba250 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -67,9 +67,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85BC waitmovement 0 playse SE_PIN - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 10 playbgm MUS_BOY_SUP, 1 @@ -93,7 +93,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -105,7 +105,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -129,7 +129,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 36bda7e03..8f40d7c13 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_1F899D:: @ 81F899D LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE lockall playse SE_PIN - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC waitmovement 0 special GetRivalSonDaughterString @@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - applymovement VAR_0x8004, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceRight waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_292765 end @@ -183,9 +183,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B addobject 7 delay 30 playse SE_PIN - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_272598 + applymovement 7, Common_Movement_ExclamationMark waitmovement 0 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A + applymovement 7, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_ne LittlerootTown_MaysHouse_1F_EventScript_1F8B2A @@ -218,7 +218,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B end LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 353437ad4..b946201ef 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -68,9 +68,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F946F waitmovement 0 playse SE_PIN - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 10 playbgm MUS_GIRL_SUP, 1 @@ -94,7 +94,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -106,7 +106,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -118,7 +118,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -129,7 +129,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -268,7 +268,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED end LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 - applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 5565d2934..1bf27c0bd 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -167,8 +167,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 delay 10 playse SE_TK_KASYA delay 20 - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A4 + applymovement 3, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 checkplayergender compare VAR_RESULT, MALE @@ -180,8 +180,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 delay 20 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58 waitmovement 0 - applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT playfanfare MUS_FANFA4 @@ -286,7 +286,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB release compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 drawmonpic SPECIES_CYNDAQUIL, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO @@ -299,7 +299,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF release compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 drawmonpic SPECIES_TOTODILE, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO @@ -312,7 +312,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 release compare VAR_0x40D3, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 drawmonpic SPECIES_CHIKORITA, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO @@ -530,7 +530,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 closemessage applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index ba585c98a..f43222d15 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -18,7 +18,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 - applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 150 removeobject 7 @@ -50,10 +50,10 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 waitmovement 0 msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 - applymovement 6, MagmaHideout_4F_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index aae89cb8a..c2c90d5c2 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -25,7 +25,7 @@ MarineCave_End_EventScript_23B012:: @ 823B012 MarineCave_End_EventScript_23B01B:: @ 823B01B lockall - applymovement EVENT_OBJ_ID_PLAYER, MarineCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 1, MarineCave_End_Movement_23B09D waitmovement 0 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 454adb60d..6c2ae69fc 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -70,7 +70,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF43D msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT closemessage - applymovement 7, MauvilleCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -78,7 +78,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D MauvilleCity_EventScript_1DF43D:: @ 81DF43D msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT closemessage - applymovement 7, MauvilleCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -86,17 +86,17 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D MauvilleCity_EventScript_1DF452:: @ 81DF452 lockall goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 6, MauvilleCity_Movement_272598 + applymovement 6, Common_Movement_ExclamationMark waitmovement 0 - applymovement 6, MauvilleCity_Movement_27259A + applymovement 6, Common_Movement_Delay48 waitmovement 0 msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD @@ -118,7 +118,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 applymovement 6, MauvilleCity_Movement_1DF6A8 applymovement 7, MauvilleCity_Movement_1DF6E2 waitmovement 0 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE @@ -138,7 +138,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D applymovement 6, MauvilleCity_Movement_1DF6AE applymovement 7, MauvilleCity_Movement_1DF6E8 waitmovement 0 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 applymovement 7, MauvilleCity_Movement_1DF6F7 @@ -164,7 +164,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 call_if_eq MauvilleCity_EventScript_1DF5F3 compare VAR_FACING, 4 call_if_eq MauvilleCity_EventScript_1DF601 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT closemessage @@ -205,13 +205,13 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628 MauvilleCity_EventScript_1DF63A:: @ 81DF63A msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96 - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT - applymovement 6, MauvilleCity_Movement_2725A8 + applymovement 6, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT return @@ -223,7 +223,7 @@ MauvilleCity_EventScript_1DF683:: @ 81DF683 end MauvilleCity_EventScript_1DF690:: @ 81DF690 - applymovement 6, MauvilleCity_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 3b1a5fe08..88b1ded16 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -513,7 +513,7 @@ MauvilleCity_GameCorner_EventScript_210299:: @ 8210299 MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9 closemessage - applymovement VAR_LAST_TALKED, MauvilleCity_GameCorner_Movement_2725A2 + 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 c49052914..b683b8c15 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -14,9 +14,9 @@ MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D MauvilleCity_House2_EventScript_210C82:: @ 8210C82 playse SE_PIN - applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_272598 + applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_27259A + applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO compare VAR_RESULT, 1 diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index ea161ba23..466b1ee3b 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -16,20 +16,20 @@ MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F lockall playbgm MUS_MGM0, 0 - applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725B0 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown waitmovement 0 delay 30 applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT closemessage - applymovement 5, MeteorFalls_1F_1R_Movement_2725A6 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A6 + applymovement 5, Common_Movement_WalkInPlaceUp + applymovement 6, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 5, MeteorFalls_1F_1R_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BF84, MSGBOX_DEFAULT closemessage @@ -37,9 +37,9 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 addobject 7 addobject 8 @@ -49,8 +49,8 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0 applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8 waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 - applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 + applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT closemessage @@ -68,10 +68,10 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 9, MeteorFalls_1F_1R_Movement_22BF18 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT - applymovement 7, MeteorFalls_1F_1R_Movement_2725AA + applymovement 7, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT - applymovement 7, MeteorFalls_1F_1R_Movement_2725A4 + applymovement 7, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index ba8d807c5..31baad43c 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -6,11 +6,11 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_23B1CD waitse playse SE_PIN - applymovement 1, MeteorFalls_StevensCave_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, MeteorFalls_StevensCave_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement 1, MeteorFalls_StevensCave_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D @@ -20,7 +20,7 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 end MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD - applymovement 1, MeteorFalls_StevensCave_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT release diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 3e4da5776..3e2bd4cf9 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -216,7 +216,7 @@ MossdeepCity_EventScript_1E4C10:: @ 81E4C10 lock faceplayer msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index b20524262..662774d64 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -60,7 +60,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 compare VAR_RESULT, 1 call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22301B closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -82,7 +82,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 compare VAR_RESULT, 1 call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end @@ -106,7 +106,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end @@ -139,14 +139,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight waitmovement 0 release end @@ -186,7 +186,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -194,7 +194,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -203,7 +203,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 lock faceplayer msgbox MossdeepCity_SpaceCenter_1F_Text_223849, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 0602c9dad..bfc33a10f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -32,9 +32,9 @@ MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5 MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO compare VAR_RESULT, 1 @@ -57,13 +57,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461 applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499 applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 @@ -173,7 +173,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 lock faceplayer msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -231,20 +231,20 @@ MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF step_end MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 releaseall end MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 special SavePlayerParty fadescreen 1 @@ -277,12 +277,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT closemessage delay 20 - applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4 - applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceLeft + applymovement 8, Common_Movement_WalkInPlaceDown waitmovement 0 delay 60 - applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A6 - applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 8, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 16da558c8..d66930292 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -28,12 +28,12 @@ MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA lockall - applymovement 1, MossdeepCity_StevensHouse_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 1, MossdeepCity_StevensHouse_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, MossdeepCity_StevensHouse_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 applymovement 1, MossdeepCity_StevensHouse_Movement_222833 waitmovement 0 diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index aa1d947be..7282ca944 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -17,7 +17,7 @@ MtChimney_EventScript_22EDD5:: @ 822EDD5 call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EDF9 call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EE02 closemessage - applymovement 1, MtChimney_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_EVIL_LEADER_PLEASE_STOP release @@ -35,12 +35,12 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B lockall playbgm MUS_MGM0, 0 msgbox MtChimney_Text_22F26A, MSGBOX_DEFAULT - applymovement 2, MtChimney_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 2, MtChimney_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, MtChimney_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF @@ -60,7 +60,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B call_if_eq MtChimney_EventScript_22EEC7 compare VAR_FACING, 2 call_if_eq MtChimney_EventScript_22EED2 - applymovement EVENT_OBJ_ID_PLAYER, MtChimney_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 6eaf6265f..6b9805fbf 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -32,9 +32,9 @@ MtPyre_Summit_EventScript_232030:: @ 8232030 MtPyre_Summit_EventScript_23203C:: @ 823203C playbgm MUS_AQA_0, 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725AA + applymovement 2, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 compare VAR_0x8008, 0 @@ -86,7 +86,7 @@ MtPyre_Summit_EventScript_2320EC:: @ 82320EC MtPyre_Summit_EventScript_2320F7:: @ 82320F7 applymovement 3, MtPyre_Summit_Movement_23212C waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -98,7 +98,7 @@ MtPyre_Summit_EventScript_23210C:: @ 823210C MtPyre_Summit_EventScript_232117:: @ 8232117 applymovement 3, MtPyre_Summit_Movement_232132 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -207,7 +207,7 @@ MtPyre_Summit_EventScript_232204:: @ 8232204 end MtPyre_Summit_EventScript_232210:: @ 8232210 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 60 compare VAR_0x8008, 0 @@ -217,9 +217,9 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_2322F6 playse SE_PIN - applymovement 8, MtPyre_Summit_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, MtPyre_Summit_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 delay 30 compare VAR_0x8008, 0 @@ -292,7 +292,7 @@ MtPyre_Summit_EventScript_23235A:: @ 823235A applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323ED waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -300,7 +300,7 @@ MtPyre_Summit_EventScript_232376:: @ 8232376 applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F3 waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -308,7 +308,7 @@ MtPyre_Summit_EventScript_232392:: @ 8232392 applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F8 waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 4df8343fb..332e6dbea 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -9,7 +9,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD goto_if_eq NavelRock_Harbor_EventScript_269102 msgbox NavelRock_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_NAVEL_ROCK_HARBOR diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index d841f0374..9d0452b6b 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -23,7 +23,7 @@ NewMauville_Entrance_MapScript1_2372FB: @ 82372FB NewMauville_Entrance_EventScript_2372FF:: @ 82372FF lockall - applymovement EVENT_OBJ_ID_PLAYER, NewMauville_Entrance_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 73b3e4d95..a635b2f5c 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -193,7 +193,7 @@ OldaleTown_EventScript_1E901F:: @ 81E901F goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E9066 msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT closemessage - applymovement 3, OldaleTown_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -217,7 +217,7 @@ OldaleTown_EventScript_1E9066:: @ 81E9066 OldaleTown_EventScript_1E9070:: @ 81E9070 lockall - applymovement 4, OldaleTown_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 setvar VAR_0x8009, 0 goto OldaleTown_EventScript_1E90E6 @@ -227,7 +227,7 @@ OldaleTown_EventScript_1E9086:: @ 81E9086 lockall applymovement 4, OldaleTown_Movement_1E9170 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -237,7 +237,7 @@ OldaleTown_EventScript_1E90A6:: @ 81E90A6 lockall applymovement 4, OldaleTown_Movement_1E9173 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -247,7 +247,7 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6 lockall applymovement 4, OldaleTown_Movement_1E9175 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index f69eb3a3a..0253a799f 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -44,7 +44,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E special StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT - applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY + applymovement 2, Common_Movement_WalkInPlaceLeft, MAP_PETALBURG_CITY waitmovement 2, MAP_PETALBURG_CITY msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT closemessage @@ -89,7 +89,7 @@ PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 faceplayer msgbox PetalburgCity_Text_1DC985, MSGBOX_DEFAULT closemessage - applymovement 3, PetalburgCity_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -263,13 +263,13 @@ PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE end PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA - applymovement 8, PetalburgCity_Movement_27259E + applymovement 8, Common_Movement_FacePlayer waitmovement 0 playbgm MUS_TSURETEK, 0 playse SE_PIN - applymovement 8, PetalburgCity_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, PetalburgCity_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 call_if_eq PetalburgCity_EventScript_1DC57F @@ -290,8 +290,8 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA compare VAR_0x8008, 3 call_if_eq PetalburgCity_EventScript_1DC5FF msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT - applymovement 8, PetalburgCity_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 + applymovement 8, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT closemessage @@ -304,7 +304,7 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA PetalburgCity_EventScript_1DC57F:: @ 81DC57F applymovement 8, PetalburgCity_Movement_1DC615 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -316,14 +316,14 @@ PetalburgCity_EventScript_1DC594:: @ 81DC594 PetalburgCity_EventScript_1DC59F:: @ 81DC59F applymovement 8, PetalburgCity_Movement_1DC61D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4 applymovement 8, PetalburgCity_Movement_1DC622 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -543,23 +543,23 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 applymovement 9, PetalburgCity_Movement_1DC7D6 waitmovement 0 playse SE_PIN - applymovement 9, PetalburgCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, PetalburgCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, PetalburgCity_Movement_1DC7DB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 setvar VAR_0x40D1, 1 msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT closemessage - applymovement 9, PetalburgCity_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 30 msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT closemessage - applymovement 9, PetalburgCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 30 msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index b4733ab09..474fe0df5 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -90,14 +90,14 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_2049EC waitmovement 0 playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT setvar VAR_0x4085, 2 @@ -228,7 +228,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC end PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_2050EB waitmovement 0 return @@ -236,20 +236,20 @@ PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 PetalburgCity_Gym_EventScript_204C43:: @ 8204C43 applymovement 10, PetalburgCity_Gym_Movement_2050E1 waitmovement 0 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_2050EB waitmovement 0 return PetalburgCity_Gym_EventScript_204C78:: @ 8204C78 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown applymovement 10, PetalburgCity_Gym_Movement_205102 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205111 waitmovement 0 @@ -274,55 +274,55 @@ PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5 return PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7 - applymovement 1, PetalburgCity_Gym_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2 - applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6 - applymovement 1, PetalburgCity_Gym_Movement_2725A4 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204D08:: @ 8204D08 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D13:: @ 8204D13 - applymovement 1, PetalburgCity_Gym_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D29:: @ 8204D29 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_204D34:: @ 8204D34 - applymovement 10, PetalburgCity_Gym_Movement_27259E + applymovement 10, Common_Movement_FacePlayer waitmovement 0 return PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F - applymovement 10, PetalburgCity_Gym_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -350,7 +350,7 @@ PetalburgCity_Gym_EventScript_204D72:: @ 8204D72 return PetalburgCity_Gym_EventScript_204D73:: @ 8204D73 - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -465,9 +465,9 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 applymovement 11, PetalburgCity_Gym_Movement_2050BB waitmovement 0 playse SE_PIN - applymovement 11, PetalburgCity_Gym_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 - applymovement 11, PetalburgCity_Gym_Movement_27259A + applymovement 11, Common_Movement_Delay48 waitmovement 0 delay 10 compare VAR_0x8008, 1 @@ -504,47 +504,47 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 end PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC - applymovement 11, PetalburgCity_Gym_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 return PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7 - applymovement 11, PetalburgCity_Gym_Movement_2725A8 + applymovement 11, Common_Movement_WalkInPlaceRight waitmovement 0 return PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2 - applymovement 11, PetalburgCity_Gym_Movement_2725A4 + applymovement 11, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_204FED:: @ 8204FED applymovement 11, PetalburgCity_Gym_Movement_2050C3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4 - applymovement 1, PetalburgCity_Gym_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return PetalburgCity_Gym_EventScript_205009:: @ 8205009 applymovement 11, PetalburgCity_Gym_Movement_2050CA waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_205025:: @ 8205025 applymovement 11, PetalburgCity_Gym_Movement_2050D0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return PetalburgCity_Gym_EventScript_205041:: @ 8205041 applymovement 11, PetalburgCity_Gym_Movement_20507E - applymovement 1, PetalburgCity_Gym_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A1 waitmovement 0 return diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index e296b8447..7efad7dc1 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -15,7 +15,7 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 closemessage applymovement 3, PetalburgWoods_Movement_22E1F6 waitmovement 0 - applymovement 4, PetalburgWoods_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage @@ -41,7 +41,7 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 call PetalburgWoods_EventScript_22E124 applymovement 4, PetalburgWoods_Movement_22E1D0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT closemessage @@ -52,14 +52,14 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 closemessage applymovement 3, PetalburgWoods_Movement_22E205 waitmovement 0 - applymovement 4, PetalburgWoods_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage applymovement 4, PetalburgWoods_Movement_22E1EA waitmovement 0 msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 @@ -85,7 +85,7 @@ PetalburgWoods_EventScript_22E138:: @ 822E138 applymovement 3, PetalburgWoods_Movement_22E1FD waitmovement 0 removeobject 3 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 15722a3f3..ca9d94127 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -30,7 +30,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE applymovement 4, Route101_Movement_1EBD96 applymovement 2, Route101_Movement_1EBDC8 waitmovement 0 - applymovement 2, Route101_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 4, Route101_Movement_1EBDBD applymovement 2, Route101_Movement_1EBDEF @@ -223,7 +223,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 fadescreen 1 removeobject 4 setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 special ChooseStarter waitstate diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 1cb912bd0..798e32715 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -30,11 +30,11 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT closemessage playbgm MUS_GIRL_SUP, 1 - applymovement 2, Route103_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 - applymovement 2, Route103_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route103_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT switch VAR_STARTER_MON @@ -47,11 +47,11 @@ Route103_EventScript_1EC434:: @ 81EC434 msgbox Route103_Text_1EC989, MSGBOX_DEFAULT closemessage playbgm MUS_BOY_SUP, 1 - applymovement 2, Route103_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 - applymovement 2, Route103_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route103_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT switch VAR_STARTER_MON diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index d50a8a9a3..7d2e06876 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -42,7 +42,7 @@ Route104_EventScript_1ECC9D:: @ 81ECC9D Route104_EventScript_1ECC9E:: @ 81ECC9E lockall setvar VAR_0x8008, 1 - applymovement 34, Route104_Movement_27259E + applymovement 34, Common_Movement_FacePlayer waitmovement 0 goto Route104_EventScript_1ECD33 @@ -51,7 +51,7 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 10 addobject 34 @@ -64,9 +64,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 setvar VAR_0x8008, 0 call Route104_EventScript_1E0DD1 playse SE_PIN - applymovement 34, Route104_Movement_272598 + applymovement 34, Common_Movement_ExclamationMark waitmovement 0 - applymovement 34, Route104_Movement_27259A + applymovement 34, Common_Movement_Delay48 waitmovement 0 goto Route104_EventScript_1ECD33 diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 490f1d255..f0719c2e8 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -319,7 +319,7 @@ Route109_EventScript_1EE99E:: @ 81EE99E faceplayer msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -334,7 +334,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_RECEIVED_SOFT_SAND release @@ -342,7 +342,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 Route109_EventScript_1EE9F2:: @ 81EE9F2 msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 + 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 958f3a36a..578a19a21 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -32,7 +32,7 @@ Route110_EventScript_1EF2AA:: @ 81EF2AA lock faceplayer msgbox Route110_Text_1EFB5D, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -41,7 +41,7 @@ Route110_EventScript_1EF2C0:: @ 81EF2C0 lock faceplayer msgbox Route110_Text_1EFB93, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -50,7 +50,7 @@ Route110_EventScript_1EF2D6:: @ 81EF2D6 lock faceplayer msgbox Route110_Text_1EFBCA, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -59,7 +59,7 @@ Route110_EventScript_1EF2EC:: @ 81EF2EC lock faceplayer msgbox Route110_Text_1EFC0D, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -307,7 +307,7 @@ Route110_EventScript_1EF64A:: @ 81EF64A Route110_EventScript_1EF661:: @ 81EF661 lockall - applymovement 21, Route110_Movement_2725A8 + applymovement 21, Common_Movement_WalkInPlaceRight waitmovement 0 call Route110_EventScript_1EF673 releaseall @@ -383,11 +383,11 @@ Route110_EventScript_1EF76E:: @ 81EF76E call_if_eq Route110_EventScript_1EF7E1 compare VAR_RESULT, FEMALE call_if_eq Route110_EventScript_1EF7E6 - applymovement 28, Route110_Movement_2725AA + applymovement 28, Common_Movement_WalkInPlaceDown waitmovement 0 - applymovement 28, Route110_Movement_272598 + applymovement 28, Common_Movement_ExclamationMark waitmovement 0 - applymovement 28, Route110_Movement_27259A + applymovement 28, Common_Movement_Delay48 waitmovement 0 delay 30 compare VAR_0x8008, 1 @@ -616,9 +616,9 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 applymovement 36, Route110_Movement_1EFB30 waitmovement 0 playse SE_PIN - applymovement 36, Route110_Movement_272598 + applymovement 36, Common_Movement_ExclamationMark waitmovement 0 - applymovement 36, Route110_Movement_27259A + applymovement 36, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 call_if_eq Route110_EventScript_1EFAD8 @@ -631,13 +631,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT closemessage delay 20 - applymovement 36, Route110_Movement_2725A4 + applymovement 36, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 10 - applymovement 36, Route110_Movement_2725A8 + applymovement 36, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 - applymovement 36, Route110_Movement_2725AA + applymovement 36, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index de6aa2119..770c39768 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -161,7 +161,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 delay 30 msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT closemessage - applymovement 1, Route110_TrickHouseEnd_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 delay 30 msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT @@ -212,22 +212,22 @@ Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 return Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015 - applymovement 1, Route110_TrickHouseEnd_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020 - applymovement 1, Route110_TrickHouseEnd_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B - applymovement 1, Route110_TrickHouseEnd_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036 - applymovement 1, Route110_TrickHouseEnd_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -235,13 +235,13 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 lockall turnobject 1, 3 playse SE_PIN - applymovement 1, Route110_TrickHouseEnd_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 delay 20 applymovement 1, Route110_TrickHouseEnd_Movement_26B08B waitmovement 0 playse SE_W153 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT closemessage diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index ac27d3af6..7dc918f2d 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -236,9 +236,9 @@ Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 compare VAR_0x4044, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE @@ -326,21 +326,21 @@ Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48 Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 msgbox Route110_TrickHouseEntrance_Text_26A921, MSGBOX_DEFAULT closemessage - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 1, Route110_TrickHouseEntrance_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Route110_TrickHouseEntrance_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT - applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT compare VAR_0x4044, 1 @@ -432,13 +432,13 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 setvar VAR_0x40C1, 0 setvar VAR_0x40A7, 3 - applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 - applymovement 1, Route110_TrickHouseEntrance_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT call Route110_TrickHouseEntrance_EventScript_26A070 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 4c199a993..48ce6be8c 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -25,7 +25,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27 Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 lockall - applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_1, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -35,7 +35,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 lockall - applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_2, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -45,7 +45,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 lockall - applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 3, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_3, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -55,7 +55,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 lockall - applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_4, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -65,7 +65,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6 lockall - applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 compare VAR_TEMP_5, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA @@ -215,9 +215,9 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB setvar VAR_TEMP_1, 1 setvar VAR_TEMP_8, 1 playse SE_PIN - applymovement 1, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -239,9 +239,9 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A setvar VAR_TEMP_2, 1 setvar VAR_TEMP_8, 2 playse SE_PIN - applymovement 2, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 2, Common_Movement_ExclamationMark waitmovement 0 - applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 2, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D2CC @@ -265,9 +265,9 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_8, 3 playse SE_PIN - applymovement 3, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 3, Common_Movement_ExclamationMark waitmovement 0 - applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 3, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -289,9 +289,9 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 setvar VAR_TEMP_4, 1 setvar VAR_TEMP_8, 4 playse SE_PIN - applymovement 4, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 4, Common_Movement_ExclamationMark waitmovement 0 - applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 4, Common_Movement_Delay48 waitmovement 0 compare VAR_TEMP_9, 1 call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 @@ -313,9 +313,9 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 setvar VAR_TEMP_5, 1 setvar VAR_TEMP_8, 5 playse SE_PIN - applymovement 5, Route110_TrickHousePuzzle5_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, Route110_TrickHousePuzzle5_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox Route110_TrickHousePuzzle5_Text_26DC78, MSGBOX_DEFAULT random 3 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index d9d5ea7ea..c33dc6f11 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -285,7 +285,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 Route111_EventScript_1F0FE7:: @ 81F0FE7 msgbox Route111_Text_1F1523, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542 - applymovement 1, Route111_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F156F, MSGBOX_DEFAULT @@ -303,7 +303,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 call Route111_EventScript_1F1143 msgbox Route111_Text_1F159D, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616 - applymovement 2, Route111_Movement_2725A6 + applymovement 2, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F1645, MSGBOX_DEFAULT @@ -321,7 +321,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 call Route111_EventScript_1F1143 msgbox Route111_Text_1F167E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6 - applymovement 3, Route111_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT @@ -341,7 +341,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756 msgbox Route111_Text_1F1788, MSGBOX_DEFAULT closemessage - applymovement 4, Route111_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 call Route111_EventScript_1F113C applymovement 4, Route111_Movement_1F114A @@ -437,11 +437,11 @@ Route111_EventScript_1F11DA:: @ 81F11DA Route111_EventScript_1F11E4:: @ 81F11E4 lockall - applymovement 46, Route111_Movement_27259E + applymovement 46, Common_Movement_FacePlayer waitmovement 0 msgbox Route111_Text_1F1CCA, MSGBOX_DEFAULT closemessage - applymovement 46, Route111_Movement_2725A2 + applymovement 46, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index 2890011b4..312bf739f 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -52,7 +52,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E Route111_WinstrateFamilysHouse_EventScript_22A52C:: @ 822A52C closemessage - applymovement VAR_0x8008, Route111_WinstrateFamilysHouse_Movement_2725A2 + applymovement VAR_0x8008, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 995102fe7..7f479d9f2 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -10,36 +10,36 @@ Route112_MapScript1_1F1DAE: @ 81F1DAE Route112_EventScript_1F1DB7:: @ 81F1DB7 lockall delay 40 - applymovement 1, Route112_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT closemessage - applymovement 1, Route112_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Route112_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT closemessage - applymovement 6, Route112_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 1, Route112_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT closemessage - applymovement 1, Route112_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Route112_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route112_Text_1F2003, MSGBOX_DEFAULT closemessage - applymovement 6, Route112_Movement_2725A2 + applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 96d591d2d..c36abfe3b 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -23,8 +23,8 @@ Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 lockall - applymovement 1, Route114_FossilManiacsTunnel_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, Route114_FossilManiacsTunnel_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT setvar VAR_0x40CC, 2 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 623c74e3c..1addad5ec 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -151,8 +151,8 @@ Route116_EventScript_1F2D84:: @ 81F2D84 Route116_EventScript_1F2D95:: @ 81F2D95 lockall - applymovement 11, Route116_Movement_2725A8 - applymovement EVENT_OBJ_ID_PLAYER, Route116_Movement_2725A4 + applymovement 11, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox Route116_Text_1F309D, MSGBOX_DEFAULT setvar VAR_0x406F, 2 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 45b8665b0..4e5279510 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -69,7 +69,7 @@ Route118_EventScript_1F3E85:: @ 81F3E85 Route118_EventScript_1F3E8E:: @ 81F3E8E lockall setvar VAR_0x8008, 0 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_1F3F61 waitmovement 0 @@ -79,7 +79,7 @@ Route118_EventScript_1F3E8E:: @ 81F3E8E Route118_EventScript_1F3EAE:: @ 81F3EAE lockall setvar VAR_0x8008, 1 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 goto Route118_EventScript_1F3EE4 end @@ -87,7 +87,7 @@ Route118_EventScript_1F3EAE:: @ 81F3EAE Route118_EventScript_1F3EC4:: @ 81F3EC4 lockall setvar VAR_0x8008, 2 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_1F3F63 waitmovement 0 diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 15f124bb0..d0ab5f578 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -51,7 +51,7 @@ Route119_EventScript_1F4488:: @ 81F4488 call_if_eq Route119_EventScript_1F46C6 compare VAR_TEMP_1, 2 call_if_eq Route119_EventScript_1F46D1 - applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 compare VAR_TEMP_1, 1 @@ -459,7 +459,7 @@ Route119_EventScript_1F49A3:: @ 81F49A3 faceplayer msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -469,7 +469,7 @@ Route119_EventScript_1F49BA:: @ 81F49BA faceplayer msgbox Route119_Text_1F5147, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 6826e5fe0..21d34eed1 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -55,9 +55,9 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 msgbox Route119_WeatherInstitute_2F_Text_270568, MSGBOX_DEFAULT closemessage playse SE_PIN - applymovement 3, Route119_WeatherInstitute_2F_Movement_272598 + applymovement 3, Common_Movement_ExclamationMark waitmovement 0 - applymovement 3, Route119_WeatherInstitute_2F_Movement_27259A + applymovement 3, Common_Movement_Delay48 waitmovement 0 msgbox Route119_WeatherInstitute_2F_Text_2705DD, MSGBOX_DEFAULT closemessage diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 88a950be7..c16b37691 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -196,12 +196,12 @@ Route120_EventScript_1F568B:: @ 81F568B call_if_eq Route120_EventScript_1F57A3 compare VAR_FACING, 3 call_if_eq Route120_EventScript_1F57AE - applymovement 31, Route120_Movement_2725A4 + applymovement 31, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 20 msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT closemessage - applymovement 30, Route120_Movement_2725A8 + applymovement 30, Common_Movement_WalkInPlaceRight waitmovement 0 applymovement 30, Route120_Movement_2723C7 waitmovement 0 @@ -233,15 +233,15 @@ Route120_EventScript_1F571C:: @ 81F571C end Route120_EventScript_1F572C:: @ 81F572C - applymovement 31, Route120_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A6 + applymovement 31, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT closemessage - applymovement 31, Route120_Movement_2725AA + applymovement 31, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 @@ -258,7 +258,7 @@ Route120_EventScript_1F572C:: @ 81F572C end Route120_EventScript_1F57A3:: @ 81F57A3 - applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index d4ef73f9b..f5e2fb088 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -46,7 +46,7 @@ Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 lockall - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 showmoneybox 0, 0, 0 msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 5d32a7bdf..3ec3d2fe7 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -24,18 +24,18 @@ Route128_EventScript_1F6B57:: @ 81F6B57 closemessage applymovement 5, Route128_Movement_1F6CAD waitmovement 0 - applymovement 4, Route128_Movement_2725A6 + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CBB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C96 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement 5, Route128_Movement_1F6CA8 waitmovement 0 msgbox Route128_Text_1F704F, MSGBOX_DEFAULT @@ -53,19 +53,19 @@ Route128_EventScript_1F6B57:: @ 81F6B57 addobject 3 applymovement 3, Route128_Movement_1F6C87 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_1F6C85 - applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT - applymovement 3, Route128_Movement_2725AA + applymovement 3, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox Route128_Text_1F721B, MSGBOX_DEFAULT closemessage - applymovement 3, Route128_Movement_2725AA + applymovement 3, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index e5f034f1d..f475f02e3 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -42,18 +42,18 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 applymovement 15, RustboroCity_Movement_1E0852 waitmovement 0 playse SE_PIN - applymovement 15, RustboroCity_Movement_272598 + applymovement 15, Common_Movement_ExclamationMark waitmovement 0 - applymovement 15, RustboroCity_Movement_27259A + applymovement 15, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 applymovement 15, RustboroCity_Movement_1E084E waitmovement 0 msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT closemessage setflag FLAG_HAS_MATCH_CALL - applymovement 15, RustboroCity_Movement_2725A4 + applymovement 15, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_TK_KASYA delay 10 @@ -63,7 +63,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 delay 10 playse SE_TK_KASYA delay 20 - applymovement 15, RustboroCity_Movement_2725AA + applymovement 15, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT closemessage @@ -221,7 +221,7 @@ RustboroCity_EventScript_1E0922:: @ 81E0922 lock faceplayer msgbox RustboroCity_Text_1E16F4, MSGBOX_DEFAULT - applymovement 7, RustboroCity_Movement_2725A2 + applymovement 7, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -230,7 +230,7 @@ RustboroCity_EventScript_1E0938:: @ 81E0938 lock faceplayer msgbox RustboroCity_Text_1E174B, MSGBOX_DEFAULT - applymovement 8, RustboroCity_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -344,7 +344,7 @@ RustboroCity_EventScript_1E0A6E:: @ 81E0A6E RustboroCity_EventScript_1E0A79:: @ 81E0A79 applymovement 9, RustboroCity_Movement_1E0AD5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -500,52 +500,52 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E end RustboroCity_EventScript_1E0B6F:: @ 81E0B6F - applymovement 9, RustboroCity_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return RustboroCity_EventScript_1E0B9B:: @ 81E0B9B - applymovement 9, RustboroCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AC waitmovement 0 return RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return @@ -608,69 +608,69 @@ RustboroCity_EventScript_1E0CD3:: @ 81E0CD3 return RustboroCity_EventScript_1E0CDC:: @ 81E0CDC - applymovement 9, RustboroCity_Movement_2725A6 + applymovement 9, Common_Movement_WalkInPlaceUp waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return RustboroCity_EventScript_1E0D08:: @ 81E0D08 - applymovement 9, RustboroCity_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AE waitmovement 0 return RustboroCity_EventScript_1E0D34:: @ 81E0D34 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0D60:: @ 81E0D60 - applymovement 9, RustboroCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 return RustboroCity_EventScript_1E0D96:: @ 81E0D96 - applymovement 9, RustboroCity_Movement_2725A4 + applymovement 9, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN - applymovement 9, RustboroCity_Movement_272598 + applymovement 9, Common_Movement_ExclamationMark waitmovement 0 - applymovement 9, RustboroCity_Movement_27259A + applymovement 9, Common_Movement_Delay48 waitmovement 0 return RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 lockall call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -694,128 +694,128 @@ RustboroCity_EventScript_1E0DEE:: @ 81E0DEE RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E120E waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0E33:: @ 81E0E33 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1215 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0E73:: @ 81E0E73 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E121B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1220 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1224 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0F33:: @ 81E0F33 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1227 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0F73:: @ 81E0F73 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E122B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, RustboroCity_Movement_2725AA + applymovement 14, Common_Movement_WalkInPlaceDown waitmovement 0 playse SE_PIN - applymovement 14, RustboroCity_Movement_272598 + applymovement 14, Common_Movement_ExclamationMark waitmovement 0 - applymovement 14, RustboroCity_Movement_27259A + applymovement 14, Common_Movement_Delay48 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1230 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index d9fe5819f..1631d923d 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_2118F1:: @ 82118F1 RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 closemessage playse SE_PIN - applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 @@ -104,9 +104,9 @@ RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974 RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 closemessage playse SE_PIN - applymovement 5, RustboroCity_DevonCorp_2F_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index b2f13ea86..7c4557058 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -154,7 +154,7 @@ RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_212595 msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -167,7 +167,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -175,7 +175,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC msgbox RustboroCity_DevonCorp_3F_Text_212B78, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index 7798e72e6..ec59115ef 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -59,7 +59,7 @@ RustboroCity_Flat1_2F_EventScript_2151F8:: @ 82151F8 msgbox RustboroCity_Flat1_2F_Text_215535, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_215238 msgbox RustboroCity_Flat1_2F_Text_215565, MSGBOX_DEFAULT - applymovement 6, RustboroCity_Flat1_2F_Movement_27259E + applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox RustboroCity_Flat1_2F_Text_215792, MSGBOX_DEFAULT release diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 2d3c6a8f9..74394f9a5 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -87,7 +87,7 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 setflag FLAG_RECEIVED_QUICK_CLAW release @@ -106,7 +106,7 @@ RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0 RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 release end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 59d0789ba..325e4186b 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -23,7 +23,7 @@ RusturfTunnel_EventScript_22CE5F:: @ 822CE5F faceplayer msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -35,7 +35,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -43,7 +43,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 RusturfTunnel_EventScript_22CE99:: @ 822CE99 msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -94,7 +94,7 @@ RusturfTunnel_EventScript_22CF6F:: @ 822CF6F applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 - applymovement 10, RusturfTunnel_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -102,14 +102,14 @@ RusturfTunnel_EventScript_22CF8B:: @ 822CF8B applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 - applymovement 10, RusturfTunnel_Movement_2725AA + applymovement 10, Common_Movement_WalkInPlaceDown waitmovement 0 return RusturfTunnel_EventScript_22CFA7:: @ 822CFA7 - applymovement 1, RusturfTunnel_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return @@ -142,9 +142,9 @@ RusturfTunnel_EventScript_22CFE6:: @ 822CFE6 RusturfTunnel_EventScript_22CFFF:: @ 822CFFF playse SE_PIN - applymovement 1, RusturfTunnel_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, RusturfTunnel_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 return @@ -328,7 +328,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 applymovement 5, RusturfTunnel_Movement_22D1A4 waitmovement 0 msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT - applymovement 5, RusturfTunnel_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 message RusturfTunnel_Text_22D3BA waitmessage diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 204d70e14..20d0c72d4 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -201,7 +201,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 lockall applymovement 5, SSTidalCorridor_Movement_23C26D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 9bbb9cbdc..13b65c722 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -13,9 +13,9 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED waitse playse SE_PIN - applymovement 1, SeafloorCavern_Entrance_Movement_272598 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, SeafloorCavern_Entrance_Movement_27259A + applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 20 compare VAR_FACING, 3 @@ -29,7 +29,7 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 moveobjectoffscreen 1 msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT closemessage - applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end @@ -43,23 +43,23 @@ SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED call_if_eq SeafloorCavern_Entrance_EventScript_234539 msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT closemessage - applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end SeafloorCavern_Entrance_EventScript_234523:: @ 8234523 - applymovement 1, SeafloorCavern_Entrance_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E - applymovement 1, SeafloorCavern_Entrance_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 return SeafloorCavern_Entrance_EventScript_234539:: @ 8234539 - applymovement 1, SeafloorCavern_Entrance_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 return diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 6ab802ee4..f246900d8 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -7,7 +7,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C waitmovement 0 @@ -15,15 +15,15 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A waitmovement 0 msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E + applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC @@ -47,8 +47,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 150 removeobject 7 @@ -82,7 +82,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8007, 5 msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT playse SE_PC_LOGIN - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT closemessage @@ -92,7 +92,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 closemessage playse SE_PC_OFF delay 20 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725AA + applymovement VAR_0x8004, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT closemessage @@ -103,13 +103,13 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057 applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A4 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT playse SE_PIN - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_272598 + applymovement VAR_0x8004, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259A + applymovement VAR_0x8004, Common_Movement_Delay48 waitmovement 0 msgbox SeafloorCavern_Room9_Text_2355C2, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_235692, MSGBOX_DEFAULT diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index f65d0d4ec..a6e7b05cc 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -36,7 +36,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 lockall applymovement 1, SkyPillar_Outside_Movement_2393D3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT closemessage @@ -60,13 +60,13 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special sub_8139560 waitstate delay 20 - applymovement 1, SkyPillar_Outside_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 10 - applymovement 1, SkyPillar_Outside_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 - applymovement 1, SkyPillar_Outside_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 4ca4c4681..a878b2efc 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -94,7 +94,7 @@ SkyPillar_Top_EventScript_239785:: @ 8239785 SkyPillar_Top_EventScript_23979A:: @ 823979A lockall fadeoutbgm 1 - applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Top_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 special SpawnCameraObject applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_239858 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 2e7859fba..efce9cde8 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -61,11 +61,11 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C waitmovement 0 msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT closemessage - applymovement 35, SlateportCity_Movement_2725A4 + applymovement 35, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 60 msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT - applymovement 35, SlateportCity_Movement_2725A8 + applymovement 35, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT closemessage @@ -359,7 +359,7 @@ SlateportCity_EventScript_1DD009:: @ 81DD009 faceplayer msgbox SlateportCity_Text_1DDC4F, MSGBOX_DEFAULT closemessage - applymovement 5, SlateportCity_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -369,7 +369,7 @@ SlateportCity_EventScript_1DD020:: @ 81DD020 faceplayer msgbox SlateportCity_Text_1DDC8A, MSGBOX_DEFAULT closemessage - applymovement 18, SlateportCity_Movement_2725A2 + applymovement 18, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -379,7 +379,7 @@ SlateportCity_EventScript_1DD037:: @ 81DD037 faceplayer msgbox SlateportCity_Text_1DDCD5, MSGBOX_DEFAULT closemessage - applymovement 19, SlateportCity_Movement_2725A2 + applymovement 19, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -389,7 +389,7 @@ SlateportCity_EventScript_1DD04E:: @ 81DD04E faceplayer msgbox SlateportCity_Text_1DDD18, MSGBOX_DEFAULT closemessage - applymovement 26, SlateportCity_Movement_2725A2 + applymovement 26, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -399,7 +399,7 @@ SlateportCity_EventScript_1DD065:: @ 81DD065 faceplayer msgbox SlateportCity_Text_1DDD7D, MSGBOX_DEFAULT closemessage - applymovement 27, SlateportCity_Movement_2725A2 + applymovement 27, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -409,7 +409,7 @@ SlateportCity_EventScript_1DD07C:: @ 81DD07C faceplayer msgbox SlateportCity_Text_1DDDC0, MSGBOX_DEFAULT closemessage - applymovement 28, SlateportCity_Movement_2725A2 + applymovement 28, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -419,7 +419,7 @@ SlateportCity_EventScript_1DD093:: @ 81DD093 faceplayer msgbox SlateportCity_Text_1DDDDF, MSGBOX_DEFAULT closemessage - applymovement 29, SlateportCity_Movement_2725A2 + applymovement 29, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -429,7 +429,7 @@ SlateportCity_EventScript_1DD0AA:: @ 81DD0AA faceplayer msgbox SlateportCity_Text_1DDE2F, MSGBOX_DEFAULT closemessage - applymovement 30, SlateportCity_Movement_2725A2 + applymovement 30, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -438,31 +438,31 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 lock faceplayer playse SE_PIN - applymovement 31, SlateportCity_Movement_272598 + applymovement 31, Common_Movement_ExclamationMark waitmovement 0 - applymovement 31, SlateportCity_Movement_27259A + applymovement 31, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_Text_1DDE6E, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 - applymovement 31, SlateportCity_Movement_27259E + applymovement 31, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_Text_1DDE86, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 msgbox SlateportCity_Text_1DDEB8, MSGBOX_DEFAULT closemessage - applymovement 31, SlateportCity_Movement_27259E + applymovement 31, Common_Movement_FacePlayer waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 - applymovement 31, SlateportCity_Movement_2725A2 + applymovement 31, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -481,7 +481,7 @@ SlateportCity_EventScript_1DD153:: @ 81DD153 faceplayer msgbox SlateportCity_Text_1DDF8D, MSGBOX_DEFAULT closemessage - applymovement 33, SlateportCity_Movement_2725A2 + applymovement 33, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -563,10 +563,10 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT closemessage - applymovement 10, SlateportCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceRight waitmovement 0 delay 10 - applymovement 9, SlateportCity_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceDown waitmovement 0 delay 25 applymovement 11, SlateportCity_Movement_1DD33C @@ -577,26 +577,26 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 removeobject 10 removeobject 9 msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT - applymovement 11, SlateportCity_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT playbgm MUS_AQA_0, 0 msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT - applymovement 6, SlateportCity_Movement_2725A4 - applymovement 1, SlateportCity_Movement_2725A4 + applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 7, SlateportCity_Movement_1DD309 applymovement 3, SlateportCity_Movement_272596 applymovement 2, SlateportCity_Movement_1DD311 waitmovement 0 - applymovement 11, SlateportCity_Movement_2725AA + applymovement 11, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT playse SE_PIN - applymovement 11, SlateportCity_Movement_272598 + applymovement 11, Common_Movement_ExclamationMark waitmovement 0 - applymovement 11, SlateportCity_Movement_27259A + applymovement 11, Common_Movement_Delay48 waitmovement 0 - applymovement 11, SlateportCity_Movement_2725A6 + applymovement 11, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT @@ -885,7 +885,7 @@ SlateportCity_EventScript_1DD5CE:: @ 81DD5CE SlateportCity_EventScript_1DD5DC:: @ 81DD5DC lockall - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 opendoor 10, 12 waitdooranim diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 4bd28996b..400146b3b 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -44,7 +44,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_BattleTentCorridor_Movement_2725A6 + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 opendoor 2, 1 waitdooranim diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 771cc149f..138ca9859 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -48,10 +48,10 @@ SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF end SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 - applymovement 7, SlateportCity_Harbor_Movement_2725AA + applymovement 7, Common_Movement_WalkInPlaceDown waitmovement 0 - applymovement 6, SlateportCity_Harbor_Movement_2725AA - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A6 + applymovement 6, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT closemessage @@ -85,21 +85,21 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89 applymovement 4, SlateportCity_Harbor_Movement_20CAE0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 return SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E applymovement 4, SlateportCity_Harbor_Movement_20CAE6 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 applymovement 4, SlateportCity_Harbor_Movement_20CAEB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -226,7 +226,7 @@ SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR @@ -300,7 +300,7 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 goto_if_eq SlateportCity_Harbor_EventScript_20CCDF msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2 + 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 b574ce448..05445cfbf 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -7,14 +7,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96 SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F lockall - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 lockall - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end @@ -155,9 +155,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 faceplayer delay 8 playse SE_PIN - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_272598 + applymovement 13, Common_Movement_ExclamationMark waitmovement 0 - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_27259A + applymovement 13, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, MSGBOX_DEFAULT giveitem_std ITEM_TM46 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 204ffb4eb..641c4dd86 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -43,8 +43,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF waitmovement 0 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceDown + applymovement 4, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, MSGBOX_DEFAULT closemessage @@ -68,7 +68,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 fadescreen 0 delay 30 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT setvar VAR_0x8004, 269 @@ -96,12 +96,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C return SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D - applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -268,7 +268,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_2725A2 + 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 c63ef3706..4bc1b8660 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -211,9 +211,9 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 playse SE_PIN - applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_272598 + applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_27259A + applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT giveitem_std ITEM_SOOTHE_BELL diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index adf1bd3a2..6c554387a 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_207F40:: @ 8207F40 goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FD9 goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FBA msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 setflag FLAG_DOCK_REJECTED_DEVON_GOODS setflag FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA @@ -20,31 +20,31 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 end SlateportCity_SternsShipyard_1F_EventScript_207F92:: @ 8207F92 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_208323, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FA6:: @ 8207FA6 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, MSGBOX_DEFAULT closemessage - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 + applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FD9:: @ 8207FD9 - applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E + applymovement 1, Common_Movement_FacePlayer waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_208213, MSGBOX_DEFAULT releaseall diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index bdc36c468..bfebcf055 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -219,8 +219,8 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 setvar VAR_0x8004, 0 special sub_813B7D8 waitstate - applymovement 10, SootopolisCity_Movement_2725A4 - applymovement 9, SootopolisCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 60 waitse @@ -319,8 +319,8 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 setvar VAR_0x8004, 0 special sub_813B7D8 waitstate - applymovement 10, SootopolisCity_Movement_2725A4 - applymovement 9, SootopolisCity_Movement_2725A8 + applymovement 10, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceRight waitmovement 0 delay 60 waitse @@ -730,7 +730,7 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 goto_if_eq SootopolisCity_EventScript_1E5F10 msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT closemessage - applymovement 3, SootopolisCity_Movement_2725A2 + applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -792,13 +792,13 @@ SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8 SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 lockall - applymovement 2, SootopolisCity_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E600D msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT closemessage - applymovement 2, SootopolisCity_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -838,7 +838,7 @@ SootopolisCity_EventScript_1E6038:: @ 81E6038 SootopolisCity_EventScript_1E6065:: @ 81E6065 msgbox SootopolisCity_Text_1E7078, MSGBOX_DEFAULT closemessage - applymovement 8, SootopolisCity_Movement_2725A2 + applymovement 8, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -855,7 +855,7 @@ SootopolisCity_EventScript_1E6084:: @ 81E6084 SootopolisCity_EventScript_1E608E:: @ 81E608E lockall - applymovement 4, SootopolisCity_Movement_27259E + applymovement 4, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E60D9 @@ -865,7 +865,7 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E goto_if_le SootopolisCity_EventScript_1E60CF msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT closemessage - applymovement 4, SootopolisCity_Movement_2725A2 + applymovement 4, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -882,7 +882,7 @@ SootopolisCity_EventScript_1E60D9:: @ 81E60D9 SootopolisCity_EventScript_1E60E3:: @ 81E60E3 lockall - applymovement 5, SootopolisCity_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E612D @@ -893,7 +893,7 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 goto_if_le SootopolisCity_EventScript_1E6141 msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT closemessage - applymovement 5, SootopolisCity_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -927,7 +927,7 @@ EventScript_ClosedSootopolisDoor:: @ 81E615D SootopolisCity_EventScript_1E6166:: @ 81E6166 lockall - applymovement 7, SootopolisCity_Movement_27259E + applymovement 7, Common_Movement_FacePlayer waitmovement 0 call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E61CC compare VAR_0x405E, 2 @@ -1261,13 +1261,13 @@ SootopolisCity_Movement_1E635A: @ 81E635A SootopolisCity_EventScript_1E635D:: @ 81E635D lockall - applymovement 15, SootopolisCity_Movement_27259E + applymovement 15, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E6388 msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT closemessage - applymovement 15, SootopolisCity_Movement_2725A2 + applymovement 15, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -1284,17 +1284,17 @@ SootopolisCity_EventScript_1E6393:: @ 81E6393 goto_if_eq SootopolisCity_EventScript_1E63C7 msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT closemessage - applymovement 14, SootopolisCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 msgbox SootopolisCity_Text_1E696C, MSGBOX_DEFAULT closemessage - applymovement 14, SootopolisCity_Movement_2725A2 + applymovement 14, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end SootopolisCity_EventScript_1E63C7:: @ 81E63C7 - applymovement 14, SootopolisCity_Movement_27259E + applymovement 14, Common_Movement_FacePlayer waitmovement 0 msgbox SootopolisCity_Text_1E69B8, MSGBOX_DEFAULT releaseall @@ -1302,13 +1302,13 @@ SootopolisCity_EventScript_1E63C7:: @ 81E63C7 SootopolisCity_EventScript_1E63DB:: @ 81E63DB lockall - applymovement 13, SootopolisCity_Movement_27259E + applymovement 13, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E6406 msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT closemessage - applymovement 13, SootopolisCity_Movement_2725A2 + applymovement 13, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end @@ -1321,13 +1321,13 @@ SootopolisCity_EventScript_1E6406:: @ 81E6406 SootopolisCity_EventScript_1E6411:: @ 81E6411 lockall - applymovement 12, SootopolisCity_Movement_27259E + applymovement 12, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x405E, 5 goto_if_eq SootopolisCity_EventScript_1E643C msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT closemessage - applymovement 12, SootopolisCity_Movement_2725A2 + applymovement 12, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 0eb4ffaef..a44615e9f 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -37,7 +37,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21 waitmovement 0 moveobjectoffscreen 1 - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 compare VAR_0x40C0, 1 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 388410821..8eb00337f 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -14,7 +14,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 goto_if_eq SouthernIsland_Exterior_EventScript_242A17 msgbox SouthernIsland_Exterior_Text_2A6A5D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index a3164136d..7478097bf 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -25,7 +25,7 @@ TerraCave_End_EventScript_23B0E3:: @ 823B0E3 TerraCave_End_EventScript_23B0EC:: @ 823B0EC lockall - applymovement EVENT_OBJ_ID_PLAYER, TerraCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 1, TerraCave_End_Movement_23B16E waitmovement 0 diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index c929633dd..74aa613c7 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -12,14 +12,14 @@ VerdanturfTown_EventScript_1EB575:: @ 81EB575 faceplayer goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB594 msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT - applymovement 2, VerdanturfTown_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end VerdanturfTown_EventScript_1EB594:: @ 81EB594 msgbox VerdanturfTown_Text_1EB6E0, MSGBOX_DEFAULT - applymovement 2, VerdanturfTown_Movement_2725A2 + applymovement 2, Common_Movement_FaceOriginalDirection waitmovement 0 release end diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 52aed7618..c5f318663 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -77,8 +77,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581 waitmovement 0 removeobject 2 - applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725AA - applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6 + applymovement 3, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty @@ -121,8 +121,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8 case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA - applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8 - applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A8 + applymovement 3, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 closemessage goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 2d1c63027..fdb0947d8 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 end VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 - applymovement EVENT_OBJ_ID_PLAYER, VictoryRoad_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 79747540d..8499528b7 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -328,7 +328,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5 OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 lockall - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT closemessage diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 39de44ba6..ee0e533bc 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -232,13 +232,13 @@ Route111_EventScript_28CF94:: @ 828CF94 Route111_EventScript_28CF9F:: @ 828CF9F applymovement VAR_0x8004, Route111_Movement_28D04F - applymovement VAR_0x8005, Route111_Movement_2725A6 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceUp waitmovement 0 return Route111_EventScript_28CFB1:: @ 828CFB1 applymovement VAR_0x8004, Route111_Movement_28D051 - applymovement VAR_0x8005, Route111_Movement_2725A4 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 985a2f93a..c2abe6eff 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -6,7 +6,7 @@ LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704 LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_27259E + applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 compare VAR_0x8005, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_29274D @@ -16,18 +16,18 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 closemessage setvar VAR_0x4092, 4 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763 - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp waitmovement 0 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765 LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0 waitmovement 0 releaseall @@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866 end LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceRight waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_29294B applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0 @@ -167,7 +167,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_29296C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -179,7 +179,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D end LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC - applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2725A4 + applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_29294B applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8 @@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_29296C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -206,9 +206,9 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC LittlerootTown_BrendansHouse_1F_EventScript_29294B:: @ 829294B LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B playse SE_PIN - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement VAR_0x8005, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement VAR_0x8005, Common_Movement_Delay48 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, MSGBOX_DEFAULT closemessage @@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT fadedefaultbgm @@ -446,12 +446,12 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08 compare VAR_0x8008, 1 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D13 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259E + applymovement VAR_0x8009, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_272598 + applymovement VAR_0x8009, Common_Movement_ExclamationMark waitmovement 0 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259A + applymovement VAR_0x8009, Common_Movement_Delay48 waitmovement 0 delay 20 compare VAR_0x8008, 0 @@ -585,28 +585,28 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13 LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7 waitmovement 0 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement VAR_0x800A, Common_Movement_WalkInPlaceLeft waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33 applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE waitmovement 0 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement VAR_0x800A, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -623,14 +623,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 7b8b52cd0..a26ecb4c9 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -333,7 +333,7 @@ EventScript_Pblock1_NoPokeblock: @ 8293D43 LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D lockall setvar VAR_0x8009, 2 - applymovement 10, LilycoveCity_ContestLobby_Movement_2725A2 + applymovement 10, Common_Movement_FaceOriginalDirection applymovement 3, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO @@ -398,8 +398,8 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E lockall setvar VAR_0x8008, 15 setvar VAR_0x8009, 3 - applymovement 9, LilycoveCity_ContestLobby_Movement_2725A2 - applymovement 17, LilycoveCity_ContestLobby_Movement_2725A2 + applymovement 9, Common_Movement_FaceOriginalDirection + applymovement 17, Common_Movement_FaceOriginalDirection applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO |