From 948bb616b8d3265bbcf7a99c6e3fc2b59e7a37e1 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Thu, 5 Jun 2025 06:13:31 +0800 Subject: [PATCH] Rename movement action script commands --- asm/macros/movement.inc | 210 +++++----- res/field/scripts/scripts_acuity_lakefront.s | 10 +- res/field/scripts/scripts_amity_square.s | 126 +++--- res/field/scripts/scripts_battle_arcade.s | 52 +-- res/field/scripts/scripts_battle_castle.s | 48 +-- res/field/scripts/scripts_battle_factory.s | 68 +-- res/field/scripts/scripts_battle_frontier.s | 8 +- ...ripts_battle_frontier_gate_to_fight_area.s | 10 +- res/field/scripts/scripts_battle_hall.s | 64 +-- res/field/scripts/scripts_battle_park.s | 42 +- res/field/scripts/scripts_battle_tower.s | 18 +- .../scripts_battle_tower_battle_room.s | 74 ++-- .../scripts_battle_tower_battle_salon.s | 104 ++--- .../scripts/scripts_battle_tower_corridor.s | 62 +-- .../scripts_battle_tower_corridor_multi.s | 50 +-- .../scripts/scripts_battle_tower_elevator.s | 24 +- .../scripts_battle_tower_multi_battle_room.s | 66 +-- res/field/scripts/scripts_battleground.s | 44 +- res/field/scripts/scripts_canalave_city.s | 82 ++-- .../scripts_canalave_city_harbor_inn.s | 20 +- ...ipts_canalave_city_sailor_eldritch_house.s | 26 +- .../scripts/scripts_canalave_library_1f.s | 26 +- .../scripts/scripts_canalave_library_2f.s | 28 +- .../scripts/scripts_canalave_library_3f.s | 102 ++--- res/field/scripts/scripts_celestic_town.s | 58 +-- .../scripts/scripts_celestic_town_cave.s | 220 +++++----- res/field/scripts/scripts_common.s | 16 +- .../scripts/scripts_contest_hall_lobby.s | 116 +++--- .../scripts/scripts_distortion_world_1f.s | 58 +-- .../scripts/scripts_distortion_world_b1f.s | 42 +- .../scripts/scripts_distortion_world_b2f.s | 16 +- .../scripts/scripts_distortion_world_b3f.s | 4 +- .../scripts/scripts_distortion_world_b6f.s | 16 +- .../scripts/scripts_distortion_world_b7f.s | 100 ++--- .../scripts_distortion_world_giratina_room.s | 16 +- res/field/scripts/scripts_eterna_city.s | 370 ++++++++--------- .../scripts/scripts_eterna_city_south_house.s | 2 +- ...cripts_eterna_city_underground_man_house.s | 32 +- res/field/scripts/scripts_eterna_forest.s | 118 +++--- res/field/scripts/scripts_fight_area.s | 142 +++---- res/field/scripts/scripts_floaroma_meadow.s | 26 +- res/field/scripts/scripts_floaroma_town.s | 8 +- res/field/scripts/scripts_footstep_house.s | 32 +- res/field/scripts/scripts_fullmoon_island.s | 22 +- .../scripts/scripts_fullmoon_island_forest.s | 6 +- res/field/scripts/scripts_galactic_hq_1f.s | 4 +- res/field/scripts/scripts_galactic_hq_3f.s | 4 +- res/field/scripts/scripts_galactic_hq_4f.s | 26 +- res/field/scripts/scripts_galactic_hq_b2f.s | 4 +- .../scripts_galactic_hq_control_room.s | 40 +- res/field/scripts/scripts_galactic_hq_hall.s | 54 +-- .../scripts/scripts_global_terminal_1f.s | 14 +- .../scripts_grand_lake_route_213_lobby.s | 2 +- res/field/scripts/scripts_hall_of_origin.s | 20 +- res/field/scripts/scripts_hearthome_city.s | 78 ++-- ...cripts_hearthome_city_dp_gym_leader_room.s | 32 +- ...scripts_hearthome_city_gym_entrance_room.s | 14 +- .../scripts_hearthome_city_gym_leader_room.s | 64 +-- ..._hearthome_city_northeast_house_elevator.s | 8 +- ..._hearthome_city_southeast_house_elevator.s | 8 +- res/field/scripts/scripts_iron_island.s | 18 +- .../scripts_iron_island_b2f_left_room.s | 74 ++-- res/field/scripts/scripts_iron_island_house.s | 10 +- res/field/scripts/scripts_jubilife_city.s | 386 +++++++++--------- .../scripts/scripts_jubilife_tv_2f_gallery.s | 44 +- res/field/scripts/scripts_jubilife_tv_3f.s | 4 +- .../scripts/scripts_jubilife_tv_elevator.s | 2 +- res/field/scripts/scripts_lake_acuity.s | 50 +-- res/field/scripts/scripts_lake_verity.s | 14 +- .../scripts/scripts_lake_verity_low_water.s | 70 ++-- .../scripts_mt_coronet_1f_north_room_1.s | 6 +- .../scripts/scripts_mt_coronet_1f_south.s | 34 +- .../scripts_mt_coronet_1f_tunnel_room.s | 2 +- res/field/scripts/scripts_mt_coronet_2f.s | 30 +- res/field/scripts/scripts_newmoon_island.s | 22 +- ...cripts_old_chateau_back_middle_east_room.s | 14 +- .../scripts/scripts_old_chateau_dining_area.s | 20 +- res/field/scripts/scripts_oreburgh_city.s | 146 +++---- res/field/scripts/scripts_oreburgh_gate_1f.s | 10 +- res/field/scripts/scripts_oreburgh_mine_b1f.s | 6 +- res/field/scripts/scripts_oreburgh_mine_b2f.s | 8 +- res/field/scripts/scripts_pal_park.s | 4 +- res/field/scripts/scripts_pal_park_lobby.s | 42 +- res/field/scripts/scripts_pastoria_city.s | 178 ++++---- ...cripts_pastoria_city_observatory_gate_1f.s | 34 +- .../scripts_pokemon_league_aaron_room.s | 2 +- .../scripts_pokemon_league_bertha_room.s | 2 +- .../scripts_pokemon_league_champion_room.s | 12 +- ..._pokemon_league_elevator_to_hall_of_fame.s | 52 +-- .../scripts_pokemon_league_flint_room.s | 12 +- .../scripts_pokemon_league_hall_of_fame.s | 26 +- .../scripts_pokemon_league_lucian_room.s | 2 +- ...ripts_pokemon_league_north_pokecenter_1f.s | 42 +- res/field/scripts/scripts_pokemon_mansion.s | 38 +- .../scripts/scripts_pokemon_mansion_office.s | 36 +- res/field/scripts/scripts_resort_area.s | 58 +-- res/field/scripts/scripts_resort_area_house.s | 2 +- .../scripts_resort_area_ribbon_syndicate_1f.s | 8 +- .../scripts_resort_area_ribbon_syndicate_2f.s | 84 ++-- ...ts_resort_area_ribbon_syndicate_elevator.s | 2 +- res/field/scripts/scripts_restaurant.s | 4 +- res/field/scripts/scripts_rotoms_room.s | 22 +- res/field/scripts/scripts_route_201.s | 306 +++++++------- res/field/scripts/scripts_route_202.s | 120 +++--- res/field/scripts/scripts_route_203.s | 34 +- res/field/scripts/scripts_route_205_south.s | 56 +-- ...cripts_route_206_cycling_road_north_gate.s | 4 +- ...cripts_route_206_cycling_road_south_gate.s | 4 +- res/field/scripts/scripts_route_207.s | 10 +- ...scripts_route_209_gate_to_hearthome_city.s | 58 +-- res/field/scripts/scripts_route_210_south.s | 58 +-- res/field/scripts/scripts_route_211_east.s | 2 +- res/field/scripts/scripts_route_213.s | 84 ++-- res/field/scripts/scripts_route_217.s | 42 +- .../scripts_route_218_gate_to_canalave_city.s | 60 +-- res/field/scripts/scripts_route_224.s | 178 ++++---- res/field/scripts/scripts_route_227.s | 60 +-- res/field/scripts/scripts_sandgem_town.s | 212 +++++----- ...cripts_sandgem_town_pokemon_research_lab.s | 96 ++--- res/field/scripts/scripts_sendoff_spring.s | 14 +- res/field/scripts/scripts_snowpoint_city.s | 50 +-- .../scripts_snowpoint_city_pokecenter_1f.s | 6 +- .../scripts/scripts_solaceon_ruins_room_2.s | 2 +- res/field/scripts/scripts_solaceon_town.s | 24 +- res/field/scripts/scripts_spear_pillar.s | 60 +-- .../scripts/scripts_spear_pillar_distorted.s | 24 +- .../scripts/scripts_stark_mountain_outside.s | 82 ++-- .../scripts/scripts_stark_mountain_room_1.s | 70 ++-- .../scripts/scripts_stark_mountain_room_2.s | 30 +- .../scripts/scripts_stark_mountain_room_3.s | 160 ++++---- res/field/scripts/scripts_sunyshore_city.s | 160 ++++---- res/field/scripts/scripts_survival_area.s | 6 +- ...scripts_team_galactic_eterna_building_1f.s | 28 +- ...scripts_team_galactic_eterna_building_4f.s | 16 +- res/field/scripts/scripts_trainers_school.s | 24 +- res/field/scripts/scripts_twinleaf_town.s | 228 +++++------ .../scripts_twinleaf_town_player_house_1f.s | 154 +++---- .../scripts_twinleaf_town_player_house_2f.s | 146 +++---- .../scripts_twinleaf_town_rival_house_2f.s | 18 +- res/field/scripts/scripts_underground.s | 44 +- res/field/scripts/scripts_unk_0212.s | 68 +-- res/field/scripts/scripts_unk_0213.s | 16 +- res/field/scripts/scripts_unk_0423.s | 50 +-- res/field/scripts/scripts_unk_0497.s | 24 +- res/field/scripts/scripts_unk_0501.s | 24 +- res/field/scripts/scripts_unk_1051.s | 16 +- res/field/scripts/scripts_unk_1114.s | 2 +- .../scripts_valley_windworks_building.s | 76 ++-- .../scripts_valley_windworks_outside.s | 58 +-- res/field/scripts/scripts_valor_cavern.s | 2 +- res/field/scripts/scripts_valor_lakefront.s | 122 +++--- res/field/scripts/scripts_veilstone_city.s | 312 +++++++------- ...cripts_veilstone_city_galactic_warehouse.s | 88 ++-- .../scripts_veilstone_city_southeast_house.s | 64 +-- .../scripts_veilstone_store_elevator.s | 2 +- res/field/scripts/scripts_verity_cavern.s | 12 +- res/field/scripts/scripts_verity_lakefront.s | 12 +- .../scripts/scripts_victory_road_1f_room_2.s | 114 +++--- res/field/scripts/scripts_villa.s | 76 ++-- res/field/scripts/scripts_vista_lighthouse.s | 34 +- .../scripts_vista_lighthouse_elevator.s | 8 +- res/field/scripts/scripts_wayward_cave_1f.s | 32 +- .../scripts/scripts_wifi_plaza_entrance.s | 102 ++--- 163 files changed, 4416 insertions(+), 4416 deletions(-) diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index 3b632212a2..a67e7c7ac8 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -1,526 +1,526 @@ #include "generated/movement_actions.h" - .macro MoveAction_000 length=1 + .macro FaceNorth length=1 .short MOVEMENT_ACTION_FACE_NORTH .short \length .endm - .macro MoveAction_001 length=1 + .macro FaceSouth length=1 .short MOVEMENT_ACTION_FACE_SOUTH .short \length .endm - .macro MoveAction_002 length=1 + .macro FaceWest length=1 .short MOVEMENT_ACTION_FACE_WEST .short \length .endm - .macro MoveAction_003 length=1 + .macro FaceEast length=1 .short MOVEMENT_ACTION_FACE_EAST .short \length .endm - .macro MoveAction_004 length=1 + .macro WalkSlowerNorth length=1 .short MOVEMENT_ACTION_WALK_SLOWER_NORTH .short \length .endm - .macro MoveAction_005 length=1 + .macro WalkSlowerSouth length=1 .short MOVEMENT_ACTION_WALK_SLOWER_SOUTH .short \length .endm - .macro MoveAction_006 length=1 + .macro WalkSlowerWest length=1 .short MOVEMENT_ACTION_WALK_SLOWER_WEST .short \length .endm - .macro MoveAction_007 length=1 + .macro WalkSlowerEast length=1 .short MOVEMENT_ACTION_WALK_SLOWER_EAST .short \length .endm - .macro MoveAction_008 length=1 + .macro WalkSlowNorth length=1 .short MOVEMENT_ACTION_WALK_SLOW_NORTH .short \length .endm - .macro MoveAction_009 length=1 + .macro WalkSlowSouth length=1 .short MOVEMENT_ACTION_WALK_SLOW_SOUTH .short \length .endm - .macro MoveAction_010 length=1 + .macro WalkSlowWest length=1 .short MOVEMENT_ACTION_WALK_SLOW_WEST .short \length .endm - .macro MoveAction_011 length=1 + .macro WalkSlowEast length=1 .short MOVEMENT_ACTION_WALK_SLOW_EAST .short \length .endm - .macro MoveAction_012 length=1 + .macro WalkNormalNorth length=1 .short MOVEMENT_ACTION_WALK_NORMAL_NORTH .short \length .endm - .macro MoveAction_013 length=1 + .macro WalkNormalSouth length=1 .short MOVEMENT_ACTION_WALK_NORMAL_SOUTH .short \length .endm - .macro MoveAction_014 length=1 + .macro WalkNormalWest length=1 .short MOVEMENT_ACTION_WALK_NORMAL_WEST .short \length .endm - .macro MoveAction_015 length=1 + .macro WalkNormalEast length=1 .short MOVEMENT_ACTION_WALK_NORMAL_EAST .short \length .endm - .macro MoveAction_016 length=1 + .macro WalkFastNorth length=1 .short MOVEMENT_ACTION_WALK_FAST_NORTH .short \length .endm - .macro MoveAction_017 length=1 + .macro WalkFastSouth length=1 .short MOVEMENT_ACTION_WALK_FAST_SOUTH .short \length .endm - .macro MoveAction_018 length=1 + .macro WalkFastWest length=1 .short MOVEMENT_ACTION_WALK_FAST_WEST .short \length .endm - .macro MoveAction_019 length=1 + .macro WalkFastEast length=1 .short MOVEMENT_ACTION_WALK_FAST_EAST .short \length .endm - .macro MoveAction_020 length=1 + .macro WalkFasterNorth length=1 .short MOVEMENT_ACTION_WALK_FASTER_NORTH .short \length .endm - .macro MoveAction_021 length=1 + .macro WalkFasterSouth length=1 .short MOVEMENT_ACTION_WALK_FASTER_SOUTH .short \length .endm - .macro MoveAction_022 length=1 + .macro WalkFasterWest length=1 .short MOVEMENT_ACTION_WALK_FASTER_WEST .short \length .endm - .macro MoveAction_023 length=1 + .macro WalkFasterEast length=1 .short MOVEMENT_ACTION_WALK_FASTER_EAST .short \length .endm - .macro MoveAction_024 length=1 + .macro WalkOnSpotSlowerNorth length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_SLOWER_NORTH .short \length .endm - .macro MoveAction_025 length=1 + .macro WalkOnSpotSlowerSouth length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_SLOWER_SOUTH .short \length .endm - .macro MoveAction_026 length=1 + .macro WalkOnSpotSlowerWest length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_SLOWER_WEST .short \length .endm - .macro MoveAction_027 length=1 + .macro WalkOnSpotSlowerEast length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_SLOWER_EAST .short \length .endm - .macro MoveAction_028 length=1 + .macro WalkOnSpotSlowNorth length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_SLOW_NORTH .short \length .endm - .macro MoveAction_029 length=1 + .macro WalkOnSpotSlowSouth length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_SLOW_SOUTH .short \length .endm - .macro MoveAction_030 length=1 + .macro WalkOnSpotSlowWest length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_SLOW_WEST .short \length .endm - .macro MoveAction_031 length=1 + .macro WalkOnSpotSlowEast length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_SLOW_EAST .short \length .endm - .macro MoveAction_032 length=1 + .macro WalkOnSpotNormalNorth length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_NORMAL_NORTH .short \length .endm - .macro MoveAction_033 length=1 + .macro WalkOnSpotNormalSouth length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_NORMAL_SOUTH .short \length .endm - .macro MoveAction_034 length=1 + .macro WalkOnSpotNormalWest length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_NORMAL_WEST .short \length .endm - .macro MoveAction_035 length=1 + .macro WalkOnSpotNormalEast length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_NORMAL_EAST .short \length .endm - .macro MoveAction_036 length=1 + .macro WalkOnSpotFastNorth length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_FAST_NORTH .short \length .endm - .macro MoveAction_037 length=1 + .macro WalkOnSpotFastSouth length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_FAST_SOUTH .short \length .endm - .macro MoveAction_038 length=1 + .macro WalkOnSpotFastWest length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_FAST_WEST .short \length .endm - .macro MoveAction_039 length=1 + .macro WalkOnSpotFastEast length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_FAST_EAST .short \length .endm - .macro MoveAction_040 length=1 + .macro WalkOnSpotFasterNorth length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_FASTER_NORTH .short \length .endm - .macro MoveAction_041 length=1 + .macro WalkOnSpotFasterSouth length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_FASTER_SOUTH .short \length .endm - .macro MoveAction_042 length=1 + .macro WalkOnSpotFasterWest length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_FASTER_WEST .short \length .endm - .macro MoveAction_043 length=1 + .macro WalkOnSpotFasterEast length=1 .short MOVEMENT_ACTION_WALK_ON_SPOT_FASTER_EAST .short \length .endm - .macro MoveAction_044 length=1 + .macro JumpOnSpotSlowNorth length=1 .short MOVEMENT_ACTION_JUMP_ON_SPOT_SLOW_NORTH .short \length .endm - .macro MoveAction_045 length=1 + .macro JumpOnSpotSlowSouth length=1 .short MOVEMENT_ACTION_JUMP_ON_SPOT_SLOW_SOUTH .short \length .endm - .macro MoveAction_046 length=1 + .macro JumpOnSpotSlowWest length=1 .short MOVEMENT_ACTION_JUMP_ON_SPOT_SLOW_WEST .short \length .endm - .macro MoveAction_047 length=1 + .macro JumpOnSpotSlowEast length=1 .short MOVEMENT_ACTION_JUMP_ON_SPOT_SLOW_EAST .short \length .endm - .macro MoveAction_048 length=1 + .macro JumpOnSpotFastNorth length=1 .short MOVEMENT_ACTION_JUMP_ON_SPOT_FAST_NORTH .short \length .endm - .macro MoveAction_049 length=1 + .macro JumpOnSpotFastSouth length=1 .short MOVEMENT_ACTION_JUMP_ON_SPOT_FAST_SOUTH .short \length .endm - .macro MoveAction_050 length=1 + .macro JumpOnSpotFastWest length=1 .short MOVEMENT_ACTION_JUMP_ON_SPOT_FAST_WEST .short \length .endm - .macro MoveAction_051 length=1 + .macro JumpOnSpotFastEast length=1 .short MOVEMENT_ACTION_JUMP_ON_SPOT_FAST_EAST .short \length .endm - .macro MoveAction_052 length=1 + .macro JumpNearFastNorth length=1 .short MOVEMENT_ACTION_JUMP_NEAR_FAST_NORTH .short \length .endm - .macro MoveAction_053 length=1 + .macro JumpNearFastSouth length=1 .short MOVEMENT_ACTION_JUMP_NEAR_FAST_SOUTH .short \length .endm - .macro MoveAction_054 length=1 + .macro JumpNearFastWest length=1 .short MOVEMENT_ACTION_JUMP_NEAR_FAST_WEST .short \length .endm - .macro MoveAction_055 length=1 + .macro JumpNearFastEast length=1 .short MOVEMENT_ACTION_JUMP_NEAR_FAST_EAST .short \length .endm - .macro MoveAction_056 length=1 + .macro JumpFarNorth length=1 .short MOVEMENT_ACTION_JUMP_FAR_NORTH .short \length .endm - .macro MoveAction_057 length=1 + .macro JumpFarSouth length=1 .short MOVEMENT_ACTION_JUMP_FAR_SOUTH .short \length .endm - .macro MoveAction_058 length=1 + .macro JumpFarWest length=1 .short MOVEMENT_ACTION_JUMP_FAR_WEST .short \length .endm - .macro MoveAction_059 length=1 + .macro JumpFarEast length=1 .short MOVEMENT_ACTION_JUMP_FAR_EAST .short \length .endm - .macro MoveAction_060 length=1 + .macro Delay1 length=1 .short MOVEMENT_ACTION_DELAY_1 .short \length .endm - .macro MoveAction_061 length=1 + .macro Delay2 length=1 .short MOVEMENT_ACTION_DELAY_2 .short \length .endm - .macro MoveAction_062 length=1 + .macro Delay4 length=1 .short MOVEMENT_ACTION_DELAY_4 .short \length .endm - .macro MoveAction_063 length=1 + .macro Delay8 length=1 .short MOVEMENT_ACTION_DELAY_8 .short \length .endm - .macro MoveAction_064 length=1 + .macro Delay15 length=1 .short MOVEMENT_ACTION_DELAY_15 .short \length .endm - .macro MoveAction_065 length=1 + .macro Delay16 length=1 .short MOVEMENT_ACTION_DELAY_16 .short \length .endm - .macro MoveAction_066 length=1 + .macro Delay32 length=1 .short MOVEMENT_ACTION_DELAY_32 .short \length .endm - .macro MoveAction_067 length=1 + .macro WarpOut length=1 .short MOVEMENT_ACTION_WARP_OUT .short \length .endm - .macro MoveAction_068 length=1 + .macro WarpIn length=1 .short MOVEMENT_ACTION_WARP_IN .short \length .endm - .macro MoveAction_069 length=1 + .macro SetInvisible length=1 .short MOVEMENT_ACTION_SET_INVISIBLE .short \length .endm - .macro MoveAction_070 length=1 + .macro SetVisible length=1 .short MOVEMENT_ACTION_SET_VISIBLE .short \length .endm - .macro MoveAction_071 length=1 + .macro LockDir length=1 .short MOVEMENT_ACTION_LOCK_DIR .short \length .endm - .macro MoveAction_072 length=1 + .macro UnlockDir length=1 .short MOVEMENT_ACTION_UNLOCK_DIR .short \length .endm - .macro MoveAction_073 length=1 + .macro PauseAnimation length=1 .short MOVEMENT_ACTION_PAUSE_ANIMATION .short \length .endm - .macro MoveAction_074 length=1 + .macro ResumeAnimation length=1 .short MOVEMENT_ACTION_RESUME_ANIMATION .short \length .endm - .macro MoveAction_075 length=1 + .macro EmoteExclamationMark length=1 .short MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK .short \length .endm - .macro MoveAction_076 length=1 + .macro WalkSlightlyFastNorth length=1 .short MOVEMENT_ACTION_WALK_SLIGHTLY_FAST_NORTH .short \length .endm - .macro MoveAction_077 length=1 + .macro WalkSlightlyFastSouth length=1 .short MOVEMENT_ACTION_WALK_SLIGHTLY_FAST_SOUTH .short \length .endm - .macro MoveAction_078 length=1 + .macro WalkSlightlyFastWest length=1 .short MOVEMENT_ACTION_WALK_SLIGHTLY_FAST_WEST .short \length .endm - .macro MoveAction_079 length=1 + .macro WalkSlightlyFastEast length=1 .short MOVEMENT_ACTION_WALK_SLIGHTLY_FAST_EAST .short \length .endm - .macro MoveAction_080 length=1 + .macro WalkSlightlyFasterNorth length=1 .short MOVEMENT_ACTION_WALK_SLIGHTLY_FASTER_NORTH .short \length .endm - .macro MoveAction_081 length=1 + .macro WalkSlightlyFasterSouth length=1 .short MOVEMENT_ACTION_WALK_SLIGHTLY_FASTER_SOUTH .short \length .endm - .macro MoveAction_082 length=1 + .macro WalkSlightlyFasterWest length=1 .short MOVEMENT_ACTION_WALK_SLIGHTLY_FASTER_WEST .short \length .endm - .macro MoveAction_083 length=1 + .macro WalkSlightlyFasterEast length=1 .short MOVEMENT_ACTION_WALK_SLIGHTLY_FASTER_EAST .short \length .endm - .macro MoveAction_084 length=1 + .macro WalkFastestNorth length=1 .short MOVEMENT_ACTION_WALK_FASTEST_NORTH .short \length .endm - .macro MoveAction_085 length=1 + .macro WalkFastestSouth length=1 .short MOVEMENT_ACTION_WALK_FASTEST_SOUTH .short \length .endm - .macro MoveAction_086 length=1 + .macro WalkFastestWest length=1 .short MOVEMENT_ACTION_WALK_FASTEST_WEST .short \length .endm - .macro MoveAction_087 length=1 + .macro WalkFastestEast length=1 .short MOVEMENT_ACTION_WALK_FASTEST_EAST .short \length .endm - .macro MoveAction_088 length=1 + .macro RunNorth length=1 .short MOVEMENT_ACTION_RUN_NORTH .short \length .endm - .macro MoveAction_089 length=1 + .macro RunSouth length=1 .short MOVEMENT_ACTION_RUN_SOUTH .short \length .endm - .macro MoveAction_090 length=1 + .macro RunWest length=1 .short MOVEMENT_ACTION_RUN_WEST .short \length .endm - .macro MoveAction_091 length=1 + .macro RunEast length=1 .short MOVEMENT_ACTION_RUN_EAST .short \length .endm - .macro MoveAction_092 length=1 + .macro JumpNearSlowWest length=1 .short MOVEMENT_ACTION_JUMP_NEAR_SLOW_WEST .short \length .endm - .macro MoveAction_093 length=1 + .macro JumpNearSlowEast length=1 .short MOVEMENT_ACTION_JUMP_NEAR_SLOW_EAST .short \length .endm - .macro MoveAction_094 length=1 + .macro JumpFartherWest length=1 .short MOVEMENT_ACTION_JUMP_FARTHER_WEST .short \length .endm - .macro MoveAction_095 length=1 + .macro JumpFartherEast length=1 .short MOVEMENT_ACTION_JUMP_FARTHER_EAST .short \length .endm - .macro MoveAction_096 length=1 + .macro WalkEverSoSlightlyFastNorth length=1 .short MOVEMENT_ACTION_WALK_EVER_SO_SLIGHTLY_FAST_NORTH .short \length .endm - .macro MoveAction_097 length=1 + .macro WalkEverSoSlightlyFastSouth length=1 .short MOVEMENT_ACTION_WALK_EVER_SO_SLIGHTLY_FAST_SOUTH .short \length .endm - .macro MoveAction_098 length=1 + .macro WalkEverSoSlightlyFastWest length=1 .short MOVEMENT_ACTION_WALK_EVER_SO_SLIGHTLY_FAST_WEST .short \length .endm - .macro MoveAction_099 length=1 + .macro WalkEverSoSlightlyFastEast length=1 .short MOVEMENT_ACTION_WALK_EVER_SO_SLIGHTLY_FAST_EAST .short \length .endm - .macro MoveAction_100 length=1 + .macro NurseJoyBow length=1 .short MOVEMENT_ACTION_NURSE_JOY_BOW .short \length .endm - .macro MoveAction_101 length=1 + .macro RevealTrainer length=1 .short MOVEMENT_ACTION_REVEAL_TRAINER .short \length .endm - .macro MoveAction_102 length=1 + .macro PlayerGive length=1 .short MOVEMENT_ACTION_PLAYER_GIVE .short \length .endm - .macro MoveAction_103 length=1 + .macro EmoteQuestionMark length=1 .short MOVEMENT_ACTION_EMOTE_QUESTION_MARK .short \length .endm - .macro MoveAction_104 length=1 + .macro PlayerReceive length=1 .short MOVEMENT_ACTION_PLAYER_RECEIVE .short \length .endm diff --git a/res/field/scripts/scripts_acuity_lakefront.s b/res/field/scripts/scripts_acuity_lakefront.s index ec1364c390..8a997788aa 100644 --- a/res/field/scripts/scripts_acuity_lakefront.s +++ b/res/field/scripts/scripts_acuity_lakefront.s @@ -63,17 +63,17 @@ _009A: .balign 4, 0 _00E8: - MoveAction_012 6 + WalkNormalNorth 6 EndMovement .balign 4, 0 _00F0: - MoveAction_013 6 + WalkNormalSouth 6 EndMovement .balign 4, 0 _00F8: - MoveAction_012 3 - MoveAction_014 - MoveAction_012 4 + WalkNormalNorth 3 + WalkNormalWest + WalkNormalNorth 4 EndMovement diff --git a/res/field/scripts/scripts_amity_square.s b/res/field/scripts/scripts_amity_square.s index 5567b9d675..35c4aac562 100644 --- a/res/field/scripts/scripts_amity_square.s +++ b/res/field/scripts/scripts_amity_square.s @@ -277,22 +277,22 @@ AmitySquare_Trigger_ExitAmitySquare_End: .balign 4, 0 _03B0: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _03B8: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _03C0: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _03C8: - MoveAction_012 + WalkNormalNorth EndMovement .byte 85 @@ -632,12 +632,12 @@ AmitySquare_EastReceptionist_End: .balign 4, 0 _08C8: - MoveAction_003 + FaceEast EndMovement .balign 4, 0 _08D0: - MoveAction_002 + FaceWest EndMovement AmitySquare_DrifloonMan: @@ -1421,177 +1421,177 @@ _174A: .balign 4, 0 _1758: - MoveAction_001 - MoveAction_069 + FaceSouth + SetInvisible EndMovement .balign 4, 0 _1764: - MoveAction_001 - MoveAction_070 + FaceSouth + SetVisible EndMovement .balign 4, 0 _1770: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _1778: - MoveAction_023 18 + WalkFasterEast 18 EndMovement .balign 4, 0 _1780: - MoveAction_023 19 - MoveAction_020 + WalkFasterEast 19 + WalkFasterNorth EndMovement .balign 4, 0 _178C: - MoveAction_023 17 - MoveAction_020 + WalkFasterEast 17 + WalkFasterNorth EndMovement .balign 4, 0 _1798: - MoveAction_022 18 - MoveAction_021 2 + WalkFasterWest 18 + WalkFasterSouth 2 EndMovement .balign 4, 0 _17A4: - MoveAction_022 17 - MoveAction_021 + WalkFasterWest 17 + WalkFasterSouth EndMovement .balign 4, 0 _17B0: - MoveAction_022 19 - MoveAction_021 + WalkFasterWest 19 + WalkFasterSouth EndMovement .balign 4, 0 _17BC: - MoveAction_022 5 - MoveAction_020 16 + WalkFasterWest 5 + WalkFasterNorth 16 EndMovement .balign 4, 0 _17C8: - MoveAction_022 18 - MoveAction_020 18 + WalkFasterWest 18 + WalkFasterNorth 18 EndMovement .balign 4, 0 _17D4: - MoveAction_022 38 - MoveAction_020 15 + WalkFasterWest 38 + WalkFasterNorth 15 EndMovement .balign 4, 0 _17E0: - MoveAction_023 5 - MoveAction_021 18 + WalkFasterEast 5 + WalkFasterSouth 18 EndMovement .balign 4, 0 _17EC: - MoveAction_022 31 - MoveAction_021 2 + WalkFasterWest 31 + WalkFasterSouth 2 EndMovement .balign 4, 0 _17F8: - MoveAction_022 15 - MoveAction_020 + WalkFasterWest 15 + WalkFasterNorth EndMovement .balign 4, 0 _1804: - MoveAction_023 37 - MoveAction_021 16 + WalkFasterEast 37 + WalkFasterSouth 16 EndMovement .balign 4, 0 _1810: - MoveAction_023 12 - MoveAction_020 + WalkFasterEast 12 + WalkFasterNorth EndMovement .balign 4, 0 _181C: - MoveAction_023 25 - MoveAction_021 6 + WalkFasterEast 25 + WalkFasterSouth 6 EndMovement .balign 4, 0 _1828: - MoveAction_023 19 - MoveAction_021 19 + WalkFasterEast 19 + WalkFasterSouth 19 EndMovement .balign 4, 0 _1834: - MoveAction_023 9 - MoveAction_021 9 + WalkFasterEast 9 + WalkFasterSouth 9 EndMovement .balign 4, 0 _1840: - MoveAction_022 8 - MoveAction_021 2 + WalkFasterWest 8 + WalkFasterSouth 2 EndMovement .balign 4, 0 _184C: - MoveAction_023 21 + WalkFasterEast 21 EndMovement .balign 4, 0 _1854: - MoveAction_023 22 - MoveAction_021 25 + WalkFasterEast 22 + WalkFasterSouth 25 EndMovement .balign 4, 0 _1860: - MoveAction_022 12 - MoveAction_021 + WalkFasterWest 12 + WalkFasterSouth EndMovement .balign 4, 0 _186C: - MoveAction_023 6 - MoveAction_020 7 + WalkFasterEast 6 + WalkFasterNorth 7 EndMovement .balign 4, 0 _1878: - MoveAction_022 7 - MoveAction_020 9 + WalkFasterWest 7 + WalkFasterNorth 9 EndMovement .balign 4, 0 _1884: - MoveAction_023 5 - MoveAction_021 18 + WalkFasterEast 5 + WalkFasterSouth 18 EndMovement .balign 4, 0 _1890: - MoveAction_023 5 - MoveAction_020 8 + WalkFasterEast 5 + WalkFasterNorth 8 EndMovement .balign 4, 0 _189C: - MoveAction_022 31 - MoveAction_020 24 + WalkFasterWest 31 + WalkFasterNorth 24 EndMovement .balign 4, 0 _18A8: - MoveAction_022 15 - MoveAction_020 27 + WalkFasterWest 15 + WalkFasterNorth 27 EndMovement diff --git a/res/field/scripts/scripts_battle_arcade.s b/res/field/scripts/scripts_battle_arcade.s index 6593491eb1..2631d9d8bf 100644 --- a/res/field/scripts/scripts_battle_arcade.s +++ b/res/field/scripts/scripts_battle_arcade.s @@ -356,60 +356,60 @@ _05E1: .balign 4, 0 _05F0: - MoveAction_012 2 - MoveAction_015 - MoveAction_012 2 - MoveAction_069 + WalkNormalNorth 2 + WalkNormalEast + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _0604: - MoveAction_012 4 - MoveAction_069 + WalkNormalNorth 4 + SetInvisible EndMovement .balign 4, 0 _0610: - MoveAction_012 - MoveAction_015 - MoveAction_012 2 - MoveAction_069 + WalkNormalNorth + WalkNormalEast + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _0624: - MoveAction_012 3 - MoveAction_069 + WalkNormalNorth 3 + SetInvisible EndMovement .balign 4, 0 _0630: - MoveAction_021 2 - MoveAction_022 - MoveAction_021 2 - MoveAction_000 - MoveAction_070 + WalkFasterSouth 2 + WalkFasterWest + WalkFasterSouth 2 + FaceNorth + SetVisible EndMovement .balign 4, 0 _0648: - MoveAction_021 4 - MoveAction_000 - MoveAction_070 + WalkFasterSouth 4 + FaceNorth + SetVisible EndMovement .balign 4, 0 _0658: - MoveAction_021 - MoveAction_022 - MoveAction_021 2 - MoveAction_070 + WalkFasterSouth + WalkFasterWest + WalkFasterSouth 2 + SetVisible EndMovement .balign 4, 0 _066C: - MoveAction_021 3 - MoveAction_070 + WalkFasterSouth 3 + SetVisible EndMovement _0678: diff --git a/res/field/scripts/scripts_battle_castle.s b/res/field/scripts/scripts_battle_castle.s index 99e48d59d9..d0200b6beb 100644 --- a/res/field/scripts/scripts_battle_castle.s +++ b/res/field/scripts/scripts_battle_castle.s @@ -353,58 +353,58 @@ _05D5: .balign 4, 0 _05E4: - MoveAction_014 6 - MoveAction_069 + WalkNormalWest 6 + SetInvisible EndMovement .balign 4, 0 _05F0: - MoveAction_014 3 - MoveAction_012 - MoveAction_014 3 - MoveAction_069 + WalkNormalWest 3 + WalkNormalNorth + WalkNormalWest 3 + SetInvisible EndMovement .balign 4, 0 _0604: - MoveAction_014 5 - MoveAction_069 + WalkNormalWest 5 + SetInvisible EndMovement .balign 4, 0 _0610: - MoveAction_014 2 - MoveAction_012 - MoveAction_014 3 - MoveAction_069 + WalkNormalWest 2 + WalkNormalNorth + WalkNormalWest 3 + SetInvisible EndMovement .balign 4, 0 _0624: - MoveAction_023 6 - MoveAction_070 - MoveAction_002 + WalkFasterEast 6 + SetVisible + FaceWest EndMovement .balign 4, 0 _0634: - MoveAction_023 6 - MoveAction_021 - MoveAction_070 - MoveAction_002 + WalkFasterEast 6 + WalkFasterSouth + SetVisible + FaceWest EndMovement .balign 4, 0 _0648: - MoveAction_023 5 - MoveAction_070 + WalkFasterEast 5 + SetVisible EndMovement .balign 4, 0 _0654: - MoveAction_021 - MoveAction_023 5 - MoveAction_070 + WalkFasterSouth + WalkFasterEast 5 + SetVisible EndMovement _0664: diff --git a/res/field/scripts/scripts_battle_factory.s b/res/field/scripts/scripts_battle_factory.s index 9045f1f4af..77afefc5df 100644 --- a/res/field/scripts/scripts_battle_factory.s +++ b/res/field/scripts/scripts_battle_factory.s @@ -300,68 +300,68 @@ _04B2: .balign 4, 0 _04C8: - MoveAction_012 3 - MoveAction_015 - MoveAction_012 4 - MoveAction_069 + WalkNormalNorth 3 + WalkNormalEast + WalkNormalNorth 4 + SetInvisible EndMovement .balign 4, 0 _04DC: - MoveAction_012 3 - MoveAction_014 - MoveAction_012 4 - MoveAction_069 + WalkNormalNorth 3 + WalkNormalWest + WalkNormalNorth 4 + SetInvisible EndMovement .balign 4, 0 _04F0: - MoveAction_012 2 - MoveAction_015 - MoveAction_012 4 - MoveAction_069 + WalkNormalNorth 2 + WalkNormalEast + WalkNormalNorth 4 + SetInvisible EndMovement .balign 4, 0 _0504: - MoveAction_012 2 - MoveAction_014 - MoveAction_012 4 - MoveAction_069 + WalkNormalNorth 2 + WalkNormalWest + WalkNormalNorth 4 + SetInvisible EndMovement .balign 4, 0 _0518: - MoveAction_021 3 - MoveAction_022 - MoveAction_021 4 - MoveAction_000 - MoveAction_070 + WalkFasterSouth 3 + WalkFasterWest + WalkFasterSouth 4 + FaceNorth + SetVisible EndMovement .balign 4, 0 _0530: - MoveAction_021 3 - MoveAction_023 - MoveAction_021 4 - MoveAction_000 - MoveAction_070 + WalkFasterSouth 3 + WalkFasterEast + WalkFasterSouth 4 + FaceNorth + SetVisible EndMovement .balign 4, 0 _0548: - MoveAction_021 2 - MoveAction_022 - MoveAction_021 4 - MoveAction_070 + WalkFasterSouth 2 + WalkFasterWest + WalkFasterSouth 4 + SetVisible EndMovement .balign 4, 0 _055C: - MoveAction_021 2 - MoveAction_023 - MoveAction_021 4 - MoveAction_070 + WalkFasterSouth 2 + WalkFasterEast + WalkFasterSouth 4 + SetVisible EndMovement _0570: diff --git a/res/field/scripts/scripts_battle_frontier.s b/res/field/scripts/scripts_battle_frontier.s index 6df3b33c71..0b26dcc3aa 100644 --- a/res/field/scripts/scripts_battle_frontier.s +++ b/res/field/scripts/scripts_battle_frontier.s @@ -362,7 +362,7 @@ _0360: .balign 4, 0 _0398: - MoveAction_018 5 + WalkFastWest 5 EndMovement _03A0: @@ -379,7 +379,7 @@ _03A0: .balign 4, 0 _03D8: - MoveAction_018 6 + WalkFastWest 6 EndMovement _03E0: @@ -396,7 +396,7 @@ _03E0: .balign 4, 0 _0418: - MoveAction_019 5 + WalkFastEast 5 EndMovement _0420: @@ -413,7 +413,7 @@ _0420: .balign 4, 0 _0458: - MoveAction_019 6 + WalkFastEast 6 EndMovement _0460: diff --git a/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s b/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s index 32dc499a25..d052d0fdd5 100644 --- a/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s +++ b/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s @@ -260,23 +260,23 @@ _02F5: .balign 4, 0 _0334: - MoveAction_001 + FaceSouth EndMovement .balign 4, 0 _033C: - MoveAction_003 + FaceEast EndMovement .balign 4, 0 _0344: - MoveAction_002 + FaceWest EndMovement .balign 4, 0 _034C: - MoveAction_012 3 - MoveAction_034 + WalkNormalNorth 3 + WalkOnSpotNormalWest EndMovement _0358: diff --git a/res/field/scripts/scripts_battle_hall.s b/res/field/scripts/scripts_battle_hall.s index a07f15e11e..e7ed260068 100644 --- a/res/field/scripts/scripts_battle_hall.s +++ b/res/field/scripts/scripts_battle_hall.s @@ -472,66 +472,66 @@ _07C8: .balign 4, 0 _07D4: - MoveAction_014 4 - MoveAction_013 3 - MoveAction_069 + WalkNormalWest 4 + WalkNormalSouth 3 + SetInvisible EndMovement .balign 4, 0 _07E4: - MoveAction_014 2 - MoveAction_012 - MoveAction_014 2 - MoveAction_013 3 - MoveAction_069 + WalkNormalWest 2 + WalkNormalNorth + WalkNormalWest 2 + WalkNormalSouth 3 + SetInvisible EndMovement .balign 4, 0 _07FC: - MoveAction_014 3 - MoveAction_013 3 - MoveAction_069 + WalkNormalWest 3 + WalkNormalSouth 3 + SetInvisible EndMovement .balign 4, 0 _080C: - MoveAction_014 - MoveAction_012 - MoveAction_014 2 - MoveAction_013 3 - MoveAction_069 + WalkNormalWest + WalkNormalNorth + WalkNormalWest 2 + WalkNormalSouth 3 + SetInvisible EndMovement .balign 4, 0 _0824: - MoveAction_023 4 - MoveAction_020 3 - MoveAction_002 - MoveAction_070 + WalkFasterEast 4 + WalkFasterNorth 3 + FaceWest + SetVisible EndMovement .balign 4, 0 _0838: - MoveAction_023 2 - MoveAction_021 - MoveAction_023 2 - MoveAction_020 3 - MoveAction_002 - MoveAction_070 + WalkFasterEast 2 + WalkFasterSouth + WalkFasterEast 2 + WalkFasterNorth 3 + FaceWest + SetVisible EndMovement .balign 4, 0 _0854: - MoveAction_020 3 - MoveAction_023 3 - MoveAction_070 + WalkFasterNorth 3 + WalkFasterEast 3 + SetVisible EndMovement .balign 4, 0 _0864: - MoveAction_020 2 - MoveAction_023 3 - MoveAction_070 + WalkFasterNorth 2 + WalkFasterEast 3 + SetVisible EndMovement _0874: diff --git a/res/field/scripts/scripts_battle_park.s b/res/field/scripts/scripts_battle_park.s index 8020cef346..a650de7f73 100644 --- a/res/field/scripts/scripts_battle_park.s +++ b/res/field/scripts/scripts_battle_park.s @@ -155,59 +155,59 @@ _027C: .balign 4, 0 _0290: - MoveAction_062 7 - MoveAction_037 - MoveAction_071 - MoveAction_016 - MoveAction_072 + Delay4 7 + WalkOnSpotFastSouth + LockDir + WalkFastNorth + UnlockDir EndMovement .balign 4, 0 _02A8: - MoveAction_063 - MoveAction_035 - MoveAction_032 + Delay8 + WalkOnSpotNormalEast + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _02B8: - MoveAction_063 - MoveAction_034 - MoveAction_032 + Delay8 + WalkOnSpotNormalWest + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _02C8: - MoveAction_016 8 + WalkFastNorth 8 EndMovement .balign 4, 0 _02D0: - MoveAction_034 - MoveAction_035 - MoveAction_033 + WalkOnSpotNormalWest + WalkOnSpotNormalEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _02E0: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _02E8: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _02F0: - MoveAction_019 - MoveAction_016 8 + WalkFastEast + WalkFastNorth 8 EndMovement .balign 4, 0 _02FC: - MoveAction_018 - MoveAction_016 8 + WalkFastWest + WalkFastNorth 8 EndMovement _0308: diff --git a/res/field/scripts/scripts_battle_tower.s b/res/field/scripts/scripts_battle_tower.s index a991a7435d..f8b8988e63 100644 --- a/res/field/scripts/scripts_battle_tower.s +++ b/res/field/scripts/scripts_battle_tower.s @@ -1097,31 +1097,31 @@ _1205: .balign 4, 0 _1248: - MoveAction_062 - MoveAction_012 2 + Delay4 + WalkNormalNorth 2 EndMovement .balign 4, 0 _1254: - MoveAction_012 - MoveAction_069 + WalkNormalNorth + SetInvisible EndMovement .balign 4, 0 _1260: - MoveAction_062 - MoveAction_012 2 + Delay4 + WalkNormalNorth 2 EndMovement .balign 4, 0 _126C: - MoveAction_012 2 - MoveAction_069 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _1278: - MoveAction_003 + FaceEast EndMovement _1280: diff --git a/res/field/scripts/scripts_battle_tower_battle_room.s b/res/field/scripts/scripts_battle_tower_battle_room.s index f12a561bbf..c419078fa5 100644 --- a/res/field/scripts/scripts_battle_tower_battle_room.s +++ b/res/field/scripts/scripts_battle_tower_battle_room.s @@ -329,81 +329,81 @@ _04CE: .balign 4, 0 _0504: - MoveAction_062 - MoveAction_012 - MoveAction_002 - MoveAction_014 3 - MoveAction_000 - MoveAction_012 3 - MoveAction_003 + Delay4 + WalkNormalNorth + FaceWest + WalkNormalWest 3 + FaceNorth + WalkNormalNorth 3 + FaceEast EndMovement .balign 4, 0 _0524: - MoveAction_013 - MoveAction_003 - MoveAction_015 3 - MoveAction_001 - MoveAction_013 3 - MoveAction_002 + WalkNormalSouth + FaceEast + WalkNormalEast 3 + FaceSouth + WalkNormalSouth 3 + FaceWest EndMovement .balign 4, 0 _0540: - MoveAction_015 + WalkNormalEast EndMovement .balign 4, 0 _0548: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _0550: - MoveAction_003 - MoveAction_015 - MoveAction_000 - MoveAction_012 3 - MoveAction_002 - MoveAction_014 3 - MoveAction_000 - MoveAction_012 + FaceEast + WalkNormalEast + FaceNorth + WalkNormalNorth 3 + FaceWest + WalkNormalWest 3 + FaceNorth + WalkNormalNorth EndMovement .balign 4, 0 _0574: - MoveAction_014 - MoveAction_002 + WalkNormalWest + FaceWest EndMovement .balign 4, 0 _0580: - MoveAction_015 + WalkNormalEast EndMovement .balign 4, 0 _0588: - MoveAction_003 + FaceEast EndMovement .balign 4, 0 _0590: - MoveAction_002 - MoveAction_014 - MoveAction_003 + FaceWest + WalkNormalWest + FaceEast EndMovement .balign 4, 0 _05A0: - MoveAction_002 + FaceWest EndMovement .balign 4, 0 _05A8: - MoveAction_009 - MoveAction_003 - MoveAction_011 3 - MoveAction_001 - MoveAction_009 3 - MoveAction_002 + WalkSlowSouth + FaceEast + WalkSlowEast 3 + FaceSouth + WalkSlowSouth 3 + FaceWest EndMovement diff --git a/res/field/scripts/scripts_battle_tower_battle_salon.s b/res/field/scripts/scripts_battle_tower_battle_salon.s index 739f78f870..957e67d89d 100644 --- a/res/field/scripts/scripts_battle_tower_battle_salon.s +++ b/res/field/scripts/scripts_battle_tower_battle_salon.s @@ -446,132 +446,132 @@ _06A3: .balign 4, 0 _06B8: - MoveAction_013 2 + WalkNormalSouth 2 EndMovement .balign 4, 0 _06C0: - MoveAction_000 + FaceNorth EndMovement .balign 4, 0 _06C8: - MoveAction_013 2 - MoveAction_014 - MoveAction_003 + WalkNormalSouth 2 + WalkNormalWest + FaceEast EndMovement .balign 4, 0 _06D8: - MoveAction_015 - MoveAction_001 + WalkNormalEast + FaceSouth EndMovement .balign 4, 0 _06E4: - MoveAction_001 - MoveAction_018 - MoveAction_003 + FaceSouth + WalkFastWest + FaceEast EndMovement .balign 4, 0 _06F4: - MoveAction_019 - MoveAction_001 + WalkFastEast + FaceSouth EndMovement .balign 4, 0 _0700: - MoveAction_012 2 - MoveAction_069 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _070C: - MoveAction_012 - MoveAction_069 + WalkNormalNorth + SetInvisible EndMovement .balign 4, 0 _0718: - MoveAction_000 + FaceNorth EndMovement .balign 4, 0 _0720: - MoveAction_016 2 - MoveAction_069 + WalkFastNorth 2 + SetInvisible EndMovement .balign 4, 0 _072C: - MoveAction_017 - MoveAction_018 3 - MoveAction_016 7 - MoveAction_018 2 + WalkFastSouth + WalkFastWest 3 + WalkFastNorth 7 + WalkFastWest 2 EndMovement .balign 4, 0 _0740: - MoveAction_018 - MoveAction_016 - MoveAction_018 2 - MoveAction_016 5 - MoveAction_018 2 + WalkFastWest + WalkFastNorth + WalkFastWest 2 + WalkFastNorth 5 + WalkFastWest 2 EndMovement .balign 4, 0 _0758: - MoveAction_019 - MoveAction_016 2 - MoveAction_019 3 + WalkFastEast + WalkFastNorth 2 + WalkFastEast 3 EndMovement .balign 4, 0 _0768: - MoveAction_016 2 - MoveAction_019 4 + WalkFastNorth 2 + WalkFastEast 4 EndMovement .balign 4, 0 _0774: - MoveAction_018 - MoveAction_016 4 - MoveAction_018 2 + WalkFastWest + WalkFastNorth 4 + WalkFastWest 2 EndMovement .balign 4, 0 _0784: - MoveAction_016 4 - MoveAction_018 3 + WalkFastNorth 4 + WalkFastWest 3 EndMovement .balign 4, 0 _0790: - MoveAction_017 - MoveAction_019 4 - MoveAction_016 7 - MoveAction_019 2 + WalkFastSouth + WalkFastEast 4 + WalkFastNorth 7 + WalkFastEast 2 EndMovement .balign 4, 0 _07A4: - MoveAction_016 - MoveAction_019 4 - MoveAction_016 5 - MoveAction_019 2 + WalkFastNorth + WalkFastEast 4 + WalkFastNorth 5 + WalkFastEast 2 EndMovement .balign 4, 0 _07B8: - MoveAction_018 - MoveAction_016 5 - MoveAction_019 2 + WalkFastWest + WalkFastNorth 5 + WalkFastEast 2 EndMovement .balign 4, 0 _07C8: - MoveAction_019 3 - MoveAction_016 5 - MoveAction_018 2 + WalkFastEast 3 + WalkFastNorth 5 + WalkFastWest 2 EndMovement diff --git a/res/field/scripts/scripts_battle_tower_corridor.s b/res/field/scripts/scripts_battle_tower_corridor.s index 0116cff38a..1b1cbc41f4 100644 --- a/res/field/scripts/scripts_battle_tower_corridor.s +++ b/res/field/scripts/scripts_battle_tower_corridor.s @@ -106,13 +106,13 @@ _0124: .balign 4, 0 _0140: - MoveAction_013 3 - MoveAction_000 + WalkNormalSouth 3 + FaceNorth EndMovement .balign 4, 0 _014C: - MoveAction_013 2 + WalkNormalSouth 2 EndMovement .byte 0 @@ -154,60 +154,60 @@ _014C: .balign 4, 0 _0178: - MoveAction_015 4 - MoveAction_012 2 - MoveAction_069 + WalkNormalEast 4 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _0188: - MoveAction_013 - MoveAction_015 4 - MoveAction_012 2 - MoveAction_069 + WalkNormalSouth + WalkNormalEast 4 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _019C: - MoveAction_015 8 - MoveAction_012 2 - MoveAction_069 + WalkNormalEast 8 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _01AC: - MoveAction_013 - MoveAction_015 8 - MoveAction_012 2 - MoveAction_069 + WalkNormalSouth + WalkNormalEast 8 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _01C0: - MoveAction_015 12 - MoveAction_012 2 - MoveAction_069 + WalkNormalEast 12 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _01D0: - MoveAction_013 - MoveAction_015 12 - MoveAction_012 2 - MoveAction_069 + WalkNormalSouth + WalkNormalEast 12 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _01E4: - MoveAction_015 16 - MoveAction_012 2 - MoveAction_069 + WalkNormalEast 16 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _01F4: - MoveAction_013 - MoveAction_015 16 - MoveAction_012 2 - MoveAction_069 + WalkNormalSouth + WalkNormalEast 16 + WalkNormalNorth 2 + SetInvisible EndMovement diff --git a/res/field/scripts/scripts_battle_tower_corridor_multi.s b/res/field/scripts/scripts_battle_tower_corridor_multi.s index fa3b3b9ee7..1cfa24459c 100644 --- a/res/field/scripts/scripts_battle_tower_corridor_multi.s +++ b/res/field/scripts/scripts_battle_tower_corridor_multi.s @@ -90,57 +90,57 @@ _014F: .balign 4, 0 _0174: - MoveAction_013 3 - MoveAction_000 + WalkNormalSouth 3 + FaceNorth EndMovement .balign 4, 0 _0180: - MoveAction_013 2 + WalkNormalSouth 2 EndMovement .balign 4, 0 _0188: - MoveAction_013 - MoveAction_015 5 + WalkNormalSouth + WalkNormalEast 5 EndMovement .balign 4, 0 _0194: - MoveAction_013 - MoveAction_014 5 + WalkNormalSouth + WalkNormalWest 5 EndMovement .balign 4, 0 _01A0: - MoveAction_012 2 - MoveAction_069 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _01AC: - MoveAction_015 5 - MoveAction_012 - MoveAction_063 - MoveAction_003 - MoveAction_062 - MoveAction_000 - MoveAction_062 + WalkNormalEast 5 + WalkNormalNorth + Delay8 + FaceEast + Delay4 + FaceNorth + Delay4 EndMovement .balign 4, 0 _01CC: - MoveAction_014 5 - MoveAction_012 - MoveAction_063 - MoveAction_002 - MoveAction_062 - MoveAction_000 - MoveAction_062 + WalkNormalWest 5 + WalkNormalNorth + Delay8 + FaceWest + Delay4 + FaceNorth + Delay4 EndMovement .balign 4, 0 _01EC: - MoveAction_012 - MoveAction_069 + WalkNormalNorth + SetInvisible EndMovement diff --git a/res/field/scripts/scripts_battle_tower_elevator.s b/res/field/scripts/scripts_battle_tower_elevator.s index ca9c581480..3639fd9014 100644 --- a/res/field/scripts/scripts_battle_tower_elevator.s +++ b/res/field/scripts/scripts_battle_tower_elevator.s @@ -128,26 +128,26 @@ _0194: .balign 4, 0 _01BC: - MoveAction_012 2 - MoveAction_001 + WalkNormalNorth 2 + FaceSouth EndMovement .balign 4, 0 _01C8: - MoveAction_013 - MoveAction_002 - MoveAction_014 - MoveAction_001 - MoveAction_013 - MoveAction_069 + WalkNormalSouth + FaceWest + WalkNormalWest + FaceSouth + WalkNormalSouth + SetInvisible EndMovement .balign 4, 0 _01E4: - MoveAction_063 2 - MoveAction_061 - MoveAction_013 2 - MoveAction_069 + Delay8 2 + Delay2 + WalkNormalSouth 2 + SetInvisible EndMovement _01F8: diff --git a/res/field/scripts/scripts_battle_tower_multi_battle_room.s b/res/field/scripts/scripts_battle_tower_multi_battle_room.s index 57d7e90938..6a2f8ce732 100644 --- a/res/field/scripts/scripts_battle_tower_multi_battle_room.s +++ b/res/field/scripts/scripts_battle_tower_multi_battle_room.s @@ -343,89 +343,89 @@ _0589: .balign 4, 0 _05B0: - MoveAction_012 - MoveAction_014 3 - MoveAction_012 3 - MoveAction_003 + WalkNormalNorth + WalkNormalWest 3 + WalkNormalNorth 3 + FaceEast EndMovement .balign 4, 0 _05C4: - MoveAction_012 - MoveAction_014 4 - MoveAction_012 2 - MoveAction_003 + WalkNormalNorth + WalkNormalWest 4 + WalkNormalNorth 2 + FaceEast EndMovement .balign 4, 0 _05D8: - MoveAction_013 - MoveAction_015 3 - MoveAction_013 3 - MoveAction_002 + WalkNormalSouth + WalkNormalEast 3 + WalkNormalSouth 3 + FaceWest EndMovement .balign 4, 0 _05EC: - MoveAction_013 - MoveAction_015 4 - MoveAction_013 2 - MoveAction_002 + WalkNormalSouth + WalkNormalEast 4 + WalkNormalSouth 2 + FaceWest EndMovement .balign 4, 0 _0600: - MoveAction_015 + WalkNormalEast EndMovement .balign 4, 0 _0608: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _0610: - MoveAction_030 + WalkOnSpotSlowWest EndMovement .balign 4, 0 _0618: - MoveAction_012 3 - MoveAction_014 2 - MoveAction_012 + WalkNormalNorth 3 + WalkNormalWest 2 + WalkNormalNorth EndMovement .balign 4, 0 _0628: - MoveAction_012 2 - MoveAction_014 3 - MoveAction_012 + WalkNormalNorth 2 + WalkNormalWest 3 + WalkNormalNorth EndMovement .balign 4, 0 _0638: - MoveAction_014 - MoveAction_002 + WalkNormalWest + FaceWest EndMovement .balign 4, 0 _0644: - MoveAction_015 + WalkNormalEast EndMovement .balign 4, 0 _064C: - MoveAction_003 + FaceEast EndMovement .balign 4, 0 _0654: - MoveAction_002 - MoveAction_014 - MoveAction_003 + FaceWest + WalkNormalWest + FaceEast EndMovement .balign 4, 0 _0664: - MoveAction_002 + FaceWest EndMovement diff --git a/res/field/scripts/scripts_battleground.s b/res/field/scripts/scripts_battleground.s index 61c76fedbb..acec974745 100644 --- a/res/field/scripts/scripts_battleground.s +++ b/res/field/scripts/scripts_battleground.s @@ -141,45 +141,45 @@ _01FD: .balign 4, 0 _0214: - MoveAction_063 2 - MoveAction_034 + Delay8 2 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0220: - MoveAction_063 - MoveAction_033 - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalSouth + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0234: - MoveAction_063 2 - MoveAction_034 + Delay8 2 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0240: - MoveAction_014 - MoveAction_013 - MoveAction_014 3 - MoveAction_013 2 + WalkNormalWest + WalkNormalSouth + WalkNormalWest 3 + WalkNormalSouth 2 EndMovement .balign 4, 0 _0254: - MoveAction_013 - MoveAction_014 4 - MoveAction_013 2 + WalkNormalSouth + WalkNormalWest 4 + WalkNormalSouth 2 EndMovement .balign 4, 0 _0264: - MoveAction_014 - MoveAction_013 - MoveAction_014 3 - MoveAction_013 2 + WalkNormalWest + WalkNormalSouth + WalkNormalWest 3 + WalkNormalSouth 2 EndMovement _0278: @@ -197,13 +197,13 @@ _0278: .balign 4, 0 _02A0: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _02A8: - MoveAction_012 2 - MoveAction_015 4 + WalkNormalNorth 2 + WalkNormalEast 4 EndMovement _02B4: diff --git a/res/field/scripts/scripts_canalave_city.s b/res/field/scripts/scripts_canalave_city.s index ddc2e27c03..4f43053c50 100644 --- a/res/field/scripts/scripts_canalave_city.s +++ b/res/field/scripts/scripts_canalave_city.s @@ -195,20 +195,20 @@ _0334: .balign 4, 0 _0340: - MoveAction_019 4 - MoveAction_063 - MoveAction_075 - MoveAction_063 + WalkFastEast 4 + Delay8 + EmoteExclamationMark + Delay8 EndMovement .balign 4, 0 _0354: - MoveAction_019 4 + WalkFastEast 4 EndMovement .balign 4, 0 _035C: - MoveAction_018 9 + WalkFastWest 9 EndMovement _0364: @@ -238,15 +238,15 @@ _0377: .balign 4, 0 _03AC: - MoveAction_017 - MoveAction_018 5 - MoveAction_016 10 + WalkFastSouth + WalkFastWest 5 + WalkFastNorth 10 EndMovement .balign 4, 0 _03BC: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement _03C8: @@ -307,40 +307,40 @@ _0473: .balign 4, 0 _0490: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0498: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _04A0: - MoveAction_063 2 - MoveAction_032 + Delay8 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _04AC: - MoveAction_018 5 - MoveAction_016 2 + WalkFastWest 5 + WalkFastNorth 2 EndMovement .balign 4, 0 _04B8: - MoveAction_017 6 + WalkFastSouth 6 EndMovement .balign 4, 0 _04C0: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _04C8: - MoveAction_017 3 - MoveAction_019 9 + WalkFastSouth 3 + WalkFastEast 9 EndMovement _04D4: @@ -607,33 +607,33 @@ _08A5: .balign 4, 0 _08C0: - MoveAction_003 - MoveAction_064 + FaceEast + Delay15 EndMovement .balign 4, 0 _08CC: - MoveAction_069 + SetInvisible EndMovement .balign 4, 0 _08D4: - MoveAction_013 - MoveAction_003 - MoveAction_064 + WalkNormalSouth + FaceEast + Delay15 EndMovement .balign 4, 0 _08E4: - MoveAction_015 - MoveAction_064 + WalkNormalEast + Delay15 EndMovement .balign 4, 0 _08F0: - MoveAction_012 - MoveAction_003 - MoveAction_064 + WalkNormalNorth + FaceEast + Delay15 EndMovement _0900: @@ -683,16 +683,16 @@ _0959: .balign 4, 0 _099C: - MoveAction_075 - MoveAction_015 3 - MoveAction_012 + EmoteExclamationMark + WalkNormalEast 3 + WalkNormalNorth EndMovement .balign 4, 0 _09AC: - MoveAction_013 - MoveAction_014 3 - MoveAction_013 8 + WalkNormalSouth + WalkNormalWest 3 + WalkNormalSouth 8 EndMovement _09BC: @@ -730,11 +730,11 @@ _09FA: .balign 4, 0 _0A38: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0A40: - MoveAction_012 - MoveAction_069 + WalkNormalNorth + SetInvisible EndMovement diff --git a/res/field/scripts/scripts_canalave_city_harbor_inn.s b/res/field/scripts/scripts_canalave_city_harbor_inn.s index 7e30d04e67..41a6464027 100644 --- a/res/field/scripts/scripts_canalave_city_harbor_inn.s +++ b/res/field/scripts/scripts_canalave_city_harbor_inn.s @@ -81,20 +81,20 @@ _0093: .balign 4, 0 _0130: - MoveAction_012 - MoveAction_015 3 - MoveAction_012 - MoveAction_015 - MoveAction_033 + WalkNormalNorth + WalkNormalEast 3 + WalkNormalNorth + WalkNormalEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0148: - MoveAction_015 3 - MoveAction_012 2 - MoveAction_033 - MoveAction_063 2 - MoveAction_035 + WalkNormalEast 3 + WalkNormalNorth 2 + WalkOnSpotNormalSouth + Delay8 2 + WalkOnSpotNormalEast EndMovement _0160: diff --git a/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s b/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s index 7928d6445d..36bbc233cc 100644 --- a/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s +++ b/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s @@ -186,45 +186,45 @@ _026E: .balign 4, 0 _0294: - MoveAction_002 + FaceWest EndMovement .balign 4, 0 _029C: - MoveAction_000 + FaceNorth EndMovement .balign 4, 0 _02A4: - MoveAction_001 + FaceSouth EndMovement .balign 4, 0 _02AC: - MoveAction_003 + FaceEast EndMovement .balign 4, 0 _02B4: - MoveAction_012 2 - MoveAction_015 2 + WalkNormalNorth 2 + WalkNormalEast 2 EndMovement .balign 4, 0 _02C0: - MoveAction_000 - MoveAction_071 - MoveAction_013 - MoveAction_072 + FaceNorth + LockDir + WalkNormalSouth + UnlockDir EndMovement .balign 4, 0 _02D4: - MoveAction_015 + WalkNormalEast EndMovement .balign 4, 0 _02DC: - MoveAction_014 3 - MoveAction_013 2 + WalkNormalWest 3 + WalkNormalSouth 2 EndMovement diff --git a/res/field/scripts/scripts_canalave_library_1f.s b/res/field/scripts/scripts_canalave_library_1f.s index 237e53a384..2e234eecb2 100644 --- a/res/field/scripts/scripts_canalave_library_1f.s +++ b/res/field/scripts/scripts_canalave_library_1f.s @@ -51,7 +51,7 @@ _0068: .balign 4, 0 _0078: - MoveAction_000 + FaceNorth EndMovement _0080: @@ -138,28 +138,28 @@ _0175: .balign 4, 0 _018C: - MoveAction_014 5 - MoveAction_013 6 - MoveAction_062 + WalkNormalWest 5 + WalkNormalSouth 6 + Delay4 EndMovement .balign 4, 0 _019C: - MoveAction_013 - MoveAction_014 5 - MoveAction_013 5 - MoveAction_062 + WalkNormalSouth + WalkNormalWest 5 + WalkNormalSouth 5 + Delay4 EndMovement .balign 4, 0 _01B0: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _01BC: - MoveAction_063 2 - MoveAction_062 - MoveAction_034 + Delay8 2 + Delay4 + WalkOnSpotNormalWest EndMovement diff --git a/res/field/scripts/scripts_canalave_library_2f.s b/res/field/scripts/scripts_canalave_library_2f.s index 28915e3df8..f72d65ccda 100644 --- a/res/field/scripts/scripts_canalave_library_2f.s +++ b/res/field/scripts/scripts_canalave_library_2f.s @@ -132,38 +132,38 @@ _0159: .balign 4, 0 _019C: - MoveAction_035 - MoveAction_075 - MoveAction_015 - MoveAction_012 - MoveAction_035 + WalkOnSpotNormalEast + EmoteExclamationMark + WalkNormalEast + WalkNormalNorth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _01B4: - MoveAction_033 - MoveAction_032 - MoveAction_035 + WalkOnSpotNormalSouth + WalkOnSpotNormalNorth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _01C4: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _01CC: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _01D4: - MoveAction_063 2 - MoveAction_015 2 + Delay8 2 + WalkNormalEast 2 EndMovement .balign 4, 0 _01E0: - MoveAction_013 - MoveAction_032 + WalkNormalSouth + WalkOnSpotNormalNorth EndMovement diff --git a/res/field/scripts/scripts_canalave_library_3f.s b/res/field/scripts/scripts_canalave_library_3f.s index 4af36b1a1b..a308dd075e 100644 --- a/res/field/scripts/scripts_canalave_library_3f.s +++ b/res/field/scripts/scripts_canalave_library_3f.s @@ -192,145 +192,145 @@ _0184: .balign 4, 0 _02C0: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _02C8: - MoveAction_011 - MoveAction_033 + WalkSlowEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _02D4: - MoveAction_014 - MoveAction_032 + WalkNormalWest + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _02E0: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _02E8: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _02F0: - MoveAction_015 - MoveAction_012 4 - MoveAction_014 5 - MoveAction_012 3 - MoveAction_033 + WalkNormalEast + WalkNormalNorth 4 + WalkNormalWest 5 + WalkNormalNorth 3 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0308: - MoveAction_015 + WalkNormalEast EndMovement .balign 4, 0 _0310: - MoveAction_063 3 - MoveAction_033 - MoveAction_013 2 - MoveAction_015 - MoveAction_013 - MoveAction_015 2 - MoveAction_013 + Delay8 3 + WalkOnSpotNormalSouth + WalkNormalSouth 2 + WalkNormalEast + WalkNormalSouth + WalkNormalEast 2 + WalkNormalSouth EndMovement .balign 4, 0 _0330: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0338: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0340: - MoveAction_011 3 + WalkSlowEast 3 EndMovement .balign 4, 0 _0348: - MoveAction_010 3 + WalkSlowWest 3 EndMovement .balign 4, 0 _0350: - MoveAction_016 - MoveAction_033 + WalkFastNorth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _035C: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _0364: - MoveAction_013 - MoveAction_015 2 - MoveAction_032 - MoveAction_013 - MoveAction_015 - MoveAction_013 - MoveAction_015 3 - MoveAction_013 + WalkNormalSouth + WalkNormalEast 2 + WalkOnSpotNormalNorth + WalkNormalSouth + WalkNormalEast + WalkNormalSouth + WalkNormalEast 3 + WalkNormalSouth EndMovement .balign 4, 0 _0388: - MoveAction_018 4 - MoveAction_016 3 - MoveAction_019 - MoveAction_069 + WalkFastWest 4 + WalkFastNorth 3 + WalkFastEast + SetInvisible EndMovement .balign 4, 0 _039C: - MoveAction_039 + WalkOnSpotFastEast EndMovement .balign 4, 0 _03A4: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _03AC: - MoveAction_016 + WalkFastNorth EndMovement .balign 4, 0 _03B4: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _03BC: - MoveAction_014 - MoveAction_012 5 - MoveAction_014 2 - MoveAction_012 2 - MoveAction_015 - MoveAction_069 + WalkNormalWest + WalkNormalNorth 5 + WalkNormalWest 2 + WalkNormalNorth 2 + WalkNormalEast + SetInvisible EndMovement .balign 4, 0 _03D8: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _03E0: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement _03E8: diff --git a/res/field/scripts/scripts_celestic_town.s b/res/field/scripts/scripts_celestic_town.s index 825a062b3e..33b0028be7 100644 --- a/res/field/scripts/scripts_celestic_town.s +++ b/res/field/scripts/scripts_celestic_town.s @@ -113,60 +113,60 @@ _0191: .balign 4, 0 _0198: - MoveAction_018 3 - MoveAction_017 9 + WalkFastWest 3 + WalkFastSouth 9 EndMovement .balign 4, 0 _01A4: - MoveAction_017 2 - MoveAction_018 3 - MoveAction_017 7 + WalkFastSouth 2 + WalkFastWest 3 + WalkFastSouth 7 EndMovement .balign 4, 0 _01B4: - MoveAction_012 8 - MoveAction_014 2 + WalkNormalNorth 8 + WalkNormalWest 2 EndMovement .balign 4, 0 _01C0: - MoveAction_012 8 - MoveAction_014 2 - MoveAction_032 + WalkNormalNorth 8 + WalkNormalWest 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _01D0: - MoveAction_012 8 - MoveAction_014 4 - MoveAction_032 + WalkNormalNorth 8 + WalkNormalWest 4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _01E0: - MoveAction_034 - MoveAction_063 - MoveAction_033 + WalkOnSpotNormalWest + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _01F0: - MoveAction_063 3 - MoveAction_033 + Delay8 3 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _01FC: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0204: - MoveAction_063 8 - MoveAction_062 - MoveAction_035 + Delay8 8 + Delay4 + WalkOnSpotNormalEast EndMovement .byte 63 @@ -212,12 +212,12 @@ _024A: .balign 4, 0 _025C: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0264: - MoveAction_002 + FaceWest EndMovement _026C: @@ -259,23 +259,23 @@ _0294: .balign 4, 0 _02E0: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _02E8: - MoveAction_075 - MoveAction_014 2 + EmoteExclamationMark + WalkNormalWest 2 EndMovement .balign 4, 0 _02F4: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _02FC: - MoveAction_034 + WalkOnSpotNormalWest EndMovement _0304: diff --git a/res/field/scripts/scripts_celestic_town_cave.s b/res/field/scripts/scripts_celestic_town_cave.s index 793d7009fb..60e0e0e9d7 100644 --- a/res/field/scripts/scripts_celestic_town_cave.s +++ b/res/field/scripts/scripts_celestic_town_cave.s @@ -256,81 +256,81 @@ _0393: .balign 4, 0 _039C: - MoveAction_012 6 - MoveAction_015 - MoveAction_012 - MoveAction_015 5 - MoveAction_032 + WalkNormalNorth 6 + WalkNormalEast + WalkNormalNorth + WalkNormalEast 5 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _03B4: - MoveAction_012 6 - MoveAction_015 - MoveAction_012 - MoveAction_015 4 - MoveAction_032 + WalkNormalNorth 6 + WalkNormalEast + WalkNormalNorth + WalkNormalEast 4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _03CC: - MoveAction_014 - MoveAction_012 + WalkNormalWest + WalkNormalNorth EndMovement .balign 4, 0 _03D8: - MoveAction_015 - MoveAction_012 + WalkNormalEast + WalkNormalNorth EndMovement .balign 4, 0 _03E4: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _03EC: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _03F4: - MoveAction_063 - MoveAction_003 - MoveAction_071 - MoveAction_018 - MoveAction_072 + Delay8 + FaceEast + LockDir + WalkFastWest + UnlockDir EndMovement .balign 4, 0 _040C: - MoveAction_063 - MoveAction_002 - MoveAction_071 - MoveAction_019 - MoveAction_072 + Delay8 + FaceWest + LockDir + WalkFastEast + UnlockDir EndMovement .balign 4, 0 _0424: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _042C: - MoveAction_015 + WalkNormalEast EndMovement .balign 4, 0 _0434: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _043C: - MoveAction_012 - MoveAction_035 + WalkNormalNorth + WalkOnSpotNormalEast EndMovement .byte 12 @@ -348,13 +348,13 @@ _043C: .balign 4, 0 _0454: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _045C: - MoveAction_012 - MoveAction_034 + WalkNormalNorth + WalkOnSpotNormalWest EndMovement .byte 12 @@ -372,90 +372,90 @@ _045C: .balign 4, 0 _0474: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _047C: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0488: - MoveAction_012 6 - MoveAction_015 - MoveAction_012 - MoveAction_015 5 - MoveAction_012 + WalkNormalNorth 6 + WalkNormalEast + WalkNormalNorth + WalkNormalEast 5 + WalkNormalNorth EndMovement .balign 4, 0 _04A0: - MoveAction_012 6 - MoveAction_015 - MoveAction_012 - MoveAction_015 4 - MoveAction_012 + WalkNormalNorth 6 + WalkNormalEast + WalkNormalNorth + WalkNormalEast 4 + WalkNormalNorth EndMovement .balign 4, 0 _04B8: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _04C0: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _04CC: - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _04D8: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _04E0: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _04E8: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _04F0: - MoveAction_013 - MoveAction_014 5 - MoveAction_013 - MoveAction_014 - MoveAction_013 6 + WalkNormalSouth + WalkNormalWest 5 + WalkNormalSouth + WalkNormalWest + WalkNormalSouth 6 EndMovement .balign 4, 0 _0508: - MoveAction_013 - MoveAction_014 4 - MoveAction_013 - MoveAction_014 - MoveAction_013 6 + WalkNormalSouth + WalkNormalWest 4 + WalkNormalSouth + WalkNormalWest + WalkNormalSouth 6 EndMovement .balign 4, 0 _0520: - MoveAction_013 - MoveAction_014 5 - MoveAction_013 - MoveAction_014 - MoveAction_013 6 + WalkNormalSouth + WalkNormalWest 5 + WalkNormalSouth + WalkNormalWest + WalkNormalSouth 6 EndMovement _0538: @@ -610,108 +610,108 @@ _079C: .balign 4, 0 _07B0: - MoveAction_012 6 - MoveAction_015 - MoveAction_012 - MoveAction_015 5 - MoveAction_012 + WalkNormalNorth 6 + WalkNormalEast + WalkNormalNorth + WalkNormalEast 5 + WalkNormalNorth EndMovement .balign 4, 0 _07C8: - MoveAction_012 6 - MoveAction_015 - MoveAction_012 - MoveAction_015 4 - MoveAction_012 + WalkNormalNorth 6 + WalkNormalEast + WalkNormalNorth + WalkNormalEast 4 + WalkNormalNorth EndMovement .balign 4, 0 _07E0: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _07E8: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _07F0: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _07F8: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _0800: - MoveAction_012 - MoveAction_034 + WalkNormalNorth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _080C: - MoveAction_012 - MoveAction_035 + WalkNormalNorth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0818: - MoveAction_013 - MoveAction_014 5 - MoveAction_013 - MoveAction_014 - MoveAction_013 6 + WalkNormalSouth + WalkNormalWest 5 + WalkNormalSouth + WalkNormalWest + WalkNormalSouth 6 EndMovement .balign 4, 0 _0830: - MoveAction_013 - MoveAction_014 4 - MoveAction_013 - MoveAction_014 - MoveAction_013 6 + WalkNormalSouth + WalkNormalWest 4 + WalkNormalSouth + WalkNormalWest + WalkNormalSouth 6 EndMovement .balign 4, 0 _0848: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0850: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0858: - MoveAction_063 - MoveAction_032 + Delay8 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0864: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0870: - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _087C: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0888: - MoveAction_063 2 - MoveAction_002 + Delay8 2 + FaceWest EndMovement diff --git a/res/field/scripts/scripts_common.s b/res/field/scripts/scripts_common.s index 31b9c7824e..728066d076 100644 --- a/res/field/scripts/scripts_common.s +++ b/res/field/scripts/scripts_common.s @@ -212,18 +212,18 @@ _02D4: .balign 4, 0 _02E0: - MoveAction_100 - MoveAction_062 + NurseJoyBow + Delay4 EndMovement .balign 4, 0 _02EC: - MoveAction_102 + PlayerGive EndMovement .balign 4, 0 _02F4: - MoveAction_104 + PlayerReceive EndMovement Common_HandleSignpostInput: @@ -1333,17 +1333,17 @@ _1245: .balign 4, 0 _1250: - MoveAction_002 + FaceWest EndMovement .balign 4, 0 _1258: - MoveAction_003 + FaceEast EndMovement .balign 4, 0 _1260: - MoveAction_002 + FaceWest EndMovement .byte 0 @@ -1365,7 +1365,7 @@ _1260: .balign 4, 0 _1278: - MoveAction_001 + FaceSouth EndMovement _1280: diff --git a/res/field/scripts/scripts_contest_hall_lobby.s b/res/field/scripts/scripts_contest_hall_lobby.s index 73d13d7443..f2d3039b61 100644 --- a/res/field/scripts/scripts_contest_hall_lobby.s +++ b/res/field/scripts/scripts_contest_hall_lobby.s @@ -88,43 +88,43 @@ _0104: .balign 4, 0 _0138: - MoveAction_012 2 + WalkNormalNorth 2 EndMovement .balign 4, 0 _0140: - MoveAction_033 - MoveAction_075 + WalkOnSpotNormalSouth + EmoteExclamationMark EndMovement .balign 4, 0 _014C: - MoveAction_038 - MoveAction_033 + WalkOnSpotFastWest + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0158: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0160: - MoveAction_015 3 - MoveAction_012 3 - MoveAction_015 3 - MoveAction_012 6 + WalkNormalEast 3 + WalkNormalNorth 3 + WalkNormalEast 3 + WalkNormalNorth 6 EndMovement .balign 4, 0 _0174: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _017C: - MoveAction_062 - MoveAction_035 + Delay4 + WalkOnSpotNormalEast EndMovement .byte 35 @@ -138,7 +138,7 @@ _017C: .balign 4, 0 _0190: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .byte 14 @@ -168,29 +168,29 @@ _0190: .balign 4, 0 _01B0: - MoveAction_014 - MoveAction_013 2 - MoveAction_015 - MoveAction_013 - MoveAction_033 + WalkNormalWest + WalkNormalSouth 2 + WalkNormalEast + WalkNormalSouth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _01C8: - MoveAction_062 - MoveAction_034 - MoveAction_063 - MoveAction_033 + Delay4 + WalkOnSpotNormalWest + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _01DC: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _01E4: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement _01EC: @@ -386,16 +386,16 @@ _0475: .balign 4, 0 _0484: - MoveAction_015 8 - MoveAction_037 + WalkNormalEast 8 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0490: - MoveAction_013 - MoveAction_015 8 - MoveAction_012 - MoveAction_037 + WalkNormalSouth + WalkNormalEast 8 + WalkNormalNorth + WalkOnSpotFastSouth EndMovement _04A4: @@ -481,59 +481,59 @@ _05D3: .balign 4, 0 _05E8: - MoveAction_014 6 - MoveAction_013 4 + WalkNormalWest 6 + WalkNormalSouth 4 EndMovement .balign 4, 0 _05F4: - MoveAction_012 - MoveAction_014 6 - MoveAction_013 5 + WalkNormalNorth + WalkNormalWest 6 + WalkNormalSouth 5 EndMovement .balign 4, 0 _0604: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0610: - MoveAction_063 2 - MoveAction_032 - MoveAction_062 - MoveAction_034 + Delay8 2 + WalkOnSpotNormalNorth + Delay4 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0624: - MoveAction_002 4 - MoveAction_000 4 - MoveAction_003 4 - MoveAction_001 4 + FaceWest 4 + FaceNorth 4 + FaceEast 4 + FaceSouth 4 EndMovement .balign 4, 0 _0638: - MoveAction_003 4 - MoveAction_001 4 - MoveAction_002 4 - MoveAction_000 4 + FaceEast 4 + FaceSouth 4 + FaceWest 4 + FaceNorth 4 EndMovement .balign 4, 0 _064C: - MoveAction_001 4 - MoveAction_002 4 - MoveAction_000 4 - MoveAction_003 4 + FaceSouth 4 + FaceWest 4 + FaceNorth 4 + FaceEast 4 EndMovement .balign 4, 0 _0660: - MoveAction_000 4 - MoveAction_003 4 - MoveAction_001 4 - MoveAction_002 4 + FaceNorth 4 + FaceEast 4 + FaceSouth 4 + FaceWest 4 EndMovement diff --git a/res/field/scripts/scripts_distortion_world_1f.s b/res/field/scripts/scripts_distortion_world_1f.s index ff3b98455d..d0256da5ef 100644 --- a/res/field/scripts/scripts_distortion_world_1f.s +++ b/res/field/scripts/scripts_distortion_world_1f.s @@ -100,77 +100,77 @@ _012A: .balign 4, 0 _0140: - MoveAction_014 - MoveAction_063 + WalkNormalWest + Delay8 EndMovement .balign 4, 0 _014C: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0154: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0160: - MoveAction_062 - MoveAction_002 - MoveAction_075 - MoveAction_003 + Delay4 + FaceWest + EmoteExclamationMark + FaceEast EndMovement .balign 4, 0 _0174: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _017C: - MoveAction_033 - MoveAction_065 2 - MoveAction_035 - MoveAction_063 - MoveAction_032 - MoveAction_063 + WalkOnSpotNormalSouth + Delay16 2 + WalkOnSpotNormalEast + Delay8 + WalkOnSpotNormalNorth + Delay8 EndMovement .balign 4, 0 _0198: - MoveAction_033 - MoveAction_063 + WalkOnSpotNormalSouth + Delay8 EndMovement .balign 4, 0 _01A4: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _01AC: - MoveAction_013 2 + WalkNormalSouth 2 EndMovement .balign 4, 0 _01B4: - MoveAction_002 - MoveAction_075 - MoveAction_003 + FaceWest + EmoteExclamationMark + FaceEast EndMovement .balign 4, 0 _01C4: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _01CC: - MoveAction_014 3 - MoveAction_013 3 - MoveAction_014 2 - MoveAction_013 - MoveAction_014 6 + WalkNormalWest 3 + WalkNormalSouth 3 + WalkNormalWest 2 + WalkNormalSouth + WalkNormalWest 6 EndMovement diff --git a/res/field/scripts/scripts_distortion_world_b1f.s b/res/field/scripts/scripts_distortion_world_b1f.s index 7a1cc09fac..128406fc94 100644 --- a/res/field/scripts/scripts_distortion_world_b1f.s +++ b/res/field/scripts/scripts_distortion_world_b1f.s @@ -43,48 +43,48 @@ _004B: .balign 4, 0 _0078: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0080: - MoveAction_065 - MoveAction_063 - MoveAction_034 + Delay16 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0090: - MoveAction_002 - MoveAction_060 8 - MoveAction_066 - MoveAction_065 - MoveAction_032 + FaceWest + Delay1 8 + Delay32 + Delay16 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _00A8: - MoveAction_065 3 - MoveAction_033 + Delay16 3 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _00B4: - MoveAction_014 - MoveAction_013 2 - MoveAction_034 - MoveAction_065 + WalkNormalWest + WalkNormalSouth 2 + WalkOnSpotNormalWest + Delay16 MoveAction_119 2 MoveAction_118 MoveAction_119 - MoveAction_065 + Delay16 EndMovement .balign 4, 0 _00D8: - MoveAction_065 3 - MoveAction_008 - MoveAction_012 - MoveAction_016 - MoveAction_020 8 + Delay16 3 + WalkSlowNorth + WalkNormalNorth + WalkFastNorth + WalkFasterNorth 8 EndMovement diff --git a/res/field/scripts/scripts_distortion_world_b2f.s b/res/field/scripts/scripts_distortion_world_b2f.s index d3267bde47..2f7463e6c8 100644 --- a/res/field/scripts/scripts_distortion_world_b2f.s +++ b/res/field/scripts/scripts_distortion_world_b2f.s @@ -64,43 +64,43 @@ _00D0: .balign 4, 0 _00DC: - MoveAction_001 + FaceSouth EndMovement .balign 4, 0 _00E4: MoveAction_106 - MoveAction_002 + FaceWest EndMovement .balign 4, 0 _00F0: - MoveAction_003 + FaceEast EndMovement .balign 4, 0 _00F8: MoveAction_106 - MoveAction_002 + FaceWest EndMovement .balign 4, 0 _0104: - MoveAction_002 + FaceWest EndMovement .balign 4, 0 _010C: - MoveAction_003 + FaceEast EndMovement .balign 4, 0 _0114: - MoveAction_001 + FaceSouth EndMovement .balign 4, 0 _011C: MoveAction_107 - MoveAction_000 + FaceNorth EndMovement diff --git a/res/field/scripts/scripts_distortion_world_b3f.s b/res/field/scripts/scripts_distortion_world_b3f.s index e07a1e1a4b..fc056fffb1 100644 --- a/res/field/scripts/scripts_distortion_world_b3f.s +++ b/res/field/scripts/scripts_distortion_world_b3f.s @@ -37,10 +37,10 @@ _003E: .balign 4, 0 _0060: - MoveAction_012 7 + WalkNormalNorth 7 EndMovement .balign 4, 0 _0068: - MoveAction_013 7 + WalkNormalSouth 7 EndMovement diff --git a/res/field/scripts/scripts_distortion_world_b6f.s b/res/field/scripts/scripts_distortion_world_b6f.s index 7cd4633b02..337f357c64 100644 --- a/res/field/scripts/scripts_distortion_world_b6f.s +++ b/res/field/scripts/scripts_distortion_world_b6f.s @@ -101,21 +101,21 @@ _00F6: .balign 4, 0 _0108: - MoveAction_066 - MoveAction_033 - MoveAction_075 - MoveAction_066 + Delay32 + WalkOnSpotNormalSouth + EmoteExclamationMark + Delay32 EndMovement .balign 4, 0 _011C: - MoveAction_013 + WalkNormalSouth MoveAction_118 - MoveAction_014 - MoveAction_035 + WalkNormalWest + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0130: - MoveAction_067 + WarpOut EndMovement diff --git a/res/field/scripts/scripts_distortion_world_b7f.s b/res/field/scripts/scripts_distortion_world_b7f.s index bb5435bbf9..aec1da7174 100644 --- a/res/field/scripts/scripts_distortion_world_b7f.s +++ b/res/field/scripts/scripts_distortion_world_b7f.s @@ -144,132 +144,132 @@ _01F8: .balign 4, 0 _0204: - MoveAction_065 2 - MoveAction_032 + Delay16 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0210: - MoveAction_015 - MoveAction_034 - MoveAction_033 + WalkNormalEast + WalkOnSpotNormalWest + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0220: - MoveAction_014 - MoveAction_012 7 - MoveAction_015 4 - MoveAction_033 + WalkNormalWest + WalkNormalNorth 7 + WalkNormalEast 4 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0234: - MoveAction_014 - MoveAction_012 6 - MoveAction_015 4 - MoveAction_033 + WalkNormalWest + WalkNormalNorth 6 + WalkNormalEast 4 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0248: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0254: - MoveAction_066 2 - MoveAction_065 - MoveAction_032 + Delay32 2 + Delay16 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0264: - MoveAction_066 2 - MoveAction_065 - MoveAction_034 + Delay32 2 + Delay16 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0274: - MoveAction_062 - MoveAction_032 + Delay4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0280: - MoveAction_062 - MoveAction_034 + Delay4 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _028C: - MoveAction_065 2 - MoveAction_032 - MoveAction_065 2 + Delay16 2 + WalkOnSpotNormalNorth + Delay16 2 EndMovement .balign 4, 0 _029C: - MoveAction_015 + WalkNormalEast MoveAction_117 - MoveAction_012 7 + WalkNormalNorth 7 EndMovement .balign 4, 0 _02AC: - MoveAction_063 3 - MoveAction_014 - MoveAction_035 + Delay8 3 + WalkNormalWest + WalkOnSpotNormalEast EndMovement .balign 4, 0 _02BC: - MoveAction_015 - MoveAction_033 + WalkNormalEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _02C8: - MoveAction_012 6 - MoveAction_015 4 - MoveAction_013 - MoveAction_032 + WalkNormalNorth 6 + WalkNormalEast 4 + WalkNormalSouth + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _02DC: - MoveAction_065 - MoveAction_033 + Delay16 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _02E8: - MoveAction_066 2 - MoveAction_063 - MoveAction_035 + Delay32 2 + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _02F8: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0300: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0308: - MoveAction_013 4 - MoveAction_034 + WalkNormalSouth 4 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0314: - MoveAction_013 7 + WalkNormalSouth 7 MoveAction_118 - MoveAction_065 + Delay16 EndMovement diff --git a/res/field/scripts/scripts_distortion_world_giratina_room.s b/res/field/scripts/scripts_distortion_world_giratina_room.s index cbd3e372a9..40b7196187 100644 --- a/res/field/scripts/scripts_distortion_world_giratina_room.s +++ b/res/field/scripts/scripts_distortion_world_giratina_room.s @@ -172,8 +172,8 @@ _0232: .balign 4, 0 _0244: - MoveAction_033 - MoveAction_075 + WalkOnSpotNormalSouth + EmoteExclamationMark EndMovement .balign 4, 0 @@ -183,13 +183,13 @@ _0250: .balign 4, 0 _0258: - MoveAction_033 - MoveAction_075 + WalkOnSpotNormalSouth + EmoteExclamationMark EndMovement .balign 4, 0 _0264: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 @@ -200,15 +200,15 @@ _026C: .balign 4, 0 _0274: MoveAction_118 - MoveAction_013 5 + WalkNormalSouth 5 EndMovement .balign 4, 0 _0280: - MoveAction_013 5 + WalkNormalSouth 5 EndMovement .balign 4, 0 _0288: - MoveAction_012 5 + WalkNormalNorth 5 EndMovement diff --git a/res/field/scripts/scripts_eterna_city.s b/res/field/scripts/scripts_eterna_city.s index f7313d32f5..fa7dd09e74 100644 --- a/res/field/scripts/scripts_eterna_city.s +++ b/res/field/scripts/scripts_eterna_city.s @@ -282,92 +282,92 @@ _042B: .balign 4, 0 _043C: - MoveAction_014 4 - MoveAction_075 - MoveAction_014 5 - MoveAction_012 + WalkNormalWest 4 + EmoteExclamationMark + WalkNormalWest 5 + WalkNormalNorth EndMovement .balign 4, 0 _0450: - MoveAction_014 4 - MoveAction_075 - MoveAction_014 4 + WalkNormalWest 4 + EmoteExclamationMark + WalkNormalWest 4 EndMovement .balign 4, 0 _0460: - MoveAction_035 - MoveAction_063 2 - MoveAction_032 + WalkOnSpotNormalEast + Delay8 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0470: - MoveAction_035 - MoveAction_063 2 - MoveAction_034 + WalkOnSpotNormalEast + Delay8 2 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0480: - MoveAction_014 5 - MoveAction_013 10 + WalkNormalWest 5 + WalkNormalSouth 10 EndMovement .balign 4, 0 _048C: - MoveAction_014 6 - MoveAction_013 10 + WalkNormalWest 6 + WalkNormalSouth 10 EndMovement .balign 4, 0 _0498: - MoveAction_014 7 - MoveAction_013 10 + WalkNormalWest 7 + WalkNormalSouth 10 EndMovement .balign 4, 0 _04A4: - MoveAction_013 - MoveAction_014 6 - MoveAction_013 10 + WalkNormalSouth + WalkNormalWest 6 + WalkNormalSouth 10 EndMovement .balign 4, 0 _04B4: - MoveAction_013 - MoveAction_014 6 - MoveAction_013 10 + WalkNormalSouth + WalkNormalWest 6 + WalkNormalSouth 10 EndMovement .balign 4, 0 _04C4: - MoveAction_012 - MoveAction_014 6 - MoveAction_013 11 + WalkNormalNorth + WalkNormalWest 6 + WalkNormalSouth 11 EndMovement .balign 4, 0 _04D4: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _04DC: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _04E4: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _04F0: - MoveAction_063 2 - MoveAction_034 + Delay8 2 + WalkOnSpotNormalWest EndMovement _04FC: @@ -532,41 +532,41 @@ _06B9: .balign 4, 0 _06C8: - MoveAction_039 - MoveAction_075 - MoveAction_062 + WalkOnSpotFastEast + EmoteExclamationMark + Delay4 EndMovement .balign 4, 0 _06D8: - MoveAction_039 - MoveAction_075 - MoveAction_062 - MoveAction_015 + WalkOnSpotFastEast + EmoteExclamationMark + Delay4 + WalkNormalEast EndMovement .balign 4, 0 _06EC: - MoveAction_039 - MoveAction_075 - MoveAction_062 - MoveAction_015 2 + WalkOnSpotFastEast + EmoteExclamationMark + Delay4 + WalkNormalEast 2 EndMovement .balign 4, 0 _0700: - MoveAction_039 - MoveAction_075 - MoveAction_062 - MoveAction_015 3 + WalkOnSpotFastEast + EmoteExclamationMark + Delay4 + WalkNormalEast 3 EndMovement .balign 4, 0 _0714: - MoveAction_039 - MoveAction_075 - MoveAction_062 - MoveAction_015 4 + WalkOnSpotFastEast + EmoteExclamationMark + Delay4 + WalkNormalEast 4 EndMovement .byte 39 @@ -580,36 +580,36 @@ _0714: .balign 4, 0 _0730: - MoveAction_014 - MoveAction_039 + WalkNormalWest + WalkOnSpotFastEast EndMovement .balign 4, 0 _073C: - MoveAction_014 2 - MoveAction_039 + WalkNormalWest 2 + WalkOnSpotFastEast EndMovement .balign 4, 0 _0748: - MoveAction_014 3 - MoveAction_039 + WalkNormalWest 3 + WalkOnSpotFastEast EndMovement .balign 4, 0 _0754: - MoveAction_014 4 - MoveAction_039 + WalkNormalWest 4 + WalkOnSpotFastEast EndMovement .balign 4, 0 _0760: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0768: - MoveAction_012 + WalkNormalNorth EndMovement _0770: @@ -686,59 +686,59 @@ _086F: .balign 4, 0 _0884: - MoveAction_015 - MoveAction_034 + WalkNormalEast + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0890: - MoveAction_000 + FaceNorth EndMovement .balign 4, 0 _0898: - MoveAction_001 + FaceSouth EndMovement .balign 4, 0 _08A0: - MoveAction_001 - MoveAction_075 + FaceSouth + EmoteExclamationMark EndMovement .balign 4, 0 _08AC: - MoveAction_001 - MoveAction_075 - MoveAction_013 + FaceSouth + EmoteExclamationMark + WalkNormalSouth EndMovement .balign 4, 0 _08BC: - MoveAction_001 - MoveAction_075 - MoveAction_013 2 + FaceSouth + EmoteExclamationMark + WalkNormalSouth 2 EndMovement .balign 4, 0 _08CC: - MoveAction_013 - MoveAction_012 - MoveAction_033 + WalkNormalSouth + WalkNormalNorth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _08DC: - MoveAction_013 - MoveAction_012 2 - MoveAction_033 + WalkNormalSouth + WalkNormalNorth 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _08EC: - MoveAction_013 - MoveAction_012 3 - MoveAction_033 + WalkNormalSouth + WalkNormalNorth 3 + WalkOnSpotNormalSouth EndMovement _08FC: @@ -764,12 +764,12 @@ _08FC: .balign 4, 0 _0944: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _094C: - MoveAction_012 + WalkNormalNorth EndMovement _0954: @@ -893,189 +893,189 @@ _0AB6: .balign 4, 0 _0B58: - MoveAction_016 10 - MoveAction_019 4 + WalkFastNorth 10 + WalkFastEast 4 EndMovement .balign 4, 0 _0B64: - MoveAction_016 9 - MoveAction_019 4 + WalkFastNorth 9 + WalkFastEast 4 EndMovement .balign 4, 0 _0B70: - MoveAction_016 8 - MoveAction_019 4 + WalkFastNorth 8 + WalkFastEast 4 EndMovement .balign 4, 0 _0B7C: - MoveAction_013 - MoveAction_015 - MoveAction_032 + WalkNormalSouth + WalkNormalEast + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0B8C: - MoveAction_013 - MoveAction_015 2 - MoveAction_012 - MoveAction_034 + WalkNormalSouth + WalkNormalEast 2 + WalkNormalNorth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0BA0: - MoveAction_012 - MoveAction_015 - MoveAction_033 + WalkNormalNorth + WalkNormalEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0BB0: - MoveAction_015 19 + WalkNormalEast 19 EndMovement .balign 4, 0 _0BB8: - MoveAction_015 18 + WalkNormalEast 18 EndMovement .balign 4, 0 _0BC0: - MoveAction_063 3 - MoveAction_038 + Delay8 3 + WalkOnSpotFastWest EndMovement .balign 4, 0 _0BCC: - MoveAction_018 12 + WalkFastWest 12 EndMovement .balign 4, 0 _0BD4: - MoveAction_017 + WalkFastSouth EndMovement .balign 4, 0 _0BDC: - MoveAction_062 10 - MoveAction_061 - MoveAction_060 - MoveAction_071 - MoveAction_019 - MoveAction_072 - MoveAction_002 + Delay4 10 + Delay2 + Delay1 + LockDir + WalkFastEast + UnlockDir + FaceWest EndMovement .balign 4, 0 _0BFC: - MoveAction_062 9 - MoveAction_061 - MoveAction_060 - MoveAction_071 - MoveAction_019 - MoveAction_072 - MoveAction_002 + Delay4 9 + Delay2 + Delay1 + LockDir + WalkFastEast + UnlockDir + FaceWest EndMovement .balign 4, 0 _0C1C: - MoveAction_062 8 - MoveAction_061 - MoveAction_060 - MoveAction_071 - MoveAction_019 - MoveAction_072 - MoveAction_002 + Delay4 8 + Delay2 + Delay1 + LockDir + WalkFastEast + UnlockDir + FaceWest EndMovement .balign 4, 0 _0C3C: - MoveAction_063 - MoveAction_062 - MoveAction_033 + Delay8 + Delay4 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0C4C: - MoveAction_063 - MoveAction_062 - MoveAction_033 - MoveAction_062 - MoveAction_035 + Delay8 + Delay4 + WalkOnSpotNormalSouth + Delay4 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0C64: - MoveAction_063 - MoveAction_062 - MoveAction_032 + Delay8 + Delay4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0C74: - MoveAction_013 - MoveAction_015 18 - MoveAction_013 - MoveAction_015 + WalkNormalSouth + WalkNormalEast 18 + WalkNormalSouth + WalkNormalEast EndMovement .balign 4, 0 _0C88: - MoveAction_015 18 - MoveAction_013 - MoveAction_015 + WalkNormalEast 18 + WalkNormalSouth + WalkNormalEast EndMovement .balign 4, 0 _0C98: - MoveAction_012 - MoveAction_015 18 - MoveAction_013 - MoveAction_015 + WalkNormalNorth + WalkNormalEast 18 + WalkNormalSouth + WalkNormalEast EndMovement .balign 4, 0 _0CAC: - MoveAction_013 - MoveAction_035 - MoveAction_063 2 - MoveAction_034 + WalkNormalSouth + WalkOnSpotNormalEast + Delay8 2 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0CC0: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0CC8: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0CD4: - MoveAction_015 4 + WalkNormalEast 4 EndMovement .balign 4, 0 _0CDC: - MoveAction_014 4 + WalkNormalWest 4 EndMovement .balign 4, 0 _0CE4: - MoveAction_014 3 - MoveAction_012 - MoveAction_034 + WalkNormalWest 3 + WalkNormalNorth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0CF4: - MoveAction_063 2 - MoveAction_014 14 + Delay8 2 + WalkNormalWest 14 EndMovement _0D00: @@ -1176,22 +1176,22 @@ _0E83: .balign 4, 0 _0E88: - MoveAction_012 3 - MoveAction_075 - MoveAction_012 5 - MoveAction_015 2 - MoveAction_015 + WalkNormalNorth 3 + EmoteExclamationMark + WalkNormalNorth 5 + WalkNormalEast 2 + WalkNormalEast EndMovement .balign 4, 0 _0EA0: - MoveAction_014 3 - MoveAction_013 9 + WalkNormalWest 3 + WalkNormalSouth 9 EndMovement .balign 4, 0 _0EAC: - MoveAction_034 + WalkOnSpotNormalWest EndMovement _0EB4: @@ -1333,36 +1333,36 @@ _10A0: .balign 4, 0 _10B4: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _10BC: - MoveAction_014 3 - MoveAction_013 9 + WalkNormalWest 3 + WalkNormalSouth 9 EndMovement .balign 4, 0 _10C8: - MoveAction_013 - MoveAction_014 3 - MoveAction_013 8 + WalkNormalSouth + WalkNormalWest 3 + WalkNormalSouth 8 EndMovement .balign 4, 0 _10D8: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _10E0: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _10EC: - MoveAction_063 2 - MoveAction_062 - MoveAction_034 + Delay8 2 + Delay4 + WalkOnSpotNormalWest EndMovement diff --git a/res/field/scripts/scripts_eterna_city_south_house.s b/res/field/scripts/scripts_eterna_city_south_house.s index 74adb33a75..8ecfa2abb4 100644 --- a/res/field/scripts/scripts_eterna_city_south_house.s +++ b/res/field/scripts/scripts_eterna_city_south_house.s @@ -101,5 +101,5 @@ _0150: .balign 4, 0 _0158: - MoveAction_075 + EmoteExclamationMark EndMovement diff --git a/res/field/scripts/scripts_eterna_city_underground_man_house.s b/res/field/scripts/scripts_eterna_city_underground_man_house.s index 5b0d816e87..8e9dbffda2 100644 --- a/res/field/scripts/scripts_eterna_city_underground_man_house.s +++ b/res/field/scripts/scripts_eterna_city_underground_man_house.s @@ -406,34 +406,34 @@ _05D6: .balign 4, 0 _05E4: - MoveAction_008 - MoveAction_009 2 - MoveAction_008 - MoveAction_038 + WalkSlowNorth + WalkSlowSouth 2 + WalkSlowNorth + WalkOnSpotFastWest EndMovement .balign 4, 0 _05F8: - MoveAction_008 - MoveAction_009 2 - MoveAction_008 - MoveAction_039 + WalkSlowNorth + WalkSlowSouth 2 + WalkSlowNorth + WalkOnSpotFastEast EndMovement .balign 4, 0 _060C: - MoveAction_010 - MoveAction_011 2 - MoveAction_010 - MoveAction_036 + WalkSlowWest + WalkSlowEast 2 + WalkSlowWest + WalkOnSpotFastNorth EndMovement .balign 4, 0 _0620: - MoveAction_010 - MoveAction_011 2 - MoveAction_010 - MoveAction_037 + WalkSlowWest + WalkSlowEast 2 + WalkSlowWest + WalkOnSpotFastSouth EndMovement _0634: diff --git a/res/field/scripts/scripts_eterna_forest.s b/res/field/scripts/scripts_eterna_forest.s index cf91f83924..1f4fbdfc1a 100644 --- a/res/field/scripts/scripts_eterna_forest.s +++ b/res/field/scripts/scripts_eterna_forest.s @@ -75,15 +75,15 @@ _00E0: .balign 4, 0 _00E8: MoveAction_153 - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _00F4: MoveAction_153 - MoveAction_013 - MoveAction_015 - MoveAction_033 + WalkNormalSouth + WalkNormalEast + WalkOnSpotNormalSouth EndMovement _0108: @@ -117,20 +117,20 @@ _0168: .balign 4, 0 _0174: - MoveAction_012 2 - MoveAction_033 + WalkNormalNorth 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0180: - MoveAction_012 2 - MoveAction_014 - MoveAction_033 + WalkNormalNorth 2 + WalkNormalWest + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0190: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement _0198: @@ -217,109 +217,109 @@ _02CB: .balign 4, 0 _0300: - MoveAction_035 + WalkOnSpotNormalEast MoveAction_153 EndMovement .balign 4, 0 _030C: - MoveAction_013 2 - MoveAction_015 5 + WalkNormalSouth 2 + WalkNormalEast 5 EndMovement .balign 4, 0 _0318: - MoveAction_013 - MoveAction_015 5 + WalkNormalSouth + WalkNormalEast 5 EndMovement .balign 4, 0 _0324: - MoveAction_013 - MoveAction_015 5 + WalkNormalSouth + WalkNormalEast 5 EndMovement .balign 4, 0 _0330: - MoveAction_012 - MoveAction_015 5 + WalkNormalNorth + WalkNormalEast 5 EndMovement .balign 4, 0 _033C: - MoveAction_012 - MoveAction_015 5 + WalkNormalNorth + WalkNormalEast 5 EndMovement .balign 4, 0 _0348: - MoveAction_012 2 - MoveAction_015 5 + WalkNormalNorth 2 + WalkNormalEast 5 EndMovement .balign 4, 0 _0354: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _035C: - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0368: - MoveAction_063 3 - MoveAction_034 + Delay8 3 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0374: - MoveAction_063 2 - MoveAction_033 - MoveAction_063 - MoveAction_035 + Delay8 2 + WalkOnSpotNormalSouth + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0388: - MoveAction_063 - MoveAction_033 - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalSouth + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _039C: - MoveAction_063 - MoveAction_033 - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalSouth + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _03B0: - MoveAction_063 - MoveAction_032 - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalNorth + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _03C4: - MoveAction_063 - MoveAction_032 - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalNorth + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _03D8: - MoveAction_063 2 - MoveAction_032 - MoveAction_063 - MoveAction_035 + Delay8 2 + WalkOnSpotNormalNorth + Delay8 + WalkOnSpotNormalEast EndMovement _03EC: @@ -394,20 +394,20 @@ _04B4: .balign 4, 0 _04BC: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _04C4: - MoveAction_013 2 - MoveAction_015 9 + WalkNormalSouth 2 + WalkNormalEast 9 EndMovement .balign 4, 0 _04D0: - MoveAction_014 - MoveAction_013 2 - MoveAction_015 10 + WalkNormalWest + WalkNormalSouth 2 + WalkNormalEast 10 EndMovement _04E0: @@ -440,5 +440,5 @@ _051D: .balign 4, 0 _053C: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement diff --git a/res/field/scripts/scripts_fight_area.s b/res/field/scripts/scripts_fight_area.s index 9c9f495b45..28c8259dfa 100644 --- a/res/field/scripts/scripts_fight_area.s +++ b/res/field/scripts/scripts_fight_area.s @@ -261,8 +261,8 @@ _033E: .balign 4, 0 _0340: - MoveAction_034 - MoveAction_075 + WalkOnSpotNormalWest + EmoteExclamationMark EndMovement .byte 14 @@ -276,30 +276,30 @@ _0340: .balign 4, 0 _0354: - MoveAction_015 17 - MoveAction_012 2 - MoveAction_015 9 - MoveAction_012 6 - MoveAction_015 - MoveAction_032 + WalkNormalEast 17 + WalkNormalNorth 2 + WalkNormalEast 9 + WalkNormalNorth 6 + WalkNormalEast + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0370: - MoveAction_012 + WalkNormalNorth EndMovement .balign 4, 0 _0378: - MoveAction_038 + WalkOnSpotFastWest EndMovement .balign 4, 0 _0380: - MoveAction_000 - MoveAction_071 - MoveAction_017 2 - MoveAction_072 + FaceNorth + LockDir + WalkFastSouth 2 + UnlockDir EndMovement .byte 75 @@ -313,78 +313,78 @@ _0380: .balign 4, 0 _039C: - MoveAction_016 2 + WalkFastNorth 2 EndMovement .balign 4, 0 _03A4: - MoveAction_017 8 + WalkFastSouth 8 EndMovement .balign 4, 0 _03AC: - MoveAction_038 + WalkOnSpotFastWest EndMovement .balign 4, 0 _03B4: - MoveAction_017 + WalkFastSouth EndMovement .balign 4, 0 _03BC: - MoveAction_034 - MoveAction_063 - MoveAction_035 - MoveAction_063 - MoveAction_033 + WalkOnSpotNormalWest + Delay8 + WalkOnSpotNormalEast + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _03D4: - MoveAction_016 + WalkFastNorth EndMovement .balign 4, 0 _03DC: - MoveAction_015 4 + WalkNormalEast 4 EndMovement .balign 4, 0 _03E4: - MoveAction_015 18 - MoveAction_012 2 - MoveAction_015 9 - MoveAction_012 6 + WalkNormalEast 18 + WalkNormalNorth 2 + WalkNormalEast 9 + WalkNormalNorth 6 EndMovement .balign 4, 0 _03F8: - MoveAction_012 + WalkNormalNorth EndMovement .balign 4, 0 _0400: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0408: - MoveAction_063 - MoveAction_037 - MoveAction_062 - MoveAction_036 + Delay8 + WalkOnSpotFastSouth + Delay4 + WalkOnSpotFastNorth EndMovement .balign 4, 0 _041C: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0428: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .byte 63 @@ -402,49 +402,49 @@ _0428: .balign 4, 0 _043C: - MoveAction_063 2 - MoveAction_035 + Delay8 2 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0448: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0450: - MoveAction_001 + FaceSouth EndMovement .balign 4, 0 _0458: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0460: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0468: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0470: - MoveAction_001 + FaceSouth EndMovement .balign 4, 0 _0478: - MoveAction_012 - MoveAction_014 2 + WalkNormalNorth + WalkNormalWest 2 EndMovement .balign 4, 0 _0484: - MoveAction_013 8 + WalkNormalSouth 8 EndMovement .byte 34 @@ -644,33 +644,33 @@ _0694: .balign 4, 0 _06B0: - MoveAction_001 - MoveAction_064 + FaceSouth + Delay15 EndMovement .balign 4, 0 _06BC: - MoveAction_069 + SetInvisible EndMovement .balign 4, 0 _06C4: - MoveAction_013 - MoveAction_064 + WalkNormalSouth + Delay15 EndMovement .balign 4, 0 _06D0: - MoveAction_015 - MoveAction_001 - MoveAction_064 + WalkNormalEast + FaceSouth + Delay15 EndMovement .balign 4, 0 _06E0: - MoveAction_014 - MoveAction_001 - MoveAction_064 + WalkNormalWest + FaceSouth + Delay15 EndMovement _06F0: @@ -716,32 +716,32 @@ _0792: .balign 4, 0 _07A0: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _07A8: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _07B0: - MoveAction_013 - MoveAction_014 2 - MoveAction_012 + WalkNormalSouth + WalkNormalWest 2 + WalkNormalNorth EndMovement .balign 4, 0 _07C0: - MoveAction_014 - MoveAction_013 - MoveAction_032 + WalkNormalWest + WalkNormalSouth + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _07D0: - MoveAction_014 - MoveAction_012 + WalkNormalWest + WalkNormalNorth EndMovement _07DC: @@ -802,7 +802,7 @@ _083C: .balign 4, 0 _085C: - MoveAction_034 + WalkOnSpotNormalWest EndMovement _0864: diff --git a/res/field/scripts/scripts_floaroma_meadow.s b/res/field/scripts/scripts_floaroma_meadow.s index 528432b251..f7b373702c 100644 --- a/res/field/scripts/scripts_floaroma_meadow.s +++ b/res/field/scripts/scripts_floaroma_meadow.s @@ -38,18 +38,18 @@ _006E: .balign 4, 0 _0074: - MoveAction_033 - MoveAction_075 + WalkOnSpotNormalSouth + EmoteExclamationMark EndMovement .balign 4, 0 _0080: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0088: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .byte 12 @@ -71,19 +71,19 @@ _0088: .balign 4, 0 _00A0: - MoveAction_013 - MoveAction_035 - MoveAction_063 3 - MoveAction_033 + WalkNormalSouth + WalkOnSpotNormalEast + Delay8 3 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _00B4: - MoveAction_013 - MoveAction_035 - MoveAction_063 3 - MoveAction_015 - MoveAction_033 + WalkNormalSouth + WalkOnSpotNormalEast + Delay8 3 + WalkNormalEast + WalkOnSpotNormalSouth EndMovement _00CC: diff --git a/res/field/scripts/scripts_floaroma_town.s b/res/field/scripts/scripts_floaroma_town.s index 3af77f361f..8b1f398218 100644 --- a/res/field/scripts/scripts_floaroma_town.s +++ b/res/field/scripts/scripts_floaroma_town.s @@ -36,12 +36,12 @@ _0030: .balign 4, 0 _005C: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0064: - MoveAction_034 + WalkOnSpotNormalWest EndMovement _006C: @@ -67,8 +67,8 @@ _0099: .balign 4, 0 _00A4: - MoveAction_000 - MoveAction_063 3 + FaceNorth + Delay8 3 EndMovement _00B0: diff --git a/res/field/scripts/scripts_footstep_house.s b/res/field/scripts/scripts_footstep_house.s index f29c74888e..4329885ffc 100644 --- a/res/field/scripts/scripts_footstep_house.s +++ b/res/field/scripts/scripts_footstep_house.s @@ -450,48 +450,48 @@ FootstepHouse_PokemonSilentType_GiveRibbon: .balign 4, 0 _0698: - MoveAction_071 - MoveAction_015 - MoveAction_072 + LockDir + WalkNormalEast + UnlockDir EndMovement .balign 4, 0 _06A8: - MoveAction_071 - MoveAction_014 - MoveAction_072 + LockDir + WalkNormalWest + UnlockDir EndMovement .balign 4, 0 _06B8: - MoveAction_071 - MoveAction_013 - MoveAction_072 + LockDir + WalkNormalSouth + UnlockDir EndMovement .balign 4, 0 _06C8: - MoveAction_071 - MoveAction_012 - MoveAction_072 + LockDir + WalkNormalNorth + UnlockDir EndMovement .balign 4, 0 _06D8: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _06E0: - MoveAction_015 + WalkNormalEast EndMovement .balign 4, 0 _06E8: - MoveAction_012 + WalkNormalNorth EndMovement .balign 4, 0 _06F0: - MoveAction_013 + WalkNormalSouth EndMovement diff --git a/res/field/scripts/scripts_fullmoon_island.s b/res/field/scripts/scripts_fullmoon_island.s index 972641066e..231b68e35a 100644 --- a/res/field/scripts/scripts_fullmoon_island.s +++ b/res/field/scripts/scripts_fullmoon_island.s @@ -81,31 +81,31 @@ _00F1: .balign 4, 0 _010C: - MoveAction_015 - MoveAction_064 + WalkNormalEast + Delay15 EndMovement .balign 4, 0 _0118: - MoveAction_069 + SetInvisible EndMovement .balign 4, 0 _0120: - MoveAction_013 - MoveAction_015 2 - MoveAction_064 + WalkNormalSouth + WalkNormalEast 2 + Delay15 EndMovement .balign 4, 0 _0130: - MoveAction_015 2 - MoveAction_064 + WalkNormalEast 2 + Delay15 EndMovement .balign 4, 0 _013C: - MoveAction_012 - MoveAction_015 2 - MoveAction_064 + WalkNormalNorth + WalkNormalEast 2 + Delay15 EndMovement diff --git a/res/field/scripts/scripts_fullmoon_island_forest.s b/res/field/scripts/scripts_fullmoon_island_forest.s index 3bc6632815..3fb86c0051 100644 --- a/res/field/scripts/scripts_fullmoon_island_forest.s +++ b/res/field/scripts/scripts_fullmoon_island_forest.s @@ -49,7 +49,7 @@ _007E: .balign 4, 0 _0094: - MoveAction_071 - MoveAction_012 - MoveAction_072 + LockDir + WalkNormalNorth + UnlockDir EndMovement diff --git a/res/field/scripts/scripts_galactic_hq_1f.s b/res/field/scripts/scripts_galactic_hq_1f.s index 9a05c26d73..22d61dc30d 100644 --- a/res/field/scripts/scripts_galactic_hq_1f.s +++ b/res/field/scripts/scripts_galactic_hq_1f.s @@ -141,12 +141,12 @@ _015E: .balign 4, 0 _0164: - MoveAction_018 + WalkFastWest EndMovement .balign 4, 0 _016C: - MoveAction_019 + WalkFastEast EndMovement _0174: diff --git a/res/field/scripts/scripts_galactic_hq_3f.s b/res/field/scripts/scripts_galactic_hq_3f.s index 3bde828887..375d4967bf 100644 --- a/res/field/scripts/scripts_galactic_hq_3f.s +++ b/res/field/scripts/scripts_galactic_hq_3f.s @@ -60,12 +60,12 @@ _00A0: .balign 4, 0 _00A8: - MoveAction_018 + WalkFastWest EndMovement .balign 4, 0 _00B0: - MoveAction_019 + WalkFastEast EndMovement _00B8: diff --git a/res/field/scripts/scripts_galactic_hq_4f.s b/res/field/scripts/scripts_galactic_hq_4f.s index 1c79d29ffd..a9476ec192 100644 --- a/res/field/scripts/scripts_galactic_hq_4f.s +++ b/res/field/scripts/scripts_galactic_hq_4f.s @@ -67,37 +67,37 @@ _00E1: .balign 4, 0 _00E8: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _00F0: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _00F8: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _0100: - MoveAction_013 - MoveAction_015 - MoveAction_033 + WalkNormalSouth + WalkNormalEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0110: - MoveAction_012 - MoveAction_015 4 - MoveAction_012 3 - MoveAction_033 + WalkNormalNorth + WalkNormalEast 4 + WalkNormalNorth 3 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0124: - MoveAction_015 7 + WalkNormalEast 7 EndMovement _012C: @@ -142,12 +142,12 @@ _01AB: .balign 4, 0 _01B4: - MoveAction_018 + WalkFastWest EndMovement .balign 4, 0 _01BC: - MoveAction_019 + WalkFastEast EndMovement _01C4: diff --git a/res/field/scripts/scripts_galactic_hq_b2f.s b/res/field/scripts/scripts_galactic_hq_b2f.s index 23772471cf..3e25b390a4 100644 --- a/res/field/scripts/scripts_galactic_hq_b2f.s +++ b/res/field/scripts/scripts_galactic_hq_b2f.s @@ -70,10 +70,10 @@ _00B3: .balign 4, 0 _00BC: - MoveAction_018 + WalkFastWest EndMovement .balign 4, 0 _00C4: - MoveAction_019 + WalkFastEast EndMovement diff --git a/res/field/scripts/scripts_galactic_hq_control_room.s b/res/field/scripts/scripts_galactic_hq_control_room.s index 3324e04775..6ab2584792 100644 --- a/res/field/scripts/scripts_galactic_hq_control_room.s +++ b/res/field/scripts/scripts_galactic_hq_control_room.s @@ -94,20 +94,20 @@ _011F: .balign 4, 0 _0128: - MoveAction_015 - MoveAction_033 + WalkNormalEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0134: - MoveAction_013 - MoveAction_032 + WalkNormalSouth + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0140: - MoveAction_015 - MoveAction_034 + WalkNormalEast + WalkOnSpotNormalWest EndMovement _014C: @@ -269,39 +269,39 @@ _0347: .balign 4, 0 _0354: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0360: - MoveAction_063 - MoveAction_032 + Delay8 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _036C: - MoveAction_013 2 + WalkNormalSouth 2 EndMovement .balign 4, 0 _0374: - MoveAction_013 2 + WalkNormalSouth 2 EndMovement .balign 4, 0 _037C: - MoveAction_013 2 + WalkNormalSouth 2 EndMovement .balign 4, 0 _0384: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _038C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement _0394: @@ -317,12 +317,12 @@ _0394: .balign 4, 0 _03B4: - MoveAction_012 + WalkNormalNorth EndMovement .balign 4, 0 _03BC: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement _03C4: @@ -388,15 +388,15 @@ _0450: .balign 4, 0 _0460: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0468: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0470: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement diff --git a/res/field/scripts/scripts_galactic_hq_hall.s b/res/field/scripts/scripts_galactic_hq_hall.s index 8f581e3a8d..03ff5c0904 100644 --- a/res/field/scripts/scripts_galactic_hq_hall.s +++ b/res/field/scripts/scripts_galactic_hq_hall.s @@ -115,75 +115,75 @@ _01C1: .balign 4, 0 _01D8: - MoveAction_013 3 - MoveAction_014 4 - MoveAction_013 + WalkNormalSouth 3 + WalkNormalWest 4 + WalkNormalSouth EndMovement .balign 4, 0 _01E8: - MoveAction_012 - MoveAction_015 4 - MoveAction_012 3 + WalkNormalNorth + WalkNormalEast 4 + WalkNormalNorth 3 EndMovement .balign 4, 0 _01F8: - MoveAction_014 6 - MoveAction_012 6 + WalkNormalWest 6 + WalkNormalNorth 6 EndMovement .balign 4, 0 _0204: - MoveAction_013 6 - MoveAction_015 6 + WalkNormalSouth 6 + WalkNormalEast 6 EndMovement .balign 4, 0 _0210: - MoveAction_013 - MoveAction_014 + WalkNormalSouth + WalkNormalWest EndMovement .balign 4, 0 _021C: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _0224: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _022C: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0234: - MoveAction_039 - MoveAction_075 + WalkOnSpotFastEast + EmoteExclamationMark EndMovement .balign 4, 0 _0240: - MoveAction_038 + WalkOnSpotFastWest EndMovement .balign 4, 0 _0248: - MoveAction_037 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0250: - MoveAction_018 - MoveAction_036 - MoveAction_063 - MoveAction_037 - MoveAction_062 - MoveAction_038 - MoveAction_063 - MoveAction_018 9 + WalkFastWest + WalkOnSpotFastNorth + Delay8 + WalkOnSpotFastSouth + Delay4 + WalkOnSpotFastWest + Delay8 + WalkFastWest 9 EndMovement diff --git a/res/field/scripts/scripts_global_terminal_1f.s b/res/field/scripts/scripts_global_terminal_1f.s index 0f208f47d0..4956699d59 100644 --- a/res/field/scripts/scripts_global_terminal_1f.s +++ b/res/field/scripts/scripts_global_terminal_1f.s @@ -68,7 +68,7 @@ _00CD: .balign 4, 0 _00D8: - MoveAction_013 + WalkNormalSouth EndMovement .byte 13 @@ -82,7 +82,7 @@ _00D8: .balign 4, 0 _00E8: - MoveAction_013 2 + WalkNormalSouth 2 EndMovement _00F0: @@ -241,23 +241,23 @@ _0338: .balign 4, 0 _0344: - MoveAction_015 - MoveAction_032 + WalkNormalEast + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0350: - MoveAction_012 + WalkNormalNorth EndMovement .balign 4, 0 _0358: - MoveAction_012 2 + WalkNormalNorth 2 EndMovement .balign 4, 0 _0360: - MoveAction_001 + FaceSouth EndMovement _0368: diff --git a/res/field/scripts/scripts_grand_lake_route_213_lobby.s b/res/field/scripts/scripts_grand_lake_route_213_lobby.s index 6a2d288a7a..500cad8df0 100644 --- a/res/field/scripts/scripts_grand_lake_route_213_lobby.s +++ b/res/field/scripts/scripts_grand_lake_route_213_lobby.s @@ -66,5 +66,5 @@ _0081: .balign 4, 0 _009C: - MoveAction_003 + FaceEast EndMovement diff --git a/res/field/scripts/scripts_hall_of_origin.s b/res/field/scripts/scripts_hall_of_origin.s index be0677006e..3ee38328ff 100644 --- a/res/field/scripts/scripts_hall_of_origin.s +++ b/res/field/scripts/scripts_hall_of_origin.s @@ -79,8 +79,8 @@ _00E9: .balign 4, 0 _00F8: - MoveAction_075 - MoveAction_065 + EmoteExclamationMark + Delay16 EndMovement _0104: @@ -117,24 +117,24 @@ _016F: .balign 4, 0 _017C: - MoveAction_012 4 - MoveAction_015 - MoveAction_000 + WalkNormalNorth 4 + WalkNormalEast + FaceNorth EndMovement .balign 4, 0 _018C: - MoveAction_012 4 + WalkNormalNorth 4 EndMovement .balign 4, 0 _0194: - MoveAction_012 4 - MoveAction_014 - MoveAction_000 + WalkNormalNorth 4 + WalkNormalWest + FaceNorth EndMovement .balign 4, 0 _01A4: - MoveAction_012 2 + WalkNormalNorth 2 EndMovement diff --git a/res/field/scripts/scripts_hearthome_city.s b/res/field/scripts/scripts_hearthome_city.s index 28c282110a..393a3446af 100644 --- a/res/field/scripts/scripts_hearthome_city.s +++ b/res/field/scripts/scripts_hearthome_city.s @@ -216,61 +216,61 @@ _0225: .balign 4, 0 _0240: - MoveAction_014 20 - MoveAction_012 13 - MoveAction_015 12 - MoveAction_012 4 - MoveAction_033 + WalkNormalWest 20 + WalkNormalNorth 13 + WalkNormalEast 12 + WalkNormalNorth 4 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0258: - MoveAction_012 - MoveAction_014 2 - MoveAction_013 - MoveAction_014 18 - MoveAction_012 13 - MoveAction_015 12 - MoveAction_012 4 - MoveAction_033 + WalkNormalNorth + WalkNormalWest 2 + WalkNormalSouth + WalkNormalWest 18 + WalkNormalNorth 13 + WalkNormalEast 12 + WalkNormalNorth 4 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _027C: - MoveAction_012 - MoveAction_014 20 - MoveAction_012 13 - MoveAction_015 12 - MoveAction_012 3 + WalkNormalNorth + WalkNormalWest 20 + WalkNormalNorth 13 + WalkNormalEast 12 + WalkNormalNorth 3 EndMovement .balign 4, 0 _0294: - MoveAction_013 - MoveAction_014 20 - MoveAction_012 13 - MoveAction_015 12 - MoveAction_012 3 + WalkNormalSouth + WalkNormalWest 20 + WalkNormalNorth 13 + WalkNormalEast 12 + WalkNormalNorth 3 EndMovement .balign 4, 0 _02AC: - MoveAction_014 - MoveAction_014 20 - MoveAction_012 13 - MoveAction_015 12 - MoveAction_012 3 + WalkNormalWest + WalkNormalWest 20 + WalkNormalNorth 13 + WalkNormalEast 12 + WalkNormalNorth 3 EndMovement .balign 4, 0 _02C4: - MoveAction_063 2 - MoveAction_062 - MoveAction_034 - MoveAction_014 19 - MoveAction_012 13 - MoveAction_015 12 - MoveAction_012 3 + Delay8 2 + Delay4 + WalkOnSpotNormalWest + WalkNormalWest 19 + WalkNormalNorth 13 + WalkNormalEast 12 + WalkNormalNorth 3 EndMovement _02E4: @@ -613,12 +613,12 @@ _0820: .balign 4, 0 _087C: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _0884: - MoveAction_018 9 + WalkFastWest 9 EndMovement .byte 19 @@ -632,12 +632,12 @@ _0884: .balign 4, 0 _0894: - MoveAction_018 8 + WalkFastWest 8 EndMovement .balign 4, 0 _089C: - MoveAction_015 8 + WalkNormalEast 8 EndMovement _08A4: diff --git a/res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s b/res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s index 138858f5b7..0a9a80162c 100644 --- a/res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s +++ b/res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s @@ -101,34 +101,34 @@ _0173: .balign 4, 0 _018C: - MoveAction_002 4 - MoveAction_000 4 - MoveAction_003 4 - MoveAction_001 4 + FaceWest 4 + FaceNorth 4 + FaceEast 4 + FaceSouth 4 EndMovement .balign 4, 0 _01A0: - MoveAction_003 4 - MoveAction_001 4 - MoveAction_002 4 - MoveAction_000 4 + FaceEast 4 + FaceSouth 4 + FaceWest 4 + FaceNorth 4 EndMovement .balign 4, 0 _01B4: - MoveAction_000 4 - MoveAction_002 4 - MoveAction_001 4 - MoveAction_003 4 + FaceNorth 4 + FaceWest 4 + FaceSouth 4 + FaceEast 4 EndMovement .balign 4, 0 _01C8: - MoveAction_000 4 - MoveAction_003 4 - MoveAction_001 4 - MoveAction_002 4 + FaceNorth 4 + FaceEast 4 + FaceSouth 4 + FaceWest 4 EndMovement _01DC: diff --git a/res/field/scripts/scripts_hearthome_city_gym_entrance_room.s b/res/field/scripts/scripts_hearthome_city_gym_entrance_room.s index 71f7e5ebb9..8f33e092e0 100644 --- a/res/field/scripts/scripts_hearthome_city_gym_entrance_room.s +++ b/res/field/scripts/scripts_hearthome_city_gym_entrance_room.s @@ -79,15 +79,15 @@ _00B6: .balign 4, 0 _00DC: - MoveAction_075 - MoveAction_063 - MoveAction_014 - MoveAction_013 + EmoteExclamationMark + Delay8 + WalkNormalWest + WalkNormalSouth EndMovement .balign 4, 0 _00F0: - MoveAction_012 - MoveAction_015 - MoveAction_033 + WalkNormalNorth + WalkNormalEast + WalkOnSpotNormalSouth EndMovement diff --git a/res/field/scripts/scripts_hearthome_city_gym_leader_room.s b/res/field/scripts/scripts_hearthome_city_gym_leader_room.s index e34af88709..cf2f39bfd0 100644 --- a/res/field/scripts/scripts_hearthome_city_gym_leader_room.s +++ b/res/field/scripts/scripts_hearthome_city_gym_leader_room.s @@ -116,50 +116,50 @@ _01A0: .balign 4, 0 _01B8: - MoveAction_002 4 - MoveAction_000 4 - MoveAction_003 4 - MoveAction_001 4 - MoveAction_002 4 - MoveAction_000 4 - MoveAction_003 4 - MoveAction_001 4 + FaceWest 4 + FaceNorth 4 + FaceEast 4 + FaceSouth 4 + FaceWest 4 + FaceNorth 4 + FaceEast 4 + FaceSouth 4 EndMovement .balign 4, 0 _01DC: - MoveAction_003 4 - MoveAction_001 4 - MoveAction_002 4 - MoveAction_000 4 - MoveAction_003 4 - MoveAction_001 4 - MoveAction_002 4 - MoveAction_000 4 + FaceEast 4 + FaceSouth 4 + FaceWest 4 + FaceNorth 4 + FaceEast 4 + FaceSouth 4 + FaceWest 4 + FaceNorth 4 EndMovement .balign 4, 0 _0200: - MoveAction_000 4 - MoveAction_002 4 - MoveAction_001 4 - MoveAction_003 4 - MoveAction_000 4 - MoveAction_002 4 - MoveAction_001 4 - MoveAction_003 4 + FaceNorth 4 + FaceWest 4 + FaceSouth 4 + FaceEast 4 + FaceNorth 4 + FaceWest 4 + FaceSouth 4 + FaceEast 4 EndMovement .balign 4, 0 _0224: - MoveAction_000 4 - MoveAction_003 4 - MoveAction_001 4 - MoveAction_002 4 - MoveAction_000 4 - MoveAction_003 4 - MoveAction_001 4 - MoveAction_002 4 + FaceNorth 4 + FaceEast 4 + FaceSouth 4 + FaceWest 4 + FaceNorth 4 + FaceEast 4 + FaceSouth 4 + FaceWest 4 EndMovement _0248: diff --git a/res/field/scripts/scripts_hearthome_city_northeast_house_elevator.s b/res/field/scripts/scripts_hearthome_city_northeast_house_elevator.s index 7a9746d57d..cf749f9528 100644 --- a/res/field/scripts/scripts_hearthome_city_northeast_house_elevator.s +++ b/res/field/scripts/scripts_hearthome_city_northeast_house_elevator.s @@ -45,12 +45,12 @@ _009C: .balign 4, 0 _00B8: - MoveAction_012 2 - MoveAction_033 + WalkNormalNorth 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _00C4: - MoveAction_013 2 - MoveAction_033 + WalkNormalSouth 2 + WalkOnSpotNormalSouth EndMovement diff --git a/res/field/scripts/scripts_hearthome_city_southeast_house_elevator.s b/res/field/scripts/scripts_hearthome_city_southeast_house_elevator.s index 7308d4a080..9e6b1f7260 100644 --- a/res/field/scripts/scripts_hearthome_city_southeast_house_elevator.s +++ b/res/field/scripts/scripts_hearthome_city_southeast_house_elevator.s @@ -45,12 +45,12 @@ _009C: .balign 4, 0 _00B8: - MoveAction_012 2 - MoveAction_033 + WalkNormalNorth 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _00C4: - MoveAction_013 2 - MoveAction_033 + WalkNormalSouth 2 + WalkOnSpotNormalSouth EndMovement diff --git a/res/field/scripts/scripts_iron_island.s b/res/field/scripts/scripts_iron_island.s index 39f912e48b..f53acc81bb 100644 --- a/res/field/scripts/scripts_iron_island.s +++ b/res/field/scripts/scripts_iron_island.s @@ -67,26 +67,26 @@ _00B0: .balign 4, 0 _00CC: - MoveAction_002 - MoveAction_064 + FaceWest + Delay15 EndMovement .balign 4, 0 _00D8: - MoveAction_069 + SetInvisible EndMovement .balign 4, 0 _00E0: - MoveAction_013 - MoveAction_002 - MoveAction_064 + WalkNormalSouth + FaceWest + Delay15 EndMovement .balign 4, 0 _00F0: - MoveAction_014 - MoveAction_064 + WalkNormalWest + Delay15 EndMovement _00FC: @@ -125,5 +125,5 @@ _014B: .balign 4, 0 _0168: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement diff --git a/res/field/scripts/scripts_iron_island_b2f_left_room.s b/res/field/scripts/scripts_iron_island_b2f_left_room.s index e5a3b72aee..ac75b33bf7 100644 --- a/res/field/scripts/scripts_iron_island_b2f_left_room.s +++ b/res/field/scripts/scripts_iron_island_b2f_left_room.s @@ -105,12 +105,12 @@ _014A: .balign 4, 0 _0158: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0160: - MoveAction_003 + FaceEast EndMovement .byte 14 @@ -124,28 +124,28 @@ _0160: .balign 4, 0 _0170: - MoveAction_035 - MoveAction_075 - MoveAction_012 - MoveAction_035 + WalkOnSpotNormalEast + EmoteExclamationMark + WalkNormalNorth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0184: - MoveAction_035 - MoveAction_075 + WalkOnSpotNormalEast + EmoteExclamationMark EndMovement .balign 4, 0 _0190: - MoveAction_014 - MoveAction_013 - MoveAction_034 + WalkNormalWest + WalkNormalSouth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _01A0: - MoveAction_014 + WalkNormalWest EndMovement _01A8: @@ -296,22 +296,22 @@ _037D: .balign 4, 0 _0384: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _038C: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0394: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _039C: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .byte 14 @@ -365,16 +365,16 @@ _039C: .balign 4, 0 _03D4: - MoveAction_034 - MoveAction_013 - MoveAction_014 2 + WalkOnSpotNormalWest + WalkNormalSouth + WalkNormalWest 2 EndMovement .balign 4, 0 _03E4: - MoveAction_034 - MoveAction_012 - MoveAction_014 2 + WalkOnSpotNormalWest + WalkNormalNorth + WalkNormalWest 2 EndMovement .byte 13 @@ -404,45 +404,45 @@ _03E4: .balign 4, 0 _040C: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0414: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _041C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0424: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _042C: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0434: - MoveAction_063 2 - MoveAction_033 - MoveAction_063 - MoveAction_061 - MoveAction_014 + Delay8 2 + WalkOnSpotNormalSouth + Delay8 + Delay2 + WalkNormalWest EndMovement .balign 4, 0 _044C: - MoveAction_063 2 - MoveAction_032 - MoveAction_063 - MoveAction_061 - MoveAction_014 + Delay8 2 + WalkOnSpotNormalNorth + Delay8 + Delay2 + WalkNormalWest EndMovement _0464: diff --git a/res/field/scripts/scripts_iron_island_house.s b/res/field/scripts/scripts_iron_island_house.s index b2b4ac297f..1b383e6ada 100644 --- a/res/field/scripts/scripts_iron_island_house.s +++ b/res/field/scripts/scripts_iron_island_house.s @@ -68,13 +68,13 @@ _00D0: .balign 4, 0 _00F0: - MoveAction_014 - MoveAction_013 3 + WalkNormalWest + WalkNormalSouth 3 EndMovement .balign 4, 0 _00FC: - MoveAction_013 2 - MoveAction_014 - MoveAction_013 + WalkNormalSouth 2 + WalkNormalWest + WalkNormalSouth EndMovement diff --git a/res/field/scripts/scripts_jubilife_city.s b/res/field/scripts/scripts_jubilife_city.s index a8b1a92b80..54d2836e57 100644 --- a/res/field/scripts/scripts_jubilife_city.s +++ b/res/field/scripts/scripts_jubilife_city.s @@ -286,155 +286,155 @@ _042F: .balign 4, 0 _043C: - MoveAction_013 4 - MoveAction_075 - MoveAction_065 + WalkNormalSouth 4 + EmoteExclamationMark + Delay16 EndMovement .balign 4, 0 _044C: - MoveAction_013 3 + WalkNormalSouth 3 EndMovement .balign 4, 0 _0454: - MoveAction_015 - MoveAction_012 18 + WalkNormalEast + WalkNormalNorth 18 EndMovement .balign 4, 0 _0460: - MoveAction_014 - MoveAction_012 18 + WalkNormalWest + WalkNormalNorth 18 EndMovement .balign 4, 0 _046C: - MoveAction_012 18 + WalkNormalNorth 18 EndMovement .balign 4, 0 _0474: - MoveAction_013 9 + WalkNormalSouth 9 EndMovement .balign 4, 0 _047C: - MoveAction_012 2 + WalkNormalNorth 2 EndMovement .balign 4, 0 _0484: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _048C: - MoveAction_013 - MoveAction_014 2 + WalkNormalSouth + WalkNormalWest 2 EndMovement .balign 4, 0 _0498: - MoveAction_012 - MoveAction_015 2 + WalkNormalNorth + WalkNormalEast 2 EndMovement .balign 4, 0 _04A4: - MoveAction_035 - MoveAction_063 4 - MoveAction_032 + WalkOnSpotNormalEast + Delay8 4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _04B4: - MoveAction_012 - MoveAction_015 - MoveAction_012 17 + WalkNormalNorth + WalkNormalEast + WalkNormalNorth 17 EndMovement .balign 4, 0 _04C4: - MoveAction_012 - MoveAction_014 - MoveAction_012 17 + WalkNormalNorth + WalkNormalWest + WalkNormalNorth 17 EndMovement .balign 4, 0 _04D4: - MoveAction_012 18 + WalkNormalNorth 18 EndMovement .balign 4, 0 _04DC: - MoveAction_012 2 - MoveAction_015 - MoveAction_012 + WalkNormalNorth 2 + WalkNormalEast + WalkNormalNorth EndMovement .balign 4, 0 _04EC: - MoveAction_062 - MoveAction_034 + Delay4 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _04F8: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0504: - MoveAction_063 - MoveAction_035 - MoveAction_063 3 - MoveAction_032 + Delay8 + WalkOnSpotNormalEast + Delay8 3 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0518: - MoveAction_038 - MoveAction_063 2 - MoveAction_037 - MoveAction_063 - MoveAction_010 - MoveAction_018 5 - MoveAction_039 - MoveAction_063 - MoveAction_036 - MoveAction_063 + WalkOnSpotFastWest + Delay8 2 + WalkOnSpotFastSouth + Delay8 + WalkSlowWest + WalkFastWest 5 + WalkOnSpotFastEast + Delay8 + WalkOnSpotFastNorth + Delay8 EndMovement .balign 4, 0 _0544: - MoveAction_011 - MoveAction_019 2 + WalkSlowEast + WalkFastEast 2 EndMovement .balign 4, 0 _0550: - MoveAction_037 - MoveAction_075 + WalkOnSpotFastSouth + EmoteExclamationMark EndMovement .balign 4, 0 _055C: - MoveAction_038 - MoveAction_063 - MoveAction_039 - MoveAction_063 2 - MoveAction_037 + WalkOnSpotFastWest + Delay8 + WalkOnSpotFastEast + Delay8 2 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0574: - MoveAction_019 3 - MoveAction_038 - MoveAction_063 - MoveAction_008 - MoveAction_016 7 + WalkFastEast 3 + WalkOnSpotFastWest + Delay8 + WalkSlowNorth + WalkFastNorth 7 EndMovement _058C: @@ -513,55 +513,55 @@ _067C: .balign 4, 0 _0680: - MoveAction_075 - MoveAction_013 - MoveAction_035 + EmoteExclamationMark + WalkNormalSouth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0690: - MoveAction_075 - MoveAction_013 2 - MoveAction_035 + EmoteExclamationMark + WalkNormalSouth 2 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _06A0: - MoveAction_075 - MoveAction_013 3 - MoveAction_035 + EmoteExclamationMark + WalkNormalSouth 3 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _06B0: - MoveAction_015 - MoveAction_063 2 - MoveAction_014 - MoveAction_012 - MoveAction_033 + WalkNormalEast + Delay8 2 + WalkNormalWest + WalkNormalNorth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _06C8: - MoveAction_015 - MoveAction_063 2 - MoveAction_014 - MoveAction_012 2 - MoveAction_033 + WalkNormalEast + Delay8 2 + WalkNormalWest + WalkNormalNorth 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _06E0: - MoveAction_015 - MoveAction_063 2 - MoveAction_014 - MoveAction_012 3 - MoveAction_033 + WalkNormalEast + Delay8 2 + WalkNormalWest + WalkNormalNorth 3 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _06F8: - MoveAction_015 + WalkNormalEast EndMovement _0700: @@ -672,86 +672,86 @@ _088E: .balign 4, 0 _0894: - MoveAction_063 5 - MoveAction_034 + Delay8 5 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _08A0: - MoveAction_063 5 - MoveAction_002 + Delay8 5 + FaceWest EndMovement .balign 4, 0 _08AC: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _08B4: - MoveAction_001 - MoveAction_075 - MoveAction_065 - MoveAction_013 - MoveAction_015 + FaceSouth + EmoteExclamationMark + Delay16 + WalkNormalSouth + WalkNormalEast EndMovement .balign 4, 0 _08CC: - MoveAction_001 - MoveAction_075 - MoveAction_065 - MoveAction_013 2 - MoveAction_015 + FaceSouth + EmoteExclamationMark + Delay16 + WalkNormalSouth 2 + WalkNormalEast EndMovement .balign 4, 0 _08E4: - MoveAction_001 - MoveAction_075 - MoveAction_065 - MoveAction_013 3 - MoveAction_015 + FaceSouth + EmoteExclamationMark + Delay16 + WalkNormalSouth 3 + WalkNormalEast EndMovement .balign 4, 0 _08FC: - MoveAction_001 - MoveAction_075 - MoveAction_065 - MoveAction_013 4 - MoveAction_015 + FaceSouth + EmoteExclamationMark + Delay16 + WalkNormalSouth 4 + WalkNormalEast EndMovement .balign 4, 0 _0914: - MoveAction_071 - MoveAction_014 - MoveAction_072 + LockDir + WalkNormalWest + UnlockDir EndMovement .balign 4, 0 _0924: - MoveAction_012 - MoveAction_033 + WalkNormalNorth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0930: - MoveAction_012 2 - MoveAction_033 + WalkNormalNorth 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _093C: - MoveAction_012 3 - MoveAction_033 + WalkNormalNorth 3 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0948: - MoveAction_012 4 - MoveAction_033 + WalkNormalNorth 4 + WalkOnSpotNormalSouth EndMovement _0954: @@ -796,7 +796,7 @@ _09BD: .balign 4, 0 _09D4: - MoveAction_001 + FaceSouth EndMovement _09DC: @@ -1035,43 +1035,43 @@ _0DB7: .balign 4, 0 _0DC0: - MoveAction_012 8 + WalkNormalNorth 8 EndMovement .balign 4, 0 _0DC8: - MoveAction_013 8 + WalkNormalSouth 8 EndMovement .balign 4, 0 _0DD0: - MoveAction_063 2 - MoveAction_012 - MoveAction_015 2 - MoveAction_012 + Delay8 2 + WalkNormalNorth + WalkNormalEast 2 + WalkNormalNorth EndMovement .balign 4, 0 _0DE4: - MoveAction_063 2 - MoveAction_012 - MoveAction_015 - MoveAction_012 + Delay8 2 + WalkNormalNorth + WalkNormalEast + WalkNormalNorth EndMovement .balign 4, 0 _0DF8: - MoveAction_063 2 - MoveAction_012 2 - MoveAction_032 + Delay8 2 + WalkNormalNorth 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0E08: - MoveAction_063 - MoveAction_035 - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalEast + Delay8 + WalkOnSpotNormalSouth EndMovement .byte 63 @@ -1117,29 +1117,29 @@ _0E08: .balign 4, 0 _0E44: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0E4C: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _0E54: - MoveAction_014 - MoveAction_013 + WalkNormalWest + WalkNormalSouth EndMovement .balign 4, 0 _0E60: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0E68: - MoveAction_015 - MoveAction_013 9 + WalkNormalEast + WalkNormalSouth 9 EndMovement .byte 15 @@ -1177,48 +1177,48 @@ _0E68: .balign 4, 0 _0E94: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0E9C: - MoveAction_039 2 + WalkOnSpotFastEast 2 EndMovement .balign 4, 0 _0EA4: - MoveAction_016 9 + WalkFastNorth 9 EndMovement .balign 4, 0 _0EAC: - MoveAction_016 10 + WalkFastNorth 10 EndMovement .balign 4, 0 _0EB4: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0EBC: - MoveAction_033 - MoveAction_075 + WalkOnSpotNormalSouth + EmoteExclamationMark EndMovement .balign 4, 0 _0EC8: - MoveAction_038 + WalkOnSpotFastWest EndMovement .balign 4, 0 _0ED0: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0ED8: - MoveAction_013 9 + WalkNormalSouth 9 EndMovement .byte 13 @@ -1248,12 +1248,12 @@ _0ED8: .balign 4, 0 _0EF8: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0F00: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .byte 34 @@ -1299,8 +1299,8 @@ _0F00: .balign 4, 0 _0F30: - MoveAction_014 - MoveAction_032 + WalkNormalWest + WalkOnSpotNormalNorth EndMovement _0F3C: @@ -1471,46 +1471,46 @@ _1163: .balign 4, 0 _1170: - MoveAction_000 + FaceNorth EndMovement .balign 4, 0 _1178: - MoveAction_033 - MoveAction_075 + WalkOnSpotNormalSouth + EmoteExclamationMark EndMovement .balign 4, 0 _1184: - MoveAction_013 2 - MoveAction_014 2 - MoveAction_013 2 + WalkNormalSouth 2 + WalkNormalWest 2 + WalkNormalSouth 2 EndMovement .balign 4, 0 _1194: - MoveAction_013 2 - MoveAction_014 - MoveAction_013 2 + WalkNormalSouth 2 + WalkNormalWest + WalkNormalSouth 2 EndMovement .balign 4, 0 _11A4: - MoveAction_013 4 + WalkNormalSouth 4 EndMovement .balign 4, 0 _11AC: - MoveAction_013 2 - MoveAction_015 - MoveAction_013 2 + WalkNormalSouth 2 + WalkNormalEast + WalkNormalSouth 2 EndMovement .balign 4, 0 _11BC: - MoveAction_013 2 - MoveAction_015 2 - MoveAction_013 2 + WalkNormalSouth 2 + WalkNormalEast 2 + WalkNormalSouth 2 EndMovement _11CC: @@ -1585,26 +1585,26 @@ _12D5: .balign 4, 0 _12F0: - MoveAction_014 - MoveAction_012 9 + WalkNormalWest + WalkNormalNorth 9 EndMovement .balign 4, 0 _12FC: - MoveAction_012 9 + WalkNormalNorth 9 EndMovement .balign 4, 0 _1304: - MoveAction_063 - MoveAction_034 - MoveAction_032 + Delay8 + WalkOnSpotNormalWest + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _1314: - MoveAction_063 - MoveAction_032 + Delay8 + WalkOnSpotNormalNorth EndMovement _1320: @@ -1779,24 +1779,24 @@ _14CF: .balign 4, 0 _1538: - MoveAction_011 2 - MoveAction_075 + WalkSlowEast 2 + EmoteExclamationMark EndMovement .balign 4, 0 _1544: - MoveAction_019 6 + WalkFastEast 6 EndMovement .balign 4, 0 _154C: - MoveAction_010 - MoveAction_018 8 + WalkSlowWest + WalkFastWest 8 EndMovement .balign 4, 0 _1558: - MoveAction_034 - MoveAction_063 2 - MoveAction_035 + WalkOnSpotNormalWest + Delay8 2 + WalkOnSpotNormalEast EndMovement diff --git a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s index 8c1e9893f0..29cbbe9b89 100644 --- a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s +++ b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s @@ -212,76 +212,76 @@ _0335: .balign 4, 0 _0340: - MoveAction_008 2 + WalkSlowNorth 2 EndMovement .balign 4, 0 _0348: - MoveAction_010 - MoveAction_008 + WalkSlowWest + WalkSlowNorth EndMovement .balign 4, 0 _0354: - MoveAction_011 - MoveAction_008 + WalkSlowEast + WalkSlowNorth EndMovement .balign 4, 0 _0360: - MoveAction_001 + FaceSouth EndMovement .balign 4, 0 _0368: - MoveAction_009 2 - MoveAction_000 + WalkSlowSouth 2 + FaceNorth EndMovement .balign 4, 0 _0374: - MoveAction_014 - MoveAction_003 + WalkNormalWest + FaceEast EndMovement .balign 4, 0 _0380: - MoveAction_014 - MoveAction_003 + WalkNormalWest + FaceEast EndMovement .balign 4, 0 _038C: - MoveAction_015 - MoveAction_002 + WalkNormalEast + FaceWest EndMovement .balign 4, 0 _0398: - MoveAction_015 - MoveAction_001 + WalkNormalEast + FaceSouth EndMovement .balign 4, 0 _03A4: - MoveAction_015 - MoveAction_001 + WalkNormalEast + FaceSouth EndMovement .balign 4, 0 _03B0: - MoveAction_014 - MoveAction_001 + WalkNormalWest + FaceSouth EndMovement .balign 4, 0 _03BC: - MoveAction_003 + FaceEast EndMovement .balign 4, 0 _03C4: - MoveAction_001 + FaceSouth EndMovement _03CC: diff --git a/res/field/scripts/scripts_jubilife_tv_3f.s b/res/field/scripts/scripts_jubilife_tv_3f.s index 6647053fe4..4ded529fd3 100644 --- a/res/field/scripts/scripts_jubilife_tv_3f.s +++ b/res/field/scripts/scripts_jubilife_tv_3f.s @@ -28,12 +28,12 @@ _0012: .balign 4, 0 _0044: - MoveAction_003 + FaceEast EndMovement .balign 4, 0 _004C: - MoveAction_002 + FaceWest EndMovement _0054: diff --git a/res/field/scripts/scripts_jubilife_tv_elevator.s b/res/field/scripts/scripts_jubilife_tv_elevator.s index 42a71c0513..e97d4a29bb 100644 --- a/res/field/scripts/scripts_jubilife_tv_elevator.s +++ b/res/field/scripts/scripts_jubilife_tv_elevator.s @@ -150,5 +150,5 @@ _0283: .balign 4, 0 _029C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement diff --git a/res/field/scripts/scripts_lake_acuity.s b/res/field/scripts/scripts_lake_acuity.s index d5ffb5af88..734eeccaa6 100644 --- a/res/field/scripts/scripts_lake_acuity.s +++ b/res/field/scripts/scripts_lake_acuity.s @@ -105,85 +105,85 @@ _018C: .balign 4, 0 _0198: - MoveAction_012 5 - MoveAction_015 2 + WalkNormalNorth 5 + WalkNormalEast 2 EndMovement .balign 4, 0 _01A4: - MoveAction_012 5 - MoveAction_015 + WalkNormalNorth 5 + WalkNormalEast EndMovement .balign 4, 0 _01B0: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _01B8: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _01C4: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _01CC: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _01D4: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _01DC: - MoveAction_013 2 - MoveAction_014 2 - MoveAction_013 3 + WalkNormalSouth 2 + WalkNormalWest 2 + WalkNormalSouth 3 EndMovement .balign 4, 0 _01EC: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _01F4: - MoveAction_014 2 - MoveAction_013 6 - MoveAction_034 + WalkNormalWest 2 + WalkNormalSouth 6 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0204: - MoveAction_014 2 - MoveAction_013 5 + WalkNormalWest 2 + WalkNormalSouth 5 EndMovement .balign 4, 0 _0210: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0218: - MoveAction_014 - MoveAction_013 - MoveAction_033 + WalkNormalWest + WalkNormalSouth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0228: - MoveAction_012 5 + WalkNormalNorth 5 EndMovement .balign 4, 0 _0230: - MoveAction_013 5 + WalkNormalSouth 5 EndMovement diff --git a/res/field/scripts/scripts_lake_verity.s b/res/field/scripts/scripts_lake_verity.s index 445e70ee73..e052de0114 100644 --- a/res/field/scripts/scripts_lake_verity.s +++ b/res/field/scripts/scripts_lake_verity.s @@ -149,7 +149,7 @@ _01C0: .balign 4, 0 _01C8: - MoveAction_035 + WalkOnSpotNormalEast EndMovement _01D0: @@ -182,9 +182,9 @@ _0211: .balign 4, 0 _0220: - MoveAction_033 - MoveAction_075 - MoveAction_013 + WalkOnSpotNormalSouth + EmoteExclamationMark + WalkNormalSouth EndMovement _0230: @@ -255,17 +255,17 @@ _02DB: .balign 4, 0 _02F4: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _02FC: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0304: - MoveAction_034 + WalkOnSpotNormalWest EndMovement _030C: diff --git a/res/field/scripts/scripts_lake_verity_low_water.s b/res/field/scripts/scripts_lake_verity_low_water.s index 25a5fe7ed1..30e7cc4576 100644 --- a/res/field/scripts/scripts_lake_verity_low_water.s +++ b/res/field/scripts/scripts_lake_verity_low_water.s @@ -117,13 +117,13 @@ _01A1: .balign 4, 0 _01B4: - MoveAction_063 - MoveAction_012 9 + Delay8 + WalkNormalNorth 9 EndMovement .balign 4, 0 _01C0: - MoveAction_013 9 + WalkNormalSouth 9 EndMovement .byte 35 @@ -153,15 +153,15 @@ _01C0: .balign 4, 0 _01E0: - MoveAction_013 5 - MoveAction_014 - MoveAction_013 4 + WalkNormalSouth 5 + WalkNormalWest + WalkNormalSouth 4 EndMovement .balign 4, 0 _01F0: - MoveAction_013 3 - MoveAction_069 + WalkNormalSouth 3 + SetInvisible EndMovement .byte 63 @@ -323,52 +323,52 @@ _01F0: .balign 4, 0 _0298: - MoveAction_016 + WalkFastNorth EndMovement .balign 4, 0 _02A0: - MoveAction_015 - MoveAction_034 + WalkNormalEast + WalkOnSpotNormalWest EndMovement .balign 4, 0 _02AC: - MoveAction_014 - MoveAction_033 + WalkNormalWest + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _02B8: - MoveAction_038 + WalkOnSpotFastWest EndMovement .balign 4, 0 _02C0: - MoveAction_075 - MoveAction_016 3 - MoveAction_063 3 - MoveAction_038 - MoveAction_063 - MoveAction_036 - MoveAction_063 2 - MoveAction_017 3 - MoveAction_038 + EmoteExclamationMark + WalkFastNorth 3 + Delay8 3 + WalkOnSpotFastWest + Delay8 + WalkOnSpotFastNorth + Delay8 2 + WalkFastSouth 3 + WalkOnSpotFastWest EndMovement .balign 4, 0 _02E8: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _02F0: - MoveAction_038 4 + WalkOnSpotFastWest 4 EndMovement .balign 4, 0 _02F8: - MoveAction_017 2 + WalkFastSouth 2 EndMovement .byte 35 @@ -478,35 +478,35 @@ _02F8: .balign 4, 0 _0368: - MoveAction_012 + WalkNormalNorth EndMovement .balign 4, 0 _0370: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0378: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0380: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0388: - MoveAction_063 4 - MoveAction_032 - MoveAction_063 9 - MoveAction_035 + Delay8 4 + WalkOnSpotNormalNorth + Delay8 9 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _039C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .byte 33 diff --git a/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s b/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s index 590155dd41..91c2276a74 100644 --- a/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s +++ b/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s @@ -35,15 +35,15 @@ _001D: .balign 4, 0 _0058: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0060: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0068: - MoveAction_034 + WalkOnSpotNormalWest EndMovement diff --git a/res/field/scripts/scripts_mt_coronet_1f_south.s b/res/field/scripts/scripts_mt_coronet_1f_south.s index 68b0016646..5b9393b9d5 100644 --- a/res/field/scripts/scripts_mt_coronet_1f_south.s +++ b/res/field/scripts/scripts_mt_coronet_1f_south.s @@ -31,45 +31,45 @@ _0006: .balign 4, 0 _0064: - MoveAction_013 6 - MoveAction_034 + WalkNormalSouth 6 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0070: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0078: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0080: - MoveAction_063 3 - MoveAction_014 10 + Delay8 3 + WalkNormalWest 10 EndMovement .balign 4, 0 _008C: - MoveAction_032 - MoveAction_063 4 - MoveAction_035 + WalkOnSpotNormalNorth + Delay8 4 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _009C: - MoveAction_063 3 - MoveAction_032 - MoveAction_063 - MoveAction_035 + Delay8 3 + WalkOnSpotNormalNorth + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _00B0: - MoveAction_013 - MoveAction_032 - MoveAction_063 2 - MoveAction_034 + WalkNormalSouth + WalkOnSpotNormalNorth + Delay8 2 + WalkOnSpotNormalWest EndMovement diff --git a/res/field/scripts/scripts_mt_coronet_1f_tunnel_room.s b/res/field/scripts/scripts_mt_coronet_1f_tunnel_room.s index ead52f784a..23e7ad958f 100644 --- a/res/field/scripts/scripts_mt_coronet_1f_tunnel_room.s +++ b/res/field/scripts/scripts_mt_coronet_1f_tunnel_room.s @@ -20,5 +20,5 @@ _0006: .balign 4, 0 _0024: - MoveAction_000 + FaceNorth EndMovement diff --git a/res/field/scripts/scripts_mt_coronet_2f.s b/res/field/scripts/scripts_mt_coronet_2f.s index 5b94e4d21e..e209e8b824 100644 --- a/res/field/scripts/scripts_mt_coronet_2f.s +++ b/res/field/scripts/scripts_mt_coronet_2f.s @@ -98,45 +98,45 @@ _0131: .balign 4, 0 _0148: - MoveAction_018 4 - MoveAction_063 - MoveAction_075 - MoveAction_063 + WalkFastWest 4 + Delay8 + EmoteExclamationMark + Delay8 EndMovement .balign 4, 0 _015C: - MoveAction_018 4 - MoveAction_016 - MoveAction_038 + WalkFastWest 4 + WalkFastNorth + WalkOnSpotFastWest EndMovement .balign 4, 0 _016C: - MoveAction_018 4 + WalkFastWest 4 EndMovement .balign 4, 0 _0174: - MoveAction_018 4 - MoveAction_017 - MoveAction_038 + WalkFastWest 4 + WalkFastSouth + WalkOnSpotFastWest EndMovement .balign 4, 0 _0184: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _018C: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0194: - MoveAction_063 4 - MoveAction_035 + Delay8 4 + WalkOnSpotNormalEast EndMovement _01A0: diff --git a/res/field/scripts/scripts_newmoon_island.s b/res/field/scripts/scripts_newmoon_island.s index 1f5bda1bb2..6da8740a85 100644 --- a/res/field/scripts/scripts_newmoon_island.s +++ b/res/field/scripts/scripts_newmoon_island.s @@ -83,31 +83,31 @@ _00F6: .balign 4, 0 _0110: - MoveAction_014 - MoveAction_064 + WalkNormalWest + Delay15 EndMovement .balign 4, 0 _011C: - MoveAction_069 + SetInvisible EndMovement .balign 4, 0 _0124: - MoveAction_013 - MoveAction_014 2 - MoveAction_064 + WalkNormalSouth + WalkNormalWest 2 + Delay15 EndMovement .balign 4, 0 _0134: - MoveAction_014 2 - MoveAction_064 + WalkNormalWest 2 + Delay15 EndMovement .balign 4, 0 _0140: - MoveAction_012 - MoveAction_014 2 - MoveAction_064 + WalkNormalNorth + WalkNormalWest 2 + Delay15 EndMovement diff --git a/res/field/scripts/scripts_old_chateau_back_middle_east_room.s b/res/field/scripts/scripts_old_chateau_back_middle_east_room.s index 6eeb2e82a0..ab56fac4c9 100644 --- a/res/field/scripts/scripts_old_chateau_back_middle_east_room.s +++ b/res/field/scripts/scripts_old_chateau_back_middle_east_room.s @@ -29,11 +29,11 @@ _002E: .balign 4, 0 _004C: - MoveAction_065 - MoveAction_001 - MoveAction_065 - MoveAction_073 - MoveAction_013 2 - MoveAction_074 - MoveAction_069 + Delay16 + FaceSouth + Delay16 + PauseAnimation + WalkNormalSouth 2 + ResumeAnimation + SetInvisible EndMovement diff --git a/res/field/scripts/scripts_old_chateau_dining_area.s b/res/field/scripts/scripts_old_chateau_dining_area.s index f74feaa595..9053d2f7ba 100644 --- a/res/field/scripts/scripts_old_chateau_dining_area.s +++ b/res/field/scripts/scripts_old_chateau_dining_area.s @@ -30,18 +30,18 @@ _002E: .balign 4, 0 _0054: - MoveAction_012 - MoveAction_066 - MoveAction_002 + WalkNormalNorth + Delay32 + FaceWest EndMovement .balign 4, 0 _0064: - MoveAction_063 - MoveAction_002 - MoveAction_065 - MoveAction_073 - MoveAction_014 10 - MoveAction_074 - MoveAction_069 + Delay8 + FaceWest + Delay16 + PauseAnimation + WalkNormalWest 10 + ResumeAnimation + SetInvisible EndMovement diff --git a/res/field/scripts/scripts_oreburgh_city.s b/res/field/scripts/scripts_oreburgh_city.s index 902c34f075..161a9971b6 100644 --- a/res/field/scripts/scripts_oreburgh_city.s +++ b/res/field/scripts/scripts_oreburgh_city.s @@ -185,82 +185,82 @@ _0287: .balign 4, 0 _02A0: - MoveAction_062 7 - MoveAction_071 - MoveAction_018 - MoveAction_072 - MoveAction_003 + Delay4 7 + LockDir + WalkFastWest + UnlockDir + FaceEast EndMovement .balign 4, 0 _02B8: - MoveAction_018 9 + WalkFastWest 9 EndMovement .balign 4, 0 _02C0: - MoveAction_017 - MoveAction_018 4 - MoveAction_038 + WalkFastSouth + WalkFastWest 4 + WalkOnSpotFastWest EndMovement .balign 4, 0 _02D0: - MoveAction_017 - MoveAction_018 3 - MoveAction_016 - MoveAction_018 - MoveAction_038 + WalkFastSouth + WalkFastWest 3 + WalkFastNorth + WalkFastWest + WalkOnSpotFastWest EndMovement .balign 4, 0 _02E8: - MoveAction_016 - MoveAction_018 4 - MoveAction_038 + WalkFastNorth + WalkFastWest 4 + WalkOnSpotFastWest EndMovement .balign 4, 0 _02F8: - MoveAction_016 - MoveAction_018 3 - MoveAction_016 - MoveAction_018 - MoveAction_038 + WalkFastNorth + WalkFastWest 3 + WalkFastNorth + WalkFastWest + WalkOnSpotFastWest EndMovement .balign 4, 0 _0310: - MoveAction_033 - MoveAction_034 + WalkOnSpotNormalSouth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _031C: - MoveAction_033 - MoveAction_034 + WalkOnSpotNormalSouth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0328: - MoveAction_032 - MoveAction_034 + WalkOnSpotNormalNorth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0334: - MoveAction_032 - MoveAction_034 + WalkOnSpotNormalNorth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0340: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0348: - MoveAction_034 + WalkOnSpotNormalWest EndMovement _0350: @@ -417,95 +417,95 @@ _0544: .balign 4, 0 _055C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0564: - MoveAction_013 - MoveAction_015 - MoveAction_013 10 - MoveAction_015 12 + WalkNormalSouth + WalkNormalEast + WalkNormalSouth 10 + WalkNormalEast 12 EndMovement .balign 4, 0 _0578: - MoveAction_013 - MoveAction_015 - MoveAction_013 9 - MoveAction_015 12 + WalkNormalSouth + WalkNormalEast + WalkNormalSouth 9 + WalkNormalEast 12 EndMovement .balign 4, 0 _058C: - MoveAction_013 - MoveAction_015 - MoveAction_013 8 - MoveAction_015 12 + WalkNormalSouth + WalkNormalEast + WalkNormalSouth 8 + WalkNormalEast 12 EndMovement .balign 4, 0 _05A0: - MoveAction_013 - MoveAction_015 - MoveAction_013 7 - MoveAction_015 12 + WalkNormalSouth + WalkNormalEast + WalkNormalSouth 7 + WalkNormalEast 12 EndMovement .balign 4, 0 _05B4: - MoveAction_015 - MoveAction_013 10 - MoveAction_015 13 - MoveAction_034 + WalkNormalEast + WalkNormalSouth 10 + WalkNormalEast 13 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _05C8: - MoveAction_015 - MoveAction_013 9 - MoveAction_015 13 - MoveAction_034 + WalkNormalEast + WalkNormalSouth 9 + WalkNormalEast 13 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _05DC: - MoveAction_015 - MoveAction_013 8 - MoveAction_015 13 - MoveAction_034 + WalkNormalEast + WalkNormalSouth 8 + WalkNormalEast 13 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _05F0: - MoveAction_015 - MoveAction_013 7 - MoveAction_015 13 - MoveAction_034 + WalkNormalEast + WalkNormalSouth 7 + WalkNormalEast 13 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0604: - MoveAction_075 - MoveAction_012 3 + EmoteExclamationMark + WalkNormalNorth 3 EndMovement .balign 4, 0 _0610: - MoveAction_075 - MoveAction_012 2 + EmoteExclamationMark + WalkNormalNorth 2 EndMovement .balign 4, 0 _061C: - MoveAction_075 - MoveAction_012 + EmoteExclamationMark + WalkNormalNorth EndMovement .balign 4, 0 _0628: - MoveAction_075 - MoveAction_032 + EmoteExclamationMark + WalkOnSpotNormalNorth EndMovement _0634: diff --git a/res/field/scripts/scripts_oreburgh_gate_1f.s b/res/field/scripts/scripts_oreburgh_gate_1f.s index ef52592647..7509512751 100644 --- a/res/field/scripts/scripts_oreburgh_gate_1f.s +++ b/res/field/scripts/scripts_oreburgh_gate_1f.s @@ -63,13 +63,13 @@ _007B: .balign 4, 0 _00B4: - MoveAction_063 - MoveAction_032 + Delay8 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _00C0: - MoveAction_033 - MoveAction_075 - MoveAction_013 + WalkOnSpotNormalSouth + EmoteExclamationMark + WalkNormalSouth EndMovement diff --git a/res/field/scripts/scripts_oreburgh_mine_b1f.s b/res/field/scripts/scripts_oreburgh_mine_b1f.s index 8853c56522..cf0208191f 100644 --- a/res/field/scripts/scripts_oreburgh_mine_b1f.s +++ b/res/field/scripts/scripts_oreburgh_mine_b1f.s @@ -109,11 +109,11 @@ _012B: .balign 4, 0 _0138: - MoveAction_014 - MoveAction_012 3 + WalkNormalWest + WalkNormalNorth 3 EndMovement .balign 4, 0 _0144: - MoveAction_012 3 + WalkNormalNorth 3 EndMovement diff --git a/res/field/scripts/scripts_oreburgh_mine_b2f.s b/res/field/scripts/scripts_oreburgh_mine_b2f.s index 89b2af2be9..7b5c3f7cca 100644 --- a/res/field/scripts/scripts_oreburgh_mine_b2f.s +++ b/res/field/scripts/scripts_oreburgh_mine_b2f.s @@ -107,7 +107,7 @@ _00A1: .balign 4, 0 _00C0: - MoveAction_015 10 + WalkNormalEast 10 EndMovement .byte 63 @@ -129,9 +129,9 @@ _00C0: .balign 4, 0 _00D8: - MoveAction_063 2 - MoveAction_035 - MoveAction_063 4 + Delay8 2 + WalkOnSpotNormalEast + Delay8 4 EndMovement .byte 63 diff --git a/res/field/scripts/scripts_pal_park.s b/res/field/scripts/scripts_pal_park.s index a9c9158407..a1b4e721e4 100644 --- a/res/field/scripts/scripts_pal_park.s +++ b/res/field/scripts/scripts_pal_park.s @@ -109,7 +109,7 @@ _0114: .balign 4, 0 _0124: - MoveAction_012 + WalkNormalNorth EndMovement _012C: @@ -132,7 +132,7 @@ _0159: .balign 4, 0 _0168: - MoveAction_034 + WalkOnSpotNormalWest EndMovement _0170: diff --git a/res/field/scripts/scripts_pal_park_lobby.s b/res/field/scripts/scripts_pal_park_lobby.s index c09a17783f..8591708e7f 100644 --- a/res/field/scripts/scripts_pal_park_lobby.s +++ b/res/field/scripts/scripts_pal_park_lobby.s @@ -187,16 +187,16 @@ _02AD: .balign 4, 0 _02B8: - MoveAction_036 - MoveAction_012 2 - MoveAction_015 - MoveAction_038 + WalkOnSpotFastNorth + WalkNormalNorth 2 + WalkNormalEast + WalkOnSpotFastWest EndMovement .balign 4, 0 _02CC: - MoveAction_012 5 - MoveAction_069 + WalkNormalNorth 5 + SetInvisible EndMovement _02D8: @@ -268,24 +268,24 @@ _03BD: .balign 4, 0 _03D8: - MoveAction_014 - MoveAction_013 2 + WalkNormalWest + WalkNormalSouth 2 EndMovement .balign 4, 0 _03E4: - MoveAction_013 5 + WalkNormalSouth 5 EndMovement .balign 4, 0 _03EC: - MoveAction_013 2 - MoveAction_039 + WalkNormalSouth 2 + WalkOnSpotFastEast EndMovement .balign 4, 0 _03F8: - MoveAction_013 4 + WalkNormalSouth 4 EndMovement _0400: @@ -413,27 +413,27 @@ _04F6: .balign 4, 0 _0548: - MoveAction_075 - MoveAction_063 - MoveAction_013 3 + EmoteExclamationMark + Delay8 + WalkNormalSouth 3 EndMovement .balign 4, 0 _0558: - MoveAction_075 - MoveAction_063 + EmoteExclamationMark + Delay8 EndMovement .balign 4, 0 _0564: - MoveAction_013 - MoveAction_033 + WalkNormalSouth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0570: - MoveAction_015 - MoveAction_034 + WalkNormalEast + WalkOnSpotNormalWest EndMovement _057C: diff --git a/res/field/scripts/scripts_pastoria_city.s b/res/field/scripts/scripts_pastoria_city.s index ec713f235f..376130147f 100644 --- a/res/field/scripts/scripts_pastoria_city.s +++ b/res/field/scripts/scripts_pastoria_city.s @@ -254,8 +254,8 @@ _02D2: .balign 4, 0 _02EC: - MoveAction_033 - MoveAction_035 + WalkOnSpotNormalSouth + WalkOnSpotNormalEast EndMovement .byte 32 @@ -273,12 +273,12 @@ _02EC: .balign 4, 0 _0304: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _030C: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .byte 33 @@ -400,15 +400,15 @@ _030C: .balign 4, 0 _0388: - MoveAction_017 - MoveAction_019 2 - MoveAction_039 + WalkFastSouth + WalkFastEast 2 + WalkOnSpotFastEast EndMovement .balign 4, 0 _0398: - MoveAction_019 2 - MoveAction_039 + WalkFastEast 2 + WalkOnSpotFastEast EndMovement .byte 17 @@ -538,7 +538,7 @@ _04AE: .balign 4, 0 _04C0: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement _04C8: @@ -599,32 +599,32 @@ _0597: .balign 4, 0 _05A4: - MoveAction_062 13 - MoveAction_035 + Delay4 13 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _05B0: - MoveAction_017 9 - MoveAction_038 - MoveAction_075 + WalkFastSouth 9 + WalkOnSpotFastWest + EmoteExclamationMark EndMovement .balign 4, 0 _05C0: - MoveAction_018 4 - MoveAction_038 + WalkFastWest 4 + WalkOnSpotFastWest EndMovement .balign 4, 0 _05CC: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _05D4: - MoveAction_019 5 - MoveAction_016 9 + WalkFastEast 5 + WalkFastNorth 9 EndMovement _05E0: @@ -718,75 +718,75 @@ _074D: .balign 4, 0 _0764: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _076C: - MoveAction_035 - MoveAction_063 2 - MoveAction_033 + WalkOnSpotNormalEast + Delay8 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _077C: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0784: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _078C: - MoveAction_019 6 - MoveAction_016 8 + WalkFastEast 6 + WalkFastNorth 8 EndMovement .balign 4, 0 _0798: - MoveAction_017 9 - MoveAction_018 5 + WalkFastSouth 9 + WalkFastWest 5 EndMovement .balign 4, 0 _07A4: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _07AC: - MoveAction_071 - MoveAction_017 - MoveAction_072 - MoveAction_039 + LockDir + WalkFastSouth + UnlockDir + WalkOnSpotFastEast EndMovement .balign 4, 0 _07C0: - MoveAction_019 5 - MoveAction_016 8 + WalkFastEast 5 + WalkFastNorth 8 EndMovement .balign 4, 0 _07CC: - MoveAction_062 11 - MoveAction_035 + Delay4 11 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _07D8: - MoveAction_032 - MoveAction_063 2 - MoveAction_013 - MoveAction_032 + WalkOnSpotNormalNorth + Delay8 2 + WalkNormalSouth + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _07EC: - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalEast EndMovement _07F8: @@ -891,8 +891,8 @@ _098D: .balign 4, 0 _099C: - MoveAction_063 - MoveAction_000 + Delay8 + FaceNorth EndMovement _09A8: @@ -948,47 +948,47 @@ _0A8D: .balign 4, 0 _0AA4: - MoveAction_000 + FaceNorth EndMovement .balign 4, 0 _0AAC: - MoveAction_017 - MoveAction_019 - MoveAction_037 + WalkFastSouth + WalkFastEast + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0ABC: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0AC8: - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0AD4: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0ADC: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0AE4: - MoveAction_016 3 - MoveAction_019 + WalkFastNorth 3 + WalkFastEast EndMovement .balign 4, 0 _0AF0: - MoveAction_036 + WalkOnSpotFastNorth EndMovement .byte 17 @@ -1010,52 +1010,52 @@ _0AF0: .balign 4, 0 _0B08: - MoveAction_037 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0B10: - MoveAction_063 - MoveAction_037 + Delay8 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0B1C: - MoveAction_019 2 - MoveAction_016 + WalkFastEast 2 + WalkFastNorth EndMovement .balign 4, 0 _0B28: - MoveAction_019 - MoveAction_016 - MoveAction_019 - MoveAction_036 + WalkFastEast + WalkFastNorth + WalkFastEast + WalkOnSpotFastNorth EndMovement .balign 4, 0 _0B3C: - MoveAction_039 + WalkOnSpotFastEast EndMovement .balign 4, 0 _0B44: - MoveAction_017 4 + WalkFastSouth 4 EndMovement .balign 4, 0 _0B4C: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0B54: - MoveAction_019 12 + WalkFastEast 12 EndMovement .balign 4, 0 _0B5C: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .byte 33 @@ -1069,23 +1069,23 @@ _0B5C: .balign 4, 0 _0B6C: - MoveAction_037 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0B74: - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0B80: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0B88: - MoveAction_012 2 + WalkNormalNorth 2 EndMovement _0B90: @@ -1105,24 +1105,24 @@ _0B90: .balign 4, 0 _0BC8: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0BD0: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _0BD8: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0BE0: - MoveAction_014 - MoveAction_015 - MoveAction_032 + WalkNormalWest + WalkNormalEast + WalkOnSpotNormalNorth EndMovement _0BF0: @@ -1157,16 +1157,16 @@ _0C22: .balign 4, 0 _0C64: - MoveAction_012 7 - MoveAction_034 + WalkNormalNorth 7 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0C70: - MoveAction_012 5 + WalkNormalNorth 5 EndMovement .balign 4, 0 _0C78: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement diff --git a/res/field/scripts/scripts_pastoria_city_observatory_gate_1f.s b/res/field/scripts/scripts_pastoria_city_observatory_gate_1f.s index a206502ff7..8efd4557a0 100644 --- a/res/field/scripts/scripts_pastoria_city_observatory_gate_1f.s +++ b/res/field/scripts/scripts_pastoria_city_observatory_gate_1f.s @@ -108,33 +108,33 @@ _017D: .balign 4, 0 _018C: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _0194: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _019C: - MoveAction_032 - MoveAction_012 3 - MoveAction_015 - MoveAction_012 - MoveAction_069 + WalkOnSpotNormalNorth + WalkNormalNorth 3 + WalkNormalEast + WalkNormalNorth + SetInvisible EndMovement .balign 4, 0 _01B4: - MoveAction_032 - MoveAction_012 4 - MoveAction_069 + WalkOnSpotNormalNorth + WalkNormalNorth 4 + SetInvisible EndMovement .balign 4, 0 _01C4: - MoveAction_013 + WalkNormalSouth EndMovement _01CC: @@ -186,14 +186,14 @@ _024E: .balign 4, 0 _0280: - MoveAction_013 5 + WalkNormalSouth 5 EndMovement .balign 4, 0 _0288: - MoveAction_000 - MoveAction_012 - MoveAction_069 + FaceNorth + WalkNormalNorth + SetInvisible EndMovement _0298: @@ -252,8 +252,8 @@ _0329: .balign 4, 0 _0334: - MoveAction_015 4 - MoveAction_032 + WalkNormalEast 4 + WalkOnSpotNormalNorth EndMovement .byte 14 diff --git a/res/field/scripts/scripts_pokemon_league_aaron_room.s b/res/field/scripts/scripts_pokemon_league_aaron_room.s index 2af30be13b..b8cd589e4b 100644 --- a/res/field/scripts/scripts_pokemon_league_aaron_room.s +++ b/res/field/scripts/scripts_pokemon_league_aaron_room.s @@ -71,5 +71,5 @@ _00B7: .balign 4, 0 _00DC: - MoveAction_012 2 + WalkNormalNorth 2 EndMovement diff --git a/res/field/scripts/scripts_pokemon_league_bertha_room.s b/res/field/scripts/scripts_pokemon_league_bertha_room.s index ace7eb99ba..61df65e430 100644 --- a/res/field/scripts/scripts_pokemon_league_bertha_room.s +++ b/res/field/scripts/scripts_pokemon_league_bertha_room.s @@ -71,5 +71,5 @@ _00B7: .balign 4, 0 _00DC: - MoveAction_012 2 + WalkNormalNorth 2 EndMovement diff --git a/res/field/scripts/scripts_pokemon_league_champion_room.s b/res/field/scripts/scripts_pokemon_league_champion_room.s index cd4aeee88b..1fd6702459 100644 --- a/res/field/scripts/scripts_pokemon_league_champion_room.s +++ b/res/field/scripts/scripts_pokemon_league_champion_room.s @@ -83,26 +83,26 @@ _0121: .balign 4, 0 _012C: - MoveAction_012 4 + WalkNormalNorth 4 EndMovement .balign 4, 0 _0134: - MoveAction_012 6 + WalkNormalNorth 6 EndMovement .balign 4, 0 _013C: - MoveAction_012 6 + WalkNormalNorth 6 EndMovement .balign 4, 0 _0144: - MoveAction_014 - MoveAction_033 + WalkNormalWest + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0150: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement diff --git a/res/field/scripts/scripts_pokemon_league_elevator_to_hall_of_fame.s b/res/field/scripts/scripts_pokemon_league_elevator_to_hall_of_fame.s index 664a1c4172..868c2848ef 100644 --- a/res/field/scripts/scripts_pokemon_league_elevator_to_hall_of_fame.s +++ b/res/field/scripts/scripts_pokemon_league_elevator_to_hall_of_fame.s @@ -72,55 +72,55 @@ _00C9: .balign 4, 0 _0114: - MoveAction_012 8 - MoveAction_035 + WalkNormalNorth 8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0120: - MoveAction_063 3 - MoveAction_012 2 - MoveAction_015 - MoveAction_012 2 - MoveAction_069 + Delay8 3 + WalkNormalNorth 2 + WalkNormalEast + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _0138: - MoveAction_012 8 - MoveAction_034 + WalkNormalNorth 8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0144: - MoveAction_034 - MoveAction_075 + WalkOnSpotNormalWest + EmoteExclamationMark EndMovement .balign 4, 0 _0150: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0158: - MoveAction_012 2 - MoveAction_014 - MoveAction_012 2 - MoveAction_069 + WalkNormalNorth 2 + WalkNormalWest + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _016C: - MoveAction_012 17 - MoveAction_063 - MoveAction_033 + WalkNormalNorth 17 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _017C: - MoveAction_063 6 - MoveAction_035 + Delay8 6 + WalkOnSpotNormalEast EndMovement .byte 35 @@ -134,13 +134,13 @@ _017C: .balign 4, 0 _0190: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0198: - MoveAction_063 - MoveAction_032 - MoveAction_063 6 - MoveAction_012 4 + Delay8 + WalkOnSpotNormalNorth + Delay8 6 + WalkNormalNorth 4 EndMovement diff --git a/res/field/scripts/scripts_pokemon_league_flint_room.s b/res/field/scripts/scripts_pokemon_league_flint_room.s index 9521f7bc82..defc6f9663 100644 --- a/res/field/scripts/scripts_pokemon_league_flint_room.s +++ b/res/field/scripts/scripts_pokemon_league_flint_room.s @@ -91,11 +91,11 @@ _0118: .balign 4, 0 _0120: - MoveAction_071 - MoveAction_033 3 - MoveAction_037 4 - MoveAction_041 2 - MoveAction_072 + LockDir + WalkOnSpotNormalSouth 3 + WalkOnSpotFastSouth 4 + WalkOnSpotFasterSouth 2 + UnlockDir EndMovement _0138: @@ -111,5 +111,5 @@ _0138: .balign 4, 0 _015C: - MoveAction_012 2 + WalkNormalNorth 2 EndMovement diff --git a/res/field/scripts/scripts_pokemon_league_hall_of_fame.s b/res/field/scripts/scripts_pokemon_league_hall_of_fame.s index db2bffef03..7d68fff1d9 100644 --- a/res/field/scripts/scripts_pokemon_league_hall_of_fame.s +++ b/res/field/scripts/scripts_pokemon_league_hall_of_fame.s @@ -81,43 +81,43 @@ _0119: .balign 4, 0 _0124: - MoveAction_012 8 + WalkNormalNorth 8 EndMovement .balign 4, 0 _012C: - MoveAction_012 2 + WalkNormalNorth 2 EndMovement .balign 4, 0 _0134: - MoveAction_032 - MoveAction_063 2 - MoveAction_035 + WalkOnSpotNormalNorth + Delay8 2 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0144: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _014C: - MoveAction_063 - MoveAction_035 - MoveAction_032 + Delay8 + WalkOnSpotNormalEast + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _015C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0164: - MoveAction_063 - MoveAction_034 - MoveAction_032 + Delay8 + WalkOnSpotNormalWest + WalkOnSpotNormalNorth EndMovement _0174: diff --git a/res/field/scripts/scripts_pokemon_league_lucian_room.s b/res/field/scripts/scripts_pokemon_league_lucian_room.s index af04525374..13e190bca2 100644 --- a/res/field/scripts/scripts_pokemon_league_lucian_room.s +++ b/res/field/scripts/scripts_pokemon_league_lucian_room.s @@ -71,5 +71,5 @@ _00B7: .balign 4, 0 _00DC: - MoveAction_012 2 + WalkNormalNorth 2 EndMovement diff --git a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s index 4742943cb6..26bf580e37 100644 --- a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s +++ b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s @@ -81,20 +81,20 @@ _00F7: .balign 4, 0 _0104: - MoveAction_015 - MoveAction_033 + WalkNormalEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0110: - MoveAction_014 - MoveAction_035 + WalkNormalWest + WalkOnSpotNormalEast EndMovement .balign 4, 0 _011C: - MoveAction_015 - MoveAction_034 + WalkNormalEast + WalkOnSpotNormalWest EndMovement _0128: @@ -210,45 +210,45 @@ _02AC: .balign 4, 0 _02B8: - MoveAction_037 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _02C0: - MoveAction_016 3 - MoveAction_018 - MoveAction_016 3 + WalkFastNorth 3 + WalkFastWest + WalkFastNorth 3 EndMovement .balign 4, 0 _02D0: - MoveAction_016 6 + WalkFastNorth 6 EndMovement .balign 4, 0 _02D8: - MoveAction_016 3 - MoveAction_019 - MoveAction_016 3 + WalkFastNorth 3 + WalkFastEast + WalkFastNorth 3 EndMovement .balign 4, 0 _02E8: - MoveAction_017 3 - MoveAction_019 - MoveAction_017 3 + WalkFastSouth 3 + WalkFastEast + WalkFastSouth 3 EndMovement .balign 4, 0 _02F8: - MoveAction_017 6 + WalkFastSouth 6 EndMovement .balign 4, 0 _0300: - MoveAction_017 3 - MoveAction_018 - MoveAction_017 3 + WalkFastSouth 3 + WalkFastWest + WalkFastSouth 3 EndMovement _0310: diff --git a/res/field/scripts/scripts_pokemon_mansion.s b/res/field/scripts/scripts_pokemon_mansion.s index f431b61c23..0024274182 100644 --- a/res/field/scripts/scripts_pokemon_mansion.s +++ b/res/field/scripts/scripts_pokemon_mansion.s @@ -243,50 +243,50 @@ _03E6: .balign 4, 0 _03EC: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _03F4: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _03FC: - MoveAction_012 - MoveAction_033 + WalkNormalNorth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0408: - MoveAction_013 - MoveAction_035 + WalkNormalSouth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0414: - MoveAction_034 - MoveAction_069 + WalkOnSpotNormalWest + SetInvisible EndMovement .balign 4, 0 _0420: - MoveAction_070 - MoveAction_035 + SetVisible + WalkOnSpotNormalEast EndMovement .balign 4, 0 _042C: - MoveAction_015 - MoveAction_012 - MoveAction_034 + WalkNormalEast + WalkNormalNorth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _043C: - MoveAction_015 - MoveAction_013 - MoveAction_034 + WalkNormalEast + WalkNormalSouth + WalkOnSpotNormalWest EndMovement _044C: @@ -336,12 +336,12 @@ _048A: .balign 4, 0 _04A8: - MoveAction_001 + FaceSouth EndMovement .balign 4, 0 _04B0: - MoveAction_001 + FaceSouth EndMovement .byte 3 @@ -355,7 +355,7 @@ _04B0: .balign 4, 0 _04C0: - MoveAction_002 + FaceWest EndMovement _04C8: diff --git a/res/field/scripts/scripts_pokemon_mansion_office.s b/res/field/scripts/scripts_pokemon_mansion_office.s index 6d480a4be3..e98e081e4d 100644 --- a/res/field/scripts/scripts_pokemon_mansion_office.s +++ b/res/field/scripts/scripts_pokemon_mansion_office.s @@ -126,48 +126,48 @@ _01BD: .balign 4, 0 _01CC: - MoveAction_001 + FaceSouth EndMovement .balign 4, 0 _01D4: - MoveAction_075 - MoveAction_065 - MoveAction_003 + EmoteExclamationMark + Delay16 + FaceEast EndMovement .balign 4, 0 _01E4: - MoveAction_075 - MoveAction_034 + EmoteExclamationMark + WalkOnSpotNormalWest EndMovement .balign 4, 0 _01F0: - MoveAction_013 2 - MoveAction_015 - MoveAction_001 - MoveAction_069 + WalkNormalSouth 2 + WalkNormalEast + FaceSouth + SetInvisible EndMovement .balign 4, 0 _0204: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _020C: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0214: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _021C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement _0224: @@ -259,12 +259,12 @@ _0325: .balign 4, 0 _0344: - MoveAction_001 + FaceSouth EndMovement .balign 4, 0 _034C: - MoveAction_002 + FaceWest EndMovement _0354: @@ -281,8 +281,8 @@ _0354: .balign 4, 0 _037C: - MoveAction_013 - MoveAction_000 + WalkNormalSouth + FaceNorth EndMovement _0388: diff --git a/res/field/scripts/scripts_resort_area.s b/res/field/scripts/scripts_resort_area.s index 457b8e70a1..8f6d823cba 100644 --- a/res/field/scripts/scripts_resort_area.s +++ b/res/field/scripts/scripts_resort_area.s @@ -224,87 +224,87 @@ _0312: .balign 4, 0 _0328: - MoveAction_012 - MoveAction_034 + WalkNormalNorth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0334: - MoveAction_013 - MoveAction_034 + WalkNormalSouth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0340: - MoveAction_013 - MoveAction_034 + WalkNormalSouth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _034C: - MoveAction_012 - MoveAction_034 + WalkNormalNorth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0358: - MoveAction_015 6 - MoveAction_012 2 - MoveAction_033 + WalkNormalEast 6 + WalkNormalNorth 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0368: - MoveAction_015 6 - MoveAction_012 3 - MoveAction_033 + WalkNormalEast 6 + WalkNormalNorth 3 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0378: - MoveAction_015 6 - MoveAction_012 4 - MoveAction_033 + WalkNormalEast 6 + WalkNormalNorth 4 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0388: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0390: - MoveAction_012 - MoveAction_069 + WalkNormalNorth + SetInvisible EndMovement .balign 4, 0 _039C: - MoveAction_015 7 - MoveAction_012 + WalkNormalEast 7 + WalkNormalNorth EndMovement .balign 4, 0 _03A8: - MoveAction_015 7 - MoveAction_012 2 + WalkNormalEast 7 + WalkNormalNorth 2 EndMovement .balign 4, 0 _03B4: - MoveAction_015 7 - MoveAction_012 3 + WalkNormalEast 7 + WalkNormalNorth 3 EndMovement .balign 4, 0 _03C0: - MoveAction_012 2 - MoveAction_069 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _03CC: - MoveAction_014 + WalkNormalWest EndMovement _03D4: diff --git a/res/field/scripts/scripts_resort_area_house.s b/res/field/scripts/scripts_resort_area_house.s index bec1660403..85465800c8 100644 --- a/res/field/scripts/scripts_resort_area_house.s +++ b/res/field/scripts/scripts_resort_area_house.s @@ -22,7 +22,7 @@ _000E: .balign 4, 0 _002C: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement _0034: diff --git a/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s b/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s index 1b651c0aba..30ea8dea73 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s @@ -52,10 +52,10 @@ _0078: .balign 4, 0 _00AC: - MoveAction_002 - MoveAction_071 - MoveAction_015 - MoveAction_072 + FaceWest + LockDir + WalkNormalEast + UnlockDir EndMovement _00C0: diff --git a/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s b/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s index 1e52dd6a40..97177245b8 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s @@ -148,92 +148,92 @@ _01F3: .balign 4, 0 _0210: - MoveAction_015 2 - MoveAction_013 2 - MoveAction_015 3 - MoveAction_034 + WalkNormalEast 2 + WalkNormalSouth 2 + WalkNormalEast 3 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0224: - MoveAction_013 - MoveAction_015 - MoveAction_013 - MoveAction_015 4 - MoveAction_034 + WalkNormalSouth + WalkNormalEast + WalkNormalSouth + WalkNormalEast 4 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _023C: - MoveAction_015 2 - MoveAction_013 2 - MoveAction_015 3 - MoveAction_034 + WalkNormalEast 2 + WalkNormalSouth 2 + WalkNormalEast 3 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0250: - MoveAction_015 - MoveAction_013 - MoveAction_015 2 - MoveAction_013 - MoveAction_015 2 - MoveAction_034 + WalkNormalEast + WalkNormalSouth + WalkNormalEast 2 + WalkNormalSouth + WalkNormalEast 2 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _026C: - MoveAction_015 3 - MoveAction_013 2 - MoveAction_015 2 - MoveAction_033 + WalkNormalEast 3 + WalkNormalSouth 2 + WalkNormalEast 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0280: - MoveAction_063 2 - MoveAction_013 2 - MoveAction_015 3 - MoveAction_033 + Delay8 2 + WalkNormalSouth 2 + WalkNormalEast 3 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0294: - MoveAction_013 - MoveAction_015 3 - MoveAction_013 2 - MoveAction_015 - MoveAction_033 + WalkNormalSouth + WalkNormalEast 3 + WalkNormalSouth 2 + WalkNormalEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _02AC: - MoveAction_063 2 - MoveAction_015 3 - MoveAction_013 - MoveAction_015 - MoveAction_033 + Delay8 2 + WalkNormalEast 3 + WalkNormalSouth + WalkNormalEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _02C4: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _02CC: - MoveAction_015 3 + WalkNormalEast 3 EndMovement .balign 4, 0 _02D4: - MoveAction_012 4 + WalkNormalNorth 4 EndMovement .balign 4, 0 _02DC: - MoveAction_012 - MoveAction_033 + WalkNormalNorth + WalkOnSpotNormalSouth EndMovement _02E8: diff --git a/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s b/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s index d20c77799f..348e3309ad 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s @@ -101,5 +101,5 @@ _0164: .balign 4, 0 _017C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement diff --git a/res/field/scripts/scripts_restaurant.s b/res/field/scripts/scripts_restaurant.s index c9b5d9f544..46bf0cdf58 100644 --- a/res/field/scripts/scripts_restaurant.s +++ b/res/field/scripts/scripts_restaurant.s @@ -2392,10 +2392,10 @@ _2125: .balign 4, 0 _212C: - MoveAction_003 + FaceEast EndMovement .balign 4, 0 _2134: - MoveAction_002 + FaceWest EndMovement diff --git a/res/field/scripts/scripts_rotoms_room.s b/res/field/scripts/scripts_rotoms_room.s index d75efed910..9d20a6324d 100644 --- a/res/field/scripts/scripts_rotoms_room.s +++ b/res/field/scripts/scripts_rotoms_room.s @@ -562,8 +562,8 @@ _08AA: .balign 4, 0 _08AC: - MoveAction_033 - MoveAction_075 + WalkOnSpotNormalSouth + EmoteExclamationMark EndMovement .byte 34 @@ -597,27 +597,27 @@ _08AC: .balign 4, 0 _08D4: - MoveAction_012 2 + WalkNormalNorth 2 EndMovement .balign 4, 0 _08DC: - MoveAction_014 2 - MoveAction_032 - MoveAction_063 2 - MoveAction_015 4 - MoveAction_032 + WalkNormalWest 2 + WalkOnSpotNormalNorth + Delay8 2 + WalkNormalEast 4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _08F4: - MoveAction_014 2 - MoveAction_032 + WalkNormalWest 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0900: - MoveAction_013 2 + WalkNormalSouth 2 EndMovement RotomsRoom_OldNotebook: diff --git a/res/field/scripts/scripts_route_201.s b/res/field/scripts/scripts_route_201.s index 5c118004a7..445b284f4b 100644 --- a/res/field/scripts/scripts_route_201.s +++ b/res/field/scripts/scripts_route_201.s @@ -419,76 +419,76 @@ _0656: .balign 4, 0 _0664: - MoveAction_037 - MoveAction_075 + WalkOnSpotFastSouth + EmoteExclamationMark EndMovement .balign 4, 0 _0670: - MoveAction_017 - MoveAction_018 2 - MoveAction_033 + WalkFastSouth + WalkFastWest 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0680: - MoveAction_017 - MoveAction_018 - MoveAction_033 + WalkFastSouth + WalkFastWest + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0690: - MoveAction_017 + WalkFastSouth EndMovement .balign 4, 0 _0698: - MoveAction_017 - MoveAction_019 - MoveAction_033 + WalkFastSouth + WalkFastEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _06A8: - MoveAction_012 - MoveAction_015 4 - MoveAction_012 2 - MoveAction_015 - MoveAction_034 + WalkNormalNorth + WalkNormalEast 4 + WalkNormalNorth 2 + WalkNormalEast + WalkOnSpotNormalWest EndMovement .balign 4, 0 _06C0: - MoveAction_012 - MoveAction_015 3 - MoveAction_012 2 - MoveAction_015 - MoveAction_034 + WalkNormalNorth + WalkNormalEast 3 + WalkNormalNorth 2 + WalkNormalEast + WalkOnSpotNormalWest EndMovement .balign 4, 0 _06D8: - MoveAction_012 - MoveAction_015 2 - MoveAction_012 2 - MoveAction_015 - MoveAction_034 + WalkNormalNorth + WalkNormalEast 2 + WalkNormalNorth 2 + WalkNormalEast + WalkOnSpotNormalWest EndMovement .balign 4, 0 _06F0: - MoveAction_012 - MoveAction_015 - MoveAction_012 2 - MoveAction_015 - MoveAction_034 + WalkNormalNorth + WalkNormalEast + WalkNormalNorth 2 + WalkNormalEast + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0708: - MoveAction_014 - MoveAction_033 + WalkNormalWest + WalkOnSpotNormalSouth EndMovement .byte 15 @@ -502,73 +502,73 @@ _0708: .balign 4, 0 _071C: - MoveAction_014 3 - MoveAction_035 + WalkNormalWest 3 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0728: - MoveAction_019 3 + WalkFastEast 3 EndMovement .balign 4, 0 _0730: - MoveAction_075 - MoveAction_065 - MoveAction_034 + EmoteExclamationMark + Delay16 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0740: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0748: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0750: - MoveAction_037 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0758: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0760: - MoveAction_002 + FaceWest EndMovement .balign 4, 0 _0768: - MoveAction_038 + WalkOnSpotFastWest EndMovement .balign 4, 0 _0770: - MoveAction_037 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0778: - MoveAction_038 + WalkOnSpotFastWest EndMovement .balign 4, 0 _0780: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0788: - MoveAction_012 - MoveAction_033 - MoveAction_063 2 - MoveAction_035 + WalkNormalNorth + WalkOnSpotNormalSouth + Delay8 2 + WalkOnSpotNormalEast EndMovement .byte 63 @@ -586,163 +586,163 @@ _0788: .balign 4, 0 _07A8: - MoveAction_033 - MoveAction_063 3 - MoveAction_037 8 - MoveAction_018 - MoveAction_017 + WalkOnSpotNormalSouth + Delay8 3 + WalkOnSpotFastSouth 8 + WalkFastWest + WalkFastSouth EndMovement .balign 4, 0 _07C0: - MoveAction_015 8 + WalkNormalEast 8 EndMovement .balign 4, 0 _07C8: - MoveAction_014 3 + WalkNormalWest 3 EndMovement .balign 4, 0 _07D0: - MoveAction_015 3 + WalkNormalEast 3 EndMovement .balign 4, 0 _07D8: - MoveAction_034 - MoveAction_063 2 - MoveAction_035 + WalkOnSpotNormalWest + Delay8 2 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _07E8: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _07F0: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _07F8: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0800: - MoveAction_063 2 - MoveAction_062 - MoveAction_015 9 + Delay8 2 + Delay4 + WalkNormalEast 9 EndMovement .balign 4, 0 _0810: - MoveAction_012 2 - MoveAction_015 4 - MoveAction_012 - MoveAction_035 + WalkNormalNorth 2 + WalkNormalEast 4 + WalkNormalNorth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0824: - MoveAction_012 2 - MoveAction_015 3 - MoveAction_012 - MoveAction_035 + WalkNormalNorth 2 + WalkNormalEast 3 + WalkNormalNorth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0838: - MoveAction_012 2 - MoveAction_015 2 - MoveAction_012 - MoveAction_035 + WalkNormalNorth 2 + WalkNormalEast 2 + WalkNormalNorth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _084C: - MoveAction_012 2 - MoveAction_015 - MoveAction_012 - MoveAction_035 + WalkNormalNorth 2 + WalkNormalEast + WalkNormalNorth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0860: - MoveAction_062 - MoveAction_032 + Delay4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _086C: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0878: - MoveAction_063 - MoveAction_036 + Delay8 + WalkOnSpotFastNorth EndMovement .balign 4, 0 _0884: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _088C: - MoveAction_000 + FaceNorth EndMovement .balign 4, 0 _0894: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _089C: - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _08A8: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _08B0: - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _08BC: - MoveAction_063 - MoveAction_032 + Delay8 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _08C8: - MoveAction_015 7 + WalkNormalEast 7 EndMovement .balign 4, 0 _08D0: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _08D8: - MoveAction_015 + WalkNormalEast EndMovement .balign 4, 0 _08E0: - MoveAction_015 9 + WalkNormalEast 9 EndMovement _08E8: @@ -796,44 +796,44 @@ _0986: .balign 4, 0 _0998: - MoveAction_014 - MoveAction_035 + WalkNormalWest + WalkOnSpotNormalEast EndMovement .balign 4, 0 _09A4: - MoveAction_012 - MoveAction_033 + WalkNormalNorth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _09B0: - MoveAction_003 + FaceEast EndMovement .balign 4, 0 _09B8: - MoveAction_000 + FaceNorth EndMovement .balign 4, 0 _09C0: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _09C8: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _09D0: - MoveAction_038 + WalkOnSpotFastWest EndMovement .balign 4, 0 _09D8: - MoveAction_037 + WalkOnSpotFastSouth EndMovement _09E0: @@ -867,23 +867,23 @@ _0A5B: .balign 4, 0 _0A68: - MoveAction_012 - MoveAction_033 + WalkNormalNorth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0A74: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0A7C: - MoveAction_012 + WalkNormalNorth EndMovement .balign 4, 0 _0A84: - MoveAction_036 + WalkOnSpotFastNorth EndMovement _0A8C: @@ -916,17 +916,17 @@ _0ADD: .balign 4, 0 _0AE4: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0AEC: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _0AF4: - MoveAction_012 + WalkNormalNorth EndMovement .byte 12 @@ -1091,37 +1091,37 @@ _0CF1: .balign 4, 0 _0D48: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0D50: - MoveAction_063 4 - MoveAction_014 2 + Delay8 4 + WalkNormalWest 2 EndMovement .balign 4, 0 _0D5C: - MoveAction_063 4 - MoveAction_014 - MoveAction_013 - MoveAction_014 + Delay8 4 + WalkNormalWest + WalkNormalSouth + WalkNormalWest EndMovement .balign 4, 0 _0D70: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0D78: - MoveAction_015 8 + WalkNormalEast 8 EndMovement .balign 4, 0 _0D80: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .byte 34 @@ -1135,44 +1135,44 @@ _0D80: .balign 4, 0 _0D94: - MoveAction_063 3 - MoveAction_035 + Delay8 3 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0DA0: - MoveAction_062 - MoveAction_012 - MoveAction_033 - MoveAction_035 + Delay4 + WalkNormalNorth + WalkOnSpotNormalSouth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0DB4: - MoveAction_019 8 + WalkFastEast 8 EndMovement .balign 4, 0 _0DBC: - MoveAction_035 - MoveAction_075 - MoveAction_065 + WalkOnSpotNormalEast + EmoteExclamationMark + Delay16 EndMovement .balign 4, 0 _0DCC: - MoveAction_012 - MoveAction_035 - MoveAction_075 + WalkNormalNorth + WalkOnSpotNormalEast + EmoteExclamationMark EndMovement .balign 4, 0 _0DDC: - MoveAction_063 - MoveAction_034 - MoveAction_063 - MoveAction_012 - MoveAction_035 + Delay8 + WalkOnSpotNormalWest + Delay8 + WalkNormalNorth + WalkOnSpotNormalEast EndMovement _0DF4: diff --git a/res/field/scripts/scripts_route_202.s b/res/field/scripts/scripts_route_202.s index 5d3a86a371..17019ff894 100644 --- a/res/field/scripts/scripts_route_202.s +++ b/res/field/scripts/scripts_route_202.s @@ -248,120 +248,120 @@ _03B1: .balign 4, 0 _03C4: - MoveAction_035 - MoveAction_075 - MoveAction_065 + WalkOnSpotNormalEast + EmoteExclamationMark + Delay16 EndMovement .balign 4, 0 _03D4: - MoveAction_015 4 - MoveAction_012 2 - MoveAction_015 + WalkNormalEast 4 + WalkNormalNorth 2 + WalkNormalEast EndMovement .balign 4, 0 _03E4: - MoveAction_015 4 - MoveAction_012 - MoveAction_015 + WalkNormalEast 4 + WalkNormalNorth + WalkNormalEast EndMovement .balign 4, 0 _03F4: - MoveAction_015 4 - MoveAction_015 + WalkNormalEast 4 + WalkNormalEast EndMovement .balign 4, 0 _0400: - MoveAction_015 4 - MoveAction_013 - MoveAction_015 + WalkNormalEast 4 + WalkNormalSouth + WalkNormalEast EndMovement .balign 4, 0 _0410: - MoveAction_015 4 - MoveAction_013 2 - MoveAction_015 + WalkNormalEast 4 + WalkNormalSouth 2 + WalkNormalEast EndMovement .balign 4, 0 _0420: - MoveAction_015 - MoveAction_014 4 - MoveAction_014 2 - MoveAction_013 2 + WalkNormalEast + WalkNormalWest 4 + WalkNormalWest 2 + WalkNormalSouth 2 EndMovement .balign 4, 0 _0434: - MoveAction_015 - MoveAction_014 4 - MoveAction_014 2 - MoveAction_013 + WalkNormalEast + WalkNormalWest 4 + WalkNormalWest 2 + WalkNormalSouth EndMovement .balign 4, 0 _0448: - MoveAction_015 - MoveAction_014 4 - MoveAction_014 2 + WalkNormalEast + WalkNormalWest 4 + WalkNormalWest 2 EndMovement .balign 4, 0 _0458: - MoveAction_015 - MoveAction_014 4 - MoveAction_014 2 - MoveAction_012 + WalkNormalEast + WalkNormalWest 4 + WalkNormalWest 2 + WalkNormalNorth EndMovement .balign 4, 0 _046C: - MoveAction_015 - MoveAction_014 4 - MoveAction_014 2 - MoveAction_012 2 + WalkNormalEast + WalkNormalWest 4 + WalkNormalWest 2 + WalkNormalNorth 2 EndMovement .balign 4, 0 _0480: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0488: - MoveAction_014 2 + WalkNormalWest 2 EndMovement .balign 4, 0 _0490: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0498: - MoveAction_014 12 + WalkNormalWest 12 EndMovement .balign 4, 0 _04A0: - MoveAction_063 - MoveAction_002 + Delay8 + FaceWest EndMovement .balign 4, 0 _04AC: - MoveAction_071 - MoveAction_015 - MoveAction_072 + LockDir + WalkNormalEast + UnlockDir EndMovement .balign 4, 0 _04BC: - MoveAction_014 2 + WalkNormalWest 2 EndMovement _04C4: @@ -477,30 +477,30 @@ _066C: .balign 4, 0 _0674: - MoveAction_014 - MoveAction_013 3 - MoveAction_014 10 + WalkNormalWest + WalkNormalSouth 3 + WalkNormalWest 10 EndMovement .balign 4, 0 _0684: - MoveAction_013 3 - MoveAction_014 10 + WalkNormalSouth 3 + WalkNormalWest 10 EndMovement .balign 4, 0 _0690: - MoveAction_003 + FaceEast EndMovement .balign 4, 0 _0698: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _06A0: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .byte 35 @@ -514,7 +514,7 @@ _06A0: .balign 4, 0 _06B0: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .byte 63 @@ -544,22 +544,22 @@ _06B0: .balign 4, 0 _06D0: - MoveAction_003 + FaceEast EndMovement .balign 4, 0 _06D8: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _06E0: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _06E8: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .byte 35 @@ -573,5 +573,5 @@ _06E8: .balign 4, 0 _06F8: - MoveAction_015 + WalkNormalEast EndMovement diff --git a/res/field/scripts/scripts_route_203.s b/res/field/scripts/scripts_route_203.s index 30cd3b1d11..60ef870955 100644 --- a/res/field/scripts/scripts_route_203.s +++ b/res/field/scripts/scripts_route_203.s @@ -137,53 +137,53 @@ _0207: .balign 4, 0 _0210: - MoveAction_019 10 + WalkFastEast 10 EndMovement .balign 4, 0 _0218: - MoveAction_019 10 + WalkFastEast 10 EndMovement .balign 4, 0 _0220: - MoveAction_019 10 + WalkFastEast 10 EndMovement .balign 4, 0 _0228: - MoveAction_019 10 + WalkFastEast 10 EndMovement .balign 4, 0 _0230: - MoveAction_018 4 + WalkFastWest 4 EndMovement .balign 4, 0 _0238: - MoveAction_018 2 - MoveAction_017 - MoveAction_018 2 + WalkFastWest 2 + WalkFastSouth + WalkFastWest 2 EndMovement .balign 4, 0 _0248: - MoveAction_018 2 - MoveAction_017 2 - MoveAction_018 2 + WalkFastWest 2 + WalkFastSouth 2 + WalkFastWest 2 EndMovement .balign 4, 0 _0258: - MoveAction_018 2 - MoveAction_017 3 - MoveAction_018 2 + WalkFastWest 2 + WalkFastSouth 3 + WalkFastWest 2 EndMovement .balign 4, 0 _0268: - MoveAction_063 - MoveAction_075 - MoveAction_063 + Delay8 + EmoteExclamationMark + Delay8 EndMovement diff --git a/res/field/scripts/scripts_route_205_south.s b/res/field/scripts/scripts_route_205_south.s index 1e973afcf6..0e3e63468d 100644 --- a/res/field/scripts/scripts_route_205_south.s +++ b/res/field/scripts/scripts_route_205_south.s @@ -37,12 +37,12 @@ _002C: .balign 4, 0 _0060: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0068: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement _0070: @@ -70,32 +70,32 @@ _00B6: .balign 4, 0 _00BC: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _00C4: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _00CC: - MoveAction_019 - MoveAction_037 - MoveAction_063 2 - MoveAction_014 - MoveAction_033 + WalkFastEast + WalkOnSpotFastSouth + Delay8 2 + WalkNormalWest + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _00E4: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _00EC: - MoveAction_013 - MoveAction_036 + WalkNormalSouth + WalkOnSpotFastNorth EndMovement _00F8: @@ -194,42 +194,42 @@ _0216: .balign 4, 0 _0228: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0230: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0238: - MoveAction_032 - MoveAction_075 - MoveAction_063 - MoveAction_012 + WalkOnSpotNormalNorth + EmoteExclamationMark + Delay8 + WalkNormalNorth EndMovement .balign 4, 0 _024C: - MoveAction_032 - MoveAction_075 - MoveAction_063 + WalkOnSpotNormalNorth + EmoteExclamationMark + Delay8 EndMovement .balign 4, 0 _025C: - MoveAction_033 - MoveAction_075 - MoveAction_063 + WalkOnSpotNormalSouth + EmoteExclamationMark + Delay8 EndMovement .balign 4, 0 _026C: - MoveAction_033 - MoveAction_075 - MoveAction_063 - MoveAction_013 + WalkOnSpotNormalSouth + EmoteExclamationMark + Delay8 + WalkNormalSouth EndMovement _0280: diff --git a/res/field/scripts/scripts_route_206_cycling_road_north_gate.s b/res/field/scripts/scripts_route_206_cycling_road_north_gate.s index 50ef3de12f..f4a0f3812b 100644 --- a/res/field/scripts/scripts_route_206_cycling_road_north_gate.s +++ b/res/field/scripts/scripts_route_206_cycling_road_north_gate.s @@ -60,12 +60,12 @@ _0091: .balign 4, 0 _00A0: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _00A8: - MoveAction_012 + WalkNormalNorth EndMovement _00B0: diff --git a/res/field/scripts/scripts_route_206_cycling_road_south_gate.s b/res/field/scripts/scripts_route_206_cycling_road_south_gate.s index d635203411..d0f49b0b24 100644 --- a/res/field/scripts/scripts_route_206_cycling_road_south_gate.s +++ b/res/field/scripts/scripts_route_206_cycling_road_south_gate.s @@ -55,12 +55,12 @@ _0080: .balign 4, 0 _0090: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _0098: - MoveAction_013 + WalkNormalSouth EndMovement _00A0: diff --git a/res/field/scripts/scripts_route_207.s b/res/field/scripts/scripts_route_207.s index 05aea3c04d..990e757f88 100644 --- a/res/field/scripts/scripts_route_207.s +++ b/res/field/scripts/scripts_route_207.s @@ -107,7 +107,7 @@ _0156: .balign 4, 0 _0174: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .byte 63 @@ -137,18 +137,18 @@ _0174: .balign 4, 0 _0194: - MoveAction_015 3 - MoveAction_075 + WalkNormalEast 3 + EmoteExclamationMark EndMovement .balign 4, 0 _01A0: - MoveAction_015 5 + WalkNormalEast 5 EndMovement .balign 4, 0 _01A8: - MoveAction_014 8 + WalkNormalWest 8 EndMovement _01B0: diff --git a/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s b/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s index 9ebfda1357..f0b3a35f08 100644 --- a/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s +++ b/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s @@ -145,73 +145,73 @@ _01BA: .balign 4, 0 _01D4: - MoveAction_018 2 - MoveAction_016 2 - MoveAction_038 + WalkFastWest 2 + WalkFastNorth 2 + WalkOnSpotFastWest EndMovement .balign 4, 0 _01E4: - MoveAction_018 2 - MoveAction_016 - MoveAction_038 + WalkFastWest 2 + WalkFastNorth + WalkOnSpotFastWest EndMovement .balign 4, 0 _01F4: - MoveAction_018 2 + WalkFastWest 2 EndMovement .balign 4, 0 _01FC: - MoveAction_018 2 - MoveAction_017 - MoveAction_038 + WalkFastWest 2 + WalkFastSouth + WalkOnSpotFastWest EndMovement .balign 4, 0 _020C: - MoveAction_018 2 - MoveAction_017 2 - MoveAction_038 + WalkFastWest 2 + WalkFastSouth 2 + WalkOnSpotFastWest EndMovement .balign 4, 0 _021C: - MoveAction_019 2 - MoveAction_017 2 - MoveAction_019 2 + WalkFastEast 2 + WalkFastSouth 2 + WalkFastEast 2 EndMovement .balign 4, 0 _022C: - MoveAction_019 2 - MoveAction_017 - MoveAction_019 2 + WalkFastEast 2 + WalkFastSouth + WalkFastEast 2 EndMovement .balign 4, 0 _023C: - MoveAction_019 4 + WalkFastEast 4 EndMovement .balign 4, 0 _0244: - MoveAction_019 2 - MoveAction_016 - MoveAction_019 2 + WalkFastEast 2 + WalkFastNorth + WalkFastEast 2 EndMovement .balign 4, 0 _0254: - MoveAction_019 2 - MoveAction_016 2 - MoveAction_019 2 + WalkFastEast 2 + WalkFastNorth 2 + WalkFastEast 2 EndMovement .balign 4, 0 _0264: - MoveAction_063 - MoveAction_075 - MoveAction_063 + Delay8 + EmoteExclamationMark + Delay8 EndMovement diff --git a/res/field/scripts/scripts_route_210_south.s b/res/field/scripts/scripts_route_210_south.s index dcc11bd8f8..6f327fcf3b 100644 --- a/res/field/scripts/scripts_route_210_south.s +++ b/res/field/scripts/scripts_route_210_south.s @@ -142,67 +142,67 @@ _0240: .balign 4, 0 _024C: - MoveAction_075 - MoveAction_063 4 + EmoteExclamationMark + Delay8 4 EndMovement .balign 4, 0 _0258: - MoveAction_012 - MoveAction_033 - MoveAction_063 8 - MoveAction_012 8 + WalkNormalNorth + WalkOnSpotNormalSouth + Delay8 8 + WalkNormalNorth 8 EndMovement .balign 4, 0 _026C: - MoveAction_012 2 - MoveAction_033 2 - MoveAction_063 6 - MoveAction_012 8 + WalkNormalNorth 2 + WalkOnSpotNormalSouth 2 + Delay8 6 + WalkNormalNorth 8 EndMovement .balign 4, 0 _0280: - MoveAction_035 - MoveAction_034 - MoveAction_035 - MoveAction_063 2 - MoveAction_032 - MoveAction_016 2 - MoveAction_063 2 - MoveAction_014 3 - MoveAction_035 - MoveAction_075 - MoveAction_019 3 - MoveAction_016 8 + WalkOnSpotNormalEast + WalkOnSpotNormalWest + WalkOnSpotNormalEast + Delay8 2 + WalkOnSpotNormalNorth + WalkFastNorth 2 + Delay8 2 + WalkNormalWest 3 + WalkOnSpotNormalEast + EmoteExclamationMark + WalkFastEast 3 + WalkFastNorth 8 EndMovement .balign 4, 0 _02B4: - MoveAction_012 2 - MoveAction_063 8 - MoveAction_012 8 + WalkNormalNorth 2 + Delay8 8 + WalkNormalNorth 8 EndMovement .balign 4, 0 _02C4: - MoveAction_012 7 + WalkNormalNorth 7 EndMovement .balign 4, 0 _02CC: - MoveAction_013 9 + WalkNormalSouth 9 EndMovement .balign 4, 0 _02D4: - MoveAction_013 9 + WalkNormalSouth 9 EndMovement .balign 4, 0 _02DC: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .byte 63 diff --git a/res/field/scripts/scripts_route_211_east.s b/res/field/scripts/scripts_route_211_east.s index 2ea083d2c1..83081efd4c 100644 --- a/res/field/scripts/scripts_route_211_east.s +++ b/res/field/scripts/scripts_route_211_east.s @@ -42,7 +42,7 @@ _0073: .balign 4, 0 _0080: - MoveAction_075 + EmoteExclamationMark EndMovement _0088: diff --git a/res/field/scripts/scripts_route_213.s b/res/field/scripts/scripts_route_213.s index 6705e505f0..f781b7819e 100644 --- a/res/field/scripts/scripts_route_213.s +++ b/res/field/scripts/scripts_route_213.s @@ -198,120 +198,120 @@ _02F3: .balign 4, 0 _0308: - MoveAction_019 10 - MoveAction_016 2 - MoveAction_039 + WalkFastEast 10 + WalkFastNorth 2 + WalkOnSpotFastEast EndMovement .balign 4, 0 _0318: - MoveAction_019 10 - MoveAction_016 2 - MoveAction_019 2 + WalkFastEast 10 + WalkFastNorth 2 + WalkFastEast 2 EndMovement .balign 4, 0 _0328: - MoveAction_019 10 - MoveAction_016 3 - MoveAction_019 + WalkFastEast 10 + WalkFastNorth 3 + WalkFastEast EndMovement .balign 4, 0 _0338: - MoveAction_019 10 - MoveAction_016 - MoveAction_019 + WalkFastEast 10 + WalkFastNorth + WalkFastEast EndMovement .balign 4, 0 _0348: - MoveAction_037 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0350: - MoveAction_016 - MoveAction_019 10 + WalkFastNorth + WalkFastEast 10 EndMovement .balign 4, 0 _035C: - MoveAction_016 - MoveAction_019 10 + WalkFastNorth + WalkFastEast 10 EndMovement .balign 4, 0 _0368: - MoveAction_017 - MoveAction_019 4 - MoveAction_016 - MoveAction_019 6 + WalkFastSouth + WalkFastEast 4 + WalkFastNorth + WalkFastEast 6 EndMovement .balign 4, 0 _037C: - MoveAction_016 2 - MoveAction_019 10 + WalkFastNorth 2 + WalkFastEast 10 EndMovement .balign 4, 0 _0388: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _0390: - MoveAction_019 10 + WalkFastEast 10 EndMovement .balign 4, 0 _0398: - MoveAction_017 2 - MoveAction_019 9 + WalkFastSouth 2 + WalkFastEast 9 EndMovement .balign 4, 0 _03A4: - MoveAction_019 4 - MoveAction_016 - MoveAction_019 6 + WalkFastEast 4 + WalkFastNorth + WalkFastEast 6 EndMovement .balign 4, 0 _03B4: - MoveAction_016 - MoveAction_019 10 + WalkFastNorth + WalkFastEast 10 EndMovement .balign 4, 0 _03C0: - MoveAction_063 - MoveAction_003 + Delay8 + FaceEast EndMovement .balign 4, 0 _03CC: - MoveAction_062 10 - MoveAction_034 + Delay4 10 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _03D8: - MoveAction_062 11 - MoveAction_034 + Delay4 11 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _03E4: - MoveAction_062 3 - MoveAction_035 + Delay4 3 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _03F0: - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalEast EndMovement _03FC: diff --git a/res/field/scripts/scripts_route_217.s b/res/field/scripts/scripts_route_217.s index 82301eafff..9eb2c6fdfe 100644 --- a/res/field/scripts/scripts_route_217.s +++ b/res/field/scripts/scripts_route_217.s @@ -81,49 +81,49 @@ _00F6: .balign 4, 0 _010C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0114: - MoveAction_063 2 - MoveAction_062 - MoveAction_032 + Delay8 2 + Delay4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0124: - MoveAction_012 4 - MoveAction_014 3 - MoveAction_012 - MoveAction_075 + WalkNormalNorth 4 + WalkNormalWest 3 + WalkNormalNorth + EmoteExclamationMark EndMovement .balign 4, 0 _0138: - MoveAction_012 4 - MoveAction_014 2 - MoveAction_012 - MoveAction_075 + WalkNormalNorth 4 + WalkNormalWest 2 + WalkNormalNorth + EmoteExclamationMark EndMovement .balign 4, 0 _014C: - MoveAction_012 + WalkNormalNorth EndMovement .balign 4, 0 _0154: - MoveAction_015 - MoveAction_012 3 - MoveAction_015 2 - MoveAction_012 9 + WalkNormalEast + WalkNormalNorth 3 + WalkNormalEast 2 + WalkNormalNorth 9 EndMovement .balign 4, 0 _0168: - MoveAction_014 - MoveAction_012 3 - MoveAction_015 3 - MoveAction_012 9 + WalkNormalWest + WalkNormalNorth 3 + WalkNormalEast 3 + WalkNormalNorth 9 EndMovement diff --git a/res/field/scripts/scripts_route_218_gate_to_canalave_city.s b/res/field/scripts/scripts_route_218_gate_to_canalave_city.s index cfa189437d..2143ec1615 100644 --- a/res/field/scripts/scripts_route_218_gate_to_canalave_city.s +++ b/res/field/scripts/scripts_route_218_gate_to_canalave_city.s @@ -109,72 +109,72 @@ _015A: .balign 4, 0 _0168: - MoveAction_075 - MoveAction_015 - MoveAction_012 2 - MoveAction_035 + EmoteExclamationMark + WalkNormalEast + WalkNormalNorth 2 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _017C: - MoveAction_075 - MoveAction_015 - MoveAction_012 - MoveAction_035 + EmoteExclamationMark + WalkNormalEast + WalkNormalNorth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0190: - MoveAction_075 - MoveAction_015 + EmoteExclamationMark + WalkNormalEast EndMovement .balign 4, 0 _019C: - MoveAction_075 - MoveAction_015 - MoveAction_013 - MoveAction_035 + EmoteExclamationMark + WalkNormalEast + WalkNormalSouth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _01B0: - MoveAction_075 - MoveAction_015 - MoveAction_013 2 - MoveAction_035 + EmoteExclamationMark + WalkNormalEast + WalkNormalSouth 2 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _01C4: - MoveAction_013 2 - MoveAction_015 4 + WalkNormalSouth 2 + WalkNormalEast 4 EndMovement .balign 4, 0 _01D0: - MoveAction_013 - MoveAction_015 4 + WalkNormalSouth + WalkNormalEast 4 EndMovement .balign 4, 0 _01DC: - MoveAction_012 - MoveAction_015 3 - MoveAction_013 - MoveAction_015 + WalkNormalNorth + WalkNormalEast 3 + WalkNormalSouth + WalkNormalEast EndMovement .balign 4, 0 _01F0: - MoveAction_012 - MoveAction_015 4 + WalkNormalNorth + WalkNormalEast 4 EndMovement .balign 4, 0 _01FC: - MoveAction_012 2 - MoveAction_015 4 + WalkNormalNorth 2 + WalkNormalEast 4 EndMovement _0208: diff --git a/res/field/scripts/scripts_route_224.s b/res/field/scripts/scripts_route_224.s index 92a16145b9..ec996bbcdc 100644 --- a/res/field/scripts/scripts_route_224.s +++ b/res/field/scripts/scripts_route_224.s @@ -212,104 +212,104 @@ _02B8: .balign 4, 0 _0328: - MoveAction_000 - MoveAction_065 - MoveAction_003 + FaceNorth + Delay16 + FaceEast EndMovement .balign 4, 0 _0338: - MoveAction_014 - MoveAction_012 - MoveAction_065 - MoveAction_003 + WalkNormalWest + WalkNormalNorth + Delay16 + FaceEast EndMovement .balign 4, 0 _034C: - MoveAction_013 - MoveAction_014 2 - MoveAction_012 - MoveAction_065 - MoveAction_003 + WalkNormalSouth + WalkNormalWest 2 + WalkNormalNorth + Delay16 + FaceEast EndMovement .balign 4, 0 _0364: - MoveAction_063 - MoveAction_002 + Delay8 + FaceWest EndMovement .balign 4, 0 _0370: - MoveAction_063 - MoveAction_001 - MoveAction_063 2 - MoveAction_002 + Delay8 + FaceSouth + Delay8 2 + FaceWest EndMovement .balign 4, 0 _0384: - MoveAction_000 + FaceNorth EndMovement .balign 4, 0 _038C: - MoveAction_003 - MoveAction_075 - MoveAction_065 + FaceEast + EmoteExclamationMark + Delay16 EndMovement .balign 4, 0 _039C: - MoveAction_065 - MoveAction_003 - MoveAction_075 - MoveAction_065 + Delay16 + FaceEast + EmoteExclamationMark + Delay16 EndMovement .balign 4, 0 _03B0: - MoveAction_002 - MoveAction_075 - MoveAction_065 + FaceWest + EmoteExclamationMark + Delay16 EndMovement .balign 4, 0 _03C0: - MoveAction_002 + FaceWest EndMovement .balign 4, 0 _03C8: - MoveAction_002 - MoveAction_065 - MoveAction_001 - MoveAction_065 - MoveAction_003 - MoveAction_065 - MoveAction_001 - MoveAction_065 - MoveAction_002 - MoveAction_065 - MoveAction_000 - MoveAction_065 - MoveAction_001 - MoveAction_065 + FaceWest + Delay16 + FaceSouth + Delay16 + FaceEast + Delay16 + FaceSouth + Delay16 + FaceWest + Delay16 + FaceNorth + Delay16 + FaceSouth + Delay16 EndMovement .balign 4, 0 _0404: - MoveAction_001 - MoveAction_065 - MoveAction_003 - MoveAction_065 - MoveAction_001 - MoveAction_065 - MoveAction_002 - MoveAction_065 - MoveAction_000 - MoveAction_065 + FaceSouth + Delay16 + FaceEast + Delay16 + FaceSouth + Delay16 + FaceWest + Delay16 + FaceNorth + Delay16 EndMovement .byte 33 @@ -323,19 +323,19 @@ _0404: .balign 4, 0 _0438: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0440: - MoveAction_013 12 + WalkNormalSouth 12 EndMovement .balign 4, 0 _0448: - MoveAction_000 - MoveAction_065 - MoveAction_076 12 + FaceNorth + Delay16 + WalkSlightlyFastNorth 12 EndMovement _0458: @@ -417,46 +417,46 @@ _057F: .balign 4, 0 _0598: - MoveAction_012 8 - MoveAction_035 + WalkNormalNorth 8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _05A4: - MoveAction_012 8 - MoveAction_035 + WalkNormalNorth 8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _05B0: - MoveAction_012 8 - MoveAction_035 + WalkNormalNorth 8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _05BC: - MoveAction_013 - MoveAction_015 5 - MoveAction_012 4 + WalkNormalSouth + WalkNormalEast 5 + WalkNormalNorth 4 EndMovement .balign 4, 0 _05CC: - MoveAction_012 - MoveAction_015 5 - MoveAction_012 3 + WalkNormalNorth + WalkNormalEast 5 + WalkNormalNorth 3 EndMovement .balign 4, 0 _05DC: - MoveAction_012 2 - MoveAction_015 5 - MoveAction_012 3 + WalkNormalNorth 2 + WalkNormalEast 5 + WalkNormalNorth 3 EndMovement .balign 4, 0 _05EC: - MoveAction_035 + WalkOnSpotNormalEast EndMovement _05F4: @@ -481,38 +481,38 @@ _061C: .balign 4, 0 _0628: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0630: - MoveAction_063 2 - MoveAction_035 - MoveAction_063 4 - MoveAction_032 + Delay8 2 + WalkOnSpotNormalEast + Delay8 4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0644: - MoveAction_063 2 - MoveAction_035 - MoveAction_063 3 - MoveAction_032 + Delay8 2 + WalkOnSpotNormalEast + Delay8 3 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0658: - MoveAction_063 2 - MoveAction_032 + Delay8 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0664: - MoveAction_000 + FaceNorth EndMovement .balign 4, 0 _066C: - MoveAction_003 - MoveAction_075 + FaceEast + EmoteExclamationMark EndMovement diff --git a/res/field/scripts/scripts_route_227.s b/res/field/scripts/scripts_route_227.s index a967e1d13c..601a042037 100644 --- a/res/field/scripts/scripts_route_227.s +++ b/res/field/scripts/scripts_route_227.s @@ -64,26 +64,26 @@ _00E7: .balign 4, 0 _00F4: - MoveAction_014 - MoveAction_032 + WalkNormalWest + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0100: - MoveAction_000 + FaceNorth EndMovement .balign 4, 0 _0108: - MoveAction_015 - MoveAction_012 - MoveAction_035 + WalkNormalEast + WalkNormalNorth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0118: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .byte 32 @@ -97,10 +97,10 @@ _0118: .balign 4, 0 _012C: - MoveAction_014 - MoveAction_035 - MoveAction_062 - MoveAction_033 + WalkNormalWest + WalkOnSpotNormalEast + Delay4 + WalkOnSpotNormalSouth EndMovement .byte 63 @@ -126,28 +126,28 @@ _012C: .balign 4, 0 _0154: - MoveAction_033 - MoveAction_075 + WalkOnSpotNormalSouth + EmoteExclamationMark EndMovement .balign 4, 0 _0160: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0168: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0170: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0178: - MoveAction_017 9 + WalkFastSouth 9 EndMovement .byte 17 @@ -161,18 +161,18 @@ _0178: .balign 4, 0 _0188: - MoveAction_033 - MoveAction_075 + WalkOnSpotNormalSouth + EmoteExclamationMark EndMovement .balign 4, 0 _0194: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _019C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .byte 63 @@ -198,8 +198,8 @@ _019C: .balign 4, 0 _01B8: - MoveAction_063 2 - MoveAction_013 9 + Delay8 2 + WalkNormalSouth 9 EndMovement .byte 13 @@ -260,7 +260,7 @@ _0243: .balign 4, 0 _026C: - MoveAction_000 + FaceNorth EndMovement .byte 63 @@ -278,17 +278,17 @@ _026C: .balign 4, 0 _0280: - MoveAction_033 - MoveAction_075 - MoveAction_013 + WalkOnSpotNormalSouth + EmoteExclamationMark + WalkNormalSouth EndMovement .balign 4, 0 _0290: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0298: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement diff --git a/res/field/scripts/scripts_sandgem_town.s b/res/field/scripts/scripts_sandgem_town.s index 6e714df3d8..50ad03183e 100644 --- a/res/field/scripts/scripts_sandgem_town.s +++ b/res/field/scripts/scripts_sandgem_town.s @@ -222,105 +222,105 @@ _035E: .balign 4, 0 _03AC: - MoveAction_075 - MoveAction_065 + EmoteExclamationMark + Delay16 EndMovement .balign 4, 0 _03B8: - MoveAction_014 4 - MoveAction_012 + WalkNormalWest 4 + WalkNormalNorth EndMovement .balign 4, 0 _03C4: - MoveAction_014 2 - MoveAction_012 - MoveAction_014 + WalkNormalWest 2 + WalkNormalNorth + WalkNormalWest EndMovement .balign 4, 0 _03D4: - MoveAction_014 3 + WalkNormalWest 3 EndMovement .balign 4, 0 _03DC: - MoveAction_014 4 - MoveAction_001 + WalkNormalWest 4 + FaceSouth EndMovement .balign 4, 0 _03E8: - MoveAction_014 4 - MoveAction_013 + WalkNormalWest 4 + WalkNormalSouth EndMovement .balign 4, 0 _03F4: - MoveAction_014 4 - MoveAction_013 2 + WalkNormalWest 4 + WalkNormalSouth 2 EndMovement .balign 4, 0 _0400: - MoveAction_015 5 - MoveAction_032 + WalkNormalEast 5 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _040C: - MoveAction_015 4 - MoveAction_032 + WalkNormalEast 4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0418: - MoveAction_012 - MoveAction_015 4 - MoveAction_032 + WalkNormalNorth + WalkNormalEast 4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0428: - MoveAction_015 2 - MoveAction_012 - MoveAction_015 3 - MoveAction_032 + WalkNormalEast 2 + WalkNormalNorth + WalkNormalEast 3 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _043C: - MoveAction_012 2 - MoveAction_015 5 - MoveAction_032 + WalkNormalNorth 2 + WalkNormalEast 5 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _044C: - MoveAction_012 2 - MoveAction_015 5 - MoveAction_032 + WalkNormalNorth 2 + WalkNormalEast 5 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _045C: - MoveAction_012 - MoveAction_014 - MoveAction_012 - MoveAction_069 + WalkNormalNorth + WalkNormalWest + WalkNormalNorth + SetInvisible EndMovement .balign 4, 0 _0470: - MoveAction_062 - MoveAction_035 + Delay4 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _047C: - MoveAction_063 3 - MoveAction_001 + Delay8 3 + FaceSouth EndMovement .byte 63 @@ -350,102 +350,102 @@ _047C: .balign 4, 0 _04A0: - MoveAction_063 3 - MoveAction_032 + Delay8 3 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _04AC: - MoveAction_063 3 - MoveAction_032 + Delay8 3 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _04B8: - MoveAction_063 3 - MoveAction_032 + Delay8 3 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _04C4: - MoveAction_013 - MoveAction_015 4 - MoveAction_032 + WalkNormalSouth + WalkNormalEast 4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _04D4: - MoveAction_015 2 - MoveAction_015 2 - MoveAction_032 + WalkNormalEast 2 + WalkNormalEast 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _04E4: - MoveAction_015 - MoveAction_012 - MoveAction_015 3 - MoveAction_032 + WalkNormalEast + WalkNormalNorth + WalkNormalEast 3 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _04F8: - MoveAction_012 - MoveAction_015 2 - MoveAction_012 - MoveAction_015 2 - MoveAction_032 + WalkNormalNorth + WalkNormalEast 2 + WalkNormalNorth + WalkNormalEast 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0510: - MoveAction_012 3 - MoveAction_015 4 - MoveAction_032 + WalkNormalNorth 3 + WalkNormalEast 4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0520: - MoveAction_012 4 - MoveAction_015 4 - MoveAction_032 + WalkNormalNorth 4 + WalkNormalEast 4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0530: - MoveAction_063 - MoveAction_032 - MoveAction_063 2 - MoveAction_012 2 - MoveAction_069 + Delay8 + WalkOnSpotNormalNorth + Delay8 2 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _0548: - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0554: - MoveAction_017 + WalkFastSouth EndMovement .balign 4, 0 _055C: - MoveAction_037 2 + WalkOnSpotFastSouth 2 EndMovement .balign 4, 0 _0564: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _056C: - MoveAction_019 2 - MoveAction_017 - MoveAction_019 7 + WalkFastEast 2 + WalkFastSouth + WalkFastEast 7 EndMovement _057C: @@ -592,89 +592,89 @@ _0772: .balign 4, 0 _0798: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _07A0: - MoveAction_032 - MoveAction_069 + WalkOnSpotNormalNorth + SetInvisible EndMovement .balign 4, 0 _07AC: - MoveAction_075 - MoveAction_032 + EmoteExclamationMark + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _07B8: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _07C0: - MoveAction_013 - MoveAction_015 9 - MoveAction_032 + WalkNormalSouth + WalkNormalEast 9 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _07D0: - MoveAction_015 10 - MoveAction_032 + WalkNormalEast 10 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _07DC: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _07E4: - MoveAction_063 - MoveAction_033 - MoveAction_062 - MoveAction_034 + Delay8 + WalkOnSpotNormalSouth + Delay4 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _07F8: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _0800: - MoveAction_012 + WalkNormalNorth EndMovement .balign 4, 0 _0808: - MoveAction_015 10 - MoveAction_032 + WalkNormalEast 10 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0814: - MoveAction_015 10 - MoveAction_032 + WalkNormalEast 10 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0820: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0828: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _0830: - MoveAction_013 - MoveAction_014 5 - MoveAction_012 10 + WalkNormalSouth + WalkNormalWest 5 + WalkNormalNorth 10 EndMovement _0840: diff --git a/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s b/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s index 1dcb6b9b98..7268cb7984 100644 --- a/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s +++ b/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s @@ -118,9 +118,9 @@ _016A: .balign 4, 0 _019C: - MoveAction_035 - MoveAction_062 - MoveAction_033 + WalkOnSpotNormalEast + Delay4 + WalkOnSpotNormalSouth EndMovement _01AC: @@ -325,67 +325,67 @@ _044D: .balign 4, 0 _047C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0484: - MoveAction_065 - MoveAction_012 8 - MoveAction_015 - MoveAction_034 + Delay16 + WalkNormalNorth 8 + WalkNormalEast + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0498: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _04A0: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _04A8: - MoveAction_065 - MoveAction_012 9 + Delay16 + WalkNormalNorth 9 EndMovement .balign 4, 0 _04B4: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _04BC: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _04C4: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _04D0: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _04D8: - MoveAction_013 10 + WalkNormalSouth 10 EndMovement .balign 4, 0 _04E0: - MoveAction_102 + PlayerGive EndMovement .balign 4, 0 _04E8: - MoveAction_104 + PlayerReceive EndMovement _04F0: @@ -653,20 +653,20 @@ _07E3: .balign 4, 0 _07F8: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0804: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _080C: - MoveAction_034 - MoveAction_063 2 - MoveAction_033 + WalkOnSpotNormalWest + Delay8 2 + WalkOnSpotNormalSouth EndMovement .byte 34 @@ -680,60 +680,60 @@ _080C: .balign 4, 0 _0824: - MoveAction_014 - MoveAction_013 2 - MoveAction_015 - MoveAction_032 + WalkNormalWest + WalkNormalSouth 2 + WalkNormalEast + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0838: - MoveAction_013 - MoveAction_014 - MoveAction_032 + WalkNormalSouth + WalkNormalWest + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0848: - MoveAction_013 - MoveAction_015 - MoveAction_032 + WalkNormalSouth + WalkNormalEast + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0858: - MoveAction_033 - MoveAction_063 5 - MoveAction_014 - MoveAction_035 + WalkOnSpotNormalSouth + Delay8 5 + WalkNormalWest + WalkOnSpotNormalEast EndMovement .balign 4, 0 _086C: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0878: - MoveAction_015 - MoveAction_032 + WalkNormalEast + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0884: - MoveAction_012 7 + WalkNormalNorth 7 EndMovement .balign 4, 0 _088C: - MoveAction_014 - MoveAction_032 + WalkNormalWest + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0898: - MoveAction_013 9 + WalkNormalSouth 9 EndMovement _08A0: diff --git a/res/field/scripts/scripts_sendoff_spring.s b/res/field/scripts/scripts_sendoff_spring.s index 1355d5b753..fd75f8a908 100644 --- a/res/field/scripts/scripts_sendoff_spring.s +++ b/res/field/scripts/scripts_sendoff_spring.s @@ -50,21 +50,21 @@ _0021: .balign 4, 0 _0098: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _00A0: - MoveAction_038 - MoveAction_063 - MoveAction_039 - MoveAction_063 2 - MoveAction_036 + WalkOnSpotFastWest + Delay8 + WalkOnSpotFastEast + Delay8 2 + WalkOnSpotFastNorth EndMovement .balign 4, 0 _00B8: - MoveAction_035 + WalkOnSpotNormalEast EndMovement _00C0: diff --git a/res/field/scripts/scripts_snowpoint_city.s b/res/field/scripts/scripts_snowpoint_city.s index a6cd0f80c9..06de82fc20 100644 --- a/res/field/scripts/scripts_snowpoint_city.s +++ b/res/field/scripts/scripts_snowpoint_city.s @@ -49,17 +49,17 @@ _0088: .balign 4, 0 _009C: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _00A4: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _00AC: - MoveAction_013 + WalkNormalSouth EndMovement _00B4: @@ -117,17 +117,17 @@ _011B: .balign 4, 0 _015C: - MoveAction_001 + FaceSouth EndMovement .balign 4, 0 _0164: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _016C: - MoveAction_012 7 + WalkNormalNorth 7 EndMovement _0174: @@ -271,40 +271,40 @@ _02A0: .balign 4, 0 _030C: - MoveAction_075 - MoveAction_032 + EmoteExclamationMark + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0318: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0320: - MoveAction_014 4 - MoveAction_013 2 - MoveAction_014 6 - MoveAction_013 2 + WalkNormalWest 4 + WalkNormalSouth 2 + WalkNormalWest 6 + WalkNormalSouth 2 EndMovement .balign 4, 0 _0334: - MoveAction_015 + WalkNormalEast EndMovement .balign 4, 0 _033C: - MoveAction_014 - MoveAction_033 + WalkNormalWest + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0348: - MoveAction_012 2 - MoveAction_015 3 - MoveAction_012 2 - MoveAction_015 7 + WalkNormalNorth 2 + WalkNormalEast 3 + WalkNormalNorth 2 + WalkNormalEast 7 EndMovement _035C: @@ -325,17 +325,17 @@ _0376: .balign 4, 0 _0390: - MoveAction_001 - MoveAction_064 + FaceSouth + Delay15 EndMovement .balign 4, 0 _039C: - MoveAction_069 + SetInvisible EndMovement .balign 4, 0 _03A4: - MoveAction_013 - MoveAction_064 + WalkNormalSouth + Delay15 EndMovement diff --git a/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s b/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s index 28cac73388..7208da6985 100644 --- a/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s @@ -91,15 +91,15 @@ _00EC: .balign 4, 0 _00FC: - MoveAction_041 2 + WalkOnSpotFasterSouth 2 EndMovement .balign 4, 0 _0104: - MoveAction_043 2 + WalkOnSpotFasterEast 2 EndMovement .balign 4, 0 _010C: - MoveAction_042 2 + WalkOnSpotFasterWest 2 EndMovement diff --git a/res/field/scripts/scripts_solaceon_ruins_room_2.s b/res/field/scripts/scripts_solaceon_ruins_room_2.s index 5e946458af..904c90ac2b 100644 --- a/res/field/scripts/scripts_solaceon_ruins_room_2.s +++ b/res/field/scripts/scripts_solaceon_ruins_room_2.s @@ -68,5 +68,5 @@ _00C7: .balign 4, 0 _00D4: - MoveAction_075 + EmoteExclamationMark EndMovement diff --git a/res/field/scripts/scripts_solaceon_town.s b/res/field/scripts/scripts_solaceon_town.s index 71ddf8264f..ee81bb1156 100644 --- a/res/field/scripts/scripts_solaceon_town.s +++ b/res/field/scripts/scripts_solaceon_town.s @@ -164,36 +164,36 @@ _0168: .balign 4, 0 _01E8: - MoveAction_017 7 + WalkFastSouth 7 EndMovement .balign 4, 0 _01F0: - MoveAction_038 - MoveAction_063 - MoveAction_039 - MoveAction_063 - MoveAction_037 + WalkOnSpotFastWest + Delay8 + WalkOnSpotFastEast + Delay8 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0208: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _0210: - MoveAction_016 7 + WalkFastNorth 7 EndMovement .balign 4, 0 _0218: - MoveAction_063 - MoveAction_075 - MoveAction_063 3 + Delay8 + EmoteExclamationMark + Delay8 3 EndMovement .balign 4, 0 _0228: - MoveAction_000 + FaceNorth EndMovement diff --git a/res/field/scripts/scripts_spear_pillar.s b/res/field/scripts/scripts_spear_pillar.s index 90cfe7e464..c4f5e25ec1 100644 --- a/res/field/scripts/scripts_spear_pillar.s +++ b/res/field/scripts/scripts_spear_pillar.s @@ -149,28 +149,28 @@ _01DB: .balign 4, 0 _01E4: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _01EC: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _01F4: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _01FC: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0204: - MoveAction_062 5 - MoveAction_013 + Delay4 5 + WalkNormalSouth EndMovement _0210: @@ -308,32 +308,32 @@ _03D8: .balign 4, 0 _03F4: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _03FC: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _0404: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _040C: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _0414: - MoveAction_015 + WalkNormalEast EndMovement .balign 4, 0 _041C: - MoveAction_034 + WalkOnSpotNormalWest EndMovement SpearPillar_SetRivalPartnerTeam: @@ -435,13 +435,13 @@ _04A7: .balign 4, 0 _04F4: - MoveAction_062 2 - MoveAction_016 8 + Delay4 2 + WalkFastNorth 8 EndMovement .balign 4, 0 _0500: - MoveAction_017 8 + WalkFastSouth 8 EndMovement _0508: @@ -486,7 +486,7 @@ _0567: .balign 4, 0 _05B8: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement _05C0: @@ -521,34 +521,34 @@ _0637: .balign 4, 0 _0644: - MoveAction_063 - MoveAction_012 6 - MoveAction_015 2 + Delay8 + WalkNormalNorth 6 + WalkNormalEast 2 EndMovement .balign 4, 0 _0654: - MoveAction_063 - MoveAction_012 6 - MoveAction_015 + Delay8 + WalkNormalNorth 6 + WalkNormalEast EndMovement .balign 4, 0 _0664: - MoveAction_063 - MoveAction_012 6 + Delay8 + WalkNormalNorth 6 EndMovement .balign 4, 0 _0670: - MoveAction_063 - MoveAction_012 6 - MoveAction_014 + Delay8 + WalkNormalNorth 6 + WalkNormalWest EndMovement .balign 4, 0 _0680: - MoveAction_063 - MoveAction_012 6 - MoveAction_014 2 + Delay8 + WalkNormalNorth 6 + WalkNormalWest 2 EndMovement diff --git a/res/field/scripts/scripts_spear_pillar_distorted.s b/res/field/scripts/scripts_spear_pillar_distorted.s index 901798d49e..f021ca4259 100644 --- a/res/field/scripts/scripts_spear_pillar_distorted.s +++ b/res/field/scripts/scripts_spear_pillar_distorted.s @@ -83,38 +83,38 @@ _0130: .balign 4, 0 _013C: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0144: - MoveAction_012 4 + WalkNormalNorth 4 EndMovement .balign 4, 0 _014C: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0154: - MoveAction_035 - MoveAction_063 2 - MoveAction_033 - MoveAction_063 - MoveAction_032 + WalkOnSpotNormalEast + Delay8 2 + WalkOnSpotNormalSouth + Delay8 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _016C: - MoveAction_015 - MoveAction_012 5 + WalkNormalEast + WalkNormalNorth 5 EndMovement .balign 4, 0 _0178: - MoveAction_013 5 - MoveAction_014 + WalkNormalSouth 5 + WalkNormalWest EndMovement _0184: diff --git a/res/field/scripts/scripts_stark_mountain_outside.s b/res/field/scripts/scripts_stark_mountain_outside.s index fa06da61f8..00d58bc25e 100644 --- a/res/field/scripts/scripts_stark_mountain_outside.s +++ b/res/field/scripts/scripts_stark_mountain_outside.s @@ -48,14 +48,14 @@ _002F: .balign 4, 0 _00A4: - MoveAction_015 4 + WalkNormalEast 4 EndMovement .balign 4, 0 _00AC: - MoveAction_013 2 - MoveAction_015 4 - MoveAction_012 + WalkNormalSouth 2 + WalkNormalEast 4 + WalkNormalNorth EndMovement .byte 34 @@ -69,41 +69,41 @@ _00AC: .balign 4, 0 _00C4: - MoveAction_034 - MoveAction_063 2 - MoveAction_032 + WalkOnSpotNormalWest + Delay8 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _00D4: - MoveAction_012 2 - MoveAction_069 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _00E0: - MoveAction_012 - MoveAction_015 3 + WalkNormalNorth + WalkNormalEast 3 EndMovement .balign 4, 0 _00EC: - MoveAction_015 - MoveAction_013 2 - MoveAction_015 3 - MoveAction_012 + WalkNormalEast + WalkNormalSouth 2 + WalkNormalEast 3 + WalkNormalNorth EndMovement .balign 4, 0 _0100: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0108: - MoveAction_015 - MoveAction_012 2 - MoveAction_069 + WalkNormalEast + WalkNormalNorth 2 + SetInvisible EndMovement _0118: @@ -151,58 +151,58 @@ _0118: .balign 4, 0 _01CC: - MoveAction_034 - MoveAction_063 2 - MoveAction_033 + WalkOnSpotNormalWest + Delay8 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _01DC: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _01E8: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _01F0: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _01F8: - MoveAction_012 2 - MoveAction_069 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _0204: - MoveAction_070 - MoveAction_013 - MoveAction_035 + SetVisible + WalkNormalSouth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0214: - MoveAction_013 2 - MoveAction_014 5 - MoveAction_012 2 - MoveAction_014 3 - MoveAction_021 9 - MoveAction_023 10 - MoveAction_012 6 - MoveAction_015 8 + WalkNormalSouth 2 + WalkNormalWest 5 + WalkNormalNorth 2 + WalkNormalWest 3 + WalkFasterSouth 9 + WalkFasterEast 10 + WalkNormalNorth 6 + WalkNormalEast 8 EndMovement .balign 4, 0 _0238: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0240: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement diff --git a/res/field/scripts/scripts_stark_mountain_room_1.s b/res/field/scripts/scripts_stark_mountain_room_1.s index 4edfca2194..89eb85be1b 100644 --- a/res/field/scripts/scripts_stark_mountain_room_1.s +++ b/res/field/scripts/scripts_stark_mountain_room_1.s @@ -90,107 +90,107 @@ _0150: .balign 4, 0 _0158: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0160: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _0168: - MoveAction_012 - MoveAction_033 + WalkNormalNorth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0174: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _017C: - MoveAction_032 - MoveAction_063 2 - MoveAction_033 - MoveAction_063 2 + WalkOnSpotNormalNorth + Delay8 2 + WalkOnSpotNormalSouth + Delay8 2 EndMovement .balign 4, 0 _0190: - MoveAction_013 2 - MoveAction_063 - MoveAction_013 - MoveAction_069 + WalkNormalSouth 2 + Delay8 + WalkNormalSouth + SetInvisible EndMovement .balign 4, 0 _01A4: - MoveAction_063 2 - MoveAction_014 - MoveAction_035 + Delay8 2 + WalkNormalWest + WalkOnSpotNormalEast EndMovement .balign 4, 0 _01B4: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _01BC: - MoveAction_034 - MoveAction_063 2 - MoveAction_033 + WalkOnSpotNormalWest + Delay8 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _01CC: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _01D4: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _01DC: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _01E4: - MoveAction_014 - MoveAction_013 2 - MoveAction_069 + WalkNormalWest + WalkNormalSouth 2 + SetInvisible EndMovement .balign 4, 0 _01F4: - MoveAction_063 - MoveAction_032 + Delay8 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0200: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0208: - MoveAction_012 7 + WalkNormalNorth 7 EndMovement .balign 4, 0 _0210: - MoveAction_015 - MoveAction_012 7 + WalkNormalEast + WalkNormalNorth 7 EndMovement .balign 4, 0 _021C: - MoveAction_063 - MoveAction_014 - MoveAction_012 7 + Delay8 + WalkNormalWest + WalkNormalNorth 7 EndMovement diff --git a/res/field/scripts/scripts_stark_mountain_room_2.s b/res/field/scripts/scripts_stark_mountain_room_2.s index 347364da83..4c578b2649 100644 --- a/res/field/scripts/scripts_stark_mountain_room_2.s +++ b/res/field/scripts/scripts_stark_mountain_room_2.s @@ -68,7 +68,7 @@ _00B7: .balign 4, 0 _00DC: - MoveAction_012 8 + WalkNormalNorth 8 EndMovement .byte 12 @@ -82,7 +82,7 @@ _00DC: .balign 4, 0 _00EC: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .byte 12 @@ -111,22 +111,22 @@ _00FC: .balign 4, 0 _0134: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _013C: - MoveAction_012 + WalkNormalNorth EndMovement .balign 4, 0 _0144: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _014C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement _0154: @@ -170,31 +170,31 @@ _01AB: .balign 4, 0 _01E4: - MoveAction_014 - MoveAction_035 + WalkNormalWest + WalkOnSpotNormalEast EndMovement .balign 4, 0 _01F0: - MoveAction_012 - MoveAction_034 + WalkNormalNorth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _01FC: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _0204: - MoveAction_032 - MoveAction_063 2 - MoveAction_034 + WalkOnSpotNormalNorth + Delay8 2 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0214: - MoveAction_012 + WalkNormalNorth EndMovement _021C: diff --git a/res/field/scripts/scripts_stark_mountain_room_3.s b/res/field/scripts/scripts_stark_mountain_room_3.s index 3c4380bbe6..cf54040b0f 100644 --- a/res/field/scripts/scripts_stark_mountain_room_3.s +++ b/res/field/scripts/scripts_stark_mountain_room_3.s @@ -64,7 +64,7 @@ _0096: .balign 4, 0 _00B4: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .byte 32 @@ -288,179 +288,179 @@ _019C: .balign 4, 0 _0388: - MoveAction_012 3 + WalkNormalNorth 3 EndMovement .balign 4, 0 _0390: - MoveAction_063 2 - MoveAction_035 - MoveAction_063 2 - MoveAction_032 + Delay8 2 + WalkOnSpotNormalEast + Delay8 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _03A4: - MoveAction_063 - MoveAction_012 2 + Delay8 + WalkNormalNorth 2 EndMovement .balign 4, 0 _03B0: - MoveAction_012 2 - MoveAction_063 2 - MoveAction_033 + WalkNormalNorth 2 + Delay8 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _03C0: - MoveAction_038 - MoveAction_063 - MoveAction_039 - MoveAction_063 - MoveAction_037 + WalkOnSpotFastWest + Delay8 + WalkOnSpotFastEast + Delay8 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _03D8: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _03E0: - MoveAction_063 2 - MoveAction_013 3 + Delay8 2 + WalkNormalSouth 3 EndMovement .balign 4, 0 _03EC: - MoveAction_013 - MoveAction_015 - MoveAction_013 3 - MoveAction_014 - MoveAction_013 - MoveAction_069 + WalkNormalSouth + WalkNormalEast + WalkNormalSouth 3 + WalkNormalWest + WalkNormalSouth + SetInvisible EndMovement .balign 4, 0 _0408: - MoveAction_063 3 - MoveAction_062 - MoveAction_032 + Delay8 3 + Delay4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0418: - MoveAction_063 - MoveAction_033 - MoveAction_063 - MoveAction_034 - MoveAction_062 - MoveAction_032 + Delay8 + WalkOnSpotNormalSouth + Delay8 + WalkOnSpotNormalWest + Delay4 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0434: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _043C: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0444: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _044C: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0454: - MoveAction_039 3 + WalkOnSpotFastEast 3 EndMovement .balign 4, 0 _045C: - MoveAction_038 3 + WalkOnSpotFastWest 3 EndMovement .balign 4, 0 _0464: - MoveAction_019 2 - MoveAction_017 5 - MoveAction_018 - MoveAction_017 - MoveAction_069 + WalkFastEast 2 + WalkFastSouth 5 + WalkFastWest + WalkFastSouth + SetInvisible EndMovement .balign 4, 0 _047C: - MoveAction_017 5 - MoveAction_018 - MoveAction_017 - MoveAction_069 + WalkFastSouth 5 + WalkFastWest + WalkFastSouth + SetInvisible EndMovement .balign 4, 0 _0490: - MoveAction_018 2 - MoveAction_016 3 - MoveAction_032 - MoveAction_017 3 - MoveAction_019 2 + WalkFastWest 2 + WalkFastNorth 3 + WalkOnSpotNormalNorth + WalkFastSouth 3 + WalkFastEast 2 EndMovement .balign 4, 0 _04A8: - MoveAction_014 3 - MoveAction_012 3 + WalkNormalWest 3 + WalkNormalNorth 3 EndMovement .balign 4, 0 _04B4: - MoveAction_014 - MoveAction_012 - MoveAction_015 - MoveAction_013 2 + WalkNormalWest + WalkNormalNorth + WalkNormalEast + WalkNormalSouth 2 EndMovement .balign 4, 0 _04C8: - MoveAction_012 2 - MoveAction_015 - MoveAction_012 3 - MoveAction_014 2 - MoveAction_032 + WalkNormalNorth 2 + WalkNormalEast + WalkNormalNorth 3 + WalkNormalWest 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _04E0: - MoveAction_015 - MoveAction_013 - MoveAction_015 - MoveAction_013 3 - MoveAction_014 - MoveAction_013 2 + WalkNormalEast + WalkNormalSouth + WalkNormalEast + WalkNormalSouth 3 + WalkNormalWest + WalkNormalSouth 2 EndMovement .balign 4, 0 _04FC: - MoveAction_015 - MoveAction_012 4 - MoveAction_014 - MoveAction_032 + WalkNormalEast + WalkNormalNorth 4 + WalkNormalWest + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0510: - MoveAction_015 - MoveAction_013 3 - MoveAction_014 - MoveAction_013 2 - MoveAction_069 + WalkNormalEast + WalkNormalSouth 3 + WalkNormalWest + WalkNormalSouth 2 + SetInvisible EndMovement diff --git a/res/field/scripts/scripts_sunyshore_city.s b/res/field/scripts/scripts_sunyshore_city.s index e72fcc7849..c2da4a06e7 100644 --- a/res/field/scripts/scripts_sunyshore_city.s +++ b/res/field/scripts/scripts_sunyshore_city.s @@ -236,180 +236,180 @@ _03C2: .balign 4, 0 _03D0: - MoveAction_014 4 - MoveAction_013 + WalkNormalWest 4 + WalkNormalSouth EndMovement .balign 4, 0 _03DC: - MoveAction_014 3 - MoveAction_013 + WalkNormalWest 3 + WalkNormalSouth EndMovement .balign 4, 0 _03E8: - MoveAction_014 2 - MoveAction_013 + WalkNormalWest 2 + WalkNormalSouth EndMovement .balign 4, 0 _03F4: - MoveAction_014 - MoveAction_013 + WalkNormalWest + WalkNormalSouth EndMovement .balign 4, 0 _0400: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _0408: - MoveAction_012 - MoveAction_015 4 - MoveAction_033 + WalkNormalNorth + WalkNormalEast 4 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0418: - MoveAction_012 - MoveAction_015 3 - MoveAction_033 + WalkNormalNorth + WalkNormalEast 3 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0428: - MoveAction_012 - MoveAction_015 2 - MoveAction_033 + WalkNormalNorth + WalkNormalEast 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0438: - MoveAction_012 - MoveAction_015 - MoveAction_033 + WalkNormalNorth + WalkNormalEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0448: - MoveAction_012 - MoveAction_033 + WalkNormalNorth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0454: - MoveAction_063 - MoveAction_016 4 - MoveAction_018 + Delay8 + WalkFastNorth 4 + WalkFastWest EndMovement .balign 4, 0 _0464: - MoveAction_063 - MoveAction_016 4 - MoveAction_038 + Delay8 + WalkFastNorth 4 + WalkOnSpotFastWest EndMovement .balign 4, 0 _0474: - MoveAction_063 - MoveAction_016 3 + Delay8 + WalkFastNorth 3 EndMovement .balign 4, 0 _0480: - MoveAction_063 - MoveAction_016 4 - MoveAction_039 + Delay8 + WalkFastNorth 4 + WalkOnSpotFastEast EndMovement .balign 4, 0 _0490: - MoveAction_063 - MoveAction_016 4 - MoveAction_019 + Delay8 + WalkFastNorth 4 + WalkFastEast EndMovement .balign 4, 0 _04A0: - MoveAction_037 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _04A8: - MoveAction_038 + WalkOnSpotFastWest EndMovement .balign 4, 0 _04B0: - MoveAction_036 + WalkOnSpotFastNorth EndMovement .balign 4, 0 _04B8: - MoveAction_039 + WalkOnSpotFastEast EndMovement .balign 4, 0 _04C0: - MoveAction_017 8 + WalkFastSouth 8 EndMovement .balign 4, 0 _04C8: - MoveAction_017 8 + WalkFastSouth 8 EndMovement .balign 4, 0 _04D0: - MoveAction_017 8 + WalkFastSouth 8 EndMovement .balign 4, 0 _04D8: - MoveAction_017 8 + WalkFastSouth 8 EndMovement .balign 4, 0 _04E0: - MoveAction_017 8 + WalkFastSouth 8 EndMovement .balign 4, 0 _04E8: - MoveAction_033 - MoveAction_075 + WalkOnSpotNormalSouth + EmoteExclamationMark EndMovement .balign 4, 0 _04F4: - MoveAction_033 - MoveAction_063 - MoveAction_035 + WalkOnSpotNormalSouth + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0504: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _050C: - MoveAction_033 - MoveAction_063 2 - MoveAction_034 + WalkOnSpotNormalSouth + Delay8 2 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _051C: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0528: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement _0530: @@ -489,34 +489,34 @@ _05D7: .balign 4, 0 _063C: - MoveAction_014 3 - MoveAction_034 - MoveAction_075 - MoveAction_014 5 + WalkNormalWest 3 + WalkOnSpotNormalWest + EmoteExclamationMark + WalkNormalWest 5 EndMovement .balign 4, 0 _0650: - MoveAction_013 - MoveAction_014 3 - MoveAction_034 - MoveAction_075 - MoveAction_014 5 + WalkNormalSouth + WalkNormalWest 3 + WalkOnSpotNormalWest + EmoteExclamationMark + WalkNormalWest 5 EndMovement .balign 4, 0 _0668: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0670: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0678: - MoveAction_015 9 + WalkNormalEast 9 EndMovement _0680: @@ -702,26 +702,26 @@ _08EE: .balign 4, 0 _08F8: - MoveAction_015 - MoveAction_013 2 - MoveAction_015 8 + WalkNormalEast + WalkNormalSouth 2 + WalkNormalEast 8 EndMovement .balign 4, 0 _0908: - MoveAction_013 2 - MoveAction_015 9 + WalkNormalSouth 2 + WalkNormalEast 9 EndMovement .balign 4, 0 _0914: - MoveAction_063 - MoveAction_003 + Delay8 + FaceEast EndMovement .balign 4, 0 _0920: - MoveAction_063 - MoveAction_033 - MoveAction_035 + Delay8 + WalkOnSpotNormalSouth + WalkOnSpotNormalEast EndMovement diff --git a/res/field/scripts/scripts_survival_area.s b/res/field/scripts/scripts_survival_area.s index 5676939ad8..384d46ed12 100644 --- a/res/field/scripts/scripts_survival_area.s +++ b/res/field/scripts/scripts_survival_area.s @@ -107,13 +107,13 @@ _00D5: .balign 4, 0 _011C: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0124: - MoveAction_012 - MoveAction_069 + WalkNormalNorth + SetInvisible EndMovement _0130: diff --git a/res/field/scripts/scripts_team_galactic_eterna_building_1f.s b/res/field/scripts/scripts_team_galactic_eterna_building_1f.s index c5cf08de71..ad6939f618 100644 --- a/res/field/scripts/scripts_team_galactic_eterna_building_1f.s +++ b/res/field/scripts/scripts_team_galactic_eterna_building_1f.s @@ -88,28 +88,28 @@ _006A: .balign 4, 0 _00F0: - MoveAction_063 9 - MoveAction_035 + Delay8 9 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _00FC: - MoveAction_038 - MoveAction_075 - MoveAction_063 2 - MoveAction_014 2 + WalkOnSpotFastWest + EmoteExclamationMark + Delay8 2 + WalkNormalWest 2 EndMovement .balign 4, 0 _0110: - MoveAction_001 - MoveAction_061 - MoveAction_003 - MoveAction_062 - MoveAction_000 - MoveAction_062 - MoveAction_002 - MoveAction_061 + FaceSouth + Delay2 + FaceEast + Delay4 + FaceNorth + Delay4 + FaceWest + Delay2 EndMovement _0134: diff --git a/res/field/scripts/scripts_team_galactic_eterna_building_4f.s b/res/field/scripts/scripts_team_galactic_eterna_building_4f.s index f547deea99..abc479ae89 100644 --- a/res/field/scripts/scripts_team_galactic_eterna_building_4f.s +++ b/res/field/scripts/scripts_team_galactic_eterna_building_4f.s @@ -93,12 +93,12 @@ _0135: .balign 4, 0 _013C: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0144: - MoveAction_012 + WalkNormalNorth EndMovement .byte 63 @@ -120,20 +120,20 @@ _0144: .balign 4, 0 _015C: - MoveAction_012 3 - MoveAction_035 + WalkNormalNorth 3 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0168: - MoveAction_012 3 - MoveAction_034 + WalkNormalNorth 3 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0174: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .byte 34 diff --git a/res/field/scripts/scripts_trainers_school.s b/res/field/scripts/scripts_trainers_school.s index a42fee1bc4..f5e32ef62a 100644 --- a/res/field/scripts/scripts_trainers_school.s +++ b/res/field/scripts/scripts_trainers_school.s @@ -79,30 +79,30 @@ _00F2: .balign 4, 0 _0114: - MoveAction_019 - MoveAction_017 8 - MoveAction_037 + WalkFastEast + WalkFastSouth 8 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0124: - MoveAction_017 4 - MoveAction_019 - MoveAction_017 4 - MoveAction_037 + WalkFastSouth 4 + WalkFastEast + WalkFastSouth 4 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0138: - MoveAction_063 - MoveAction_035 - MoveAction_033 + Delay8 + WalkOnSpotNormalEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0148: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement _0154: diff --git a/res/field/scripts/scripts_twinleaf_town.s b/res/field/scripts/scripts_twinleaf_town.s index 14ca1181ec..a18a1c299c 100644 --- a/res/field/scripts/scripts_twinleaf_town.s +++ b/res/field/scripts/scripts_twinleaf_town.s @@ -193,197 +193,197 @@ _02EC: .balign 4, 0 _02F0: - MoveAction_062 6 - MoveAction_071 - MoveAction_013 - MoveAction_072 - MoveAction_036 + Delay4 6 + LockDir + WalkNormalSouth + UnlockDir + WalkOnSpotFastNorth EndMovement .balign 4, 0 _0308: - MoveAction_062 5 - MoveAction_071 - MoveAction_013 - MoveAction_072 - MoveAction_036 + Delay4 5 + LockDir + WalkNormalSouth + UnlockDir + WalkOnSpotFastNorth EndMovement .balign 4, 0 _0320: - MoveAction_062 6 - MoveAction_071 - MoveAction_013 - MoveAction_072 - MoveAction_036 + Delay4 6 + LockDir + WalkNormalSouth + UnlockDir + WalkOnSpotFastNorth EndMovement .balign 4, 0 _0338: - MoveAction_062 7 - MoveAction_071 - MoveAction_013 - MoveAction_072 - MoveAction_036 + Delay4 7 + LockDir + WalkNormalSouth + UnlockDir + WalkOnSpotFastNorth EndMovement .balign 4, 0 _0350: - MoveAction_062 8 - MoveAction_071 - MoveAction_013 - MoveAction_072 - MoveAction_036 + Delay4 8 + LockDir + WalkNormalSouth + UnlockDir + WalkOnSpotFastNorth EndMovement .balign 4, 0 _0368: - MoveAction_062 9 - MoveAction_071 - MoveAction_013 - MoveAction_072 - MoveAction_036 + Delay4 9 + LockDir + WalkNormalSouth + UnlockDir + WalkOnSpotFastNorth EndMovement .balign 4, 0 _0380: - MoveAction_062 10 - MoveAction_071 - MoveAction_013 - MoveAction_072 - MoveAction_036 + Delay4 10 + LockDir + WalkNormalSouth + UnlockDir + WalkOnSpotFastNorth EndMovement .balign 4, 0 _0398: - MoveAction_062 11 - MoveAction_071 - MoveAction_013 - MoveAction_072 - MoveAction_036 + Delay4 11 + LockDir + WalkNormalSouth + UnlockDir + WalkOnSpotFastNorth EndMovement .balign 4, 0 _03B0: - MoveAction_036 - MoveAction_075 - MoveAction_063 - MoveAction_062 + WalkOnSpotFastNorth + EmoteExclamationMark + Delay8 + Delay4 EndMovement .balign 4, 0 _03C4: - MoveAction_016 - MoveAction_019 - MoveAction_016 2 - MoveAction_018 - MoveAction_037 - MoveAction_013 + WalkFastNorth + WalkFastEast + WalkFastNorth 2 + WalkFastWest + WalkOnSpotFastSouth + WalkNormalSouth EndMovement .balign 4, 0 _03E0: - MoveAction_016 3 - MoveAction_019 - MoveAction_037 - MoveAction_013 + WalkFastNorth 3 + WalkFastEast + WalkOnSpotFastSouth + WalkNormalSouth EndMovement .balign 4, 0 _03F4: - MoveAction_016 3 - MoveAction_019 2 - MoveAction_037 - MoveAction_013 + WalkFastNorth 3 + WalkFastEast 2 + WalkOnSpotFastSouth + WalkNormalSouth EndMovement .balign 4, 0 _0408: - MoveAction_016 3 - MoveAction_019 3 - MoveAction_037 - MoveAction_013 + WalkFastNorth 3 + WalkFastEast 3 + WalkOnSpotFastSouth + WalkNormalSouth EndMovement .balign 4, 0 _041C: - MoveAction_016 3 - MoveAction_019 4 - MoveAction_037 - MoveAction_013 + WalkFastNorth 3 + WalkFastEast 4 + WalkOnSpotFastSouth + WalkNormalSouth EndMovement .balign 4, 0 _0430: - MoveAction_016 3 - MoveAction_019 5 - MoveAction_037 - MoveAction_013 + WalkFastNorth 3 + WalkFastEast 5 + WalkOnSpotFastSouth + WalkNormalSouth EndMovement .balign 4, 0 _0444: - MoveAction_016 3 - MoveAction_019 6 - MoveAction_037 - MoveAction_013 + WalkFastNorth 3 + WalkFastEast 6 + WalkOnSpotFastSouth + WalkNormalSouth EndMovement .balign 4, 0 _0458: - MoveAction_016 3 - MoveAction_019 7 - MoveAction_037 - MoveAction_013 + WalkFastNorth 3 + WalkFastEast 7 + WalkOnSpotFastSouth + WalkNormalSouth EndMovement .balign 4, 0 _046C: - MoveAction_015 - MoveAction_013 2 - MoveAction_014 + WalkNormalEast + WalkNormalSouth 2 + WalkNormalWest EndMovement .balign 4, 0 _047C: - MoveAction_014 - MoveAction_013 2 + WalkNormalWest + WalkNormalSouth 2 EndMovement .balign 4, 0 _0488: - MoveAction_014 2 - MoveAction_013 2 + WalkNormalWest 2 + WalkNormalSouth 2 EndMovement .balign 4, 0 _0494: - MoveAction_014 3 - MoveAction_013 2 + WalkNormalWest 3 + WalkNormalSouth 2 EndMovement .balign 4, 0 _04A0: - MoveAction_014 4 - MoveAction_013 2 + WalkNormalWest 4 + WalkNormalSouth 2 EndMovement .balign 4, 0 _04AC: - MoveAction_014 5 - MoveAction_013 2 + WalkNormalWest 5 + WalkNormalSouth 2 EndMovement .balign 4, 0 _04B8: - MoveAction_014 6 - MoveAction_013 2 + WalkNormalWest 6 + WalkNormalSouth 2 EndMovement .balign 4, 0 _04C4: - MoveAction_014 7 - MoveAction_013 2 + WalkNormalWest 7 + WalkNormalSouth 2 EndMovement _04D0: @@ -427,45 +427,45 @@ _04D0: .balign 4, 0 _0570: - MoveAction_063 - MoveAction_062 - MoveAction_035 - MoveAction_063 5 - MoveAction_032 + Delay8 + Delay4 + WalkOnSpotNormalEast + Delay8 5 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0588: - MoveAction_000 - MoveAction_071 - MoveAction_013 - MoveAction_072 + FaceNorth + LockDir + WalkNormalSouth + UnlockDir EndMovement .balign 4, 0 _059C: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _05A4: - MoveAction_017 - MoveAction_036 + WalkFastSouth + WalkOnSpotFastNorth EndMovement .balign 4, 0 _05B0: - MoveAction_019 4 - MoveAction_075 - MoveAction_063 - MoveAction_018 4 - MoveAction_037 + WalkFastEast 4 + EmoteExclamationMark + Delay8 + WalkFastWest 4 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _05C8: - MoveAction_012 - MoveAction_069 + WalkNormalNorth + SetInvisible EndMovement _05D4: diff --git a/res/field/scripts/scripts_twinleaf_town_player_house_1f.s b/res/field/scripts/scripts_twinleaf_town_player_house_1f.s index 6d466f706f..8f7e102cc2 100644 --- a/res/field/scripts/scripts_twinleaf_town_player_house_1f.s +++ b/res/field/scripts/scripts_twinleaf_town_player_house_1f.s @@ -50,26 +50,26 @@ _0064: .balign 4, 0 _00A4: - MoveAction_062 - MoveAction_033 + Delay4 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _00B0: - MoveAction_032 - MoveAction_075 - MoveAction_063 - MoveAction_012 - MoveAction_015 3 - MoveAction_012 3 + WalkOnSpotNormalNorth + EmoteExclamationMark + Delay8 + WalkNormalNorth + WalkNormalEast 3 + WalkNormalNorth 3 EndMovement .balign 4, 0 _00CC: - MoveAction_013 2 - MoveAction_014 3 - MoveAction_013 2 - MoveAction_032 + WalkNormalSouth 2 + WalkNormalWest 3 + WalkNormalSouth 2 + WalkOnSpotNormalNorth EndMovement _00E0: @@ -106,14 +106,14 @@ _0158: .balign 4, 0 _0164: - MoveAction_062 - MoveAction_033 + Delay4 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0170: - MoveAction_032 - MoveAction_075 + WalkOnSpotNormalNorth + EmoteExclamationMark EndMovement _017C: @@ -144,24 +144,24 @@ _017C: .balign 4, 0 _01D4: - MoveAction_014 - MoveAction_000 - MoveAction_063 2 - MoveAction_015 3 - MoveAction_013 2 - MoveAction_015 3 - MoveAction_013 2 - MoveAction_034 + WalkNormalWest + FaceNorth + Delay8 2 + WalkNormalEast 3 + WalkNormalSouth 2 + WalkNormalEast 3 + WalkNormalSouth 2 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _01F8: - MoveAction_063 4 - MoveAction_035 - MoveAction_063 4 - MoveAction_015 3 - MoveAction_013 2 - MoveAction_015 + Delay8 4 + WalkOnSpotNormalEast + Delay8 4 + WalkNormalEast 3 + WalkNormalSouth 2 + WalkNormalEast EndMovement _0214: @@ -605,12 +605,12 @@ _0792: .balign 4, 0 _079C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _07A4: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .byte 34 @@ -624,159 +624,159 @@ _07A4: .balign 4, 0 _07B4: - MoveAction_033 - MoveAction_075 + WalkOnSpotNormalSouth + EmoteExclamationMark EndMovement .balign 4, 0 _07C0: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _07C8: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _07D0: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _07D8: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _07E0: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _07E8: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _07F4: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _07FC: - MoveAction_012 - MoveAction_035 + WalkNormalNorth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0808: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0810: - MoveAction_012 2 - MoveAction_035 + WalkNormalNorth 2 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _081C: - MoveAction_015 2 - MoveAction_032 + WalkNormalEast 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0828: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0830: - MoveAction_013 - MoveAction_033 + WalkNormalSouth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _083C: - MoveAction_013 3 - MoveAction_033 + WalkNormalSouth 3 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0848: - MoveAction_014 2 - MoveAction_013 - MoveAction_033 + WalkNormalWest 2 + WalkNormalSouth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0858: - MoveAction_013 - MoveAction_033 + WalkNormalSouth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0864: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _086C: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0874: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _087C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0884: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _088C: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0894: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _089C: - MoveAction_063 2 - MoveAction_034 + Delay8 2 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _08A8: - MoveAction_063 2 - MoveAction_033 + Delay8 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _08B4: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _08BC: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _08C4: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .byte 63 @@ -794,7 +794,7 @@ _08C4: .balign 4, 0 _08D8: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement _08E0: @@ -820,8 +820,8 @@ _0904: .balign 4, 0 _0918: - MoveAction_063 2 - MoveAction_032 + Delay8 2 + WalkOnSpotNormalNorth EndMovement .byte 62 @@ -839,7 +839,7 @@ _0918: .balign 4, 0 _0930: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .byte 33 diff --git a/res/field/scripts/scripts_twinleaf_town_player_house_2f.s b/res/field/scripts/scripts_twinleaf_town_player_house_2f.s index 52df9320a4..37be4b6413 100644 --- a/res/field/scripts/scripts_twinleaf_town_player_house_2f.s +++ b/res/field/scripts/scripts_twinleaf_town_player_house_2f.s @@ -252,189 +252,189 @@ _037D: .balign 4, 0 _0394: - MoveAction_018 2 - MoveAction_075 - MoveAction_063 + WalkFastWest 2 + EmoteExclamationMark + Delay8 EndMovement .balign 4, 0 _03A4: - MoveAction_018 - MoveAction_017 - MoveAction_018 2 + WalkFastWest + WalkFastSouth + WalkFastWest 2 EndMovement .balign 4, 0 _03B4: - MoveAction_018 - MoveAction_017 2 - MoveAction_018 3 + WalkFastWest + WalkFastSouth 2 + WalkFastWest 3 EndMovement .balign 4, 0 _03C4: - MoveAction_017 2 - MoveAction_018 2 + WalkFastSouth 2 + WalkFastWest 2 EndMovement .balign 4, 0 _03D0: - MoveAction_018 - MoveAction_017 3 - MoveAction_018 2 + WalkFastWest + WalkFastSouth 3 + WalkFastWest 2 EndMovement .balign 4, 0 _03E0: - MoveAction_075 - MoveAction_063 + EmoteExclamationMark + Delay8 EndMovement .balign 4, 0 _03EC: - MoveAction_017 - MoveAction_018 4 - MoveAction_016 + WalkFastSouth + WalkFastWest 4 + WalkFastNorth EndMovement .balign 4, 0 _03FC: - MoveAction_016 - MoveAction_018 3 - MoveAction_036 + WalkFastNorth + WalkFastWest 3 + WalkOnSpotFastNorth EndMovement .balign 4, 0 _040C: - MoveAction_016 - MoveAction_018 5 - MoveAction_036 + WalkFastNorth + WalkFastWest 5 + WalkOnSpotFastNorth EndMovement .balign 4, 0 _041C: - MoveAction_016 - MoveAction_018 4 - MoveAction_016 + WalkFastNorth + WalkFastWest 4 + WalkFastNorth EndMovement .balign 4, 0 _042C: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0434: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _043C: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0444: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _044C: - MoveAction_019 2 + WalkFastEast 2 EndMovement .balign 4, 0 _0454: - MoveAction_019 - MoveAction_017 - MoveAction_039 + WalkFastEast + WalkFastSouth + WalkOnSpotFastEast EndMovement .balign 4, 0 _0464: - MoveAction_019 - MoveAction_017 - MoveAction_019 2 + WalkFastEast + WalkFastSouth + WalkFastEast 2 EndMovement .balign 4, 0 _0474: - MoveAction_019 - MoveAction_017 2 - MoveAction_019 + WalkFastEast + WalkFastSouth 2 + WalkFastEast EndMovement .balign 4, 0 _0484: - MoveAction_017 - MoveAction_019 3 - MoveAction_016 2 - MoveAction_019 4 + WalkFastSouth + WalkFastEast 3 + WalkFastNorth 2 + WalkFastEast 4 EndMovement .balign 4, 0 _0498: - MoveAction_016 - MoveAction_019 4 - MoveAction_016 - MoveAction_019 3 + WalkFastNorth + WalkFastEast 4 + WalkFastNorth + WalkFastEast 3 EndMovement .balign 4, 0 _04AC: - MoveAction_016 - MoveAction_019 2 - MoveAction_016 - MoveAction_019 3 + WalkFastNorth + WalkFastEast 2 + WalkFastNorth + WalkFastEast 3 EndMovement .balign 4, 0 _04C0: - MoveAction_016 - MoveAction_019 3 - MoveAction_016 2 - MoveAction_019 3 + WalkFastNorth + WalkFastEast 3 + WalkFastNorth 2 + WalkFastEast 3 EndMovement .balign 4, 0 _04D4: - MoveAction_063 - MoveAction_062 - MoveAction_035 + Delay8 + Delay4 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _04E4: - MoveAction_063 2 - MoveAction_035 + Delay8 2 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _04F0: - MoveAction_063 2 - MoveAction_038 + Delay8 2 + WalkOnSpotFastWest EndMovement .balign 4, 0 _04FC: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0508: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0514: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0520: - MoveAction_063 2 - MoveAction_035 + Delay8 2 + WalkOnSpotNormalEast EndMovement diff --git a/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s b/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s index f6796608a8..51a9373dd7 100644 --- a/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s +++ b/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s @@ -33,23 +33,23 @@ _000E: .balign 4, 0 _0060: - MoveAction_034 - MoveAction_075 + WalkOnSpotNormalWest + EmoteExclamationMark EndMovement .balign 4, 0 _006C: - MoveAction_018 4 - MoveAction_016 - MoveAction_018 3 - MoveAction_069 + WalkFastWest 4 + WalkFastNorth + WalkFastWest 3 + SetInvisible EndMovement .balign 4, 0 _0080: - MoveAction_063 2 - MoveAction_013 - MoveAction_032 + Delay8 2 + WalkNormalSouth + WalkOnSpotNormalNorth EndMovement _0090: diff --git a/res/field/scripts/scripts_underground.s b/res/field/scripts/scripts_underground.s index e4b2460249..a837e85f35 100644 --- a/res/field/scripts/scripts_underground.s +++ b/res/field/scripts/scripts_underground.s @@ -201,34 +201,34 @@ _0289: .balign 4, 0 _02D4: - MoveAction_034 - MoveAction_075 - MoveAction_063 + WalkOnSpotNormalWest + EmoteExclamationMark + Delay8 EndMovement .balign 4, 0 _02E4: - MoveAction_033 - MoveAction_063 2 + WalkOnSpotNormalSouth + Delay8 2 EndMovement .balign 4, 0 _02F0: - MoveAction_003 - MoveAction_061 - MoveAction_000 - MoveAction_061 - MoveAction_002 - MoveAction_061 - MoveAction_001 - MoveAction_061 - MoveAction_003 - MoveAction_060 - MoveAction_000 - MoveAction_060 - MoveAction_002 - MoveAction_060 - MoveAction_001 - MoveAction_067 - MoveAction_063 2 + FaceEast + Delay2 + FaceNorth + Delay2 + FaceWest + Delay2 + FaceSouth + Delay2 + FaceEast + Delay1 + FaceNorth + Delay1 + FaceWest + Delay1 + FaceSouth + WarpOut + Delay8 2 EndMovement diff --git a/res/field/scripts/scripts_unk_0212.s b/res/field/scripts/scripts_unk_0212.s index 62db956f79..206198b8e9 100644 --- a/res/field/scripts/scripts_unk_0212.s +++ b/res/field/scripts/scripts_unk_0212.s @@ -92,24 +92,24 @@ _0115: .balign 4, 0 _0120: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _0128: - MoveAction_013 2 + WalkNormalSouth 2 EndMovement .balign 4, 0 _0130: - MoveAction_014 - MoveAction_036 + WalkNormalWest + WalkOnSpotFastNorth EndMovement .balign 4, 0 _013C: - MoveAction_014 2 - MoveAction_036 + WalkNormalWest 2 + WalkOnSpotFastNorth EndMovement _0148: @@ -890,22 +890,22 @@ _0D98: .balign 4, 0 _0DA0: - MoveAction_015 2 - MoveAction_012 3 - MoveAction_034 + WalkNormalEast 2 + WalkNormalNorth 3 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0DB0: - MoveAction_015 2 - MoveAction_012 3 - MoveAction_034 + WalkNormalEast 2 + WalkNormalNorth 3 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0DC0: - MoveAction_015 - MoveAction_012 3 + WalkNormalEast + WalkNormalNorth 3 EndMovement .byte 62 @@ -963,58 +963,58 @@ _0DC0: .balign 4, 0 _0E00: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0E08: - MoveAction_063 2 - MoveAction_012 - MoveAction_015 + Delay8 2 + WalkNormalNorth + WalkNormalEast EndMovement .balign 4, 0 _0E18: - MoveAction_063 2 - MoveAction_012 - MoveAction_015 + Delay8 2 + WalkNormalNorth + WalkNormalEast EndMovement .balign 4, 0 _0E28: - MoveAction_063 2 - MoveAction_012 - MoveAction_035 + Delay8 2 + WalkNormalNorth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0E38: - MoveAction_063 2 - MoveAction_034 - MoveAction_063 - MoveAction_035 - MoveAction_063 - MoveAction_037 + Delay8 2 + WalkOnSpotNormalWest + Delay8 + WalkOnSpotNormalEast + Delay8 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0E54: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0E5C: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0E64: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0E6C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement _0E74: diff --git a/res/field/scripts/scripts_unk_0213.s b/res/field/scripts/scripts_unk_0213.s index da7409e366..7041d37f88 100644 --- a/res/field/scripts/scripts_unk_0213.s +++ b/res/field/scripts/scripts_unk_0213.s @@ -66,17 +66,17 @@ _008F: .balign 4, 0 _00F0: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _00F8: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _0100: - MoveAction_013 2 + WalkNormalSouth 2 EndMovement _0108: @@ -406,19 +406,19 @@ _051E: .balign 4, 0 _0524: - MoveAction_015 - MoveAction_012 2 + WalkNormalEast + WalkNormalNorth 2 EndMovement .balign 4, 0 _0530: - MoveAction_012 + WalkNormalNorth EndMovement .balign 4, 0 _0538: - MoveAction_012 - MoveAction_069 + WalkNormalNorth + SetInvisible EndMovement _0544: diff --git a/res/field/scripts/scripts_unk_0423.s b/res/field/scripts/scripts_unk_0423.s index b4c2be36e1..ae144f1eb7 100644 --- a/res/field/scripts/scripts_unk_0423.s +++ b/res/field/scripts/scripts_unk_0423.s @@ -60,12 +60,12 @@ _00C6: .balign 4, 0 _00D8: - MoveAction_032 - MoveAction_063 2 - MoveAction_012 4 - MoveAction_014 - MoveAction_000 - MoveAction_063 2 + WalkOnSpotNormalNorth + Delay8 2 + WalkNormalNorth 4 + WalkNormalWest + FaceNorth + Delay8 2 EndMovement _00F4: @@ -253,65 +253,65 @@ _035C: .balign 4, 0 _03B8: - MoveAction_015 - MoveAction_032 + WalkNormalEast + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _03C4: - MoveAction_012 2 + WalkNormalNorth 2 EndMovement .balign 4, 0 _03CC: - MoveAction_012 + WalkNormalNorth EndMovement .balign 4, 0 _03D4: - MoveAction_012 - MoveAction_069 + WalkNormalNorth + SetInvisible EndMovement .balign 4, 0 _03E0: - MoveAction_012 2 - MoveAction_069 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _03EC: - MoveAction_001 - MoveAction_070 - MoveAction_013 + FaceSouth + SetVisible + WalkNormalSouth EndMovement .balign 4, 0 _03FC: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _0404: - MoveAction_013 2 + WalkNormalSouth 2 EndMovement .balign 4, 0 _040C: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0414: - MoveAction_012 - MoveAction_015 - MoveAction_032 + WalkNormalNorth + WalkNormalEast + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0424: - MoveAction_012 - MoveAction_069 + WalkNormalNorth + SetInvisible EndMovement _0430: diff --git a/res/field/scripts/scripts_unk_0497.s b/res/field/scripts/scripts_unk_0497.s index ca95a1e686..326daa0187 100644 --- a/res/field/scripts/scripts_unk_0497.s +++ b/res/field/scripts/scripts_unk_0497.s @@ -374,36 +374,36 @@ _070C: .balign 4, 0 _0718: - MoveAction_015 3 - MoveAction_069 + WalkNormalEast 3 + SetInvisible EndMovement .balign 4, 0 _0724: - MoveAction_015 4 - MoveAction_069 + WalkNormalEast 4 + SetInvisible EndMovement .balign 4, 0 _0730: - MoveAction_014 3 - MoveAction_069 + WalkNormalWest 3 + SetInvisible EndMovement .balign 4, 0 _073C: - MoveAction_014 4 - MoveAction_069 + WalkNormalWest 4 + SetInvisible EndMovement .balign 4, 0 _0748: - MoveAction_070 - MoveAction_015 3 + SetVisible + WalkNormalEast 3 EndMovement .balign 4, 0 _0754: - MoveAction_070 - MoveAction_014 3 + SetVisible + WalkNormalWest 3 EndMovement diff --git a/res/field/scripts/scripts_unk_0501.s b/res/field/scripts/scripts_unk_0501.s index 622cb4e57f..59cc0de421 100644 --- a/res/field/scripts/scripts_unk_0501.s +++ b/res/field/scripts/scripts_unk_0501.s @@ -315,18 +315,18 @@ _045E: .balign 4, 0 _046C: - MoveAction_062 3 - MoveAction_002 - MoveAction_062 3 - MoveAction_003 - MoveAction_062 3 - MoveAction_000 - MoveAction_012 2 - MoveAction_069 - MoveAction_063 3 - MoveAction_001 - MoveAction_070 - MoveAction_013 2 + Delay4 3 + FaceWest + Delay4 3 + FaceEast + Delay4 3 + FaceNorth + WalkNormalNorth 2 + SetInvisible + Delay8 3 + FaceSouth + SetVisible + WalkNormalSouth 2 EndMovement _04A0: diff --git a/res/field/scripts/scripts_unk_1051.s b/res/field/scripts/scripts_unk_1051.s index 324d6895d0..e2bb9b2083 100644 --- a/res/field/scripts/scripts_unk_1051.s +++ b/res/field/scripts/scripts_unk_1051.s @@ -319,26 +319,26 @@ _046C: .balign 4, 0 _0474: - MoveAction_015 10 + WalkNormalEast 10 EndMovement .balign 4, 0 _047C: - MoveAction_012 - MoveAction_015 10 + WalkNormalNorth + WalkNormalEast 10 EndMovement .balign 4, 0 _0488: - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0494: - MoveAction_063 - MoveAction_032 - MoveAction_035 + Delay8 + WalkOnSpotNormalNorth + WalkOnSpotNormalEast EndMovement _04A4: diff --git a/res/field/scripts/scripts_unk_1114.s b/res/field/scripts/scripts_unk_1114.s index 3606399125..77b749571e 100644 --- a/res/field/scripts/scripts_unk_1114.s +++ b/res/field/scripts/scripts_unk_1114.s @@ -1046,7 +1046,7 @@ _1043: .balign 4, 0 _104C: - MoveAction_101 + RevealTrainer EndMovement _1054: diff --git a/res/field/scripts/scripts_valley_windworks_building.s b/res/field/scripts/scripts_valley_windworks_building.s index 5a6b4c69d3..6ab6a931cc 100644 --- a/res/field/scripts/scripts_valley_windworks_building.s +++ b/res/field/scripts/scripts_valley_windworks_building.s @@ -43,18 +43,18 @@ _005F: .balign 4, 0 _0090: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _0098: - MoveAction_018 9 + WalkFastWest 9 EndMovement .balign 4, 0 _00A0: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement _00AC: @@ -201,88 +201,88 @@ _02B9: .balign 4, 0 _02C0: - MoveAction_019 4 - MoveAction_016 - MoveAction_019 6 - MoveAction_036 + WalkFastEast 4 + WalkFastNorth + WalkFastEast 6 + WalkOnSpotFastNorth EndMovement .balign 4, 0 _02D4: - MoveAction_019 4 - MoveAction_016 2 - MoveAction_019 6 - MoveAction_037 + WalkFastEast 4 + WalkFastNorth 2 + WalkFastEast 6 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _02E8: - MoveAction_013 3 - MoveAction_014 + WalkNormalSouth 3 + WalkNormalWest EndMovement .balign 4, 0 _02F4: - MoveAction_013 4 - MoveAction_014 + WalkNormalSouth 4 + WalkNormalWest EndMovement .balign 4, 0 _0300: - MoveAction_063 6 - MoveAction_033 + Delay8 6 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _030C: - MoveAction_063 6 - MoveAction_032 + Delay8 6 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0318: - MoveAction_003 - MoveAction_063 2 - MoveAction_002 - MoveAction_063 2 - MoveAction_001 + FaceEast + Delay8 2 + FaceWest + Delay8 2 + FaceSouth EndMovement .balign 4, 0 _0330: - MoveAction_003 - MoveAction_063 2 - MoveAction_002 - MoveAction_063 2 - MoveAction_000 + FaceEast + Delay8 2 + FaceWest + Delay8 2 + FaceNorth EndMovement .balign 4, 0 _0348: - MoveAction_075 - MoveAction_012 - MoveAction_034 + EmoteExclamationMark + WalkNormalNorth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0358: - MoveAction_075 - MoveAction_034 + EmoteExclamationMark + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0364: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _036C: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0374: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement _037C: diff --git a/res/field/scripts/scripts_valley_windworks_outside.s b/res/field/scripts/scripts_valley_windworks_outside.s index 08855d837d..da1fbd8f9c 100644 --- a/res/field/scripts/scripts_valley_windworks_outside.s +++ b/res/field/scripts/scripts_valley_windworks_outside.s @@ -92,13 +92,13 @@ _0133: .balign 4, 0 _013C: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0144: - MoveAction_012 - MoveAction_069 + WalkNormalNorth + SetInvisible EndMovement _0150: @@ -197,62 +197,62 @@ _0201: .balign 4, 0 _02AC: - MoveAction_063 5 - MoveAction_062 - MoveAction_034 + Delay8 5 + Delay4 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _02BC: - MoveAction_013 - MoveAction_032 + WalkNormalSouth + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _02C8: - MoveAction_063 - MoveAction_034 - MoveAction_033 + Delay8 + WalkOnSpotNormalWest + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _02D8: - MoveAction_075 - MoveAction_063 - MoveAction_016 4 - MoveAction_039 + EmoteExclamationMark + Delay8 + WalkFastNorth 4 + WalkOnSpotFastEast EndMovement .balign 4, 0 _02EC: - MoveAction_063 - MoveAction_062 - MoveAction_015 - MoveAction_032 + Delay8 + Delay4 + WalkNormalEast + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0300: - MoveAction_012 - MoveAction_069 - MoveAction_001 + WalkNormalNorth + SetInvisible + FaceSouth EndMovement .balign 4, 0 _0310: - MoveAction_070 - MoveAction_017 + SetVisible + WalkFastSouth EndMovement .balign 4, 0 _031C: - MoveAction_037 + WalkOnSpotFastSouth EndMovement .balign 4, 0 _0324: - MoveAction_018 - MoveAction_017 - MoveAction_017 6 - MoveAction_018 9 + WalkFastWest + WalkFastSouth + WalkFastSouth 6 + WalkFastWest 9 EndMovement diff --git a/res/field/scripts/scripts_valor_cavern.s b/res/field/scripts/scripts_valor_cavern.s index c84a6e57f2..e7848f863c 100644 --- a/res/field/scripts/scripts_valor_cavern.s +++ b/res/field/scripts/scripts_valor_cavern.s @@ -97,7 +97,7 @@ ValorCavern_CommanderSaturn: .balign 4, 0 _013C: - MoveAction_075 + EmoteExclamationMark EndMovement ValorCavern_LostBattleCommanderSaturn: diff --git a/res/field/scripts/scripts_valor_lakefront.s b/res/field/scripts/scripts_valor_lakefront.s index cd787d526b..44c6031f86 100644 --- a/res/field/scripts/scripts_valor_lakefront.s +++ b/res/field/scripts/scripts_valor_lakefront.s @@ -126,55 +126,55 @@ _01D9: .balign 4, 0 _01E0: - MoveAction_035 - MoveAction_032 + WalkOnSpotNormalEast + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _01EC: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _01F4: - MoveAction_063 - MoveAction_035 - MoveAction_063 - MoveAction_032 + Delay8 + WalkOnSpotNormalEast + Delay8 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0208: - MoveAction_063 - MoveAction_032 + Delay8 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0214: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _021C: - MoveAction_019 - MoveAction_016 11 + WalkFastEast + WalkFastNorth 11 EndMovement .balign 4, 0 _0228: - MoveAction_016 10 + WalkFastNorth 10 EndMovement .balign 4, 0 _0230: - MoveAction_015 - MoveAction_008 9 + WalkNormalEast + WalkSlowNorth 9 EndMovement .balign 4, 0 _023C: - MoveAction_012 - MoveAction_008 9 + WalkNormalNorth + WalkSlowNorth 9 EndMovement _0248: @@ -367,58 +367,58 @@ _053A: .balign 4, 0 _055C: - MoveAction_016 10 - MoveAction_038 + WalkFastNorth 10 + WalkOnSpotFastWest EndMovement .balign 4, 0 _0568: - MoveAction_016 10 - MoveAction_039 + WalkFastNorth 10 + WalkOnSpotFastEast EndMovement .balign 4, 0 _0574: - MoveAction_036 + WalkOnSpotFastNorth EndMovement .balign 4, 0 _057C: - MoveAction_038 + WalkOnSpotFastWest EndMovement .balign 4, 0 _0584: - MoveAction_039 + WalkOnSpotFastEast EndMovement .balign 4, 0 _058C: - MoveAction_016 8 + WalkFastNorth 8 EndMovement .balign 4, 0 _0594: - MoveAction_013 4 - MoveAction_032 - MoveAction_063 2 - MoveAction_013 4 + WalkNormalSouth 4 + WalkOnSpotNormalNorth + Delay8 2 + WalkNormalSouth 4 EndMovement .balign 4, 0 _05A8: - MoveAction_063 - MoveAction_032 + Delay8 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _05B4: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _05BC: - MoveAction_012 9 + WalkNormalNorth 9 EndMovement .byte 63 @@ -436,20 +436,20 @@ _05BC: .balign 4, 0 _05D0: - MoveAction_063 4 - MoveAction_035 + Delay8 4 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _05DC: - MoveAction_063 4 - MoveAction_034 + Delay8 4 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _05E8: - MoveAction_063 2 - MoveAction_032 + Delay8 2 + WalkOnSpotNormalNorth EndMovement .byte 63 @@ -467,8 +467,8 @@ _05E8: .balign 4, 0 _0600: - MoveAction_063 - MoveAction_000 + Delay8 + FaceNorth EndMovement _060C: @@ -525,12 +525,12 @@ _065A: .balign 4, 0 _06A8: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _06B0: - MoveAction_012 + WalkNormalNorth EndMovement _06B8: @@ -598,54 +598,54 @@ _0799: .balign 4, 0 _07A8: - MoveAction_075 - MoveAction_065 + EmoteExclamationMark + Delay16 EndMovement .balign 4, 0 _07B4: - MoveAction_015 - MoveAction_013 + WalkNormalEast + WalkNormalSouth EndMovement .balign 4, 0 _07C0: - MoveAction_015 - MoveAction_013 2 + WalkNormalEast + WalkNormalSouth 2 EndMovement .balign 4, 0 _07CC: - MoveAction_015 - MoveAction_013 3 + WalkNormalEast + WalkNormalSouth 3 EndMovement .balign 4, 0 _07D8: - MoveAction_012 - MoveAction_001 + WalkNormalNorth + FaceSouth EndMovement .balign 4, 0 _07E4: - MoveAction_012 2 - MoveAction_001 + WalkNormalNorth 2 + FaceSouth EndMovement .balign 4, 0 _07F0: - MoveAction_012 3 - MoveAction_001 + WalkNormalNorth 3 + FaceSouth EndMovement .balign 4, 0 _07FC: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _0804: - MoveAction_071 - MoveAction_014 - MoveAction_072 + LockDir + WalkNormalWest + UnlockDir EndMovement diff --git a/res/field/scripts/scripts_veilstone_city.s b/res/field/scripts/scripts_veilstone_city.s index 5455707172..f94bbb980d 100644 --- a/res/field/scripts/scripts_veilstone_city.s +++ b/res/field/scripts/scripts_veilstone_city.s @@ -257,80 +257,80 @@ _042D: .balign 4, 0 _0444: - MoveAction_063 - MoveAction_033 - MoveAction_075 - MoveAction_063 + Delay8 + WalkOnSpotNormalSouth + EmoteExclamationMark + Delay8 EndMovement .balign 4, 0 _0458: - MoveAction_014 - MoveAction_013 + WalkNormalWest + WalkNormalSouth EndMovement .balign 4, 0 _0464: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _046C: - MoveAction_015 - MoveAction_013 + WalkNormalEast + WalkNormalSouth EndMovement .balign 4, 0 _0478: - MoveAction_015 2 - MoveAction_013 + WalkNormalEast 2 + WalkNormalSouth EndMovement .balign 4, 0 _0484: - MoveAction_036 + WalkOnSpotFastNorth EndMovement .balign 4, 0 _048C: - MoveAction_063 4 - MoveAction_035 + Delay8 4 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0498: - MoveAction_063 3 - MoveAction_035 + Delay8 3 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _04A4: - MoveAction_063 2 - MoveAction_035 + Delay8 2 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _04B0: - MoveAction_063 4 - MoveAction_034 + Delay8 4 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _04BC: - MoveAction_015 - MoveAction_013 9 + WalkNormalEast + WalkNormalSouth 9 EndMovement .balign 4, 0 _04C8: - MoveAction_014 - MoveAction_013 9 + WalkNormalWest + WalkNormalSouth 9 EndMovement .balign 4, 0 _04D4: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .byte 63 @@ -348,112 +348,112 @@ _04D4: .balign 4, 0 _04EC: - MoveAction_063 4 - MoveAction_062 - MoveAction_035 + Delay8 4 + Delay4 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _04FC: - MoveAction_063 3 - MoveAction_062 - MoveAction_035 + Delay8 3 + Delay4 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _050C: - MoveAction_063 2 - MoveAction_062 - MoveAction_035 + Delay8 2 + Delay4 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _051C: - MoveAction_063 4 - MoveAction_062 - MoveAction_034 + Delay8 4 + Delay4 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _052C: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0534: - MoveAction_063 2 - MoveAction_035 - MoveAction_033 + Delay8 2 + WalkOnSpotNormalEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0544: - MoveAction_063 2 - MoveAction_034 - MoveAction_033 + Delay8 2 + WalkOnSpotNormalWest + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0554: - MoveAction_063 - MoveAction_062 - MoveAction_033 + Delay8 + Delay4 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0564: - MoveAction_013 + WalkNormalSouth EndMovement .balign 4, 0 _056C: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _0574: - MoveAction_013 4 - MoveAction_014 2 + WalkNormalSouth 4 + WalkNormalWest 2 EndMovement .balign 4, 0 _0580: - MoveAction_013 4 - MoveAction_014 + WalkNormalSouth 4 + WalkNormalWest EndMovement .balign 4, 0 _058C: - MoveAction_013 4 - MoveAction_034 + WalkNormalSouth 4 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0598: - MoveAction_013 - MoveAction_014 - MoveAction_013 3 - MoveAction_035 + WalkNormalSouth + WalkNormalWest + WalkNormalSouth 3 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _05AC: - MoveAction_013 8 + WalkNormalSouth 8 EndMovement .balign 4, 0 _05B4: - MoveAction_013 8 + WalkNormalSouth 8 EndMovement .balign 4, 0 _05BC: - MoveAction_013 8 + WalkNormalSouth 8 EndMovement .balign 4, 0 _05C4: - MoveAction_013 8 + WalkNormalSouth 8 EndMovement _05CC: @@ -766,51 +766,51 @@ _0A73: .balign 4, 0 _0A7C: - MoveAction_016 10 - MoveAction_019 3 + WalkFastNorth 10 + WalkFastEast 3 EndMovement .balign 4, 0 _0A88: - MoveAction_063 2 - MoveAction_034 + Delay8 2 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0A94: - MoveAction_015 - MoveAction_032 + WalkNormalEast + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0AA0: - MoveAction_015 - MoveAction_033 + WalkNormalEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0AAC: - MoveAction_015 5 - MoveAction_012 4 - MoveAction_069 + WalkNormalEast 5 + WalkNormalNorth 4 + SetInvisible EndMovement .balign 4, 0 _0ABC: - MoveAction_013 - MoveAction_035 + WalkNormalSouth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0AC8: - MoveAction_013 - MoveAction_035 + WalkNormalSouth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0AD4: - MoveAction_012 - MoveAction_035 + WalkNormalNorth + WalkOnSpotNormalEast EndMovement .byte 62 @@ -892,39 +892,39 @@ _0AD4: .balign 4, 0 _0B2C: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0B34: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0B3C: - MoveAction_038 + WalkOnSpotFastWest EndMovement .balign 4, 0 _0B44: - MoveAction_014 3 - MoveAction_013 10 + WalkNormalWest 3 + WalkNormalSouth 10 EndMovement .balign 4, 0 _0B50: - MoveAction_012 - MoveAction_015 + WalkNormalNorth + WalkNormalEast EndMovement .balign 4, 0 _0B5C: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0B64: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .byte 63 @@ -962,17 +962,17 @@ _0B64: .balign 4, 0 _0B8C: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0B94: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0B9C: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .byte 63 @@ -990,49 +990,49 @@ _0B9C: .balign 4, 0 _0BB0: - MoveAction_063 - MoveAction_001 + Delay8 + FaceSouth EndMovement .balign 4, 0 _0BBC: - MoveAction_063 - MoveAction_000 + Delay8 + FaceNorth EndMovement .balign 4, 0 _0BC8: - MoveAction_013 - MoveAction_015 5 - MoveAction_012 5 - MoveAction_069 + WalkNormalSouth + WalkNormalEast 5 + WalkNormalNorth 5 + SetInvisible EndMovement .balign 4, 0 _0BDC: - MoveAction_012 - MoveAction_015 5 - MoveAction_012 5 - MoveAction_069 + WalkNormalNorth + WalkNormalEast 5 + WalkNormalNorth 5 + SetInvisible EndMovement .balign 4, 0 _0BF0: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0BF8: - MoveAction_019 4 - MoveAction_016 4 - MoveAction_036 + WalkFastEast 4 + WalkFastNorth 4 + WalkOnSpotFastNorth EndMovement .balign 4, 0 _0C08: - MoveAction_019 4 - MoveAction_016 6 - MoveAction_036 + WalkFastEast 4 + WalkFastNorth 6 + WalkOnSpotFastNorth EndMovement _0C18: @@ -1146,27 +1146,27 @@ _0CF7: .balign 4, 0 _0D28: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0D30: - MoveAction_033 - MoveAction_075 + WalkOnSpotNormalSouth + EmoteExclamationMark EndMovement .balign 4, 0 _0D3C: - MoveAction_017 - MoveAction_034 - MoveAction_063 2 - MoveAction_012 - MoveAction_034 + WalkFastSouth + WalkOnSpotNormalWest + Delay8 2 + WalkNormalNorth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0D54: - MoveAction_014 + WalkNormalWest EndMovement _0D5C: @@ -1300,69 +1300,69 @@ _0F0B: .balign 4, 0 _0F1C: - MoveAction_075 + EmoteExclamationMark EndMovement .balign 4, 0 _0F24: - MoveAction_019 - MoveAction_017 2 - MoveAction_019 - MoveAction_017 9 + WalkFastEast + WalkFastSouth 2 + WalkFastEast + WalkFastSouth 9 EndMovement .balign 4, 0 _0F38: - MoveAction_017 2 - MoveAction_019 2 - MoveAction_017 9 + WalkFastSouth 2 + WalkFastEast 2 + WalkFastSouth 9 EndMovement .balign 4, 0 _0F48: - MoveAction_063 - MoveAction_035 - MoveAction_033 + Delay8 + WalkOnSpotNormalEast + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0F58: - MoveAction_063 2 - MoveAction_033 + Delay8 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0F64: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0F70: - MoveAction_012 6 - MoveAction_014 2 - MoveAction_012 2 + WalkNormalNorth 6 + WalkNormalWest 2 + WalkNormalNorth 2 EndMovement .balign 4, 0 _0F80: - MoveAction_012 6 - MoveAction_014 2 - MoveAction_032 + WalkNormalNorth 6 + WalkNormalWest 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0F90: - MoveAction_012 6 - MoveAction_014 3 - MoveAction_012 + WalkNormalNorth 6 + WalkNormalWest 3 + WalkNormalNorth EndMovement .balign 4, 0 _0FA0: - MoveAction_012 6 - MoveAction_014 - MoveAction_012 + WalkNormalNorth 6 + WalkNormalWest + WalkNormalNorth EndMovement _0FB0: @@ -1383,9 +1383,9 @@ _0FB0: .balign 4, 0 _0FE0: - MoveAction_063 - MoveAction_075 - MoveAction_063 + Delay8 + EmoteExclamationMark + Delay8 EndMovement _0FF0: @@ -1523,15 +1523,15 @@ _11DE: .balign 4, 0 _11E8: - MoveAction_032 - MoveAction_075 - MoveAction_015 2 - MoveAction_012 + WalkOnSpotNormalNorth + EmoteExclamationMark + WalkNormalEast 2 + WalkNormalNorth EndMovement .balign 4, 0 _11FC: - MoveAction_013 9 + WalkNormalSouth 9 EndMovement _1204: diff --git a/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s b/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s index 33cf639dc0..40567f00fd 100644 --- a/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s +++ b/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s @@ -63,12 +63,12 @@ _00C2: .balign 4, 0 _00C8: - MoveAction_018 + WalkFastWest EndMovement .balign 4, 0 _00D0: - MoveAction_019 + WalkFastEast EndMovement _00D8: @@ -96,39 +96,39 @@ _00D8: .balign 4, 0 _012C: - MoveAction_012 2 + WalkNormalNorth 2 EndMovement .balign 4, 0 _0134: - MoveAction_013 2 - MoveAction_034 - MoveAction_063 2 - MoveAction_035 - MoveAction_063 2 - MoveAction_015 5 - MoveAction_032 - MoveAction_075 - MoveAction_034 + WalkNormalSouth 2 + WalkOnSpotNormalWest + Delay8 2 + WalkOnSpotNormalEast + Delay8 2 + WalkNormalEast 5 + WalkOnSpotNormalNorth + EmoteExclamationMark + WalkOnSpotNormalWest EndMovement .balign 4, 0 _015C: - MoveAction_014 5 - MoveAction_033 + WalkNormalWest 5 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0168: - MoveAction_063 9 - MoveAction_035 + Delay8 9 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0174: - MoveAction_063 4 - MoveAction_061 - MoveAction_032 + Delay8 4 + Delay2 + WalkOnSpotNormalNorth EndMovement _0184: @@ -213,65 +213,65 @@ _02AE: .balign 4, 0 _02C4: - MoveAction_063 4 - MoveAction_035 + Delay8 4 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _02D0: - MoveAction_063 3 - MoveAction_034 + Delay8 3 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _02DC: - MoveAction_063 - MoveAction_032 + Delay8 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _02E8: - MoveAction_012 2 - MoveAction_015 - MoveAction_012 - MoveAction_034 + WalkNormalNorth 2 + WalkNormalEast + WalkNormalNorth + WalkOnSpotNormalWest EndMovement .balign 4, 0 _02FC: - MoveAction_012 3 - MoveAction_035 + WalkNormalNorth 3 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0308: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0310: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0318: - MoveAction_034 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0320: - MoveAction_012 5 - MoveAction_038 - MoveAction_039 - MoveAction_063 2 - MoveAction_019 6 + WalkNormalNorth 5 + WalkOnSpotFastWest + WalkOnSpotFastEast + Delay8 2 + WalkFastEast 6 EndMovement .balign 4, 0 _0338: - MoveAction_012 5 - MoveAction_038 - MoveAction_039 - MoveAction_063 2 - MoveAction_019 7 + WalkNormalNorth 5 + WalkOnSpotFastWest + WalkOnSpotFastEast + Delay8 2 + WalkFastEast 7 EndMovement diff --git a/res/field/scripts/scripts_veilstone_city_southeast_house.s b/res/field/scripts/scripts_veilstone_city_southeast_house.s index d331990829..c2854efb10 100644 --- a/res/field/scripts/scripts_veilstone_city_southeast_house.s +++ b/res/field/scripts/scripts_veilstone_city_southeast_house.s @@ -75,50 +75,50 @@ _00EF: .balign 4, 0 _00FC: - MoveAction_000 - MoveAction_061 - MoveAction_003 - MoveAction_061 - MoveAction_001 - MoveAction_061 - MoveAction_002 - MoveAction_061 + FaceNorth + Delay2 + FaceEast + Delay2 + FaceSouth + Delay2 + FaceWest + Delay2 EndMovement .balign 4, 0 _0120: - MoveAction_003 - MoveAction_061 - MoveAction_001 - MoveAction_061 - MoveAction_002 - MoveAction_061 - MoveAction_000 - MoveAction_061 + FaceEast + Delay2 + FaceSouth + Delay2 + FaceWest + Delay2 + FaceNorth + Delay2 EndMovement .balign 4, 0 _0144: - MoveAction_001 - MoveAction_061 - MoveAction_002 - MoveAction_061 - MoveAction_000 - MoveAction_061 - MoveAction_003 - MoveAction_061 + FaceSouth + Delay2 + FaceWest + Delay2 + FaceNorth + Delay2 + FaceEast + Delay2 EndMovement .balign 4, 0 _0168: - MoveAction_002 - MoveAction_061 - MoveAction_000 - MoveAction_061 - MoveAction_003 - MoveAction_061 - MoveAction_001 - MoveAction_061 + FaceWest + Delay2 + FaceNorth + Delay2 + FaceEast + Delay2 + FaceSouth + Delay2 EndMovement _018C: diff --git a/res/field/scripts/scripts_veilstone_store_elevator.s b/res/field/scripts/scripts_veilstone_store_elevator.s index 076e83a511..6c3ccd8c57 100644 --- a/res/field/scripts/scripts_veilstone_store_elevator.s +++ b/res/field/scripts/scripts_veilstone_store_elevator.s @@ -217,5 +217,5 @@ _03F6: .balign 4, 0 _0410: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement diff --git a/res/field/scripts/scripts_verity_cavern.s b/res/field/scripts/scripts_verity_cavern.s index a6bd3993ed..3b5abee0ad 100644 --- a/res/field/scripts/scripts_verity_cavern.s +++ b/res/field/scripts/scripts_verity_cavern.s @@ -112,22 +112,22 @@ VerityCavern_ResetRoamingMespritState: .balign 4, 0 _0190: - MoveAction_012 7 + WalkNormalNorth 7 EndMovement .balign 4, 0 _0198: - MoveAction_033 - MoveAction_063 2 - MoveAction_032 + WalkOnSpotNormalSouth + Delay8 2 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _01A8: - MoveAction_013 9 + WalkNormalSouth 9 EndMovement .balign 4, 0 _01B0: - MoveAction_001 + FaceSouth EndMovement diff --git a/res/field/scripts/scripts_verity_lakefront.s b/res/field/scripts/scripts_verity_lakefront.s index 5f4a3f6a3b..59f2e3fc33 100644 --- a/res/field/scripts/scripts_verity_lakefront.s +++ b/res/field/scripts/scripts_verity_lakefront.s @@ -65,24 +65,24 @@ _00F0: .balign 4, 0 _0124: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _012C: - MoveAction_012 2 - MoveAction_069 + WalkNormalNorth 2 + SetInvisible EndMovement .balign 4, 0 _0138: - MoveAction_012 - MoveAction_069 + WalkNormalNorth + SetInvisible EndMovement .balign 4, 0 _0144: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement _014C: diff --git a/res/field/scripts/scripts_victory_road_1f_room_2.s b/res/field/scripts/scripts_victory_road_1f_room_2.s index 4332a16f7a..09d9d1eca8 100644 --- a/res/field/scripts/scripts_victory_road_1f_room_2.s +++ b/res/field/scripts/scripts_victory_road_1f_room_2.s @@ -90,43 +90,43 @@ _0139: .balign 4, 0 _0140: - MoveAction_034 - MoveAction_075 + WalkOnSpotNormalWest + EmoteExclamationMark EndMovement .balign 4, 0 _014C: - MoveAction_012 3 - MoveAction_014 + WalkNormalNorth 3 + WalkNormalWest EndMovement .balign 4, 0 _0158: - MoveAction_012 2 - MoveAction_014 + WalkNormalNorth 2 + WalkNormalWest EndMovement .balign 4, 0 _0164: - MoveAction_012 - MoveAction_014 + WalkNormalNorth + WalkNormalWest EndMovement .balign 4, 0 _0170: - MoveAction_014 + WalkNormalWest EndMovement .balign 4, 0 _0178: - MoveAction_013 - MoveAction_014 + WalkNormalSouth + WalkNormalWest EndMovement .balign 4, 0 _0184: - MoveAction_013 2 - MoveAction_014 + WalkNormalSouth 2 + WalkNormalWest EndMovement _0190: @@ -184,7 +184,7 @@ _026D: .balign 4, 0 _0274: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .byte 12 @@ -198,47 +198,47 @@ _0274: .balign 4, 0 _0284: - MoveAction_015 2 - MoveAction_013 3 - MoveAction_035 + WalkNormalEast 2 + WalkNormalSouth 3 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0294: - MoveAction_015 2 - MoveAction_013 2 - MoveAction_035 + WalkNormalEast 2 + WalkNormalSouth 2 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _02A4: - MoveAction_015 2 - MoveAction_013 - MoveAction_035 + WalkNormalEast 2 + WalkNormalSouth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _02B4: - MoveAction_015 2 + WalkNormalEast 2 EndMovement .balign 4, 0 _02BC: - MoveAction_015 2 - MoveAction_012 - MoveAction_035 + WalkNormalEast 2 + WalkNormalNorth + WalkOnSpotNormalEast EndMovement .balign 4, 0 _02CC: - MoveAction_015 2 - MoveAction_012 2 - MoveAction_035 + WalkNormalEast 2 + WalkNormalNorth 2 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _02DC: - MoveAction_002 + FaceWest EndMovement _02E4: @@ -290,58 +290,58 @@ _03A1: .balign 4, 0 _03B4: - MoveAction_063 - MoveAction_033 + Delay8 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _03C0: - MoveAction_063 - MoveAction_035 - MoveAction_032 + Delay8 + WalkOnSpotNormalEast + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _03D0: - MoveAction_063 - MoveAction_034 - MoveAction_032 + Delay8 + WalkOnSpotNormalWest + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _03E0: - MoveAction_032 - MoveAction_075 + WalkOnSpotNormalNorth + EmoteExclamationMark EndMovement .balign 4, 0 _03EC: - MoveAction_015 - MoveAction_012 7 - MoveAction_015 4 - MoveAction_035 + WalkNormalEast + WalkNormalNorth 7 + WalkNormalEast 4 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0400: - MoveAction_015 - MoveAction_012 7 - MoveAction_015 3 - MoveAction_035 + WalkNormalEast + WalkNormalNorth 7 + WalkNormalEast 3 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0414: - MoveAction_015 - MoveAction_012 7 - MoveAction_015 2 - MoveAction_035 + WalkNormalEast + WalkNormalNorth 7 + WalkNormalEast 2 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0428: - MoveAction_014 - MoveAction_012 7 - MoveAction_015 3 - MoveAction_035 + WalkNormalWest + WalkNormalNorth 7 + WalkNormalEast 3 + WalkOnSpotNormalEast EndMovement diff --git a/res/field/scripts/scripts_villa.s b/res/field/scripts/scripts_villa.s index 6a3a3100df..1311eb105a 100644 --- a/res/field/scripts/scripts_villa.s +++ b/res/field/scripts/scripts_villa.s @@ -660,13 +660,13 @@ _0917: .balign 4, 0 _0930: - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _093C: - MoveAction_034 + WalkOnSpotNormalWest EndMovement _0944: @@ -781,13 +781,13 @@ _0AC8: .balign 4, 0 _0AD8: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0AE0: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement _0AEC: @@ -815,16 +815,16 @@ _0AF4: .balign 4, 0 _0B3C: - MoveAction_033 - MoveAction_063 5 - MoveAction_034 + WalkOnSpotNormalSouth + Delay8 5 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _0B4C: - MoveAction_014 2 - MoveAction_012 5 - MoveAction_014 3 + WalkNormalWest 2 + WalkNormalNorth 5 + WalkNormalWest 3 EndMovement _0B5C: @@ -846,14 +846,14 @@ _0B5C: .balign 4, 0 _0BA4: - MoveAction_015 8 + WalkNormalEast 8 EndMovement .balign 4, 0 _0BAC: - MoveAction_033 - MoveAction_063 3 - MoveAction_035 + WalkOnSpotNormalSouth + Delay8 3 + WalkOnSpotNormalEast EndMovement _0BBC: @@ -875,16 +875,16 @@ _0BBC: .balign 4, 0 _0C04: - MoveAction_014 2 - MoveAction_012 3 - MoveAction_014 2 + WalkNormalWest 2 + WalkNormalNorth 3 + WalkNormalWest 2 EndMovement .balign 4, 0 _0C14: - MoveAction_033 - MoveAction_063 4 - MoveAction_034 + WalkOnSpotNormalSouth + Delay8 4 + WalkOnSpotNormalWest EndMovement _0C24: @@ -906,15 +906,15 @@ _0C24: .balign 4, 0 _0C6C: - MoveAction_014 8 - MoveAction_012 6 + WalkNormalWest 8 + WalkNormalNorth 6 EndMovement .balign 4, 0 _0C78: - MoveAction_033 - MoveAction_063 5 - MoveAction_034 + WalkOnSpotNormalSouth + Delay8 5 + WalkOnSpotNormalWest EndMovement _0C88: @@ -1433,20 +1433,20 @@ _1436: .balign 4, 0 _1454: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _145C: - MoveAction_014 - MoveAction_012 3 + WalkNormalWest + WalkNormalNorth 3 EndMovement .balign 4, 0 _1468: - MoveAction_013 3 - MoveAction_015 - MoveAction_033 + WalkNormalSouth 3 + WalkNormalEast + WalkOnSpotNormalSouth EndMovement _1478: @@ -1482,13 +1482,13 @@ _1485: .balign 4, 0 _14F0: - MoveAction_063 - MoveAction_034 + Delay8 + WalkOnSpotNormalWest EndMovement .balign 4, 0 _14FC: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .byte 13 @@ -1561,12 +1561,12 @@ _15F3: .balign 4, 0 _1614: - MoveAction_033 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _161C: - MoveAction_012 + WalkNormalNorth EndMovement _1624: diff --git a/res/field/scripts/scripts_vista_lighthouse.s b/res/field/scripts/scripts_vista_lighthouse.s index b8a0bbb878..a372d4c83d 100644 --- a/res/field/scripts/scripts_vista_lighthouse.s +++ b/res/field/scripts/scripts_vista_lighthouse.s @@ -87,37 +87,37 @@ _00D2: .balign 4, 0 _0104: - MoveAction_015 3 - MoveAction_013 6 - MoveAction_014 3 - MoveAction_032 + WalkNormalEast 3 + WalkNormalSouth 6 + WalkNormalWest 3 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0118: - MoveAction_013 - MoveAction_015 3 - MoveAction_013 5 - MoveAction_014 3 - MoveAction_032 + WalkNormalSouth + WalkNormalEast 3 + WalkNormalSouth 5 + WalkNormalWest 3 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _0130: - MoveAction_012 - MoveAction_069 + WalkNormalNorth + SetInvisible EndMovement .balign 4, 0 _013C: - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0148: - MoveAction_063 - MoveAction_033 - MoveAction_063 - MoveAction_035 + Delay8 + WalkOnSpotNormalSouth + Delay8 + WalkOnSpotNormalEast EndMovement diff --git a/res/field/scripts/scripts_vista_lighthouse_elevator.s b/res/field/scripts/scripts_vista_lighthouse_elevator.s index 8a5f002cdf..c12724a02b 100644 --- a/res/field/scripts/scripts_vista_lighthouse_elevator.s +++ b/res/field/scripts/scripts_vista_lighthouse_elevator.s @@ -45,12 +45,12 @@ _009C: .balign 4, 0 _00B8: - MoveAction_012 2 - MoveAction_033 + WalkNormalNorth 2 + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _00C4: - MoveAction_013 2 - MoveAction_033 + WalkNormalSouth 2 + WalkOnSpotNormalSouth EndMovement diff --git a/res/field/scripts/scripts_wayward_cave_1f.s b/res/field/scripts/scripts_wayward_cave_1f.s index b4ffb183e6..ed91dcae0f 100644 --- a/res/field/scripts/scripts_wayward_cave_1f.s +++ b/res/field/scripts/scripts_wayward_cave_1f.s @@ -128,24 +128,24 @@ _0182: .balign 4, 0 _0194: - MoveAction_035 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _019C: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement .balign 4, 0 _01A4: - MoveAction_012 - MoveAction_033 + WalkNormalNorth + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _01B0: - MoveAction_015 - MoveAction_034 + WalkNormalEast + WalkOnSpotNormalWest EndMovement .byte 63 @@ -179,26 +179,26 @@ _01B0: .balign 4, 0 _01D8: - MoveAction_034 - MoveAction_075 + WalkOnSpotNormalWest + EmoteExclamationMark EndMovement .balign 4, 0 _01E4: - MoveAction_033 - MoveAction_075 + WalkOnSpotNormalSouth + EmoteExclamationMark EndMovement .balign 4, 0 _01F0: - MoveAction_063 3 - MoveAction_014 - MoveAction_033 + Delay8 3 + WalkNormalWest + WalkOnSpotNormalSouth EndMovement .balign 4, 0 _0200: - MoveAction_063 3 - MoveAction_013 - MoveAction_033 + Delay8 3 + WalkNormalSouth + WalkOnSpotNormalSouth EndMovement diff --git a/res/field/scripts/scripts_wifi_plaza_entrance.s b/res/field/scripts/scripts_wifi_plaza_entrance.s index c71bcff75a..20edb61b3e 100644 --- a/res/field/scripts/scripts_wifi_plaza_entrance.s +++ b/res/field/scripts/scripts_wifi_plaza_entrance.s @@ -79,103 +79,103 @@ _00D9: .balign 4, 0 _0148: - MoveAction_012 7 - MoveAction_014 11 + WalkNormalNorth 7 + WalkNormalWest 11 EndMovement .balign 4, 0 _0154: - MoveAction_012 7 - MoveAction_014 9 + WalkNormalNorth 7 + WalkNormalWest 9 EndMovement .balign 4, 0 _0160: - MoveAction_012 7 - MoveAction_014 7 + WalkNormalNorth 7 + WalkNormalWest 7 EndMovement .balign 4, 0 _016C: - MoveAction_012 7 - MoveAction_014 5 + WalkNormalNorth 7 + WalkNormalWest 5 EndMovement .balign 4, 0 _0178: - MoveAction_012 7 - MoveAction_014 3 + WalkNormalNorth 7 + WalkNormalWest 3 EndMovement .balign 4, 0 _0184: - MoveAction_012 - MoveAction_002 - MoveAction_061 - MoveAction_001 - MoveAction_061 - MoveAction_003 - MoveAction_061 - MoveAction_000 - MoveAction_061 - MoveAction_002 - MoveAction_061 - MoveAction_001 - MoveAction_061 - MoveAction_003 - MoveAction_061 - MoveAction_000 - MoveAction_061 - MoveAction_002 - MoveAction_061 - MoveAction_001 - MoveAction_061 - MoveAction_003 - MoveAction_061 - MoveAction_000 + WalkNormalNorth + FaceWest + Delay2 + FaceSouth + Delay2 + FaceEast + Delay2 + FaceNorth + Delay2 + FaceWest + Delay2 + FaceSouth + Delay2 + FaceEast + Delay2 + FaceNorth + Delay2 + FaceWest + Delay2 + FaceSouth + Delay2 + FaceEast + Delay2 + FaceNorth EndMovement .balign 4, 0 _01E8: - MoveAction_067 + WarpOut EndMovement .balign 4, 0 _01F0: - MoveAction_012 6 - MoveAction_014 12 - MoveAction_035 + WalkNormalNorth 6 + WalkNormalWest 12 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0200: - MoveAction_012 6 - MoveAction_014 10 - MoveAction_035 + WalkNormalNorth 6 + WalkNormalWest 10 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0210: - MoveAction_012 6 - MoveAction_014 8 - MoveAction_035 + WalkNormalNorth 6 + WalkNormalWest 8 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0220: - MoveAction_012 6 - MoveAction_014 6 - MoveAction_035 + WalkNormalNorth 6 + WalkNormalWest 6 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0230: - MoveAction_012 6 - MoveAction_014 4 - MoveAction_035 + WalkNormalNorth 6 + WalkNormalWest 4 + WalkOnSpotNormalEast EndMovement .balign 4, 0 _0240: - MoveAction_032 + WalkOnSpotNormalNorth EndMovement