From 7233b2ed0a321cb52eda92bf53d25282341f9ff1 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Thu, 11 Aug 2022 12:21:28 +0800 Subject: [PATCH] Rename WalkFastest functions to WalkFaster --- asm/macros/movement.inc | 16 ++-- data/event_scripts.s | 8 +- data/maps/CeruleanCity/scripts.inc | 16 ++-- data/maps/CinnabarIsland/scripts.inc | 16 ++-- data/maps/CinnabarIsland_Gym/scripts.inc | 24 ++--- .../FiveIsland_LostCave_Room10/scripts.inc | 4 +- .../FiveIsland_MemorialPillar/scripts.inc | 8 +- .../FiveIsland_ResortGorgeous/scripts.inc | 2 +- .../scripts.inc | 16 ++-- .../FiveIsland_RocketWarehouse/scripts.inc | 16 ++-- data/maps/FourIsland/scripts.inc | 4 +- .../FourIsland_IcefallCave_Back/scripts.inc | 18 ++-- .../scripts.inc | 2 +- data/maps/IndigoPlateau_Exterior/scripts.inc | 14 +-- data/maps/MtEmber_Exterior/scripts.inc | 4 +- data/maps/MtMoon_B2F/scripts.inc | 2 +- .../OneIsland_PokemonCenter_1F/scripts.inc | 62 ++++++------- data/maps/PalletTown/scripts.inc | 18 ++-- .../PalletTown_ProfessorOaksLab/scripts.inc | 90 +++++++++---------- data/maps/PalletTown_RivalsHouse/scripts.inc | 2 +- data/maps/PewterCity/scripts.inc | 44 ++++----- data/maps/PewterCity_Museum_1F/scripts.inc | 6 +- .../maps/PokemonLeague_BrunosRoom/scripts.inc | 6 +- .../PokemonLeague_ChampionsRoom/scripts.inc | 14 +-- .../maps/PokemonLeague_HallOfFame/scripts.inc | 8 +- .../maps/PokemonLeague_LancesRoom/scripts.inc | 4 +- data/maps/PokemonTower_2F/scripts.inc | 12 +-- data/maps/PokemonTower_7F/scripts.inc | 2 +- .../maps/Route16_NorthEntrance_1F/scripts.inc | 2 +- data/maps/Route18_EastEntrance_1F/scripts.inc | 2 +- data/maps/Route22/scripts.inc | 4 +- data/maps/Route24/scripts.inc | 6 +- data/maps/Route25_SeaCottage/scripts.inc | 2 +- data/maps/Route5_SouthEntrance/scripts.inc | 2 +- data/maps/Route6_NorthEntrance/scripts.inc | 2 +- data/maps/Route7_EastEntrance/scripts.inc | 2 +- data/maps/Route8_WestEntrance/scripts.inc | 2 +- data/maps/SSAnne_2F_Corridor/scripts.inc | 8 +- data/maps/SSAnne_Exterior/scripts.inc | 2 +- data/maps/SaffronCity_Dojo/scripts.inc | 8 +- .../scripts.inc | 10 +-- data/maps/SevenIsland_House_Room1/scripts.inc | 8 +- .../scripts.inc | 10 +-- data/maps/SilphCo_11F/scripts.inc | 6 +- data/maps/SilphCo_7F/scripts.inc | 2 +- .../scripts.inc | 22 ++--- .../SixIsland_PokemonCenter_1F/scripts.inc | 4 +- data/maps/ThreeIsland/scripts.inc | 38 ++++---- data/maps/ThreeIsland_BerryForest/scripts.inc | 6 +- data/maps/TrainerTower_Elevator/scripts.inc | 2 +- .../TwoIsland_JoyfulGameCorner/scripts.inc | 22 ++--- data/maps/VermilionCity/scripts.inc | 4 +- data/maps/ViridianCity/scripts.inc | 10 +-- data/maps/ViridianCity_Mart/scripts.inc | 6 +- data/maps/ViridianCity_School/scripts.inc | 4 +- data/scripts/cable_club.inc | 2 +- data/scripts/movement.inc | 16 ++-- data/scripts/pkmn_center_nurse.inc | 4 +- data/scripts/route23.inc | 6 +- data/scripts/white_out.inc | 2 +- include/constants/event_object_movement.h | 16 ++-- .../movement_action_func_tables.h | 80 ++++++++--------- src/event_object_movement.c | 52 +++++------ src/field_player_avatar.c | 2 +- src/vs_seeker.c | 2 +- 65 files changed, 408 insertions(+), 408 deletions(-) diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index b116c72b0..dbe3811a9 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -49,18 +49,18 @@ create_movement_action walk_in_place_fast_up, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP create_movement_action walk_in_place_fast_left, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT create_movement_action walk_in_place_fast_right, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT - create_movement_action walk_in_place_fastest_down, MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN - create_movement_action walk_in_place_fastest_up, MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP - create_movement_action walk_in_place_fastest_left, MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT - create_movement_action walk_in_place_fastest_right, MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT + create_movement_action walk_in_place_faster_down, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN + create_movement_action walk_in_place_faster_up, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_UP + create_movement_action walk_in_place_faster_left, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_LEFT + create_movement_action walk_in_place_faster_right, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT create_movement_action ride_water_current_down, MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN create_movement_action ride_water_current_up, MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP create_movement_action ride_water_current_lefft, MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT create_movement_action ride_water_current_right, MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT - create_movement_action walk_fastest_down, MOVEMENT_ACTION_WALK_FASTEST_DOWN - create_movement_action walk_fastest_up, MOVEMENT_ACTION_WALK_FASTEST_UP - create_movement_action walk_fastest_left, MOVEMENT_ACTION_WALK_FASTEST_LEFT - create_movement_action walk_fastest_right, MOVEMENT_ACTION_WALK_FASTEST_RIGHT + create_movement_action walk_faster_down, MOVEMENT_ACTION_WALK_FASTER_DOWN + create_movement_action walk_faster_up, MOVEMENT_ACTION_WALK_FASTER_UP + create_movement_action walk_faster_left, MOVEMENT_ACTION_WALK_FASTER_LEFT + create_movement_action walk_faster_right, MOVEMENT_ACTION_WALK_FASTER_RIGHT create_movement_action slide_down, MOVEMENT_ACTION_SLIDE_DOWN create_movement_action slide_up, MOVEMENT_ACTION_SLIDE_UP create_movement_action slide_left, MOVEMENT_ACTION_SLIDE_LEFT diff --git a/data/event_scripts.s b/data/event_scripts.s index 004f61131..e297da365 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1175,16 +1175,16 @@ EventScript_ReleaseEnd:: @ Unused EventScript_DelayedLookAround:: lockall - applymovement VAR_0x8004, Movement_WalkInPlaceFastestLeft + applymovement VAR_0x8004, Movement_WalkInPlaceFasterLeft waitmovement 0 delay 20 - applymovement VAR_0x8004, Movement_WalkInPlaceFastestUp + applymovement VAR_0x8004, Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 - applymovement VAR_0x8004, Movement_WalkInPlaceFastestRight + applymovement VAR_0x8004, Movement_WalkInPlaceFasterRight waitmovement 0 delay 20 - applymovement VAR_0x8004, Movement_WalkInPlaceFastestDown + applymovement VAR_0x8004, Movement_WalkInPlaceFasterDown waitmovement 0 delay 20 releaseall diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 110a2de4c..916bb3122 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -105,17 +105,17 @@ CeruleanCity_EventScript_RivalStartExitRight:: CeruleanCity_Movement_PlayerWatchRivalExit:: delay_16 delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end CeruleanCity_Movement_PlayerWatchRivalExitRight:: delay_16 delay_8 - walk_in_place_fastest_left + walk_in_place_faster_left delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end CeruleanCity_Movement_RivalEnter:: @@ -211,9 +211,9 @@ CeruleanCity_EventScript_NoRoomForTM28:: CeruleanCity_EventScript_GruntTriggerTop:: lockall setvar VAR_TEMP_1, 0 - applymovement LOCALID_GRUNT, Movement_WalkInPlaceFastestUp + applymovement LOCALID_GRUNT, Movement_WalkInPlaceFasterUp waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 goto CeruleanCity_EventScript_GruntTrigger end @@ -221,9 +221,9 @@ CeruleanCity_EventScript_GruntTriggerTop:: CeruleanCity_EventScript_GruntTriggerBottom:: lockall setvar VAR_TEMP_1, 1 - applymovement LOCALID_GRUNT, Movement_WalkInPlaceFastestDown + applymovement LOCALID_GRUNT, Movement_WalkInPlaceFasterDown waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 goto CeruleanCity_EventScript_GruntTrigger end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index f4e2dc6af..9e87a4f9e 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -113,12 +113,12 @@ CinnabarIsland_EventScript_BillScene:: end CinnabarIsland_EventScript_BillFacePlayer1:: - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterUp waitmovement 0 return CinnabarIsland_EventScript_BillFacePlayer2:: - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterLeft waitmovement 0 return @@ -130,7 +130,7 @@ CinnabarIsland_EventScript_BillApproachPlayer1:: CinnabarIsland_EventScript_BillApproachPlayer2:: applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer2 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 return @@ -181,13 +181,13 @@ CinnabarIsland_EventScript_BillReturnToPokeCenter:: CinnabarIsland_Movement_PlayerWatchBillExit:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end CinnabarIsland_Movement_BillApproachDoor:: delay_16 walk_left - walk_in_place_fastest_up + walk_in_place_faster_up step_end CinnabarIsland_Movement_BillReEnterPokeCenter:: @@ -278,7 +278,7 @@ CinnabarIsland_Movement_BillFaceBoat:: delay_16 delay_16 delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right step_end CinnabarIsland_Movement_ApproachShore:: @@ -301,7 +301,7 @@ CinnabarIsland_Movement_PlayerBoardBoat:: walk_right walk_down walk_down - walk_in_place_fastest_right + walk_in_place_faster_right delay_4 walk_right delay_4 @@ -319,7 +319,7 @@ CinnabarIsland_Movement_PlayerBoardBoatFromShore:: @ Triggered when VAR_TEMP_1 is 0 CinnabarIsland_EventScript_GymDoorLocked:: lockall - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 msgbox CinnabarIsland_Text_DoorIsLocked diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 0d9a1ff0a..b277c9f34 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -276,13 +276,13 @@ CinnabarIsland_Gym_EventScript_BattleQuinn:: end CinnabarIsland_Gym_EventScript_QuinnApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_QuinnApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachRight waitmovement 0 return @@ -372,13 +372,13 @@ CinnabarIsland_Gym_Movement_AveryApproachLeft:: CinnabarIsland_Gym_Movement_AveryApproachRight:: walk_up walk_up - walk_in_place_fastest_left + walk_in_place_faster_left step_end CinnabarIsland_Gym_Movement_PlayerFaceAvery:: delay_16 delay_16 - walk_in_place_fastest_right + walk_in_place_faster_right step_end CinnabarIsland_Gym_EventScript_Quiz3Left:: @@ -437,13 +437,13 @@ CinnabarIsland_Gym_EventScript_BattleRamon:: end CinnabarIsland_Gym_EventScript_RamonApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_RamonApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachRight waitmovement 0 return @@ -513,13 +513,13 @@ CinnabarIsland_Gym_EventScript_BattleDerek:: end CinnabarIsland_Gym_EventScript_DerekApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_DerekApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachRight waitmovement 0 return @@ -589,13 +589,13 @@ CinnabarIsland_Gym_EventScript_BattleDusty:: end CinnabarIsland_Gym_EventScript_DustyApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_DustyApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachRight waitmovement 0 return @@ -665,13 +665,13 @@ CinnabarIsland_Gym_EventScript_BattleZac:: end CinnabarIsland_Gym_EventScript_ZacApproachLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachLeft waitmovement 0 return CinnabarIsland_Gym_EventScript_ZacApproachRight:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachRight waitmovement 0 return diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index d442b9b40..52871daa8 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -54,9 +54,9 @@ FiveIsland_LostCave_Room10_Movement_SelphyWander:: delay_16 walk_right delay_16 - walk_in_place_fastest_up + walk_in_place_faster_up delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end FiveIsland_LostCave_Room10_Movement_SelphyApproach:: diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index c240bdbba..f8c749218 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -13,7 +13,7 @@ FiveIsland_MemorialPillar_EventScript_MemorialMan:: waitmovement 0 delay 45 msgbox FiveIsland_MemorialPillar_Text_YourMonsLookHealthy - applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestUp + applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox FiveIsland_MemorialPillar_Text_ThisIsWhereIBuriedMyOnix release @@ -57,10 +57,10 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade:: removeitem ITEM_LEMONADE, 1 msgbox FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade closemessage - applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestRight + applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterRight waitmovement 0 delay 45 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 textcolor 0 msgbox FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis @@ -73,7 +73,7 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade:: FiveIsland_MemorialPillar_EventScript_ReceivedTM42:: msgbox FiveIsland_MemorialPillar_Text_BeGoodToYourMonsToo - applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestUp + applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterUp waitmovement 0 setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR return diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index 2e6cf1777..3b383c847 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -22,7 +22,7 @@ FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene:: textcolor 1 msgbox FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow closemessage - applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestUp + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterUp waitmovement 0 opendoor 39, 8 waitdooranim diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 9b42f9966..4b2ed3762 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -47,7 +47,7 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon:: waitmovement 0 textcolor 0 msgbox FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady - applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestUp + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterUp waitmovement 0 textcolor 1 msgbox FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation @@ -73,25 +73,25 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon:: end FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth:: - applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestDown + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterDown applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth:: applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast:: - applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterLeft applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return @@ -122,13 +122,13 @@ FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth:: walk_down walk_down walk_down - walk_in_place_fastest_right + walk_in_place_faster_right step_end FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth:: walk_left walk_left - walk_in_place_fastest_down + walk_in_place_faster_down step_end FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast:: diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 28ad89a8e..ce27220c9 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -43,7 +43,7 @@ FiveIsland_RocketWarehouse_EventScript_Computer:: FiveIsland_RocketWarehouse_EventScript_Admin2Trigger:: lockall - applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFasterLeft waitmovement 0 setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 releaseall @@ -101,7 +101,7 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2:: end FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 return @@ -149,7 +149,7 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1:: FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1:: compare PLAYER_X_POS, 27 goto_if_eq EventScript_Return - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 return @@ -164,27 +164,27 @@ FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch:: return FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch:: - applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestUp + applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterUp waitmovement 0 return FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft:: - applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterLeft waitmovement 0 return FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown:: - applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterDown waitmovement 0 return FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar:: walk_right walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch:: walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 024171e8f..b6d239f2c 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -30,7 +30,7 @@ FourIsland_OnFrame:: FourIsland_EventScript_RivalScene:: lockall textcolor 0 - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown waitmovement 0 playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_ExclamationMark @@ -68,7 +68,7 @@ FourIsland_Movement_RivalExit:: FourIsland_Movement_PlayerWatchRivalExit:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end FourIsland_EventScript_DaycareMan:: diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index b0ef13da6..7af6bd1ad 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -28,17 +28,17 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: playse SE_PIN applymovement LOCALID_LORELEI, Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterDown waitmovement 0 applymovement LOCALID_LORELEI, Movement_Delay48 waitmovement 0 textcolor 1 msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut closemessage - applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestRight + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterRight waitmovement 0 delay 18 - applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown + applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterDown waitmovement 0 delay 35 applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei @@ -82,7 +82,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: delay 50 applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 textcolor 1 msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful @@ -101,10 +101,10 @@ FourIsland_IcefallCave_Back_Movement_PlayerToRockets:: FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit:: delay_16 - walk_in_place_fastest_left + walk_in_place_faster_left delay_16 delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown:: @@ -163,7 +163,7 @@ FourIsland_IcefallCave_Back_Movement_Rocket3Exit:: FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei:: delay_16 delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right step_end FourIsland_IcefallCave_Back_Movement_UnusedWalkLeft:: @@ -182,10 +182,10 @@ FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp:: FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit:: delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right delay_16 delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer:: diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index e58fc0c65..e3213580f 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -101,7 +101,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerLeft:: FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone:: textcolor 0 msgbox FuchsiaCity_SafariZone_Entrance_Text_WelcomeToSafariZone - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 showmoneybox 0, 0, 0 msgbox FuchsiaCity_SafariZone_Entrance_Text_PlaySafariGameFor500, MSGBOX_YESNO diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 9f64c22a5..be1073c9d 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -104,12 +104,12 @@ IndigoPlateau_Exterior_Movement_PlayerExitBuilding:: IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave:: delay_16 delay_4 - walk_in_place_fastest_down + walk_in_place_faster_down step_end IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave:: delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right delay_16 delay_16 delay_16 @@ -121,7 +121,7 @@ IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave:: delay_16 delay_16 delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end IndigoPlateau_Exterior_Movement_PlayerBeginLeave:: @@ -134,7 +134,7 @@ IndigoPlateau_Exterior_Movement_PlayerBeginLeave:: step_end IndigoPlateau_Exterior_Movement_PlayerTurnAround:: - walk_in_place_fastest_down + walk_in_place_faster_down step_end IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay:: @@ -145,7 +145,7 @@ IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay:: step_end IndigoPlateau_Exterior_Movement_PlayerFaceLeague:: - walk_in_place_fastest_up + walk_in_place_faster_up step_end IndigoPlateau_Exterior_Movement_RivalLeave:: @@ -163,7 +163,7 @@ IndigoPlateau_Exterior_Movement_RivalExitBuilding:: step_end IndigoPlateau_Exterior_Movement_OakLeave:: - walk_in_place_fastest_left + walk_in_place_faster_left delay_16 delay_16 delay_16 @@ -174,7 +174,7 @@ IndigoPlateau_Exterior_Movement_OakLeave:: delay_16 delay_16 delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down delay_16 walk_down walk_down diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 770deab35..87647e5c5 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -99,14 +99,14 @@ MtEmber_Exterior_EventScript_RocketPasswordScene:: waitmovement 0 waitbuttonpress msgbox MtEmber_Exterior_Text_FirstPasswordGoldeen - applymovement LOCALID_GRUNT1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_GRUNT1, Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN applymovement LOCALID_GRUNT1, Movement_ExclamationMark waitmovement 0 applymovement LOCALID_GRUNT1, Movement_Delay48 waitmovement 0 - applymovement LOCALID_GRUNT2, Movement_WalkInPlaceFastestDown + applymovement LOCALID_GRUNT2, Movement_WalkInPlaceFasterDown waitmovement 0 call MtEmber_Exterior_EventScript_RocketsFaceDown msgbox MtEmber_Exterior_Text_SnoopsBeenListeningIn diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 7b2ca76ae..56d26d27f 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -17,7 +17,7 @@ MtMoon_B2F_EventScript_ShowFossils:: MtMoon_B2F_EventScript_MiguelTrigger:: lockall - applymovement LOCALID_MIGUEL, Movement_WalkInPlaceFastestRight + applymovement LOCALID_MIGUEL, Movement_WalkInPlaceFasterRight waitmovement 0 call MtMoon_B2F_EventScript_BattleMiguel releaseall diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 7219df19e..c0c101719 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -67,46 +67,46 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 playse SE_PIN applymovement LOCALID_CELIO, Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterLeft waitmovement 0 applymovement LOCALID_CELIO, Movement_Delay48 waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut msgbox OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestRight + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterRight waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 call_if_set FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerChamp call_if_unset FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestDown + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterDown waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioThatsReallyImpressive msgbox OneIsland_PokemonCenter_1F_Text_BillBringMeUpToSpeed - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterLeft waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioPCsCantLinkWithYours closemessage - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_OBTAIN_KEY_ITEM additem ITEM_METEORITE - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestDown + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterDown waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_OBTAIN_KEY_ITEM @@ -118,9 +118,9 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: setflag FLAG_SYS_SEVII_MAP_123 msgbox OneIsland_PokemonCenter_1F_Text_BillCatchYouLater closemessage - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterUp waitmovement 0 - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterUp waitmovement 0 setflag FLAG_SYS_PC_STORAGE_DISABLED setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 @@ -158,7 +158,7 @@ OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio:: walk_right walk_right walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio:: @@ -169,7 +169,7 @@ OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio:: walk_right walk_right walk_up - walk_in_place_fastest_right + walk_in_place_faster_right step_end @ Unused @@ -180,7 +180,7 @@ Movement_170E8F:: @ Unused Movement_170E91:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end OneIsland_PokemonCenter_1F_EventScript_Nurse:: @@ -360,7 +360,7 @@ OneIsland_PokemonCenter_1F_EventScript_CelioWaitingForRuby:: OneIsland_PokemonCenter_1F_EventScript_CelioRequestRuby:: msgbox OneIsland_PokemonCenter_1F_Text_CelioCaughtMoreMonMaybeICanBeUseful - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_YoullBeTradingFromTrainersFarAway applymovement LOCALID_CELIO, Movement_FacePlayer @@ -383,7 +383,7 @@ OneIsland_PokemonCenter_1F_Movement_CelioCheckMachine:: step_end OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine:: - walk_in_place_fastest_up + walk_in_place_faster_up walk_in_place_up delay_16 walk_in_place_up @@ -470,30 +470,30 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: call_if_eq OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom delay 10 msgbox OneIsland_PokemonCenter_1F_Text_BillWeGotItDone - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown waitmovement 0 - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_BillYouveLearnedALot msgbox OneIsland_PokemonCenter_1F_Text_CelioOhReallyEhehe closemessage - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterLeft waitmovement 0 delay 10 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 delay 15 msgbox OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto closemessage - applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown waitmovement 0 delay 15 - applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioPromiseIllShowYouAroundSometime closemessage @@ -534,7 +534,7 @@ OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom:: OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop:: walk_right walk_down - walk_in_place_fastest_right + walk_in_place_faster_right step_end OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop:: @@ -544,14 +544,14 @@ OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop:: OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom:: walk_right walk_up - walk_in_place_fastest_right + walk_in_place_faster_right step_end OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom:: walk_right walk_up walk_up - walk_in_place_fastest_right + walk_in_place_faster_right step_end @ Unused @@ -559,7 +559,7 @@ Movement_17131F:: delay_16 delay_16 delay_4 - walk_in_place_fastest_left + walk_in_place_faster_left step_end @ Unused diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index f6a1777ab..68293cf13 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -117,7 +117,7 @@ PalletTown_Movement_OakWalkToPlayersDoor:: walk_left walk_left walk_left - walk_in_place_fastest_up + walk_in_place_faster_up step_end PalletTown_Movement_OakExit:: @@ -152,7 +152,7 @@ PalletTown_Movement_OakWalkToLabFromHouse:: walk_right walk_right walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end PalletTown_Movement_PlayerWalkToLabFromHouse:: @@ -194,7 +194,7 @@ PalletTown_EventScript_OakTrigger:: waitmessage delay 85 closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN applymovement OBJ_EVENT_ID_PLAYER, Movement_ExclamationMark @@ -298,7 +298,7 @@ PalletTown_Movement_OakWalkToLabLeft:: walk_down walk_to_lab walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end PalletTown_Movement_OakWalkToLabRight:: @@ -306,7 +306,7 @@ PalletTown_Movement_OakWalkToLabRight:: walk_left walk_to_lab walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end PalletTown_Movement_OakEnterLab:: @@ -394,12 +394,12 @@ PalletTown_EventScript_SignLadyJustShowedSign:: PalletTown_Movement_SignLadyMoveOutOfWayRight:: walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PalletTown_Movement_SignLadyMoveOutOfWayLeft:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end PalletTown_EventScript_FatMan:: @@ -434,8 +434,8 @@ PalletTown_EventScript_TrainerTips:: PalletTown_EventScript_SignLadyTrigger:: lockall - applymovement LOCALID_SIGN_LADY, Movement_WalkInPlaceFastestRight - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_SIGN_LADY, Movement_WalkInPlaceFasterRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 call PalletTown_EventScript_SignLadyShowSign releaseall diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 1d6fbfbeb..04c5344dc 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -161,7 +161,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 @@ -171,18 +171,18 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth:: setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return @@ -212,7 +212,7 @@ PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest:: PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk:: walk_up walk_left - walk_in_place_fastest_up + walk_in_place_faster_up delay_16 delay_4 step_end @@ -236,7 +236,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene:: clearflag FLAG_HIDE_OAK_IN_HIS_LAB applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter waitmovement 0 - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterUp waitmovement 0 clearflag FLAG_DONT_TRANSITION_MUSIC savebgm MUS_DUMMY @@ -317,9 +317,9 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight:: PalletTown_ProfessorOaksLab_EventScript_RivalBattle:: textcolor 0 playbgm MUS_ENCOUNTER_RIVAL, 0 - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons closemessage @@ -576,17 +576,17 @@ PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid:: PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle:: delay_16 delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight:: delay_16 delay_8 - walk_in_place_fastest_left + walk_in_place_faster_left delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end PalletTown_ProfessorOaksLab_EventScript_Rival:: @@ -701,7 +701,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: delay 40 msgbox PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou closemessage - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestUp + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterUp waitmovement 0 removeobject LOCALID_POKEDEX_1 delay 10 @@ -784,7 +784,7 @@ PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest:: PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast:: delay_16 delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right step_end PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver:: @@ -823,20 +823,20 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest:: PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast:: delay_16 delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up step_end PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk:: delay_16 delay_8 - walk_in_place_fastest_left + walk_in_place_faster_left step_end PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk:: walk_up walk_left delay_16 - walk_in_place_fastest_down + walk_in_place_faster_down step_end PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth:: @@ -844,7 +844,7 @@ PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth:: walk_left walk_up delay_16 - walk_in_place_fastest_right + walk_in_place_faster_right step_end PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls:: @@ -946,27 +946,27 @@ PalletTown_ProfessorOaksLab_Movement_OakExcitedWest:: @ Unused Movement_1699AC:: walk_left - walk_in_place_fastest_down + walk_in_place_faster_down delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up delay_8 - walk_in_place_fastest_left + walk_in_place_faster_left delay_8 - walk_in_place_fastest_down + walk_in_place_faster_down delay_8 walk_right walk_right - walk_in_place_fastest_up + walk_in_place_faster_up delay_8 - walk_in_place_fastest_left + walk_in_place_faster_left delay_8 - walk_in_place_fastest_down + walk_in_place_faster_down delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up delay_8 walk_left step_end @@ -1043,7 +1043,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth:: PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest:: setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 @@ -1052,7 +1052,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest:: PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth:: setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 return @@ -1061,7 +1061,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth:: applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -1069,8 +1069,8 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest:: applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -1078,26 +1078,26 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast:: applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth:: applymovement LOCALID_RIVAL, Movement_FacePlayer - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth:: - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest:: applymovement LOCALID_RIVAL, Movement_FacePlayer - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -1113,24 +1113,24 @@ PalletTown_ProfessorOaksLab_EventScript_RivalExit:: return PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest:: delay_4 - walk_in_place_fastest_down + walk_in_place_faster_down step_end PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth:: - walk_in_place_fastest_down + walk_in_place_faster_down delay_16 delay_16 delay_16 delay_16 delay_16 delay_8 - walk_in_place_fastest_left + walk_in_place_faster_left step_end PalletTown_ProfessorOaksLab_Movement_RivalEnter:: @@ -1299,7 +1299,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle:: walk_right walk_right walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: @@ -1307,7 +1307,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: walk_right walk_right walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end PalletTown_ProfessorOaksLab_EventScript_SquirtleBall:: diff --git a/data/maps/PalletTown_RivalsHouse/scripts.inc b/data/maps/PalletTown_RivalsHouse/scripts.inc index 119ccba49..d8edec488 100644 --- a/data/maps/PalletTown_RivalsHouse/scripts.inc +++ b/data/maps/PalletTown_RivalsHouse/scripts.inc @@ -147,7 +147,7 @@ PalletTown_RivalsHouse_EventScript_GiveTownMap:: checkitemspace ITEM_TOWN_MAP, 1 compare VAR_RESULT, FALSE goto_if_eq PalletTown_RivalsHouse_EventScript_NoRoomForTownMap - applymovement LOCALID_DAISY, Movement_WalkInPlaceFastestRight + applymovement LOCALID_DAISY, Movement_WalkInPlaceFasterRight waitmovement 0 removeobject LOCALID_TOWN_MAP setvar VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 42cfcbca2..84bbd1832 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -170,7 +170,7 @@ PewterCity_Movement_PlayerWaitForGuideEast:: delay_16 delay_16 delay_4 - walk_in_place_fastest_down + walk_in_place_faster_down step_end PewterCity_Movement_PlayerWalkToGymEast:: @@ -207,14 +207,14 @@ PewterCity_Movement_PlayerWalkToGymNorth:: PewterCity_Movement_GuideMoveToLeadEast:: walk_down walk_left - walk_in_place_fastest_up + walk_in_place_faster_up walk_in_place_up step_end PewterCity_Movement_GuideWalkToGymEast:: walk_to_gym walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PewterCity_Movement_GuideMoveToLeadWest:: @@ -228,7 +228,7 @@ PewterCity_Movement_GuideWalkToGymWest:: walk_left walk_to_gym_alt walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PewterCity_Movement_GuideMoveToLeadNorth:: @@ -242,7 +242,7 @@ PewterCity_Movement_GuideWalkToGymNorth:: walk_left walk_to_gym_alt walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PewterCity_Movement_GymGuideExit:: @@ -372,7 +372,7 @@ PewterCity_Movement_PlayerWalkToGymRight:: PewterCity_Movement_GuideMoveToLeadTop:: walk_left walk_down - walk_in_place_fastest_right + walk_in_place_faster_right walk_in_place_right step_end @@ -399,14 +399,14 @@ PewterCity_Movement_GuideApproachPlayerRight:: PewterCity_Movement_GuideWalkToGymTop:: walk_to_gym walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PewterCity_Movement_GuideWalkToGymMid:: walk_left walk_to_gym walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PewterCity_Movement_GuideWalkToGymBottom:: @@ -414,7 +414,7 @@ PewterCity_Movement_GuideWalkToGymBottom:: walk_left walk_to_gym walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PewterCity_Movement_GuideWalkToGymRight:: @@ -429,7 +429,7 @@ PewterCity_Movement_GuideWalkToGymRight:: walk_up walk_to_gym_alt walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end PewterCity_EventScript_Lass:: @@ -550,13 +550,13 @@ PewterCity_Movement_PlayerWalkToMuseumNorth:: walk_up walk_to_museum delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_GuideWalkToMuseumNorth:: walk_to_museum walk_left - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_PlayerWalkToMuseumSouth:: @@ -565,7 +565,7 @@ PewterCity_Movement_PlayerWalkToMuseumSouth:: walk_left walk_to_museum_south delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_GuideWalkToMuseumSouth:: @@ -573,33 +573,33 @@ PewterCity_Movement_GuideWalkToMuseumSouth:: walk_up walk_to_museum_south walk_left - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_PlayerWalkToMuseumWest:: walk_left walk_to_museum delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_GuideWalkToMuseumWest:: walk_to_museum walk_left - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_PlayerWalkToMuseumEast:: walk_right walk_to_museum delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_GuideWalkToMuseumEast:: walk_to_museum walk_left - walk_in_place_fastest_up + walk_in_place_faster_up step_end PewterCity_Movement_MuseumGuideExit:: @@ -749,7 +749,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: return PewterCity_EventScript_AideNoticePlayer:: - applymovement LOCALID_AIDE, Movement_WalkInPlaceFastestDown + applymovement LOCALID_AIDE, Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -761,7 +761,7 @@ PewterCity_EventScript_AideApproachPlayer0:: PewterCity_EventScript_AideApproachPlayer1:: closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return @@ -769,7 +769,7 @@ PewterCity_EventScript_AideApproachPlayer2:: closemessage applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerMid waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return @@ -777,7 +777,7 @@ PewterCity_EventScript_AideApproachPlayer3:: closemessage applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerBottom waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index d73ae856c..5505ee0c1 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -42,7 +42,7 @@ PewterCity_Museum_1F_EventScript_ExplainAmber:: PewterCity_Museum_1F_EventScript_EntranceTriggerLeft:: lockall setvar VAR_TEMP_1, 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 goto PewterCity_Museum_1F_EventScript_EntranceTrigger end @@ -50,7 +50,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerLeft:: PewterCity_Museum_1F_EventScript_EntranceTriggerMid:: lockall setvar VAR_TEMP_1, 1 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 goto PewterCity_Museum_1F_EventScript_EntranceTrigger end @@ -58,7 +58,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerMid:: PewterCity_Museum_1F_EventScript_EntranceTriggerRight:: lockall setvar VAR_TEMP_1, 2 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 goto PewterCity_Museum_1F_EventScript_EntranceTrigger end diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 3d87c4520..6eee66d2c 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -109,16 +109,16 @@ PokemonLeague_BrunosRoom_EventScript_DefeatedBruno:: end PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft:: - applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_BRUNO, Movement_WalkInPlaceFasterLeft waitmovement 0 return PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight:: - applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestRight + applymovement LOCALID_BRUNO, Movement_WalkInPlaceFasterRight waitmovement 0 return PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown:: - applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BRUNO, Movement_WalkInPlaceFasterDown waitmovement 0 return diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 1c9558459..eb3577960 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -81,12 +81,12 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: specialvar VAR_RESULT, GetStarterSpecies getspeciesname 0, VAR_RESULT msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestRight - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterRight + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterLeft waitmovement 0 msgbox PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival closemessage - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown waitmovement 0 delay 20 msgbox PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe @@ -186,7 +186,7 @@ PokemonLeague_ChampionsRoom_Movement_PlayerExit:: PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter:: delay_8 - walk_in_place_fastest_down + walk_in_place_faster_down delay_16 delay_16 delay_16 @@ -194,7 +194,7 @@ PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter:: delay_16 delay_16 delay_16 - walk_in_place_fastest_left + walk_in_place_faster_left step_end PokemonLeague_ChampionsRoom_Movement_OakEnter:: @@ -208,7 +208,7 @@ PokemonLeague_ChampionsRoom_Movement_OakEnter:: walk_left walk_up walk_up - walk_in_place_fastest_down + walk_in_place_faster_down delay_16 step_end @@ -234,5 +234,5 @@ PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter:: delay_16 delay_16 delay_16 - walk_in_place_fastest_left + walk_in_place_faster_left step_end diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index c91027354..24fb5d576 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -22,14 +22,14 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom:: textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom waitmovement 0 - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestLeft - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 delay 18 msgbox PokemonLeague_HallOfFame_Text_OakCongratulations closemessage - applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestUp - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 dofieldeffect FLDEFF_HALL_OF_FAME_RECORD diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index e191cd3c6..c2b255ba2 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -159,10 +159,10 @@ PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayRight:: PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight:: walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index c20e4e1ce..b13ba2189 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -54,14 +54,14 @@ PokemonTower_2F_EventScript_Rival:: end PokemonTower_2F_EventScript_RivalFacePlayerRight:: - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestRight - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return PokemonTower_2F_EventScript_RivalFacePlayerDown:: - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return @@ -95,7 +95,7 @@ PokemonTower_2F_Movement_RivalExitRight:: walk_down walk_down walk_down - walk_in_place_fastest_right + walk_in_place_faster_right step_end PokemonTower_2F_Movement_RivalExitDown:: @@ -106,5 +106,5 @@ PokemonTower_2F_Movement_RivalExitDown:: walk_down walk_down walk_down - walk_in_place_fastest_right + walk_in_place_faster_right step_end diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 91379e132..539caf40d 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -103,7 +103,7 @@ PokemonTower_7F_Movement_Grunt1ExitLeft:: walk_right walk_down walk_down - walk_in_place_fastest_left + walk_in_place_faster_left step_end PokemonTower_7F_EventScript_Grunt2:: diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index f305b656d..610872d40 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -49,7 +49,7 @@ Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger:: textcolor 0 msgbox Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 compare VAR_0x8008, 1 diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 6d3afed96..8d1ff0ffb 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -49,7 +49,7 @@ Route18_EastEntrance_1F_EventScript_NeedBikeTrigger:: textcolor 0 msgbox Route18_EastEntrance_1F_Text_ExcuseMe closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 compare VAR_0x8008, 1 diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 5df278bae..597b110ce 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -148,7 +148,7 @@ Route22_Movement_RivalApproachBottom:: walk_right walk_right walk_right - walk_in_place_fastest_down + walk_in_place_faster_down step_end Route22_Movement_PlayerFaceRival:: @@ -160,7 +160,7 @@ Route22_Movement_PlayerFaceRival:: delay_16 delay_16 delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up step_end Route22_EventScript_LateRivalTriggerTop:: diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index dbcc621bc..3871bc55d 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -44,7 +44,7 @@ Route24_EventScript_RocketTrigger:: call_if_eq Route24_EventScript_RocketApproachPlayer compare VAR_TEMP_1, 1 call_if_eq Route24_EventScript_RocketMotionToPlayer - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 msgbox Route24_Text_JustEarnedFabulousPrize checkitemspace ITEM_NUGGET, 1 @@ -72,7 +72,7 @@ Route24_EventScript_RocketApproachPlayer:: return Route24_EventScript_RocketMotionToPlayer:: - applymovement LOCALID_ROCKET, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_ROCKET, Movement_WalkInPlaceFasterLeft waitmovement 0 return @@ -97,7 +97,7 @@ Route24_Movement_RocketApproachPlayer:: Route24_Movement_RocketWalkBackToPos:: walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end Route24_Movement_WalkDown:: diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 83173399c..dca26bb6d 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -149,7 +149,7 @@ Route25_SeaCottage_Movement_BillWalkToTeleporterSouth:: walk_up walk_up walk_left - walk_in_place_fastest_up + walk_in_place_faster_up step_end Route25_SeaCottage_Movement_BillEnterTeleporter:: diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index f9a914e26..564dab1f2 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -25,7 +25,7 @@ Route5_SouthEntrance_EventScript_GuardTriggerRight:: Route5_SouthEntrance_EventScript_GuardTrigger:: textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 goto_if_set FLAG_GOT_TEA, Route5_SouthEntrance_EventScript_GiveTea msgbox Route5_SouthEntrance_Text_ThirstyOnGuardDuty diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 6fbbfe87d..a8097bd2e 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -25,7 +25,7 @@ Route6_NorthEntrance_EventScript_GuardTriggerRight:: Route6_NorthEntrance_EventScript_GuardTrigger:: textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 goto_if_set FLAG_GOT_TEA, Route6_NorthEntrance_EventScript_GiveTea msgbox Route6_NorthEntrance_Text_ThirstyOnGuardDuty diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index 6786a148b..c76f6f9b6 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -25,7 +25,7 @@ Route7_EastEntrance_EventScript_GuardTriggerBottom:: Route7_EastEntrance_EventScript_GuardTrigger:: textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 goto_if_set FLAG_GOT_TEA, Route7_EastEntrance_EventScript_GiveTea msgbox Route7_EastEntrance_Text_ThirstyOnGuardDuty diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index f9ca6bda5..88fa7c060 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -25,7 +25,7 @@ Route8_WestEntrance_EventScript_GuardTriggerBottom:: Route8_WestEntrance_EventScript_GuardTrigger:: textcolor 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 goto_if_set FLAG_GOT_TEA, Route8_WestEntrance_EventScript_GiveTea msgbox Route8_WestEntrance_Text_ThirstyOnGuardDuty diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index c2feafdbd..61f817f86 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -28,7 +28,7 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger:: playbgm MUS_ENCOUNTER_RIVAL, 0 addobject LOCALID_RIVAL delay 10 - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown waitmovement 0 delay 20 compare VAR_TEMP_1, 0 @@ -110,7 +110,7 @@ SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight:: delay_16 delay_16 delay_16 - walk_in_place_fastest_left + walk_in_place_faster_left step_end SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid:: @@ -118,7 +118,7 @@ SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid:: delay_16 delay_16 delay_16 - walk_in_place_fastest_left + walk_in_place_faster_left step_end SSAnne_2F_Corridor_Movement_RivalApproachLeft:: @@ -132,7 +132,7 @@ SSAnne_2F_Corridor_Movement_RivalApproachMid:: walk_down walk_down walk_down - walk_in_place_fastest_right + walk_in_place_faster_right step_end SSAnne_2F_Corridor_Movement_RivalApproachRight:: diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index acd1c6aac..77e4021c8 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -40,7 +40,7 @@ SSAnne_Exterior_WalkDown:: return SSAnne_Exterior_WalkInPlaceDown:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 2cc0b23bc..634419086 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -6,7 +6,7 @@ SaffronCity_Dojo_MapScripts:: SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterLeft waitmovement 0 releaseall end @@ -14,7 +14,7 @@ SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: SaffronCity_Dojo_EventScript_TriggerMasterBattleRight:: lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestRight + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterRight waitmovement 0 releaseall end @@ -25,7 +25,7 @@ SaffronCity_Dojo_EventScript_HitmonleeBall:: goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon drawmonpic SPECIES_HITMONLEE, 10, 3 setvar VAR_TEMP_1, SPECIES_HITMONLEE - applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterUp waitmovement 0 textcolor 0 msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO @@ -47,7 +47,7 @@ SaffronCity_Dojo_EventScript_HitmonchanBall:: goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon drawmonpic SPECIES_HITMONCHAN, 10, 3 setvar VAR_TEMP_1, SPECIES_HITMONCHAN - applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp + applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterUp waitmovement 0 textcolor 0 msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 4bd8bb684..d9f22613d 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -19,7 +19,7 @@ SaffronCity_PokemonTrainerFanClub_OnFrame:: SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: lockall textcolor 1 - applymovement LOCALID_BATTLE_GIRL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BATTLE_GIRL, Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN applymovement LOCALID_BATTLE_GIRL, Movement_ExclamationMark @@ -30,7 +30,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: closemessage applymovement LOCALID_BATTLE_GIRL, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 msgbox SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 @@ -50,7 +50,7 @@ SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ Unused, leftover from RS LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: delay_8 - walk_in_place_fastest_down + walk_in_place_faster_down walk_down walk_down walk_down @@ -71,7 +71,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer:: @ Unused, leftover from RS LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer:: walk_down - walk_in_place_fastest_right + walk_in_place_faster_right step_end @ Unused, leftover from RS @@ -80,7 +80,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:: walk_fast_up walk_fast_up walk_fast_right - walk_in_place_fastest_down + walk_in_place_faster_down step_end SaffronCity_PokemonTrainerFanClub_OnTransition:: diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index e2e8c4e6b..c9fdeac82 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -41,7 +41,7 @@ SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle:: applymovement LOCALID_OLD_WOMAN, SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer waitmovement 0 moveobjectoffscreen LOCALID_OLD_WOMAN - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 call_if_eq SevenIsland_House_Room1_EventScript_BattleWonComment @@ -72,7 +72,7 @@ SevenIsland_House_Room1_Movement_PlayerReEnterRoom:: SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer:: walk_right - walk_in_place_fastest_down + walk_in_place_faster_down step_end SevenIsland_House_Room1_EventScript_OldWoman:: @@ -174,12 +174,12 @@ SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest:: SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight:: walk_right - walk_in_place_fastest_left + walk_in_place_faster_left step_end SevenIsland_House_Room1_EventScript_Box:: diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index e070f409d..9068d6ef9 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -36,7 +36,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: end SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -62,13 +62,13 @@ SevenIsland_SevaultCanyon_House_Movement_ChanseyDance:: delay_16 walk_in_place_down delay_16 - walk_in_place_fastest_right + walk_in_place_faster_right delay_4 - walk_in_place_fastest_up + walk_in_place_faster_up delay_4 - walk_in_place_fastest_left + walk_in_place_faster_left delay_4 - walk_in_place_fastest_down + walk_in_place_faster_down delay_4 step_end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 61d2ef04b..a528b30cd 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -64,7 +64,7 @@ SilphCo_11F_EventScript_GiovanniTriggerRight:: SilphCo_11F_EventScript_BattleGiovanni:: textcolor 0 - applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFastestDown + applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFasterDown waitmovement 0 delay 25 msgbox SilphCo_11F_Text_GiovanniIntro @@ -104,7 +104,7 @@ SilphCo_11F_Movement_GiovanniApproachLeft:: walk_down walk_down walk_down - walk_in_place_fastest_left + walk_in_place_faster_left step_end SilphCo_11F_Movement_GiovanniApproachRight:: @@ -119,7 +119,7 @@ SilphCo_11F_Movement_PlayerFaceGiovanni:: delay_16 delay_8 delay_4 - walk_in_place_fastest_right + walk_in_place_faster_right step_end @ Unused diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index cce9193ae..29e855a8c 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -38,7 +38,7 @@ SilphCo_7F_EventScript_RivalScene:: playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown applymovement LOCALID_RIVAL, Movement_Delay48 waitmovement 0 msgbox SilphCo_7F_Text_RivalWhatKeptYou diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index fa1b9a367..ec8311d9c 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -80,22 +80,22 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ Lots of redundant scripts below SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return @@ -122,28 +122,28 @@ SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest:: SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 return SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return @@ -174,13 +174,13 @@ SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest:: SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft:: walk_up walk_up - walk_in_place_fastest_right + walk_in_place_faster_right step_end SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow:: walk_right walk_right - walk_in_place_fastest_up + walk_in_place_faster_up step_end SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft:: @@ -236,7 +236,7 @@ SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn:: SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit:: delay_16 - walk_in_place_fastest_right + walk_in_place_faster_right step_end SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage:: diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index c67d905e3..c3dff17a6 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -23,7 +23,7 @@ SixIsland_PokemonCenter_1F_OnFrame:: SixIsland_PokemonCenter_1F_EventScript_RivalScene:: lockall textcolor 0 - applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown waitmovement 0 playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_ExclamationMark @@ -62,7 +62,7 @@ SixIsland_PokemonCenter_1F_Movement_RivalExit:: SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end SixIsland_PokemonCenter_1F_EventScript_Nurse:: diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index f75505ea2..5d4c83713 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -109,23 +109,23 @@ ThreeIsland_EventScript_BikerArgumentScene:: return ThreeIsland_EventScript_PlayerFaceUp:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 return @ Unused ThreeIsland_EventScript_PlayerFaceDown:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown waitmovement 0 return ThreeIsland_EventScript_PlayerFaceLeft:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 return ThreeIsland_EventScript_PlayerFaceRight:: - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 return @@ -221,7 +221,7 @@ ThreeIsland_EventScript_BattleBikersTriggerRight:: ThreeIsland_EventScript_BattleBikersScene:: textcolor 0 - applymovement LOCALID_BIKER1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER1, Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN applymovement LOCALID_BIKER1, Movement_ExclamationMark @@ -257,10 +257,10 @@ ThreeIsland_EventScript_BattleBikersScene:: msgbox ThreeIsland_Text_Biker3Intro setvar VAR_LAST_TALKED, LOCALID_BIKER3 trainerbattle_no_intro TRAINER_BIKER_GOON_3, ThreeIsland_Text_Biker3Defeat - applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterLeft waitmovement 0 - applymovement LOCALID_BIKER4, Movement_WalkInPlaceFastestDown - applymovement LOCALID_BIKER5, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER4, Movement_WalkInPlaceFasterDown + applymovement LOCALID_BIKER5, Movement_WalkInPlaceFasterDown waitmovement 0 msgbox ThreeIsland_Text_Biker3PostBattle closemessage @@ -295,33 +295,33 @@ ThreeIsland_EventScript_BattleBikersScene:: end ThreeIsland_EventScript_PaxtonApproachLeft:: - applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachLeft waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachMidLeft:: - applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidLeft waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachMid:: - applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMid applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachMidRight:: - applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidRight waitmovement 0 return ThreeIsland_EventScript_PaxtonApproachRight:: - applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachRight waitmovement 0 @@ -348,7 +348,7 @@ ThreeIsland_Movement_BikerApproach:: ThreeIsland_Movement_Biker1ReturnToPack:: walk_up - walk_in_place_fastest_left + walk_in_place_faster_left step_end ThreeIsland_Movement_BikerSpeak:: @@ -358,7 +358,7 @@ ThreeIsland_Movement_BikerSpeak:: ThreeIsland_Movement_PaxtonApproachLeft:: walk_down walk_left - walk_in_place_fastest_down + walk_in_place_faster_down step_end ThreeIsland_Movement_PaxtonApproachMidLeft:: @@ -368,20 +368,20 @@ ThreeIsland_Movement_PaxtonApproachMidLeft:: ThreeIsland_Movement_PaxtonApproachMid:: walk_down walk_down - walk_in_place_fastest_right + walk_in_place_faster_right step_end ThreeIsland_Movement_PlayerFacePaxton:: delay_16 delay_16 - walk_in_place_fastest_left + walk_in_place_faster_left step_end ThreeIsland_Movement_PaxtonApproachMidRight:: walk_down walk_down walk_right - walk_in_place_fastest_right + walk_in_place_faster_right step_end ThreeIsland_Movement_PaxtonApproachRight:: @@ -389,7 +389,7 @@ ThreeIsland_Movement_PaxtonApproachRight:: walk_down walk_right walk_right - walk_in_place_fastest_right + walk_in_place_faster_right step_end ThreeIsland_EventScript_Woman:: diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 8f5210dec..1f47f767f 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -49,11 +49,11 @@ ThreeIsland_BerryForest_EventScript_NoRoomForBerry:: return ThreeIsland_BerryForest_Movement_LostelleLookAround:: - walk_in_place_fastest_left + walk_in_place_faster_left delay_16 - walk_in_place_fastest_right + walk_in_place_faster_right delay_8 - walk_in_place_fastest_left + walk_in_place_faster_left step_end ThreeIsland_BerryForest_EventScript_WelcomeSign:: diff --git a/data/maps/TrainerTower_Elevator/scripts.inc b/data/maps/TrainerTower_Elevator/scripts.inc index eb871699e..d638085ad 100644 --- a/data/maps/TrainerTower_Elevator/scripts.inc +++ b/data/maps/TrainerTower_Elevator/scripts.inc @@ -71,7 +71,7 @@ TrainerTower_Elevator_EventScript_MoveElevator:: return TrainerTower_Elevator_Movement_ExitElevator:: - walk_in_place_fastest_down + walk_in_place_faster_down delay_16 walk_down walk_right diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index e2a5cdf02..265988394 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -43,7 +43,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: special BufferBigGuyOrBigGirlString msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy closemessage - applymovement LOCALID_LOSTELLE, Movement_WalkInPlaceFastestDown + applymovement LOCALID_LOSTELLE, Movement_WalkInPlaceFasterDown waitmovement 0 setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 releaseall @@ -56,7 +56,7 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo closemessage - applymovement LOCALID_DADDY, Movement_WalkInPlaceFastestDown + applymovement LOCALID_DADDY, Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_PIN applymovement LOCALID_DADDY, Movement_ExclamationMark @@ -65,7 +65,7 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: waitmovement 0 applymovement LOCALID_DADDY, Movement_171527 waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle closemessage @@ -78,12 +78,12 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: applymovement LOCALID_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland - applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestRight + applymovement LOCALID_BIKER, Movement_WalkInPlaceFasterRight waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt msgbox TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing closemessage - applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER, Movement_WalkInPlaceFasterDown waitmovement 0 playse SE_EXIT removeobject LOCALID_BIKER @@ -101,7 +101,7 @@ Movement_171520:: walk_right walk_right delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up delay_16 step_end @@ -109,20 +109,20 @@ Movement_171527:: walk_down walk_down walk_down - walk_in_place_fastest_left + walk_in_place_faster_left step_end Movement_17152C:: walk_left - walk_in_place_fastest_right + walk_in_place_faster_right step_end TwoIsland_JoyfulGameCorner_Movement_BikerLookAround:: - walk_in_place_fastest_left + walk_in_place_faster_left delay_8 - walk_in_place_fastest_right + walk_in_place_faster_right delay_8 - walk_in_place_fastest_up + walk_in_place_faster_up step_end TwoIsland_JoyfulGameCorner_EventScript_InfoMan:: diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 128850f03..1ccb10adc 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -200,8 +200,8 @@ VermilionCity_EventScript_ExitedTicketCheck:: VermilionCity_EventScript_CheckTicket:: textcolor 0 - applymovement LOCALID_FERRY_SAILOR, Movement_WalkInPlaceFastestLeft - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement LOCALID_FERRY_SAILOR, Movement_WalkInPlaceFasterLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 compare VAR_MAP_SCENE_VERMILION_CITY, 3 goto_if_eq VermilionCity_EventScript_CheckSeagallopPresentTrigger diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index c1b735a6d..def79f780 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -47,7 +47,7 @@ ViridianCity_EventScript_TryUnlockGym:: ViridianCity_EventScript_GymDoorLocked:: lockall textcolor 3 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 delay 20 msgbox ViridianCity_Text_GymDoorsAreLocked @@ -218,9 +218,9 @@ ViridianCity_Movement_WalkDown:: ViridianCity_EventScript_TutorialTriggerLeft:: lockall textcolor 0 - applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFasterLeft waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight waitmovement 0 call ViridianCity_EventScript_DoTutorialBattle release @@ -229,9 +229,9 @@ ViridianCity_EventScript_TutorialTriggerLeft:: ViridianCity_EventScript_TutorialTriggerRight:: lockall textcolor 0 - applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestRight + applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFasterRight waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft waitmovement 0 call ViridianCity_EventScript_DoTutorialBattle release diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 3142b0500..272b6a088 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -21,7 +21,7 @@ ViridianCity_Mart_OnFrame:: ViridianCity_Mart_EventScript_ParcelScene:: lockall textcolor 0 - applymovement LOCALID_CLERK, Movement_WalkInPlaceFastestDown + applymovement LOCALID_CLERK, Movement_WalkInPlaceFasterDown waitmovement 0 msgbox ViridianCity_Mart_Text_YouCameFromPallet closemessage @@ -40,7 +40,7 @@ ViridianCity_Mart_Movement_ApproachCounter:: walk_up walk_up walk_up - walk_in_place_fastest_left + walk_in_place_faster_left step_end ViridianCity_Mart_Movement_FacePlayer:: @@ -48,7 +48,7 @@ ViridianCity_Mart_Movement_FacePlayer:: delay_16 delay_16 delay_16 - walk_in_place_fastest_right + walk_in_place_faster_right step_end ViridianCity_Mart_EventScript_Clerk:: diff --git a/data/maps/ViridianCity_School/scripts.inc b/data/maps/ViridianCity_School/scripts.inc index 9b4cbcbf2..241713ca9 100644 --- a/data/maps/ViridianCity_School/scripts.inc +++ b/data/maps/ViridianCity_School/scripts.inc @@ -9,7 +9,7 @@ ViridianCity_School_EventScript_Lass:: faceplayer msgbox ViridianCity_School_Text_TryingToMemorizeNotes closemessage - applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp + applymovement LOCALID_LASS, Movement_WalkInPlaceFasterUp waitmovement 0 release end @@ -39,7 +39,7 @@ ViridianCity_School_EventScript_Notebook:: compare VAR_RESULT, NO goto_if_eq ViridianCity_School_EventScript_StopReadingNotebook msgbox ViridianCity_School_Text_NotebookFourthPage - applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp + applymovement LOCALID_LASS, Movement_WalkInPlaceFasterUp waitmovement 0 textcolor 1 msgbox ViridianCity_School_Text_HeyDontLookAtMyNotes diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 4774025e8..7f71c2e2a 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -193,7 +193,7 @@ CableClub_EventScript_PlayerExitLinkRoom:: CableClub_EventScript_Tutorial:: lockall textcolor 1 - applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp waitmovement 0 msgbox CableClub_Text_FirstTimeRightThisWay closemessage diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc index 61960d26a..52e5a2c96 100644 --- a/data/scripts/movement.inc +++ b/data/scripts/movement.inc @@ -25,20 +25,20 @@ Movement_FaceOriginalDirection:: face_original_direction step_end -Movement_WalkInPlaceFastestLeft:: - walk_in_place_fastest_left +Movement_WalkInPlaceFasterLeft:: + walk_in_place_faster_left step_end -Movement_WalkInPlaceFastestUp:: - walk_in_place_fastest_up +Movement_WalkInPlaceFasterUp:: + walk_in_place_faster_up step_end -Movement_WalkInPlaceFastestRight:: - walk_in_place_fastest_right +Movement_WalkInPlaceFasterRight:: + walk_in_place_faster_right step_end -Movement_WalkInPlaceFastestDown:: - walk_in_place_fastest_down +Movement_WalkInPlaceFasterDown:: + walk_in_place_faster_down step_end Movement_FaceRight:: diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index 3c0e6b56e..f8b8c6899 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -19,11 +19,11 @@ EventScript_PkmnCenterNurse_HealPkmn:: end EventScript_PkmnCenterNurse_TakeAndHealPkmn:: - applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestLeft + applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFasterLeft waitmovement 0 dofieldeffect FLDEFF_POKECENTER_HEAL waitfieldeffect FLDEFF_POKECENTER_HEAL - applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestDown + applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFasterDown waitmovement 0 special HealPlayerParty return diff --git a/data/scripts/route23.inc b/data/scripts/route23.inc index 3d88bc272..2d7c19130 100644 --- a/data/scripts/route23.inc +++ b/data/scripts/route23.inc @@ -116,7 +116,7 @@ Route23_EventScript_RecognizeBadge:: Route23_EventScript_BadgeGuardTrigger:: textcolor 0 - applymovement VAR_0x8009, Movement_WalkInPlaceFastestLeft + applymovement VAR_0x8009, Movement_WalkInPlaceFasterLeft waitmovement 0 switch VAR_TEMP_1 case 1, Route23_EventScript_CheckBoulderBadgeTrigger @@ -175,7 +175,7 @@ Route23_EventScript_MissingBoulderBadgeTrigger:: msgbox Text_CantLetYouPass closemessage applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown - applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown + applymovement VAR_0x8009, Movement_WalkInPlaceFasterDown waitmovement 0 releaseall end @@ -188,7 +188,7 @@ Route23_EventScript_MissingBadgeTrigger:: closemessage waitse applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown - applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown + applymovement VAR_0x8009, Movement_WalkInPlaceFasterDown waitmovement 0 releaseall end diff --git a/data/scripts/white_out.inc b/data/scripts/white_out.inc index c86341d8e..99bb2a8cc 100644 --- a/data/scripts/white_out.inc +++ b/data/scripts/white_out.inc @@ -24,7 +24,7 @@ EventScript_AfterWhiteOutHealMsg:: EventScript_AfterWhiteOutMomHeal:: lockall textcolor 1 - applymovement LOCALID_MOM, Movement_WalkInPlaceFastestDown + applymovement LOCALID_MOM, Movement_WalkInPlaceFasterDown waitmovement 0 msgbox Text_HadQuiteAnExperienceTakeRest call EventScript_OutOfCenterPartyHeal diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index 88056783e..b5ce788bc 100644 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -130,18 +130,18 @@ #define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x2A #define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x2B #define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x2C -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x2D -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x2E -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x2F -#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x30 +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN 0x2D +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_UP 0x2E +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_LEFT 0x2F +#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT 0x30 #define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x31 #define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x32 #define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x33 #define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x34 -#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x35 -#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x36 -#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x37 -#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x38 +#define MOVEMENT_ACTION_WALK_FASTER_DOWN 0x35 +#define MOVEMENT_ACTION_WALK_FASTER_UP 0x36 +#define MOVEMENT_ACTION_WALK_FASTER_LEFT 0x37 +#define MOVEMENT_ACTION_WALK_FASTER_RIGHT 0x38 #define MOVEMENT_ACTION_SLIDE_DOWN 0x39 #define MOVEMENT_ACTION_SLIDE_UP 0x3A #define MOVEMENT_ACTION_SLIDE_LEFT 0x3B diff --git a/src/data/object_events/movement_action_func_tables.h b/src/data/object_events/movement_action_func_tables.h index 51b50bb57..e1222285c 100644 --- a/src/data/object_events/movement_action_func_tables.h +++ b/src/data/object_events/movement_action_func_tables.h @@ -45,10 +45,10 @@ static bool8 MovementAction_WalkInPlaceFastDown_Step0(struct ObjectEvent *, stru static bool8 MovementAction_WalkInPlaceFastUp_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_WalkInPlaceFastRight_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkInPlaceFasterDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkInPlaceFasterUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkInPlaceFasterLeft_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkInPlaceFasterRight_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_Jump2Down_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_Jump2Down_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_Jump2Up_Step0(struct ObjectEvent *, struct Sprite *); @@ -79,14 +79,14 @@ static bool8 MovementAction_RideWaterCurrentLeft_Step0(struct ObjectEvent *, str static bool8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_RideWaterCurrentRight_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestDown_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestUp_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestLeft_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestRight_Step0(struct ObjectEvent *, struct Sprite *); -static bool8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterDown_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterDown_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterUp_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterUp_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterLeft_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterLeft_Step1(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterRight_Step0(struct ObjectEvent *, struct Sprite *); +static bool8 MovementAction_WalkFasterRight_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_SlideDown_Step0(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_SlideDown_Step1(struct ObjectEvent *, struct Sprite *); static bool8 MovementAction_SlideUp_Step0(struct ObjectEvent *, struct Sprite *); @@ -340,10 +340,10 @@ static bool8 (*const sMovementActionFuncs_RideWaterCurrentDown[])(struct ObjectE static bool8 (*const sMovementActionFuncs_RideWaterCurrentUp[])(struct ObjectEvent *, struct Sprite *); static bool8 (*const sMovementActionFuncs_RideWaterCurrentLeft[])(struct ObjectEvent *, struct Sprite *); static bool8 (*const sMovementActionFuncs_RideWaterCurrentRight[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_WalkFastestDown[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_WalkFastestUp[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_WalkFastestLeft[])(struct ObjectEvent *, struct Sprite *); -static bool8 (*const sMovementActionFuncs_WalkFastestRight[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkFasterDown[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkFasterUp[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkFasterLeft[])(struct ObjectEvent *, struct Sprite *); +static bool8 (*const sMovementActionFuncs_WalkFasterRight[])(struct ObjectEvent *, struct Sprite *); static bool8 (*const sMovementActionFuncs_SlideDown[])(struct ObjectEvent *, struct Sprite *); static bool8 (*const sMovementActionFuncs_SlideUp[])(struct ObjectEvent *, struct Sprite *); static bool8 (*const sMovementActionFuncs_SlideLeft[])(struct ObjectEvent *, struct Sprite *); @@ -508,18 +508,18 @@ static bool8 (*const *const sMovementActionFuncs[])(struct ObjectEvent *, struct [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP] = sMovementActionFuncs_WalkInPlaceFastUp, [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT] = sMovementActionFuncs_WalkInPlaceFastLeft, [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT] = sMovementActionFuncs_WalkInPlaceFastRight, - [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN] = sMovementActionFuncs_WalkInPlaceFasterDown, - [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP] = sMovementActionFuncs_WalkInPlaceFasterUp, - [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT] = sMovementActionFuncs_WalkInPlaceFasterLeft, - [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT] = sMovementActionFuncs_WalkInPlaceFasterRight, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN] = sMovementActionFuncs_WalkInPlaceFasterDown, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_UP] = sMovementActionFuncs_WalkInPlaceFasterUp, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_LEFT] = sMovementActionFuncs_WalkInPlaceFasterLeft, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT] = sMovementActionFuncs_WalkInPlaceFasterRight, [MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN] = sMovementActionFuncs_RideWaterCurrentDown, [MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP] = sMovementActionFuncs_RideWaterCurrentUp, [MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT] = sMovementActionFuncs_RideWaterCurrentLeft, [MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT] = sMovementActionFuncs_RideWaterCurrentRight, - [MOVEMENT_ACTION_WALK_FASTEST_DOWN] = sMovementActionFuncs_WalkFastestDown, - [MOVEMENT_ACTION_WALK_FASTEST_UP] = sMovementActionFuncs_WalkFastestUp, - [MOVEMENT_ACTION_WALK_FASTEST_LEFT] = sMovementActionFuncs_WalkFastestLeft, - [MOVEMENT_ACTION_WALK_FASTEST_RIGHT] = sMovementActionFuncs_WalkFastestRight, + [MOVEMENT_ACTION_WALK_FASTER_DOWN] = sMovementActionFuncs_WalkFasterDown, + [MOVEMENT_ACTION_WALK_FASTER_UP] = sMovementActionFuncs_WalkFasterUp, + [MOVEMENT_ACTION_WALK_FASTER_LEFT] = sMovementActionFuncs_WalkFasterLeft, + [MOVEMENT_ACTION_WALK_FASTER_RIGHT] = sMovementActionFuncs_WalkFasterRight, [MOVEMENT_ACTION_SLIDE_DOWN] = sMovementActionFuncs_SlideDown, [MOVEMENT_ACTION_SLIDE_UP] = sMovementActionFuncs_SlideUp, [MOVEMENT_ACTION_SLIDE_LEFT] = sMovementActionFuncs_SlideLeft, @@ -966,25 +966,25 @@ static bool8 (*const sMovementActionFuncs_WalkInPlaceFastRight[])(struct ObjectE }; static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterDown[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestDown_Step0, + MovementAction_WalkInPlaceFasterDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterUp[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestUp_Step0, + MovementAction_WalkInPlaceFasterUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterLeft[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestLeft_Step0, + MovementAction_WalkInPlaceFasterLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; static bool8 (*const sMovementActionFuncs_WalkInPlaceFasterRight[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestRight_Step0, + MovementAction_WalkInPlaceFasterRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; @@ -1013,27 +1013,27 @@ static bool8 (*const sMovementActionFuncs_RideWaterCurrentRight[])(struct Object MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_WalkFastestDown[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkFastestDown_Step0, - MovementAction_WalkFastestDown_Step1, +static bool8 (*const sMovementActionFuncs_WalkFasterDown[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkFasterDown_Step0, + MovementAction_WalkFasterDown_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_WalkFastestUp[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkFastestUp_Step0, - MovementAction_WalkFastestUp_Step1, +static bool8 (*const sMovementActionFuncs_WalkFasterUp[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkFasterUp_Step0, + MovementAction_WalkFasterUp_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_WalkFastestLeft[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkFastestLeft_Step0, - MovementAction_WalkFastestLeft_Step1, +static bool8 (*const sMovementActionFuncs_WalkFasterLeft[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkFasterLeft_Step0, + MovementAction_WalkFasterLeft_Step1, MovementAction_PauseSpriteAnim, }; -static bool8 (*const sMovementActionFuncs_WalkFastestRight[])(struct ObjectEvent *, struct Sprite *) = { - MovementAction_WalkFastestRight_Step0, - MovementAction_WalkFastestRight_Step1, +static bool8 (*const sMovementActionFuncs_WalkFasterRight[])(struct ObjectEvent *, struct Sprite *) = { + MovementAction_WalkFasterRight_Step0, + MovementAction_WalkFasterRight_Step1, MovementAction_PauseSpriteAnim, }; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index f04c12cec..92091244d 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -969,11 +969,11 @@ static const u8 gUnknown_83A6514[] = { }; static const u8 gUnknown_83A6519[] = { - [DIR_NONE] = MOVEMENT_ACTION_WALK_FASTEST_DOWN, - [DIR_SOUTH] = MOVEMENT_ACTION_WALK_FASTEST_DOWN, - [DIR_NORTH] = MOVEMENT_ACTION_WALK_FASTEST_UP, - [DIR_WEST] = MOVEMENT_ACTION_WALK_FASTEST_LEFT, - [DIR_EAST] = MOVEMENT_ACTION_WALK_FASTEST_RIGHT, + [DIR_NONE] = MOVEMENT_ACTION_WALK_FASTER_DOWN, + [DIR_SOUTH] = MOVEMENT_ACTION_WALK_FASTER_DOWN, + [DIR_NORTH] = MOVEMENT_ACTION_WALK_FASTER_UP, + [DIR_WEST] = MOVEMENT_ACTION_WALK_FASTER_LEFT, + [DIR_EAST] = MOVEMENT_ACTION_WALK_FASTER_RIGHT, }; static const u8 gUnknown_83A651E[] = { @@ -1081,11 +1081,11 @@ static const u8 gUnknown_83A655A[] = { }; static const u8 gUnknown_83A655F[] = { - [DIR_NONE] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, - [DIR_SOUTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, - [DIR_NORTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP, - [DIR_WEST] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT, - [DIR_EAST] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT, + [DIR_NONE] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN, + [DIR_SOUTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN, + [DIR_NORTH] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_UP, + [DIR_WEST] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_LEFT, + [DIR_EAST] = MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT, }; static const u8 gUnknown_83A6564[] = { @@ -6260,25 +6260,25 @@ static bool8 MovementAction_WalkInPlaceFastRight_Step0(struct ObjectEvent *objec return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkInPlaceFasterDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMoveInPlace(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4); return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkInPlaceFasterUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMoveInPlace(objectEvent, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4); return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkInPlaceFasterLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMoveInPlace(objectEvent, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4); return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkInPlaceFasterRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMoveInPlace(objectEvent, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4); return MovementAction_WalkInPlace_Step1(objectEvent, sprite); @@ -6348,13 +6348,13 @@ static bool8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *obje return FALSE; } -static bool8 MovementAction_WalkFastestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMovementNormal(objectEvent, sprite, DIR_SOUTH, MOVE_SPEED_FASTER); - return MovementAction_WalkFastestDown_Step1(objectEvent, sprite); + return MovementAction_WalkFasterDown_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateMovementNormal(objectEvent, sprite)) { @@ -6364,13 +6364,13 @@ static bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *objectEven return FALSE; } -static bool8 MovementAction_WalkFastestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMovementNormal(objectEvent, sprite, DIR_NORTH, MOVE_SPEED_FASTER); - return MovementAction_WalkFastestUp_Step1(objectEvent, sprite); + return MovementAction_WalkFasterUp_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateMovementNormal(objectEvent, sprite)) { @@ -6380,13 +6380,13 @@ static bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *objectEvent, return FALSE; } -static bool8 MovementAction_WalkFastestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMovementNormal(objectEvent, sprite, DIR_WEST, MOVE_SPEED_FASTER); - return MovementAction_WalkFastestLeft_Step1(objectEvent, sprite); + return MovementAction_WalkFasterLeft_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateMovementNormal(objectEvent, sprite)) { @@ -6396,13 +6396,13 @@ static bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *objectEven return FALSE; } -static bool8 MovementAction_WalkFastestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { InitMovementNormal(objectEvent, sprite, DIR_EAST, MOVE_SPEED_FASTER); - return MovementAction_WalkFastestRight_Step1(objectEvent, sprite); + return MovementAction_WalkFasterRight_Step1(objectEvent, sprite); } -static bool8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static bool8 MovementAction_WalkFasterRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (UpdateMovementNormal(objectEvent, sprite)) { diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index b65942866..fd1c67ccd 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -767,7 +767,7 @@ static bool8 PlayerAnimIsMultiFrameStationary(void) if (movementActionId <= MOVEMENT_ACTION_FACE_RIGHT_FAST || (movementActionId >= MOVEMENT_ACTION_DELAY_1 && movementActionId <= MOVEMENT_ACTION_DELAY_16) - || (movementActionId >= MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN && movementActionId <= MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT) + || (movementActionId >= MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN && movementActionId <= MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT) || (movementActionId >= MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN && movementActionId <= MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT) || (movementActionId >= MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN && movementActionId <= MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT)) return TRUE; diff --git a/src/vs_seeker.c b/src/vs_seeker.c index c95c0da52..7ab569e57 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -575,7 +575,7 @@ static const u8 sMovementScript_TrainerNoRematch[] = { }; static const u8 sMovementScript_TrainerRematch[] = { - MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, + MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN, MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK, MOVEMENT_ACTION_STEP_END };