diff options
93 files changed, 609 insertions, 607 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 8ac608327..4d96e181c 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1127,7 +1127,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 nurse_joy_bow delay_4 - end_movement + step_end Std_ObtainItem: @ 819FDF7 additem VAR_0x8000, VAR_0x8001 @@ -1877,7 +1877,7 @@ SlateportCity_Harbor_Movement_1A041C:: @ 81A041C walk_right walk_right walk_right - end_movement + step_end PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN @@ -1913,7 +1913,7 @@ EventScript_1A0457: @ unreferenced? Movement_1A047A: walk_up - end_movement + step_end BattleTower_Outside_EventScript_1A047C:: @ 81A047C SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C @@ -2159,7 +2159,7 @@ Route120_Movement_1A0662:: @ 81A0662 set_invisible delay_16 set_visible - end_movement + step_end LittlerootTown_ProfessorBirchsLab_EventScript_1A0678:: @ 81A0678 MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678 @@ -2258,7 +2258,7 @@ EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA SlateportCity_Movement_1A0831:: @ 81A0831 emote_question_mark - end_movement + step_end AquaHideout_B2F_Movement_1A0833:: @ 81A0833 EverGrandeCity_ChampionsRoom_Movement_1A0833:: @ 81A0833 @@ -2288,7 +2288,7 @@ SlateportCity_OceanicMuseum_1F_Movement_1A0833:: @ 81A0833 SlateportCity_PokemonFanClub_Movement_1A0833:: @ 81A0833 SootopolisCity_Movement_1A0833:: @ 81A0833 emote_exclamation_mark - end_movement + step_end EverGrandeCity_ChampionsRoom_Movement_1A0835:: @ 81A0835 LavaridgeTown_Movement_1A0835:: @ 81A0835 @@ -2317,7 +2317,7 @@ SootopolisCity_Movement_1A0835:: @ 81A0835 delay_16 delay_16 delay_16 - end_movement + step_end AquaHideout_B2F_Movement_1A0839:: @ 81A0839 EverGrandeCity_PokemonLeague_Movement_1A0839:: @ 81A0839 @@ -2350,11 +2350,11 @@ SlateportCity_ContestLobby_Movement_1A0839:: @ 81A0839 SlateportCity_Movement_1A0839:: @ 81A0839 SlateportCity_SternsShipyard_1F_Movement_1A0839:: @ 81A0839 face_player - end_movement + step_end @ 81A083B face_away_player - end_movement + step_end EverGrandeCity_PokemonLeague_Movement_1A083D:: @ 81A083D LilycoveCity_ContestHall_Movement_1A083D:: @ 81A083D @@ -2386,7 +2386,7 @@ SlateportCity_OceanicMuseum_2F_Movement_1A083D:: @ 81A083D SlateportCity_SternsShipyard_1F_Movement_1A083D:: @ 81A083D VerdanturfTown_Movement_1A083D:: @ 81A083D face_original_direction - end_movement + step_end Movement_1A083F:: @ 81A083F DewfordTown_Hall_Movement_1A083F:: @ 81A083F @@ -2420,7 +2420,7 @@ SlateportCity_OceanicMuseum_2F_Movement_1A083F:: @ 81A083F SootopolisCity_Movement_1A083F:: @ 81A083F VictoryRoad_1F_Movement_1A083F:: @ 81A083F walk_in_place_fastest_left - end_movement + step_end AquaHideout_B2F_Movement_1A0841:: @ 81A0841 CaveOfOrigin_B4F_Movement_1A0841:: @ 81A0841 @@ -2451,7 +2451,7 @@ SlateportCity_Harbor_Movement_1A0841:: @ 81A0841 SlateportCity_Movement_1A0841:: @ 81A0841 SlateportCity_OceanicMuseum_2F_Movement_1A0841:: @ 81A0841 walk_in_place_fastest_up - end_movement + step_end AquaHideout_B2F_Movement_1A0843:: @ 81A0843 DewfordTown_Hall_Movement_1A0843:: @ 81A0843 @@ -2483,7 +2483,7 @@ SlateportCity_OceanicMuseum_1F_Movement_1A0843:: @ 81A0843 SlateportCity_OceanicMuseum_2F_Movement_1A0843:: @ 81A0843 SootopolisCity_Movement_1A0843:: @ 81A0843 walk_in_place_fastest_right - end_movement + step_end BattleTower_Outside_Movement_1A0845:: @ 81A0845 DewfordTown_Hall_Movement_1A0845:: @ 81A0845 @@ -2515,7 +2515,7 @@ SlateportCity_OceanicMuseum_2F_Movement_1A0845:: @ 81A0845 SootopolisCity_Movement_1A0845:: @ 81A0845 SouthernIsland_Exterior_Movement_1A0845:: @ 81A0845 walk_in_place_fastest_down - end_movement + step_end EverGrandeCity_SidneysRoom_Movement_1A0847:: @ 81A0847 walk_up @@ -2524,28 +2524,28 @@ EverGrandeCity_SidneysRoom_Movement_1A0847:: @ 81A0847 walk_up walk_up walk_up - end_movement + step_end EverGrandeCity_ChampionsRoom_Movement_1A084E:: @ 81A084E walk_up walk_up walk_up walk_up - end_movement + step_end EverGrandeCity_SidneysRoom_Movement_1A0853:: @ 81A0853 delay_16 delay_16 - end_movement + step_end Route110_TrickHouseEntrance_Movement_1A0856:: @ 81A0856 walk_up - end_movement + step_end @ 81A0858 walk_up walk_up - end_movement + step_end PictureBookShelfScript:: @ 81A085B msgbox PictureBookShelfText, MSGBOX_SIGN @@ -3399,7 +3399,7 @@ SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08 SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 walk_up walk_up - end_movement + step_end gUnknown_081A2E14:: @ 81A2E14 lockall @@ -4540,7 +4540,7 @@ gUnknown_081C6BDE:: @ 81C6BDE GraniteCave_B1F_Movement_1C6BF7:: @ 81C6BF7 set_invisible - end_movement + step_end @ 81C6BF9 msgbox Text_1C6C2B, MSGBOX_NPC diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc index 7efd06e84..001754c9c 100644 --- a/data-de/field_move_scripts.inc +++ b/data-de/field_move_scripts.inc @@ -33,7 +33,7 @@ DoTreeCutMovement: @ 81B0E21 TreeCutMovement: @ 81B0E30 cut_tree - end_movement + step_end CannotUseCut: @ 81B0E32 msgbox CannotUseCutText, MSGBOX_SIGN @@ -104,7 +104,7 @@ DoRockSmashMovement_Done: @ 81B0F3A RockSmashMovement: @ 81B0F3C rock_smash_break - end_movement + step_end CannotUseRockSmash: @ 81B0F3E msgbox CannotUseRockSmashText, MSGBOX_SIGN diff --git a/data/event_scripts.s b/data/event_scripts.s index 9e1b02e2d..0d2f8fe2e 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1126,7 +1126,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 nurse_joy_bow delay_4 - end_movement + step_end Std_ObtainItem: @ 819FDF7 additem VAR_0x8000, VAR_0x8001 @@ -1876,7 +1876,7 @@ SlateportCity_Harbor_Movement_1A041C:: @ 81A041C walk_right walk_right walk_right - end_movement + step_end PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN @@ -1912,7 +1912,7 @@ EventScript_1A0457: @ unreferenced? Movement_1A047A: walk_up - end_movement + step_end BattleTower_Outside_EventScript_1A047C:: @ 81A047C SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C @@ -2158,7 +2158,7 @@ Route120_Movement_1A0662:: @ 81A0662 set_invisible delay_16 set_visible - end_movement + step_end LittlerootTown_ProfessorBirchsLab_EventScript_1A0678:: @ 81A0678 MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678 @@ -2257,7 +2257,7 @@ EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA SlateportCity_Movement_1A0831:: @ 81A0831 emote_question_mark - end_movement + step_end AquaHideout_B2F_Movement_1A0833:: @ 81A0833 EverGrandeCity_ChampionsRoom_Movement_1A0833:: @ 81A0833 @@ -2287,7 +2287,7 @@ SlateportCity_OceanicMuseum_1F_Movement_1A0833:: @ 81A0833 SlateportCity_PokemonFanClub_Movement_1A0833:: @ 81A0833 SootopolisCity_Movement_1A0833:: @ 81A0833 emote_exclamation_mark - end_movement + step_end EverGrandeCity_ChampionsRoom_Movement_1A0835:: @ 81A0835 LavaridgeTown_Movement_1A0835:: @ 81A0835 @@ -2316,7 +2316,7 @@ SootopolisCity_Movement_1A0835:: @ 81A0835 delay_16 delay_16 delay_16 - end_movement + step_end AquaHideout_B2F_Movement_1A0839:: @ 81A0839 EverGrandeCity_PokemonLeague_Movement_1A0839:: @ 81A0839 @@ -2349,11 +2349,11 @@ SlateportCity_ContestLobby_Movement_1A0839:: @ 81A0839 SlateportCity_Movement_1A0839:: @ 81A0839 SlateportCity_SternsShipyard_1F_Movement_1A0839:: @ 81A0839 face_player - end_movement + step_end @ 81A083B face_away_player - end_movement + step_end EverGrandeCity_PokemonLeague_Movement_1A083D:: @ 81A083D LilycoveCity_ContestHall_Movement_1A083D:: @ 81A083D @@ -2385,7 +2385,7 @@ SlateportCity_OceanicMuseum_2F_Movement_1A083D:: @ 81A083D SlateportCity_SternsShipyard_1F_Movement_1A083D:: @ 81A083D VerdanturfTown_Movement_1A083D:: @ 81A083D face_original_direction - end_movement + step_end Movement_1A083F:: @ 81A083F DewfordTown_Hall_Movement_1A083F:: @ 81A083F @@ -2419,7 +2419,7 @@ SlateportCity_OceanicMuseum_2F_Movement_1A083F:: @ 81A083F SootopolisCity_Movement_1A083F:: @ 81A083F VictoryRoad_1F_Movement_1A083F:: @ 81A083F walk_in_place_fastest_left - end_movement + step_end AquaHideout_B2F_Movement_1A0841:: @ 81A0841 CaveOfOrigin_B4F_Movement_1A0841:: @ 81A0841 @@ -2450,7 +2450,7 @@ SlateportCity_Harbor_Movement_1A0841:: @ 81A0841 SlateportCity_Movement_1A0841:: @ 81A0841 SlateportCity_OceanicMuseum_2F_Movement_1A0841:: @ 81A0841 walk_in_place_fastest_up - end_movement + step_end AquaHideout_B2F_Movement_1A0843:: @ 81A0843 DewfordTown_Hall_Movement_1A0843:: @ 81A0843 @@ -2482,7 +2482,7 @@ SlateportCity_OceanicMuseum_1F_Movement_1A0843:: @ 81A0843 SlateportCity_OceanicMuseum_2F_Movement_1A0843:: @ 81A0843 SootopolisCity_Movement_1A0843:: @ 81A0843 walk_in_place_fastest_right - end_movement + step_end BattleTower_Outside_Movement_1A0845:: @ 81A0845 DewfordTown_Hall_Movement_1A0845:: @ 81A0845 @@ -2514,7 +2514,7 @@ SlateportCity_OceanicMuseum_2F_Movement_1A0845:: @ 81A0845 SootopolisCity_Movement_1A0845:: @ 81A0845 SouthernIsland_Exterior_Movement_1A0845:: @ 81A0845 walk_in_place_fastest_down - end_movement + step_end EverGrandeCity_SidneysRoom_Movement_1A0847:: @ 81A0847 walk_up @@ -2523,28 +2523,28 @@ EverGrandeCity_SidneysRoom_Movement_1A0847:: @ 81A0847 walk_up walk_up walk_up - end_movement + step_end EverGrandeCity_ChampionsRoom_Movement_1A084E:: @ 81A084E walk_up walk_up walk_up walk_up - end_movement + step_end EverGrandeCity_SidneysRoom_Movement_1A0853:: @ 81A0853 delay_16 delay_16 - end_movement + step_end Route110_TrickHouseEntrance_Movement_1A0856:: @ 81A0856 walk_up - end_movement + step_end @ 81A0858 walk_up walk_up - end_movement + step_end PictureBookShelfScript:: @ 81A085B msgbox PictureBookShelfText, MSGBOX_SIGN @@ -3383,7 +3383,7 @@ SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08 SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 walk_up walk_up - end_movement + step_end gUnknown_081A2E14:: @ 81A2E14 lockall @@ -4513,7 +4513,7 @@ gUnknown_081C6BDE:: @ 81C6BDE GraniteCave_B1F_Movement_1C6BF7:: @ 81C6BF7 set_invisible - end_movement + step_end @ 81C6BF9 msgbox Text_1C6C2B, MSGBOX_NPC diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index b412af095..a0ba1cf66 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -33,7 +33,7 @@ DoTreeCutMovement: @ 81B0E21 TreeCutMovement: @ 81B0E30 cut_tree - end_movement + step_end CannotUseCut: @ 81B0E32 msgbox CannotUseCutText, MSGBOX_SIGN @@ -101,7 +101,7 @@ DoRockSmashMovement_Done: @ 81B0F3A RockSmashMovement: @ 81B0F3C rock_smash_break - end_movement + step_end CannotUseRockSmash: @ 81B0F3E msgbox CannotUseRockSmashText, MSGBOX_SIGN diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 071c1cb31..1b71cd138 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -74,14 +74,14 @@ AquaHideout_B2F_Movement_15D958:: @ 815D958 walk_left walk_left walk_left - end_movement + step_end AquaHideout_B2F_Movement_15D95D:: @ 815D95D walk_right walk_right walk_right walk_right - end_movement + step_end AquaHideout_B2F_EventScript_15D962:: @ 815D962 MagmaHideout_B2F_EventScript_15D962:: @ 815D962 diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc index 039c5fa3b..96d43747b 100644 --- a/data/maps/BattleTower_BattleRoom/scripts.inc +++ b/data/maps/BattleTower_BattleRoom/scripts.inc @@ -124,15 +124,15 @@ BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7 walk_up walk_up face_right - end_movement + step_end BattleTower_BattleRoom_Movement_160ABC:: @ 8160ABC face_down - end_movement + step_end BattleTower_BattleRoom_Movement_160ABE:: @ 8160ABE face_right - end_movement + step_end BattleTower_BattleRoom_Movement_160AC0:: @ 8160AC0 walk_down @@ -140,21 +140,21 @@ BattleTower_BattleRoom_Movement_160AC0:: @ 8160AC0 walk_down walk_down face_left - end_movement + step_end BattleTower_BattleRoom_Movement_160AC6:: @ 8160AC6 walk_up walk_up walk_up walk_up - end_movement + step_end BattleTower_BattleRoom_Movement_160ACB:: @ 8160ACB walk_right walk_right walk_right walk_up - end_movement + step_end BattleTower_BattleRoom_Movement_160AD0:: @ 8160AD0 walk_down @@ -162,4 +162,4 @@ BattleTower_BattleRoom_Movement_160AD0:: @ 8160AD0 walk_left walk_left face_right - end_movement + step_end diff --git a/data/maps/BattleTower_Corridor/scripts.inc b/data/maps/BattleTower_Corridor/scripts.inc index 8e6296913..aeb140a45 100644 --- a/data/maps/BattleTower_Corridor/scripts.inc +++ b/data/maps/BattleTower_Corridor/scripts.inc @@ -55,4 +55,4 @@ BattleTower_Corridor_Movement_1608D5:: @ 81608D5 walk_right walk_up set_invisible - end_movement + step_end diff --git a/data/maps/BattleTower_Elevator/scripts.inc b/data/maps/BattleTower_Elevator/scripts.inc index ff2d947dc..4839cf65e 100644 --- a/data/maps/BattleTower_Elevator/scripts.inc +++ b/data/maps/BattleTower_Elevator/scripts.inc @@ -36,22 +36,22 @@ BattleTower_Elevator_Movement_160835:: @ 8160835 walk_up walk_right face_down - end_movement + step_end BattleTower_Elevator_Movement_160839:: @ 8160839 walk_up walk_up face_down - end_movement + step_end BattleTower_Elevator_Movement_16083D:: @ 816083D walk_down walk_down set_invisible - end_movement + step_end BattleTower_Elevator_Movement_160841:: @ 8160841 walk_right walk_down walk_down - end_movement + step_end diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc index f03bb2a52..5e8e142ad 100644 --- a/data/maps/BattleTower_Lobby/scripts.inc +++ b/data/maps/BattleTower_Lobby/scripts.inc @@ -307,18 +307,18 @@ BattleTower_Lobby_Movement_160693:: @ 8160693 walk_up walk_up walk_up - end_movement + step_end BattleTower_Lobby_Movement_160697:: @ 8160697 walk_up set_invisible - end_movement + step_end BattleTower_Lobby_Movement_16069A:: @ 816069A walk_up walk_up set_invisible - end_movement + step_end @ 816069E walk_fast_up @@ -327,7 +327,7 @@ BattleTower_Lobby_Movement_16069A:: @ 816069A walk_fast_up walk_fast_up set_invisible - end_movement + step_end BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 lock diff --git a/data/maps/CaveOfOrigin_B4F/scripts.inc b/data/maps/CaveOfOrigin_B4F/scripts.inc index d21093879..5ff159e31 100644 --- a/data/maps/CaveOfOrigin_B4F/scripts.inc +++ b/data/maps/CaveOfOrigin_B4F/scripts.inc @@ -90,8 +90,8 @@ CaveOfOrigin_B4F_EventScript_15DE73:: @ 815DE73 CaveOfOrigin_B4F_Movement_15DE7D:: @ 815DE7D init_affine_anim - walk_down_affine_0 + walk_down_start_affine delay_16 delay_16 - walk_down_affine_1 - end_movement + walk_down_affine + step_end diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 0097ba16f..96c4f8e07 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -387,7 +387,7 @@ DewfordTown_Movement_14E293:: @ 814E293 walk_up walk_up walk_up - end_movement + step_end DewfordTown_Movement_14E356:: @ 814E356 walk_right @@ -561,34 +561,34 @@ DewfordTown_Movement_14E356:: @ 814E356 walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end DewfordTown_Movement_14E402:: @ 814E402 walk_right walk_up - end_movement + step_end DewfordTown_Movement_14E405:: @ 814E405 walk_up walk_up walk_up - end_movement + step_end DewfordTown_Movement_14E409:: @ 814E409 walk_up walk_up walk_up walk_in_place_fastest_down - end_movement + step_end DewfordTown_Movement_14E40E:: @ 814E40E walk_up - end_movement + step_end DewfordTown_Movement_14E410:: @ 814E410 walk_up walk_up - end_movement + step_end DewfordTown_EventScript_14E413:: @ 814E413 lock diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 1c564f7ec..b502b95d2 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -242,11 +242,11 @@ DewfordTown_Hall_EventScript_153583:: @ 8153583 DewfordTown_Hall_Movement_153599:: @ 8153599 walk_in_place_left - end_movement + step_end DewfordTown_Hall_Movement_15359B:: @ 815359B walk_in_place_right - end_movement + step_end DewfordTown_Hall_EventScript_15359D:: @ 815359D lock diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 2806eafd4..678f09714 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -35,7 +35,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 walk_up walk_up - end_movement + step_end EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 playbgm MUS_DAIGO, FALSE @@ -165,7 +165,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B9D2:: @ 815B9D2 EverGrandeCity_ChampionsRoom_Movement_15B9DD:: @ 815B9DD walk_up walk_up - end_movement + step_end EverGrandeCity_ChampionsRoom_Movement_15B9E0:: @ 815B9E0 walk_up @@ -173,7 +173,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B9E0:: @ 815B9E0 walk_up delay_8 set_invisible - end_movement + step_end EverGrandeCity_ChampionsRoom_Movement_15B9E6:: @ 815B9E6 walk_up @@ -184,7 +184,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B9E6:: @ 815B9E6 walk_left walk_up walk_in_place_fastest_right - end_movement + step_end EverGrandeCity_ChampionsRoom_Movement_15B9EF:: @ 815B9EF walk_in_place_fastest_up @@ -195,24 +195,24 @@ EverGrandeCity_ChampionsRoom_Movement_15B9EF:: @ 815B9EF delay_8 walk_in_place_fastest_right delay_16 - end_movement + step_end EverGrandeCity_ChampionsRoom_Movement_15B9F8:: @ 815B9F8 walk_right walk_up - end_movement + step_end EverGrandeCity_ChampionsRoom_Movement_15B9FB:: @ 815B9FB walk_up walk_up walk_in_place_fastest_down - end_movement + step_end EverGrandeCity_ChampionsRoom_Movement_15B9FF:: @ 815B9FF walk_up delay_8 set_invisible - end_movement + step_end EverGrandeCity_ChampionsRoom_Movement_15BA03:: @ 815BA03 walk_up @@ -223,4 +223,4 @@ EverGrandeCity_ChampionsRoom_Movement_15BA03:: @ 815BA03 walk_right walk_up walk_in_place_fastest_left - end_movement + step_end diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index f648829a7..13079c5bd 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -73,7 +73,7 @@ EverGrandeCity_HallOfFame_Movement_15BC59:: @ 815BC59 walk_up walk_up walk_up - end_movement + step_end EverGrandeCity_HallOfFame_Movement_15BC60:: @ 815BC60 walk_up @@ -81,4 +81,4 @@ EverGrandeCity_HallOfFame_Movement_15BC60:: @ 815BC60 walk_up walk_up walk_up - end_movement + step_end diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc index 80067b8ea..8bd948377 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -102,20 +102,20 @@ EverGrandeCity_PokemonLeague_Movement_15BB76:: @ 815BB76 walk_down walk_left walk_in_place_fastest_up - end_movement + step_end EverGrandeCity_PokemonLeague_Movement_15BB7A:: @ 815BB7A walk_down walk_right walk_in_place_fastest_up - end_movement + step_end EverGrandeCity_PokemonLeague_Movement_15BB7E:: @ 815BB7E walk_left walk_in_place_fastest_down - end_movement + step_end EverGrandeCity_PokemonLeague_Movement_15BB81:: @ 815BB81 walk_right walk_in_place_fastest_down - end_movement + step_end diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc index 66f810073..33d03feac 100644 --- a/data/maps/FallarborTown_ContestLobby/scripts.inc +++ b/data/maps/FallarborTown_ContestLobby/scripts.inc @@ -55,22 +55,22 @@ FallarborTown_ContestLobby_Movement_153A70:: @ 8153A70 walk_up delay_8 set_invisible - end_movement + step_end FallarborTown_ContestLobby_Movement_153A7A:: @ 8153A7A walk_in_place_fastest_left - end_movement + step_end FallarborTown_ContestLobby_Movement_153A7C:: @ 8153A7C walk_left walk_in_place_fastest_down - end_movement + step_end FallarborTown_ContestLobby_Movement_153A7F:: @ 8153A7F walk_down walk_down walk_in_place_fastest_up - end_movement + step_end FallarborTown_ContestLobby_Movement_153A83:: @ 8153A83 walk_left @@ -81,11 +81,11 @@ FallarborTown_ContestLobby_Movement_153A83:: @ 8153A83 walk_up delay_8 set_invisible - end_movement + step_end FallarborTown_ContestLobby_Movement_153A8C:: @ 8153A8C walk_in_place_fastest_right - end_movement + step_end FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E msgbox FallarborTown_ContestLobby_Text_177141, MSGBOX_NPC diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 60ec8d5c0..528118482 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -65,7 +65,7 @@ FallarborTown_PokemonCenter_1F_Movement_153B74:: @ 8153B74 walk_down walk_down delay_8 - end_movement + step_end FallarborTown_PokemonCenter_1F_Movement_153B81:: @ 8153B81 walk_down @@ -78,4 +78,4 @@ FallarborTown_PokemonCenter_1F_Movement_153B81:: @ 8153B81 walk_down walk_down delay_8 - end_movement + step_end diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 2616081df..382364fd3 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -87,4 +87,4 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 FortreeCity_Movement_14CA13:: @ 814CA13 walk_right - end_movement + step_end diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index ddad4919c..5f72bf607 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -51,7 +51,7 @@ FortreeCity_House4_Movement_158218:: @ 8158218 walk_fast_right walk_in_place_fastest_down delay_8 - end_movement + step_end FortreeCity_House4_EventScript_15821E:: @ 815821E lock diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 9e61a5c2e..e8b8c6133 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -48,7 +48,7 @@ GraniteCave_StevensRoom_Movement_15CC8C:: @ 815CC8C walk_up walk_up delay_8 - end_movement + step_end GraniteCave_StevensRoom_Movement_15CC93:: @ 815CC93 walk_left @@ -59,4 +59,4 @@ GraniteCave_StevensRoom_Movement_15CC93:: @ 815CC93 walk_up walk_up delay_8 - end_movement + step_end diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index f511ae1c7..cc036e073 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -191,7 +191,7 @@ LavaridgeTown_Movement_14E6E8:: @ 814E6E8 walk_left walk_left walk_left - end_movement + step_end LavaridgeTown_Movement_14E6EF:: @ 814E6EF walk_fast_right @@ -204,7 +204,7 @@ LavaridgeTown_Movement_14E6EF:: @ 814E6EF walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end LavaridgeTown_Movement_14E6FA:: @ 814E6FA walk_fast_right @@ -215,7 +215,7 @@ LavaridgeTown_Movement_14E6FA:: @ 814E6FA walk_fast_right walk_fast_right walk_fast_right - end_movement + step_end LavaridgeTown_Movement_14E703:: @ 814E703 walk_fast_down @@ -228,11 +228,11 @@ LavaridgeTown_Movement_14E703:: @ 814E703 walk_fast_right walk_fast_right walk_fast_right - end_movement + step_end LavaridgeTown_Movement_14E70E:: @ 814E70E walk_down - end_movement + step_end LavaridgeTown_EventScript_14E710:: @ 814E710 specialvar VAR_RESULT, GetPlayerFacingDirection diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 527a4e178..2e7127fa2 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -152,7 +152,7 @@ LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B walk_right walk_right walk_right - end_movement + step_end LilycoveCity_ContestLobby_Movement_158A43:: @ 8158A43 walk_down @@ -163,17 +163,17 @@ LilycoveCity_ContestLobby_Movement_158A43:: @ 8158A43 walk_down walk_down walk_down - end_movement + step_end LilycoveCity_ContestLobby_Movement_158A4C:: @ 8158A4C walk_in_place_fastest_left - end_movement + step_end LilycoveCity_ContestLobby_Movement_158A4E:: @ 8158A4E walk_down walk_down walk_down - end_movement + step_end LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 delay_16 @@ -184,7 +184,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 walk_fast_up walk_fast_up walk_in_place_fastest_right - end_movement + step_end LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158A6A @@ -266,7 +266,7 @@ LilycoveCity_ContestLobby_Movement_158B64:: @ 8158B64 walk_left walk_left walk_left - end_movement + step_end LilycoveCity_ContestLobby_Movement_158B6D:: @ 8158B6D walk_down @@ -277,17 +277,17 @@ LilycoveCity_ContestLobby_Movement_158B6D:: @ 8158B6D walk_down walk_down walk_down - end_movement + step_end LilycoveCity_ContestLobby_Movement_158B76:: @ 8158B76 walk_in_place_fastest_right - end_movement + step_end LilycoveCity_ContestLobby_Movement_158B78:: @ 8158B78 walk_down walk_down walk_down - end_movement + step_end LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C delay_16 @@ -298,7 +298,7 @@ LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C walk_fast_up walk_fast_up walk_in_place_fastest_left - end_movement + step_end LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 lockall @@ -528,24 +528,24 @@ LilycoveCity_ContestLobby_Movement_158E8E:: @ 8158E8E walk_up delay_8 set_invisible - end_movement + step_end LilycoveCity_ContestLobby_Movement_158E99:: @ 8158E99 walk_in_place_fastest_right walk_right - end_movement + step_end LilycoveCity_ContestLobby_Movement_158E9C:: @ 8158E9C walk_right walk_right walk_in_place_fastest_down - end_movement + step_end LilycoveCity_ContestLobby_Movement_158EA0:: @ 8158EA0 walk_down walk_down walk_in_place_fastest_up - end_movement + step_end LilycoveCity_ContestLobby_Movement_158EA4:: @ 8158EA4 walk_right @@ -557,11 +557,11 @@ LilycoveCity_ContestLobby_Movement_158EA4:: @ 8158EA4 walk_up delay_8 set_invisible - end_movement + step_end LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE walk_in_place_fastest_left - end_movement + step_end LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialvar VAR_RESULT, sub_80C5044 @@ -664,24 +664,24 @@ LilycoveCity_ContestLobby_Movement_158FFE:: @ 8158FFE walk_up delay_8 set_invisible - end_movement + step_end LilycoveCity_ContestLobby_Movement_159008:: @ 8159008 walk_in_place_fastest_left walk_left - end_movement + step_end LilycoveCity_ContestLobby_Movement_15900B:: @ 815900B walk_left walk_left walk_in_place_fastest_down - end_movement + step_end LilycoveCity_ContestLobby_Movement_15900F:: @ 815900F walk_down walk_down walk_in_place_fastest_up - end_movement + step_end LilycoveCity_ContestLobby_Movement_159013:: @ 8159013 walk_left @@ -692,11 +692,11 @@ LilycoveCity_ContestLobby_Movement_159013:: @ 8159013 walk_up delay_8 set_invisible - end_movement + step_end LilycoveCity_ContestLobby_Movement_15901C:: @ 815901C walk_in_place_fastest_right - end_movement + step_end LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E msgbox LilycoveCity_ContestLobby_Text_188D3C, MSGBOX_NPC diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 012c4800c..dbd9e11e6 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -61,14 +61,14 @@ LilycoveCity_CoveLilyMotel_1F_Movement_158395:: @ 8158395 lock_facing_direction walk_left unlock_facing_direction - end_movement + step_end LilycoveCity_CoveLilyMotel_1F_Movement_15839A:: @ 815839A walk_up - end_movement + step_end LilycoveCity_CoveLilyMotel_1F_Movement_15839C:: @ 815839C face_down walk_down face_up - end_movement + step_end diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 71bd92594..70ccfc7f4 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -142,15 +142,15 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE LilycoveCity_Harbor_Movement_159A86:: @ 8159A86 walk_right walk_in_place_fastest_up - end_movement + step_end LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 walk_up - end_movement + step_end @ 8159A8B walk_up - end_movement + step_end LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index f99507dbe..c878e1b7f 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -71,22 +71,22 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7 LilycoveCity_LilycoveMuseum_1F_Movement_1584FC:: @ 81584FC walk_up - end_movement + step_end LilycoveCity_LilycoveMuseum_1F_Movement_1584FE:: @ 81584FE walk_left walk_up - end_movement + step_end LilycoveCity_LilycoveMuseum_1F_Movement_158501:: @ 8158501 walk_right walk_up - end_movement + step_end LilycoveCity_LilycoveMuseum_1F_Movement_158504:: @ 8158504 walk_up walk_up - end_movement + step_end LilycoveCity_LilycoveMuseum_1F_EventScript_158507:: @ 8158507 msgbox LilycoveCity_LilycoveMuseum_1F_Text_18757F, MSGBOX_SIGN diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 756a679ba..a8ded84ed 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -82,12 +82,12 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A LilycoveCity_LilycoveMuseum_2F_Movement_1586D3:: @ 81586D3 walk_in_place_fastest_left - end_movement + step_end LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5 face_up delay_16 - end_movement + step_end LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 538653fb2..890f4d1dc 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -36,7 +36,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_1593FA:: @ 81593FA walk_down walk_left walk_left - end_movement + step_end LilycoveCity_PokemonTrainerFanClub_Movement_159402:: @ 8159402 walk_fast_left @@ -45,12 +45,12 @@ LilycoveCity_PokemonTrainerFanClub_Movement_159402:: @ 8159402 walk_fast_down walk_fast_left walk_fast_down - end_movement + step_end LilycoveCity_PokemonTrainerFanClub_Movement_159409:: @ 8159409 walk_down walk_in_place_fastest_right - end_movement + step_end LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C jump_in_place_right @@ -58,7 +58,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C walk_fast_up walk_fast_right walk_in_place_fastest_down - end_movement + step_end LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 compare VAR_LILYCOVE_FAN_CLUB_STATE, 1 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index afb6ce739..0000e8b4a 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -132,42 +132,42 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B LittlerootTown_Movement_14D6AC:: @ 814D6AC walk_down - end_movement + step_end LittlerootTown_Movement_14D6AE:: @ 814D6AE walk_down walk_in_place_fastest_left - end_movement + step_end LittlerootTown_Movement_14D6B1:: @ 814D6B1 delay_16 delay_8 walk_up - end_movement + step_end LittlerootTown_Movement_14D6B5:: @ 814D6B5 walk_up set_invisible - end_movement + step_end LittlerootTown_Movement_14D6B8:: @ 814D6B8 delay_16 delay_8 walk_right walk_in_place_fastest_up - end_movement + step_end LittlerootTown_Movement_14D6BD:: @ 814D6BD walk_up walk_up - end_movement + step_end LittlerootTown_Movement_14D6C0:: @ 814D6C0 jump_right delay_16 delay_16 delay_16 - end_movement + step_end LittlerootTown_EventScript_14D6C5:: @ 814D6C5 lockall @@ -248,11 +248,11 @@ LittlerootTown_Movement_14D779:: @ 814D779 walk_fast_up walk_fast_left face_down - end_movement + step_end LittlerootTown_Movement_14D787:: @ 814D787 walk_down - end_movement + step_end LittlerootTown_Movement_14D789:: @ 814D789 walk_right @@ -264,13 +264,13 @@ LittlerootTown_Movement_14D789:: @ 814D789 walk_left walk_up walk_in_place_fastest_down - end_movement + step_end LittlerootTown_Movement_14D793:: @ 814D793 lock_facing_direction walk_down unlock_facing_direction - end_movement + step_end LittlerootTown_EventScript_14D797:: @ 814D797 lockall @@ -295,7 +295,7 @@ LittlerootTown_Movement_14D7B3:: @ 814D7B3 walk_fast_up walk_fast_right face_down - end_movement + step_end LittlerootTown_Movement_14D7C0:: @ 814D7C0 walk_left @@ -304,7 +304,7 @@ LittlerootTown_Movement_14D7C0:: @ 814D7C0 walk_left walk_left walk_in_place_fastest_down - end_movement + step_end LittlerootTown_EventScript_14D7C7:: @ 814D7C7 lockall @@ -692,7 +692,7 @@ LittlerootTown_Movement_14DC76:: @ 814DC76 walk_up walk_up walk_up - end_movement + step_end LittlerootTown_Movement_14DC7D:: @ 814DC7D walk_up @@ -701,14 +701,14 @@ LittlerootTown_Movement_14DC7D:: @ 814DC7D walk_up walk_up walk_up - end_movement + step_end LittlerootTown_Movement_14DC84:: @ 814DC84 walk_right walk_right walk_right walk_right - end_movement + step_end LittlerootTown_Movement_14DC89:: @ 814DC89 walk_right @@ -716,29 +716,29 @@ LittlerootTown_Movement_14DC89:: @ 814DC89 walk_right walk_right walk_right - end_movement + step_end LittlerootTown_Movement_14DC8F:: @ 814DC8F walk_right walk_right - end_movement + step_end LittlerootTown_Movement_14DC92:: @ 814DC92 walk_right walk_right walk_right - end_movement + step_end LittlerootTown_Movement_14DC96:: @ 814DC96 walk_left walk_left walk_left - end_movement + step_end LittlerootTown_Movement_14DC9A:: @ 814DC9A walk_left walk_left - end_movement + step_end LittlerootTown_Movement_14DC9D:: @ 814DC9D walk_left @@ -746,14 +746,14 @@ LittlerootTown_Movement_14DC9D:: @ 814DC9D walk_left walk_left walk_left - end_movement + step_end LittlerootTown_Movement_14DCA3:: @ 814DCA3 walk_left walk_left walk_left walk_left - end_movement + step_end LittlerootTown_Movement_14DCA8:: @ 814DCA8 walk_down @@ -761,7 +761,7 @@ LittlerootTown_Movement_14DCA8:: @ 814DCA8 walk_down walk_down walk_down - end_movement + step_end LittlerootTown_Movement_14DCAE:: @ 814DCAE walk_down @@ -769,7 +769,7 @@ LittlerootTown_Movement_14DCAE:: @ 814DCAE walk_down walk_down walk_down - end_movement + step_end LittlerootTown_Movement_14DCB4:: @ 814DCB4 walk_left @@ -777,7 +777,7 @@ LittlerootTown_Movement_14DCB4:: @ 814DCB4 walk_left walk_left walk_in_place_fastest_up - end_movement + step_end LittlerootTown_Movement_14DCBA:: @ 814DCBA walk_left @@ -786,33 +786,33 @@ LittlerootTown_Movement_14DCBA:: @ 814DCBA walk_left walk_left walk_in_place_fastest_up - end_movement + step_end LittlerootTown_Movement_14DCC1:: @ 814DCC1 walk_left walk_left walk_in_place_fastest_up - end_movement + step_end LittlerootTown_Movement_14DCC5:: @ 814DCC5 walk_left walk_left walk_left walk_in_place_fastest_up - end_movement + step_end LittlerootTown_Movement_14DCCA:: @ 814DCCA walk_right walk_right walk_right walk_in_place_fastest_up - end_movement + step_end LittlerootTown_Movement_14DCCF:: @ 814DCCF walk_right walk_right walk_in_place_fastest_up - end_movement + step_end LittlerootTown_Movement_14DCD3:: @ 814DCD3 walk_right @@ -821,7 +821,7 @@ LittlerootTown_Movement_14DCD3:: @ 814DCD3 walk_right walk_right walk_in_place_fastest_up - end_movement + step_end LittlerootTown_Movement_14DCDA:: @ 814DCDA walk_right @@ -829,11 +829,11 @@ LittlerootTown_Movement_14DCDA:: @ 814DCDA walk_right walk_right walk_in_place_fastest_up - end_movement + step_end LittlerootTown_Movement_14DCE0:: @ 814DCE0 walk_up - end_movement + step_end LittlerootTown_EventScript_14DCE2:: @ 814DCE2 lock diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 93718eb77..81cf11ced 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -71,7 +71,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720 walk_up - end_movement + step_end LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 lockall @@ -111,7 +111,7 @@ LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782 walk_right walk_right walk_right - end_movement + step_end LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 lockall diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index f776b8a79..9a2251396 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -71,7 +71,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E walk_up - end_movement + step_end LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960 lockall @@ -111,7 +111,7 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 walk_left walk_left walk_left - end_movement + step_end @ 81529C7 lockall diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 7a176908b..7efdfd21c 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -148,7 +148,7 @@ LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11 walk_up walk_up delay_8 - end_movement + step_end LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C walk_left @@ -159,7 +159,7 @@ LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C walk_left walk_up delay_8 - end_movement + step_end LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25 walk_down @@ -172,7 +172,7 @@ LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25 walk_up walk_up delay_8 - end_movement + step_end LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30 walk_right @@ -183,7 +183,7 @@ LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30 walk_right walk_up delay_8 - end_movement + step_end gUnknown_08152C39:: @ 8152C39 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index bd07100cf..52a93dc85 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -80,7 +80,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B walk_up walk_up walk_up - end_movement + step_end LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock @@ -176,7 +176,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E8E:: @ 8152E8E LittlerootTown_ProfessorBirchsLab_Movement_152E97:: @ 8152E97 walk_down walk_in_place_fastest_left - end_movement + step_end LittlerootTown_ProfessorBirchsLab_EventScript_152E9A:: @ 8152E9A msgbox LittlerootTown_ProfessorBirchsLab_Text_1746A2, MSGBOX_SIGN diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index bc07537be..fa9833d97 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -191,7 +191,7 @@ MauvilleCity_Movement_14C2AA:: @ 814C2AA walk_down walk_down walk_left - end_movement + step_end MauvilleCity_Movement_14C2B0:: @ 814C2B0 walk_down @@ -199,7 +199,7 @@ MauvilleCity_Movement_14C2B0:: @ 814C2B0 walk_left walk_left walk_left - end_movement + step_end MauvilleCity_Movement_14C2B6:: @ 814C2B6 delay_16 @@ -212,7 +212,7 @@ MauvilleCity_Movement_14C2B6:: @ 814C2B6 walk_left walk_left walk_left - end_movement + step_end MauvilleCity_Movement_14C2C1:: @ 814C2C1 delay_16 @@ -225,7 +225,7 @@ MauvilleCity_Movement_14C2C1:: @ 814C2C1 walk_left walk_left walk_left - end_movement + step_end MauvilleCity_Movement_14C2CC:: @ 814C2CC walk_left @@ -233,7 +233,7 @@ MauvilleCity_Movement_14C2CC:: @ 814C2CC walk_left walk_down walk_down - end_movement + step_end MauvilleCity_Movement_14C2D2:: @ 814C2D2 walk_left @@ -241,18 +241,18 @@ MauvilleCity_Movement_14C2D2:: @ 814C2D2 walk_down walk_left walk_left - end_movement + step_end MauvilleCity_Movement_14C2D8:: @ 814C2D8 walk_right walk_right walk_in_place_fastest_up - end_movement + step_end MauvilleCity_Movement_14C2DC:: @ 814C2DC walk_right walk_up - end_movement + step_end MauvilleCity_Movement_14C2DF:: @ 814C2DF walk_left @@ -263,7 +263,7 @@ MauvilleCity_Movement_14C2DF:: @ 814C2DF walk_left walk_left walk_left - end_movement + step_end MauvilleCity_Movement_14C2E8:: @ 814C2E8 walk_down @@ -275,7 +275,7 @@ MauvilleCity_Movement_14C2E8:: @ 814C2E8 walk_left walk_left walk_left - end_movement + step_end MauvilleCity_EventScript_14C2F2:: @ 814C2F2 lock diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 0f8f37009..39e6e2077 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -85,7 +85,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C MeteorFalls_1F_1R_Movement_15C5EE:: @ 815C5EE walk_right walk_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C5F1:: @ 815C5F1 walk_fast_up @@ -98,7 +98,7 @@ MeteorFalls_1F_1R_Movement_15C5F1:: @ 815C5F1 walk_fast_right walk_fast_right walk_fast_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C5FC:: @ 815C5FC walk_fast_up @@ -112,7 +112,7 @@ MeteorFalls_1F_1R_Movement_15C5FC:: @ 815C5FC walk_fast_right walk_fast_right walk_fast_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C608:: @ 815C608 walk_right @@ -121,7 +121,7 @@ MeteorFalls_1F_1R_Movement_15C608:: @ 815C608 walk_right walk_right walk_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C60F:: @ 815C60F delay_16 @@ -131,7 +131,7 @@ MeteorFalls_1F_1R_Movement_15C60F:: @ 815C60F walk_right walk_right walk_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C617:: @ 815C617 delay_16 @@ -141,7 +141,7 @@ MeteorFalls_1F_1R_Movement_15C617:: @ 815C617 walk_right walk_right walk_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C61F:: @ 815C61F walk_right @@ -152,7 +152,7 @@ MeteorFalls_1F_1R_Movement_15C61F:: @ 815C61F walk_right walk_right walk_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C628:: @ 815C628 walk_right @@ -160,7 +160,7 @@ MeteorFalls_1F_1R_Movement_15C628:: @ 815C628 walk_up walk_up walk_in_place_fastest_left - end_movement + step_end MeteorFalls_1F_1R_Movement_15C62E:: @ 815C62E walk_up @@ -173,14 +173,14 @@ MeteorFalls_1F_1R_Movement_15C62E:: @ 815C62E walk_right walk_right walk_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C639:: @ 815C639 walk_right walk_right walk_right walk_in_place_fastest_up - end_movement + step_end MeteorFalls_1F_1R_Movement_15C63E:: @ 815C63E walk_up @@ -194,14 +194,14 @@ MeteorFalls_1F_1R_Movement_15C63E:: @ 815C63E walk_right walk_right walk_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C64A:: @ 815C64A walk_right walk_right walk_right walk_in_place_fastest_up - end_movement + step_end MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F walk_in_place_fastest_down @@ -210,7 +210,7 @@ MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F lock_facing_direction walk_left unlock_facing_direction - end_movement + step_end MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656 lock diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index 67a77d6a9..ad244d3f3 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -74,12 +74,12 @@ MossdeepCity_GameCorner_1F_EventScript_15AD34:: @ 815AD34 MossdeepCity_GameCorner_1F_Movement_15AD3D:: @ 815AD3D walk_down - end_movement + step_end MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F walk_right walk_in_place_fastest_down - end_movement + step_end MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 lock @@ -157,29 +157,29 @@ MossdeepCity_GameCorner_1F_Movement_15AE3A:: @ 815AE3A delay_16 walk_up walk_up - end_movement + step_end MossdeepCity_GameCorner_1F_Movement_15AE3E:: @ 815AE3E delay_16 walk_right walk_up - end_movement + step_end MossdeepCity_GameCorner_1F_Movement_15AE42:: @ 815AE42 delay_16 walk_left walk_up - end_movement + step_end MossdeepCity_GameCorner_1F_Movement_15AE46:: @ 815AE46 walk_left walk_in_place_fastest_right - end_movement + step_end MossdeepCity_GameCorner_1F_Movement_15AE49:: @ 815AE49 walk_right walk_in_place_fastest_left - end_movement + step_end MossdeepCity_GameCorner_1F_EventScript_15AE4C:: @ 815AE4C msgbox MossdeepCity_GameCorner_1F_Text_18E631, MSGBOX_SIGN diff --git a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc index 713dd1bb7..3536e8d32 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc @@ -64,7 +64,7 @@ MossdeepCity_GameCorner_B1F_Movement_15AEF9:: @ 815AEF9 walk_down walk_right walk_right - end_movement + step_end MossdeepCity_GameCorner_B1F_Movement_15AEFF:: @ 815AEFF walk_left @@ -74,4 +74,4 @@ MossdeepCity_GameCorner_B1F_Movement_15AEFF:: @ 815AEFF walk_up walk_up delay_8 - end_movement + step_end diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 4cf54ecb6..6e735f408 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -214,7 +214,7 @@ MossdeepCity_Gym_EventScript_15A7ED:: @ 815A7ED MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 delay_16 delay_16 - end_movement + step_end MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc index 84e80453f..c88f644d8 100644 --- a/data/maps/MossdeepCity_House2/scripts.inc +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -44,11 +44,11 @@ MossdeepCity_House2_Movement_15A8C4:: @ 815A8C4 walk_fast_left walk_fast_down delay_8 - end_movement + step_end MossdeepCity_House2_Movement_15A8CB:: @ 815A8CB walk_fast_down walk_fast_down walk_fast_down delay_8 - end_movement + step_end diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index c3bece5e6..2a9e7566d 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -58,7 +58,7 @@ MossdeepCity_StevensHouse_Movement_15AA6E:: @ 815AA6E walk_left walk_left walk_in_place_fastest_down - end_movement + step_end MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 walk_up @@ -66,7 +66,7 @@ MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 walk_right walk_right walk_in_place_fastest_up - end_movement + step_end MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C lockall diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index a797a249d..8384ac537 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -66,7 +66,7 @@ MtChimney_Movement_15D025:: @ 815D025 walk_up walk_up walk_right - end_movement + step_end MtChimney_Movement_15D02D:: @ 815D02D walk_left @@ -77,7 +77,7 @@ MtChimney_Movement_15D02D:: @ 815D02D walk_down walk_down walk_down - end_movement + step_end MtChimney_Movement_15D036:: @ 815D036 walk_up @@ -87,7 +87,7 @@ MtChimney_Movement_15D036:: @ 815D036 walk_up walk_right walk_right - end_movement + step_end MtChimney_Movement_15D03E:: @ 815D03E walk_left @@ -99,7 +99,7 @@ MtChimney_Movement_15D03E:: @ 815D03E walk_down walk_down walk_down - end_movement + step_end @ 815D048 walk_down @@ -119,7 +119,7 @@ MtChimney_Movement_15D03E:: @ 815D03E walk_left walk_left walk_down - end_movement + step_end @ 815D05A walk_down @@ -130,7 +130,7 @@ MtChimney_Movement_15D03E:: @ 815D03E walk_left walk_left walk_down - end_movement + step_end @ 815D063 walk_right @@ -147,7 +147,7 @@ MtChimney_Movement_15D03E:: @ 815D03E walk_down walk_down walk_down - end_movement + step_end @ 815D072 walk_fast_down @@ -174,7 +174,7 @@ MtChimney_Movement_15D03E:: @ 815D03E walk_left walk_left walk_down - end_movement + step_end @ 815D08B delay_16 @@ -187,7 +187,7 @@ MtChimney_Movement_15D03E:: @ 815D03E walk_left walk_left walk_down - end_movement + step_end @ 815D096 delay_16 @@ -205,7 +205,7 @@ MtChimney_Movement_15D03E:: @ 815D03E walk_down walk_down walk_down - end_movement + step_end @ 815D0A6 delay_16 @@ -224,7 +224,7 @@ MtChimney_Movement_15D03E:: @ 815D03E walk_left walk_left walk_down - end_movement + step_end @ 815D0B7 delay_16 @@ -234,7 +234,7 @@ MtChimney_Movement_15D03E:: @ 815D03E walk_left walk_left walk_in_place_fastest_down - end_movement + step_end @ 815D0BF walk_down @@ -250,11 +250,11 @@ MtChimney_Movement_15D03E:: @ 815D03E walk_down walk_down walk_down - end_movement + step_end @ 815D0CD walk_down - end_movement + step_end @ 815D0CF walk_down @@ -264,7 +264,7 @@ MtChimney_Movement_15D03E:: @ 815D03E walk_down walk_down walk_down - end_movement + step_end @ 815D0D7 delay_16 @@ -276,7 +276,7 @@ MtChimney_Movement_15D03E:: @ 815D03E walk_down walk_down walk_down - end_movement + step_end @ 815D0E1 delay_16 @@ -289,20 +289,20 @@ MtChimney_Movement_15D03E:: @ 815D03E delay_16 walk_down walk_down - end_movement + step_end @ 815D0EC lock_facing_direction walk_fast_left unlock_facing_direction face_right - end_movement + step_end @ 815D0F1 walk_left walk_in_place_fastest_right delay_16 - end_movement + step_end MtChimney_EventScript_15D0F5:: @ 815D0F5 .ifdef SAPPHIRE diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 46c49089f..703c2062e 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -63,25 +63,25 @@ MtChimney_CableCarStation_Movement_15C1A5:: @ 815C1A5 walk_up walk_left walk_in_place_fastest_right - end_movement + step_end MtChimney_CableCarStation_Movement_15C1AA:: @ 815C1AA delay_16 walk_right walk_down walk_down - end_movement + step_end MtChimney_CableCarStation_Movement_15C1AF:: @ 815C1AF walk_up walk_up walk_up delay_16 - end_movement + step_end MtChimney_CableCarStation_Movement_15C1B4:: @ 815C1B4 walk_down walk_down walk_down delay_16 - end_movement + step_end diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index b48bd1b6e..eec6cf720 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -113,27 +113,27 @@ MtPyre_Summit_Movement_15D5DF:: @ 815D5DF walk_down walk_down walk_in_place_fastest_left - end_movement + step_end MtPyre_Summit_Movement_15D5E3:: @ 815D5E3 walk_down - end_movement + step_end MtPyre_Summit_Movement_15D5E5:: @ 815D5E5 walk_down walk_down walk_in_place_fastest_right - end_movement + step_end MtPyre_Summit_Movement_15D5E9:: @ 815D5E9 walk_left walk_in_place_fastest_down - end_movement + step_end MtPyre_Summit_Movement_15D5EC:: @ 815D5EC walk_right walk_in_place_fastest_down - end_movement + step_end MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF lock @@ -321,15 +321,15 @@ MtPyre_Summit_EventScript_15D795:: @ 815D795 MtPyre_Summit_Movement_15D7A0:: @ 815D7A0 walk_left walk_in_place_fastest_down - end_movement + step_end MtPyre_Summit_Movement_15D7A3:: @ 815D7A3 - end_movement + step_end MtPyre_Summit_Movement_15D7A4:: @ 815D7A4 walk_right walk_in_place_fastest_down - end_movement + step_end MtPyre_Summit_Movement_15D7A7:: @ 815D7A7 walk_right @@ -340,7 +340,7 @@ MtPyre_Summit_Movement_15D7A7:: @ 815D7A7 walk_down walk_down walk_down - end_movement + step_end MtPyre_Summit_Movement_15D7B0:: @ 815D7B0 walk_right @@ -351,7 +351,7 @@ MtPyre_Summit_Movement_15D7B0:: @ 815D7B0 walk_down walk_down walk_down - end_movement + step_end MtPyre_Summit_Movement_15D7B9:: @ 815D7B9 walk_left @@ -362,4 +362,4 @@ MtPyre_Summit_Movement_15D7B9:: @ 815D7B9 walk_down walk_down walk_down - end_movement + step_end diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index c90c87e21..8955bc134 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -99,7 +99,7 @@ OldaleTown_Movement_14DE8E:: @ 814DE8E walk_up walk_up walk_in_place_fastest_down - end_movement + step_end OldaleTown_Movement_14DE97:: @ 814DE97 walk_left @@ -112,7 +112,7 @@ OldaleTown_Movement_14DE97:: @ 814DE97 walk_up walk_up walk_in_place_fastest_down - end_movement + step_end OldaleTown_Movement_14DEA2:: @ 814DEA2 walk_up @@ -123,7 +123,7 @@ OldaleTown_Movement_14DEA2:: @ 814DEA2 walk_up walk_up walk_in_place_fastest_down - end_movement + step_end @ 814DEAB walk_up @@ -139,7 +139,7 @@ OldaleTown_Movement_14DEA2:: @ 814DEA2 walk_up delay_8 walk_in_place_fastest_down - end_movement + step_end OldaleTown_Movement_14DEB9:: @ 814DEB9 walk_right @@ -149,7 +149,7 @@ OldaleTown_Movement_14DEB9:: @ 814DEB9 walk_up walk_up walk_up - end_movement + step_end OldaleTown_Movement_14DEC1:: @ 814DEC1 delay_16 @@ -161,7 +161,7 @@ OldaleTown_Movement_14DEC1:: @ 814DEC1 walk_up walk_up walk_up - end_movement + step_end OldaleTown_Movement_14DECB:: @ 814DECB walk_up @@ -171,7 +171,7 @@ OldaleTown_Movement_14DECB:: @ 814DECB walk_up walk_up walk_up - end_movement + step_end @ 814DED3 walk_left @@ -185,7 +185,7 @@ OldaleTown_Movement_14DECB:: @ 814DECB walk_up walk_up walk_up - end_movement + step_end OldaleTown_EventScript_14DEDF:: @ 814DEDF lock @@ -280,15 +280,15 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6 OldaleTown_Movement_14DFDE:: @ 814DFDE walk_left walk_left - end_movement + step_end OldaleTown_Movement_14DFE1:: @ 814DFE1 walk_left - end_movement + step_end OldaleTown_Movement_14DFE3:: @ 814DFE3 face_left - end_movement + step_end OldaleTown_Movement_14DFE5:: @ 814DFE5 walk_down @@ -297,12 +297,12 @@ OldaleTown_Movement_14DFE5:: @ 814DFE5 walk_down walk_down walk_down - end_movement + step_end OldaleTown_Movement_14DFEC:: @ 814DFEC delay_8 walk_right - end_movement + step_end OldaleTown_Movement_14DFEF:: @ 814DFEF walk_fast_up @@ -310,9 +310,9 @@ OldaleTown_Movement_14DFEF:: @ 814DFEF lock_facing_direction walk_right unlock_facing_direction - end_movement + step_end OldaleTown_Movement_14DFF5:: @ 814DFF5 walk_down walk_left - end_movement + step_end diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 39ba495bd..18b886301 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -98,7 +98,7 @@ PetalburgCity_Movement_14B7CC:: @ 814B7CC walk_up walk_up walk_in_place_fastest_right - end_movement + step_end PetalburgCity_Movement_14B7ED:: @ 814B7ED delay_8 @@ -137,7 +137,7 @@ PetalburgCity_Movement_14B7ED:: @ 814B7ED delay_16 delay_16 walk_in_place_fastest_right - end_movement + step_end PetalburgCity_EventScript_14B812:: @ 814B812 msgbox PetalburgCity_Text_1645BB, MSGBOX_SIGN @@ -272,26 +272,26 @@ PetalburgCity_EventScript_14B99B:: @ 814B99B delay_16 delay_16 delay_16 - end_movement + step_end PetalburgCity_Movement_14B9B1:: @ 814B9B1 walk_right walk_right walk_right walk_in_place_fastest_up - end_movement + step_end PetalburgCity_Movement_14B9B6:: @ 814B9B6 walk_right walk_right - end_movement + step_end PetalburgCity_Movement_14B9B9:: @ 814B9B9 walk_right walk_right walk_right walk_in_place_fastest_down - end_movement + step_end PetalburgCity_Movement_14B9BE:: @ 814B9BE walk_down @@ -299,7 +299,7 @@ PetalburgCity_Movement_14B9BE:: @ 814B9BE walk_right walk_right walk_in_place_fastest_down - end_movement + step_end PetalburgCity_Movement_14B9C4:: @ 814B9C4 walk_right @@ -312,7 +312,7 @@ PetalburgCity_Movement_14B9C4:: @ 814B9C4 walk_up walk_right walk_in_place_fastest_up - end_movement + step_end PetalburgCity_Movement_14B9CF:: @ 814B9CF walk_down @@ -328,7 +328,7 @@ PetalburgCity_Movement_14B9CF:: @ 814B9CF walk_up walk_right walk_in_place_fastest_up - end_movement + step_end PetalburgCity_Movement_14B9DD:: @ 814B9DD walk_right @@ -341,7 +341,7 @@ PetalburgCity_Movement_14B9DD:: @ 814B9DD walk_up walk_right walk_in_place_fastest_up - end_movement + step_end PetalburgCity_Movement_14B9E8:: @ 814B9E8 walk_right @@ -355,7 +355,7 @@ PetalburgCity_Movement_14B9E8:: @ 814B9E8 walk_up walk_right walk_in_place_fastest_up - end_movement + step_end PetalburgCity_Movement_14B9F4:: @ 814B9F4 walk_down @@ -370,7 +370,7 @@ PetalburgCity_Movement_14B9F4:: @ 814B9F4 walk_left walk_left walk_left - end_movement + step_end PetalburgCity_Movement_14BA01:: @ 814BA01 walk_down @@ -382,7 +382,7 @@ PetalburgCity_Movement_14BA01:: @ 814BA01 walk_right walk_right walk_up - end_movement + step_end PetalburgCity_Movement_14BA0B:: @ 814BA0B delay_16 @@ -397,7 +397,7 @@ PetalburgCity_Movement_14BA0B:: @ 814BA0B walk_right walk_up walk_up - end_movement + step_end PetalburgCity_Movement_14BA18:: @ 814BA18 walk_up @@ -409,7 +409,7 @@ PetalburgCity_Movement_14BA18:: @ 814BA18 walk_right walk_right walk_up - end_movement + step_end PetalburgCity_Movement_14BA22:: @ 814BA22 walk_up @@ -422,7 +422,7 @@ PetalburgCity_Movement_14BA22:: @ 814BA22 walk_right walk_up walk_up - end_movement + step_end PetalburgCity_EventScript_14BA2D:: @ 814BA2D msgbox PetalburgCity_Text_16438A, MSGBOX_NPC diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 578a91aa2..8cf19cdb7 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -92,7 +92,7 @@ PetalburgCity_Gym_Movement_1545B4:: @ 81545B4 walk_down walk_down delay_16 - end_movement + step_end PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 lock @@ -479,7 +479,7 @@ PetalburgCity_Gym_EventScript_154B09:: @ 8154B09 delay_16 delay_8 walk_in_place_fastest_down - end_movement + step_end PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D delay_16 @@ -491,7 +491,7 @@ PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D walk_up walk_up walk_in_place_fastest_left - end_movement + step_end PetalburgCity_Gym_Movement_154B27:: @ 8154B27 delay_16 @@ -500,7 +500,7 @@ PetalburgCity_Gym_Movement_154B27:: @ 8154B27 delay_8 walk_up walk_up - end_movement + step_end PetalburgCity_Gym_Movement_154B2E:: @ 8154B2E walk_down @@ -510,7 +510,7 @@ PetalburgCity_Gym_Movement_154B2E:: @ 8154B2E walk_in_place_fastest_up delay_16 walk_in_place_down - end_movement + step_end PetalburgCity_Gym_Movement_154B36:: @ 8154B36 walk_down @@ -520,7 +520,7 @@ PetalburgCity_Gym_Movement_154B36:: @ 8154B36 walk_in_place_fastest_up delay_16 walk_in_place_down - end_movement + step_end PetalburgCity_Gym_Movement_154B3E:: @ 8154B3E walk_down @@ -529,7 +529,7 @@ PetalburgCity_Gym_Movement_154B3E:: @ 8154B3E walk_in_place_fastest_up delay_16 walk_in_place_down - end_movement + step_end PetalburgCity_Gym_Movement_154B45:: @ 8154B45 delay_16 @@ -539,7 +539,7 @@ PetalburgCity_Gym_Movement_154B45:: @ 8154B45 walk_down walk_down delay_8 - end_movement + step_end PetalburgCity_Gym_Movement_154B4D:: @ 8154B4D delay_16 @@ -551,7 +551,7 @@ PetalburgCity_Gym_Movement_154B4D:: @ 8154B4D walk_down walk_down delay_8 - end_movement + step_end PetalburgCity_Gym_Movement_154B57:: @ 8154B57 delay_16 @@ -561,7 +561,7 @@ PetalburgCity_Gym_Movement_154B57:: @ 8154B57 walk_down walk_down delay_8 - end_movement + step_end PetalburgCity_Gym_Movement_154B5F:: @ 8154B5F walk_in_place_fastest_down @@ -573,7 +573,7 @@ PetalburgCity_Gym_Movement_154B5F:: @ 8154B5F walk_right walk_down delay_8 - end_movement + step_end PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 msgbox PetalburgCity_Gym_Text_17AB17, MSGBOX_DEFAULT diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 8a6be99a7..6c40d7b96 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -128,7 +128,7 @@ PetalburgWoods_Movement_15CE73:: @ 815CE73 delay_16 face_up delay_16 - end_movement + step_end PetalburgWoods_Movement_15CE80:: @ 815CE80 walk_fast_right @@ -139,14 +139,14 @@ PetalburgWoods_Movement_15CE80:: @ 815CE80 walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end PetalburgWoods_Movement_15CE89:: @ 815CE89 delay_16 face_player walk_down walk_down - end_movement + step_end PetalburgWoods_Movement_15CE8E:: @ 815CE8E delay_16 @@ -155,7 +155,7 @@ PetalburgWoods_Movement_15CE8E:: @ 815CE8E walk_down walk_down walk_in_place_fastest_right - end_movement + step_end PetalburgWoods_Movement_15CE95:: @ 815CE95 walk_fast_left @@ -166,7 +166,7 @@ PetalburgWoods_Movement_15CE95:: @ 815CE95 walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end PetalburgWoods_Movement_15CE9E:: @ 815CE9E walk_fast_right @@ -174,13 +174,13 @@ PetalburgWoods_Movement_15CE9E:: @ 815CE9E walk_fast_down walk_fast_left walk_in_place_fastest_up - end_movement + step_end PetalburgWoods_Movement_15CEA4:: @ 815CEA4 walk_fast_down walk_fast_right walk_in_place_fastest_up - end_movement + step_end PetalburgWoods_Movement_15CEA8:: @ 815CEA8 walk_in_place_fastest_down @@ -190,18 +190,18 @@ PetalburgWoods_Movement_15CEA8:: @ 815CEA8 delay_16 delay_16 face_up - end_movement + step_end PetalburgWoods_Movement_15CEB0:: @ 815CEB0 walk_fast_down walk_fast_down - end_movement + step_end PetalburgWoods_Movement_15CEB3:: @ 815CEB3 lock_facing_direction walk_up unlock_facing_direction - end_movement + step_end PetalburgWoods_Movement_15CEB7:: @ 815CEB7 walk_fast_up @@ -211,24 +211,24 @@ PetalburgWoods_Movement_15CEB7:: @ 815CEB7 walk_fast_up delay_16 delay_16 - end_movement + step_end PetalburgWoods_Movement_15CEBF:: @ 815CEBF walk_fast_down walk_fast_down walk_fast_down - end_movement + step_end PetalburgWoods_Movement_15CEC3:: @ 815CEC3 walk_down walk_down delay_16 delay_16 - end_movement + step_end PetalburgWoods_Movement_15CEC8:: @ 815CEC8 walk_down - end_movement + step_end PetalburgWoods_EventScript_15CECA:: @ 815CECA msgbox PetalburgWoods_Text_1953AC, MSGBOX_NPC diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index cedac75d0..4c698a113 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -70,15 +70,15 @@ Route101_EventScript_14E9E4:: @ 814E9E4 Route101_Movement_14E9FA:: @ 814E9FA walk_up - end_movement + step_end Route101_Movement_14E9FC:: @ 814E9FC walk_right - end_movement + step_end Route101_Movement_14E9FE:: @ 814E9FE walk_down - end_movement + step_end Route101_Movement_14EA00:: @ 814EA00 walk_fast_up @@ -111,7 +111,7 @@ Route101_Movement_14EA00:: @ 814EA00 walk_fast_down walk_fast_left walk_fast_left - end_movement + step_end Route101_Movement_14EA1F:: @ 814EA1F walk_fast_up @@ -120,24 +120,24 @@ Route101_Movement_14EA1F:: @ 814EA1F walk_fast_right walk_fast_right walk_fast_up - end_movement + step_end @ 814EA26 - end_movement + step_end Route101_Movement_14EA27:: @ 814EA27 walk_in_place_fast_left walk_in_place_fast_left walk_in_place_fast_left walk_in_place_fast_left - end_movement + step_end Route101_Movement_14EA2C:: @ 814EA2C walk_fast_up walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end Route101_Movement_14EA31:: @ 814EA31 walk_fast_up @@ -170,7 +170,7 @@ Route101_Movement_14EA31:: @ 814EA31 walk_fast_left walk_fast_left walk_fast_left - end_movement + step_end Route101_Movement_14EA50:: @ 814EA50 walk_fast_right @@ -179,28 +179,28 @@ Route101_Movement_14EA50:: @ 814EA50 walk_fast_right walk_fast_up walk_fast_up - end_movement + step_end @ 814EA57 - end_movement + step_end Route101_Movement_14EA58:: @ 814EA58 walk_in_place_fast_right walk_in_place_fast_right walk_in_place_fast_right walk_in_place_fast_right - end_movement + step_end @ 814EA5D walk_up walk_up - end_movement + step_end @ 814EA60 walk_up walk_left walk_up - end_movement + step_end Route101_EventScript_14EA64:: @ 814EA64 msgbox Route101_Text_16D25E, MSGBOX_NPC @@ -243,4 +243,4 @@ Route101_EventScript_14EA7F:: @ 814EA7F Route101_Movement_14EAD7:: @ 814EAD7 walk_right - end_movement + step_end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 50a7bea09..1245e73b8 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -132,7 +132,7 @@ Route103_Movement_14ED67:: @ 814ED67 walk_left walk_down walk_down - end_movement + step_end Route103_Movement_14ED6B:: @ 814ED6B jump_2_down @@ -140,19 +140,19 @@ Route103_Movement_14ED6B:: @ 814ED6B walk_down walk_down walk_down - end_movement + step_end Route103_Movement_14ED71:: @ 814ED71 walk_down walk_down - end_movement + step_end Route103_Movement_14ED74:: @ 814ED74 jump_2_down delay_16 walk_down walk_down - end_movement + step_end Route103_EventScript_14ED79:: @ 814ED79 msgbox Route103_Text_16D950, MSGBOX_NPC diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index d3368f4d6..85b24f59c 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -362,33 +362,33 @@ Route104_Movement_14F09F:: @ 814F09F walk_fast_down walk_down walk_down - end_movement + step_end Route104_Movement_14F162:: @ 814F162 walk_left walk_down walk_down - end_movement + step_end Route104_Movement_14F166:: @ 814F166 walk_down - end_movement + step_end Route104_Movement_14F168:: @ 814F168 walk_down walk_left walk_in_place_fastest_right - end_movement + step_end Route104_Movement_14F16C:: @ 814F16C walk_down walk_down - end_movement + step_end Route104_Movement_14F16F:: @ 814F16F walk_down walk_in_place_fastest_left - end_movement + step_end Route104_EventScript_14F172:: @ 814F172 trainerbattle_single TRAINER_IVAN, Route104_Text_1B85EB, Route104_Text_1B8637 diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 8a6f409a4..fe3a2fb45 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -235,38 +235,38 @@ Route109_Movement_14F5BF:: @ 814F5BF walk_left walk_left walk_in_place_fastest_down - end_movement + step_end Route109_Movement_14F66D:: @ 814F66D walk_down walk_down - end_movement + step_end Route109_Movement_14F670:: @ 814F670 walk_down walk_down walk_left walk_in_place_fastest_right - end_movement + step_end Route109_Movement_14F675:: @ 814F675 walk_right walk_down - end_movement + step_end Route109_Movement_14F678:: @ 814F678 walk_left walk_down - end_movement + step_end Route109_Movement_14F67B:: @ 814F67B walk_down - end_movement + step_end Route109_Movement_14F67D:: @ 814F67D walk_down walk_in_place_fastest_left - end_movement + step_end Route109_EventScript_14F680:: @ 814F680 lock diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 2b6264c75..92d529767 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -495,17 +495,17 @@ Route110_Movement_14FF6E:: @ 814FF6E walk_down walk_left walk_in_place_fastest_down - end_movement + step_end Route110_Movement_14FF72:: @ 814FF72 walk_down - end_movement + step_end Route110_Movement_14FF74:: @ 814FF74 walk_down walk_right walk_in_place_fastest_down - end_movement + step_end Route110_Movement_14FF78:: @ 814FF78 walk_fast_up @@ -515,7 +515,7 @@ Route110_Movement_14FF78:: @ 814FF78 walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end Route110_Movement_14FF80:: @ 814FF80 walk_fast_up @@ -526,7 +526,7 @@ Route110_Movement_14FF80:: @ 814FF80 walk_fast_up walk_fast_up walk_fast_down - end_movement + step_end Route110_Movement_14FF89:: @ 814FF89 walk_fast_up @@ -536,4 +536,4 @@ Route110_Movement_14FF89:: @ 814FF89 walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index bc213720e..227f7f53d 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -49,7 +49,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523 Route110_SeasideCyclingRoadNorthEntrance_Movement_163538:: @ 8163538 walk_left - end_movement + step_end Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A @ Coord event directly in front of the gatesman heading right to left diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index 8e0f414c7..e57bb085a 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -28,7 +28,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6:: @ 81634A6 Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB walk_left - end_movement + step_end Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD lockall diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 6cc285eb5..813c4f245 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -244,8 +244,8 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 Route110_TrickHouseEnd_Movement_161CE8:: @ 8161CE8 walk_down - end_movement + step_end Route110_TrickHouseEnd_Movement_161CEA:: @ 8161CEA jump_in_place_left - end_movement + step_end diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 037c0e239..b6331e25d 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -306,7 +306,7 @@ Route110_TrickHouseEntrance_Movement_161315:: @ 8161315 delay_4 face_right delay_4 - end_movement + step_end Route110_TrickHouseEnd_Movement_16131E:: @ 816131E Route110_TrickHouseEntrance_Movement_16131E:: @ 816131E @@ -318,7 +318,7 @@ Route110_TrickHouseEntrance_Movement_16131E:: @ 816131E slide_up slide_up slide_up - end_movement + step_end Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327 msgbox Route110_TrickHouseEntrance_Text_19BCFD, MSGBOX_DEFAULT @@ -514,7 +514,7 @@ Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E set_invisible - end_movement + step_end Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660 warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 097047e53..c7f97622b 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -647,33 +647,33 @@ Route110_TrickHousePuzzle5_EventScript_163082:: @ 8163082 Route110_TrickHousePuzzle5_Movement_16308D:: @ 816308D walk_left - end_movement + step_end Route110_TrickHousePuzzle5_Movement_16308F:: @ 816308F walk_left walk_left - end_movement + step_end Route110_TrickHousePuzzle5_Movement_163092:: @ 8163092 walk_left walk_left walk_left - end_movement + step_end Route110_TrickHousePuzzle5_Movement_163096:: @ 8163096 walk_right - end_movement + step_end Route110_TrickHousePuzzle5_Movement_163098:: @ 8163098 walk_right walk_right - end_movement + step_end Route110_TrickHousePuzzle5_Movement_16309B:: @ 816309B walk_right walk_right walk_right - end_movement + step_end Route110_TrickHouseEntrance_Movement_16309F:: @ 816309F Route110_TrickHousePuzzle5_Movement_16309F:: @ 816309F @@ -722,4 +722,4 @@ Route110_TrickHousePuzzle5_Movement_16309F:: @ 816309F face_right delay_2 face_down - end_movement + step_end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index fde7d6d9b..9edcaaccc 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -113,7 +113,7 @@ Route111_Movement_1500AF:: @ 81500AF set_invisible delay_16 set_visible - end_movement + step_end Route111_EventScript_1500C5:: @ 81500C5 lock @@ -203,19 +203,19 @@ Route111_EventScript_1501A9:: @ 81501A9 Route111_Movement_1501B4:: @ 81501B4 walk_up - end_movement + step_end Route111_Movement_1501B6:: @ 81501B6 walk_down - end_movement + step_end Route111_Movement_1501B8:: @ 81501B8 walk_left - end_movement + step_end Route111_Movement_1501BA:: @ 81501BA walk_right - end_movement + step_end Route111_EventScript_1501BC:: @ 81501BC setweather WEATHER_SUNNY @@ -323,17 +323,17 @@ Route111_EventScript_15034F:: @ 815034F Route111_Movement_150356:: @ 8150356 walk_in_place_fastest_up walk_up - end_movement + step_end Route111_Movement_150359:: @ 8150359 walk_down - end_movement + step_end Route111_Movement_15035B:: @ 815035B delay_16 delay_16 delay_16 - end_movement + step_end Route111_EventScript_15035F:: @ 815035F msgbox Route111_Text_16FC9C, MSGBOX_SIGN diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 78b4031a4..93d45f52f 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -64,25 +64,25 @@ Route112_CableCarStation_Movement_15C0E6:: @ 815C0E6 walk_up walk_right walk_in_place_fastest_left - end_movement + step_end Route112_CableCarStation_Movement_15C0EB:: @ 815C0EB delay_16 walk_left walk_down walk_down - end_movement + step_end Route112_CableCarStation_Movement_15C0F0:: @ 815C0F0 walk_up walk_up walk_up delay_16 - end_movement + step_end Route112_CableCarStation_Movement_15C0F5:: @ 815C0F5 walk_down walk_down walk_down delay_16 - end_movement + step_end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index eeeab1cb0..28d85c83f 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -87,7 +87,7 @@ Route116_Movement_150B1C:: @ 8150B1C walk_left walk_left walk_left - end_movement + step_end Route116_Movement_150B25:: @ 8150B25 walk_down @@ -100,7 +100,7 @@ Route116_Movement_150B25:: @ 8150B25 walk_left walk_left walk_left - end_movement + step_end Route116_EventScript_150B30:: @ 8150B30 msgbox Route116_Text_170A46, MSGBOX_SIGN @@ -209,7 +209,7 @@ Route116_Movement_150C4D:: @ 8150C4D walk_left walk_left walk_left - end_movement + step_end Route116_Movement_150C57:: @ 8150C57 walk_up @@ -222,7 +222,7 @@ Route116_Movement_150C57:: @ 8150C57 walk_left walk_left walk_left - end_movement + step_end Route116_EventScript_150C62:: @ 8150C62 trainerbattle_single TRAINER_JOEY, Route116_Text_1BD02B, Route116_Text_1BD04C diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 71c8d76d1..6edf333c4 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -110,17 +110,17 @@ Route118_EventScript_15105E:: @ 815105E Route118_Movement_151069:: @ 8151069 walk_left - end_movement + step_end Route118_Movement_15106B:: @ 815106B walk_right - end_movement + step_end Route118_Movement_15106D:: @ 815106D jump_2_down delay_16 walk_down - end_movement + step_end Route118_Movement_151071:: @ 8151071 walk_right @@ -133,7 +133,7 @@ Route118_Movement_151071:: @ 8151071 walk_right walk_right walk_right - end_movement + step_end Route118_Movement_15107C:: @ 815107C walk_right @@ -145,7 +145,7 @@ Route118_Movement_15107C:: @ 815107C walk_right walk_right walk_right - end_movement + step_end Route118_Movement_151086:: @ 8151086 walk_right @@ -156,7 +156,7 @@ Route118_Movement_151086:: @ 8151086 walk_right walk_right walk_right - end_movement + step_end Route118_EventScript_15108F:: @ 815108F trainerbattle_single TRAINER_ROSE_1, Route118_Text_1BDFF4, Route118_Text_1BE03C diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 8d94171ac..c9218f459 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -211,7 +211,7 @@ Route119_Movement_1513F0:: @ 81513F0 walk_fast_right walk_fast_right walk_fast_up - end_movement + step_end Route119_Movement_1513FA:: @ 81513FA walk_fast_right @@ -224,7 +224,7 @@ Route119_Movement_1513FA:: @ 81513FA walk_fast_right walk_fast_right walk_fast_up - end_movement + step_end Route119_Movement_151405:: @ 8151405 walk_fast_right @@ -236,7 +236,7 @@ Route119_Movement_151405:: @ 8151405 walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end Route119_Movement_15140F:: @ 815140F walk_fast_left @@ -249,7 +249,7 @@ Route119_Movement_15140F:: @ 815140F walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end Route119_EventScript_15141A:: @ 815141A msgbox Route119_Text_171698, MSGBOX_NPC diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 318fa3d4f..33234f030 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -82,7 +82,7 @@ Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8 walk_right walk_right walk_right - end_movement + step_end Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC lock diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 92e199b62..79d9be171 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -265,7 +265,7 @@ Route120_EventScript_15198A:: @ 815198A Route120_Movement_151995:: @ 8151995 walk_down walk_left - end_movement + step_end Route120_EventScript_151998:: @ 8151998 msgbox Route120_Text_171B93, MSGBOX_NPC diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 09a46c8f6..9cb0124fe 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -42,7 +42,7 @@ Route121_Movement_151B57:: @ 8151B57 walk_down walk_down walk_down - end_movement + step_end Route121_Movement_151B60:: @ 8151B60 walk_down @@ -53,7 +53,7 @@ Route121_Movement_151B60:: @ 8151B60 walk_down walk_down walk_down - end_movement + step_end Route121_Movement_151B69:: @ 8151B69 walk_down @@ -64,7 +64,7 @@ Route121_Movement_151B69:: @ 8151B69 walk_down walk_down walk_down - end_movement + step_end Route121_EventScript_151B72:: @ 8151B72 trainerbattle_single TRAINER_VANESSA, Route121_Text_1BF96E, Route121_Text_1BF9A1 diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 124d9117f..aaa7a19b2 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -24,7 +24,7 @@ Route121_SafariZoneEntrance_Movement_15C348:: @ 815C348 walk_right walk_right walk_right - end_movement + step_end Route121_SafariZoneEntrance_EventScript_15C351:: @ 815C351 msgbox Route121_SafariZoneEntrance_Text_1C35D0, MSGBOX_NPC @@ -120,7 +120,7 @@ Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C Route121_SafariZoneEntrance_Movement_15C47C:: @ 815C47C walk_right - end_movement + step_end Route121_SafariZoneEntrance_Movement_15C47E:: @ 815C47E walk_left @@ -131,7 +131,7 @@ Route121_SafariZoneEntrance_Movement_15C47E:: @ 815C47E walk_left walk_down delay_16 - end_movement + step_end Route121_SafariZoneEntrance_EventScript_15C487:: @ 815C487 msgbox Route121_SafariZoneEntrance_Text_1C3E4B, MSGBOX_SIGN diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 3a0ceb04f..6309039cd 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -87,7 +87,7 @@ Route128_EventScript_15213F:: @ 815213F @ 815225E walk_fast_left - end_movement + step_end @ 8152260 walk_left @@ -102,15 +102,15 @@ Route128_EventScript_15213F:: @ 815213F walk_up walk_up walk_up - end_movement + step_end Route128_Movement_15226D:: @ 815226D walk_up - end_movement + step_end Route128_Movement_15226F:: @ 815226F walk_fast_left - end_movement + step_end Route128_Movement_152271:: @ 8152271 walk_fast_down @@ -120,21 +120,21 @@ Route128_Movement_152271:: @ 8152271 delay_16 delay_16 walk_in_place_fastest_down - end_movement + step_end Route128_Movement_152279:: @ 8152279 lock_facing_direction walk_slow_up delay_16 unlock_facing_direction - end_movement + step_end Route128_Movement_15227E:: @ 815227E walk_fast_left walk_fast_left walk_fast_left walk_in_place_fastest_right - end_movement + step_end Route128_Movement_152283:: @ 8152283 delay_16 @@ -149,17 +149,17 @@ Route128_Movement_152283:: @ 8152283 walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end Route128_Movement_152290:: @ 8152290 walk_left walk_left - end_movement + step_end Route128_Movement_152293:: @ 8152293 walk_left walk_in_place_fastest_down - end_movement + step_end Route128_Movement_152296:: @ 8152296 walk_fast_left @@ -172,12 +172,12 @@ Route128_Movement_152296:: @ 8152296 walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end Route128_Movement_1522A1:: @ 81522A1 walk_right walk_in_place_fastest_down - end_movement + step_end Route128_EventScript_1522A4:: @ 81522A4 trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_1C1C67, Route128_Text_1C1C95 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index ab2f4075d..f1e3a1fef 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -241,7 +241,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end RustboroCity_Movement_14C5C2:: @ 814C5C2 walk_fastest_right @@ -260,7 +260,7 @@ RustboroCity_Movement_14C5C2:: @ 814C5C2 walk_fast_up walk_fast_up walk_fast_up - end_movement + step_end RustboroCity_Movement_14C5D3:: @ 814C5D3 walk_right @@ -270,7 +270,7 @@ RustboroCity_Movement_14C5D3:: @ 814C5D3 walk_right walk_right walk_in_place_fastest_up - end_movement + step_end RustboroCity_Movement_14C5DB:: @ 814C5DB walk_up @@ -280,27 +280,27 @@ RustboroCity_Movement_14C5DB:: @ 814C5DB walk_up walk_up walk_up - end_movement + step_end RustboroCity_Movement_14C5E3:: @ 814C5E3 walk_down walk_right walk_right - end_movement + step_end RustboroCity_Movement_14C5E7:: @ 814C5E7 walk_down walk_down walk_right walk_right - end_movement + step_end RustboroCity_Movement_14C5EC:: @ 814C5EC walk_down walk_down walk_right walk_right - end_movement + step_end RustboroCity_Movement_14C5F1:: @ 814C5F1 walk_down @@ -308,7 +308,7 @@ RustboroCity_Movement_14C5F1:: @ 814C5F1 walk_down walk_right walk_right - end_movement + step_end RustboroCity_Movement_14C5F7:: @ 814C5F7 walk_down @@ -318,7 +318,7 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7 walk_right walk_right walk_in_place_fastest_down - end_movement + step_end RustboroCity_EventScript_14C5FF:: @ 814C5FF lock @@ -426,7 +426,7 @@ RustboroCity_EventScript_14C715:: @ 814C715 RustboroCity_Movement_14C74B:: @ 814C74B walk_down - end_movement + step_end RustboroCity_EventScript_14C74D:: @ 814C74D lockall diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 8f7478322..ca98b651e 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -73,7 +73,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 walk_up walk_up walk_in_place_fastest_left - end_movement + step_end RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803 walk_right @@ -90,12 +90,12 @@ RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803 walk_right walk_right walk_in_place_fastest_left - end_movement + step_end RustboroCity_DevonCorp_3F_Movement_157812:: @ 8157812 delay_16 walk_in_place_fastest_down - end_movement + step_end RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815 walk_right @@ -106,7 +106,7 @@ RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815 walk_right walk_right walk_right - end_movement + step_end RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E walk_left @@ -117,7 +117,7 @@ RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E walk_left walk_left walk_left - end_movement + step_end RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827 walk_right @@ -133,7 +133,7 @@ RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827 walk_right walk_right walk_right - end_movement + step_end RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 delay_16 @@ -141,7 +141,7 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 walk_down walk_down walk_in_place_fastest_right - end_movement + step_end RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B lock diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index d10e05fe8..9ea437792 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -134,7 +134,7 @@ RustboroCity_PokemonSchool_Movement_157B49:: @ 8157B49 walk_up walk_up walk_right - end_movement + step_end RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60 walk_right @@ -161,4 +161,4 @@ RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60 walk_up walk_left walk_left - end_movement + step_end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index bd37cdf9b..b244eb0bf 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -166,7 +166,7 @@ RusturfTunnel_Movement_15C945:: @ 815C945 walk_down walk_down walk_down - end_movement + step_end RusturfTunnel_Movement_15C951:: @ 815C951 walk_right @@ -180,41 +180,41 @@ RusturfTunnel_Movement_15C951:: @ 815C951 walk_down walk_down walk_down - end_movement + step_end @ 815C95D walk_left walk_in_place_fastest_right - end_movement + step_end @ 815C960 walk_down walk_in_place_fastest_up delay_8 walk_in_place_fastest_right - end_movement + step_end @ 815C965 walk_up walk_in_place_fastest_down delay_8 walk_in_place_fastest_right - end_movement + step_end RusturfTunnel_Movement_15C96A:: @ 815C96A walk_left walk_in_place_fastest_right - end_movement + step_end RusturfTunnel_Movement_15C96D:: @ 815C96D walk_right walk_in_place_fastest_left - end_movement + step_end RusturfTunnel_Movement_15C970:: @ 815C970 walk_up walk_in_place_fastest_right - end_movement + step_end RusturfTunnel_Movement_15C973:: @ 815C973 walk_right @@ -229,7 +229,7 @@ RusturfTunnel_Movement_15C973:: @ 815C973 walk_down walk_down walk_down - end_movement + step_end RusturfTunnel_Movement_15C980:: @ 815C980 walk_up @@ -244,25 +244,25 @@ RusturfTunnel_Movement_15C980:: @ 815C980 walk_down walk_down walk_down - end_movement + step_end RusturfTunnel_Movement_15C98D:: @ 815C98D walk_right - end_movement + step_end RusturfTunnel_Movement_15C98F:: @ 815C98F walk_in_place_fast_up walk_in_place_fast_up walk_fast_up walk_fast_right - end_movement + step_end RusturfTunnel_Movement_15C994:: @ 815C994 walk_in_place_fast_right walk_in_place_fast_right walk_fast_right walk_in_place_fastest_up - end_movement + step_end RusturfTunnel_EventScript_15C999:: @ 815C999 setvar VAR_TEMP_1, 1 @@ -293,7 +293,7 @@ RusturfTunnel_Movement_15C9D3:: @ 815C9D3 lock_facing_direction walk_right unlock_facing_direction - end_movement + step_end RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 lock @@ -354,12 +354,12 @@ RusturfTunnel_Movement_15CA99:: @ 815CA99 walk_up unlock_facing_direction walk_in_place_fastest_left - end_movement + step_end RusturfTunnel_Movement_15CA9F:: @ 815CA9F walk_down walk_in_place_fastest_up - end_movement + step_end RusturfTunnel_Movement_15CAA2:: @ 815CAA2 walk_fast_left @@ -371,7 +371,7 @@ RusturfTunnel_Movement_15CAA2:: @ 815CAA2 walk_fast_left walk_fast_left walk_fast_left - end_movement + step_end RusturfTunnel_Movement_15CAAC:: @ 815CAAC walk_right @@ -381,7 +381,7 @@ RusturfTunnel_Movement_15CAAC:: @ 815CAAC walk_right walk_right walk_right - end_movement + step_end RusturfTunnel_Movement_15CAB4:: @ 815CAB4 walk_left @@ -395,12 +395,12 @@ RusturfTunnel_Movement_15CAB4:: @ 815CAB4 walk_left walk_left walk_left - end_movement + step_end RusturfTunnel_Movement_15CAC0:: @ 815CAC0 delay_16 walk_right - end_movement + step_end RusturfTunnel_Movement_15CAC3:: @ 815CAC3 walk_left @@ -412,7 +412,7 @@ RusturfTunnel_Movement_15CAC3:: @ 815CAC3 walk_left walk_left walk_left - end_movement + step_end RusturfTunnel_EventScript_15CACD:: @ 815CACD trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 diff --git a/data/maps/SafariZone_Southeast/scripts.inc b/data/maps/SafariZone_Southeast/scripts.inc index 774fa2488..9606023c1 100644 --- a/data/maps/SafariZone_Southeast/scripts.inc +++ b/data/maps/SafariZone_Southeast/scripts.inc @@ -30,12 +30,12 @@ SafariZone_Southeast_EventScript_16007F:: @ 816007F SafariZone_Southeast_Movement_160087:: @ 8160087 walk_down - end_movement + step_end SafariZone_Southeast_Movement_160089:: @ 8160089 walk_right walk_in_place_fastest_down - end_movement + step_end SafariZone_Southeast_EventScript_16008C:: @ 816008C msgbox SafariZone_Southeast_Text_1C3B71, MSGBOX_NPC @@ -100,19 +100,19 @@ SafariZone_Southeast_EventScript_160139:: @ 8160139 SafariZone_Southeast_Movement_16014B:: @ 816014B walk_up - end_movement + step_end SafariZone_Southeast_Movement_16014D:: @ 816014D walk_right walk_in_place_fastest_up - end_movement + step_end SafariZone_Southeast_Movement_160150:: @ 8160150 walk_left walk_in_place_fastest_right - end_movement + step_end SafariZone_Southeast_Movement_160153:: @ 8160153 walk_down walk_in_place_fastest_up - end_movement + step_end diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index ac55ac4ac..24e0c037d 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -223,21 +223,21 @@ SeafloorCavern_Room9_Movement_15DD36:: @ 815DD36 walk_right walk_right walk_right - end_movement + step_end @ 815DD3E walk_left walk_left - end_movement + step_end SeafloorCavern_Room9_Movement_15DD41:: @ 815DD41 walk_left delay_16 - end_movement + step_end @ 815DD44 walk_right - end_movement + step_end SeafloorCavern_Room9_Movement_15DD46:: @ 815DD46 face_up @@ -245,7 +245,7 @@ SeafloorCavern_Room9_Movement_15DD46:: @ 815DD46 walk_down unlock_facing_direction walk_in_place_fastest_right - end_movement + step_end SeafloorCavern_Room9_Movement_15DD4C:: @ 815DD4C delay_16 @@ -258,12 +258,12 @@ SeafloorCavern_Room9_Movement_15DD4C:: @ 815DD4C delay_16 delay_16 delay_16 - end_movement + step_end SeafloorCavern_Room9_Movement_15DD57:: @ 815DD57 slide_up slide_up - end_movement + step_end SeafloorCavern_Room9_Movement_15DD5A:: @ 815DD5A walk_fast_right @@ -271,21 +271,21 @@ SeafloorCavern_Room9_Movement_15DD5A:: @ 815DD5A walk_fast_right walk_fast_right walk_fast_right - end_movement + step_end SeafloorCavern_Room9_Movement_15DD60:: @ 815DD60 walk_right walk_right - end_movement + step_end SeafloorCavern_Room9_Movement_15DD63:: @ 815DD63 walk_fast_right walk_fast_right walk_fast_right walk_fast_right - end_movement + step_end SeafloorCavern_Room9_Movement_15DD68:: @ 815DD68 delay_16 delay_16 - end_movement + step_end diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 7baf6d9b9..7c977dfce 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -544,7 +544,7 @@ SlateportCity_Movement_14BFCD:: @ 814BFCD delay_16 delay_16 walk_in_place_fastest_left - end_movement + step_end SlateportCity_Movement_14BFD5:: @ 814BFD5 emote_question_mark @@ -554,7 +554,7 @@ SlateportCity_Movement_14BFD5:: @ 814BFD5 delay_16 delay_16 walk_in_place_fastest_left - end_movement + step_end SlateportCity_Movement_14BFDD:: @ 814BFDD delay_16 @@ -569,7 +569,7 @@ SlateportCity_Movement_14BFDD:: @ 814BFDD walk_left walk_left walk_left - end_movement + step_end SlateportCity_Movement_14BFEA:: @ 814BFEA walk_down @@ -585,19 +585,19 @@ SlateportCity_Movement_14BFEA:: @ 814BFEA walk_left walk_left walk_left - end_movement + step_end @ 814BFF8 walk_down walk_in_place_fastest_up - end_movement + step_end SlateportCity_Movement_14BFFB:: @ 814BFFB walk_right walk_up walk_up set_invisible - end_movement + step_end SlateportCity_Movement_14C000:: @ 814C000 delay_16 @@ -607,7 +607,7 @@ SlateportCity_Movement_14C000:: @ 814C000 delay_16 walk_down walk_left - end_movement + step_end SlateportCity_Movement_14C008:: @ 814C008 walk_in_place_fastest_right @@ -615,7 +615,7 @@ SlateportCity_Movement_14C008:: @ 814C008 delay_16 walk_right walk_up - end_movement + step_end SlateportCity_Movement_14C00E:: @ 814C00E delay_16 @@ -626,7 +626,7 @@ SlateportCity_Movement_14C00E:: @ 814C00E delay_16 delay_16 walk_in_place_fastest_down - end_movement + step_end SlateportCity_EventScript_14C017:: @ 814C017 msgbox SlateportCity_Text_165425, MSGBOX_SIGN diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc index db4b545c3..5e649c2e9 100644 --- a/data/maps/SlateportCity_ContestLobby/scripts.inc +++ b/data/maps/SlateportCity_ContestLobby/scripts.inc @@ -55,22 +55,22 @@ SlateportCity_ContestLobby_Movement_1554C0:: @ 81554C0 walk_up delay_8 set_invisible - end_movement + step_end SlateportCity_ContestLobby_Movement_1554CA:: @ 81554CA walk_in_place_fastest_left - end_movement + step_end SlateportCity_ContestLobby_Movement_1554CC:: @ 81554CC walk_left walk_in_place_fastest_down - end_movement + step_end SlateportCity_ContestLobby_Movement_1554CF:: @ 81554CF walk_down walk_down walk_in_place_fastest_up - end_movement + step_end SlateportCity_ContestLobby_Movement_1554D3:: @ 81554D3 walk_left @@ -81,11 +81,11 @@ SlateportCity_ContestLobby_Movement_1554D3:: @ 81554D3 walk_up delay_8 set_invisible - end_movement + step_end SlateportCity_ContestLobby_Movement_1554DC:: @ 81554DC walk_in_place_fastest_right - end_movement + step_end SlateportCity_ContestLobby_EventScript_1554DE:: @ 81554DE msgbox SlateportCity_ContestLobby_Text_17C937, MSGBOX_NPC diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 0ddeb2fa5..3b43aed9f 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -105,14 +105,14 @@ SlateportCity_Harbor_Movement_15609B:: @ 815609B delay_16 jump_up set_invisible - end_movement + step_end @ 81560A0 delay_16 delay_16 jump_up set_invisible - end_movement + step_end SlateportCity_Harbor_Movement_1560A5:: @ 81560A5 delay_16 @@ -128,7 +128,7 @@ SlateportCity_Harbor_Movement_1560A5:: @ 81560A5 walk_fast_right walk_fast_right walk_fast_right - end_movement + step_end SlateportCity_Harbor_Movement_1560B3:: @ 81560B3 walk_left @@ -136,24 +136,24 @@ SlateportCity_Harbor_Movement_1560B3:: @ 81560B3 walk_left walk_left walk_up - end_movement + step_end SlateportCity_Harbor_Movement_1560B9:: @ 81560B9 walk_left walk_left walk_up walk_left - end_movement + step_end SlateportCity_Harbor_Movement_1560BE:: @ 81560BE walk_left walk_left walk_left - end_movement + step_end SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 walk_up - end_movement + step_end SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock @@ -249,11 +249,11 @@ SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF SlateportCity_Harbor_Movement_1561FA:: @ 81561FA walk_right walk_in_place_fastest_up - end_movement + step_end SlateportCity_Harbor_Movement_1561FD:: @ 81561FD walk_up - end_movement + step_end SlateportCity_Harbor_EventScript_1561FF:: @ 81561FF msgbox SlateportCity_Harbor_Text_17FC07, MSGBOX_NPC diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 85d89a2a8..f4a8fa088 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -75,7 +75,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B SlateportCity_OceanicMuseum_1F_Movement_155B8D:: @ 8155B8D walk_down - end_movement + step_end SlateportCity_OceanicMuseum_1F_EventScript_155B8F:: @ 8155B8F msgbox SlateportCity_OceanicMuseum_1F_Text_17E2BB, MSGBOX_NPC @@ -205,7 +205,7 @@ SlateportCity_OceanicMuseum_1F_Movement_155CCC:: @ 8155CCC walk_fast_down walk_fast_down delay_8 - end_movement + step_end SlateportCity_OceanicMuseum_1F_Movement_155CD3:: @ 8155CD3 walk_fast_right @@ -214,4 +214,4 @@ SlateportCity_OceanicMuseum_1F_Movement_155CD3:: @ 8155CD3 walk_fast_down walk_fast_down delay_8 - end_movement + step_end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 3154193d5..560165838 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -117,7 +117,7 @@ SlateportCity_OceanicMuseum_2F_Movement_155E8E:: @ 8155E8E walk_left walk_down walk_in_place_fastest_left - end_movement + step_end SlateportCity_OceanicMuseum_2F_Movement_155E92:: @ 8155E92 walk_up @@ -125,7 +125,7 @@ SlateportCity_OceanicMuseum_2F_Movement_155E92:: @ 8155E92 walk_left walk_down walk_in_place_fastest_left - end_movement + step_end SlateportCity_OceanicMuseum_2F_Movement_155E98:: @ 8155E98 walk_up @@ -141,11 +141,11 @@ SlateportCity_OceanicMuseum_2F_Movement_155E98:: @ 8155E98 walk_up walk_up delay_8 - end_movement + step_end SlateportCity_OceanicMuseum_2F_Movement_155EA6:: @ 8155EA6 walk_right - end_movement + step_end SlateportCity_OceanicMuseum_2F_Movement_155EA8:: @ 8155EA8 walk_down @@ -157,17 +157,17 @@ SlateportCity_OceanicMuseum_2F_Movement_155EA8:: @ 8155EA8 walk_right walk_right walk_right - end_movement + step_end SlateportCity_OceanicMuseum_2F_Movement_155EB2:: @ 8155EB2 walk_right - end_movement + step_end SlateportCity_OceanicMuseum_2F_Movement_155EB4:: @ 8155EB4 walk_down walk_right walk_in_place_fastest_down - end_movement + step_end SlateportCity_OceanicMuseum_2F_Movement_155EB8:: @ 8155EB8 walk_down @@ -176,17 +176,17 @@ SlateportCity_OceanicMuseum_2F_Movement_155EB8:: @ 8155EB8 walk_right walk_right walk_right - end_movement + step_end SlateportCity_OceanicMuseum_2F_Movement_155EBF:: @ 8155EBF lock_facing_direction walk_left unlock_facing_direction - end_movement + step_end SlateportCity_OceanicMuseum_2F_Movement_155EC3:: @ 8155EC3 walk_down - end_movement + step_end SlateportCity_OceanicMuseum_2F_Movement_155EC5:: @ 8155EC5 walk_down @@ -197,7 +197,7 @@ SlateportCity_OceanicMuseum_2F_Movement_155EC5:: @ 8155EC5 walk_right walk_right walk_right - end_movement + step_end SlateportCity_OceanicMuseum_2F_Movement_155ECE:: @ 8155ECE delay_16 @@ -211,7 +211,7 @@ SlateportCity_OceanicMuseum_2F_Movement_155ECE:: @ 8155ECE delay_8 walk_fast_down walk_in_place_fastest_up - end_movement + step_end SlateportCity_OceanicMuseum_2F_EventScript_155EDA:: @ 8155EDA msgbox SlateportCity_OceanicMuseum_2F_Text_17F572, MSGBOX_SIGN diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index c6eefc095..ab4407fb3 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -285,7 +285,7 @@ SootopolisCity_Movement_14D413:: @ 814D413 walk_left walk_left walk_left - end_movement + step_end SootopolisCity_Movement_14D417:: @ 814D417 walk_right @@ -293,7 +293,7 @@ SootopolisCity_Movement_14D417:: @ 814D417 walk_right walk_up walk_in_place_fastest_down - end_movement + step_end SootopolisCity_Movement_14D41D:: @ 814D41D walk_down @@ -311,7 +311,7 @@ SootopolisCity_Movement_14D41D:: @ 814D41D walk_down walk_left walk_left - end_movement + step_end SootopolisCity_Movement_14D42D:: @ 814D42D walk_left @@ -332,14 +332,14 @@ SootopolisCity_Movement_14D42D:: @ 814D42D walk_right walk_right walk_right - end_movement + step_end SootopolisCity_Movement_14D440:: @ 814D440 walk_right walk_right walk_right walk_right - end_movement + step_end SootopolisCity_Movement_14D445:: @ 814D445 walk_right @@ -359,7 +359,7 @@ SootopolisCity_Movement_14D445:: @ 814D445 walk_left walk_left walk_left - end_movement + step_end SootopolisCity_Movement_14D457:: @ 814D457 delay_16 @@ -380,7 +380,7 @@ SootopolisCity_Movement_14D457:: @ 814D457 walk_right walk_right walk_right - end_movement + step_end SootopolisCity_Movement_14D46A:: @ 814D46A walk_down @@ -400,7 +400,7 @@ SootopolisCity_Movement_14D46A:: @ 814D46A walk_left walk_left walk_left - end_movement + step_end SootopolisCity_Movement_14D47C:: @ 814D47C delay_16 @@ -421,7 +421,7 @@ SootopolisCity_Movement_14D47C:: @ 814D47C walk_right walk_right walk_right - end_movement + step_end SootopolisCity_EventScript_14D48F:: @ 814D48F .ifdef SAPPHIRE diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 2db1fbb93..44dd9425a 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -83,7 +83,7 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD set_invisible - end_movement + step_end SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle_single TRAINER_WALLACE, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D, NO_MUSIC diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 92c36e7fb..d1d0f5487 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -42,12 +42,12 @@ BattleTower_Outside_EventScript_160B3A:: @ 8160B3A BattleTower_Outside_Movement_160B45:: @ 8160B45 walk_down - end_movement + step_end BattleTower_Outside_Movement_160B47:: @ 8160B47 walk_left walk_in_place_fastest_down - end_movement + step_end SouthernIsland_Exterior_EventScript_160B4A:: @ 8160B4A msgbox SouthernIsland_Exterior_Text_1C52FB, MSGBOX_SIGN diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index a7f82014a..5da21e585 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -79,7 +79,7 @@ SouthernIsland_Interior_Movement_160C12:: @ 8160C12 walk_up walk_up walk_up - end_movement + step_end SouthernIsland_Interior_Movement_160C16:: @ 8160C16 delay_16 @@ -93,7 +93,7 @@ SouthernIsland_Interior_Movement_160C16:: @ 8160C16 walk_down walk_down walk_in_place_fastest_up - end_movement + step_end SouthernIsland_Interior_Movement_160C22:: @ 8160C22 walk_down @@ -107,4 +107,4 @@ SouthernIsland_Interior_Movement_160C22:: @ 8160C22 walk_down walk_down walk_down - end_movement + step_end diff --git a/data/maps/VerdanturfTown_ContestLobby/scripts.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc index 5c3f4a77f..57ac569ca 100644 --- a/data/maps/VerdanturfTown_ContestLobby/scripts.inc +++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc @@ -55,22 +55,22 @@ VerdanturfTown_ContestLobby_Movement_153E19:: @ 8153E19 walk_up delay_8 set_invisible - end_movement + step_end VerdanturfTown_ContestLobby_Movement_153E23:: @ 8153E23 walk_in_place_fastest_left - end_movement + step_end VerdanturfTown_ContestLobby_Movement_153E25:: @ 8153E25 walk_left walk_in_place_fastest_down - end_movement + step_end VerdanturfTown_ContestLobby_Movement_153E28:: @ 8153E28 walk_down walk_down walk_in_place_fastest_up - end_movement + step_end VerdanturfTown_ContestLobby_Movement_153E2C:: @ 8153E2C walk_left @@ -81,11 +81,11 @@ VerdanturfTown_ContestLobby_Movement_153E2C:: @ 8153E2C walk_up delay_8 set_invisible - end_movement + step_end VerdanturfTown_ContestLobby_Movement_153E35:: @ 8153E35 walk_in_place_fastest_right - end_movement + step_end VerdanturfTown_ContestLobby_EventScript_153E37:: @ 8153E37 lockall diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index d6f98f440..cc76426e5 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -59,7 +59,7 @@ VictoryRoad_1F_Movement_15DF07:: @ 815DF07 walk_up walk_right walk_right - end_movement + step_end VictoryRoad_1F_Movement_15DF13:: @ 815DF13 walk_up @@ -72,7 +72,7 @@ VictoryRoad_1F_Movement_15DF13:: @ 815DF13 walk_up walk_right walk_right - end_movement + step_end VictoryRoad_1F_Movement_15DF1E:: @ 815DF1E walk_up @@ -84,7 +84,7 @@ VictoryRoad_1F_Movement_15DF1E:: @ 815DF1E walk_up walk_right walk_right - end_movement + step_end VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 msgbox VictoryRoad_1F_Text_197967, MSGBOX_NPC diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index caf02fe7b..121f33754 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -567,30 +567,30 @@ OldaleTown_PokemonCenter_2F_EventScript_1A434B:: @ 81A434B OldaleTown_PokemonCenter_2F_Movement_1A4354:: @ 81A4354 face_down - end_movement + step_end OldaleTown_PokemonCenter_2F_Movement_1A4356:: @ 81A4356 face_right - end_movement + step_end OldaleTown_PokemonCenter_2F_Movement_1A4358:: @ 81A4358 walk_down walk_down - end_movement + step_end OldaleTown_PokemonCenter_2F_Movement_1A435B:: @ 81A435B walk_right walk_up walk_up - end_movement + step_end OldaleTown_PokemonCenter_2F_Movement_1A435F:: @ 81A435F walk_up - end_movement + step_end OldaleTown_PokemonCenter_2F_Movement_1A4361:: @ 81A4361 face_left - end_movement + step_end gUnknown_081A4363:: @ 81A4363 lockall diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 9053e3c59..a99c33492 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1153,65 +1153,65 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B LinkContestRoom1_Movement_1A5D85:: @ 81A5D85 walk_down - end_movement + step_end LinkContestRoom1_Movement_1A5D87:: @ 81A5D87 lock_facing_direction walk_up unlock_facing_direction - end_movement + step_end LinkContestRoom1_Movement_1A5D8B:: @ 81A5D8B walk_in_place_fastest_right - end_movement + step_end LinkContestRoom1_Movement_1A5D8D:: @ 81A5D8D emote_heart - end_movement + step_end LinkContestRoom1_Movement_1A5D8F:: @ 81A5D8F walk_in_place_fastest_down - end_movement + step_end LinkContestRoom1_Movement_1A5D91:: @ 81A5D91 walk_left walk_left walk_in_place_fastest_down - end_movement + step_end LinkContestRoom1_Movement_1A5D95:: @ 81A5D95 walk_right walk_right walk_in_place_fastest_down - end_movement + step_end LinkContestRoom1_Movement_1A5D99:: @ 81A5D99 walk_up walk_in_place_fastest_down - end_movement + step_end LinkContestRoom1_Movement_1A5D9C:: @ 81A5D9C delay_16 delay_16 - end_movement + step_end LinkContestRoom1_Movement_1A5D9F:: @ 81A5D9F walk_in_place_fastest_right - end_movement + step_end LinkContestRoom1_Movement_1A5DA1:: @ 81A5DA1 walk_in_place_fastest_left - end_movement + step_end LinkContestRoom1_Movement_1A5DA3:: @ 81A5DA3 walk_in_place_fastest_down - end_movement + step_end LinkContestRoom1_Movement_1A5DA5:: @ 81A5DA5 walk_left walk_left walk_up - end_movement + step_end LinkContestRoom1_Movement_1A5DA9:: @ 81A5DA9 walk_left @@ -1219,54 +1219,54 @@ LinkContestRoom1_Movement_1A5DA9:: @ 81A5DA9 walk_left walk_left walk_up - end_movement + step_end LinkContestRoom1_Movement_1A5DAF:: @ 81A5DAF face_left delay_16 face_original_direction - end_movement + step_end LinkContestRoom1_Movement_1A5DB3:: @ 81A5DB3 face_up delay_16 face_original_direction - end_movement + step_end LinkContestRoom1_Movement_1A5DB7:: @ 81A5DB7 face_right delay_16 face_original_direction - end_movement + step_end LinkContestRoom1_Movement_1A5DBB:: @ 81A5DBB face_down delay_16 face_original_direction - end_movement + step_end LinkContestRoom1_Movement_1A5DBF:: @ 81A5DBF face_up - end_movement + step_end LinkContestRoom1_Movement_1A5DC1:: @ 81A5DC1 face_up delay_16 walk_in_place_fastest_right - end_movement + step_end LinkContestRoom1_Movement_1A5DC5:: @ 81A5DC5 walk_in_place_fastest_left delay_16 delay_16 walk_in_place_fastest_down - end_movement + step_end LinkContestRoom1_Movement_1A5DCA:: @ 81A5DCA delay_16 delay_16 walk_in_place_fastest_down - end_movement + step_end LinkContestRoom1_Movement_1A5DCE:: @ 81A5DCE walk_up @@ -1274,7 +1274,7 @@ LinkContestRoom1_Movement_1A5DCE:: @ 81A5DCE walk_right walk_right walk_in_place_fastest_up - end_movement + step_end LinkContestRoom1_Movement_1A5DD4:: @ 81A5DD4 walk_fast_left @@ -1282,31 +1282,31 @@ LinkContestRoom1_Movement_1A5DD4:: @ 81A5DD4 walk_fast_left walk_fast_down walk_in_place_fastest_up - end_movement + step_end LinkContestRoom1_Movement_1A5DDA:: @ 81A5DDA walk_up walk_right walk_in_place_fastest_up - end_movement + step_end LinkContestRoom1_Movement_1A5DDE:: @ 81A5DDE walk_fast_left walk_fast_down walk_in_place_fastest_up - end_movement + step_end LinkContestRoom1_Movement_1A5DE2:: @ 81A5DE2 walk_up walk_left walk_in_place_fastest_up - end_movement + step_end LinkContestRoom1_Movement_1A5DE6:: @ 81A5DE6 walk_fast_right walk_fast_down walk_in_place_fastest_up - end_movement + step_end LinkContestRoom1_Movement_1A5DEA:: @ 81A5DEA walk_up @@ -1314,7 +1314,7 @@ LinkContestRoom1_Movement_1A5DEA:: @ 81A5DEA walk_left walk_left walk_in_place_fastest_up - end_movement + step_end LinkContestRoom1_Movement_1A5DF0:: @ 81A5DF0 walk_fast_right @@ -1322,14 +1322,14 @@ LinkContestRoom1_Movement_1A5DF0:: @ 81A5DF0 walk_fast_right walk_fast_down walk_in_place_fastest_up - end_movement + step_end LinkContestRoom1_Movement_1A5DF6:: @ 81A5DF6 walk_right walk_right walk_up - end_movement + step_end LinkContestRoom1_Movement_1A5DFA:: @ 81A5DFA walk_up - end_movement + step_end diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index c60ec488d..7c12343d4 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -252,7 +252,7 @@ Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543 face_down set_visible walk_slow_down - end_movement + step_end @ 81B2557 end diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index b8bc05b3b..867e41661 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -257,15 +257,15 @@ Route120_EventScript_1AE60F:: @ 81AE60F Route111_Movement_1AE699:: @ 81AE699 walk_in_place_down - end_movement + step_end Route111_Movement_1AE69B:: @ 81AE69B walk_in_place_up - end_movement + step_end Route111_Movement_1AE69D:: @ 81AE69D walk_in_place_left - end_movement + step_end Route111_EventScript_1AE69F:: @ 81AE69F msgbox Route111_Text_1AC60B, MSGBOX_YESNO diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index b64d86a70..d86ef0b03 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -33,7 +33,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA LittlerootTown_BrendansHouse_1F_Movement_1B69B5:: @ 81B69B5 walk_up - end_movement + step_end LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 @@ -124,13 +124,13 @@ LittlerootTown_BrendansHouse_2F_Movement_1B6AA2:: @ 81B6AA2 delay_16 delay_8 walk_left - end_movement + step_end LittlerootTown_BrendansHouse_2F_Movement_1B6AA9:: @ 81B6AA9 walk_right walk_up delay_8 - end_movement + step_end LittlerootTown_BrendansHouse_2F_Movement_1B6AAD:: @ 81B6AAD delay_8 @@ -139,13 +139,13 @@ LittlerootTown_BrendansHouse_2F_Movement_1B6AAD:: @ 81B6AAD delay_16 delay_8 walk_right - end_movement + step_end LittlerootTown_BrendansHouse_2F_Movement_1B6AB4:: @ 81B6AB4 walk_left walk_up delay_8 - end_movement + step_end LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 @@ -228,24 +228,24 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE LittlerootTown_BrendansHouse_1F_Movement_1B6BDB:: @ 81B6BDB walk_left walk_in_place_fastest_right - end_movement + step_end LittlerootTown_MaysHouse_1F_Movement_1B6BDE:: @ 81B6BDE walk_right walk_in_place_fastest_left - end_movement + step_end LittlerootTown_BrendansHouse_1F_Movement_1B6BE1:: @ 81B6BE1 walk_left walk_down walk_in_place_fastest_right - end_movement + step_end LittlerootTown_MaysHouse_1F_Movement_1B6BE5:: @ 81B6BE5 walk_right walk_down walk_in_place_fastest_left - end_movement + step_end LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 @@ -332,11 +332,11 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6CCC:: @ 81B6CCC walk_left walk_left walk_left - end_movement + step_end LittlerootTown_BrendansHouse_1F_Movement_1B6CD2:: @ 81B6CD2 walk_left - end_movement + step_end LittlerootTown_MaysHouse_1F_Movement_1B6CD4:: @ 81B6CD4 walk_down @@ -344,15 +344,15 @@ LittlerootTown_MaysHouse_1F_Movement_1B6CD4:: @ 81B6CD4 walk_right walk_right walk_right - end_movement + step_end LittlerootTown_MaysHouse_1F_Movement_1B6CDA:: @ 81B6CDA walk_right - end_movement + step_end LittlerootTown_BrendansHouse_1F_Movement_1B6CDC:: @ 81B6CDC walk_up - end_movement + step_end LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE @@ -457,20 +457,20 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6E28:: @ 81B6E28 LittlerootTown_BrendansHouse_1F_Movement_1B6E33:: @ 81B6E33 walk_right walk_right - end_movement + step_end LittlerootTown_BrendansHouse_1F_Movement_1B6E36:: @ 81B6E36 walk_left walk_left - end_movement + step_end LittlerootTown_BrendansHouse_1F_Movement_1B6E39:: @ 81B6E39 walk_left - end_movement + step_end LittlerootTown_BrendansHouse_1F_Movement_1B6E3B:: @ 81B6E3B walk_right - end_movement + step_end LittlerootTown_BrendansHouse_1F_Movement_1B6E3D:: @ 81B6E3D walk_down @@ -478,7 +478,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6E3D:: @ 81B6E3D walk_right walk_down delay_8 - end_movement + step_end LittlerootTown_BrendansHouse_1F_Movement_1B6E43:: @ 81B6E43 walk_down @@ -486,7 +486,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6E43:: @ 81B6E43 walk_left walk_down delay_8 - end_movement + step_end LittlerootTown_BrendansHouse_1F_Movement_1B6E49:: @ 81B6E49 delay_16 @@ -494,14 +494,14 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6E49:: @ 81B6E49 walk_down walk_down walk_in_place_fastest_left - end_movement + step_end LittlerootTown_BrendansHouse_1F_Movement_1B6E4F:: @ 81B6E4F delay_16 delay_16 delay_16 walk_in_place_fastest_down - end_movement + step_end LittlerootTown_BrendansHouse_1F_Movement_1B6E54:: @ 81B6E54 delay_16 @@ -509,4 +509,4 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6E54:: @ 81B6E54 walk_down walk_down walk_in_place_fastest_right - end_movement + step_end diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 1b1f3a333..0622da0cc 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -183,7 +183,7 @@ LilycoveCity_ContestLobby_Movement_1B7821:: @ 81B7821 SlateportCity_ContestLobby_Movement_1B7821:: @ 81B7821 VerdanturfTown_ContestLobby_Movement_1B7821:: @ 81B7821 walk_in_place_fastest_right - end_movement + step_end FallarborTown_ContestLobby_EventScript_1B7823:: @ 81B7823 goto FallarborTown_ContestLobby_EventScript_1B783B diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index b13eeca6d..5042bd211 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -53,7 +53,7 @@ Route111_Movement_1A38E3:: @ 81A38E3 walk_left walk_down walk_down - end_movement + step_end Route111_Movement_1A38EF:: @ 81A38EF walk_left @@ -67,4 +67,4 @@ Route111_Movement_1A38EF:: @ 81A38EF walk_left walk_down walk_down - end_movement + step_end diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 95dc54c88..4615435d1 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -103,7 +103,7 @@ EventScript_RevealTrainer: Movement_RevealTrainer:: reveal_trainer - end_movement + step_end EventScript_DoTrainerBattle: special ShowTrainerIntroSpeech diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index a93a2ac05..81826c6fc 100755 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -218,4 +218,6 @@ #define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x88 #define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x89 +#define MOVEMENT_ACTION_STEP_END 0xFE + #endif // GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H diff --git a/include/macros/movement.inc b/include/macros/movement.inc index 80a5b5dca..ba59792b0 100644 --- a/include/macros/movement.inc +++ b/include/macros/movement.inc @@ -102,8 +102,8 @@ create_movement_action clear_fixed_priority create_movement_action init_affine_anim create_movement_action clear_affine_anim - create_movement_action walk_down_affine_0 - create_movement_action walk_down_affine_1 + create_movement_action walk_down_start_affine + create_movement_action walk_down_affine enum_start 0xfe - create_movement_action end_movement + create_movement_action step_end |