diff options
137 files changed, 6516 insertions, 6508 deletions
diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index 5a810c497..99b5c8f84 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -1,4 +1,4 @@ - .macro create_movement name + .macro create_movement_action name enum _\name .macro \name .byte _\name @@ -6,118 +6,126 @@ .endm enum_start - create_movement step_00 - create_movement step_01 - create_movement step_02 - create_movement step_03 - create_movement slow_step_down - create_movement slow_step_up - create_movement slow_step_left - create_movement slow_step_right - create_movement step_down - create_movement step_up - create_movement step_left - create_movement step_right - create_movement fast_step_down - create_movement fast_step_up - create_movement fast_step_left - create_movement fast_step_right - create_movement step_10 - create_movement step_11 - create_movement step_12 - create_movement step_13 - create_movement step_14 - create_movement step_15 - create_movement step_16 - create_movement step_17 - create_movement step_18 - create_movement step_19 - create_movement step_1a - create_movement step_1b - create_movement step_1c - create_movement step_1d - create_movement step_1e - create_movement step_1f - create_movement step_20 - create_movement step_21 - create_movement step_22 - create_movement step_23 - create_movement step_24 - create_movement step_25 - create_movement step_26 - create_movement step_27 - create_movement step_28 - create_movement step_29 - create_movement step_2a - create_movement step_2b - create_movement step_2c - create_movement step_2d - create_movement step_2e - create_movement step_2f - create_movement step_30 - create_movement step_31 - create_movement step_32 - create_movement step_33 - create_movement step_34 - create_movement step_35 - create_movement step_36 - create_movement step_37 - create_movement step_38 - create_movement step_39 - create_movement step_3a - create_movement step_3b - create_movement step_3c - create_movement step_3d - create_movement step_3e - create_movement step_3f - create_movement step_40 - create_movement step_41 - create_movement step_42 - create_movement step_43 - create_movement step_44 - create_movement step_45 - create_movement step_46 - create_movement step_47 - create_movement step_48 - create_movement step_49 - create_movement step_4a - create_movement step_4b - create_movement step_4c - create_movement step_4d - create_movement step_4e - create_movement step_4f - create_movement step_50 - create_movement step_51 - create_movement step_52 - create_movement step_53 - create_movement step_54 - create_movement step_55 - create_movement step_56 - create_movement step_57 - create_movement step_58 - create_movement step_59 - create_movement step_5a - create_movement step_5b - create_movement step_5c - create_movement step_5d - create_movement step_5e - create_movement step_5f - create_movement step_60 - create_movement step_61 - create_movement step_62 - create_movement step_63 + create_movement_action face_down + create_movement_action face_up + create_movement_action face_left + create_movement_action face_right + create_movement_action walk_slow_down + create_movement_action walk_slow_up + create_movement_action walk_slow_left + create_movement_action walk_slow_right + create_movement_action walk_down + create_movement_action walk_up + create_movement_action walk_left + create_movement_action walk_right + create_movement_action jump_2_down + create_movement_action jump_2_up + create_movement_action jump_2_left + create_movement_action jump_2_right + create_movement_action delay_1 + create_movement_action delay_2 + create_movement_action delay_4 + create_movement_action delay_8 + create_movement_action delay_16 + create_movement_action walk_fast_down + create_movement_action walk_fast_up + create_movement_action walk_fast_left + create_movement_action walk_fast_right + create_movement_action walk_in_place_slow_down + create_movement_action walk_in_place_slow_up + create_movement_action walk_in_place_slow_left + create_movement_action walk_in_place_slow_right + create_movement_action walk_in_place_down + create_movement_action walk_in_place_up + create_movement_action walk_in_place_left + create_movement_action walk_in_place_right + create_movement_action walk_in_place_fast_down + create_movement_action walk_in_place_fast_up + create_movement_action walk_in_place_fast_left + create_movement_action walk_in_place_fast_right + create_movement_action walk_in_place_fastest_down + create_movement_action walk_in_place_fastest_up + create_movement_action walk_in_place_fastest_left + create_movement_action walk_in_place_fastest_right + create_movement_action ride_water_current_down + create_movement_action ride_water_current_up + create_movement_action ride_water_current_left + create_movement_action ride_water_current_right + create_movement_action walk_fastest_down + create_movement_action walk_fastest_up + create_movement_action walk_fastest_left + create_movement_action walk_fastest_right + create_movement_action slide_down + create_movement_action slide_up + create_movement_action slide_left + create_movement_action slide_right + create_movement_action player_run_down + create_movement_action player_run_up + create_movement_action player_run_left + create_movement_action player_run_right + create_movement_action start_anim_in_direction + create_movement_action jump_special_down + create_movement_action jump_special_up + create_movement_action jump_special_left + create_movement_action jump_special_right + create_movement_action face_player + create_movement_action face_away_player + create_movement_action lock_facing_direction + create_movement_action unlock_facing_direction + create_movement_action jump_down + create_movement_action jump_up + create_movement_action jump_left + create_movement_action jump_right + create_movement_action jump_in_place_down + create_movement_action jump_in_place_up + create_movement_action jump_in_place_left + create_movement_action jump_in_place_right + create_movement_action jump_in_place_down_up + create_movement_action jump_in_place_up_down + create_movement_action jump_in_place_left_right + create_movement_action jump_in_place_right_left + create_movement_action face_original_direction + create_movement_action nurse_joy_bow + create_movement_action enable_jump_landing_ground_effect + create_movement_action disable_jump_landing_ground_effect + create_movement_action disable_anim + create_movement_action restore_anim + create_movement_action set_invisible + create_movement_action set_visible + create_movement_action emote_exclamation_mark + create_movement_action emote_question_mark + create_movement_action emote_heart + create_movement_action reveal_trainer + create_movement_action rock_smash_break + create_movement_action cut_tree + create_movement_action set_fixed_priority + create_movement_action clear_fixed_priority + create_movement_action init_affine_anim + create_movement_action clear_affine_anim + create_movement_action unknown_movement_1 + create_movement_action unknown_movement_2 + create_movement_action walk_down_start_affine + create_movement_action walk_down_affine - enum_start 0x91 - create_movement step_91 - create_movement step_92 - create_movement step_93 - create_movement step_94 - create_movement step_95 - create_movement step_96 - create_movement step_97 - create_movement step_98 - create_movement step_99 - create_movement step_9A + enum_start 0x8C + create_movement_action walk_diag_northwest + create_movement_action walk_diag_northeast + create_movement_action walk_diag_southwest + create_movement_action walk_diag_southeast + create_movement_action walk_slow_diag_northwest + create_movement_action walk_slow_diag_northeast + create_movement_action walk_slow_diag_southwest + create_movement_action walk_slow_diag_southeast + create_movement_action store_lock_anim + create_movement_action free_unlock_anim + create_movement_action walk_left_affine + create_movement_action walk_right_affine + create_movement_action levitate + create_movement_action stop_levitate + create_movement_action destroy_extra_task + create_movement_action figure_8 + create_movement_action fly_up + create_movement_action fly_down enum_start 0xfe - create_movement step_end + create_movement_action step_end diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index 8fc2939c6..ce2490579 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -1454,43 +1454,43 @@ gUnknown_08612690:: @ 8612690 .4byte 0x00000400, 0x00000800 gUnknown_08612698:: @ 8612698 - step_94 - step_right - step_95 + store_lock_anim + walk_right + free_unlock_anim step_end gUnknown_0861269C:: @ 861269C - step_94 - step_down - step_95 + store_lock_anim + walk_down + free_unlock_anim step_end gUnknown_086126A0:: @ 86126A0 - step_94 - step_left - step_95 + store_lock_anim + walk_left + free_unlock_anim step_end gUnknown_086126A4:: @ 86126A4 - step_94 - step_up - step_95 + store_lock_anim + walk_up + free_unlock_anim step_end gUnknown_086126A8:: @ 86126A8 - step_03 + face_right step_end gUnknown_086126AA:: @ 86126AA - step_00 + face_down step_end gUnknown_086126AC:: @ 86126AC - step_02 + face_left step_end gUnknown_086126AE:: @ 86126AE - step_01 + face_up step_end @ 86126B0 diff --git a/data/event_scripts.s b/data/event_scripts.s index 841a9935c..ec9ddb86a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -946,7 +946,7 @@ EventScript_27142F:: @ 827142F return Movement_27143A: @ 827143A - step_59 + reveal_trainer step_end EventScript_ShowTrainerIntroMsg:: @ 827143C @@ -1523,8 +1523,8 @@ OldaleTown_PokemonCenter_1F_EventScript_271AC5:: @ 8271AC5 end OldaleTown_PokemonCenter_1F_Movement_271AD0: @ 8271AD0 - step_4f - step_12 + nurse_joy_bow + delay_4 step_end Std_ObtainItem:: @ 8271AD3 @@ -2329,13 +2329,13 @@ SlateportCity_Harbor_EventScript_2721E2:: @ 82721E2 return SlateportCity_Harbor_Movement_2721F0: @ 82721F0 - slow_step_right - slow_step_right - slow_step_right - step_right - step_right - step_right - step_right + walk_slow_right + walk_slow_right + walk_slow_right + walk_right + walk_right + walk_right + walk_right step_end PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8 @@ -2371,7 +2371,7 @@ EventScript_27222B:: @ 827222B return Movement_27224E: @ 827224E - step_up + walk_up step_end BattleFrontier_OutsideWest_EventScript_272250:: @ 8272250 @@ -2533,27 +2533,27 @@ Route119_EventScript_2723C1:: @ 82723C1 FortreeCity_Movement_2723C7: @ 82723C7 Route119_Movement_2723C7: @ 82723C7 Route120_Movement_2723C7: @ 82723C7 - step_55 - step_12 - step_54 - step_12 - step_55 - step_12 - step_54 - step_12 - step_55 - step_13 - step_54 - step_13 - step_55 - step_13 - step_54 - step_13 - step_55 - step_14 - step_54 - step_14 - step_55 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_16 + set_invisible + delay_16 + set_visible step_end LittlerootTown_ProfessorBirchsLab_EventScript_2723DD:: @ 82723DD @@ -2652,7 +2652,7 @@ EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F return SlateportCity_Movement_272596: @ 8272596 - step_57 + emote_question_mark step_end AquaHideout_B2F_Movement_272598: @ 8272598 @@ -2697,7 +2697,7 @@ SeafloorCavern_Room9_Movement_272598: @ 8272598 SlateportCity_Movement_272598: @ 8272598 SlateportCity_OceanicMuseum_1F_Movement_272598: @ 8272598 SlateportCity_PokemonFanClub_Movement_272598: @ 8272598 - step_56 + emote_exclamation_mark step_end BattleFrontier_BattleTowerBattleRoom_Movement_27259A: @ 827259A @@ -2738,9 +2738,9 @@ SeafloorCavern_Room9_Movement_27259A: @ 827259A SlateportCity_Movement_27259A: @ 827259A SlateportCity_OceanicMuseum_1F_Movement_27259A: @ 827259A SlateportCity_PokemonFanClub_Movement_27259A: @ 827259A - step_14 - step_14 - step_14 + delay_16 + delay_16 + delay_16 step_end AquaHideout_B2F_Movement_27259E: @ 827259E @@ -2784,11 +2784,11 @@ SeafloorCavern_Room9_Movement_27259E: @ 827259E SlateportCity_Movement_27259E: @ 827259E SlateportCity_SternsShipyard_1F_Movement_27259E: @ 827259E SootopolisCity_Movement_27259E: @ 827259E - step_3e + face_player step_end BattleFrontier_OutsideWest_Movement_2725A0: @ 82725A0 - step_3f + face_away_player step_end BattleFrontier_Lounge3_Movement_2725A2: @ 82725A2 @@ -2825,7 +2825,7 @@ SlateportCity_OceanicMuseum_2F_Movement_2725A2: @ 82725A2 SlateportCity_SternsShipyard_1F_Movement_2725A2: @ 82725A2 SootopolisCity_Movement_2725A2: @ 82725A2 VerdanturfTown_Movement_2725A2: @ 82725A2 - step_4e + face_original_direction step_end AquaHideout_B2F_Movement_2725A4: @ 82725A4 @@ -2869,7 +2869,7 @@ SlateportCity_Movement_2725A4: @ 82725A4 SlateportCity_OceanicMuseum_1F_Movement_2725A4: @ 82725A4 SlateportCity_OceanicMuseum_2F_Movement_2725A4: @ 82725A4 SootopolisCity_Movement_2725A4: @ 82725A4 - step_27 + walk_in_place_fastest_left step_end BattleFrontier_BattleTowerCorridor2_Movement_2725A6: @ 82725A6 @@ -2916,7 +2916,7 @@ SlateportCity_Movement_2725A6: @ 82725A6 SlateportCity_OceanicMuseum_2F_Movement_2725A6: @ 82725A6 SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6: @ 82725A6 VerdanturfTown_BattleTentBattleRoom_Movement_2725A6: @ 82725A6 - step_26 + walk_in_place_fastest_up step_end BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8: @ 82725A8 @@ -2959,7 +2959,7 @@ SlateportCity_OceanicMuseum_1F_Movement_2725A8: @ 82725A8 SlateportCity_OceanicMuseum_2F_Movement_2725A8: @ 82725A8 SootopolisCity_Movement_2725A8: @ 82725A8 VerdanturfTown_BattleTentBattleRoom_Movement_2725A8: @ 82725A8 - step_28 + walk_in_place_fastest_right step_end BattleFrontier_OutsideWest_Movement_2725AA: @ 82725AA @@ -3003,20 +3003,20 @@ SlateportCity_OceanicMuseum_2F_Movement_2725AA: @ 82725AA SouthernIsland_Exterior_Movement_2725AA: @ 82725AA VerdanturfTown_BattleTentBattleRoom_Movement_2725AA: @ 82725AA VictoryRoad_1F_Movement_2725AA: @ 82725AA - step_25 + walk_in_place_fastest_down step_end RustboroCity_Movement_2725AC: @ 82725AC - step_03 + face_right step_end RustboroCity_Movement_2725AE: @ 82725AE - step_02 + face_left step_end BattleFrontier_Mart_Movement_2725B0: @ 82725B0 MeteorFalls_1F_1R_Movement_2725B0: @ 82725B0 - step_00 + face_down step_end MarineCave_End_Movement_2725B2: @ 82725B2 @@ -3025,51 +3025,51 @@ Route118_Movement_2725B2: @ 82725B2 SkyPillar_Top_Movement_2725B2: @ 82725B2 SlateportCity_Movement_2725B2: @ 82725B2 TerraCave_End_Movement_2725B2: @ 82725B2 - step_01 + face_up step_end BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4 MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4 - step_1d + walk_in_place_down step_end BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6 BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6 - step_1f + walk_in_place_left step_end Route121_Movement_2725B8: @ 82725B8 - step_20 + walk_in_place_right step_end EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6 - step_14 - step_14 + delay_16 + delay_16 step_end Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9 - step_up + walk_up step_end Movement_2725CB:: @ 82725CB - step_up - step_up + walk_up + walk_up step_end EventScript_2725CE:: @ 82725CE @@ -4564,8 +4564,8 @@ SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB end SecretBase_RedCave1_Movement_275BB4: @ 8275BB4 - step_up - step_up + walk_up + walk_up step_end EventScript_275BB7:: @ 8275BB7 @@ -6041,7 +6041,7 @@ gUnknown_082A8350:: @ 82A8350 end GraniteCave_B1F_Movement_2A8369: @ 82A8369 - step_54 + set_invisible step_end LilycoveCity_PokemonCenter_1F_EventScript_2A836B:: @ 82A836B @@ -6549,28 +6549,28 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A89AE:: @ 82A89AE end LilycoveCity_PokemonCenter_1F_Movement_2A89B8: @ 82A89B8 - step_03 - step_13 + face_right + delay_8 step_end LilycoveCity_PokemonCenter_1F_Movement_2A89BB: @ 82A89BB - step_02 - step_13 + face_left + delay_8 step_end LilycoveCity_PokemonCenter_1F_Movement_2A89BE: @ 82A89BE - step_00 + face_down step_end LilycoveCity_PokemonCenter_1F_Movement_2A89C0: @ 82A89C0 - step_3e + face_player step_end LilycoveCity_PokemonCenter_1F_Movement_2A89C2: @ 82A89C2 - step_51 - step_48 - step_51 - step_48 + disable_jump_landing_ground_effect + jump_in_place_left + disable_jump_landing_ground_effect + jump_in_place_left step_end LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7 @@ -10280,24 +10280,24 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6E93:: @ 82B6E93 end BattleFrontier_BattleTowerLobby_Movement_2B6E94: @ 82B6E94 - step_18 + walk_fast_right BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 - step_15 - step_15 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_54 - step_31 - step_31 - step_31 + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + set_invisible + slide_down + slide_down + slide_down step_end gText_082B6EA5:: @ 82B6EA5 @@ -13480,7 +13480,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271 BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A: @ 82C427A - step_54 + set_invisible step_end LilycoveCity_ContestLobby_Text_2C427C: @ 82C427C @@ -14701,7 +14701,7 @@ TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF end TrainerHill_1F_Movement_2C83EE:: @ 82C83EE - step_54 + set_invisible step_end EventScript_2C83F0:: @ 82C83F0 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 9a34d2e61..523aa67ca 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -342,8 +342,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 end OldaleTown_PokemonCenter_2F_Movement_276E10: @ 8276E10 - step_up - step_up + walk_up + walk_up step_end OldaleTown_PokemonCenter_2F_EventScript_276E13:: @ 8276E13 @@ -736,52 +736,52 @@ OldaleTown_PokemonCenter_2F_EventScript_27733F:: @ 827733F end OldaleTown_PokemonCenter_2F_Movement_277349: @ 8277349 - step_00 + face_down step_end OldaleTown_PokemonCenter_2F_Movement_27734B: @ 827734B - step_03 + face_right step_end MossdeepCity_GameCorner_1F_Movement_27734D: @ 827734D OldaleTown_PokemonCenter_2F_Movement_27734D: @ 827734D - step_02 + face_left step_end OldaleTown_PokemonCenter_2F_Movement_27734F: @ 827734F - step_down - step_down + walk_down + walk_down step_end Movement_277352: @ 8277352 - step_right - step_up - step_up + walk_right + walk_up + walk_up step_end OldaleTown_PokemonCenter_2F_Movement_277356: @ 8277356 - step_left - step_up - step_up + walk_left + walk_up + walk_up step_end OldaleTown_PokemonCenter_2F_Movement_27735A: @ 827735A - step_up + walk_up step_end OldaleTown_PokemonCenter_2F_Movement_27735C: @ 827735C - step_02 + face_left step_end OldaleTown_PokemonCenter_2F_Movement_27735E: @ 827735E - step_03 + face_right step_end MossdeepCity_GameCorner_1F_Movement_277360: @ 8277360 - step_left - step_up - step_up - step_up + walk_left + walk_up + walk_up + walk_up step_end gUnknown_08277365:: @ 8277365 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index a6a0ebcc2..6a13f39ba 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1248,186 +1248,186 @@ LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF return LinkContestRoom1_Movement_27AD09: @ 827AD09 - step_down + walk_down step_end LinkContestRoom1_Movement_27AD0B: @ 827AD0B - step_40 - step_up - step_41 + lock_facing_direction + walk_up + unlock_facing_direction step_end LinkContestRoom1_Movement_27AD0F: @ 827AD0F - step_28 + walk_in_place_fastest_right step_end LinkContestRoom1_Movement_27AD11: @ 827AD11 - step_58 + emote_heart step_end LinkContestRoom1_Movement_27AD13: @ 827AD13 - step_25 + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD15: @ 827AD15 - step_left - step_left - step_25 + walk_left + walk_left + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD19: @ 827AD19 - step_right - step_right - step_25 + walk_right + walk_right + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD1D: @ 827AD1D - step_up - step_25 + walk_up + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD20: @ 827AD20 - step_14 - step_14 + delay_16 + delay_16 step_end LinkContestRoom1_Movement_27AD23: @ 827AD23 - step_28 + walk_in_place_fastest_right step_end LinkContestRoom1_Movement_27AD25: @ 827AD25 - step_27 + walk_in_place_fastest_left step_end LinkContestRoom1_Movement_27AD27: @ 827AD27 - step_25 + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD29: @ 827AD29 - step_left - step_left - step_up + walk_left + walk_left + walk_up step_end LinkContestRoom1_Movement_27AD2D: @ 827AD2D - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_up step_end LinkContestRoom1_Movement_27AD33: @ 827AD33 - step_02 - step_14 - step_4e + face_left + delay_16 + face_original_direction step_end LinkContestRoom1_Movement_27AD37: @ 827AD37 - step_01 - step_14 - step_4e + face_up + delay_16 + face_original_direction step_end LinkContestRoom1_Movement_27AD3B: @ 827AD3B - step_03 - step_14 - step_4e + face_right + delay_16 + face_original_direction step_end LinkContestRoom1_Movement_27AD3F: @ 827AD3F - step_00 - step_14 - step_4e + face_down + delay_16 + face_original_direction step_end LinkContestRoom1_Movement_27AD43: @ 827AD43 - step_01 + face_up step_end LinkContestRoom1_Movement_27AD45: @ 827AD45 - step_01 - step_14 - step_28 + face_up + delay_16 + walk_in_place_fastest_right step_end LinkContestRoom1_Movement_27AD49: @ 827AD49 - step_27 - step_14 - step_14 - step_25 + walk_in_place_fastest_left + delay_16 + delay_16 + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD4E: @ 827AD4E - step_14 - step_14 - step_25 + delay_16 + delay_16 + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD52: @ 827AD52 - step_up - step_right - step_right - step_right - step_26 + walk_up + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD58: @ 827AD58 - step_17 - step_17 - step_17 - step_15 - step_26 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_down + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD5E: @ 827AD5E - step_up - step_right - step_26 + walk_up + walk_right + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD62: @ 827AD62 - step_17 - step_15 - step_26 + walk_fast_left + walk_fast_down + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD66: @ 827AD66 - step_up - step_left - step_26 + walk_up + walk_left + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD6A: @ 827AD6A - step_18 - step_15 - step_26 + walk_fast_right + walk_fast_down + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD6E: @ 827AD6E - step_up - step_left - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD74: @ 827AD74 - step_18 - step_18 - step_18 - step_15 - step_26 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD7A: @ 827AD7A - step_right - step_right - step_up + walk_right + walk_right + walk_up step_end LinkContestRoom1_Movement_27AD7E: @ 827AD7E - step_up + walk_up step_end LinkContestRoom1_EventScript_27AD80:: @ 827AD80 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 07ed1b82d..d9b8a89ac 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -240,25 +240,25 @@ Route117_PokemonDayCare_EventScript_291F3D:: @ 8291F3D end Route117_PokemonDayCare_Movement_291F47: @ 8291F47 - step_14 - step_14 - step_02 - step_14 - step_14 - step_03 - step_14 - step_14 - step_01 - slow_step_up - step_54 - step_14 - step_14 - step_14 - step_14 - step_14 - step_00 - step_55 - slow_step_down + delay_16 + delay_16 + face_left + delay_16 + delay_16 + face_right + delay_16 + delay_16 + face_up + walk_slow_up + set_invisible + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + face_down + set_visible + walk_slow_down step_end Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 44631cc20..df25056ea 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -43,7 +43,7 @@ Route103_EventScript_290710:: @ 8290710 end Route103_Movement_29071F: @ 829071F - step_5b + cut_tree step_end Route103_EventScript_290721:: @ 8290721 @@ -128,7 +128,7 @@ Route111_EventScript_290829:: @ 8290829 end Route111_Movement_29082B: @ 829082B - step_5a + rock_smash_break step_end Route111_EventScript_29082D:: @ 829082D diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 0cf683bb8..5a03a0e98 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -270,15 +270,15 @@ Route120_EventScript_28CFC3:: @ 828CFC3 end Route111_Movement_28D04D: @ 828D04D - step_1d + walk_in_place_down step_end Route111_Movement_28D04F: @ 828D04F - step_1e + walk_in_place_up step_end Route111_Movement_28D051: @ 828D051 - step_1f + walk_in_place_left step_end Route111_EventScript_28D053:: @ 828D053 diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index ccf8997d7..fd3868512 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -53,17 +53,17 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25 end AquaHideout_B2F_Movement_233E80: @ 8233E80 - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end AquaHideout_B2F_Movement_233E85: @ 8233E85 - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right step_end AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc index 2f952936f..27ea23b59 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc @@ -457,75 +457,75 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9 return BattleFrontier_BattleArenaBattleRoom_Movement_257BE2: @ 8257BE2 - step_right - step_right + walk_right + walk_right BattleFrontier_BattleArenaBattleRoom_Movement_257BE4: @ 8257BE4 - step_right + walk_right BattleFrontier_BattleArenaBattleRoom_Movement_257BE5: @ 8257BE5 - step_right + walk_right step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BE7: @ 8257BE7 - step_left - step_left - step_28 + walk_left + walk_left + walk_in_place_fastest_right step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BEB: @ 8257BEB - step_26 + walk_in_place_fastest_up step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BED: @ 8257BED - step_28 + walk_in_place_fastest_right step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BEF: @ 8257BEF - step_left - step_left + walk_left + walk_left BattleFrontier_BattleArenaBattleRoom_Movement_257BF1: @ 8257BF1 - step_left + walk_left BattleFrontier_BattleArenaBattleRoom_Movement_257BF2: @ 8257BF2 - step_left + walk_left step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BF4: @ 8257BF4 - step_17 - step_17 - step_17 - step_17 - step_17 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BFA: @ 8257BFA - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C02: @ 8257C02 - step_51 - step_46 + disable_jump_landing_ground_effect + jump_in_place_down step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C05: @ 8257C05 - step_51 - step_47 + disable_jump_landing_ground_effect + jump_in_place_up step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C08: @ 8257C08 - step_25 + walk_in_place_fastest_down step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C0A: @ 8257C0A - step_28 + walk_in_place_fastest_right step_end BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C: @ 8257C0C @@ -541,20 +541,20 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16 end BattleFrontier_BattleArenaBattleRoom_Movement_257C30: @ 8257C30 - step_down - step_27 - step_14 - step_14 - step_14 - step_14 - step_up - step_up - step_27 + walk_down + walk_in_place_fastest_left + delay_16 + delay_16 + delay_16 + delay_16 + walk_up + walk_up + walk_in_place_fastest_left step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C3A: @ 8257C3A - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end BattleFrontier_BattleArenaBattleRoom_Text_257C3D: @ 8257C3D diff --git a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc index cecd5b44c..83b602fc4 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc @@ -25,63 +25,63 @@ BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 end BattleFrontier_BattleArenaCorridor_Movement_257417: @ 8257417 - step_up - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_right - step_right - step_right + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right step_end BattleFrontier_BattleArenaCorridor_Movement_25742C: @ 825742C - step_right - step_54 + walk_right + set_invisible step_end BattleFrontier_BattleArenaCorridor_Movement_25742F: @ 825742F - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_right - step_right - step_right - step_right + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right step_end BattleFrontier_BattleArenaCorridor_Movement_257444: @ 8257444 - step_27 + walk_in_place_fastest_left step_end BattleFrontier_BattleArenaCorridor_Movement_257446: @ 8257446 - step_up - step_25 + walk_up + walk_in_place_fastest_down step_end BattleFrontier_BattleArenaCorridor_Text_257449: @ 8257449 diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc index 68ac57fcd..7a0695445 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc @@ -271,39 +271,39 @@ BattleFrontier_BattleArenaLobby_EventScript_256005:: @ 8256005 return BattleFrontier_BattleArenaLobby_Movement_256034: @ 8256034 - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_left - step_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end BattleFrontier_BattleArenaLobby_Movement_25603E: @ 825603E - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleArenaLobby_Movement_256041: @ 8256041 - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end BattleFrontier_BattleArenaLobby_Movement_25604C: @ 825604C - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050 @@ -320,26 +320,26 @@ BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050 return BattleFrontier_BattleArenaLobby_Movement_25607F: @ 825607F - step_up - step_up - step_up - step_right - step_right - step_right - step_right - step_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up step_end BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088 - step_up - step_up - step_up - step_up - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092 diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc index 52981a07d..c46358aed 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc @@ -669,214 +669,214 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652 BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773 BattleFrontier_BattleDomeBattleRoom_Movement_24C773: @ 824C773 - step_54 + set_invisible step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C775: @ 824C775 - step_55 - step_14 - step_up - step_up - step_up - step_right + set_visible + delay_16 + walk_up + walk_up + walk_up + walk_right BattleFrontier_BattleDomeBattleRoom_Movement_24C77B: @ 824C77B - step_right + walk_right step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C77D: @ 824C77D - step_up + walk_up step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C77F: @ 824C77F - step_55 - step_14 - step_up - step_up - step_up - step_right - step_right + set_visible + delay_16 + walk_up + walk_up + walk_up + walk_right + walk_right step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C787: @ 824C787 - step_right + walk_right step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C789: @ 824C789 - step_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C78B: @ 824C78B - step_01 - step_54 + face_up + set_invisible step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C78E: @ 824C78E - step_55 - step_up - step_up - step_up - step_02 - step_13 - step_12 - step_00 - step_13 - step_12 - step_03 - step_13 - step_12 - step_01 - step_13 - step_12 - step_02 - step_14 - step_16 - step_16 - step_02 - step_13 - step_12 - step_00 - step_13 - step_12 - step_03 - step_13 - step_12 - step_01 - step_13 - step_12 - step_02 - fast_step_left - step_41 - step_01 - step_40 - fast_step_left - fast_step_left - step_41 - step_03 - step_40 - fast_step_left - step_41 - step_00 - step_11 - step_02 - step_13 - step_12 - step_01 - step_13 - step_12 - step_03 - step_13 - step_12 - step_00 - step_13 - step_12 - step_02 - step_12 - step_01 - step_12 - step_03 - step_12 - step_00 - step_12 - step_02 - step_11 - step_01 - step_11 - step_03 - step_11 - step_00 - step_11 - step_02 - step_40 - step_right - slow_step_right - step_right - slow_step_right - step_41 - step_01 - step_14 - step_47 - step_47 - step_14 - step_right - step_right - step_right - step_47 - step_14 - step_right - step_down - step_down - step_02 - step_11 - step_01 - step_11 - step_03 - step_11 - step_00 - step_11 - step_02 - step_12 - step_left - step_left + set_visible + walk_up + walk_up + walk_up + face_left + delay_8 + delay_4 + face_down + delay_8 + delay_4 + face_right + delay_8 + delay_4 + face_up + delay_8 + delay_4 + face_left + delay_16 + walk_fast_up + walk_fast_up + face_left + delay_8 + delay_4 + face_down + delay_8 + delay_4 + face_right + delay_8 + delay_4 + face_up + delay_8 + delay_4 + face_left + jump_2_left + unlock_facing_direction + face_up + lock_facing_direction + jump_2_left + jump_2_left + unlock_facing_direction + face_right + lock_facing_direction + jump_2_left + unlock_facing_direction + face_down + delay_2 + face_left + delay_8 + delay_4 + face_up + delay_8 + delay_4 + face_right + delay_8 + delay_4 + face_down + delay_8 + delay_4 + face_left + delay_4 + face_up + delay_4 + face_right + delay_4 + face_down + delay_4 + face_left + delay_2 + face_up + delay_2 + face_right + delay_2 + face_down + delay_2 + face_left + lock_facing_direction + walk_right + walk_slow_right + walk_right + walk_slow_right + unlock_facing_direction + face_up + delay_16 + jump_in_place_up + jump_in_place_up + delay_16 + walk_right + walk_right + walk_right + jump_in_place_up + delay_16 + walk_right + walk_down + walk_down + face_left + delay_2 + face_up + delay_2 + face_right + delay_2 + face_down + delay_2 + face_left + delay_4 + walk_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9: @ 824C7F9 - step_14 - step_14 - step_left - step_left - step_28 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_right - step_right - step_25 + delay_16 + delay_16 + walk_left + walk_left + walk_in_place_fastest_right + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_right + walk_right + walk_in_place_fastest_down step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C829: @ 824C829 - step_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C82B: @ 824C82B - step_left - step_left + walk_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E @@ -978,50 +978,50 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 return BattleFrontier_BattleDomeBattleRoom_Movement_24C94B: @ 824C94B - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_13 - step_51 - step_46 - step_12 - step_46 - step_50 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + disable_jump_landing_ground_effect + jump_in_place_down + delay_4 + jump_in_place_down + enable_jump_landing_ground_effect step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C95E: @ 824C95E - step_down - step_down - step_right - step_right - step_25 + walk_down + walk_down + walk_right + walk_right + walk_in_place_fastest_down step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C964: @ 824C964 - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C969: @ 824C969 - step_27 + walk_in_place_fastest_left step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C96B: @ 824C96B - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_Text_24C970: @ 824C970 diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc index ad6204fd5..6a97382d4 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc @@ -46,107 +46,107 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F end BattleFrontier_BattleDomeCorridor_Movement_24B1A1: @ 824B1A1 - step_up - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end BattleFrontier_BattleDomeCorridor_Movement_24B1AE: @ 824B1AE - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end BattleFrontier_BattleDomeCorridor_Movement_24B1BE: @ 824B1BE - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1 - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end BattleFrontier_BattleDomeCorridor_Movement_24B1D2: @ 824B1D2 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up step_end BattleFrontier_BattleDomeCorridor_Movement_24B1E6: @ 824B1E6 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleDomeCorridor_Movement_24B1E9: @ 824B1E9 - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_54 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + set_invisible step_end diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc index 35bf3f5a6..b08d0ca89 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc @@ -390,22 +390,22 @@ BattleFrontier_BattleDomeLobby_EventScript_249D3F:: @ 8249D3F return BattleFrontier_BattleDomeLobby_Movement_249D45: @ 8249D45 - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleDomeLobby_Movement_249D4B: @ 8249D4B - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52 diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc index f3693e179..d19b4b999 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc @@ -280,24 +280,24 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646:: @ 824B646 return BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F: @ 824B64F - step_right - step_02 + walk_right + face_left step_end BattleFrontier_BattleDomePreBattleRoom_Movement_24B652: @ 824B652 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleDomePreBattleRoom_Movement_24B657: @ 824B657 - step_up + walk_up step_end BattleFrontier_BattleDomePreBattleRoom_Movement_24B659: @ 824B659 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleDomePreBattleRoom_Text_24B65C: @ 824B65C diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc index bd76e111d..cdfd6edd6 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc @@ -261,32 +261,32 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 end BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B: @ 825B17B - step_up - step_up - step_up - step_up - step_up - step_03 + walk_up + walk_up + walk_up + walk_up + walk_up + face_right step_end BattleFrontier_BattleFactoryBattleRoom_Movement_25B182: @ 825B182 - step_right + walk_right step_end BattleFrontier_BattleFactoryBattleRoom_Movement_25B184: @ 825B184 - step_down - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B - step_up - step_up - step_up - step_02 + walk_up + walk_up + walk_up + face_left step_end BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190 diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc index 640e96b4d..4f2dea343 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc @@ -261,17 +261,17 @@ BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D end BattleFrontier_BattleFactoryLobby_Movement_2587A7: @ 82587A7 - step_up - step_up - step_up - step_54 + walk_up + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleFactoryLobby_Movement_2587AC: @ 82587AC - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleFactoryLobby_EventScript_2587B1:: @ 82587B1 diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc index 93a5f2caf..875a3a220 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -457,65 +457,65 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B:: @ 825A18B return BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0: @ 825A1A0 - step_up - step_left - step_left - step_up - step_up + walk_up + walk_left + walk_left + walk_up + walk_up step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6: @ 825A1A6 - step_up - step_right - step_right - step_up - step_up + walk_up + walk_right + walk_right + walk_up + walk_up step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC: @ 825A1AC - step_up - step_up - step_up - step_up - step_up - step_00 + walk_up + walk_up + walk_up + walk_up + walk_up + face_down step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3: @ 825A1B3 - step_left - step_left - step_up - step_up - step_54 + walk_left + walk_left + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9: @ 825A1B9 - step_right - step_right - step_up - step_up - step_54 + walk_right + walk_right + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF: @ 825A1BF - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3: @ 825A1C3 - step_right - step_right - step_right - step_00 + walk_right + walk_right + walk_right + face_down step_end BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8: @ 825A1C8 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc index 5aff5ad81..07ccbe79d 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc @@ -394,68 +394,68 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89:: @ 824FE89 return BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90: @ 824FE90 - step_54 + set_invisible step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92: @ 824FE92 - step_55 - step_up - step_up - step_up - step_up + set_visible + walk_up + walk_up + walk_up + walk_up BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97: @ 824FE97 - step_03 + face_right step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99: @ 824FE99 - step_01 + face_up step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B: @ 824FE9B - step_55 - step_up - step_up - step_up - step_up + set_visible + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1: @ 824FEA1 - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7: @ 824FEA7 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC: @ 824FEAC - step_00 + face_down step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAE: @ 824FEAE - step_55 - slow_step_down - slow_step_down - step_02 + set_visible + walk_slow_down + walk_slow_down + face_left step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB3: @ 824FEB3 - step_55 - slow_step_down + set_visible + walk_slow_down step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6 - slow_step_down - slow_step_down - slow_step_down - step_02 + walk_slow_down + walk_slow_down + walk_slow_down + face_left step_end BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB @@ -472,42 +472,42 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5:: @ 824FED5 end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF: @ 824FEDF - step_14 - step_14 - step_55 - step_down - step_right - step_down - step_27 + delay_16 + delay_16 + set_visible + walk_down + walk_right + walk_down + walk_in_place_fastest_left step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7: @ 824FEE7 - step_55 - step_15 - step_18 - step_15 - step_15 - step_15 - step_15 - step_15 - step_27 - step_14 + set_visible + walk_fast_down + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_in_place_fastest_left + delay_16 step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2: @ 824FEF2 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_55 - slow_step_down - slow_step_down - slow_step_down - slow_step_down - step_02 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + set_visible + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + face_left step_end BattleFrontier_BattlePalaceBattleRoom_Text_24FF00: @ 824FF00 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc index 91fb31ad3..89697ff33 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc @@ -80,54 +80,54 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF:: @ 824F5AF return BattleFrontier_BattlePalaceCorridor_Movement_24F5B8: @ 824F5B8 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5BD: @ 824F5BD - step_up - step_up - step_left - step_left - step_up - step_up + walk_up + walk_up + walk_left + walk_left + walk_up + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5C4: @ 824F5C4 - step_up - step_up - step_up - step_left - step_left - step_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5CB: @ 824F5CB - step_up - step_right - step_right - step_up - step_up - step_up + walk_up + walk_right + walk_right + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5D2: @ 824F5D2 - step_up - step_up - step_right - step_right - step_up - step_up + walk_up + walk_up + walk_right + walk_right + walk_up + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5D9: @ 824F5D9 - step_up + walk_up BattleFrontier_BattlePalaceCorridor_Movement_24F5DA: @ 824F5DA - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattlePalaceCorridor_Text_24F5DD: @ 824F5DD diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc index 067e18fa2..a5cb11081 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc @@ -345,18 +345,18 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC41:: @ 824DC41 return BattleFrontier_BattlePalaceLobby_Movement_24DC47: @ 824DC47 - step_up + walk_up step_end BattleFrontier_BattlePalaceLobby_Movement_24DC49: @ 824DC49 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattlePalaceLobby_Movement_24DC4C: @ 824DC4C - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc index 5293b6cfa..4171da314 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc @@ -46,21 +46,21 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801 end BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B - step_up - step_up + walk_up + walk_up step_end BattleFrontier_BattlePikeCorridor_Movement_25C80E: @ 825C80E - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattlePikeCorridor_Movement_25C812: @ 825C812 - step_up - step_up - step_left - step_00 + walk_up + walk_up + walk_left + face_down step_end BattleFrontier_BattlePikeCorridor_Text_25C817: @ 825C817 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc index 0cee28347..74bdb1d78 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc @@ -268,12 +268,12 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94 return BattleFrontier_BattlePikeLobby_Movement_25BAA6: @ 825BAA6 - step_up + walk_up BattleFrontier_BattlePikeLobby_Movement_25BAA7: @ 825BAA7 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattlePikeLobby_EventScript_25BAAB:: @ 825BAAB diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc index bcaa7dfe1..fd5fd81e0 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc @@ -440,141 +440,141 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B return BattleFrontier_BattlePikeRandomRoom1_Movement_25D795: @ 825D795 - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D798: @ 825D798 - step_up - step_up - step_up - step_54 - step_up + walk_up + walk_up + walk_up + set_invisible + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E: @ 825D79E - step_up - step_54 - step_up + walk_up + set_invisible + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2: @ 825D7A2 - step_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4: @ 825D7A4 - step_down - step_02 - step_14 - step_14 - step_00 + walk_down + face_left + delay_16 + delay_16 + face_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA: @ 825D7AA - step_15 - step_18 - step_18 - step_15 - step_17 - step_00 + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_left + face_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1: @ 825D7B1 - step_01 + face_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3: @ 825D7B3 - step_left + walk_left BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4: @ 825D7B4 - step_03 + face_right step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6: @ 825D7B6 - step_down - step_down - step_right - step_00 + walk_down + walk_down + walk_right + face_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB: @ 825D7BB - step_02 + face_left step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD: @ 825D7BD - step_03 + face_right step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF: @ 825D7BF - step_01 + face_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1: @ 825D7C1 - step_right + walk_right step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3: @ 825D7C3 - step_left + walk_left step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5: @ 825D7C5 - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8: @ 825D7C8 - step_03 + face_right step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA: @ 825D7CA - step_02 + face_left step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC: @ 825D7CC - step_up - step_up - step_up - step_right - step_up - step_54 - step_up + walk_up + walk_up + walk_up + walk_right + walk_up + set_invisible + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4: @ 825D7D4 - step_up - step_up - step_up - step_left - step_up - step_54 - step_up + walk_up + walk_up + walk_up + walk_left + walk_up + set_invisible + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC: @ 825D7DC - step_up - step_up + walk_up + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF: @ 825D7DF - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2: @ 825D7E2 - step_up - step_up - step_up - step_54 + walk_up + walk_up + walk_up + set_invisible step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7: @ 825D7E7 - step_55 - step_down + set_visible + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA - step_left - step_03 + walk_left + face_right step_end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED @@ -689,13 +689,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D:: @ 825D96D return BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0: @ 825D9B0 - step_up - step_up + walk_up + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B3: @ 825D9B3 - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6: @ 825D9B6 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc index 14f543284..39045c317 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc @@ -24,8 +24,8 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 end BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB: @ 825E3DB - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc index 6952412f2..6bef7ba12 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc @@ -267,22 +267,22 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2:: @ 825CBC2 end BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE: @ 825CBCE - step_left - step_left - step_down - step_down - step_down - step_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down step_end BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5: @ 825CBD5 - step_up - step_up - step_up - step_up - step_right - step_right - step_00 + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + face_down step_end BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD: @ 825CBDD diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc index 2862722ce..e92c8d97f 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc @@ -462,34 +462,34 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C return BattleFrontier_BattlePyramidLobby_Movement_250DC4: @ 8250DC4 - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_00 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + face_down step_end BattleFrontier_BattlePyramidLobby_Movement_250DCD: @ 8250DCD - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePyramidLobby_Movement_250DD5: @ 8250DD5 - step_right - step_02 + walk_right + face_left step_end BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8 - step_up - step_up + walk_up + walk_up step_end BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc index 05cee99b9..9d83ab4e0 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -235,32 +235,32 @@ BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED return BattleFrontier_BattlePyramidTop_Movement_2553FD: @ 82553FD - step_right - step_27 + walk_right + walk_in_place_fastest_left step_end BattleFrontier_BattlePyramidTop_Movement_255400: @ 8255400 - step_left - step_26 + walk_left + walk_in_place_fastest_up step_end BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403 - step_up - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end BattleFrontier_BattlePyramidTop_Movement_25540A: @ 825540A - step_15 + walk_fast_down step_end BattleFrontier_BattlePyramidTop_Movement_25540C: @ 825540C - slow_step_up - slow_step_up - step_14 + walk_slow_up + walk_slow_up + delay_16 step_end BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc index 63306af2a..087752d8f 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc @@ -394,92 +394,92 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170 return BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179 - step_up - step_up - step_up - step_03 + walk_up + walk_up + walk_up + face_right step_end BattleFrontier_BattleTowerBattleRoom_Movement_24217E: @ 824217E - step_00 + face_down step_end BattleFrontier_BattleTowerBattleRoom_Movement_242180: @ 8242180 - step_03 + face_right step_end BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182 - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattleTowerBattleRoom_Movement_242188: @ 8242188 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleTowerBattleRoom_Movement_24218D: @ 824218D - step_right - step_right - step_right - step_up + walk_right + walk_right + walk_right + walk_up step_end BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192 - step_down - step_left - step_left - step_left - step_03 + walk_down + walk_left + walk_left + walk_left + face_right step_end BattleFrontier_BattleTowerBattleRoom_Movement_242198: @ 8242198 - step_54 + set_invisible step_end BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A - step_55 - step_14 - step_up - step_left - step_left - step_13 + set_visible + delay_16 + walk_up + walk_left + walk_left + delay_8 step_end BattleFrontier_BattleTowerBattleRoom_Movement_2421A1: @ 82421A1 - step_right - step_right - step_down - step_54 + walk_right + walk_right + walk_down + set_invisible step_end BattleFrontier_BattleTowerBattleRoom_Movement_2421A6: @ 82421A6 - step_14 - step_14 - step_14 - step_14 + delay_16 + delay_16 + delay_16 + delay_16 step_end BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB - step_03 - step_14 - step_14 - step_14 - step_14 - step_20 + face_right + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_right step_end BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2 - slow_step_down - slow_step_down - slow_step_down - slow_step_down - step_02 + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + face_left step_end BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc index f22b0de26..81c2dd563 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc @@ -415,72 +415,72 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249514:: @ 8249514 return BattleFrontier_BattleTowerBattleRoom2_Movement_249518: @ 8249518 - step_up - step_up - step_up - step_up - step_03 + walk_up + walk_up + walk_up + walk_up + face_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E - step_left - step_up - step_up - step_up - step_03 + walk_left + walk_up + walk_up + walk_up + face_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524 - step_02 + face_left step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526 - step_28 + walk_in_place_fastest_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528 - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E - step_right - step_down - step_down - step_down - step_02 + walk_right + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534 - step_up - step_up - step_up - step_54 + walk_up + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E - step_right - step_right + walk_right + walk_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541 - step_left - step_left - step_28 + walk_left + walk_left + walk_in_place_fastest_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545 - step_1f + walk_in_place_left step_end BattleFrontier_BattleTowerBattleRoom2_Text_249547: @ 8249547 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc index a1dfa2abc..ef1102175 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc @@ -40,20 +40,20 @@ BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 end BattleFrontier_BattleTowerCorridor_Movement_241B36: @ 8241B36 - step_right + walk_right BattleFrontier_BattleTowerCorridor_Movement_241B37: @ 8241B37 - step_right - step_right + walk_right + walk_right BattleFrontier_BattleTowerCorridor_Movement_241B39: @ 8241B39 - step_right + walk_right BattleFrontier_BattleTowerCorridor_Movement_241B3A: @ 8241B3A - step_right - step_right - step_right - step_up - step_54 + walk_right + walk_right + walk_right + walk_up + set_invisible step_end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc index af2c67eac..39157609e 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc @@ -113,60 +113,60 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248EB2:: @ 8248EB2 return BattleFrontier_BattleTowerCorridor2_Movement_248EBC: @ 8248EBC - step_down - step_right - step_right - step_right - step_right - step_right - step_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end BattleFrontier_BattleTowerCorridor2_Movement_248EC4: @ 8248EC4 - step_down - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end BattleFrontier_BattleTowerCorridor2_Movement_248ECC: @ 8248ECC - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_28 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_in_place_fastest_right step_end BattleFrontier_BattleTowerCorridor2_Movement_248ED5: @ 8248ED5 - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_27 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_in_place_fastest_left step_end BattleFrontier_BattleTowerCorridor2_Movement_248EDE: @ 8248EDE - step_14 - step_up - step_up - step_54 + delay_16 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleTowerCorridor2_Movement_248EE3: @ 8248EE3 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleTowerCorridor2_Movement_248EE6: @ 8248EE6 - step_down + walk_down step_end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc index 095e75394..433d8e181 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc @@ -57,27 +57,27 @@ BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C return BattleFrontier_BattleTowerElevator_Movement_241A86: @ 8241A86 - step_up - step_right - step_00 + walk_up + walk_right + face_down step_end BattleFrontier_BattleTowerElevator_Movement_241A8A: @ 8241A8A - step_up - step_up - step_00 + walk_up + walk_up + face_down step_end BattleFrontier_BattleTowerElevator_Movement_241A8E: @ 8241A8E - step_down - step_down - step_54 + walk_down + walk_down + set_invisible step_end BattleFrontier_BattleTowerElevator_Movement_241A92: @ 8241A92 - step_right - step_down - step_down + walk_right + walk_down + walk_down step_end BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc index 9f2099b32..d899b1cbe 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc @@ -781,29 +781,29 @@ BattleFrontier_BattleTowerLobby_EventScript_23F15B:: @ 823F15B return BattleFrontier_BattleTowerLobby_Movement_23F195: @ 823F195 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleTowerLobby_Movement_23F199: @ 823F199 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleTowerLobby_Movement_23F19C: @ 823F19C - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0 - step_16 - step_16 - step_16 - step_16 - step_16 - step_54 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + set_invisible step_end BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc index e6c99541d..c1d3534d3 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -74,12 +74,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75: @ 8243E75 - step_down + walk_down step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77: @ 8243E77 - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A @@ -136,26 +136,26 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08 return BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A: @ 8243F1A - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E: @ 8243F1E - step_right - step_up - step_54 + walk_right + walk_up + set_invisible step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22: @ 8243F22 - step_left - step_up - step_54 + walk_left + walk_up + set_invisible step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26: @ 8243F26 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29 @@ -223,24 +223,24 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF:: @ 8243FDF return BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FEA: @ 8243FEA - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FF2: @ 8243FF2 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB:: @ 8243FFB diff --git a/data/scripts/maps/BattleFrontier_OutsideEast.inc b/data/scripts/maps/BattleFrontier_OutsideEast.inc index bf0d3ff16..dff56322a 100644 --- a/data/scripts/maps/BattleFrontier_OutsideEast.inc +++ b/data/scripts/maps/BattleFrontier_OutsideEast.inc @@ -151,21 +151,21 @@ BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60 end BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69 - step_03 - step_13 - step_00 - step_13 - step_02 - step_13 - step_00 - step_13 - step_03 - step_13 - step_00 - step_13 - step_02 - step_13 - step_00 + face_right + delay_8 + face_down + delay_8 + face_left + delay_8 + face_down + delay_8 + face_right + delay_8 + face_down + delay_8 + face_left + delay_8 + face_down step_end BattleFrontier_OutsideEast_EventScript_242D79:: @ 8242D79 diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/scripts/maps/BattleFrontier_OutsideWest.inc index f5886bfff..fa2ff7e36 100644 --- a/data/scripts/maps/BattleFrontier_OutsideWest.inc +++ b/data/scripts/maps/BattleFrontier_OutsideWest.inc @@ -202,23 +202,23 @@ BattleFrontier_OutsideWest_EventScript_23D61E:: @ 823D61E return BattleFrontier_OutsideWest_Movement_23D629: @ 823D629 - step_25 - step_25 + walk_in_place_fastest_down + walk_in_place_fastest_down step_end BattleFrontier_OutsideWest_Movement_23D62C: @ 823D62C - step_26 - step_26 + walk_in_place_fastest_up + walk_in_place_fastest_up step_end BattleFrontier_OutsideWest_Movement_23D62F: @ 823D62F - step_28 - step_28 + walk_in_place_fastest_right + walk_in_place_fastest_right step_end BattleFrontier_OutsideWest_Movement_23D632: @ 823D632 - step_27 - step_27 + walk_in_place_fastest_left + walk_in_place_fastest_left step_end BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 diff --git a/data/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/scripts/maps/BattleFrontier_ReceptionGate.inc index eca861f85..ec38c3e9d 100644 --- a/data/scripts/maps/BattleFrontier_ReceptionGate.inc +++ b/data/scripts/maps/BattleFrontier_ReceptionGate.inc @@ -63,59 +63,59 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 end BattleFrontier_ReceptionGate_Movement_2662D2: @ 82662D2 - step_up - step_up - step_left - step_left + walk_up + walk_up + walk_left + walk_left step_end BattleFrontier_ReceptionGate_Movement_2662D7: @ 82662D7 - step_14 - step_14 - step_14 - step_13 - step_28 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_right step_end BattleFrontier_ReceptionGate_Movement_2662DD: @ 82662DD - step_down - step_down + walk_down + walk_down step_end BattleFrontier_ReceptionGate_Movement_2662E0: @ 82662E0 - step_down - step_down - step_down - step_down - step_down - step_down - step_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left step_end BattleFrontier_ReceptionGate_Movement_2662E8: @ 82662E8 - step_right - step_up - step_up - step_up - step_up - step_up - step_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_ReceptionGate_Movement_2662F0: @ 82662F0 - step_14 - step_14 - step_14 - step_13 - step_28 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_right step_end BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6 - step_14 - step_14 - step_14 - step_13 - step_27 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_left step_end BattleFrontier_ReceptionGate_EventScript_2662FC:: @ 82662FC diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc index 6fd637461..b2427e95d 100644 --- a/data/scripts/maps/BirthIsland_Exterior.inc +++ b/data/scripts/maps/BirthIsland_Exterior.inc @@ -114,12 +114,12 @@ BirthIsland_Exterior_EventScript_268049:: @ 8268049 end BirthIsland_Exterior_Movement_268054: @ 8268054 - slow_step_down - slow_step_down - slow_step_down - slow_step_down - slow_step_down - slow_step_down - slow_step_down + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down step_end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index f78d4ea15..1edc1407d 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -197,401 +197,401 @@ DewfordTown_EventScript_1E9799:: @ 81E9799 return DewfordTown_Movement_1E97A2: @ 81E97A2 - step_up - step_up - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_up - step_up - step_left - step_left - step_17 - step_17 - step_17 - step_17 - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_17 - step_17 - step_17 - step_17 - step_16 - step_16 - step_16 - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_16 - step_16 - step_16 - step_16 - step_17 - step_17 - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_17 - step_17 - step_16 - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_16 - step_16 - step_16 - step_16 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_up + walk_up + walk_left + walk_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_up + walk_up + walk_up + walk_up step_end DewfordTown_Movement_1E9865: @ 81E9865 - step_right - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_16 - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_right + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end DewfordTown_Movement_1E9911: @ 81E9911 - step_right - step_up + walk_right + walk_up step_end DewfordTown_Movement_1E9914: @ 81E9914 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end DewfordTown_Movement_1E9918: @ 81E9918 - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end DewfordTown_Movement_1E991D: @ 81E991D - step_up + walk_up step_end DewfordTown_Movement_1E991F: @ 81E991F - step_up - step_up + walk_up + walk_up step_end DewfordTown_EventScript_1E9922:: @ 81E9922 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 4d4c3732d..37122a640 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -241,11 +241,11 @@ DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 return DewfordTown_Hall_Movement_1FD7D6: @ 81FD7D6 - step_1f + walk_in_place_left step_end DewfordTown_Hall_Movement_1FD7D8: @ 81FD7D8 - step_20 + walk_in_place_right step_end DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 71410a43f..bed242a2b 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -33,8 +33,8 @@ EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E end EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42 - step_up - step_up + walk_up + walk_up step_end EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45 @@ -163,66 +163,66 @@ EverGrandeCity_ChampionsRoom_EventScript_228C12:: @ 8228C12 return EverGrandeCity_ChampionsRoom_Movement_228C1D: @ 8228C1D - step_up - step_up + walk_up + walk_up step_end EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20 - step_up - step_14 - step_up - step_13 - step_54 + walk_up + delay_16 + walk_up + delay_8 + set_invisible step_end EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26 - step_up - step_up - step_up - step_up - step_up - step_left - step_up - step_28 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_in_place_fastest_right step_end EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F - step_26 - step_14 - step_28 - step_14 - step_26 - step_13 - step_28 - step_14 + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_right + delay_16 + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_right + delay_16 step_end EverGrandeCity_ChampionsRoom_Movement_228C38: @ 8228C38 - step_right - step_up + walk_right + walk_up step_end EverGrandeCity_ChampionsRoom_Movement_228C3B: @ 8228C3B - step_up - step_up - step_25 + walk_up + walk_up + walk_in_place_fastest_down step_end EverGrandeCity_ChampionsRoom_Movement_228C3F: @ 8228C3F - step_up - step_13 - step_54 + walk_up + delay_8 + set_invisible step_end EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43 - step_up - step_up - step_up - step_up - step_up - step_right - step_up - step_27 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_in_place_fastest_left step_end EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index de29dca0f..60f0dd1ad 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -67,20 +67,20 @@ EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5 end EverGrandeCity_HallOfFame_Movement_229901: @ 8229901 - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end EverGrandeCity_HallOfFame_Movement_229908: @ 8229908 - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end EverGrandeCity_HallOfFame_Text_22990E: @ 822990E diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index a9e27ec73..ed6e6a497 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -61,21 +61,21 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229AC1:: @ 8229AC1 return EverGrandeCity_PokemonCenter_1F_Movement_229ACC: @ 8229ACC - step_left - step_down - step_down - step_left - step_down - step_down + walk_left + walk_down + walk_down + walk_left + walk_down + walk_down step_end EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3 - step_down - step_down - step_left - step_left - step_down - step_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down step_end EverGrandeCity_PokemonCenter_1F_Text_229ADA: @ 8229ADA diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc index 4fd73b3bf..f1a6ce17f 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc @@ -103,25 +103,25 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB end EverGrandeCity_PokemonLeague_1F_Movement_2296DA: @ 82296DA - step_down - step_left - step_26 + walk_down + walk_left + walk_in_place_fastest_up step_end EverGrandeCity_PokemonLeague_1F_Movement_2296DE: @ 82296DE - step_down - step_right - step_26 + walk_down + walk_right + walk_in_place_fastest_up step_end EverGrandeCity_PokemonLeague_1F_Movement_2296E2: @ 82296E2 - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end EverGrandeCity_PokemonLeague_1F_Movement_2296E5: @ 82296E5 - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end EverGrandeCity_PokemonLeague_1F_Text_2296E8: @ 82296E8 diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc index f6750009d..48703897e 100644 --- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc @@ -203,56 +203,56 @@ FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73 end FallarborTown_BattleTentBattleRoom_Movement_200B8D: @ 8200B8D - step_up - step_up - step_up - step_28 + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end FallarborTown_BattleTentBattleRoom_Movement_200B92: @ 8200B92 - step_28 + walk_in_place_fastest_right step_end FallarborTown_BattleTentBattleRoom_Movement_200B94: @ 8200B94 - step_27 + walk_in_place_fastest_left step_end FallarborTown_BattleTentBattleRoom_Movement_200B96: @ 8200B96 - step_down - step_down - step_down - step_down - step_27 + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end FallarborTown_BattleTentBattleRoom_Movement_200B9C: @ 8200B9C - step_left + walk_left step_end FallarborTown_BattleTentBattleRoom_Movement_200B9E: @ 8200B9E - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end FallarborTown_BattleTentBattleRoom_Movement_200BA3: @ 8200BA3 - step_51 - step_46 + disable_jump_landing_ground_effect + jump_in_place_down step_end FallarborTown_BattleTentBattleRoom_Movement_200BA6: @ 8200BA6 - step_down - step_down - step_down - step_28 + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end FallarborTown_BattleTentBattleRoom_Movement_200BAB: @ 8200BAB - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0 diff --git a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc index 1325b0332..f1d3024c0 100644 --- a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc +++ b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc @@ -26,18 +26,18 @@ FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7 end FallarborTown_BattleTentCorridor_Movement_2006FB: @ 82006FB - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end FallarborTown_BattleTentCorridor_Movement_200700: @ 8200700 - step_up + walk_up FallarborTown_BattleTentCorridor_Movement_200701: @ 8200701 - step_up - step_54 + walk_up + set_invisible step_end FallarborTown_BattleTentCorridor_Text_200704: @ 8200704 diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc index 327221120..1bde88e7d 100644 --- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc +++ b/data/scripts/maps/FallarborTown_BattleTentLobby.inc @@ -257,26 +257,26 @@ FallarborTown_BattleTentLobby_EventScript_2001CF:: @ 82001CF return FallarborTown_BattleTentLobby_Movement_2001FE: @ 82001FE - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end FallarborTown_BattleTentLobby_Movement_200202: @ 8200202 - step_up - step_54 + walk_up + set_invisible step_end FallarborTown_BattleTentLobby_Movement_200205: @ 8200205 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end FallarborTown_BattleTentLobby_Movement_200209: @ 8200209 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end FallarborTown_BattleTentLobby_EventScript_20020D:: @ 820020D diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 1cc3999f7..15f5d2b9e 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -54,31 +54,31 @@ FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48 end FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53 - step_right - step_down - step_down - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_13 + walk_right + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + delay_8 step_end FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60 - step_down - step_down - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_13 + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + delay_8 step_end FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/scripts/maps/FarawayIsland_Interior.inc index 42b18983f..e7d67431d 100644 --- a/data/scripts/maps/FarawayIsland_Interior.inc +++ b/data/scripts/maps/FarawayIsland_Interior.inc @@ -72,51 +72,51 @@ FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2 end FarawayIsland_Interior_Movement_267DCE: @ 8267DCE - step_up - step_up - step_up - step_25 - step_54 + walk_up + walk_up + walk_up + walk_in_place_fastest_down + set_invisible step_end FarawayIsland_Interior_Movement_267DD4: @ 8267DD4 - step_55 + set_visible step_end FarawayIsland_Interior_Movement_267DD6: @ 8267DD6 - step_40 - step_16 - step_16 - step_41 - step_1d - step_1d + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + walk_in_place_down + walk_in_place_down step_end FarawayIsland_Interior_Movement_267DDD: @ 8267DDD - step_40 - step_16 - step_16 - step_41 - step_1e - step_1e + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + walk_in_place_up + walk_in_place_up step_end FarawayIsland_Interior_Movement_267DE4: @ 8267DE4 - step_40 - step_16 - step_16 - step_41 - step_20 - step_20 + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + walk_in_place_right + walk_in_place_right step_end FarawayIsland_Interior_Movement_267DEB: @ 8267DEB - step_40 - step_16 - step_16 - step_41 - step_1f - step_1f + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + walk_in_place_left + walk_in_place_left step_end FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 0b4b71c2b..4a28a180b 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -87,7 +87,7 @@ FortreeCity_EventScript_1E2645:: @ 81E2645 end FortreeCity_Movement_1E2674: @ 81E2674 - step_right + walk_right step_end FortreeCity_Text_1E2676: @ 81E2676 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 521e99021..27ead9ec2 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -49,11 +49,11 @@ FortreeCity_House4_EventScript_217D06:: @ 8217D06 end FortreeCity_House4_Movement_217D1A: @ 8217D1A - step_15 - step_15 - step_18 - step_25 - step_13 + walk_fast_down + walk_fast_down + walk_fast_right + walk_in_place_fastest_down + delay_8 step_end FortreeCity_House4_EventScript_217D20:: @ 8217D20 diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 9d61bc1a5..b057a0548 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -58,30 +58,30 @@ GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C return GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45 - step_up - step_up - step_up - step_up - step_up - step_13 + walk_up + walk_up + walk_up + walk_up + walk_up + delay_8 step_end GraniteCave_StevensRoom_Movement_22DD4C: @ 822DD4C - step_14 - step_14 - step_14 - step_26 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_up step_end GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51 - step_left - step_up - step_up - step_up - step_right - step_up - step_up - step_13 + walk_left + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + delay_8 step_end GraniteCave_StevensRoom_Text_22DD5A: @ 822DD5A diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 8a8e2baed..5670d9b6e 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -162,53 +162,53 @@ LavaridgeTown_EventScript_1EA6C9:: @ 81EA6C9 return LavaridgeTown_Movement_1EA6D4: @ 81EA6D4 - step_18 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end LavaridgeTown_Movement_1EA6DF: @ 81EA6DF - step_14 - step_13 - step_28 + delay_16 + delay_8 + walk_in_place_fastest_right step_end LavaridgeTown_Movement_1EA6E3: @ 81EA6E3 - step_15 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right step_end LavaridgeTown_Movement_1EA6ED: @ 81EA6ED - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end LavaridgeTown_Movement_1EA6F4: @ 81EA6F4 - step_left - step_left - step_up + walk_left + walk_left + walk_up step_end LavaridgeTown_Movement_1EA6F8: @ 81EA6F8 - step_down + walk_down step_end LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 1c4d21970..1f65b88fd 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -160,45 +160,45 @@ LilycoveCity_ContestLobby_EventScript_21A403:: @ 821A403 return LilycoveCity_ContestLobby_Movement_21A407: @ 821A407 - step_down - step_down - step_down - step_right - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end LilycoveCity_ContestLobby_Movement_21A418: @ 821A418 - step_27 + walk_in_place_fastest_left step_end LilycoveCity_ContestLobby_Movement_21A41A: @ 821A41A - step_down - step_down - step_down + walk_down + walk_down + walk_down step_end LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E - step_14 - step_14 - step_14 - step_14 - step_16 - step_16 - step_16 - step_28 + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_right step_end LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427 @@ -275,46 +275,46 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 return LilycoveCity_ContestLobby_Movement_21A533: @ 821A533 - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left step_end LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end LilycoveCity_ContestLobby_Movement_21A545: @ 821A545 - step_28 + walk_in_place_fastest_right step_end LilycoveCity_ContestLobby_Movement_21A547: @ 821A547 - step_down - step_down - step_down + walk_down + walk_down + walk_down step_end LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B - step_14 - step_14 - step_14 - step_14 - step_16 - step_16 - step_16 - step_27 + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_left step_end LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554 @@ -433,47 +433,47 @@ LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670 return LilycoveCity_ContestLobby_Movement_21A6E8: @ 821A6E8 - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible step_end LilycoveCity_ContestLobby_Movement_21A6F2: @ 821A6F2 - step_27 - step_left + walk_in_place_fastest_left + walk_left step_end LilycoveCity_ContestLobby_Movement_21A6F5: @ 821A6F5 - step_left - step_left - step_25 + walk_left + walk_left + walk_in_place_fastest_down step_end LilycoveCity_ContestLobby_Movement_21A6F9: @ 821A6F9 - step_down - step_down - step_26 + walk_down + walk_down + walk_in_place_fastest_up step_end LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible step_end LilycoveCity_ContestLobby_Movement_21A706: @ 821A706 - step_28 + walk_in_place_fastest_right step_end LilycoveCity_ContestLobby_EventScript_21A708:: @ 821A708 @@ -959,48 +959,48 @@ LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49 return LilycoveCity_ContestLobby_Movement_21ACD0: @ 821ACD0 - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_13 - step_54 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + delay_8 + set_invisible step_end LilycoveCity_ContestLobby_Movement_21ACDB: @ 821ACDB - step_right + walk_right step_end LilycoveCity_ContestLobby_Movement_21ACDD: @ 821ACDD - step_right - step_right - step_25 + walk_right + walk_right + walk_in_place_fastest_down step_end LilycoveCity_ContestLobby_Movement_21ACE1: @ 821ACE1 - step_down - step_down - step_26 + walk_down + walk_down + walk_in_place_fastest_up step_end LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5 - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_13 - step_54 + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + delay_8 + set_invisible step_end LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF - step_27 + walk_in_place_fastest_left step_end LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 5f2b79a5d..3468299a9 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -59,20 +59,20 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 end LilycoveCity_CoveLilyMotel_1F_Movement_218259: @ 8218259 - step_03 - step_40 - step_left - step_41 + face_right + lock_facing_direction + walk_left + unlock_facing_direction step_end LilycoveCity_CoveLilyMotel_1F_Movement_21825E: @ 821825E - step_up + walk_up step_end LilycoveCity_CoveLilyMotel_1F_Movement_218260: @ 8218260 - step_00 - step_down - step_01 + face_down + walk_down + face_up step_end LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index f57ca14b5..6357326c1 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -454,16 +454,16 @@ LilycoveCity_Harbor_EventScript_21E626:: @ 821E626 end LilycoveCity_Harbor_Movement_21E630: @ 821E630 - step_right - step_26 + walk_right + walk_in_place_fastest_up step_end LilycoveCity_Harbor_Movement_21E633: @ 821E633 - step_up + walk_up step_end LilycoveCity_Harbor_Movement_21E635: @ 821E635 - step_up + walk_up step_end LilycoveCity_Harbor_EventScript_21E637:: @ 821E637 @@ -491,16 +491,16 @@ LilycoveCity_Harbor_EventScript_21E661:: @ 821E661 return LilycoveCity_Harbor_Movement_21E66C: @ 821E66C - step_28 - step_40 - step_left - step_41 + walk_in_place_fastest_right + lock_facing_direction + walk_left + unlock_facing_direction step_end LilycoveCity_Harbor_Movement_21E671: @ 821E671 - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end LilycoveCity_Harbor_EventScript_21E675:: @ 821E675 @@ -538,43 +538,43 @@ LilycoveCity_Harbor_EventScript_21E6BA:: @ 821E6BA return LilycoveCity_Harbor_Movement_21E6D3: @ 821E6D3 - step_26 - step_13 - step_54 + walk_in_place_fastest_up + delay_8 + set_invisible step_end LilycoveCity_Harbor_Movement_21E6D7: @ 821E6D7 - step_14 - step_up - step_14 - step_54 + delay_16 + walk_up + delay_16 + set_invisible step_end LilycoveCity_Harbor_Movement_21E6DC: @ 821E6DC - step_14 - step_14 - step_14 - step_right - step_26 - step_14 - step_54 + delay_16 + delay_16 + delay_16 + walk_right + walk_in_place_fastest_up + delay_16 + set_invisible step_end LilycoveCity_Harbor_Movement_21E6E4: @ 821E6E4 - step_14 - step_right - step_26 - step_14 - step_54 + delay_16 + walk_right + walk_in_place_fastest_up + delay_16 + set_invisible step_end LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA - step_14 - step_14 - step_14 - step_up - step_14 - step_54 + delay_16 + delay_16 + delay_16 + walk_up + delay_16 + set_invisible step_end LilycoveCity_Harbor_Text_21E6F1: @ 821E6F1 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 8103a623c..507997416 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -70,22 +70,22 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84 end LilycoveCity_LilycoveMuseum_1F_Movement_218D99: @ 8218D99 - step_up + walk_up step_end LilycoveCity_LilycoveMuseum_1F_Movement_218D9B: @ 8218D9B - step_left - step_up + walk_left + walk_up step_end LilycoveCity_LilycoveMuseum_1F_Movement_218D9E: @ 8218D9E - step_right - step_up + walk_right + walk_up step_end LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1 - step_up - step_up + walk_up + walk_up step_end LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4:: @ 8218DA4 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 97dba4704..6b4f0f3da 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -86,12 +86,12 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 end LilycoveCity_LilycoveMuseum_2F_Movement_219861: @ 8219861 - step_27 + walk_in_place_fastest_left step_end LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863 - step_01 - step_14 + face_up + delay_16 step_end LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866 diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index cdcef8e9a..74146fc7e 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -29,35 +29,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A end LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5: @ 821C7F5 - step_13 - step_25 - step_down - step_down - step_down - step_left - step_left + delay_8 + walk_in_place_fastest_down + walk_down + walk_down + walk_down + walk_left + walk_left step_end LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD: @ 821C7FD - step_17 - step_17 - step_15 - step_15 - step_17 - step_15 + walk_fast_left + walk_fast_left + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down step_end LilycoveCity_PokemonTrainerFanClub_Movement_21C804: @ 821C804 - step_down - step_28 + walk_down + walk_in_place_fastest_right step_end LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807 - step_49 - step_16 - step_16 - step_18 - step_25 + jump_in_place_right + walk_fast_up + walk_fast_up + walk_fast_right + walk_in_place_fastest_down step_end LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 0fcdc46d5..67b1f9381 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -146,42 +146,42 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 return LittlerootTown_Movement_1E7F98: @ 81E7F98 - step_down + walk_down step_end LittlerootTown_Movement_1E7F9A: @ 81E7F9A - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end LittlerootTown_Movement_1E7F9D: @ 81E7F9D - step_14 - step_13 - step_up + delay_16 + delay_8 + walk_up step_end LittlerootTown_Movement_1E7FA1: @ 81E7FA1 - step_up - step_54 + walk_up + set_invisible step_end LittlerootTown_Movement_1E7FA4: @ 81E7FA4 - step_14 - step_13 - step_right - step_26 + delay_16 + delay_8 + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E7FA9: @ 81E7FA9 - step_up - step_up + walk_up + walk_up step_end LittlerootTown_Movement_1E7FAC: @ 81E7FAC - step_45 - step_14 - step_14 - step_14 + jump_right + delay_16 + delay_16 + delay_16 step_end LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 @@ -287,41 +287,41 @@ LittlerootTown_EventScript_1E80AD:: @ 81E80AD return LittlerootTown_Movement_1E80D1: @ 81E80D1 - step_03 - step_13 - step_51 - step_49 - step_13 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 - step_17 - step_00 + face_right + delay_8 + disable_jump_landing_ground_effect + jump_in_place_right + delay_8 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_left + face_down step_end LittlerootTown_Movement_1E80DF: @ 81E80DF - step_down + walk_down step_end LittlerootTown_Movement_1E80E1: @ 81E80E1 - step_right - step_down - step_down - step_left - step_left - step_left - step_left - step_up - step_25 + walk_right + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_up + walk_in_place_fastest_down step_end LittlerootTown_Movement_1E80EB: @ 81E80EB - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end LittlerootTown_EventScript_1E80EF:: @ 81E80EF @@ -335,27 +335,27 @@ LittlerootTown_EventScript_1E80EF:: @ 81E80EF end LittlerootTown_Movement_1E810B: @ 81E810B - step_03 - step_13 - step_51 - step_49 - step_13 - step_18 - step_18 - step_18 - step_16 - step_16 - step_18 - step_00 + face_right + delay_8 + disable_jump_landing_ground_effect + jump_in_place_right + delay_8 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_right + face_down step_end LittlerootTown_Movement_1E8118: @ 81E8118 - step_left - step_down - step_left - step_left - step_left - step_25 + walk_left + walk_down + walk_left + walk_left + walk_left + walk_in_place_fastest_down step_end LittlerootTown_EventScript_1E811F:: @ 81E811F @@ -739,153 +739,153 @@ LittlerootTown_EventScript_1E85AB:: @ 81E85AB return LittlerootTown_Movement_1E85D1: @ 81E85D1 - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_Movement_1E85D8: @ 81E85D8 - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_Movement_1E85DF: @ 81E85DF - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right step_end LittlerootTown_Movement_1E85E4: @ 81E85E4 - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end LittlerootTown_Movement_1E85EA: @ 81E85EA - step_right - step_right + walk_right + walk_right step_end LittlerootTown_Movement_1E85ED: @ 81E85ED - step_right - step_right - step_right + walk_right + walk_right + walk_right step_end LittlerootTown_Movement_1E85F1: @ 81E85F1 - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end LittlerootTown_Movement_1E85F5: @ 81E85F5 - step_left - step_left + walk_left + walk_left step_end LittlerootTown_Movement_1E85F8: @ 81E85F8 - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end LittlerootTown_Movement_1E85FE: @ 81E85FE - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end LittlerootTown_Movement_1E8603: @ 81E8603 - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end LittlerootTown_Movement_1E8609: @ 81E8609 - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end LittlerootTown_Movement_1E860F: @ 81E860F - step_left - step_left - step_left - step_left - step_26 + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E8615: @ 81E8615 - step_left - step_left - step_left - step_left - step_left - step_26 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E861C: @ 81E861C - step_left - step_left - step_26 + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E8620: @ 81E8620 - step_left - step_left - step_left - step_26 + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E8625: @ 81E8625 - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E862A: @ 81E862A - step_right - step_right - step_26 + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E862E: @ 81E862E - step_right - step_right - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E8635: @ 81E8635 - step_right - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E863B: @ 81E863B - step_up + walk_up step_end LittlerootTown_EventScript_1E863D:: @ 81E863D diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 0f3fa1a0e..53825a84c 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -71,7 +71,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 end LittlerootTown_BrendansHouse_1F_Movement_1F783A: @ 81F783A - step_up + walk_up step_end LittlerootTown_BrendansHouse_1F_EventScript_1F783C:: @ 81F783C @@ -106,12 +106,12 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E end LittlerootTown_BrendansHouse_1F_Movement_1F789C: @ 81F789C - step_down - step_right - step_right - step_right - step_right - step_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right step_end LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3 @@ -202,29 +202,29 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F79A2:: @ 81F79A2 return LittlerootTown_BrendansHouse_1F_Movement_1F79AD: @ 81F79AD - step_27 - step_left - step_26 - step_up - step_up - step_up - step_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F79B5: @ 81F79B5 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9 - step_28 - step_right - step_26 - step_up - step_up - step_up - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_EventScript_1F79C1:: @ 81F79C1 @@ -246,52 +246,52 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F79E5:: @ 81F79E5 return LittlerootTown_BrendansHouse_1F_Movement_1F79F7: @ 81F79F7 - step_14 - step_13 - step_28 + delay_16 + delay_8 + walk_in_place_fastest_right step_end LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB - step_14 - step_13 - step_28 - step_14 - step_14 - step_26 + delay_16 + delay_8 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F7A02: @ 81F7A02 - step_14 - step_13 - step_27 + delay_16 + delay_8 + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06 - step_28 - step_right - step_26 - step_up - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C - step_28 - step_right - step_26 - step_up - step_up - step_27 - step_left - step_26 - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16 - step_27 - step_left - step_26 - step_up - step_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Text_1F7A1C: @ 81F7A1C diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index a5223d38a..429c933fc 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -139,110 +139,110 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 return LittlerootTown_BrendansHouse_2F_Movement_1F85BC: @ 81F85BC - step_down - step_down - step_27 + walk_down + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85C0: @ 81F85C0 - step_left - step_left - step_down - step_down - step_left + walk_left + walk_left + walk_down + walk_down + walk_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85C6: @ 81F85C6 - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_2F_Movement_1F85CF: @ 81F85CF - step_14 - step_26 - step_14 - step_14 - step_14 - step_14 - step_27 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85D7: @ 81F85D7 - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85DB: @ 81F85DB - step_up - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_2F_Movement_1F85E2: @ 81F85E2 - step_14 - step_26 - step_14 - step_14 - step_27 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85E8: @ 81F85E8 - step_left - step_left - step_down - step_27 + walk_left + walk_left + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85ED: @ 81F85ED - step_up - step_up - step_left - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_2F_Movement_1F85F6: @ 81F85F6 - step_13 - step_14 - step_26 - step_14 - step_14 - step_27 + delay_8 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85FD: @ 81F85FD - step_left - step_left - step_left - step_left - step_left - step_25 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down step_end LittlerootTown_BrendansHouse_2F_Movement_1F8604: @ 81F8604 - step_up - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609 - step_14 - step_14 - step_27 + delay_16 + delay_16 + walk_in_place_fastest_left step_end gUnknown_081F860D:: @ 81F860D diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index e0229b9ea..9fc2fe53e 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -71,7 +71,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 end LittlerootTown_MaysHouse_1F_Movement_1F898A: @ 81F898A - step_up + walk_up step_end LittlerootTown_MaysHouse_1F_EventScript_1F898C:: @ 81F898C @@ -106,12 +106,12 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE end LittlerootTown_MaysHouse_1F_Movement_1F89EC: @ 81F89EC - step_down - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left step_end LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3 @@ -241,29 +241,29 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8B4B:: @ 81F8B4B return LittlerootTown_MaysHouse_1F_Movement_1F8B56: @ 81F8B56 - step_27 - step_left - step_26 - step_up - step_up - step_up - step_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8B5E: @ 81F8B5E - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62 - step_28 - step_right - step_26 - step_up - step_up - step_up - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_MaysHouse_1F_EventScript_1F8B6A:: @ 81F8B6A @@ -285,52 +285,52 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8B8E:: @ 81F8B8E return LittlerootTown_MaysHouse_1F_Movement_1F8BA0: @ 81F8BA0 - step_14 - step_13 - step_28 + delay_16 + delay_8 + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4 - step_14 - step_13 - step_28 - step_14 - step_14 - step_26 + delay_16 + delay_8 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8BAB: @ 81F8BAB - step_14 - step_13 - step_27 + delay_16 + delay_8 + walk_in_place_fastest_left step_end LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF - step_28 - step_right - step_26 - step_up - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5 - step_28 - step_right - step_26 - step_up - step_up - step_27 - step_left - step_26 - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8BBF: @ 81F8BBF - step_27 - step_left - step_26 - step_up - step_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Text_1F8BC5: @ 81F8BC5 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index f300b5849..5501f5ad5 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -140,111 +140,111 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 return LittlerootTown_MaysHouse_2F_Movement_1F946F: @ 81F946F - step_down - step_down - step_28 + walk_down + walk_down + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F9473: @ 81F9473 - step_right - step_right - step_down - step_down - step_right + walk_right + walk_right + walk_down + walk_down + walk_right step_end LittlerootTown_MaysHouse_2F_Movement_1F9479: @ 81F9479 - step_up - step_up - step_up - step_28 - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_up + walk_up + walk_in_place_fastest_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_2F_Movement_1F9483: @ 81F9483 - step_14 - step_26 - step_14 - step_14 - step_14 - step_14 - step_28 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F948B: @ 81F948B - step_right - step_right - step_right + walk_right + walk_right + walk_right step_end LittlerootTown_MaysHouse_2F_Movement_1F948F: @ 81F948F - step_up - step_28 - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_in_place_fastest_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_2F_Movement_1F9497: @ 81F9497 - step_14 - step_26 - step_14 - step_14 - step_28 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F949D: @ 81F949D - step_right - step_right - step_right - step_right - step_right - step_25 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_down step_end LittlerootTown_MaysHouse_2F_Movement_1F94A4: @ 81F94A4 - step_up - step_right - step_right - step_26 + walk_up + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_2F_Movement_1F94A9: @ 81F94A9 - step_14 - step_14 - step_28 + delay_16 + delay_16 + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F94AD: @ 81F94AD - step_right - step_right - step_down - step_28 + walk_right + walk_right + walk_down + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F94B2: @ 81F94B2 - step_up - step_up - step_right - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB - step_14 - step_26 - step_14 - step_14 - step_28 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right step_end LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index c7d968d78..75b83b6a1 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -142,13 +142,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67 end LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78 - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 @@ -211,35 +211,35 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C:: @ 81F9F3C return LittlerootTown_ProfessorBirchsLab_Movement_1F9F46: @ 81F9F46 - step_left - step_25 - step_14 - step_14 - step_right - step_25 - step_14 - step_14 - step_right - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_26 + walk_left + walk_in_place_fastest_down + delay_16 + delay_16 + walk_right + walk_in_place_fastest_down + delay_16 + delay_16 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_ProfessorBirchsLab_Movement_1F9F58: @ 81F9F58 - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_left - step_25 + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_in_place_fastest_down step_end LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62 @@ -252,13 +252,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62 end LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 @@ -591,8 +591,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7:: @ 81FA3D7 return LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0 - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3 diff --git a/data/scripts/maps/MagmaHideout_4F.inc b/data/scripts/maps/MagmaHideout_4F.inc index cb0580580..0cc0fea56 100644 --- a/data/scripts/maps/MagmaHideout_4F.inc +++ b/data/scripts/maps/MagmaHideout_4F.inc @@ -77,35 +77,35 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 end MagmaHideout_4F_Movement_23A672: @ 823A672 - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 step_end MagmaHideout_4F_Movement_23A67D: @ 823A67D - step_32 - step_32 + slide_up + slide_up step_end MagmaHideout_4F_Movement_23A680: @ 823A680 - step_02 - step_14 - step_03 - step_14 - step_02 - step_14 - step_03 - step_14 - step_01 - step_14 - step_14 + face_left + delay_16 + face_right + delay_16 + face_left + delay_16 + face_right + delay_16 + face_up + delay_16 + delay_16 step_end MagmaHideout_4F_EventScript_23A68C:: @ 823A68C diff --git a/data/scripts/maps/MarineCave_End.inc b/data/scripts/maps/MarineCave_End.inc index c8e7c6fad..9c821e14f 100644 --- a/data/scripts/maps/MarineCave_End.inc +++ b/data/scripts/maps/MarineCave_End.inc @@ -66,13 +66,13 @@ MarineCave_End_EventScript_23B092:: @ 823B092 end MarineCave_End_Movement_23B09D: @ 823B09D - step_5e - step_62 - step_14 - step_14 - step_63 - step_14 - step_14 - step_63 + init_affine_anim + walk_down_start_affine + delay_16 + delay_16 + walk_down_affine + delay_16 + delay_16 + walk_down_affine step_end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 40578a907..abb527d7f 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -234,191 +234,191 @@ MauvilleCity_EventScript_1DF690:: @ 81DF690 end MauvilleCity_Movement_1DF6A8: @ 81DF6A8 - step_left - step_left - step_down - step_down - step_left + walk_left + walk_left + walk_down + walk_down + walk_left step_end MauvilleCity_Movement_1DF6AE: @ 81DF6AE - step_down - step_down - step_left - step_left - step_left + walk_down + walk_down + walk_left + walk_left + walk_left step_end MauvilleCity_Movement_1DF6B4: @ 81DF6B4 - step_14 - step_14 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_13 + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + delay_8 step_end MauvilleCity_Movement_1DF6C0: @ 81DF6C0 - step_14 - step_14 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_13 + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + delay_8 step_end MauvilleCity_Movement_1DF6CC: @ 81DF6CC - step_14 - step_13 - step_27 + delay_16 + delay_8 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6D0: @ 81DF6D0 - step_14 - step_14 - step_14 - step_27 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6D5: @ 81DF6D5 - step_14 - step_27 + delay_16 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6D8: @ 81DF6D8 - step_14 - step_14 - step_27 + delay_16 + delay_16 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6DC: @ 81DF6DC - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end MauvilleCity_Movement_1DF6DF: @ 81DF6DF - step_14 - step_27 + delay_16 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6E2: @ 81DF6E2 - step_left - step_left - step_left - step_down - step_down + walk_left + walk_left + walk_left + walk_down + walk_down step_end MauvilleCity_Movement_1DF6E8: @ 81DF6E8 - step_left - step_down - step_down - step_left - step_left + walk_left + walk_down + walk_down + walk_left + walk_left step_end MauvilleCity_Movement_1DF6EE: @ 81DF6EE - step_14 - step_13 - step_12 - step_25 + delay_16 + delay_8 + delay_4 + walk_in_place_fastest_down step_end MauvilleCity_Movement_1DF6F3: @ 81DF6F3 - step_right - step_right - step_26 + walk_right + walk_right + walk_in_place_fastest_up step_end MauvilleCity_Movement_1DF6F7: @ 81DF6F7 - step_right - step_up + walk_right + walk_up step_end MauvilleCity_Movement_1DF6FA: @ 81DF6FA - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MauvilleCity_Movement_1DF703: @ 81DF703 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MauvilleCity_Movement_1DF70D: @ 81DF70D - step_up - step_up - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end MauvilleCity_Movement_1DF719: @ 81DF719 - step_up - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_left - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end MauvilleCity_Movement_1DF725: @ 81DF725 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MauvilleCity_Movement_1DF72F: @ 81DF72F - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MauvilleCity_EventScript_1DF73A:: @ 81DF73A diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 50b218f04..b786dc961 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -92,130 +92,130 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F end MeteorFalls_1F_1R_Movement_22BEC0: @ 822BEC0 - step_right - step_right - step_26 + walk_right + walk_right + walk_in_place_fastest_up step_end MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4 - step_16 - step_16 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right step_end MeteorFalls_1F_1R_Movement_22BECE: @ 822BECE - step_16 - step_16 - step_16 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right step_end MeteorFalls_1F_1R_Movement_22BED9: @ 822BED9 - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0 - step_14 - step_14 - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8 - step_14 - step_14 - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0 - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8 - step_right - step_right - step_up - step_up - step_27 + walk_right + walk_right + walk_up + walk_up + walk_in_place_fastest_left step_end MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE - step_up - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BF08: @ 822BF08 - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D - step_up - step_up - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BF18: @ 822BF18 - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D - step_25 - step_12 - step_28 - step_40 - step_left - step_41 - step_03 + walk_in_place_fastest_down + delay_4 + walk_in_place_fastest_right + lock_facing_direction + walk_left + unlock_facing_direction + face_right step_end MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25 diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 4e8531a4e..8cce8efeb 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -103,116 +103,116 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41 end MossdeepCity_Movement_1E4BAD: @ 81E4BAD - step_14 - step_03 - step_14 - step_14 - step_14 - step_14 - step_02 - step_14 - step_14 + delay_16 + face_right + delay_16 + delay_16 + delay_16 + delay_16 + face_left + delay_16 + delay_16 step_end MossdeepCity_Movement_1E4BB7: @ 81E4BB7 - step_03 - step_14 - step_14 - step_14 + face_right + delay_16 + delay_16 + delay_16 step_end MossdeepCity_Movement_1E4BBC: @ 81E4BBC - step_down - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_down + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_Movement_1E4BCA: @ 81E4BCA - step_14 - step_13 - step_down - step_down - step_down - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_8 + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_Movement_1E4BDD: @ 81E4BDD - step_14 - step_13 - step_down - step_down - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_8 + walk_down + walk_down + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_Movement_1E4BEF: @ 81E4BEF - step_14 - step_13 - step_down - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_8 + walk_down + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_Movement_1E4C00: @ 81E4C00 - step_14 - step_13 - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_8 + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_EventScript_1E4C10:: @ 81E4C10 @@ -281,34 +281,34 @@ MossdeepCity_EventScript_1E4CC2:: @ 81E4CC2 return MossdeepCity_Movement_1E4CD4: @ 81E4CD4 - step_14 - step_14 - step_27 + delay_16 + delay_16 + walk_in_place_fastest_left step_end MossdeepCity_Movement_1E4CD8: @ 81E4CD8 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MossdeepCity_Movement_1E4CE2: @ 81E4CE2 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MossdeepCity_Text_1E4CED: @ 81E4CED diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 972d5f4e8..bb6bfd9de 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -285,8 +285,8 @@ MossdeepCity_Gym_EventScript_220C26:: @ 8220C26 end MossdeepCity_Gym_Movement_220C30: @ 8220C30 - step_14 - step_14 + delay_16 + delay_16 step_end MossdeepCity_Gym_EventScript_220C33:: @ 8220C33 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 7707690fb..c61f74d99 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -38,19 +38,19 @@ MossdeepCity_House2_EventScript_22212F:: @ 822212F return MossdeepCity_House2_Movement_22213A: @ 822213A - step_18 - step_15 - step_15 - step_17 - step_15 - step_13 + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down + delay_8 step_end MossdeepCity_House2_Movement_222141: @ 8222141 - step_15 - step_15 - step_15 - step_13 + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 step_end MossdeepCity_House2_Text_222146: @ 8222146 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 8fc55295f..2edf6d251 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -271,22 +271,22 @@ MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289 end MossdeepCity_SpaceCenter_1F_Movement_22329A: @ 822329A - step_40 - step_left - step_41 + lock_facing_direction + walk_left + unlock_facing_direction step_end MossdeepCity_SpaceCenter_1F_Movement_22329E: @ 822329E - step_40 - step_right - step_41 + lock_facing_direction + walk_right + unlock_facing_direction step_end MossdeepCity_SpaceCenter_1F_Movement_2232A2: @ 82232A2 - step_02 - step_40 - step_right - step_41 + face_left + lock_facing_direction + walk_right + unlock_facing_direction step_end MossdeepCity_SpaceCenter_1F_Text_2232A7: @ 82232A7 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc index cee99c4d5..52d01db6c 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc @@ -49,7 +49,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF end MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07 - step_up + walk_up step_end MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 @@ -77,21 +77,21 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 end MossdeepCity_SpaceCenter_2F_Movement_223E81: @ 8223E81 - step_40 - step_left - step_41 + lock_facing_direction + walk_left + unlock_facing_direction step_end MossdeepCity_SpaceCenter_2F_Movement_223E85: @ 8223E85 - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end MossdeepCity_SpaceCenter_2F_Movement_223E89: @ 8223E89 - step_40 - step_right - step_41 + lock_facing_direction + walk_right + unlock_facing_direction step_end MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D @@ -211,27 +211,27 @@ MossdeepCity_SpaceCenter_2F_EventScript_223FBA:: @ 8223FBA end MossdeepCity_SpaceCenter_2F_Movement_223FC6: @ 8223FC6 - step_40 - step_16 - step_16 - step_41 - step_14 - step_14 - slow_step_down - slow_step_down + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + delay_16 + delay_16 + walk_slow_down + walk_slow_down step_end MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF - step_02 - step_40 - step_18 - step_18 - step_41 - step_14 - step_14 - slow_step_left - slow_step_left - step_00 + face_left + lock_facing_direction + walk_fast_right + walk_fast_right + unlock_facing_direction + delay_16 + delay_16 + walk_slow_left + walk_slow_left + face_down step_end MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index fb2665e8b..14d0cd5c7 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -54,21 +54,21 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA end MossdeepCity_StevensHouse_Movement_222833: @ 8222833 - step_left - step_left - step_left - step_left - step_left - step_left - step_25 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down step_end MossdeepCity_StevensHouse_Movement_22283B: @ 822283B - step_up - step_right - step_right - step_right - step_26 + walk_up + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index b4825579c..28135bb1e 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -153,249 +153,249 @@ MtChimney_EventScript_22EF76:: @ 822EF76 end MtChimney_Movement_22EF83: @ 822EF83 - step_up - step_up - step_up - step_up - step_up - step_up - step_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right step_end MtChimney_Movement_22EF8B: @ 822EF8B - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22EF94: @ 822EF94 - step_up - step_up - step_up - step_up - step_up - step_right - step_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right step_end MtChimney_Movement_22EF9C: @ 822EF9C - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22EFA6: @ 822EFA6 - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down step_end MtChimney_Movement_22EFB8: @ 822EFB8 - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down step_end MtChimney_Movement_22EFC1: @ 822EFC1 - step_right - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22EFD0: @ 822EFD0 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_left - step_left - step_down - step_down - step_down - step_left - step_left - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down step_end MtChimney_Movement_22EFE9: @ 822EFE9 - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_left - step_left - step_left - step_down + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down step_end MtChimney_Movement_22EFF4: @ 822EFF4 - step_14 - step_left - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down + delay_16 + walk_left + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22F004: @ 822F004 - step_14 - step_left - step_left - step_down - step_down - step_down - step_left - step_left - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down + delay_16 + walk_left + walk_left + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down step_end MtChimney_Movement_22F015: @ 822F015 - step_14 - step_down - step_left - step_left - step_left - step_left - step_25 + delay_16 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down step_end MtChimney_Movement_22F01D: @ 822F01D - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22F02B: @ 822F02B - step_down + walk_down step_end MtChimney_Movement_22F02D: @ 822F02D - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22F035: @ 822F035 - step_14 - step_14 - step_27 - step_14 - step_down - step_down - step_down - step_down - step_down + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22F03F: @ 822F03F - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_27 - step_14 - step_down - step_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + walk_down + walk_down step_end MtChimney_Movement_22F04A: @ 822F04A - step_40 - step_17 - step_41 - step_03 + lock_facing_direction + walk_fast_left + unlock_facing_direction + face_right step_end MtChimney_Movement_22F04F: @ 822F04F - step_left - step_28 - step_14 + walk_left + walk_in_place_fastest_right + delay_16 step_end MtChimney_EventScript_22F053:: @ 822F053 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 1dd9c2725..b6c2118db 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -59,31 +59,31 @@ MtChimney_CableCarStation_EventScript_22AC9B:: @ 822AC9B end MtChimney_CableCarStation_Movement_22ACA5: @ 822ACA5 - step_up - step_up - step_left - step_28 + walk_up + walk_up + walk_left + walk_in_place_fastest_right step_end MtChimney_CableCarStation_Movement_22ACAA: @ 822ACAA - step_14 - step_right - step_down - step_down + delay_16 + walk_right + walk_down + walk_down step_end MtChimney_CableCarStation_Movement_22ACAF: @ 822ACAF - step_up - step_up - step_up - step_14 + walk_up + walk_up + walk_up + delay_16 step_end MtChimney_CableCarStation_Movement_22ACB4: @ 822ACB4 - step_down - step_down - step_down - step_14 + walk_down + walk_down + walk_down + delay_16 step_end MtChimney_CableCarStation_Text_22ACB9: @ 822ACB9 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index fed63f0e0..fe39e9d48 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -103,29 +103,29 @@ MtPyre_Summit_EventScript_232117:: @ 8232117 return MtPyre_Summit_Movement_23212C: @ 823212C - step_down - step_down - step_27 + walk_down + walk_down + walk_in_place_fastest_left step_end MtPyre_Summit_Movement_232130: @ 8232130 - step_down + walk_down step_end MtPyre_Summit_Movement_232132: @ 8232132 - step_down - step_down - step_28 + walk_down + walk_down + walk_in_place_fastest_right step_end MtPyre_Summit_Movement_232136: @ 8232136 - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_232139: @ 8232139 - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end MtPyre_Summit_EventScript_23213C:: @ 823213C @@ -316,112 +316,112 @@ MtPyre_Summit_EventScript_232392:: @ 8232392 return MtPyre_Summit_Movement_2323AE: @ 82323AE - step_14 - step_14 - step_28 + delay_16 + delay_16 + walk_in_place_fastest_right step_end MtPyre_Summit_Movement_2323B2: @ 82323B2 - step_14 - step_14 - step_27 + delay_16 + delay_16 + walk_in_place_fastest_left step_end MtPyre_Summit_Movement_2323B6: @ 82323B6 - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtPyre_Summit_Movement_2323BD: @ 82323BD - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtPyre_Summit_Movement_2323C4: @ 82323C4 - step_14 - step_13 - step_left - step_28 - step_14 - step_25 + delay_16 + delay_8 + walk_left + walk_in_place_fastest_right + delay_16 + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_2323CB: @ 82323CB - step_14 - step_13 - step_right - step_27 - step_14 - step_25 + delay_16 + delay_8 + walk_right + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_2323D2: @ 82323D2 - step_14 - step_13 - step_27 - step_14 - step_25 + delay_16 + delay_8 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_2323D8: @ 82323D8 - step_up - step_up - step_up - step_left + walk_up + walk_up + walk_up + walk_left step_end MtPyre_Summit_Movement_2323DD: @ 82323DD - step_up - step_up - step_up - step_28 + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end MtPyre_Summit_Movement_2323E2: @ 82323E2 - step_up - step_up - step_up - step_28 + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end MtPyre_Summit_Movement_2323E7: @ 82323E7 - step_14 - step_26 + delay_16 + walk_in_place_fastest_up step_end MtPyre_Summit_Movement_2323EA: @ 82323EA - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_2323ED: @ 82323ED - step_down - step_right - step_down - step_down - step_27 + walk_down + walk_right + walk_down + walk_down + walk_in_place_fastest_left step_end MtPyre_Summit_Movement_2323F3: @ 82323F3 - step_down - step_down - step_down - step_27 + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end MtPyre_Summit_Movement_2323F8: @ 82323F8 - step_down - step_down - step_down - step_27 + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end MtPyre_Summit_EventScript_2323FD:: @ 82323FD diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc index c05d32088..67ddbc373 100644 --- a/data/scripts/maps/NavelRock_Top.inc +++ b/data/scripts/maps/NavelRock_Top.inc @@ -92,36 +92,36 @@ NavelRock_Top_EventScript_269225:: @ 8269225 end NavelRock_Top_Movement_269230: @ 8269230 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end NavelRock_Top_Movement_269234: @ 8269234 - step_14 - step_14 - step_down - step_down - step_down + delay_16 + delay_16 + walk_down + walk_down + walk_down step_end NavelRock_Top_Movement_26923A: @ 826923A - step_down - step_down - step_down - step_down - step_down - step_1d - step_14 - step_14 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_in_place_down + delay_16 + delay_16 step_end NavelRock_Top_Movement_269243: @ 8269243 - step_14 - step_14 - step_1d - step_1d - step_1d - step_1d + delay_16 + delay_16 + walk_in_place_down + walk_in_place_down + walk_in_place_down + walk_in_place_down step_end diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 3c075cad0..32bca3703 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -96,100 +96,100 @@ OldaleTown_EventScript_1E8FC3:: @ 81E8FC3 end OldaleTown_Movement_1E8FCE: @ 81E8FCE - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end OldaleTown_Movement_1E8FD7: @ 81E8FD7 - step_left - step_up - step_up - step_right - step_up - step_up - step_up - step_up - step_up - step_25 + walk_left + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end OldaleTown_Movement_1E8FE2: @ 81E8FE2 - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end OldaleTown_Movement_1E8FEB: @ 81E8FEB - step_up - step_up - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_up - step_up - step_13 - step_25 + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + delay_8 + walk_in_place_fastest_down step_end OldaleTown_Movement_1E8FF9: @ 81E8FF9 - step_right - step_up - step_up - step_up - step_up - step_up - step_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end OldaleTown_Movement_1E9001: @ 81E9001 - step_14 - step_14 - step_14 - step_14 - step_up - step_up - step_up - step_up - step_up + delay_16 + delay_16 + delay_16 + delay_16 + walk_up + walk_up + walk_up + walk_up + walk_up step_end OldaleTown_Movement_1E900B: @ 81E900B - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end OldaleTown_Movement_1E9013: @ 81E9013 - step_left - step_up - step_up - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_up + walk_left + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up step_end OldaleTown_EventScript_1E901F:: @ 81E901F @@ -305,49 +305,49 @@ OldaleTown_EventScript_1E915E:: @ 81E915E return OldaleTown_Movement_1E9170: @ 81E9170 - step_left - step_left + walk_left + walk_left step_end OldaleTown_Movement_1E9173: @ 81E9173 - step_left + walk_left step_end OldaleTown_Movement_1E9175: @ 81E9175 - step_02 + face_left step_end OldaleTown_Movement_1E9177: @ 81E9177 - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end OldaleTown_Movement_1E917E: @ 81E917E - step_13 - step_12 - step_25 + delay_8 + delay_4 + walk_in_place_fastest_down step_end OldaleTown_Movement_1E9182: @ 81E9182 - step_13 - step_right + delay_8 + walk_right step_end OldaleTown_Movement_1E9185: @ 81E9185 - step_16 - step_27 - step_40 - step_right - step_41 + walk_fast_up + walk_in_place_fastest_left + lock_facing_direction + walk_right + unlock_facing_direction step_end OldaleTown_Movement_1E918B: @ 81E918B - step_down - step_left + walk_down + walk_left step_end OldaleTown_Text_1E918E: @ 81E918E diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index c297d61a7..891b5a25a 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -94,127 +94,127 @@ PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD end PetalburgCity_Movement_1DC406: @ 81DC406 - step_13 - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up + delay_8 + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up step_end PetalburgCity_Movement_1DC418: @ 81DC418 - step_up - step_up + walk_up + walk_up step_end PetalburgCity_Movement_1DC41B: @ 81DC41B - step_13 - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up + delay_8 + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end PetalburgCity_Movement_1DC42D: @ 81DC42D - step_up - step_54 + walk_up + set_invisible step_end PetalburgCity_Movement_1DC430: @ 81DC430 - step_13 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_28 + delay_8 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_in_place_fastest_right step_end PetalburgCity_Movement_1DC451: @ 81DC451 - step_13 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_right - step_14 - step_26 - step_14 - step_14 - step_28 + delay_8 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right step_end PetalburgCity_EventScript_1DC476:: @ 81DC476 @@ -347,159 +347,159 @@ PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF return PetalburgCity_Movement_1DC611:: @ 81DC611 - step_14 - step_14 - step_14 + delay_16 + delay_16 + delay_16 step_end PetalburgCity_Movement_1DC615: @ 81DC615 - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end PetalburgCity_Movement_1DC61A: @ 81DC61A - step_right - step_right + walk_right + walk_right step_end PetalburgCity_Movement_1DC61D: @ 81DC61D - step_right - step_right - step_right - step_25 + walk_right + walk_right + walk_right + walk_in_place_fastest_down step_end PetalburgCity_Movement_1DC622: @ 81DC622 - step_down - step_right - step_right - step_right - step_25 + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_down step_end PetalburgCity_Movement_1DC628: @ 81DC628 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_in_place_fastest_up step_end PetalburgCity_Movement_1DC633: @ 81DC633 - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_right - step_26 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + walk_in_place_fastest_up step_end PetalburgCity_Movement_1DC641: @ 81DC641 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_in_place_fastest_up step_end PetalburgCity_Movement_1DC64C: @ 81DC64C - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + walk_in_place_fastest_up step_end PetalburgCity_Movement_1DC658: @ 81DC658 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC665: @ 81DC665 - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up step_end PetalburgCity_Movement_1DC66F: @ 81DC66F - step_14 - step_14 - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up + delay_16 + delay_16 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up step_end PetalburgCity_Movement_1DC67C: @ 81DC67C - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up step_end PetalburgCity_Movement_1DC686: @ 81DC686 - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up step_end PetalburgCity_EventScript_1DC691:: @ 81DC691 @@ -597,111 +597,111 @@ PetalburgCity_EventScript_1DC7C4:: @ 81DC7C4 return PetalburgCity_Movement_1DC7D6: @ 81DC7D6 - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC7DB: @ 81DC7DB - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC7E0: @ 81DC7E0 - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC7EE: @ 81DC7EE - step_14 - step_25 - step_14 - step_14 - step_13 - step_27 + delay_16 + walk_in_place_fastest_down + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_left step_end PetalburgCity_Movement_1DC7F5: @ 81DC7F5 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC802: @ 81DC802 - step_14 - step_25 - step_14 - step_13 - step_27 + delay_16 + walk_in_place_fastest_down + delay_16 + delay_8 + walk_in_place_fastest_left step_end PetalburgCity_Movement_1DC808: @ 81DC808 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC815: @ 81DC815 - step_14 - step_25 - step_14 - step_13 - step_27 + delay_16 + walk_in_place_fastest_down + delay_16 + delay_8 + walk_in_place_fastest_left step_end PetalburgCity_Movement_1DC81B: @ 81DC81B - step_up - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC828: @ 81DC828 - step_14 - step_26 - step_14 - step_13 - step_27 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_8 + walk_in_place_fastest_left step_end PetalburgCity_EventScript_1DC82E:: @ 81DC82E diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 2751e345e..663165611 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -106,10 +106,10 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 end PetalburgCity_Gym_Movement_2049EC: @ 82049EC - step_down - step_down - step_down - step_14 + walk_down + walk_down + walk_down + delay_16 step_end PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1 @@ -565,218 +565,218 @@ PetalburgCity_Gym_EventScript_20506C:: @ 820506C return PetalburgCity_Gym_Movement_20507E: @ 820507E - step_down - step_down - step_left - step_left - step_down - step_down - step_26 - step_13 - step_1d - step_54 + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_down + set_invisible step_end PetalburgCity_Gym_Movement_205089: @ 8205089 - step_down - step_down - step_left - step_left - step_down - step_down - step_26 - step_13 - step_1d - step_54 + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_down + set_invisible step_end PetalburgCity_Gym_Movement_205094: @ 8205094 - step_down - step_down - step_left - step_left - step_left - step_left - step_down - step_down - step_26 - step_13 - step_1d - step_54 + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_down + set_invisible step_end PetalburgCity_Gym_Movement_2050A1: @ 82050A1 - step_14 - step_down - step_down - step_left - step_left - step_down - step_down + delay_16 + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down step_end PetalburgCity_Gym_Movement_2050A9: @ 82050A9 - step_14 - step_down - step_down - step_left - step_down - step_down - step_down + delay_16 + walk_down + walk_down + walk_left + walk_down + walk_down + walk_down step_end PetalburgCity_Gym_Movement_2050B1: @ 82050B1 - step_14 - step_down - step_down - step_down - step_left - step_left - step_left - step_down - step_down + delay_16 + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + walk_down step_end PetalburgCity_Gym_Movement_2050BB: @ 82050BB - step_up - step_13 - step_28 - step_13 - step_27 - step_14 - step_26 + walk_up + delay_8 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_up step_end PetalburgCity_Gym_Movement_2050C3: @ 82050C3 - step_right - step_right - step_up - step_up - step_up - step_28 + walk_right + walk_right + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end PetalburgCity_Gym_Movement_2050CA: @ 82050CA - step_right - step_right - step_up - step_up - step_up + walk_right + walk_right + walk_up + walk_up + walk_up step_end PetalburgCity_Gym_Movement_2050D0: @ 82050D0 - step_right - step_right - step_up - step_up - step_right - step_right - step_up + walk_right + walk_right + walk_up + walk_up + walk_right + walk_right + walk_up step_end PetalburgCity_Gym_Movement_2050D8: @ 82050D8 - step_26 - step_14 - step_14 - step_14 - step_14 - step_14 - step_13 - step_25 + walk_in_place_fastest_up + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_down step_end PetalburgCity_Gym_Movement_2050E1: @ 82050E1 - step_14 - step_up - step_14 - step_13 - step_up - step_right - step_up - step_up - step_27 + delay_16 + walk_up + delay_16 + delay_8 + walk_up + walk_right + walk_up + walk_up + walk_in_place_fastest_left step_end PetalburgCity_Gym_Movement_2050EB: @ 82050EB - step_14 - step_up - step_14 - step_13 - step_up - step_up + delay_16 + walk_up + delay_16 + delay_8 + walk_up + walk_up step_end PetalburgCity_Gym_Movement_2050F2: @ 82050F2 - step_down - step_down - step_down - step_down - step_26 - step_14 - step_1d + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down step_end PetalburgCity_Gym_Movement_2050FA: @ 82050FA - step_down - step_down - step_right - step_down - step_26 - step_14 - step_1d + walk_down + walk_down + walk_right + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down step_end PetalburgCity_Gym_Movement_205102: @ 8205102 - step_down - step_down - step_down - step_26 - step_14 - step_1d + walk_down + walk_down + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down step_end PetalburgCity_Gym_Movement_205109: @ 8205109 - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_13 + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + delay_8 step_end PetalburgCity_Gym_Movement_205111: @ 8205111 - step_14 - step_14 - step_right - step_down - step_down - step_down - step_down - step_down - step_13 + delay_16 + delay_16 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + delay_8 step_end PetalburgCity_Gym_Movement_20511B: @ 820511B - step_14 - step_14 - step_down - step_down - step_down - step_down - step_13 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_down + delay_8 step_end PetalburgCity_Gym_Movement_205123: @ 8205123 - step_25 - step_14 - step_14 - step_down - step_down - step_down - step_right - step_down - step_13 + walk_in_place_fastest_down + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_right + walk_down + delay_8 step_end PetalburgCity_Gym_EventScript_20512D:: @ 820512D diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 907f07623..7c9a1ae49 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -114,128 +114,128 @@ PetalburgWoods_EventScript_22E1A7:: @ 822E1A7 end PetalburgWoods_Movement_22E1B1: @ 822E1B1 - step_01 - step_14 - step_12 - step_03 - step_14 - step_13 - step_02 - step_14 - step_13 - step_00 - step_14 - step_03 - step_14 - step_13 - step_01 - step_14 + face_up + delay_16 + delay_4 + face_right + delay_16 + delay_8 + face_left + delay_16 + delay_8 + face_down + delay_16 + face_right + delay_16 + delay_8 + face_up + delay_16 step_end PetalburgWoods_Movement_22E1C2: @ 822E1C2 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end PetalburgWoods_Movement_22E1CB: @ 822E1CB - step_14 - step_3e - step_down - step_down + delay_16 + face_player + walk_down + walk_down step_end PetalburgWoods_Movement_22E1D0: @ 822E1D0 - step_14 - step_3e - step_down - step_down - step_down - step_28 + delay_16 + face_player + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end PetalburgWoods_Movement_22E1D7: @ 822E1D7 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end PetalburgWoods_Movement_22E1E0: @ 822E1E0 - step_14 - step_14 - step_26 + delay_16 + delay_16 + walk_in_place_fastest_up step_end PetalburgWoods_Movement_22E1E4: @ 822E1E4 - step_18 - step_15 - step_15 - step_17 - step_26 + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_in_place_fastest_up step_end PetalburgWoods_Movement_22E1EA: @ 822E1EA - step_15 - step_18 - step_26 + walk_fast_down + walk_fast_right + walk_in_place_fastest_up step_end PetalburgWoods_Movement_22E1EE: @ 822E1EE - step_25 - step_14 - step_14 - step_14 - step_14 - step_14 - step_01 + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + face_up step_end PetalburgWoods_Movement_22E1F6: @ 822E1F6 - step_15 - step_15 + walk_fast_down + walk_fast_down step_end PetalburgWoods_Movement_22E1F9: @ 822E1F9 - step_40 - step_up - step_41 + lock_facing_direction + walk_up + unlock_facing_direction step_end PetalburgWoods_Movement_22E1FD: @ 822E1FD - step_16 - step_16 - step_16 - step_16 - step_16 - step_14 - step_14 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + delay_16 + delay_16 step_end PetalburgWoods_Movement_22E205: @ 822E205 - step_15 - step_15 - step_15 + walk_fast_down + walk_fast_down + walk_fast_down step_end PetalburgWoods_Movement_22E209: @ 822E209 - step_down - step_down - step_14 - step_14 + walk_down + walk_down + delay_16 + delay_16 step_end PetalburgWoods_Movement_22E20E: @ 822E20E - step_down + walk_down step_end PetalburgWoods_EventScript_22E210:: @ 822E210 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 4d4334aca..c2807d50b 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -69,138 +69,138 @@ Route101_EventScript_1EBD7A:: @ 81EBD7A end Route101_Movement_1EBD90: @ 81EBD90 - step_up + walk_up step_end Route101_Movement_1EBD92: @ 81EBD92 - step_right + walk_right step_end Route101_Movement_1EBD94: @ 81EBD94 - step_down + walk_down step_end Route101_Movement_1EBD96: @ 81EBD96 - step_16 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left step_end Route101_Movement_1EBDB5: @ 81EBDB5 - step_16 - step_18 - step_18 - step_18 - step_18 - step_16 + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up step_end Route101_Movement_1EBDBC: @ 81EBDBC step_end Route101_Movement_1EBDBD: @ 81EBDBD - step_23 - step_23 - step_23 - step_23 + walk_in_place_fast_left + walk_in_place_fast_left + walk_in_place_fast_left + walk_in_place_fast_left step_end Route101_Movement_1EBDC2: @ 81EBDC2 - step_16 - step_16 - step_16 - step_16 - step_27 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_left step_end Route101_Movement_1EBDC8: @ 81EBDC8 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left step_end Route101_Movement_1EBDE7: @ 81EBDE7 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up step_end Route101_Movement_1EBDEE: @ 81EBDEE step_end Route101_Movement_1EBDEF: @ 81EBDEF - step_24 - step_24 - step_24 - step_24 + walk_in_place_fast_right + walk_in_place_fast_right + walk_in_place_fast_right + walk_in_place_fast_right step_end Route101_Movement_1EBDF4: @ 81EBDF4 - step_up - step_up + walk_up + walk_up step_end Route101_Movement_1EBDF7: @ 81EBDF7 - step_up - step_left - step_up + walk_up + walk_left + walk_up step_end Route101_EventScript_1EBDFB:: @ 81EBDFB @@ -256,7 +256,7 @@ Route101_EventScript_1EBE89:: @ 81EBE89 return Route101_Movement_1EBE8D: @ 81EBE8D - step_right + walk_right step_end Route101_Text_1EBE8F: @ 81EBE8F diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index d71ec729c..8bf597902 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -152,42 +152,42 @@ Route103_EventScript_1EC5A2:: @ 81EC5A2 end Route103_Movement_1EC5BE: @ 81EC5BE - step_left - step_down + walk_left + walk_down step_end Route103_Movement_1EC5C1: @ 81EC5C1 - fast_step_down - step_14 - step_down - step_down - step_down - step_down + jump_2_down + delay_16 + walk_down + walk_down + walk_down + walk_down step_end Route103_Movement_1EC5C8: @ 81EC5C8 - step_14 - step_12 - step_27 - step_14 - step_25 + delay_16 + delay_4 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down step_end Route103_Movement_1EC5CE: @ 81EC5CE - step_down + walk_down step_end Route103_Movement_1EC5D0: @ 81EC5D0 - fast_step_down - step_14 - step_down - step_down - step_down + jump_2_down + delay_16 + walk_down + walk_down + walk_down step_end Route103_Movement_1EC5D6: @ 81EC5D6 - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end Route103_EventScript_1EC5D9:: @ 81EC5D9 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 314b47e1d..a432f0d94 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -130,17 +130,17 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B end Route104_Movement_1ECDC8: @ 81ECDC8 - slow_step_left + walk_slow_left step_end Route104_Movement_1ECDCA: @ 81ECDCA - step_down - step_03 + walk_down + face_right step_end Route104_Movement_1ECDCD: @ 81ECDCD - step_12 - step_27 + delay_4 + walk_in_place_fastest_left step_end Route104_EventScript_1ECDD0:: @ 81ECDD0 @@ -262,13 +262,13 @@ Route104_EventScript_1ECF73:: @ 81ECF73 end Route104_Movement_1ECF86: @ 81ECF86 - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end Route104_Movement_1ECF8A: @ 81ECF8A - step_down + walk_down step_end Route104_EventScript_1ECF8C:: @ 81ECF8C @@ -448,426 +448,426 @@ Route104_EventScript_1ED1BE:: @ 81ED1BE end Route104_Movement_1ED1C8: @ 81ED1C8 - step_down - step_down - step_down - step_down - step_15 - step_15 - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_15 - step_15 - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_15 - step_15 - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d + walk_down + walk_down + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down step_end Route104_Movement_1ED22A: @ 81ED22A - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_15 - step_15 - step_18 - step_18 - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_18 - step_18 - step_right - step_right - step_down - step_down - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_down - step_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_right + walk_right + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_down + walk_down step_end Route104_Movement_1ED28C: @ 81ED28C - step_down - step_down - step_down - step_down - step_15 - step_15 - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_15 - step_15 - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_15 - step_15 - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_15 - step_15 - step_18 - step_18 - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_18 - step_18 - step_right - step_right - step_down - step_down - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_right + walk_right + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_down + walk_down step_end Route104_Movement_1ED34F: @ 81ED34F - step_left - step_down - step_down + walk_left + walk_down + walk_down step_end Route104_Movement_1ED353: @ 81ED353 - step_down + walk_down step_end Route104_Movement_1ED355: @ 81ED355 - step_down - step_left - step_28 + walk_down + walk_left + walk_in_place_fastest_right step_end Route104_Movement_1ED359: @ 81ED359 - step_down - step_down + walk_down + walk_down step_end Route104_Movement_1ED35C: @ 81ED35C - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end Route104_EventScript_1ED35F:: @ 81ED35F diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 123f78db1..b1ac87e30 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -63,210 +63,210 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 end Route109_Movement_1EE84F: @ 81EE84F - step_25 - step_down - step_down - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_17 - step_17 - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_left - step_left - step_25 + walk_in_place_fastest_down + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_left + walk_left + walk_in_place_fastest_down step_end Route109_Movement_1EE8FD: @ 81EE8FD - step_down - step_down + walk_down + walk_down step_end Route109_Movement_1EE900: @ 81EE900 - step_down - step_down - step_left - step_28 + walk_down + walk_down + walk_left + walk_in_place_fastest_right step_end Route109_Movement_1EE905: @ 81EE905 - step_right - step_down + walk_right + walk_down step_end Route109_Movement_1EE908: @ 81EE908 - step_left - step_down + walk_left + walk_down step_end Route109_Movement_1EE90B: @ 81EE90B - step_down + walk_down step_end Route109_Movement_1EE90D: @ 81EE90D - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end Route109_EventScript_1EE910:: @ 81EE910 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 9d00303c9..40d6a2e69 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -557,50 +557,50 @@ Route110_EventScript_1EF9A0:: @ 81EF9A0 return Route110_Movement_1EF9A8: @ 81EF9A8 - step_down - step_left - step_25 + walk_down + walk_left + walk_in_place_fastest_down step_end Route110_Movement_1EF9AC: @ 81EF9AC - step_down + walk_down step_end Route110_Movement_1EF9AE: @ 81EF9AE - step_down - step_right - step_25 + walk_down + walk_right + walk_in_place_fastest_down step_end Route110_Movement_1EF9B2: @ 81EF9B2 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end Route110_Movement_1EF9BA: @ 81EF9BA - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_15 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_down step_end Route110_Movement_1EF9C3: @ 81EF9C3 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end Route110_EventScript_1EF9CB:: @ 81EF9CB @@ -717,66 +717,66 @@ Route110_EventScript_1EFB25:: @ 81EFB25 return Route110_Movement_1EFB30: @ 81EFB30 - step_down - step_down - step_down + walk_down + walk_down + walk_down step_end Route110_Movement_1EFB34: @ 81EFB34 - step_down - step_left - step_left - step_down + walk_down + walk_left + walk_left + walk_down step_end Route110_Movement_1EFB39: @ 81EFB39 - step_down - step_left - step_down + walk_down + walk_left + walk_down step_end Route110_Movement_1EFB3D: @ 81EFB3D - step_down - step_down + walk_down + walk_down step_end Route110_Movement_1EFB40: @ 81EFB40 - step_down - step_right - step_down + walk_down + walk_right + walk_down step_end Route110_Movement_1EFB44: @ 81EFB44 - step_up - step_up - step_right - step_up - step_up - step_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up step_end Route110_Movement_1EFB4B: @ 81EFB4B - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route110_Movement_1EFB51: @ 81EFB51 - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route110_Movement_1EFB57: @ 81EFB57 - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route110_Text_1EFB5D: @ 81EFB5D diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc index 5087d304c..9579df56c 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc @@ -27,7 +27,7 @@ Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F:: @ 826EA9F end Route110_SeasideCyclingRoadEntrance1_Movement_26EAB4: @ 826EAB4 - step_left + walk_left step_end Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6:: @ 826EAB6 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc index 97e7452ec..499969d6e 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc @@ -45,7 +45,7 @@ Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC:: @ 826EBFC end Route110_SeasideCyclingRoadEntrance2_Movement_26EC11: @ 826EC11 - step_left + walk_left step_end Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13:: @ 826EC13 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index b8db4697b..a2997a49b 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -253,11 +253,11 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 end Route110_TrickHouseEnd_Movement_26B089: @ 826B089 - step_down + walk_down step_end Route110_TrickHouseEnd_Movement_26B08B: @ 826B08B - step_48 + jump_in_place_left step_end Route110_TrickHouseEnd_Text_26B08D: @ 826B08D diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 4bf7eb10a..5e03fa165 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -304,26 +304,26 @@ Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D Route110_TrickHouseEnd_Movement_269E36: @ 8269E36 Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36 - step_01 - step_12 - step_02 - step_12 - step_00 - step_12 - step_03 - step_12 + face_up + delay_4 + face_left + delay_4 + face_down + delay_4 + face_right + delay_4 step_end Route110_TrickHouseEnd_Movement_269E3F: @ 8269E3F Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F - step_01 - step_52 - step_32 - step_32 - step_32 - step_32 - step_32 - step_32 + face_up + disable_anim + slide_up + slide_up + slide_up + slide_up + slide_up + slide_up step_end Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48 @@ -529,7 +529,7 @@ Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126 end Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7 - step_54 + set_invisible step_end Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index cd14f0060..3bdf93b12 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -855,113 +855,113 @@ Route110_TrickHousePuzzle5_EventScript_26D5FF:: @ 826D5FF return Route110_TrickHousePuzzle5_Movement_26D60A: @ 826D60A - step_left + walk_left step_end Route110_TrickHousePuzzle5_Movement_26D60C: @ 826D60C - step_left - step_left + walk_left + walk_left step_end Route110_TrickHousePuzzle5_Movement_26D60F: @ 826D60F - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end Route110_TrickHousePuzzle5_Movement_26D613: @ 826D613 - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end Movement_26D618: @ 826D618 - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route110_TrickHousePuzzle5_Movement_26D61E: @ 826D61E - step_right + walk_right step_end Route110_TrickHousePuzzle5_Movement_26D620: @ 826D620 - step_right - step_right + walk_right + walk_right step_end Route110_TrickHousePuzzle5_Movement_26D623: @ 826D623 - step_right - step_right - step_right + walk_right + walk_right + walk_right step_end Route110_TrickHousePuzzle5_Movement_26D627: @ 826D627 - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right step_end Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route110_TrickHouseEntrance_Movement_26D632: @ 826D632 Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_00 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_down step_end Route110_TrickHousePuzzle5_Text_26D660: @ 826D660 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 37d77d095..094a52895 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -150,13 +150,13 @@ Route111_EventScript_1F0EA7:: @ 81F0EA7 end Route111_Movement_1F0EB1:: @ 81F0EB1 - step_94 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 + store_lock_anim + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end Route111_EventScript_1F0EB9:: @ 81F0EB9 @@ -247,19 +247,19 @@ Route111_EventScript_1F0F9D:: @ 81F0F9D return Route111_Movement_1F0FA8: @ 81F0FA8 - step_up + walk_up step_end Route111_Movement_1F0FAA: @ 81F0FAA - step_down + walk_down step_end Route111_Movement_1F0FAC: @ 81F0FAC - step_left + walk_left step_end Route111_Movement_1F0FAE: @ 81F0FAE - step_right + walk_right step_end Route111_EventScript_1F0FB0:: @ 81F0FB0 @@ -366,18 +366,18 @@ Route111_EventScript_1F1143:: @ 81F1143 return Route111_Movement_1F114A: @ 81F114A - step_26 - step_up + walk_in_place_fastest_up + walk_up step_end Route111_Movement_1F114D: @ 81F114D - step_down + walk_down step_end Route111_Movement_1F114F: @ 81F114F - step_14 - step_14 - step_14 + delay_16 + delay_16 + delay_16 step_end Route111_EventScript_1F1153:: @ 81F1153 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 72c003d99..94e442a48 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -60,31 +60,31 @@ Route112_CableCarStation_EventScript_22AB67:: @ 822AB67 end Route112_CableCarStation_Movement_22AB71: @ 822AB71 - step_up - step_up - step_right - step_27 + walk_up + walk_up + walk_right + walk_in_place_fastest_left step_end Route112_CableCarStation_Movement_22AB76: @ 822AB76 - step_14 - step_left - step_down - step_down + delay_16 + walk_left + walk_down + walk_down step_end Route112_CableCarStation_Movement_22AB7B: @ 822AB7B - step_up - step_up - step_up - step_14 + walk_up + walk_up + walk_up + delay_16 step_end Route112_CableCarStation_Movement_22AB80: @ 822AB80 - step_down - step_down - step_down - step_14 + walk_down + walk_down + walk_down + delay_16 step_end Route112_CableCarStation_Text_22AB85: @ 822AB85 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index a8d73397c..68a32c3b5 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -102,27 +102,27 @@ Route116_EventScript_1F2D39:: @ 81F2D39 end Route116_Movement_1F2D43: @ 81F2D43 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route116_Movement_1F2D4C: @ 81F2D4C - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route116_EventScript_1F2D57:: @ 81F2D57 @@ -223,28 +223,28 @@ Route116_EventScript_1F2E69:: @ 81F2E69 return Route116_Movement_1F2E74: @ 81F2E74 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route116_Movement_1F2E7E: @ 81F2E7E - step_up - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route116_EventScript_1F2E89:: @ 81F2E89 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 27a2539e1..818111b81 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -132,58 +132,58 @@ Route118_EventScript_1F3F4C:: @ 81F3F4C return Route118_Movement_1F3F5E: @ 81F3F5E - step_14 - step_28 + delay_16 + walk_in_place_fastest_right step_end Route118_Movement_1F3F61: @ 81F3F61 - step_left + walk_left step_end Route118_Movement_1F3F63: @ 81F3F63 - step_right + walk_right step_end Route118_Movement_1F3F65: @ 81F3F65 - fast_step_down - step_14 - step_down + jump_2_down + delay_16 + walk_down step_end Route118_Movement_1F3F69: @ 81F3F69 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route118_Movement_1F3F74: @ 81F3F74 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route118_Movement_1F3F7E: @ 81F3F7E - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route118_EventScript_1F3F87:: @ 81F3F87 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 41e0fbbfe..a4b6a5fb1 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -230,98 +230,98 @@ Route119_EventScript_1F470F:: @ 81F470F return Route119_Movement_1F471E: @ 81F471E - step_14 - step_28 - step_13 - step_26 + delay_16 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_up step_end Route119_Movement_1F4723: @ 81F4723 - step_14 - step_27 - step_13 - step_26 + delay_16 + walk_in_place_fastest_left + delay_8 + walk_in_place_fastest_up step_end Route119_Movement_1F4728: @ 81F4728 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_16 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up step_end Route119_Movement_1F4732: @ 81F4732 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_16 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up step_end Route119_Movement_1F473D: @ 81F473D - step_18 - step_16 - step_16 - step_16 - step_18 - step_16 - step_16 - step_16 - step_16 + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end Route119_Movement_1F4747: @ 81F4747 - step_17 - step_16 - step_16 - step_16 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end Route119_Movement_1F4752: @ 81F4752 - step_down - step_down - step_down - step_down - step_left - step_left - step_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down step_end Route119_Movement_1F475A: @ 81F475A - step_up - step_right - step_right - step_up - step_up - step_up - step_up - step_up + walk_up + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route119_Movement_1F4763: @ 81F4763 - step_up - step_right - step_up - step_up - step_up - step_up - step_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route119_EventScript_1F476B:: @ 81F476B diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 0bd6c12f2..b2341bf3d 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -175,38 +175,38 @@ Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166 end Route119_WeatherInstitute_2F_Movement_270170: @ 8270170 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left step_end Route119_WeatherInstitute_2F_Movement_27017C: @ 827017C - step_14 - step_14 - step_14 - step_14 - step_14 - step_2a - step_25 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + ride_water_current_up + walk_in_place_fastest_down step_end Route119_WeatherInstitute_2F_Movement_270184: @ 8270184 - step_31 - step_27 + slide_down + walk_in_place_fastest_left step_end Route119_WeatherInstitute_2F_Movement_270187: @ 8270187 - step_right - step_right - step_right + walk_right + walk_right + walk_right step_end Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 461823e47..7d6876aeb 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -274,8 +274,8 @@ Route120_EventScript_1F57AE:: @ 81F57AE return Route120_Movement_1F57B9: @ 81F57B9 - step_down - step_left + walk_down + walk_left step_end Route120_EventScript_1F57BC:: @ 81F57BC diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index d579401b8..f133ffe56 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -33,36 +33,36 @@ Route121_EventScript_1F5E18:: @ 81F5E18 end Route121_Movement_1F5E59: @ 81F5E59 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Route121_Movement_1F5E62: @ 81F5E62 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Route121_Movement_1F5E6B: @ 81F5E6B - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Route121_EventScript_1F5E74:: @ 81F5E74 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 1369b5721..0e9cf9636 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -15,14 +15,14 @@ Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB end Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route121_SafariZoneEntrance_EventScript_22BBE6:: @ 822BBE6 @@ -122,18 +122,18 @@ Route121_SafariZoneEntrance_EventScript_22BD06:: @ 822BD06 end Route121_SafariZoneEntrance_Movement_22BD16: @ 822BD16 - step_right + walk_right step_end Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18 - step_left - step_left - step_left - step_left - step_left - step_left - step_down - step_14 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + delay_16 step_end Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index f62f78404..8e2742ff5 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -80,99 +80,99 @@ Route128_EventScript_1F6B57:: @ 81F6B57 end Route128_Movement_1F6C76: @ 81F6C76 - step_17 + walk_fast_left step_end Route128_Movement_1F6C78: @ 81F6C78 - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route128_Movement_1F6C85: @ 81F6C85 - step_up + walk_up step_end Route128_Movement_1F6C87: @ 81F6C87 - step_17 + walk_fast_left step_end Route128_Movement_1F6C89: @ 81F6C89 - step_15 - step_27 - step_14 - step_28 - step_14 - step_14 - step_25 + walk_fast_down + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_down step_end Route128_Movement_1F6C91: @ 81F6C91 - step_40 - slow_step_up - step_14 - step_41 + lock_facing_direction + walk_slow_up + delay_16 + unlock_facing_direction step_end Route128_Movement_1F6C96: @ 81F6C96 - step_17 - step_17 - step_17 - step_28 + walk_fast_left + walk_fast_left + walk_fast_left + walk_in_place_fastest_right step_end Route128_Movement_1F6C9B: @ 81F6C9B - step_14 - step_14 - step_16 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + delay_16 + delay_16 + walk_fast_up + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end Route128_Movement_1F6CA8: @ 81F6CA8 - step_left - step_left - step_13 - step_12 + walk_left + walk_left + delay_8 + delay_4 step_end Route128_Movement_1F6CAD: @ 81F6CAD - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end Route128_Movement_1F6CB0: @ 81F6CB0 - step_17 - step_17 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end Route128_Movement_1F6CBB: @ 81F6CBB - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end Route128_EventScript_1F6CBE:: @ 81F6CBE diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index f8426a7eb..5e323211a 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -105,30 +105,30 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD end RustboroCity_Movement_1E084E: @ 81E084E - step_1d + walk_in_place_down step_end RustboroCity_Movement_1E0850: @ 81E0850 - step_down + walk_down step_end RustboroCity_Movement_1E0852: @ 81E0852 - step_down - step_14 + walk_down + delay_16 step_end RustboroCity_Movement_1E0855: @ 81E0855 - step_14 - step_left - step_down - step_down - step_right - step_26 - step_14 + delay_16 + walk_left + walk_down + walk_down + walk_right + walk_in_place_fastest_up + delay_16 step_end RustboroCity_Movement_1E085D: @ 81E085D - step_up + walk_up step_end RustboroCity_EventScript_1E085F:: @ 81E085F @@ -352,100 +352,100 @@ RustboroCity_EventScript_1E0A79:: @ 81E0A79 return RustboroCity_Movement_1E0A8E: @ 81E0A8E - step_30 - step_30 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end RustboroCity_Movement_1E0AA0: @ 81E0AA0 - step_30 - step_30 - step_18 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end RustboroCity_Movement_1E0AB1: @ 81E0AB1 - step_right - step_right - step_right - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end RustboroCity_Movement_1E0AB9: @ 81E0AB9 - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end RustboroCity_Movement_1E0AC1: @ 81E0AC1 - step_down - step_right - step_right + walk_down + walk_right + walk_right step_end RustboroCity_Movement_1E0AC5: @ 81E0AC5 - step_down - step_down - step_right - step_right + walk_down + walk_down + walk_right + walk_right step_end RustboroCity_Movement_1E0ACA: @ 81E0ACA - step_down - step_down - step_right - step_right + walk_down + walk_down + walk_right + walk_right step_end RustboroCity_Movement_1E0ACF: @ 81E0ACF - step_down - step_down - step_down - step_right - step_right + walk_down + walk_down + walk_down + walk_right + walk_right step_end RustboroCity_Movement_1E0AD5: @ 81E0AD5 - step_down - step_down - step_down - step_right - step_right - step_right - step_25 + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_down step_end RustboroCity_EventScript_1E0ADD:: @ 81E0ADD @@ -554,7 +554,7 @@ RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 return RustboroCity_Movement_1E0C29: @ 81E0C29 - step_down + walk_down step_end RustboroCity_EventScript_1E0C2B:: @ 81E0C2B @@ -972,59 +972,59 @@ RustboroCity_EventScript_1E11FB:: @ 81E11FB end RustboroCity_Movement_1E120E: @ 81E120E - step_down - step_left - step_left - step_left - step_left - step_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down step_end RustboroCity_Movement_1E1215: @ 81E1215 - step_down - step_left - step_left - step_left - step_down + walk_down + walk_left + walk_left + walk_left + walk_down step_end RustboroCity_Movement_1E121B: @ 81E121B - step_down - step_left - step_left - step_down + walk_down + walk_left + walk_left + walk_down step_end RustboroCity_Movement_1E1220: @ 81E1220 - step_down - step_left - step_down + walk_down + walk_left + walk_down step_end RustboroCity_Movement_1E1224: @ 81E1224 - step_down - step_down + walk_down + walk_down step_end RustboroCity_Movement_1E1227: @ 81E1227 - step_down - step_right - step_down + walk_down + walk_right + walk_down step_end RustboroCity_Movement_1E122B: @ 81E122B - step_down - step_right - step_right - step_down + walk_down + walk_right + walk_right + walk_down step_end RustboroCity_Movement_1E1230: @ 81E1230 - step_down - step_right - step_right - step_right - step_down + walk_down + walk_right + walk_right + walk_right + walk_down step_end RustboroCity_EventScript_1E1236:: @ 81E1236 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 9547fbd67..ffc2614cb 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -73,78 +73,78 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E end RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F - step_up - step_up - step_up - step_27 + walk_up + walk_up + walk_up + walk_in_place_fastest_left step_end RustboroCity_DevonCorp_3F_Movement_212534: @ 8212534 - step_right - step_right - step_right - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_27 + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_left step_end RustboroCity_DevonCorp_3F_Movement_212543: @ 8212543 - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end RustboroCity_DevonCorp_3F_Movement_212546: @ 8212546 - step_right - step_right - step_right - step_down - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right step_end RustboroCity_DevonCorp_3F_Movement_21254F: @ 821254F - step_left - step_left - step_left - step_left - step_up - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left step_end RustboroCity_DevonCorp_3F_Movement_212558: @ 8212558 - step_right - step_right - step_right - step_right - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566 - step_14 - step_14 - step_down - step_down - step_28 + delay_16 + delay_16 + walk_down + walk_down + walk_in_place_fastest_right step_end RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 46887b9c6..f5030facd 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -113,55 +113,55 @@ RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB end RustboroCity_PokemonSchool_Movement_214010: @ 8214010 - step_left - step_down - step_down - step_right - step_25 - step_14 - step_14 - step_14 - step_down - step_27 - step_14 - step_14 - step_right - step_14 - step_14 - step_13 - step_up - step_left - step_left - step_up - step_up - step_right + walk_left + walk_down + walk_down + walk_right + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + walk_down + walk_in_place_fastest_left + delay_16 + delay_16 + walk_right + delay_16 + delay_16 + delay_8 + walk_up + walk_left + walk_left + walk_up + walk_up + walk_right step_end RustboroCity_PokemonSchool_Movement_214027: @ 8214027 - step_right - step_right - step_down - step_down - step_left - step_left - step_25 - step_14 - step_14 - step_14 - step_down - step_27 - step_14 - step_14 - step_right - step_14 - step_14 - step_13 - step_up - step_right - step_up - step_up - step_left - step_left + walk_right + walk_right + walk_down + walk_down + walk_left + walk_left + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + walk_down + walk_in_place_fastest_left + delay_16 + delay_16 + walk_right + delay_16 + delay_16 + delay_8 + walk_up + walk_right + walk_up + walk_up + walk_left + walk_left step_end RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 52dca4c95..5e42be78d 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -150,121 +150,121 @@ RusturfTunnel_EventScript_22CFFF:: @ 822CFFF return RusturfTunnel_Movement_22D017: @ 822D017 - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end RusturfTunnel_Movement_22D023: @ 822D023 - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end RusturfTunnel_Movement_22D02F: @ 822D02F - step_13 - step_26 - step_14 - step_14 - step_28 + delay_8 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D035: @ 822D035 - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D038: @ 822D038 - step_down - step_26 - step_13 - step_28 + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D03D: @ 822D03D - step_up - step_25 - step_13 - step_28 + walk_up + walk_in_place_fastest_down + delay_8 + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D042: @ 822D042 - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D045: @ 822D045 - step_right - step_27 + walk_right + walk_in_place_fastest_left step_end RusturfTunnel_Movement_22D048: @ 822D048 - step_up - step_28 + walk_up + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D04B: @ 822D04B - step_right - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end RusturfTunnel_Movement_22D058: @ 822D058 - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end RusturfTunnel_Movement_22D065: @ 822D065 - step_right + walk_right step_end RusturfTunnel_Movement_22D067: @ 822D067 - step_22 - step_22 - step_16 - step_18 + walk_in_place_fast_up + walk_in_place_fast_up + walk_fast_up + walk_fast_right step_end RusturfTunnel_Movement_22D06C: @ 822D06C - step_24 - step_24 - step_18 - step_26 + walk_in_place_fast_right + walk_in_place_fast_right + walk_fast_right + walk_in_place_fastest_up step_end RusturfTunnel_EventScript_22D071:: @ 822D071 @@ -293,9 +293,9 @@ RusturfTunnel_EventScript_22D083:: @ 822D083 end RusturfTunnel_Movement_22D0AB: @ 822D0AB - step_40 - step_right - step_41 + lock_facing_direction + walk_right + unlock_facing_direction step_end RusturfTunnel_EventScript_22D0AF:: @ 822D0AF @@ -353,76 +353,76 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 end RusturfTunnel_Movement_22D178: @ 822D178 - step_00 - step_40 - step_up - step_41 - step_27 + face_down + lock_facing_direction + walk_up + unlock_facing_direction + walk_in_place_fastest_left step_end RusturfTunnel_Movement_22D17E: @ 822D17E - step_down - step_26 + walk_down + walk_in_place_fastest_up step_end RusturfTunnel_Movement_22D181: @ 822D181 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left step_end RusturfTunnel_Movement_22D18B: @ 822D18B - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end RusturfTunnel_Movement_22D193: @ 822D193 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end RusturfTunnel_Movement_22D19F: @ 822D19F - step_14 - step_13 - step_12 - step_27 + delay_16 + delay_8 + delay_4 + walk_in_place_fastest_left step_end RusturfTunnel_Movement_22D1A4: @ 822D1A4 - step_14 - step_right + delay_16 + walk_right step_end RusturfTunnel_Movement_22D1A7: @ 822D1A7 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index ad10e2669..6d83c8841 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -224,47 +224,47 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 end SSTidalCorridor_Movement_23C26D: @ 823C26D - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end SSTidalCorridor_Movement_23C275: @ 823C275 - step_25 - step_14 - step_14 - step_14 - step_14 - step_down - step_left + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_left step_end SSTidalCorridor_Movement_23C27D: @ 823C27D - step_14 - step_14 - step_14 - step_14 - step_13 - step_25 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_down step_end SSTidalCorridor_Movement_23C284: @ 823C284 - step_14 - step_right - step_right - step_26 - step_14 - step_27 + delay_16 + walk_right + walk_right + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_left step_end SSTidalCorridor_Movement_23C28B: @ 823C28B - step_left - step_left - step_26 + walk_left + walk_left + walk_in_place_fastest_up step_end SSTidalCorridor_Text_23C28F: @ 823C28F diff --git a/data/scripts/maps/SafariZone_South.inc b/data/scripts/maps/SafariZone_South.inc index 4be06d00b..239a2efda 100644 --- a/data/scripts/maps/SafariZone_South.inc +++ b/data/scripts/maps/SafariZone_South.inc @@ -28,12 +28,12 @@ SafariZone_South_EventScript_23D2BD:: @ 823D2BD return SafariZone_South_Movement_23D2C5: @ 823D2C5 - step_down + walk_down step_end SafariZone_South_Movement_23D2C7: @ 823D2C7 - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end SafariZone_South_EventScript_23D2CA:: @ 823D2CA @@ -98,22 +98,22 @@ SafariZone_South_EventScript_23D373:: @ 823D373 end SafariZone_South_Movement_23D385: @ 823D385 - step_up + walk_up step_end SafariZone_South_Movement_23D387: @ 823D387 - step_right - step_26 + walk_right + walk_in_place_fastest_up step_end SafariZone_South_Movement_23D38A: @ 823D38A - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end SafariZone_South_Movement_23D38D: @ 823D38D - step_down - step_26 + walk_down + walk_in_place_fastest_up step_end SafariZone_South_EventScript_23D390:: @ 823D390 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index a2247286c..e8f6323c1 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -147,78 +147,78 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 end SeafloorCavern_Room9_Movement_23502A: @ 823502A - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end SeafloorCavern_Room9_Movement_235032: @ 8235032 - step_left - step_left + walk_left + walk_left step_end SeafloorCavern_Room9_Movement_235035: @ 8235035 - step_left - step_14 + walk_left + delay_16 step_end SeafloorCavern_Room9_Movement_235038: @ 8235038 - step_right + walk_right step_end SeafloorCavern_Room9_Movement_23503A: @ 823503A - step_01 - step_40 - step_down - step_41 - step_28 + face_up + lock_facing_direction + walk_down + unlock_facing_direction + walk_in_place_fastest_right step_end SeafloorCavern_Room9_Movement_235040: @ 8235040 - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 step_end SeafloorCavern_Room9_Movement_23504B: @ 823504B - step_32 - step_32 + slide_up + slide_up step_end SeafloorCavern_Room9_Movement_23504E: @ 823504E - step_18 - step_18 - step_18 - step_18 - step_18 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right step_end SeafloorCavern_Room9_Movement_235054: @ 8235054 - step_right - step_right + walk_right + walk_right step_end SeafloorCavern_Room9_Movement_235057: @ 8235057 - step_18 - step_18 - step_18 - step_18 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right step_end SeafloorCavern_Room9_Movement_23505C: @ 823505C - step_14 - step_14 + delay_16 + delay_16 step_end SeafloorCavern_Room9_Text_23505F: @ 823505F diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/scripts/maps/SkyPillar_Outside.inc index cced073aa..e9fbf4ad6 100644 --- a/data/scripts/maps/SkyPillar_Outside.inc +++ b/data/scripts/maps/SkyPillar_Outside.inc @@ -92,46 +92,46 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 end SkyPillar_Outside_Movement_2393D3: @ 82393D3 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right step_end SkyPillar_Outside_Movement_2393DE: @ 82393DE - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_right - step_up - step_up - step_up - step_up + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up step_end SkyPillar_Outside_Movement_2393EB: @ 82393EB - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_right - step_up - step_up - step_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up step_end SkyPillar_Outside_EventScript_2393F8:: @ 82393F8 diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index a2ea5ed1d..334acc8ac 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -139,49 +139,49 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A end SkyPillar_Top_Movement_23983A: @ 823983A - step_14 - step_23 - step_14 - step_14 - step_14 - step_14 - step_14 - step_1f - step_14 - step_20 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 + delay_16 + walk_in_place_fast_left + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_left + delay_16 + walk_in_place_right + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 step_end SkyPillar_Top_Movement_23984B: @ 823984B - step_14 - step_1d - step_13 - step_20 - step_13 - step_2e - step_32 - step_32 - step_32 - step_32 - step_32 - step_32 + delay_16 + walk_in_place_down + delay_8 + walk_in_place_right + delay_8 + walk_fastest_up + slide_up + slide_up + slide_up + slide_up + slide_up + slide_up step_end SkyPillar_Top_Movement_239858: @ 8239858 - slow_step_up - slow_step_up - slow_step_up + walk_slow_up + walk_slow_up + walk_slow_up step_end SkyPillar_Top_Movement_23985C: @ 823985C - slow_step_down - slow_step_down - slow_step_down + walk_slow_down + walk_slow_down + walk_slow_down step_end SkyPillar_Top_Text_239860: @ 8239860 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index fe7cfc0fd..d860e6e7c 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -90,30 +90,30 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C end SlateportCity_Movement_1DCDA8: @ 81DCDA8 - step_14 - step_13 - step_27 + delay_16 + delay_8 + walk_in_place_fastest_left step_end SlateportCity_Movement_1DCDAC: @ 81DCDAC - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end SlateportCity_Movement_1DCDB4: @ 81DCDB4 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end SlateportCity_EventScript_1DCDBD:: @ 81DCDBD @@ -473,8 +473,8 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 end SlateportCity_Movement_1DD147: @ 81DD147 - step_14 - step_14 + delay_16 + delay_16 step_end SlateportCity_EventScript_1DD14A:: @ 81DD14A @@ -622,95 +622,95 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 end SlateportCity_Movement_1DD309: @ 81DD309 - step_14 - step_14 - step_57 - step_28 - step_14 - step_14 - step_27 + delay_16 + delay_16 + emote_question_mark + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_left step_end SlateportCity_Movement_1DD311: @ 81DD311 - step_57 - step_26 - step_14 - step_25 - step_14 - step_14 - step_27 + emote_question_mark + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_down + delay_16 + delay_16 + walk_in_place_fastest_left step_end SlateportCity_Movement_1DD319: @ 81DD319 - step_14 - step_left - step_left - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + delay_16 + walk_left + walk_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end SlateportCity_Movement_1DD326: @ 81DD326 - step_down - step_left - step_left - step_left - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end SlateportCity_Movement_1DD334: @ 81DD334 - step_down - step_26 + walk_down + walk_in_place_fastest_up step_end SlateportCity_Movement_1DD337: @ 81DD337 - step_right - step_up - step_up - step_54 + walk_right + walk_up + walk_up + set_invisible step_end SlateportCity_Movement_1DD33C: @ 81DD33C - step_14 - step_14 - step_14 - step_14 - step_14 - step_down - step_left + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_left step_end SlateportCity_Movement_1DD344: @ 81DD344 - step_28 - step_14 - step_14 - step_right - step_up + walk_in_place_fastest_right + delay_16 + delay_16 + walk_right + walk_up step_end SlateportCity_Movement_1DD34A: @ 81DD34A - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_25 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_down step_end SlateportCity_EventScript_1DD353:: @ 81DD353 @@ -914,30 +914,30 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC end SlateportCity_Movement_1DD630: @ 81DD630 - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end SlateportCity_Movement_1DD634: @ 81DD634 - step_14 - step_28 + delay_16 + walk_in_place_fastest_right step_end SlateportCity_Movement_1DD637: @ 81DD637 - step_13 - step_down + delay_8 + walk_down step_end SlateportCity_Movement_1DD63A: @ 81DD63A - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end SlateportCity_EventScript_1DD643:: @ 81DD643 diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc index 4c5aa0371..d79849a6c 100644 --- a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc +++ b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc @@ -99,17 +99,17 @@ SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B @ forced stop SlateportCity_BattleTentBattleRoom_Movement_209A99: @ 8209A99 - step_up - step_up - step_up - step_28 + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end SlateportCity_BattleTentBattleRoom_Movement_209A9E: @ 8209A9E - step_down - step_down - step_down - step_down - step_27 + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc index 47ca641ce..7446c1002 100644 --- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc +++ b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc @@ -147,29 +147,29 @@ SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044 goto SlateportCity_BattleTentCorridor_EventScript_208F0D SlateportCity_BattleTentCorridor_Movement_209059: @ 8209059 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end SlateportCity_BattleTentCorridor_Movement_20905E: @ 820905E - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062 - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end SlateportCity_BattleTentCorridor_Movement_209068: @ 8209068 - step_up - step_54 + walk_up + set_invisible step_end SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc index 6353856e3..187ed0751 100644 --- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc +++ b/data/scripts/maps/SlateportCity_BattleTentLobby.inc @@ -194,26 +194,26 @@ SlateportCity_BattleTentLobby_EventScript_2089C9:: @ 82089C9 return SlateportCity_BattleTentLobby_Movement_2089F8: @ 82089F8 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end SlateportCity_BattleTentLobby_Movement_2089FC: @ 82089FC - step_up - step_54 + walk_up + set_invisible step_end SlateportCity_BattleTentLobby_Movement_2089FF: @ 82089FF - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07 @@ -236,10 +236,10 @@ SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E end SlateportCity_BattleTentLobby_Movement_208A38:: @ 8208A38 - step_up - step_up - step_up - step_54 + walk_up + walk_up + walk_up + set_invisible step_end SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index a66e0e6d9..ca6ab50b5 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -105,58 +105,58 @@ SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 return SlateportCity_Harbor_Movement_20CAC8: @ 820CAC8 - step_14 - step_14 - step_43 - step_54 + delay_16 + delay_16 + jump_up + set_invisible step_end SlateportCity_Harbor_Movement_20CACD: @ 820CACD - step_14 - step_14 - step_43 - step_54 + delay_16 + delay_16 + jump_up + set_invisible step_end SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2 - step_14 - step_14 - step_14 - step_14 - step_right - step_right - step_right - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 + delay_16 + delay_16 + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right step_end SlateportCity_Harbor_Movement_20CAE0: @ 820CAE0 - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_up step_end SlateportCity_Harbor_Movement_20CAE6: @ 820CAE6 - step_left - step_left - step_up - step_left + walk_left + walk_left + walk_up + walk_left step_end SlateportCity_Harbor_Movement_20CAEB: @ 820CAEB - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end SlateportCity_Harbor_Movement_20CAEF: @ 820CAEF - step_up + walk_up step_end SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1 @@ -259,12 +259,12 @@ SlateportCity_Harbor_EventScript_20CC42:: @ 820CC42 return SlateportCity_Harbor_Movement_20CC4D: @ 820CC4D - step_right - step_26 + walk_right + walk_in_place_fastest_up step_end SlateportCity_Harbor_Movement_20CC50: @ 820CC50 - step_up + walk_up step_end SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index ba8575c66..4464ee582 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -72,7 +72,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 end SlateportCity_OceanicMuseum_1F_Movement_20AE4B: @ 820AE4B - step_down + walk_down step_end SlateportCity_OceanicMuseum_1F_EventScript_20AE4D:: @ 820AE4D @@ -210,33 +210,33 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AFB5:: @ 820AFB5 end SlateportCity_OceanicMuseum_1F_Movement_20AFBF: @ 820AFBF - step_14 - step_13 - step_12 - step_25 + delay_16 + delay_8 + delay_4 + walk_in_place_fastest_down step_end SlateportCity_OceanicMuseum_1F_Movement_20AFC4: @ 820AFC4 - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end SlateportCity_OceanicMuseum_1F_Movement_20AFC7: @ 820AFC7 - step_00 - step_15 - step_15 - step_15 - step_15 - step_13 + face_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 step_end SlateportCity_OceanicMuseum_1F_Movement_20AFCE: @ 820AFCE - step_18 - step_15 - step_15 - step_15 - step_15 - step_13 + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 step_end SlateportCity_OceanicMuseum_1F_Text_20AFD5: @ 820AFD5 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index a7a24757f..4172c47ef 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -116,103 +116,103 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BCB3:: @ 820BCB3 return SlateportCity_OceanicMuseum_2F_Movement_20BCBE: @ 820BCBE - step_left - step_down - step_27 + walk_left + walk_down + walk_in_place_fastest_left step_end SlateportCity_OceanicMuseum_2F_Movement_20BCC2: @ 820BCC2 - step_up - step_left - step_left - step_down - step_27 + walk_up + walk_left + walk_left + walk_down + walk_in_place_fastest_left step_end SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8 - step_up - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_left - step_left - step_up - step_up - step_13 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_left + walk_left + walk_up + walk_up + delay_8 step_end SlateportCity_OceanicMuseum_2F_Movement_20BCD6: @ 820BCD6 - step_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCD8: @ 820BCD8 - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCE2: @ 820BCE2 - step_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCE4: @ 820BCE4 - step_down - step_right - step_25 + walk_down + walk_right + walk_in_place_fastest_down step_end SlateportCity_OceanicMuseum_2F_Movement_20BCE8: @ 820BCE8 - step_down - step_down - step_down - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCEF: @ 820BCEF - step_40 - step_left - step_41 + lock_facing_direction + walk_left + unlock_facing_direction step_end SlateportCity_OceanicMuseum_2F_Movement_20BCF3: @ 820BCF3 - step_down + walk_down step_end SlateportCity_OceanicMuseum_2F_Movement_20BCF5: @ 820BCF5 - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_13 - step_15 - step_26 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_fast_down + walk_in_place_fastest_up step_end SlateportCity_OceanicMuseum_2F_EventScript_20BD0A:: @ 820BD0A diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 6dac80f4b..6a26ee0ff 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -281,33 +281,33 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 end SootopolisCity_Movement_1E5A68: @ 81E5A68 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest step_end SootopolisCity_Movement_1E5A75: @ 81E5A75 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast step_end SootopolisCity_EventScript_1E5A82:: @ 81E5A82 @@ -381,113 +381,113 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 end SootopolisCity_Movement_1E5BA4: @ 81E5BA4 - step_91 - step_91 - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E5BAE: @ 81E5BAE - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_92 - step_92 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_slow_diag_southwest + walk_slow_diag_southwest step_end SootopolisCity_Movement_1E5BB8: @ 81E5BB8 - step_1b - step_1b - step_1b - step_14 - step_14 - step_14 - step_5e - step_96 - step_5f + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left + delay_16 + delay_16 + delay_16 + init_affine_anim + walk_left_affine + clear_affine_anim step_end SootopolisCity_Movement_1E5BC2: @ 81E5BC2 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_5e - step_96 - step_5f + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + init_affine_anim + walk_left_affine + clear_affine_anim step_end SootopolisCity_Movement_1E5BCF: @ 81E5BCF - step_40 - step_right - step_14 - step_14 - step_14 - step_41 + lock_facing_direction + walk_right + delay_16 + delay_16 + delay_16 + unlock_facing_direction step_end SootopolisCity_Movement_1E5BD6: @ 81E5BD6 - step_1b - step_1b - step_1b - step_1b - step_1b - step_1b + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left step_end SootopolisCity_Movement_1E5BDD: @ 81E5BDD - step_1c - step_1c - step_1c - step_14 - step_14 - step_14 - step_18 + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right + delay_16 + delay_16 + delay_16 + walk_fast_right step_end SootopolisCity_Movement_1E5BE5: @ 81E5BE5 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_18 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_right step_end SootopolisCity_Movement_1E5BF0: @ 81E5BF0 - step_40 - step_left - step_14 - step_14 - step_14 - step_41 + lock_facing_direction + walk_left + delay_16 + delay_16 + delay_16 + unlock_facing_direction step_end SootopolisCity_Movement_1E5BF7: @ 81E5BF7 - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right step_end SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE @@ -634,65 +634,65 @@ SootopolisCity_EventScript_1E5D82:: @ 81E5D82 return SootopolisCity_Movement_1E5E5B: @ 81E5E5B - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up step_end SootopolisCity_Movement_1E5E63: @ 81E5E63 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E5E68: @ 81E5E68 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E5E6D: @ 81E5E6D - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down step_end SootopolisCity_Movement_1E5E72: @ 81E5E72 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_right - step_right - step_right - step_right + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_right + walk_right + walk_right + walk_right step_end SootopolisCity_Movement_1E5E7F: @ 81E5E7F - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_92 - step_92 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_slow_diag_southwest + walk_slow_diag_southwest step_end SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D @@ -1004,267 +1004,267 @@ SootopolisCity_EventScript_1E6255:: @ 81E6255 return SootopolisCity_Movement_1E6267: @ 81E6267 - step_up - step_up - step_up - step_right - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_left - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end SootopolisCity_Movement_1E628C: @ 81E628C - step_left - step_up - step_up - step_up - step_right - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_left - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_left + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E62B0: @ 81E62B0 - step_up - step_up - step_up - step_up - step_right - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_left - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E62D4: @ 81E62D4 - step_up - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_12 - step_27 - step_14 - step_14 - step_right - step_up - step_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + delay_4 + walk_in_place_fastest_left + delay_16 + delay_16 + walk_right + walk_up + walk_up step_end SootopolisCity_Movement_1E630E: @ 81E630E - step_up - step_up - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right step_end SootopolisCity_Movement_1E6341: @ 81E6341 - slow_step_left - step_28 + walk_slow_left + walk_in_place_fastest_right step_end SootopolisCity_Movement_1E6344: @ 81E6344 - step_down - step_down - step_left - step_13 - step_right - step_up - step_up - step_up - step_right - step_27 + walk_down + walk_down + walk_left + delay_8 + walk_right + walk_up + walk_up + walk_up + walk_right + walk_in_place_fastest_left step_end SootopolisCity_Movement_1E634F: @ 81E634F - step_14 - step_14 - step_14 - step_13 - step_right - step_right - step_up - step_up - step_up - step_28 + delay_16 + delay_16 + delay_16 + delay_8 + walk_right + walk_right + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end SootopolisCity_Movement_1E635A: @ 81E635A - step_up - step_up + walk_up + walk_up step_end SootopolisCity_EventScript_1E635D:: @ 81E635D @@ -1398,13 +1398,13 @@ SootopolisCity_EventScript_1E64E2:: @ 81E64E2 end SootopolisCity_Movement_1E64EC: @ 81E64EC - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end SootopolisCity_Movement_1E64EF: @ 81E64EF - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end SootopolisCity_EventScript_1E64F2:: @ 81E64F2 @@ -1454,11 +1454,11 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C end SootopolisCity_Movement_1E656B:: @ 81E656B - step_98 + levitate step_end SootopolisCity_Movement_1E656D:: @ 81E656D - step_9A + destroy_extra_task step_end SootopolisCity_Text_1E656F: @ 81E656F diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 6a53dc57c..02ac01f2b 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -82,7 +82,7 @@ SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 end SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 - step_54 + set_invisible step_end SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc index 54ade5181..8d6b4631f 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc @@ -63,12 +63,12 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16:: @ 8227A16 return SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F: @ 8227A1F - step_down + walk_down step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227A21: @ 8227A21 - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24 @@ -152,31 +152,31 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22:: @ 8227B22 return SootopolisCity_MysteryEventsHouse_1F_Movement_227B34: @ 8227B34 - step_14 - step_up - step_up + delay_16 + walk_up + walk_up step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227B38: @ 8227B38 - step_14 - step_right - step_up + delay_16 + walk_right + walk_up step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C: @ 8227B3C - step_14 - step_left - step_up + delay_16 + walk_left + walk_up step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227B40: @ 8227B40 - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227B43: @ 8227B43 - step_right - step_27 + walk_right + walk_in_place_fastest_left step_end SootopolisCity_MysteryEventsHouse_1F_Text_227B46: @ 8227B46 diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc index 5a4a09735..142a8e70e 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -59,20 +59,20 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8 return SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3: @ 8227EF3 - step_down - step_down - step_down - step_right - step_right + walk_down + walk_down + walk_down + walk_right + walk_right step_end SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9: @ 8227EF9 - step_left - step_left - step_up - step_up - step_up - step_up - step_13 + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + delay_8 step_end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 8784a6424..bf57aa9ce 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -41,12 +41,12 @@ BattleFrontier_OutsideWest_EventScript_242A2C:: @ 8242A2C return BattleFrontier_OutsideWest_Movement_242A37: @ 8242A37 - step_down + walk_down step_end BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39 - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index f78f938ca..432667cc9 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -132,36 +132,36 @@ SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7 return SouthernIsland_Interior_Movement_242BCA: @ 8242BCA - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end SouthernIsland_Interior_Movement_242BCE: @ 8242BCE - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_26 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_up step_end SouthernIsland_Interior_Movement_242BDA: @ 8242BDA - step_down - step_down - step_down - step_down - step_down - step_14 - step_14 - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_down step_end diff --git a/data/scripts/maps/TerraCave_End.inc b/data/scripts/maps/TerraCave_End.inc index be532733d..5152f85cf 100644 --- a/data/scripts/maps/TerraCave_End.inc +++ b/data/scripts/maps/TerraCave_End.inc @@ -66,13 +66,13 @@ TerraCave_End_EventScript_23B163:: @ 823B163 end TerraCave_End_Movement_23B16E: @ 823B16E - step_5e - step_62 - step_14 - step_14 - step_63 - step_14 - step_14 - step_63 + init_affine_anim + walk_down_start_affine + delay_16 + delay_16 + walk_down_affine + delay_16 + delay_16 + walk_down_affine step_end diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/scripts/maps/TrainerHill_Elevator.inc index 7886f91b8..155c31877 100644 --- a/data/scripts/maps/TrainerHill_Elevator.inc +++ b/data/scripts/maps/TrainerHill_Elevator.inc @@ -55,33 +55,33 @@ TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9 return TrainerHill_Elevator_Movement_2693DF: @ 82693DF - step_up - step_up - step_right - step_00 + walk_up + walk_up + walk_right + face_down step_end TrainerHill_Elevator_Movement_2693E4: @ 82693E4 - step_14 - step_left + delay_16 + walk_left step_end TrainerHill_Elevator_Movement_2693E7: @ 82693E7 - step_14 - step_down - step_down + delay_16 + walk_down + walk_down step_end TrainerHill_Elevator_Movement_2693EB: @ 82693EB - step_00 - step_14 + face_down + delay_16 step_end TrainerHill_Elevator_Movement_2693EE: @ 82693EE - step_03 + face_right step_end TrainerHill_Elevator_Movement_2693F0: @ 82693F0 - step_00 + face_down step_end diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/scripts/maps/TrainerHill_Entrance.inc index 6dc934f3c..84543ff2b 100644 --- a/data/scripts/maps/TrainerHill_Entrance.inc +++ b/data/scripts/maps/TrainerHill_Entrance.inc @@ -217,20 +217,20 @@ TrainerHill_Entrance_EventScript_26836A:: @ 826836A end TrainerHill_Entrance_Movement_26837F: @ 826837F - step_03 + face_right step_end TrainerHill_Entrance_Movement_268381: @ 8268381 - step_down + walk_down step_end TrainerHill_Entrance_Movement_268383: @ 8268383 - step_01 + face_up step_end TrainerHill_Entrance_Movement_268385: @ 8268385 - step_down - step_down + walk_down + walk_down step_end TrainerHill_Entrance_EventScript_268388:: @ 8268388 diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc index 24c319337..d7233a3aa 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc @@ -172,29 +172,29 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20256C:: @ 820256C return VerdanturfTown_BattleTentBattleRoom_Movement_202573: @ 8202573 - step_54 + set_invisible step_end VerdanturfTown_BattleTentBattleRoom_Movement_202575: @ 8202575 - step_55 - step_up - step_up - step_up - step_03 + set_visible + walk_up + walk_up + walk_up + face_right step_end VerdanturfTown_BattleTentBattleRoom_Movement_20257B: @ 820257B - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + face_left step_end VerdanturfTown_BattleTentBattleRoom_Movement_202581: @ 8202581 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end diff --git a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc index 0d0470fc1..96bd1f114 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc @@ -26,18 +26,18 @@ VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A end VerdanturfTown_BattleTentCorridor_Movement_2020DE: @ 82020DE - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end VerdanturfTown_BattleTentCorridor_Movement_2020E3: @ 82020E3 - step_up + walk_up VerdanturfTown_BattleTentCorridor_Movement_2020E4: @ 82020E4 - step_up - step_54 + walk_up + set_invisible step_end VerdanturfTown_BattleTentCorridor_Text_2020E7: @ 82020E7 diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc index 85c5f33c7..468a34991 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc @@ -258,20 +258,20 @@ VerdanturfTown_BattleTentLobby_EventScript_201A41:: @ 8201A41 return VerdanturfTown_BattleTentLobby_Movement_201A70: @ 8201A70 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end VerdanturfTown_BattleTentLobby_Movement_201A74: @ 8201A74 - step_up - step_54 + walk_up + set_invisible step_end VerdanturfTown_BattleTentLobby_Movement_201A77: @ 8201A77 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 4dd00035a..2ed1c6baf 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -51,30 +51,30 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 end VictoryRoad_1F_Movement_235E15: @ 8235E15 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end VictoryRoad_1F_Movement_235E21: @ 8235E21 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 8f8d493f8..734831f7f 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -32,7 +32,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 return LittlerootTown_BrendansHouse_1F_Movement_292763: @ 8292763 - step_up + walk_up step_end LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765 @@ -119,33 +119,33 @@ LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849 return LittlerootTown_BrendansHouse_2F_Movement_292850: @ 8292850 - step_13 - step_down - step_27 - step_14 - step_13 - step_left + delay_8 + walk_down + walk_in_place_fastest_left + delay_16 + delay_8 + walk_left step_end LittlerootTown_BrendansHouse_2F_Movement_292857: @ 8292857 - step_right - step_up - step_13 + walk_right + walk_up + delay_8 step_end LittlerootTown_BrendansHouse_2F_Movement_29285B: @ 829285B - step_13 - step_down - step_28 - step_14 - step_13 - step_right + delay_8 + walk_down + walk_in_place_fastest_right + delay_16 + delay_8 + walk_right step_end LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862 - step_left - step_up - step_13 + walk_left + walk_up + delay_8 step_end LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866 @@ -227,87 +227,87 @@ LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C return LittlerootTown_BrendansHouse_1F_Movement_292989: @ 8292989 - step_up - step_right - step_right - step_right - step_right - step_down - step_28 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_in_place_fastest_right step_end LittlerootTown_BrendansHouse_1F_Movement_292991: @ 8292991 - step_up - step_left - step_left - step_left - step_left - step_down - step_27 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_Movement_292999: @ 8292999 - step_right + walk_right step_end LittlerootTown_BrendansHouse_1F_Movement_29299B: @ 829299B - step_left + walk_left step_end LittlerootTown_BrendansHouse_1F_Movement_29299D: @ 829299D - step_27 - step_14 - step_14 - step_14 - step_14 - step_28 - step_14 - step_14 + walk_in_place_fastest_left + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_right + delay_16 + delay_16 step_end LittlerootTown_BrendansHouse_1F_Movement_2929A6: @ 82929A6 - step_28 - step_14 - step_14 - step_14 - step_14 - step_27 - step_14 - step_14 + walk_in_place_fastest_right + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + delay_16 step_end LittlerootTown_BrendansHouse_1F_Movement_2929AF: @ 82929AF - step_up - step_left - step_left + walk_up + walk_left + walk_left step_end LittlerootTown_BrendansHouse_1F_Movement_2929B3: @ 82929B3 - step_up - step_right - step_right + walk_up + walk_right + walk_right step_end LittlerootTown_BrendansHouse_1F_Movement_2929B7: @ 82929B7 - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_1F_Movement_2929BA: @ 82929BA - step_right - step_27 + walk_right + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_Movement_2929BD: @ 82929BD - step_left - step_down - step_28 + walk_left + walk_down + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_1F_Movement_2929C1: @ 82929C1 - step_right - step_down - step_27 + walk_right + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5 @@ -413,31 +413,31 @@ LittlerootTown_MaysHouse_1F_EventScript_292ACD:: @ 8292ACD end LittlerootTown_BrendansHouse_1F_Movement_292AE0: @ 8292AE0 - step_down - step_down - step_left - step_left - step_left + walk_down + walk_down + walk_left + walk_left + walk_left step_end LittlerootTown_BrendansHouse_1F_Movement_292AE6: @ 8292AE6 - step_left + walk_left step_end LittlerootTown_MaysHouse_1F_Movement_292AE8: @ 8292AE8 - step_down - step_down - step_right - step_right - step_right + walk_down + walk_down + walk_right + walk_right + walk_right step_end LittlerootTown_MaysHouse_1F_Movement_292AEE: @ 8292AEE - step_right + walk_right step_end LittlerootTown_BrendansHouse_1F_Movement_292AF0: @ 8292AF0 - step_up + walk_up step_end LittlerootTown_BrendansHouse_1F_EventScript_292AF2:: @ 8292AF2 @@ -641,74 +641,74 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D return LittlerootTown_BrendansHouse_1F_Movement_292DB2: @ 8292DB2 - step_right - step_right + walk_right + walk_right step_end LittlerootTown_BrendansHouse_1F_Movement_292DB5: @ 8292DB5 - step_left - step_left + walk_left + walk_left step_end LittlerootTown_BrendansHouse_1F_Movement_292DB8: @ 8292DB8 - step_02 + face_left step_end LittlerootTown_BrendansHouse_1F_Movement_292DBA: @ 8292DBA - step_03 + face_right step_end LittlerootTown_BrendansHouse_1F_Movement_292DBC: @ 8292DBC - step_down - step_right - step_down - step_13 + walk_down + walk_right + walk_down + delay_8 step_end LittlerootTown_BrendansHouse_1F_Movement_292DC1: @ 8292DC1 - step_down - step_left - step_down - step_13 + walk_down + walk_left + walk_down + delay_8 step_end LittlerootTown_BrendansHouse_1F_Movement_292DC6: @ 8292DC6 - step_14 - step_down - step_down - step_down - step_27 + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_Movement_292DCC: @ 8292DCC - step_13 - step_14 - step_14 - step_25 + delay_8 + delay_16 + delay_16 + walk_in_place_fastest_down step_end LittlerootTown_BrendansHouse_1F_Movement_292DD1: @ 8292DD1 - step_14 - step_down - step_down - step_down - step_28 + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end LittlerootTown_BrendansHouse_1F_Movement_292DD7: @ 8292DD7 - step_up - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE - step_up - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 9d4aa80b6..9c4b46ae2 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -559,7 +559,7 @@ LilycoveCity_ContestLobby_EventScript_294032:: @ 8294032 end LilycoveCity_ContestLobby_Movement_294053: @ 8294053 - step_28 + walk_in_place_fastest_right step_end LilycoveCity_ContestLobby_EventScript_294055:: @ 8294055 diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index c75fb9b48..76a4ee8f1 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -77,31 +77,31 @@ Route111_EventScript_276680:: @ 8276680 end Route111_Movement_27668A: @ 827668A - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down step_end Route111_Movement_276696: @ 8276696 - step_left - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_down - step_down + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + walk_down step_end EventScript_2766A2:: @ 82766A2 |