From 9ee714be0b97564760dac13cfaba38932754c2a2 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Fri, 13 Dec 2024 22:03:08 +0800 Subject: [PATCH 1/2] Rename movement action constants --- asm/macros/movement.inc | 596 +++++++++--------- consts/movement.json | 309 ++++----- res/field/scripts/scripts_acuity_lakefront.s | 10 +- res/field/scripts/scripts_amity_square.s | 118 ++-- res/field/scripts/scripts_battle_arcade.s | 48 +- res/field/scripts/scripts_battle_castle.s | 44 +- res/field/scripts/scripts_battle_factory.s | 64 +- res/field/scripts/scripts_battle_frontier.s | 8 +- ...ripts_battle_frontier_gate_to_fight_area.s | 4 +- res/field/scripts/scripts_battle_hall.s | 60 +- res/field/scripts/scripts_battle_park.s | 42 +- res/field/scripts/scripts_battle_tower.s | 16 +- .../scripts_battle_tower_battle_room.s | 34 +- .../scripts_battle_tower_battle_salon.s | 90 +-- .../scripts/scripts_battle_tower_corridor.s | 60 +- .../scripts_battle_tower_corridor_multi.s | 40 +- .../scripts/scripts_battle_tower_elevator.s | 18 +- .../scripts_battle_tower_multi_battle_room.s | 48 +- res/field/scripts/scripts_battleground.s | 44 +- res/field/scripts/scripts_canalave_city.s | 76 +-- .../scripts_canalave_city_harbor_inn.s | 20 +- ...ipts_canalave_city_sailor_eldritch_house.s | 16 +- .../scripts/scripts_canalave_library_1f.s | 24 +- .../scripts/scripts_canalave_library_2f.s | 28 +- .../scripts/scripts_canalave_library_3f.s | 102 +-- res/field/scripts/scripts_celestic_town.s | 56 +- .../scripts/scripts_celestic_town_cave.s | 214 +++---- .../scripts/scripts_contest_hall_lobby.s | 84 +-- .../scripts/scripts_distortion_world_1f.s | 50 +- .../scripts/scripts_distortion_world_b1f.s | 44 +- .../scripts/scripts_distortion_world_b2f.s | 6 +- .../scripts/scripts_distortion_world_b3f.s | 4 +- .../scripts/scripts_distortion_world_b6f.s | 18 +- .../scripts/scripts_distortion_world_b7f.s | 104 +-- .../scripts_distortion_world_giratina_room.s | 22 +- res/field/scripts/scripts_eterna_city.s | 354 +++++------ .../scripts/scripts_eterna_city_south_house.s | 2 +- ...cripts_eterna_city_underground_man_house.s | 20 +- res/field/scripts/scripts_eterna_forest.s | 124 ++-- res/field/scripts/scripts_fight_area.s | 130 ++-- res/field/scripts/scripts_floaroma_meadow.s | 26 +- res/field/scripts/scripts_floaroma_town.s | 6 +- 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 | 12 +- res/field/scripts/scripts_hall_of_origin.s | 16 +- res/field/scripts/scripts_hearthome_city.s | 78 +-- ...scripts_hearthome_city_gym_entrance_room.s | 14 +- ..._hearthome_city_northeast_house_elevator.s | 8 +- ..._hearthome_city_southeast_house_elevator.s | 8 +- res/field/scripts/scripts_iron_island.s | 14 +- .../scripts_iron_island_b2f_left_room.s | 72 +-- res/field/scripts/scripts_iron_island_house.s | 10 +- res/field/scripts/scripts_jubilife_city.s | 370 +++++------ .../scripts/scripts_jubilife_tv_2f_gallery.s | 16 +- .../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 +- 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 | 12 +- .../scripts/scripts_old_chateau_dining_area.s | 16 +- res/field/scripts/scripts_oreburgh_city.s | 144 ++--- 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 | 174 ++--- ...cripts_pastoria_city_observatory_gate_1f.s | 32 +- .../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 | 32 +- .../scripts/scripts_pokemon_mansion_office.s | 24 +- res/field/scripts/scripts_resort_area.s | 58 +- res/field/scripts/scripts_resort_area_house.s | 2 +- .../scripts_resort_area_ribbon_syndicate_1f.s | 6 +- .../scripts_resort_area_ribbon_syndicate_2f.s | 84 +-- ...ts_resort_area_ribbon_syndicate_elevator.s | 2 +- res/field/scripts/scripts_rotoms_room.s | 22 +- res/field/scripts/scripts_route_201.s | 298 ++++----- res/field/scripts/scripts_route_202.s | 114 ++-- 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 | 82 +-- res/field/scripts/scripts_route_217.s | 42 +- .../scripts_route_218_gate_to_canalave_city.s | 60 +- res/field/scripts/scripts_route_224.s | 124 ++-- res/field/scripts/scripts_route_227.s | 56 +- res/field/scripts/scripts_sandgem_town.s | 208 +++--- ...cripts_sandgem_town_pokemon_research_lab.s | 96 +-- res/field/scripts/scripts_sendoff_spring.s | 14 +- res/field/scripts/scripts_snowpoint_city.s | 46 +- .../scripts_snowpoint_city_pokecenter_1f.s | 6 +- .../scripts/scripts_solaceon_ruins_room_2.s | 2 +- res/field/scripts/scripts_solaceon_town.s | 22 +- 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 | 158 ++--- res/field/scripts/scripts_survival_area.s | 6 +- ...scripts_team_galactic_eterna_building_1f.s | 20 +- ...scripts_team_galactic_eterna_building_4f.s | 16 +- res/field/scripts/scripts_trainers_school.s | 24 +- res/field/scripts/scripts_twinleaf_town.s | 222 +++---- .../scripts_twinleaf_town_player_house_1f.s | 152 ++--- .../scripts_twinleaf_town_player_house_2f.s | 146 ++--- .../scripts_twinleaf_town_rival_house_2f.s | 18 +- res/field/scripts/scripts_underground.s | 28 +- res/field/scripts/scripts_unk_0211.s | 8 +- res/field/scripts/scripts_unk_0212.s | 68 +- res/field/scripts/scripts_unk_0213.s | 16 +- res/field/scripts/scripts_unk_0423.s | 46 +- res/field/scripts/scripts_unk_0497.s | 24 +- res/field/scripts/scripts_unk_0501.s | 16 +- res/field/scripts/scripts_unk_1051.s | 16 +- res/field/scripts/scripts_unk_1114.s | 2 +- .../scripts_valley_windworks_building.s | 64 +- .../scripts_valley_windworks_outside.s | 56 +- res/field/scripts/scripts_valor_cavern.s | 2 +- res/field/scripts/scripts_valor_lakefront.s | 110 ++-- res/field/scripts/scripts_veilstone_city.s | 308 ++++----- ...cripts_veilstone_city_galactic_warehouse.s | 88 +-- .../scripts_veilstone_city_southeast_house.s | 32 +- .../scripts_veilstone_store_elevator.s | 2 +- res/field/scripts/scripts_verity_cavern.s | 10 +- res/field/scripts/scripts_verity_lakefront.s | 12 +- .../scripts/scripts_victory_road_1f_room_2.s | 112 ++-- 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 | 78 +-- src/unk_020655F4.c | 4 +- src/unk_020EDBAC.c | 4 +- 160 files changed, 4447 insertions(+), 4442 deletions(-) diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index c7f8bcf129..c0edf11c85 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -1,772 +1,772 @@ .include "consts/movement.inc" .macro MoveAction_000 length=1 - .short MOVEMENT_ACTION_0 + .short MOVEMENT_ACTION_000 .short \length .endm .macro MoveAction_001 length=1 - .short MOVEMENT_ACTION_1 + .short MOVEMENT_ACTION_001 .short \length .endm .macro MoveAction_002 length=1 - .short MOVEMENT_ACTION_2 + .short MOVEMENT_ACTION_002 .short \length .endm .macro MoveAction_003 length=1 - .short MOVEMENT_ACTION_3 + .short MOVEMENT_ACTION_003 .short \length .endm .macro MoveAction_004 length=1 - .short MOVEMENT_ACTION_4 + .short MOVEMENT_ACTION_004 .short \length .endm .macro MoveAction_005 length=1 - .short MOVEMENT_ACTION_5 + .short MOVEMENT_ACTION_005 .short \length .endm .macro MoveAction_006 length=1 - .short MOVEMENT_ACTION_6 + .short MOVEMENT_ACTION_006 .short \length .endm .macro MoveAction_007 length=1 - .short MOVEMENT_ACTION_7 + .short MOVEMENT_ACTION_007 .short \length .endm .macro MoveAction_008 length=1 - .short MOVEMENT_ACTION_8 + .short MOVEMENT_ACTION_008 .short \length .endm .macro MoveAction_009 length=1 - .short MOVEMENT_ACTION_9 + .short MOVEMENT_ACTION_009 .short \length .endm - .macro MoveAction_00A length=1 - .short MOVEMENT_ACTION_A + .macro MoveAction_010 length=1 + .short MOVEMENT_ACTION_010 .short \length .endm - .macro MoveAction_00B length=1 - .short MOVEMENT_ACTION_B + .macro MoveAction_011 length=1 + .short MOVEMENT_ACTION_011 .short \length .endm - .macro MoveAction_00C length=1 - .short MOVEMENT_ACTION_C + .macro MoveAction_012 length=1 + .short MOVEMENT_ACTION_012 .short \length .endm - .macro MoveAction_00D length=1 - .short MOVEMENT_ACTION_D + .macro MoveAction_013 length=1 + .short MOVEMENT_ACTION_013 .short \length .endm - .macro MoveAction_00E length=1 - .short MOVEMENT_ACTION_E + .macro MoveAction_014 length=1 + .short MOVEMENT_ACTION_014 .short \length .endm - .macro MoveAction_00F length=1 - .short MOVEMENT_ACTION_F + .macro MoveAction_015 length=1 + .short MOVEMENT_ACTION_015 .short \length .endm - .macro MoveAction_010 length=1 - .short MOVEMENT_ACTION_10 + .macro MoveAction_016 length=1 + .short MOVEMENT_ACTION_016 .short \length .endm - .macro MoveAction_011 length=1 - .short MOVEMENT_ACTION_11 + .macro MoveAction_017 length=1 + .short MOVEMENT_ACTION_017 .short \length .endm - .macro MoveAction_012 length=1 - .short MOVEMENT_ACTION_12 + .macro MoveAction_018 length=1 + .short MOVEMENT_ACTION_018 .short \length .endm - .macro MoveAction_013 length=1 - .short MOVEMENT_ACTION_13 + .macro MoveAction_019 length=1 + .short MOVEMENT_ACTION_019 .short \length .endm - .macro MoveAction_014 length=1 - .short MOVEMENT_ACTION_14 + .macro MoveAction_020 length=1 + .short MOVEMENT_ACTION_020 .short \length .endm - .macro MoveAction_015 length=1 - .short MOVEMENT_ACTION_15 + .macro MoveAction_021 length=1 + .short MOVEMENT_ACTION_021 .short \length .endm - .macro MoveAction_016 length=1 - .short MOVEMENT_ACTION_16 + .macro MoveAction_022 length=1 + .short MOVEMENT_ACTION_022 .short \length .endm - .macro MoveAction_017 length=1 - .short MOVEMENT_ACTION_17 + .macro MoveAction_023 length=1 + .short MOVEMENT_ACTION_023 .short \length .endm - .macro MoveAction_018 length=1 - .short MOVEMENT_ACTION_18 + .macro MoveAction_024 length=1 + .short MOVEMENT_ACTION_024 .short \length .endm - .macro MoveAction_019 length=1 - .short MOVEMENT_ACTION_19 + .macro MoveAction_025 length=1 + .short MOVEMENT_ACTION_025 .short \length .endm - .macro MoveAction_01A length=1 - .short MOVEMENT_ACTION_1A + .macro MoveAction_026 length=1 + .short MOVEMENT_ACTION_026 .short \length .endm - .macro MoveAction_01B length=1 - .short MOVEMENT_ACTION_1B + .macro MoveAction_027 length=1 + .short MOVEMENT_ACTION_027 .short \length .endm - .macro MoveAction_01C length=1 - .short MOVEMENT_ACTION_1C + .macro MoveAction_028 length=1 + .short MOVEMENT_ACTION_028 .short \length .endm - .macro MoveAction_01D length=1 - .short MOVEMENT_ACTION_1D + .macro MoveAction_029 length=1 + .short MOVEMENT_ACTION_029 .short \length .endm - .macro MoveAction_01E length=1 - .short MOVEMENT_ACTION_1E + .macro MoveAction_030 length=1 + .short MOVEMENT_ACTION_030 .short \length .endm - .macro MoveAction_01F length=1 - .short MOVEMENT_ACTION_1F + .macro MoveAction_031 length=1 + .short MOVEMENT_ACTION_031 .short \length .endm - .macro MoveAction_020 length=1 - .short MOVEMENT_ACTION_20 + .macro MoveAction_032 length=1 + .short MOVEMENT_ACTION_032 .short \length .endm - .macro MoveAction_021 length=1 - .short MOVEMENT_ACTION_21 + .macro MoveAction_033 length=1 + .short MOVEMENT_ACTION_033 .short \length .endm - .macro MoveAction_022 length=1 - .short MOVEMENT_ACTION_22 + .macro MoveAction_034 length=1 + .short MOVEMENT_ACTION_034 .short \length .endm - .macro MoveAction_023 length=1 - .short MOVEMENT_ACTION_23 + .macro MoveAction_035 length=1 + .short MOVEMENT_ACTION_035 .short \length .endm - .macro MoveAction_024 length=1 - .short MOVEMENT_ACTION_24 + .macro MoveAction_036 length=1 + .short MOVEMENT_ACTION_036 .short \length .endm - .macro MoveAction_025 length=1 - .short MOVEMENT_ACTION_25 + .macro MoveAction_037 length=1 + .short MOVEMENT_ACTION_037 .short \length .endm - .macro MoveAction_026 length=1 - .short MOVEMENT_ACTION_26 + .macro MoveAction_038 length=1 + .short MOVEMENT_ACTION_038 .short \length .endm - .macro MoveAction_027 length=1 - .short MOVEMENT_ACTION_27 + .macro MoveAction_039 length=1 + .short MOVEMENT_ACTION_039 .short \length .endm - .macro MoveAction_028 length=1 - .short MOVEMENT_ACTION_28 + .macro MoveAction_040 length=1 + .short MOVEMENT_ACTION_040 .short \length .endm - .macro MoveAction_029 length=1 - .short MOVEMENT_ACTION_29 + .macro MoveAction_041 length=1 + .short MOVEMENT_ACTION_041 .short \length .endm - .macro MoveAction_02A length=1 - .short MOVEMENT_ACTION_2A + .macro MoveAction_042 length=1 + .short MOVEMENT_ACTION_042 .short \length .endm - .macro MoveAction_02B length=1 - .short MOVEMENT_ACTION_2B + .macro MoveAction_043 length=1 + .short MOVEMENT_ACTION_043 .short \length .endm - .macro MoveAction_02C length=1 - .short MOVEMENT_ACTION_2C + .macro MoveAction_044 length=1 + .short MOVEMENT_ACTION_044 .short \length .endm - .macro MoveAction_02D length=1 - .short MOVEMENT_ACTION_2D + .macro MoveAction_045 length=1 + .short MOVEMENT_ACTION_045 .short \length .endm - .macro MoveAction_02E length=1 - .short MOVEMENT_ACTION_2E + .macro MoveAction_046 length=1 + .short MOVEMENT_ACTION_046 .short \length .endm - .macro MoveAction_02F length=1 - .short MOVEMENT_ACTION_2F + .macro MoveAction_047 length=1 + .short MOVEMENT_ACTION_047 .short \length .endm - .macro MoveAction_030 length=1 - .short MOVEMENT_ACTION_30 + .macro MoveAction_048 length=1 + .short MOVEMENT_ACTION_048 .short \length .endm - .macro MoveAction_031 length=1 - .short MOVEMENT_ACTION_31 + .macro MoveAction_049 length=1 + .short MOVEMENT_ACTION_049 .short \length .endm - .macro MoveAction_032 length=1 - .short MOVEMENT_ACTION_32 + .macro MoveAction_050 length=1 + .short MOVEMENT_ACTION_050 .short \length .endm - .macro MoveAction_033 length=1 - .short MOVEMENT_ACTION_33 + .macro MoveAction_051 length=1 + .short MOVEMENT_ACTION_051 .short \length .endm - .macro MoveAction_034 length=1 - .short MOVEMENT_ACTION_34 + .macro MoveAction_052 length=1 + .short MOVEMENT_ACTION_052 .short \length .endm - .macro MoveAction_035 length=1 - .short MOVEMENT_ACTION_35 + .macro MoveAction_053 length=1 + .short MOVEMENT_ACTION_053 .short \length .endm - .macro MoveAction_036 length=1 - .short MOVEMENT_ACTION_36 + .macro MoveAction_054 length=1 + .short MOVEMENT_ACTION_054 .short \length .endm - .macro MoveAction_037 length=1 - .short MOVEMENT_ACTION_37 + .macro MoveAction_055 length=1 + .short MOVEMENT_ACTION_055 .short \length .endm - .macro MoveAction_038 length=1 - .short MOVEMENT_ACTION_38 + .macro MoveAction_056 length=1 + .short MOVEMENT_ACTION_056 .short \length .endm - .macro MoveAction_039 length=1 - .short MOVEMENT_ACTION_39 + .macro MoveAction_057 length=1 + .short MOVEMENT_ACTION_057 .short \length .endm - .macro MoveAction_03A length=1 - .short MOVEMENT_ACTION_3A + .macro MoveAction_058 length=1 + .short MOVEMENT_ACTION_058 .short \length .endm - .macro MoveAction_03B length=1 - .short MOVEMENT_ACTION_3B + .macro MoveAction_059 length=1 + .short MOVEMENT_ACTION_059 .short \length .endm - .macro MoveAction_03C length=1 - .short MOVEMENT_ACTION_3C + .macro MoveAction_060 length=1 + .short MOVEMENT_ACTION_060 .short \length .endm - .macro MoveAction_03D length=1 - .short MOVEMENT_ACTION_3D + .macro MoveAction_061 length=1 + .short MOVEMENT_ACTION_061 .short \length .endm - .macro MoveAction_03E length=1 - .short MOVEMENT_ACTION_3E + .macro MoveAction_062 length=1 + .short MOVEMENT_ACTION_062 .short \length .endm - .macro MoveAction_03F length=1 - .short MOVEMENT_ACTION_3F + .macro MoveAction_063 length=1 + .short MOVEMENT_ACTION_063 .short \length .endm - .macro MoveAction_040 length=1 - .short MOVEMENT_ACTION_40 + .macro MoveAction_064 length=1 + .short MOVEMENT_ACTION_064 .short \length .endm - .macro MoveAction_041 length=1 - .short MOVEMENT_ACTION_41 + .macro MoveAction_065 length=1 + .short MOVEMENT_ACTION_065 .short \length .endm - .macro MoveAction_042 length=1 - .short MOVEMENT_ACTION_42 + .macro MoveAction_066 length=1 + .short MOVEMENT_ACTION_066 .short \length .endm - .macro MoveAction_043 length=1 - .short MOVEMENT_ACTION_43 + .macro MoveAction_067 length=1 + .short MOVEMENT_ACTION_067 .short \length .endm - .macro MoveAction_044 length=1 - .short MOVEMENT_ACTION_44 + .macro MoveAction_068 length=1 + .short MOVEMENT_ACTION_068 .short \length .endm - .macro MoveAction_045 length=1 - .short MOVEMENT_ACTION_45 + .macro MoveAction_069 length=1 + .short MOVEMENT_ACTION_069 .short \length .endm - .macro MoveAction_046 length=1 - .short MOVEMENT_ACTION_46 + .macro MoveAction_070 length=1 + .short MOVEMENT_ACTION_070 .short \length .endm - .macro MoveAction_047 length=1 - .short MOVEMENT_ACTION_47 + .macro MoveAction_071 length=1 + .short MOVEMENT_ACTION_071 .short \length .endm - .macro MoveAction_048 length=1 - .short MOVEMENT_ACTION_48 + .macro MoveAction_072 length=1 + .short MOVEMENT_ACTION_072 .short \length .endm - .macro MoveAction_049 length=1 - .short MOVEMENT_ACTION_49 + .macro MoveAction_073 length=1 + .short MOVEMENT_ACTION_073 .short \length .endm - .macro MoveAction_04A length=1 - .short MOVEMENT_ACTION_4A + .macro MoveAction_074 length=1 + .short MOVEMENT_ACTION_074 .short \length .endm - .macro MoveAction_04B length=1 - .short MOVEMENT_ACTION_4B + .macro MoveAction_075 length=1 + .short MOVEMENT_ACTION_075 .short \length .endm - .macro MoveAction_04C length=1 - .short MOVEMENT_ACTION_4C + .macro MoveAction_076 length=1 + .short MOVEMENT_ACTION_076 .short \length .endm - .macro MoveAction_04D length=1 - .short MOVEMENT_ACTION_4D + .macro MoveAction_077 length=1 + .short MOVEMENT_ACTION_077 .short \length .endm - .macro MoveAction_04E length=1 - .short MOVEMENT_ACTION_4E + .macro MoveAction_078 length=1 + .short MOVEMENT_ACTION_078 .short \length .endm - .macro MoveAction_04F length=1 - .short MOVEMENT_ACTION_4F + .macro MoveAction_079 length=1 + .short MOVEMENT_ACTION_079 .short \length .endm - .macro MoveAction_050 length=1 - .short MOVEMENT_ACTION_50 + .macro MoveAction_080 length=1 + .short MOVEMENT_ACTION_080 .short \length .endm - .macro MoveAction_051 length=1 - .short MOVEMENT_ACTION_51 + .macro MoveAction_081 length=1 + .short MOVEMENT_ACTION_081 .short \length .endm - .macro MoveAction_052 length=1 - .short MOVEMENT_ACTION_52 + .macro MoveAction_082 length=1 + .short MOVEMENT_ACTION_082 .short \length .endm - .macro MoveAction_053 length=1 - .short MOVEMENT_ACTION_53 + .macro MoveAction_083 length=1 + .short MOVEMENT_ACTION_083 .short \length .endm - .macro MoveAction_054 length=1 - .short MOVEMENT_ACTION_54 + .macro MoveAction_084 length=1 + .short MOVEMENT_ACTION_084 .short \length .endm - .macro MoveAction_055 length=1 - .short MOVEMENT_ACTION_55 + .macro MoveAction_085 length=1 + .short MOVEMENT_ACTION_085 .short \length .endm - .macro MoveAction_056 length=1 - .short MOVEMENT_ACTION_56 + .macro MoveAction_086 length=1 + .short MOVEMENT_ACTION_086 .short \length .endm - .macro MoveAction_057 length=1 - .short MOVEMENT_ACTION_57 + .macro MoveAction_087 length=1 + .short MOVEMENT_ACTION_087 .short \length .endm - .macro MoveAction_058 length=1 - .short MOVEMENT_ACTION_58 + .macro MoveAction_088 length=1 + .short MOVEMENT_ACTION_088 .short \length .endm - .macro MoveAction_059 length=1 - .short MOVEMENT_ACTION_59 + .macro MoveAction_089 length=1 + .short MOVEMENT_ACTION_089 .short \length .endm - .macro MoveAction_05A length=1 - .short MOVEMENT_ACTION_5A + .macro MoveAction_090 length=1 + .short MOVEMENT_ACTION_090 .short \length .endm - .macro MoveAction_05B length=1 - .short MOVEMENT_ACTION_5B + .macro MoveAction_091 length=1 + .short MOVEMENT_ACTION_091 .short \length .endm - .macro MoveAction_05C length=1 - .short MOVEMENT_ACTION_5C + .macro MoveAction_092 length=1 + .short MOVEMENT_ACTION_092 .short \length .endm - .macro MoveAction_05D length=1 - .short MOVEMENT_ACTION_5D + .macro MoveAction_093 length=1 + .short MOVEMENT_ACTION_093 .short \length .endm - .macro MoveAction_05E length=1 - .short MOVEMENT_ACTION_5E + .macro MoveAction_094 length=1 + .short MOVEMENT_ACTION_094 .short \length .endm - .macro MoveAction_05F length=1 - .short MOVEMENT_ACTION_5F + .macro MoveAction_095 length=1 + .short MOVEMENT_ACTION_095 .short \length .endm - .macro MoveAction_060 length=1 - .short MOVEMENT_ACTION_60 + .macro MoveAction_096 length=1 + .short MOVEMENT_ACTION_096 .short \length .endm - .macro MoveAction_061 length=1 - .short MOVEMENT_ACTION_61 + .macro MoveAction_097 length=1 + .short MOVEMENT_ACTION_097 .short \length .endm - .macro MoveAction_062 length=1 - .short MOVEMENT_ACTION_62 + .macro MoveAction_098 length=1 + .short MOVEMENT_ACTION_098 .short \length .endm - .macro MoveAction_063 length=1 - .short MOVEMENT_ACTION_63 + .macro MoveAction_099 length=1 + .short MOVEMENT_ACTION_099 .short \length .endm - .macro MoveAction_064 length=1 - .short MOVEMENT_ACTION_64 + .macro MoveAction_100 length=1 + .short MOVEMENT_ACTION_100 .short \length .endm - .macro MoveAction_065 length=1 - .short MOVEMENT_ACTION_65 + .macro MoveAction_101 length=1 + .short MOVEMENT_ACTION_101 .short \length .endm - .macro MoveAction_066 length=1 - .short MOVEMENT_ACTION_66 + .macro MoveAction_102 length=1 + .short MOVEMENT_ACTION_102 .short \length .endm - .macro MoveAction_067 length=1 - .short MOVEMENT_ACTION_67 + .macro MoveAction_103 length=1 + .short MOVEMENT_ACTION_103 .short \length .endm - .macro MoveAction_068 length=1 - .short MOVEMENT_ACTION_68 + .macro MoveAction_104 length=1 + .short MOVEMENT_ACTION_104 .short \length .endm - .macro MoveAction_069 length=1 - .short MOVEMENT_ACTION_69 + .macro MoveAction_105 length=1 + .short MOVEMENT_ACTION_105 .short \length .endm - .macro MoveAction_06A length=1 - .short MOVEMENT_ACTION_6A + .macro MoveAction_106 length=1 + .short MOVEMENT_ACTION_106 .short \length .endm - .macro MoveAction_06B length=1 - .short MOVEMENT_ACTION_6B + .macro MoveAction_107 length=1 + .short MOVEMENT_ACTION_107 .short \length .endm - .macro MoveAction_06C length=1 - .short MOVEMENT_ACTION_6C + .macro MoveAction_108 length=1 + .short MOVEMENT_ACTION_108 .short \length .endm - .macro MoveAction_06D length=1 - .short MOVEMENT_ACTION_6D + .macro MoveAction_109 length=1 + .short MOVEMENT_ACTION_109 .short \length .endm - .macro MoveAction_06E length=1 - .short MOVEMENT_ACTION_6E + .macro MoveAction_110 length=1 + .short MOVEMENT_ACTION_110 .short \length .endm - .macro MoveAction_06F length=1 - .short MOVEMENT_ACTION_6F + .macro MoveAction_111 length=1 + .short MOVEMENT_ACTION_111 .short \length .endm - .macro MoveAction_070 length=1 - .short MOVEMENT_ACTION_70 + .macro MoveAction_112 length=1 + .short MOVEMENT_ACTION_112 .short \length .endm - .macro MoveAction_071 length=1 - .short MOVEMENT_ACTION_71 + .macro MoveAction_113 length=1 + .short MOVEMENT_ACTION_113 .short \length .endm - .macro MoveAction_072 length=1 - .short MOVEMENT_ACTION_72 + .macro MoveAction_114 length=1 + .short MOVEMENT_ACTION_114 .short \length .endm - .macro MoveAction_073 length=1 - .short MOVEMENT_ACTION_73 + .macro MoveAction_115 length=1 + .short MOVEMENT_ACTION_115 .short \length .endm - .macro MoveAction_074 length=1 - .short MOVEMENT_ACTION_74 + .macro MoveAction_116 length=1 + .short MOVEMENT_ACTION_116 .short \length .endm - .macro MoveAction_075 length=1 - .short MOVEMENT_ACTION_75 + .macro MoveAction_117 length=1 + .short MOVEMENT_ACTION_117 .short \length .endm - .macro MoveAction_076 length=1 - .short MOVEMENT_ACTION_76 + .macro MoveAction_118 length=1 + .short MOVEMENT_ACTION_118 .short \length .endm - .macro MoveAction_077 length=1 - .short MOVEMENT_ACTION_77 + .macro MoveAction_119 length=1 + .short MOVEMENT_ACTION_119 .short \length .endm - .macro MoveAction_078 length=1 - .short MOVEMENT_ACTION_78 + .macro MoveAction_120 length=1 + .short MOVEMENT_ACTION_120 .short \length .endm - .macro MoveAction_079 length=1 - .short MOVEMENT_ACTION_79 + .macro MoveAction_121 length=1 + .short MOVEMENT_ACTION_121 .short \length .endm - .macro MoveAction_07A length=1 - .short MOVEMENT_ACTION_7A + .macro MoveAction_122 length=1 + .short MOVEMENT_ACTION_122 .short \length .endm - .macro MoveAction_07B length=1 - .short MOVEMENT_ACTION_7B + .macro MoveAction_123 length=1 + .short MOVEMENT_ACTION_123 .short \length .endm - .macro MoveAction_07C length=1 - .short MOVEMENT_ACTION_7C + .macro MoveAction_124 length=1 + .short MOVEMENT_ACTION_124 .short \length .endm - .macro MoveAction_07D length=1 - .short MOVEMENT_ACTION_7D + .macro MoveAction_125 length=1 + .short MOVEMENT_ACTION_125 .short \length .endm - .macro MoveAction_07E length=1 - .short MOVEMENT_ACTION_7E + .macro MoveAction_126 length=1 + .short MOVEMENT_ACTION_126 .short \length .endm - .macro MoveAction_07F length=1 - .short MOVEMENT_ACTION_7F + .macro MoveAction_127 length=1 + .short MOVEMENT_ACTION_127 .short \length .endm - .macro MoveAction_080 length=1 - .short MOVEMENT_ACTION_80 + .macro MoveAction_128 length=1 + .short MOVEMENT_ACTION_128 .short \length .endm - .macro MoveAction_081 length=1 - .short MOVEMENT_ACTION_81 + .macro MoveAction_129 length=1 + .short MOVEMENT_ACTION_129 .short \length .endm - .macro MoveAction_082 length=1 - .short MOVEMENT_ACTION_82 + .macro MoveAction_130 length=1 + .short MOVEMENT_ACTION_130 .short \length .endm - .macro MoveAction_083 length=1 - .short MOVEMENT_ACTION_83 + .macro MoveAction_131 length=1 + .short MOVEMENT_ACTION_131 .short \length .endm - .macro MoveAction_084 length=1 - .short MOVEMENT_ACTION_84 + .macro MoveAction_132 length=1 + .short MOVEMENT_ACTION_132 .short \length .endm - .macro MoveAction_085 length=1 - .short MOVEMENT_ACTION_85 + .macro MoveAction_133 length=1 + .short MOVEMENT_ACTION_133 .short \length .endm - .macro MoveAction_086 length=1 - .short MOVEMENT_ACTION_86 + .macro MoveAction_134 length=1 + .short MOVEMENT_ACTION_134 .short \length .endm - .macro MoveAction_087 length=1 - .short MOVEMENT_ACTION_87 + .macro MoveAction_135 length=1 + .short MOVEMENT_ACTION_135 .short \length .endm - .macro MoveAction_088 length=1 - .short MOVEMENT_ACTION_88 + .macro MoveAction_136 length=1 + .short MOVEMENT_ACTION_136 .short \length .endm - .macro MoveAction_089 length=1 - .short MOVEMENT_ACTION_89 + .macro MoveAction_137 length=1 + .short MOVEMENT_ACTION_137 .short \length .endm - .macro MoveAction_08A length=1 - .short MOVEMENT_ACTION_8A + .macro MoveAction_138 length=1 + .short MOVEMENT_ACTION_138 .short \length .endm - .macro MoveAction_08B length=1 - .short MOVEMENT_ACTION_8B + .macro MoveAction_139 length=1 + .short MOVEMENT_ACTION_139 .short \length .endm - .macro MoveAction_08C length=1 - .short MOVEMENT_ACTION_8C + .macro MoveAction_140 length=1 + .short MOVEMENT_ACTION_140 .short \length .endm - .macro MoveAction_08D length=1 - .short MOVEMENT_ACTION_8D + .macro MoveAction_141 length=1 + .short MOVEMENT_ACTION_141 .short \length .endm - .macro MoveAction_08E length=1 - .short MOVEMENT_ACTION_8E + .macro MoveAction_142 length=1 + .short MOVEMENT_ACTION_142 .short \length .endm - .macro MoveAction_08F length=1 - .short MOVEMENT_ACTION_8F + .macro MoveAction_143 length=1 + .short MOVEMENT_ACTION_143 .short \length .endm - .macro MoveAction_090 length=1 - .short MOVEMENT_ACTION_90 + .macro MoveAction_144 length=1 + .short MOVEMENT_ACTION_144 .short \length .endm - .macro MoveAction_091 length=1 - .short MOVEMENT_ACTION_91 + .macro MoveAction_145 length=1 + .short MOVEMENT_ACTION_145 .short \length .endm - .macro MoveAction_092 length=1 - .short MOVEMENT_ACTION_92 + .macro MoveAction_146 length=1 + .short MOVEMENT_ACTION_146 .short \length .endm - .macro MoveAction_093 length=1 - .short MOVEMENT_ACTION_93 + .macro MoveAction_147 length=1 + .short MOVEMENT_ACTION_147 .short \length .endm - .macro MoveAction_094 length=1 - .short MOVEMENT_ACTION_94 + .macro MoveAction_148 length=1 + .short MOVEMENT_ACTION_148 .short \length .endm - .macro MoveAction_095 length=1 - .short MOVEMENT_ACTION_95 + .macro MoveAction_149 length=1 + .short MOVEMENT_ACTION_149 .short \length .endm - .macro MoveAction_096 length=1 - .short MOVEMENT_ACTION_96 + .macro MoveAction_150 length=1 + .short MOVEMENT_ACTION_150 .short \length .endm - .macro MoveAction_097 length=1 - .short MOVEMENT_ACTION_97 + .macro MoveAction_151 length=1 + .short MOVEMENT_ACTION_151 .short \length .endm - .macro MoveAction_098 length=1 - .short MOVEMENT_ACTION_98 + .macro MoveAction_152 length=1 + .short MOVEMENT_ACTION_152 .short \length .endm - .macro MoveAction_099 length=1 - .short MOVEMENT_ACTION_99 + .macro MoveAction_153 length=1 + .short MOVEMENT_ACTION_153 .short \length .endm diff --git a/consts/movement.json b/consts/movement.json index 1388f53e96..699c10b5b6 100644 --- a/consts/movement.json +++ b/consts/movement.json @@ -3,160 +3,161 @@ "@MovementAction": { "type": "enum", "values": [ - "MOVEMENT_ACTION_0", - "MOVEMENT_ACTION_1", - "MOVEMENT_ACTION_2", - "MOVEMENT_ACTION_3", - "MOVEMENT_ACTION_4", - "MOVEMENT_ACTION_5", - "MOVEMENT_ACTION_6", - "MOVEMENT_ACTION_7", - "MOVEMENT_ACTION_8", - "MOVEMENT_ACTION_9", - "MOVEMENT_ACTION_A", - "MOVEMENT_ACTION_B", - "MOVEMENT_ACTION_C", - "MOVEMENT_ACTION_D", - "MOVEMENT_ACTION_E", - "MOVEMENT_ACTION_F", - "MOVEMENT_ACTION_10", - "MOVEMENT_ACTION_11", - "MOVEMENT_ACTION_12", - "MOVEMENT_ACTION_13", - "MOVEMENT_ACTION_14", - "MOVEMENT_ACTION_15", - "MOVEMENT_ACTION_16", - "MOVEMENT_ACTION_17", - "MOVEMENT_ACTION_18", - "MOVEMENT_ACTION_19", - "MOVEMENT_ACTION_1A", - "MOVEMENT_ACTION_1B", - "MOVEMENT_ACTION_1C", - "MOVEMENT_ACTION_1D", - "MOVEMENT_ACTION_1E", - "MOVEMENT_ACTION_1F", - "MOVEMENT_ACTION_20", - "MOVEMENT_ACTION_21", - "MOVEMENT_ACTION_22", - "MOVEMENT_ACTION_23", - "MOVEMENT_ACTION_24", - "MOVEMENT_ACTION_25", - "MOVEMENT_ACTION_26", - "MOVEMENT_ACTION_27", - "MOVEMENT_ACTION_28", - "MOVEMENT_ACTION_29", - "MOVEMENT_ACTION_2A", - "MOVEMENT_ACTION_2B", - "MOVEMENT_ACTION_2C", - "MOVEMENT_ACTION_2D", - "MOVEMENT_ACTION_2E", - "MOVEMENT_ACTION_2F", - "MOVEMENT_ACTION_30", - "MOVEMENT_ACTION_31", - "MOVEMENT_ACTION_32", - "MOVEMENT_ACTION_33", - "MOVEMENT_ACTION_34", - "MOVEMENT_ACTION_35", - "MOVEMENT_ACTION_36", - "MOVEMENT_ACTION_37", - "MOVEMENT_ACTION_38", - "MOVEMENT_ACTION_39", - "MOVEMENT_ACTION_3A", - "MOVEMENT_ACTION_3B", - "MOVEMENT_ACTION_3C", - "MOVEMENT_ACTION_3D", - "MOVEMENT_ACTION_3E", - "MOVEMENT_ACTION_3F", - "MOVEMENT_ACTION_40", - "MOVEMENT_ACTION_41", - "MOVEMENT_ACTION_42", - "MOVEMENT_ACTION_43", - "MOVEMENT_ACTION_44", - "MOVEMENT_ACTION_45", - "MOVEMENT_ACTION_46", - "MOVEMENT_ACTION_47", - "MOVEMENT_ACTION_48", - "MOVEMENT_ACTION_49", - "MOVEMENT_ACTION_4A", - "MOVEMENT_ACTION_4B", - "MOVEMENT_ACTION_4C", - "MOVEMENT_ACTION_4D", - "MOVEMENT_ACTION_4E", - "MOVEMENT_ACTION_4F", - "MOVEMENT_ACTION_50", - "MOVEMENT_ACTION_51", - "MOVEMENT_ACTION_52", - "MOVEMENT_ACTION_53", - "MOVEMENT_ACTION_54", - "MOVEMENT_ACTION_55", - "MOVEMENT_ACTION_56", - "MOVEMENT_ACTION_57", - "MOVEMENT_ACTION_58", - "MOVEMENT_ACTION_59", - "MOVEMENT_ACTION_5A", - "MOVEMENT_ACTION_5B", - "MOVEMENT_ACTION_5C", - "MOVEMENT_ACTION_5D", - "MOVEMENT_ACTION_5E", - "MOVEMENT_ACTION_5F", - "MOVEMENT_ACTION_60", - "MOVEMENT_ACTION_61", - "MOVEMENT_ACTION_62", - "MOVEMENT_ACTION_63", - "MOVEMENT_ACTION_64", - "MOVEMENT_ACTION_65", - "MOVEMENT_ACTION_66", - "MOVEMENT_ACTION_67", - "MOVEMENT_ACTION_68", - "MOVEMENT_ACTION_69", - "MOVEMENT_ACTION_6A", - "MOVEMENT_ACTION_6B", - "MOVEMENT_ACTION_6C", - "MOVEMENT_ACTION_6D", - "MOVEMENT_ACTION_6E", - "MOVEMENT_ACTION_6F", - "MOVEMENT_ACTION_70", - "MOVEMENT_ACTION_71", - "MOVEMENT_ACTION_72", - "MOVEMENT_ACTION_73", - "MOVEMENT_ACTION_74", - "MOVEMENT_ACTION_75", - "MOVEMENT_ACTION_76", - "MOVEMENT_ACTION_77", - "MOVEMENT_ACTION_78", - "MOVEMENT_ACTION_79", - "MOVEMENT_ACTION_7A", - "MOVEMENT_ACTION_7B", - "MOVEMENT_ACTION_7C", - "MOVEMENT_ACTION_7D", - "MOVEMENT_ACTION_7E", - "MOVEMENT_ACTION_7F", - "MOVEMENT_ACTION_80", - "MOVEMENT_ACTION_81", - "MOVEMENT_ACTION_82", - "MOVEMENT_ACTION_83", - "MOVEMENT_ACTION_84", - "MOVEMENT_ACTION_85", - "MOVEMENT_ACTION_86", - "MOVEMENT_ACTION_87", - "MOVEMENT_ACTION_88", - "MOVEMENT_ACTION_89", - "MOVEMENT_ACTION_8A", - "MOVEMENT_ACTION_8B", - "MOVEMENT_ACTION_8C", - "MOVEMENT_ACTION_8D", - "MOVEMENT_ACTION_8E", - "MOVEMENT_ACTION_8F", - "MOVEMENT_ACTION_90", - "MOVEMENT_ACTION_91", - "MOVEMENT_ACTION_92", - "MOVEMENT_ACTION_93", - "MOVEMENT_ACTION_94", - "MOVEMENT_ACTION_95", - "MOVEMENT_ACTION_96", - "MOVEMENT_ACTION_97", - "MOVEMENT_ACTION_98", - "MOVEMENT_ACTION_99", + "MOVEMENT_ACTION_000", + "MOVEMENT_ACTION_001", + "MOVEMENT_ACTION_002", + "MOVEMENT_ACTION_003", + "MOVEMENT_ACTION_004", + "MOVEMENT_ACTION_005", + "MOVEMENT_ACTION_006", + "MOVEMENT_ACTION_007", + "MOVEMENT_ACTION_008", + "MOVEMENT_ACTION_009", + "MOVEMENT_ACTION_010", + "MOVEMENT_ACTION_011", + "MOVEMENT_ACTION_012", + "MOVEMENT_ACTION_013", + "MOVEMENT_ACTION_014", + "MOVEMENT_ACTION_015", + "MOVEMENT_ACTION_016", + "MOVEMENT_ACTION_017", + "MOVEMENT_ACTION_018", + "MOVEMENT_ACTION_019", + "MOVEMENT_ACTION_020", + "MOVEMENT_ACTION_021", + "MOVEMENT_ACTION_022", + "MOVEMENT_ACTION_023", + "MOVEMENT_ACTION_024", + "MOVEMENT_ACTION_025", + "MOVEMENT_ACTION_026", + "MOVEMENT_ACTION_027", + "MOVEMENT_ACTION_028", + "MOVEMENT_ACTION_029", + "MOVEMENT_ACTION_030", + "MOVEMENT_ACTION_031", + "MOVEMENT_ACTION_032", + "MOVEMENT_ACTION_033", + "MOVEMENT_ACTION_034", + "MOVEMENT_ACTION_035", + "MOVEMENT_ACTION_036", + "MOVEMENT_ACTION_037", + "MOVEMENT_ACTION_038", + "MOVEMENT_ACTION_039", + "MOVEMENT_ACTION_040", + "MOVEMENT_ACTION_041", + "MOVEMENT_ACTION_042", + "MOVEMENT_ACTION_043", + "MOVEMENT_ACTION_044", + "MOVEMENT_ACTION_045", + "MOVEMENT_ACTION_046", + "MOVEMENT_ACTION_047", + "MOVEMENT_ACTION_048", + "MOVEMENT_ACTION_049", + "MOVEMENT_ACTION_050", + "MOVEMENT_ACTION_051", + "MOVEMENT_ACTION_052", + "MOVEMENT_ACTION_053", + "MOVEMENT_ACTION_054", + "MOVEMENT_ACTION_055", + "MOVEMENT_ACTION_056", + "MOVEMENT_ACTION_057", + "MOVEMENT_ACTION_058", + "MOVEMENT_ACTION_059", + "MOVEMENT_ACTION_060", + "MOVEMENT_ACTION_061", + "MOVEMENT_ACTION_062", + "MOVEMENT_ACTION_063", + "MOVEMENT_ACTION_064", + "MOVEMENT_ACTION_065", + "MOVEMENT_ACTION_066", + "MOVEMENT_ACTION_067", + "MOVEMENT_ACTION_068", + "MOVEMENT_ACTION_069", + "MOVEMENT_ACTION_070", + "MOVEMENT_ACTION_071", + "MOVEMENT_ACTION_072", + "MOVEMENT_ACTION_073", + "MOVEMENT_ACTION_074", + "MOVEMENT_ACTION_075", + "MOVEMENT_ACTION_076", + "MOVEMENT_ACTION_077", + "MOVEMENT_ACTION_078", + "MOVEMENT_ACTION_079", + "MOVEMENT_ACTION_080", + "MOVEMENT_ACTION_081", + "MOVEMENT_ACTION_082", + "MOVEMENT_ACTION_083", + "MOVEMENT_ACTION_084", + "MOVEMENT_ACTION_085", + "MOVEMENT_ACTION_086", + "MOVEMENT_ACTION_087", + "MOVEMENT_ACTION_088", + "MOVEMENT_ACTION_089", + "MOVEMENT_ACTION_090", + "MOVEMENT_ACTION_091", + "MOVEMENT_ACTION_092", + "MOVEMENT_ACTION_093", + "MOVEMENT_ACTION_094", + "MOVEMENT_ACTION_095", + "MOVEMENT_ACTION_096", + "MOVEMENT_ACTION_097", + "MOVEMENT_ACTION_098", + "MOVEMENT_ACTION_099", + "MOVEMENT_ACTION_100", + "MOVEMENT_ACTION_101", + "MOVEMENT_ACTION_102", + "MOVEMENT_ACTION_103", + "MOVEMENT_ACTION_104", + "MOVEMENT_ACTION_105", + "MOVEMENT_ACTION_106", + "MOVEMENT_ACTION_107", + "MOVEMENT_ACTION_108", + "MOVEMENT_ACTION_109", + "MOVEMENT_ACTION_110", + "MOVEMENT_ACTION_111", + "MOVEMENT_ACTION_112", + "MOVEMENT_ACTION_113", + "MOVEMENT_ACTION_114", + "MOVEMENT_ACTION_115", + "MOVEMENT_ACTION_116", + "MOVEMENT_ACTION_117", + "MOVEMENT_ACTION_118", + "MOVEMENT_ACTION_119", + "MOVEMENT_ACTION_120", + "MOVEMENT_ACTION_121", + "MOVEMENT_ACTION_122", + "MOVEMENT_ACTION_123", + "MOVEMENT_ACTION_124", + "MOVEMENT_ACTION_125", + "MOVEMENT_ACTION_126", + "MOVEMENT_ACTION_127", + "MOVEMENT_ACTION_128", + "MOVEMENT_ACTION_129", + "MOVEMENT_ACTION_130", + "MOVEMENT_ACTION_131", + "MOVEMENT_ACTION_132", + "MOVEMENT_ACTION_133", + "MOVEMENT_ACTION_134", + "MOVEMENT_ACTION_135", + "MOVEMENT_ACTION_136", + "MOVEMENT_ACTION_137", + "MOVEMENT_ACTION_138", + "MOVEMENT_ACTION_139", + "MOVEMENT_ACTION_140", + "MOVEMENT_ACTION_141", + "MOVEMENT_ACTION_142", + "MOVEMENT_ACTION_143", + "MOVEMENT_ACTION_144", + "MOVEMENT_ACTION_145", + "MOVEMENT_ACTION_146", + "MOVEMENT_ACTION_147", + "MOVEMENT_ACTION_148", + "MOVEMENT_ACTION_149", + "MOVEMENT_ACTION_150", + "MOVEMENT_ACTION_151", + "MOVEMENT_ACTION_152", + "MOVEMENT_ACTION_153", + "MAX_MOVEMENT_ACTION", "MOVEMENT_ACTION_END" ], "overrides": { diff --git a/res/field/scripts/scripts_acuity_lakefront.s b/res/field/scripts/scripts_acuity_lakefront.s index 2df437a6a1..299ab4e439 100644 --- a/res/field/scripts/scripts_acuity_lakefront.s +++ b/res/field/scripts/scripts_acuity_lakefront.s @@ -66,17 +66,17 @@ _009A: .balign 4, 0 _00E8: - MoveAction_00C 6 + MoveAction_012 6 EndMovement .balign 4, 0 _00F0: - MoveAction_00D 6 + MoveAction_013 6 EndMovement .balign 4, 0 _00F8: - MoveAction_00C 3 - MoveAction_00E - MoveAction_00C 4 + MoveAction_012 3 + MoveAction_014 + MoveAction_012 4 EndMovement diff --git a/res/field/scripts/scripts_amity_square.s b/res/field/scripts/scripts_amity_square.s index a8ff53abd8..6c35270976 100644 --- a/res/field/scripts/scripts_amity_square.s +++ b/res/field/scripts/scripts_amity_square.s @@ -269,22 +269,22 @@ _0389: .balign 4, 0 _03B0: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _03B8: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _03C0: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _03C8: - MoveAction_00C + MoveAction_012 EndMovement .byte 85 @@ -1418,176 +1418,176 @@ _174A: .balign 4, 0 _1758: MoveAction_001 - MoveAction_045 + MoveAction_069 EndMovement .balign 4, 0 _1764: MoveAction_001 - MoveAction_046 + MoveAction_070 EndMovement .balign 4, 0 _1770: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _1778: - MoveAction_017 18 + MoveAction_023 18 EndMovement .balign 4, 0 _1780: - MoveAction_017 19 - MoveAction_014 + MoveAction_023 19 + MoveAction_020 EndMovement .balign 4, 0 _178C: - MoveAction_017 17 - MoveAction_014 + MoveAction_023 17 + MoveAction_020 EndMovement .balign 4, 0 _1798: - MoveAction_016 18 - MoveAction_015 2 + MoveAction_022 18 + MoveAction_021 2 EndMovement .balign 4, 0 _17A4: - MoveAction_016 17 - MoveAction_015 + MoveAction_022 17 + MoveAction_021 EndMovement .balign 4, 0 _17B0: - MoveAction_016 19 - MoveAction_015 + MoveAction_022 19 + MoveAction_021 EndMovement .balign 4, 0 _17BC: - MoveAction_016 5 - MoveAction_014 16 + MoveAction_022 5 + MoveAction_020 16 EndMovement .balign 4, 0 _17C8: - MoveAction_016 18 - MoveAction_014 18 + MoveAction_022 18 + MoveAction_020 18 EndMovement .balign 4, 0 _17D4: - MoveAction_016 38 - MoveAction_014 15 + MoveAction_022 38 + MoveAction_020 15 EndMovement .balign 4, 0 _17E0: - MoveAction_017 5 - MoveAction_015 18 + MoveAction_023 5 + MoveAction_021 18 EndMovement .balign 4, 0 _17EC: - MoveAction_016 31 - MoveAction_015 2 + MoveAction_022 31 + MoveAction_021 2 EndMovement .balign 4, 0 _17F8: - MoveAction_016 15 - MoveAction_014 + MoveAction_022 15 + MoveAction_020 EndMovement .balign 4, 0 _1804: - MoveAction_017 37 - MoveAction_015 16 + MoveAction_023 37 + MoveAction_021 16 EndMovement .balign 4, 0 _1810: - MoveAction_017 12 - MoveAction_014 + MoveAction_023 12 + MoveAction_020 EndMovement .balign 4, 0 _181C: - MoveAction_017 25 - MoveAction_015 6 + MoveAction_023 25 + MoveAction_021 6 EndMovement .balign 4, 0 _1828: - MoveAction_017 19 - MoveAction_015 19 + MoveAction_023 19 + MoveAction_021 19 EndMovement .balign 4, 0 _1834: - MoveAction_017 9 - MoveAction_015 9 + MoveAction_023 9 + MoveAction_021 9 EndMovement .balign 4, 0 _1840: - MoveAction_016 8 - MoveAction_015 2 + MoveAction_022 8 + MoveAction_021 2 EndMovement .balign 4, 0 _184C: - MoveAction_017 21 + MoveAction_023 21 EndMovement .balign 4, 0 _1854: - MoveAction_017 22 - MoveAction_015 25 + MoveAction_023 22 + MoveAction_021 25 EndMovement .balign 4, 0 _1860: - MoveAction_016 12 - MoveAction_015 + MoveAction_022 12 + MoveAction_021 EndMovement .balign 4, 0 _186C: - MoveAction_017 6 - MoveAction_014 7 + MoveAction_023 6 + MoveAction_020 7 EndMovement .balign 4, 0 _1878: - MoveAction_016 7 - MoveAction_014 9 + MoveAction_022 7 + MoveAction_020 9 EndMovement .balign 4, 0 _1884: - MoveAction_017 5 - MoveAction_015 18 + MoveAction_023 5 + MoveAction_021 18 EndMovement .balign 4, 0 _1890: - MoveAction_017 5 - MoveAction_014 8 + MoveAction_023 5 + MoveAction_020 8 EndMovement .balign 4, 0 _189C: - MoveAction_016 31 - MoveAction_014 24 + MoveAction_022 31 + MoveAction_020 24 EndMovement .balign 4, 0 _18A8: - MoveAction_016 15 - MoveAction_014 27 + MoveAction_022 15 + MoveAction_020 27 EndMovement diff --git a/res/field/scripts/scripts_battle_arcade.s b/res/field/scripts/scripts_battle_arcade.s index d8b304cf49..ccca377a6c 100644 --- a/res/field/scripts/scripts_battle_arcade.s +++ b/res/field/scripts/scripts_battle_arcade.s @@ -355,60 +355,60 @@ _05E1: .balign 4, 0 _05F0: - MoveAction_00C 2 - MoveAction_00F - MoveAction_00C 2 - MoveAction_045 + MoveAction_012 2 + MoveAction_015 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _0604: - MoveAction_00C 4 - MoveAction_045 + MoveAction_012 4 + MoveAction_069 EndMovement .balign 4, 0 _0610: - MoveAction_00C - MoveAction_00F - MoveAction_00C 2 - MoveAction_045 + MoveAction_012 + MoveAction_015 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _0624: - MoveAction_00C 3 - MoveAction_045 + MoveAction_012 3 + MoveAction_069 EndMovement .balign 4, 0 _0630: - MoveAction_015 2 - MoveAction_016 - MoveAction_015 2 + MoveAction_021 2 + MoveAction_022 + MoveAction_021 2 MoveAction_000 - MoveAction_046 + MoveAction_070 EndMovement .balign 4, 0 _0648: - MoveAction_015 4 + MoveAction_021 4 MoveAction_000 - MoveAction_046 + MoveAction_070 EndMovement .balign 4, 0 _0658: - MoveAction_015 - MoveAction_016 - MoveAction_015 2 - MoveAction_046 + MoveAction_021 + MoveAction_022 + MoveAction_021 2 + MoveAction_070 EndMovement .balign 4, 0 _066C: - MoveAction_015 3 - MoveAction_046 + MoveAction_021 3 + MoveAction_070 EndMovement _0678: diff --git a/res/field/scripts/scripts_battle_castle.s b/res/field/scripts/scripts_battle_castle.s index e4775b0c5e..b286c21c24 100644 --- a/res/field/scripts/scripts_battle_castle.s +++ b/res/field/scripts/scripts_battle_castle.s @@ -352,58 +352,58 @@ _05D5: .balign 4, 0 _05E4: - MoveAction_00E 6 - MoveAction_045 + MoveAction_014 6 + MoveAction_069 EndMovement .balign 4, 0 _05F0: - MoveAction_00E 3 - MoveAction_00C - MoveAction_00E 3 - MoveAction_045 + MoveAction_014 3 + MoveAction_012 + MoveAction_014 3 + MoveAction_069 EndMovement .balign 4, 0 _0604: - MoveAction_00E 5 - MoveAction_045 + MoveAction_014 5 + MoveAction_069 EndMovement .balign 4, 0 _0610: - MoveAction_00E 2 - MoveAction_00C - MoveAction_00E 3 - MoveAction_045 + MoveAction_014 2 + MoveAction_012 + MoveAction_014 3 + MoveAction_069 EndMovement .balign 4, 0 _0624: - MoveAction_017 6 - MoveAction_046 + MoveAction_023 6 + MoveAction_070 MoveAction_002 EndMovement .balign 4, 0 _0634: - MoveAction_017 6 - MoveAction_015 - MoveAction_046 + MoveAction_023 6 + MoveAction_021 + MoveAction_070 MoveAction_002 EndMovement .balign 4, 0 _0648: - MoveAction_017 5 - MoveAction_046 + MoveAction_023 5 + MoveAction_070 EndMovement .balign 4, 0 _0654: - MoveAction_015 - MoveAction_017 5 - MoveAction_046 + MoveAction_021 + MoveAction_023 5 + MoveAction_070 EndMovement _0664: diff --git a/res/field/scripts/scripts_battle_factory.s b/res/field/scripts/scripts_battle_factory.s index e8dbdb79f2..ba79b70726 100644 --- a/res/field/scripts/scripts_battle_factory.s +++ b/res/field/scripts/scripts_battle_factory.s @@ -299,68 +299,68 @@ _04B2: .balign 4, 0 _04C8: - MoveAction_00C 3 - MoveAction_00F - MoveAction_00C 4 - MoveAction_045 + MoveAction_012 3 + MoveAction_015 + MoveAction_012 4 + MoveAction_069 EndMovement .balign 4, 0 _04DC: - MoveAction_00C 3 - MoveAction_00E - MoveAction_00C 4 - MoveAction_045 + MoveAction_012 3 + MoveAction_014 + MoveAction_012 4 + MoveAction_069 EndMovement .balign 4, 0 _04F0: - MoveAction_00C 2 - MoveAction_00F - MoveAction_00C 4 - MoveAction_045 + MoveAction_012 2 + MoveAction_015 + MoveAction_012 4 + MoveAction_069 EndMovement .balign 4, 0 _0504: - MoveAction_00C 2 - MoveAction_00E - MoveAction_00C 4 - MoveAction_045 + MoveAction_012 2 + MoveAction_014 + MoveAction_012 4 + MoveAction_069 EndMovement .balign 4, 0 _0518: - MoveAction_015 3 - MoveAction_016 - MoveAction_015 4 + MoveAction_021 3 + MoveAction_022 + MoveAction_021 4 MoveAction_000 - MoveAction_046 + MoveAction_070 EndMovement .balign 4, 0 _0530: - MoveAction_015 3 - MoveAction_017 - MoveAction_015 4 + MoveAction_021 3 + MoveAction_023 + MoveAction_021 4 MoveAction_000 - MoveAction_046 + MoveAction_070 EndMovement .balign 4, 0 _0548: - MoveAction_015 2 - MoveAction_016 - MoveAction_015 4 - MoveAction_046 + MoveAction_021 2 + MoveAction_022 + MoveAction_021 4 + MoveAction_070 EndMovement .balign 4, 0 _055C: - MoveAction_015 2 - MoveAction_017 - MoveAction_015 4 - MoveAction_046 + MoveAction_021 2 + MoveAction_023 + MoveAction_021 4 + MoveAction_070 EndMovement _0570: diff --git a/res/field/scripts/scripts_battle_frontier.s b/res/field/scripts/scripts_battle_frontier.s index 00c3d77bd8..07cc81acd3 100644 --- a/res/field/scripts/scripts_battle_frontier.s +++ b/res/field/scripts/scripts_battle_frontier.s @@ -381,7 +381,7 @@ _0360: .balign 4, 0 _0398: - MoveAction_012 5 + MoveAction_018 5 EndMovement _03A0: @@ -398,7 +398,7 @@ _03A0: .balign 4, 0 _03D8: - MoveAction_012 6 + MoveAction_018 6 EndMovement _03E0: @@ -415,7 +415,7 @@ _03E0: .balign 4, 0 _0418: - MoveAction_013 5 + MoveAction_019 5 EndMovement _0420: @@ -432,7 +432,7 @@ _0420: .balign 4, 0 _0458: - MoveAction_013 6 + MoveAction_019 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 adba4a05d4..7379809476 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 @@ -274,8 +274,8 @@ _0344: .balign 4, 0 _034C: - MoveAction_00C 3 - MoveAction_022 + MoveAction_012 3 + MoveAction_034 EndMovement _0358: diff --git a/res/field/scripts/scripts_battle_hall.s b/res/field/scripts/scripts_battle_hall.s index f47d739dab..669fc5b208 100644 --- a/res/field/scripts/scripts_battle_hall.s +++ b/res/field/scripts/scripts_battle_hall.s @@ -471,66 +471,66 @@ _07C8: .balign 4, 0 _07D4: - MoveAction_00E 4 - MoveAction_00D 3 - MoveAction_045 + MoveAction_014 4 + MoveAction_013 3 + MoveAction_069 EndMovement .balign 4, 0 _07E4: - MoveAction_00E 2 - MoveAction_00C - MoveAction_00E 2 - MoveAction_00D 3 - MoveAction_045 + MoveAction_014 2 + MoveAction_012 + MoveAction_014 2 + MoveAction_013 3 + MoveAction_069 EndMovement .balign 4, 0 _07FC: - MoveAction_00E 3 - MoveAction_00D 3 - MoveAction_045 + MoveAction_014 3 + MoveAction_013 3 + MoveAction_069 EndMovement .balign 4, 0 _080C: - MoveAction_00E - MoveAction_00C - MoveAction_00E 2 - MoveAction_00D 3 - MoveAction_045 + MoveAction_014 + MoveAction_012 + MoveAction_014 2 + MoveAction_013 3 + MoveAction_069 EndMovement .balign 4, 0 _0824: - MoveAction_017 4 - MoveAction_014 3 + MoveAction_023 4 + MoveAction_020 3 MoveAction_002 - MoveAction_046 + MoveAction_070 EndMovement .balign 4, 0 _0838: - MoveAction_017 2 - MoveAction_015 - MoveAction_017 2 - MoveAction_014 3 + MoveAction_023 2 + MoveAction_021 + MoveAction_023 2 + MoveAction_020 3 MoveAction_002 - MoveAction_046 + MoveAction_070 EndMovement .balign 4, 0 _0854: - MoveAction_014 3 - MoveAction_017 3 - MoveAction_046 + MoveAction_020 3 + MoveAction_023 3 + MoveAction_070 EndMovement .balign 4, 0 _0864: - MoveAction_014 2 - MoveAction_017 3 - MoveAction_046 + MoveAction_020 2 + MoveAction_023 3 + MoveAction_070 EndMovement _0874: diff --git a/res/field/scripts/scripts_battle_park.s b/res/field/scripts/scripts_battle_park.s index ce22a0a8b6..b22a6a1026 100644 --- a/res/field/scripts/scripts_battle_park.s +++ b/res/field/scripts/scripts_battle_park.s @@ -154,59 +154,59 @@ _027C: .balign 4, 0 _0290: - MoveAction_03E 7 - MoveAction_025 - MoveAction_047 - MoveAction_010 - MoveAction_048 + MoveAction_062 7 + MoveAction_037 + MoveAction_071 + MoveAction_016 + MoveAction_072 EndMovement .balign 4, 0 _02A8: - MoveAction_03F - MoveAction_023 - MoveAction_020 + MoveAction_063 + MoveAction_035 + MoveAction_032 EndMovement .balign 4, 0 _02B8: - MoveAction_03F - MoveAction_022 - MoveAction_020 + MoveAction_063 + MoveAction_034 + MoveAction_032 EndMovement .balign 4, 0 _02C8: - MoveAction_010 8 + MoveAction_016 8 EndMovement .balign 4, 0 _02D0: - MoveAction_022 - MoveAction_023 - MoveAction_021 + MoveAction_034 + MoveAction_035 + MoveAction_033 EndMovement .balign 4, 0 _02E0: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _02E8: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _02F0: - MoveAction_013 - MoveAction_010 8 + MoveAction_019 + MoveAction_016 8 EndMovement .balign 4, 0 _02FC: - MoveAction_012 - MoveAction_010 8 + MoveAction_018 + MoveAction_016 8 EndMovement _0308: diff --git a/res/field/scripts/scripts_battle_tower.s b/res/field/scripts/scripts_battle_tower.s index 688c009e6e..e973ceb9f8 100644 --- a/res/field/scripts/scripts_battle_tower.s +++ b/res/field/scripts/scripts_battle_tower.s @@ -1096,26 +1096,26 @@ _1205: .balign 4, 0 _1248: - MoveAction_03E - MoveAction_00C 2 + MoveAction_062 + MoveAction_012 2 EndMovement .balign 4, 0 _1254: - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 EndMovement .balign 4, 0 _1260: - MoveAction_03E - MoveAction_00C 2 + MoveAction_062 + MoveAction_012 2 EndMovement .balign 4, 0 _126C: - MoveAction_00C 2 - MoveAction_045 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 diff --git a/res/field/scripts/scripts_battle_tower_battle_room.s b/res/field/scripts/scripts_battle_tower_battle_room.s index 1cd45e6df1..1004038773 100644 --- a/res/field/scripts/scripts_battle_tower_battle_room.s +++ b/res/field/scripts/scripts_battle_tower_battle_room.s @@ -328,56 +328,56 @@ _04CE: .balign 4, 0 _0504: - MoveAction_03E - MoveAction_00C + MoveAction_062 + MoveAction_012 MoveAction_002 - MoveAction_00E 3 + MoveAction_014 3 MoveAction_000 - MoveAction_00C 3 + MoveAction_012 3 MoveAction_003 EndMovement .balign 4, 0 _0524: - MoveAction_00D + MoveAction_013 MoveAction_003 - MoveAction_00F 3 + MoveAction_015 3 MoveAction_001 - MoveAction_00D 3 + MoveAction_013 3 MoveAction_002 EndMovement .balign 4, 0 _0540: - MoveAction_00F + MoveAction_015 EndMovement .balign 4, 0 _0548: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _0550: MoveAction_003 - MoveAction_00F + MoveAction_015 MoveAction_000 - MoveAction_00C 3 + MoveAction_012 3 MoveAction_002 - MoveAction_00E 3 + MoveAction_014 3 MoveAction_000 - MoveAction_00C + MoveAction_012 EndMovement .balign 4, 0 _0574: - MoveAction_00E + MoveAction_014 MoveAction_002 EndMovement .balign 4, 0 _0580: - MoveAction_00F + MoveAction_015 EndMovement .balign 4, 0 @@ -388,7 +388,7 @@ _0588: .balign 4, 0 _0590: MoveAction_002 - MoveAction_00E + MoveAction_014 MoveAction_003 EndMovement @@ -401,7 +401,7 @@ _05A0: _05A8: MoveAction_009 MoveAction_003 - MoveAction_00B 3 + MoveAction_011 3 MoveAction_001 MoveAction_009 3 MoveAction_002 diff --git a/res/field/scripts/scripts_battle_tower_battle_salon.s b/res/field/scripts/scripts_battle_tower_battle_salon.s index c96cebea53..9901ee1e0a 100644 --- a/res/field/scripts/scripts_battle_tower_battle_salon.s +++ b/res/field/scripts/scripts_battle_tower_battle_salon.s @@ -445,7 +445,7 @@ _06A3: .balign 4, 0 _06B8: - MoveAction_00D 2 + MoveAction_013 2 EndMovement .balign 4, 0 @@ -455,40 +455,40 @@ _06C0: .balign 4, 0 _06C8: - MoveAction_00D 2 - MoveAction_00E + MoveAction_013 2 + MoveAction_014 MoveAction_003 EndMovement .balign 4, 0 _06D8: - MoveAction_00F + MoveAction_015 MoveAction_001 EndMovement .balign 4, 0 _06E4: MoveAction_001 - MoveAction_012 + MoveAction_018 MoveAction_003 EndMovement .balign 4, 0 _06F4: - MoveAction_013 + MoveAction_019 MoveAction_001 EndMovement .balign 4, 0 _0700: - MoveAction_00C 2 - MoveAction_045 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _070C: - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 EndMovement .balign 4, 0 @@ -498,79 +498,79 @@ _0718: .balign 4, 0 _0720: - MoveAction_010 2 - MoveAction_045 + MoveAction_016 2 + MoveAction_069 EndMovement .balign 4, 0 _072C: - MoveAction_011 - MoveAction_012 3 - MoveAction_010 7 - MoveAction_012 2 + MoveAction_017 + MoveAction_018 3 + MoveAction_016 7 + MoveAction_018 2 EndMovement .balign 4, 0 _0740: - MoveAction_012 - MoveAction_010 - MoveAction_012 2 - MoveAction_010 5 - MoveAction_012 2 + MoveAction_018 + MoveAction_016 + MoveAction_018 2 + MoveAction_016 5 + MoveAction_018 2 EndMovement .balign 4, 0 _0758: - MoveAction_013 - MoveAction_010 2 - MoveAction_013 3 + MoveAction_019 + MoveAction_016 2 + MoveAction_019 3 EndMovement .balign 4, 0 _0768: - MoveAction_010 2 - MoveAction_013 4 + MoveAction_016 2 + MoveAction_019 4 EndMovement .balign 4, 0 _0774: - MoveAction_012 - MoveAction_010 4 - MoveAction_012 2 + MoveAction_018 + MoveAction_016 4 + MoveAction_018 2 EndMovement .balign 4, 0 _0784: - MoveAction_010 4 - MoveAction_012 3 + MoveAction_016 4 + MoveAction_018 3 EndMovement .balign 4, 0 _0790: - MoveAction_011 - MoveAction_013 4 - MoveAction_010 7 - MoveAction_013 2 + MoveAction_017 + MoveAction_019 4 + MoveAction_016 7 + MoveAction_019 2 EndMovement .balign 4, 0 _07A4: - MoveAction_010 - MoveAction_013 4 - MoveAction_010 5 - MoveAction_013 2 + MoveAction_016 + MoveAction_019 4 + MoveAction_016 5 + MoveAction_019 2 EndMovement .balign 4, 0 _07B8: - MoveAction_012 - MoveAction_010 5 - MoveAction_013 2 + MoveAction_018 + MoveAction_016 5 + MoveAction_019 2 EndMovement .balign 4, 0 _07C8: - MoveAction_013 3 - MoveAction_010 5 - MoveAction_012 2 + MoveAction_019 3 + MoveAction_016 5 + MoveAction_018 2 EndMovement diff --git a/res/field/scripts/scripts_battle_tower_corridor.s b/res/field/scripts/scripts_battle_tower_corridor.s index e33c49b04c..7457966ede 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_00D 3 + MoveAction_013 3 MoveAction_000 EndMovement .balign 4, 0 _014C: - MoveAction_00D 2 + MoveAction_013 2 EndMovement .byte 0 @@ -154,60 +154,60 @@ _014C: .balign 4, 0 _0178: - MoveAction_00F 4 - MoveAction_00C 2 - MoveAction_045 + MoveAction_015 4 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _0188: - MoveAction_00D - MoveAction_00F 4 - MoveAction_00C 2 - MoveAction_045 + MoveAction_013 + MoveAction_015 4 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _019C: - MoveAction_00F 8 - MoveAction_00C 2 - MoveAction_045 + MoveAction_015 8 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _01AC: - MoveAction_00D - MoveAction_00F 8 - MoveAction_00C 2 - MoveAction_045 + MoveAction_013 + MoveAction_015 8 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _01C0: - MoveAction_00F 12 - MoveAction_00C 2 - MoveAction_045 + MoveAction_015 12 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _01D0: - MoveAction_00D - MoveAction_00F 12 - MoveAction_00C 2 - MoveAction_045 + MoveAction_013 + MoveAction_015 12 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _01E4: - MoveAction_00F 16 - MoveAction_00C 2 - MoveAction_045 + MoveAction_015 16 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _01F4: - MoveAction_00D - MoveAction_00F 16 - MoveAction_00C 2 - MoveAction_045 + MoveAction_013 + MoveAction_015 16 + MoveAction_012 2 + MoveAction_069 EndMovement diff --git a/res/field/scripts/scripts_battle_tower_corridor_multi.s b/res/field/scripts/scripts_battle_tower_corridor_multi.s index bba5e8988b..c403815e0f 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_00D 3 + MoveAction_013 3 MoveAction_000 EndMovement .balign 4, 0 _0180: - MoveAction_00D 2 + MoveAction_013 2 EndMovement .balign 4, 0 _0188: - MoveAction_00D - MoveAction_00F 5 + MoveAction_013 + MoveAction_015 5 EndMovement .balign 4, 0 _0194: - MoveAction_00D - MoveAction_00E 5 + MoveAction_013 + MoveAction_014 5 EndMovement .balign 4, 0 _01A0: - MoveAction_00C 2 - MoveAction_045 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _01AC: - MoveAction_00F 5 - MoveAction_00C - MoveAction_03F + MoveAction_015 5 + MoveAction_012 + MoveAction_063 MoveAction_003 - MoveAction_03E + MoveAction_062 MoveAction_000 - MoveAction_03E + MoveAction_062 EndMovement .balign 4, 0 _01CC: - MoveAction_00E 5 - MoveAction_00C - MoveAction_03F + MoveAction_014 5 + MoveAction_012 + MoveAction_063 MoveAction_002 - MoveAction_03E + MoveAction_062 MoveAction_000 - MoveAction_03E + MoveAction_062 EndMovement .balign 4, 0 _01EC: - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 EndMovement diff --git a/res/field/scripts/scripts_battle_tower_elevator.s b/res/field/scripts/scripts_battle_tower_elevator.s index acd78bdcf2..876010dfd1 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_00C 2 + MoveAction_012 2 MoveAction_001 EndMovement .balign 4, 0 _01C8: - MoveAction_00D + MoveAction_013 MoveAction_002 - MoveAction_00E + MoveAction_014 MoveAction_001 - MoveAction_00D - MoveAction_045 + MoveAction_013 + MoveAction_069 EndMovement .balign 4, 0 _01E4: - MoveAction_03F 2 - MoveAction_03D - MoveAction_00D 2 - MoveAction_045 + MoveAction_063 2 + MoveAction_061 + MoveAction_013 2 + MoveAction_069 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 e0325819ad..99e67cd3f4 100644 --- a/res/field/scripts/scripts_battle_tower_multi_battle_room.s +++ b/res/field/scripts/scripts_battle_tower_multi_battle_room.s @@ -342,74 +342,74 @@ _0589: .balign 4, 0 _05B0: - MoveAction_00C - MoveAction_00E 3 - MoveAction_00C 3 + MoveAction_012 + MoveAction_014 3 + MoveAction_012 3 MoveAction_003 EndMovement .balign 4, 0 _05C4: - MoveAction_00C - MoveAction_00E 4 - MoveAction_00C 2 + MoveAction_012 + MoveAction_014 4 + MoveAction_012 2 MoveAction_003 EndMovement .balign 4, 0 _05D8: - MoveAction_00D - MoveAction_00F 3 - MoveAction_00D 3 + MoveAction_013 + MoveAction_015 3 + MoveAction_013 3 MoveAction_002 EndMovement .balign 4, 0 _05EC: - MoveAction_00D - MoveAction_00F 4 - MoveAction_00D 2 + MoveAction_013 + MoveAction_015 4 + MoveAction_013 2 MoveAction_002 EndMovement .balign 4, 0 _0600: - MoveAction_00F + MoveAction_015 EndMovement .balign 4, 0 _0608: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _0610: - MoveAction_01E + MoveAction_030 EndMovement .balign 4, 0 _0618: - MoveAction_00C 3 - MoveAction_00E 2 - MoveAction_00C + MoveAction_012 3 + MoveAction_014 2 + MoveAction_012 EndMovement .balign 4, 0 _0628: - MoveAction_00C 2 - MoveAction_00E 3 - MoveAction_00C + MoveAction_012 2 + MoveAction_014 3 + MoveAction_012 EndMovement .balign 4, 0 _0638: - MoveAction_00E + MoveAction_014 MoveAction_002 EndMovement .balign 4, 0 _0644: - MoveAction_00F + MoveAction_015 EndMovement .balign 4, 0 @@ -420,7 +420,7 @@ _064C: .balign 4, 0 _0654: MoveAction_002 - MoveAction_00E + MoveAction_014 MoveAction_003 EndMovement diff --git a/res/field/scripts/scripts_battleground.s b/res/field/scripts/scripts_battleground.s index 2ae9ef4ea9..fb2eb58ba9 100644 --- a/res/field/scripts/scripts_battleground.s +++ b/res/field/scripts/scripts_battleground.s @@ -140,45 +140,45 @@ _01FD: .balign 4, 0 _0214: - MoveAction_03F 2 - MoveAction_022 + MoveAction_063 2 + MoveAction_034 EndMovement .balign 4, 0 _0220: - MoveAction_03F - MoveAction_021 - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_033 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _0234: - MoveAction_03F 2 - MoveAction_022 + MoveAction_063 2 + MoveAction_034 EndMovement .balign 4, 0 _0240: - MoveAction_00E - MoveAction_00D - MoveAction_00E 3 - MoveAction_00D 2 + MoveAction_014 + MoveAction_013 + MoveAction_014 3 + MoveAction_013 2 EndMovement .balign 4, 0 _0254: - MoveAction_00D - MoveAction_00E 4 - MoveAction_00D 2 + MoveAction_013 + MoveAction_014 4 + MoveAction_013 2 EndMovement .balign 4, 0 _0264: - MoveAction_00E - MoveAction_00D - MoveAction_00E 3 - MoveAction_00D 2 + MoveAction_014 + MoveAction_013 + MoveAction_014 3 + MoveAction_013 2 EndMovement _0278: @@ -196,13 +196,13 @@ _0278: .balign 4, 0 _02A0: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _02A8: - MoveAction_00C 2 - MoveAction_00F 4 + MoveAction_012 2 + MoveAction_015 4 EndMovement _02B4: diff --git a/res/field/scripts/scripts_canalave_city.s b/res/field/scripts/scripts_canalave_city.s index 6b1628a511..984ed68848 100644 --- a/res/field/scripts/scripts_canalave_city.s +++ b/res/field/scripts/scripts_canalave_city.s @@ -193,20 +193,20 @@ _0334: .balign 4, 0 _0340: - MoveAction_013 4 - MoveAction_03F - MoveAction_04B - MoveAction_03F + MoveAction_019 4 + MoveAction_063 + MoveAction_075 + MoveAction_063 EndMovement .balign 4, 0 _0354: - MoveAction_013 4 + MoveAction_019 4 EndMovement .balign 4, 0 _035C: - MoveAction_012 9 + MoveAction_018 9 EndMovement _0364: @@ -236,15 +236,15 @@ _0377: .balign 4, 0 _03AC: - MoveAction_011 - MoveAction_012 5 - MoveAction_010 10 + MoveAction_017 + MoveAction_018 5 + MoveAction_016 10 EndMovement .balign 4, 0 _03BC: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement _03C8: @@ -305,40 +305,40 @@ _0473: .balign 4, 0 _0490: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0498: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _04A0: - MoveAction_03F 2 - MoveAction_020 + MoveAction_063 2 + MoveAction_032 EndMovement .balign 4, 0 _04AC: - MoveAction_012 5 - MoveAction_010 2 + MoveAction_018 5 + MoveAction_016 2 EndMovement .balign 4, 0 _04B8: - MoveAction_011 6 + MoveAction_017 6 EndMovement .balign 4, 0 _04C0: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _04C8: - MoveAction_011 3 - MoveAction_013 9 + MoveAction_017 3 + MoveAction_019 9 EndMovement _04D4: @@ -634,32 +634,32 @@ _08A5: .balign 4, 0 _08C0: MoveAction_003 - MoveAction_040 + MoveAction_064 EndMovement .balign 4, 0 _08CC: - MoveAction_045 + MoveAction_069 EndMovement .balign 4, 0 _08D4: - MoveAction_00D + MoveAction_013 MoveAction_003 - MoveAction_040 + MoveAction_064 EndMovement .balign 4, 0 _08E4: - MoveAction_00F - MoveAction_040 + MoveAction_015 + MoveAction_064 EndMovement .balign 4, 0 _08F0: - MoveAction_00C + MoveAction_012 MoveAction_003 - MoveAction_040 + MoveAction_064 EndMovement _0900: @@ -709,16 +709,16 @@ _0959: .balign 4, 0 _099C: - MoveAction_04B - MoveAction_00F 3 - MoveAction_00C + MoveAction_075 + MoveAction_015 3 + MoveAction_012 EndMovement .balign 4, 0 _09AC: - MoveAction_00D - MoveAction_00E 3 - MoveAction_00D 8 + MoveAction_013 + MoveAction_014 3 + MoveAction_013 8 EndMovement _09BC: @@ -756,11 +756,11 @@ _09FA: .balign 4, 0 _0A38: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0A40: - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 EndMovement diff --git a/res/field/scripts/scripts_canalave_city_harbor_inn.s b/res/field/scripts/scripts_canalave_city_harbor_inn.s index 5bb8183210..b211cf4bb8 100644 --- a/res/field/scripts/scripts_canalave_city_harbor_inn.s +++ b/res/field/scripts/scripts_canalave_city_harbor_inn.s @@ -79,20 +79,20 @@ _0093: .balign 4, 0 _0130: - MoveAction_00C - MoveAction_00F 3 - MoveAction_00C - MoveAction_00F - MoveAction_021 + MoveAction_012 + MoveAction_015 3 + MoveAction_012 + MoveAction_015 + MoveAction_033 EndMovement .balign 4, 0 _0148: - MoveAction_00F 3 - MoveAction_00C 2 - MoveAction_021 - MoveAction_03F 2 - MoveAction_023 + MoveAction_015 3 + MoveAction_012 2 + MoveAction_033 + MoveAction_063 2 + MoveAction_035 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 ecd833588e..3bcc9a38f7 100644 --- a/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s +++ b/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s @@ -205,25 +205,25 @@ _02AC: .balign 4, 0 _02B4: - MoveAction_00C 2 - MoveAction_00F 2 + MoveAction_012 2 + MoveAction_015 2 EndMovement .balign 4, 0 _02C0: MoveAction_000 - MoveAction_047 - MoveAction_00D - MoveAction_048 + MoveAction_071 + MoveAction_013 + MoveAction_072 EndMovement .balign 4, 0 _02D4: - MoveAction_00F + MoveAction_015 EndMovement .balign 4, 0 _02DC: - MoveAction_00E 3 - MoveAction_00D 2 + MoveAction_014 3 + MoveAction_013 2 EndMovement diff --git a/res/field/scripts/scripts_canalave_library_1f.s b/res/field/scripts/scripts_canalave_library_1f.s index 2edbabdbef..94f6c0c3f4 100644 --- a/res/field/scripts/scripts_canalave_library_1f.s +++ b/res/field/scripts/scripts_canalave_library_1f.s @@ -137,28 +137,28 @@ _0175: .balign 4, 0 _018C: - MoveAction_00E 5 - MoveAction_00D 6 - MoveAction_03E + MoveAction_014 5 + MoveAction_013 6 + MoveAction_062 EndMovement .balign 4, 0 _019C: - MoveAction_00D - MoveAction_00E 5 - MoveAction_00D 5 - MoveAction_03E + MoveAction_013 + MoveAction_014 5 + MoveAction_013 5 + MoveAction_062 EndMovement .balign 4, 0 _01B0: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _01BC: - MoveAction_03F 2 - MoveAction_03E - MoveAction_022 + MoveAction_063 2 + MoveAction_062 + MoveAction_034 EndMovement diff --git a/res/field/scripts/scripts_canalave_library_2f.s b/res/field/scripts/scripts_canalave_library_2f.s index a9665d955b..fce175395a 100644 --- a/res/field/scripts/scripts_canalave_library_2f.s +++ b/res/field/scripts/scripts_canalave_library_2f.s @@ -131,38 +131,38 @@ _0159: .balign 4, 0 _019C: - MoveAction_023 - MoveAction_04B - MoveAction_00F - MoveAction_00C - MoveAction_023 + MoveAction_035 + MoveAction_075 + MoveAction_015 + MoveAction_012 + MoveAction_035 EndMovement .balign 4, 0 _01B4: - MoveAction_021 - MoveAction_020 - MoveAction_023 + MoveAction_033 + MoveAction_032 + MoveAction_035 EndMovement .balign 4, 0 _01C4: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _01CC: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _01D4: - MoveAction_03F 2 - MoveAction_00F 2 + MoveAction_063 2 + MoveAction_015 2 EndMovement .balign 4, 0 _01E0: - MoveAction_00D - MoveAction_020 + MoveAction_013 + MoveAction_032 EndMovement diff --git a/res/field/scripts/scripts_canalave_library_3f.s b/res/field/scripts/scripts_canalave_library_3f.s index e67c18b354..8f2b052d74 100644 --- a/res/field/scripts/scripts_canalave_library_3f.s +++ b/res/field/scripts/scripts_canalave_library_3f.s @@ -191,145 +191,145 @@ _0184: .balign 4, 0 _02C0: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _02C8: - MoveAction_00B - MoveAction_021 + MoveAction_011 + MoveAction_033 EndMovement .balign 4, 0 _02D4: - MoveAction_00E - MoveAction_020 + MoveAction_014 + MoveAction_032 EndMovement .balign 4, 0 _02E0: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _02E8: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _02F0: - MoveAction_00F - MoveAction_00C 4 - MoveAction_00E 5 - MoveAction_00C 3 - MoveAction_021 + MoveAction_015 + MoveAction_012 4 + MoveAction_014 5 + MoveAction_012 3 + MoveAction_033 EndMovement .balign 4, 0 _0308: - MoveAction_00F + MoveAction_015 EndMovement .balign 4, 0 _0310: - MoveAction_03F 3 - MoveAction_021 - MoveAction_00D 2 - MoveAction_00F - MoveAction_00D - MoveAction_00F 2 - MoveAction_00D + MoveAction_063 3 + MoveAction_033 + MoveAction_013 2 + MoveAction_015 + MoveAction_013 + MoveAction_015 2 + MoveAction_013 EndMovement .balign 4, 0 _0330: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0338: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0340: - MoveAction_00B 3 + MoveAction_011 3 EndMovement .balign 4, 0 _0348: - MoveAction_00A 3 + MoveAction_010 3 EndMovement .balign 4, 0 _0350: - MoveAction_010 - MoveAction_021 + MoveAction_016 + MoveAction_033 EndMovement .balign 4, 0 _035C: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _0364: - MoveAction_00D - MoveAction_00F 2 - MoveAction_020 - MoveAction_00D - MoveAction_00F - MoveAction_00D - MoveAction_00F 3 - MoveAction_00D + MoveAction_013 + MoveAction_015 2 + MoveAction_032 + MoveAction_013 + MoveAction_015 + MoveAction_013 + MoveAction_015 3 + MoveAction_013 EndMovement .balign 4, 0 _0388: - MoveAction_012 4 - MoveAction_010 3 - MoveAction_013 - MoveAction_045 + MoveAction_018 4 + MoveAction_016 3 + MoveAction_019 + MoveAction_069 EndMovement .balign 4, 0 _039C: - MoveAction_027 + MoveAction_039 EndMovement .balign 4, 0 _03A4: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _03AC: - MoveAction_010 + MoveAction_016 EndMovement .balign 4, 0 _03B4: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _03BC: - MoveAction_00E - MoveAction_00C 5 - MoveAction_00E 2 - MoveAction_00C 2 - MoveAction_00F - MoveAction_045 + MoveAction_014 + MoveAction_012 5 + MoveAction_014 2 + MoveAction_012 2 + MoveAction_015 + MoveAction_069 EndMovement .balign 4, 0 _03D8: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _03E0: - MoveAction_020 + MoveAction_032 EndMovement _03E8: diff --git a/res/field/scripts/scripts_celestic_town.s b/res/field/scripts/scripts_celestic_town.s index 66859a2d1a..0839f098ec 100644 --- a/res/field/scripts/scripts_celestic_town.s +++ b/res/field/scripts/scripts_celestic_town.s @@ -112,60 +112,60 @@ _0191: .balign 4, 0 _0198: - MoveAction_012 3 - MoveAction_011 9 + MoveAction_018 3 + MoveAction_017 9 EndMovement .balign 4, 0 _01A4: - MoveAction_011 2 - MoveAction_012 3 - MoveAction_011 7 + MoveAction_017 2 + MoveAction_018 3 + MoveAction_017 7 EndMovement .balign 4, 0 _01B4: - MoveAction_00C 8 - MoveAction_00E 2 + MoveAction_012 8 + MoveAction_014 2 EndMovement .balign 4, 0 _01C0: - MoveAction_00C 8 - MoveAction_00E 2 - MoveAction_020 + MoveAction_012 8 + MoveAction_014 2 + MoveAction_032 EndMovement .balign 4, 0 _01D0: - MoveAction_00C 8 - MoveAction_00E 4 - MoveAction_020 + MoveAction_012 8 + MoveAction_014 4 + MoveAction_032 EndMovement .balign 4, 0 _01E0: - MoveAction_022 - MoveAction_03F - MoveAction_021 + MoveAction_034 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _01F0: - MoveAction_03F 3 - MoveAction_021 + MoveAction_063 3 + MoveAction_033 EndMovement .balign 4, 0 _01FC: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0204: - MoveAction_03F 8 - MoveAction_03E - MoveAction_023 + MoveAction_063 8 + MoveAction_062 + MoveAction_035 EndMovement .byte 63 @@ -211,7 +211,7 @@ _024A: .balign 4, 0 _025C: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 @@ -258,23 +258,23 @@ _0294: .balign 4, 0 _02E0: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _02E8: - MoveAction_04B - MoveAction_00E 2 + MoveAction_075 + MoveAction_014 2 EndMovement .balign 4, 0 _02F4: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _02FC: - MoveAction_022 + MoveAction_034 EndMovement _0304: diff --git a/res/field/scripts/scripts_celestic_town_cave.s b/res/field/scripts/scripts_celestic_town_cave.s index 98795bc014..6bf6b8e6ab 100644 --- a/res/field/scripts/scripts_celestic_town_cave.s +++ b/res/field/scripts/scripts_celestic_town_cave.s @@ -255,81 +255,81 @@ _0393: .balign 4, 0 _039C: - MoveAction_00C 6 - MoveAction_00F - MoveAction_00C - MoveAction_00F 5 - MoveAction_020 + MoveAction_012 6 + MoveAction_015 + MoveAction_012 + MoveAction_015 5 + MoveAction_032 EndMovement .balign 4, 0 _03B4: - MoveAction_00C 6 - MoveAction_00F - MoveAction_00C - MoveAction_00F 4 - MoveAction_020 + MoveAction_012 6 + MoveAction_015 + MoveAction_012 + MoveAction_015 4 + MoveAction_032 EndMovement .balign 4, 0 _03CC: - MoveAction_00E - MoveAction_00C + MoveAction_014 + MoveAction_012 EndMovement .balign 4, 0 _03D8: - MoveAction_00F - MoveAction_00C + MoveAction_015 + MoveAction_012 EndMovement .balign 4, 0 _03E4: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _03EC: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _03F4: - MoveAction_03F + MoveAction_063 MoveAction_003 - MoveAction_047 - MoveAction_012 - MoveAction_048 + MoveAction_071 + MoveAction_018 + MoveAction_072 EndMovement .balign 4, 0 _040C: - MoveAction_03F + MoveAction_063 MoveAction_002 - MoveAction_047 - MoveAction_013 - MoveAction_048 + MoveAction_071 + MoveAction_019 + MoveAction_072 EndMovement .balign 4, 0 _0424: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _042C: - MoveAction_00F + MoveAction_015 EndMovement .balign 4, 0 _0434: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _043C: - MoveAction_00C - MoveAction_023 + MoveAction_012 + MoveAction_035 EndMovement .byte 12 @@ -347,13 +347,13 @@ _043C: .balign 4, 0 _0454: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _045C: - MoveAction_00C - MoveAction_022 + MoveAction_012 + MoveAction_034 EndMovement .byte 12 @@ -371,90 +371,90 @@ _045C: .balign 4, 0 _0474: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _047C: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _0488: - MoveAction_00C 6 - MoveAction_00F - MoveAction_00C - MoveAction_00F 5 - MoveAction_00C + MoveAction_012 6 + MoveAction_015 + MoveAction_012 + MoveAction_015 5 + MoveAction_012 EndMovement .balign 4, 0 _04A0: - MoveAction_00C 6 - MoveAction_00F - MoveAction_00C - MoveAction_00F 4 - MoveAction_00C + MoveAction_012 6 + MoveAction_015 + MoveAction_012 + MoveAction_015 4 + MoveAction_012 EndMovement .balign 4, 0 _04B8: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _04C0: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _04CC: - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _04D8: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _04E0: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _04E8: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _04F0: - MoveAction_00D - MoveAction_00E 5 - MoveAction_00D - MoveAction_00E - MoveAction_00D 6 + MoveAction_013 + MoveAction_014 5 + MoveAction_013 + MoveAction_014 + MoveAction_013 6 EndMovement .balign 4, 0 _0508: - MoveAction_00D - MoveAction_00E 4 - MoveAction_00D - MoveAction_00E - MoveAction_00D 6 + MoveAction_013 + MoveAction_014 4 + MoveAction_013 + MoveAction_014 + MoveAction_013 6 EndMovement .balign 4, 0 _0520: - MoveAction_00D - MoveAction_00E 5 - MoveAction_00D - MoveAction_00E - MoveAction_00D 6 + MoveAction_013 + MoveAction_014 5 + MoveAction_013 + MoveAction_014 + MoveAction_013 6 EndMovement _0538: @@ -609,108 +609,108 @@ _079C: .balign 4, 0 _07B0: - MoveAction_00C 6 - MoveAction_00F - MoveAction_00C - MoveAction_00F 5 - MoveAction_00C + MoveAction_012 6 + MoveAction_015 + MoveAction_012 + MoveAction_015 5 + MoveAction_012 EndMovement .balign 4, 0 _07C8: - MoveAction_00C 6 - MoveAction_00F - MoveAction_00C - MoveAction_00F 4 - MoveAction_00C + MoveAction_012 6 + MoveAction_015 + MoveAction_012 + MoveAction_015 4 + MoveAction_012 EndMovement .balign 4, 0 _07E0: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _07E8: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _07F0: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _07F8: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _0800: - MoveAction_00C - MoveAction_022 + MoveAction_012 + MoveAction_034 EndMovement .balign 4, 0 _080C: - MoveAction_00C - MoveAction_023 + MoveAction_012 + MoveAction_035 EndMovement .balign 4, 0 _0818: - MoveAction_00D - MoveAction_00E 5 - MoveAction_00D - MoveAction_00E - MoveAction_00D 6 + MoveAction_013 + MoveAction_014 5 + MoveAction_013 + MoveAction_014 + MoveAction_013 6 EndMovement .balign 4, 0 _0830: - MoveAction_00D - MoveAction_00E 4 - MoveAction_00D - MoveAction_00E - MoveAction_00D 6 + MoveAction_013 + MoveAction_014 4 + MoveAction_013 + MoveAction_014 + MoveAction_013 6 EndMovement .balign 4, 0 _0848: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0850: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0858: - MoveAction_03F - MoveAction_020 + MoveAction_063 + MoveAction_032 EndMovement .balign 4, 0 _0864: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _0870: - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _087C: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _0888: - MoveAction_03F 2 + MoveAction_063 2 MoveAction_002 EndMovement diff --git a/res/field/scripts/scripts_contest_hall_lobby.s b/res/field/scripts/scripts_contest_hall_lobby.s index 1831a9cfd1..e71618ed1c 100644 --- a/res/field/scripts/scripts_contest_hall_lobby.s +++ b/res/field/scripts/scripts_contest_hall_lobby.s @@ -87,43 +87,43 @@ _0104: .balign 4, 0 _0138: - MoveAction_00C 2 + MoveAction_012 2 EndMovement .balign 4, 0 _0140: - MoveAction_021 - MoveAction_04B + MoveAction_033 + MoveAction_075 EndMovement .balign 4, 0 _014C: - MoveAction_026 - MoveAction_021 + MoveAction_038 + MoveAction_033 EndMovement .balign 4, 0 _0158: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0160: - MoveAction_00F 3 - MoveAction_00C 3 - MoveAction_00F 3 - MoveAction_00C 6 + MoveAction_015 3 + MoveAction_012 3 + MoveAction_015 3 + MoveAction_012 6 EndMovement .balign 4, 0 _0174: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _017C: - MoveAction_03E - MoveAction_023 + MoveAction_062 + MoveAction_035 EndMovement .byte 35 @@ -137,7 +137,7 @@ _017C: .balign 4, 0 _0190: - MoveAction_021 + MoveAction_033 EndMovement .byte 14 @@ -167,29 +167,29 @@ _0190: .balign 4, 0 _01B0: - MoveAction_00E - MoveAction_00D 2 - MoveAction_00F - MoveAction_00D - MoveAction_021 + MoveAction_014 + MoveAction_013 2 + MoveAction_015 + MoveAction_013 + MoveAction_033 EndMovement .balign 4, 0 _01C8: - MoveAction_03E - MoveAction_022 - MoveAction_03F - MoveAction_021 + MoveAction_062 + MoveAction_034 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _01DC: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _01E4: - MoveAction_020 + MoveAction_032 EndMovement _01EC: @@ -385,16 +385,16 @@ _0475: .balign 4, 0 _0484: - MoveAction_00F 8 - MoveAction_025 + MoveAction_015 8 + MoveAction_037 EndMovement .balign 4, 0 _0490: - MoveAction_00D - MoveAction_00F 8 - MoveAction_00C - MoveAction_025 + MoveAction_013 + MoveAction_015 8 + MoveAction_012 + MoveAction_037 EndMovement _04A4: @@ -480,29 +480,29 @@ _05D3: .balign 4, 0 _05E8: - MoveAction_00E 6 - MoveAction_00D 4 + MoveAction_014 6 + MoveAction_013 4 EndMovement .balign 4, 0 _05F4: - MoveAction_00C - MoveAction_00E 6 - MoveAction_00D 5 + MoveAction_012 + MoveAction_014 6 + MoveAction_013 5 EndMovement .balign 4, 0 _0604: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _0610: - MoveAction_03F 2 - MoveAction_020 - MoveAction_03E - MoveAction_022 + MoveAction_063 2 + MoveAction_032 + MoveAction_062 + MoveAction_034 EndMovement .balign 4, 0 diff --git a/res/field/scripts/scripts_distortion_world_1f.s b/res/field/scripts/scripts_distortion_world_1f.s index a5527b39b1..85821cae17 100644 --- a/res/field/scripts/scripts_distortion_world_1f.s +++ b/res/field/scripts/scripts_distortion_world_1f.s @@ -99,77 +99,77 @@ _012A: .balign 4, 0 _0140: - MoveAction_00E - MoveAction_03F + MoveAction_014 + MoveAction_063 EndMovement .balign 4, 0 _014C: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0154: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _0160: - MoveAction_03E + MoveAction_062 MoveAction_002 - MoveAction_04B + MoveAction_075 MoveAction_003 EndMovement .balign 4, 0 _0174: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _017C: - MoveAction_021 - MoveAction_041 2 - MoveAction_023 - MoveAction_03F - MoveAction_020 - MoveAction_03F + MoveAction_033 + MoveAction_065 2 + MoveAction_035 + MoveAction_063 + MoveAction_032 + MoveAction_063 EndMovement .balign 4, 0 _0198: - MoveAction_021 - MoveAction_03F + MoveAction_033 + MoveAction_063 EndMovement .balign 4, 0 _01A4: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _01AC: - MoveAction_00D 2 + MoveAction_013 2 EndMovement .balign 4, 0 _01B4: MoveAction_002 - MoveAction_04B + MoveAction_075 MoveAction_003 EndMovement .balign 4, 0 _01C4: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _01CC: - MoveAction_00E 3 - MoveAction_00D 3 - MoveAction_00E 2 - MoveAction_00D - MoveAction_00E 6 + MoveAction_014 3 + MoveAction_013 3 + MoveAction_014 2 + MoveAction_013 + MoveAction_014 6 EndMovement diff --git a/res/field/scripts/scripts_distortion_world_b1f.s b/res/field/scripts/scripts_distortion_world_b1f.s index 1f0a189c6c..6213a3c6b5 100644 --- a/res/field/scripts/scripts_distortion_world_b1f.s +++ b/res/field/scripts/scripts_distortion_world_b1f.s @@ -42,48 +42,48 @@ _004B: .balign 4, 0 _0078: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0080: - MoveAction_041 - MoveAction_03F - MoveAction_022 + MoveAction_065 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _0090: MoveAction_002 - MoveAction_03C 8 - MoveAction_042 - MoveAction_041 - MoveAction_020 + MoveAction_060 8 + MoveAction_066 + MoveAction_065 + MoveAction_032 EndMovement .balign 4, 0 _00A8: - MoveAction_041 3 - MoveAction_021 + MoveAction_065 3 + MoveAction_033 EndMovement .balign 4, 0 _00B4: - MoveAction_00E - MoveAction_00D 2 - MoveAction_022 - MoveAction_041 - MoveAction_077 2 - MoveAction_076 - MoveAction_077 - MoveAction_041 + MoveAction_014 + MoveAction_013 2 + MoveAction_034 + MoveAction_065 + MoveAction_119 2 + MoveAction_118 + MoveAction_119 + MoveAction_065 EndMovement .balign 4, 0 _00D8: - MoveAction_041 3 + MoveAction_065 3 MoveAction_008 - MoveAction_00C - MoveAction_010 - MoveAction_014 8 + MoveAction_012 + MoveAction_016 + MoveAction_020 8 EndMovement diff --git a/res/field/scripts/scripts_distortion_world_b2f.s b/res/field/scripts/scripts_distortion_world_b2f.s index 2235b2c690..b3e4bc535b 100644 --- a/res/field/scripts/scripts_distortion_world_b2f.s +++ b/res/field/scripts/scripts_distortion_world_b2f.s @@ -68,7 +68,7 @@ _00DC: .balign 4, 0 _00E4: - MoveAction_06A + MoveAction_106 MoveAction_002 EndMovement @@ -79,7 +79,7 @@ _00F0: .balign 4, 0 _00F8: - MoveAction_06A + MoveAction_106 MoveAction_002 EndMovement @@ -100,6 +100,6 @@ _0114: .balign 4, 0 _011C: - MoveAction_06B + MoveAction_107 MoveAction_000 EndMovement diff --git a/res/field/scripts/scripts_distortion_world_b3f.s b/res/field/scripts/scripts_distortion_world_b3f.s index ef5cd9684d..66b967862d 100644 --- a/res/field/scripts/scripts_distortion_world_b3f.s +++ b/res/field/scripts/scripts_distortion_world_b3f.s @@ -36,10 +36,10 @@ _003E: .balign 4, 0 _0060: - MoveAction_00C 7 + MoveAction_012 7 EndMovement .balign 4, 0 _0068: - MoveAction_00D 7 + MoveAction_013 7 EndMovement diff --git a/res/field/scripts/scripts_distortion_world_b6f.s b/res/field/scripts/scripts_distortion_world_b6f.s index 3b9e294460..86fef32862 100644 --- a/res/field/scripts/scripts_distortion_world_b6f.s +++ b/res/field/scripts/scripts_distortion_world_b6f.s @@ -100,21 +100,21 @@ _00F6: .balign 4, 0 _0108: - MoveAction_042 - MoveAction_021 - MoveAction_04B - MoveAction_042 + MoveAction_066 + MoveAction_033 + MoveAction_075 + MoveAction_066 EndMovement .balign 4, 0 _011C: - MoveAction_00D - MoveAction_076 - MoveAction_00E - MoveAction_023 + MoveAction_013 + MoveAction_118 + MoveAction_014 + MoveAction_035 EndMovement .balign 4, 0 _0130: - MoveAction_043 + MoveAction_067 EndMovement diff --git a/res/field/scripts/scripts_distortion_world_b7f.s b/res/field/scripts/scripts_distortion_world_b7f.s index fdf5a5e2d1..aba13e5c49 100644 --- a/res/field/scripts/scripts_distortion_world_b7f.s +++ b/res/field/scripts/scripts_distortion_world_b7f.s @@ -143,132 +143,132 @@ _01F8: .balign 4, 0 _0204: - MoveAction_041 2 - MoveAction_020 + MoveAction_065 2 + MoveAction_032 EndMovement .balign 4, 0 _0210: - MoveAction_00F - MoveAction_022 - MoveAction_021 + MoveAction_015 + MoveAction_034 + MoveAction_033 EndMovement .balign 4, 0 _0220: - MoveAction_00E - MoveAction_00C 7 - MoveAction_00F 4 - MoveAction_021 + MoveAction_014 + MoveAction_012 7 + MoveAction_015 4 + MoveAction_033 EndMovement .balign 4, 0 _0234: - MoveAction_00E - MoveAction_00C 6 - MoveAction_00F 4 - MoveAction_021 + MoveAction_014 + MoveAction_012 6 + MoveAction_015 4 + MoveAction_033 EndMovement .balign 4, 0 _0248: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _0254: - MoveAction_042 2 - MoveAction_041 - MoveAction_020 + MoveAction_066 2 + MoveAction_065 + MoveAction_032 EndMovement .balign 4, 0 _0264: - MoveAction_042 2 - MoveAction_041 - MoveAction_022 + MoveAction_066 2 + MoveAction_065 + MoveAction_034 EndMovement .balign 4, 0 _0274: - MoveAction_03E - MoveAction_020 + MoveAction_062 + MoveAction_032 EndMovement .balign 4, 0 _0280: - MoveAction_03E - MoveAction_022 + MoveAction_062 + MoveAction_034 EndMovement .balign 4, 0 _028C: - MoveAction_041 2 - MoveAction_020 - MoveAction_041 2 + MoveAction_065 2 + MoveAction_032 + MoveAction_065 2 EndMovement .balign 4, 0 _029C: - MoveAction_00F - MoveAction_075 - MoveAction_00C 7 + MoveAction_015 + MoveAction_117 + MoveAction_012 7 EndMovement .balign 4, 0 _02AC: - MoveAction_03F 3 - MoveAction_00E - MoveAction_023 + MoveAction_063 3 + MoveAction_014 + MoveAction_035 EndMovement .balign 4, 0 _02BC: - MoveAction_00F - MoveAction_021 + MoveAction_015 + MoveAction_033 EndMovement .balign 4, 0 _02C8: - MoveAction_00C 6 - MoveAction_00F 4 - MoveAction_00D - MoveAction_020 + MoveAction_012 6 + MoveAction_015 4 + MoveAction_013 + MoveAction_032 EndMovement .balign 4, 0 _02DC: - MoveAction_041 - MoveAction_021 + MoveAction_065 + MoveAction_033 EndMovement .balign 4, 0 _02E8: - MoveAction_042 2 - MoveAction_03F - MoveAction_023 + MoveAction_066 2 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _02F8: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0300: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0308: - MoveAction_00D 4 - MoveAction_022 + MoveAction_013 4 + MoveAction_034 EndMovement .balign 4, 0 _0314: - MoveAction_00D 7 - MoveAction_076 - MoveAction_041 + MoveAction_013 7 + MoveAction_118 + MoveAction_065 EndMovement diff --git a/res/field/scripts/scripts_distortion_world_giratina_room.s b/res/field/scripts/scripts_distortion_world_giratina_room.s index d61674f626..23ab02bf02 100644 --- a/res/field/scripts/scripts_distortion_world_giratina_room.s +++ b/res/field/scripts/scripts_distortion_world_giratina_room.s @@ -170,43 +170,43 @@ _0232: .balign 4, 0 _0244: - MoveAction_021 - MoveAction_04B + MoveAction_033 + MoveAction_075 EndMovement .balign 4, 0 _0250: - MoveAction_075 2 + MoveAction_117 2 EndMovement .balign 4, 0 _0258: - MoveAction_021 - MoveAction_04B + MoveAction_033 + MoveAction_075 EndMovement .balign 4, 0 _0264: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _026C: - MoveAction_075 + MoveAction_117 EndMovement .balign 4, 0 _0274: - MoveAction_076 - MoveAction_00D 5 + MoveAction_118 + MoveAction_013 5 EndMovement .balign 4, 0 _0280: - MoveAction_00D 5 + MoveAction_013 5 EndMovement .balign 4, 0 _0288: - MoveAction_00C 5 + MoveAction_012 5 EndMovement diff --git a/res/field/scripts/scripts_eterna_city.s b/res/field/scripts/scripts_eterna_city.s index 8f9a5cc710..6de0890ee2 100644 --- a/res/field/scripts/scripts_eterna_city.s +++ b/res/field/scripts/scripts_eterna_city.s @@ -304,92 +304,92 @@ _042B: .balign 4, 0 _043C: - MoveAction_00E 4 - MoveAction_04B - MoveAction_00E 5 - MoveAction_00C + MoveAction_014 4 + MoveAction_075 + MoveAction_014 5 + MoveAction_012 EndMovement .balign 4, 0 _0450: - MoveAction_00E 4 - MoveAction_04B - MoveAction_00E 4 + MoveAction_014 4 + MoveAction_075 + MoveAction_014 4 EndMovement .balign 4, 0 _0460: - MoveAction_023 - MoveAction_03F 2 - MoveAction_020 + MoveAction_035 + MoveAction_063 2 + MoveAction_032 EndMovement .balign 4, 0 _0470: - MoveAction_023 - MoveAction_03F 2 - MoveAction_022 + MoveAction_035 + MoveAction_063 2 + MoveAction_034 EndMovement .balign 4, 0 _0480: - MoveAction_00E 5 - MoveAction_00D 10 + MoveAction_014 5 + MoveAction_013 10 EndMovement .balign 4, 0 _048C: - MoveAction_00E 6 - MoveAction_00D 10 + MoveAction_014 6 + MoveAction_013 10 EndMovement .balign 4, 0 _0498: - MoveAction_00E 7 - MoveAction_00D 10 + MoveAction_014 7 + MoveAction_013 10 EndMovement .balign 4, 0 _04A4: - MoveAction_00D - MoveAction_00E 6 - MoveAction_00D 10 + MoveAction_013 + MoveAction_014 6 + MoveAction_013 10 EndMovement .balign 4, 0 _04B4: - MoveAction_00D - MoveAction_00E 6 - MoveAction_00D 10 + MoveAction_013 + MoveAction_014 6 + MoveAction_013 10 EndMovement .balign 4, 0 _04C4: - MoveAction_00C - MoveAction_00E 6 - MoveAction_00D 11 + MoveAction_012 + MoveAction_014 6 + MoveAction_013 11 EndMovement .balign 4, 0 _04D4: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _04DC: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _04E4: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _04F0: - MoveAction_03F 2 - MoveAction_022 + MoveAction_063 2 + MoveAction_034 EndMovement _04FC: @@ -554,41 +554,41 @@ _06B9: .balign 4, 0 _06C8: - MoveAction_027 - MoveAction_04B - MoveAction_03E + MoveAction_039 + MoveAction_075 + MoveAction_062 EndMovement .balign 4, 0 _06D8: - MoveAction_027 - MoveAction_04B - MoveAction_03E - MoveAction_00F + MoveAction_039 + MoveAction_075 + MoveAction_062 + MoveAction_015 EndMovement .balign 4, 0 _06EC: - MoveAction_027 - MoveAction_04B - MoveAction_03E - MoveAction_00F 2 + MoveAction_039 + MoveAction_075 + MoveAction_062 + MoveAction_015 2 EndMovement .balign 4, 0 _0700: - MoveAction_027 - MoveAction_04B - MoveAction_03E - MoveAction_00F 3 + MoveAction_039 + MoveAction_075 + MoveAction_062 + MoveAction_015 3 EndMovement .balign 4, 0 _0714: - MoveAction_027 - MoveAction_04B - MoveAction_03E - MoveAction_00F 4 + MoveAction_039 + MoveAction_075 + MoveAction_062 + MoveAction_015 4 EndMovement .byte 39 @@ -602,36 +602,36 @@ _0714: .balign 4, 0 _0730: - MoveAction_00E - MoveAction_027 + MoveAction_014 + MoveAction_039 EndMovement .balign 4, 0 _073C: - MoveAction_00E 2 - MoveAction_027 + MoveAction_014 2 + MoveAction_039 EndMovement .balign 4, 0 _0748: - MoveAction_00E 3 - MoveAction_027 + MoveAction_014 3 + MoveAction_039 EndMovement .balign 4, 0 _0754: - MoveAction_00E 4 - MoveAction_027 + MoveAction_014 4 + MoveAction_039 EndMovement .balign 4, 0 _0760: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0768: - MoveAction_00C + MoveAction_012 EndMovement _0770: @@ -708,8 +708,8 @@ _086F: .balign 4, 0 _0884: - MoveAction_00F - MoveAction_022 + MoveAction_015 + MoveAction_034 EndMovement .balign 4, 0 @@ -725,42 +725,42 @@ _0898: .balign 4, 0 _08A0: MoveAction_001 - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _08AC: MoveAction_001 - MoveAction_04B - MoveAction_00D + MoveAction_075 + MoveAction_013 EndMovement .balign 4, 0 _08BC: MoveAction_001 - MoveAction_04B - MoveAction_00D 2 + MoveAction_075 + MoveAction_013 2 EndMovement .balign 4, 0 _08CC: - MoveAction_00D - MoveAction_00C - MoveAction_021 + MoveAction_013 + MoveAction_012 + MoveAction_033 EndMovement .balign 4, 0 _08DC: - MoveAction_00D - MoveAction_00C 2 - MoveAction_021 + MoveAction_013 + MoveAction_012 2 + MoveAction_033 EndMovement .balign 4, 0 _08EC: - MoveAction_00D - MoveAction_00C 3 - MoveAction_021 + MoveAction_013 + MoveAction_012 3 + MoveAction_033 EndMovement _08FC: @@ -786,12 +786,12 @@ _08FC: .balign 4, 0 _0944: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _094C: - MoveAction_00C + MoveAction_012 EndMovement _0954: @@ -915,189 +915,189 @@ _0AB6: .balign 4, 0 _0B58: - MoveAction_010 10 - MoveAction_013 4 + MoveAction_016 10 + MoveAction_019 4 EndMovement .balign 4, 0 _0B64: - MoveAction_010 9 - MoveAction_013 4 + MoveAction_016 9 + MoveAction_019 4 EndMovement .balign 4, 0 _0B70: - MoveAction_010 8 - MoveAction_013 4 + MoveAction_016 8 + MoveAction_019 4 EndMovement .balign 4, 0 _0B7C: - MoveAction_00D - MoveAction_00F - MoveAction_020 + MoveAction_013 + MoveAction_015 + MoveAction_032 EndMovement .balign 4, 0 _0B8C: - MoveAction_00D - MoveAction_00F 2 - MoveAction_00C - MoveAction_022 + MoveAction_013 + MoveAction_015 2 + MoveAction_012 + MoveAction_034 EndMovement .balign 4, 0 _0BA0: - MoveAction_00C - MoveAction_00F - MoveAction_021 + MoveAction_012 + MoveAction_015 + MoveAction_033 EndMovement .balign 4, 0 _0BB0: - MoveAction_00F 19 + MoveAction_015 19 EndMovement .balign 4, 0 _0BB8: - MoveAction_00F 18 + MoveAction_015 18 EndMovement .balign 4, 0 _0BC0: - MoveAction_03F 3 - MoveAction_026 + MoveAction_063 3 + MoveAction_038 EndMovement .balign 4, 0 _0BCC: - MoveAction_012 12 + MoveAction_018 12 EndMovement .balign 4, 0 _0BD4: - MoveAction_011 + MoveAction_017 EndMovement .balign 4, 0 _0BDC: - MoveAction_03E 10 - MoveAction_03D - MoveAction_03C - MoveAction_047 - MoveAction_013 - MoveAction_048 + MoveAction_062 10 + MoveAction_061 + MoveAction_060 + MoveAction_071 + MoveAction_019 + MoveAction_072 MoveAction_002 EndMovement .balign 4, 0 _0BFC: - MoveAction_03E 9 - MoveAction_03D - MoveAction_03C - MoveAction_047 - MoveAction_013 - MoveAction_048 + MoveAction_062 9 + MoveAction_061 + MoveAction_060 + MoveAction_071 + MoveAction_019 + MoveAction_072 MoveAction_002 EndMovement .balign 4, 0 _0C1C: - MoveAction_03E 8 - MoveAction_03D - MoveAction_03C - MoveAction_047 - MoveAction_013 - MoveAction_048 + MoveAction_062 8 + MoveAction_061 + MoveAction_060 + MoveAction_071 + MoveAction_019 + MoveAction_072 MoveAction_002 EndMovement .balign 4, 0 _0C3C: - MoveAction_03F - MoveAction_03E - MoveAction_021 + MoveAction_063 + MoveAction_062 + MoveAction_033 EndMovement .balign 4, 0 _0C4C: - MoveAction_03F - MoveAction_03E - MoveAction_021 - MoveAction_03E - MoveAction_023 + MoveAction_063 + MoveAction_062 + MoveAction_033 + MoveAction_062 + MoveAction_035 EndMovement .balign 4, 0 _0C64: - MoveAction_03F - MoveAction_03E - MoveAction_020 + MoveAction_063 + MoveAction_062 + MoveAction_032 EndMovement .balign 4, 0 _0C74: - MoveAction_00D - MoveAction_00F 18 - MoveAction_00D - MoveAction_00F + MoveAction_013 + MoveAction_015 18 + MoveAction_013 + MoveAction_015 EndMovement .balign 4, 0 _0C88: - MoveAction_00F 18 - MoveAction_00D - MoveAction_00F + MoveAction_015 18 + MoveAction_013 + MoveAction_015 EndMovement .balign 4, 0 _0C98: - MoveAction_00C - MoveAction_00F 18 - MoveAction_00D - MoveAction_00F + MoveAction_012 + MoveAction_015 18 + MoveAction_013 + MoveAction_015 EndMovement .balign 4, 0 _0CAC: - MoveAction_00D - MoveAction_023 - MoveAction_03F 2 - MoveAction_022 + MoveAction_013 + MoveAction_035 + MoveAction_063 2 + MoveAction_034 EndMovement .balign 4, 0 _0CC0: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0CC8: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _0CD4: - MoveAction_00F 4 + MoveAction_015 4 EndMovement .balign 4, 0 _0CDC: - MoveAction_00E 4 + MoveAction_014 4 EndMovement .balign 4, 0 _0CE4: - MoveAction_00E 3 - MoveAction_00C - MoveAction_022 + MoveAction_014 3 + MoveAction_012 + MoveAction_034 EndMovement .balign 4, 0 _0CF4: - MoveAction_03F 2 - MoveAction_00E 14 + MoveAction_063 2 + MoveAction_014 14 EndMovement _0D00: @@ -1198,22 +1198,22 @@ _0E83: .balign 4, 0 _0E88: - MoveAction_00C 3 - MoveAction_04B - MoveAction_00C 5 - MoveAction_00F 2 - MoveAction_00F + MoveAction_012 3 + MoveAction_075 + MoveAction_012 5 + MoveAction_015 2 + MoveAction_015 EndMovement .balign 4, 0 _0EA0: - MoveAction_00E 3 - MoveAction_00D 9 + MoveAction_014 3 + MoveAction_013 9 EndMovement .balign 4, 0 _0EAC: - MoveAction_022 + MoveAction_034 EndMovement _0EB4: @@ -1355,36 +1355,36 @@ _10A0: .balign 4, 0 _10B4: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _10BC: - MoveAction_00E 3 - MoveAction_00D 9 + MoveAction_014 3 + MoveAction_013 9 EndMovement .balign 4, 0 _10C8: - MoveAction_00D - MoveAction_00E 3 - MoveAction_00D 8 + MoveAction_013 + MoveAction_014 3 + MoveAction_013 8 EndMovement .balign 4, 0 _10D8: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _10E0: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _10EC: - MoveAction_03F 2 - MoveAction_03E - MoveAction_022 + MoveAction_063 2 + MoveAction_062 + MoveAction_034 EndMovement diff --git a/res/field/scripts/scripts_eterna_city_south_house.s b/res/field/scripts/scripts_eterna_city_south_house.s index 41d0d4a248..6f6192fee7 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_04B + MoveAction_075 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 450412a009..3fec2704b7 100644 --- a/res/field/scripts/scripts_eterna_city_underground_man_house.s +++ b/res/field/scripts/scripts_eterna_city_underground_man_house.s @@ -408,7 +408,7 @@ _05E4: MoveAction_008 MoveAction_009 2 MoveAction_008 - MoveAction_026 + MoveAction_038 EndMovement .balign 4, 0 @@ -416,23 +416,23 @@ _05F8: MoveAction_008 MoveAction_009 2 MoveAction_008 - MoveAction_027 + MoveAction_039 EndMovement .balign 4, 0 _060C: - MoveAction_00A - MoveAction_00B 2 - MoveAction_00A - MoveAction_024 + MoveAction_010 + MoveAction_011 2 + MoveAction_010 + MoveAction_036 EndMovement .balign 4, 0 _0620: - MoveAction_00A - MoveAction_00B 2 - MoveAction_00A - MoveAction_025 + MoveAction_010 + MoveAction_011 2 + MoveAction_010 + MoveAction_037 EndMovement _0634: diff --git a/res/field/scripts/scripts_eterna_forest.s b/res/field/scripts/scripts_eterna_forest.s index b2f416d0cd..dc5db3543e 100644 --- a/res/field/scripts/scripts_eterna_forest.s +++ b/res/field/scripts/scripts_eterna_forest.s @@ -73,16 +73,16 @@ _00E0: .balign 4, 0 _00E8: - MoveAction_099 - MoveAction_00D + MoveAction_153 + MoveAction_013 EndMovement .balign 4, 0 _00F4: - MoveAction_099 - MoveAction_00D - MoveAction_00F - MoveAction_021 + MoveAction_153 + MoveAction_013 + MoveAction_015 + MoveAction_033 EndMovement _0108: @@ -116,20 +116,20 @@ _0168: .balign 4, 0 _0174: - MoveAction_00C 2 - MoveAction_021 + MoveAction_012 2 + MoveAction_033 EndMovement .balign 4, 0 _0180: - MoveAction_00C 2 - MoveAction_00E - MoveAction_021 + MoveAction_012 2 + MoveAction_014 + MoveAction_033 EndMovement .balign 4, 0 _0190: - MoveAction_021 + MoveAction_033 EndMovement _0198: @@ -217,109 +217,109 @@ _02CB: .balign 4, 0 _0300: - MoveAction_023 - MoveAction_099 + MoveAction_035 + MoveAction_153 EndMovement .balign 4, 0 _030C: - MoveAction_00D 2 - MoveAction_00F 5 + MoveAction_013 2 + MoveAction_015 5 EndMovement .balign 4, 0 _0318: - MoveAction_00D - MoveAction_00F 5 + MoveAction_013 + MoveAction_015 5 EndMovement .balign 4, 0 _0324: - MoveAction_00D - MoveAction_00F 5 + MoveAction_013 + MoveAction_015 5 EndMovement .balign 4, 0 _0330: - MoveAction_00C - MoveAction_00F 5 + MoveAction_012 + MoveAction_015 5 EndMovement .balign 4, 0 _033C: - MoveAction_00C - MoveAction_00F 5 + MoveAction_012 + MoveAction_015 5 EndMovement .balign 4, 0 _0348: - MoveAction_00C 2 - MoveAction_00F 5 + MoveAction_012 2 + MoveAction_015 5 EndMovement .balign 4, 0 _0354: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _035C: - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _0368: - MoveAction_03F 3 - MoveAction_022 + MoveAction_063 3 + MoveAction_034 EndMovement .balign 4, 0 _0374: - MoveAction_03F 2 - MoveAction_021 - MoveAction_03F - MoveAction_023 + MoveAction_063 2 + MoveAction_033 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _0388: - MoveAction_03F - MoveAction_021 - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_033 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _039C: - MoveAction_03F - MoveAction_021 - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_033 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _03B0: - MoveAction_03F - MoveAction_020 - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_032 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _03C4: - MoveAction_03F - MoveAction_020 - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_032 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _03D8: - MoveAction_03F 2 - MoveAction_020 - MoveAction_03F - MoveAction_023 + MoveAction_063 2 + MoveAction_032 + MoveAction_063 + MoveAction_035 EndMovement _03EC: @@ -394,20 +394,20 @@ _04B4: .balign 4, 0 _04BC: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _04C4: - MoveAction_00D 2 - MoveAction_00F 9 + MoveAction_013 2 + MoveAction_015 9 EndMovement .balign 4, 0 _04D0: - MoveAction_00E - MoveAction_00D 2 - MoveAction_00F 10 + MoveAction_014 + MoveAction_013 2 + MoveAction_015 10 EndMovement _04E0: @@ -448,5 +448,5 @@ _051D: .balign 4, 0 _053C: - MoveAction_020 + MoveAction_032 EndMovement diff --git a/res/field/scripts/scripts_fight_area.s b/res/field/scripts/scripts_fight_area.s index fe71af467b..d6f33d9d5f 100644 --- a/res/field/scripts/scripts_fight_area.s +++ b/res/field/scripts/scripts_fight_area.s @@ -260,8 +260,8 @@ _033E: .balign 4, 0 _0340: - MoveAction_022 - MoveAction_04B + MoveAction_034 + MoveAction_075 EndMovement .byte 14 @@ -275,30 +275,30 @@ _0340: .balign 4, 0 _0354: - MoveAction_00F 17 - MoveAction_00C 2 - MoveAction_00F 9 - MoveAction_00C 6 - MoveAction_00F - MoveAction_020 + MoveAction_015 17 + MoveAction_012 2 + MoveAction_015 9 + MoveAction_012 6 + MoveAction_015 + MoveAction_032 EndMovement .balign 4, 0 _0370: - MoveAction_00C + MoveAction_012 EndMovement .balign 4, 0 _0378: - MoveAction_026 + MoveAction_038 EndMovement .balign 4, 0 _0380: MoveAction_000 - MoveAction_047 - MoveAction_011 2 - MoveAction_048 + MoveAction_071 + MoveAction_017 2 + MoveAction_072 EndMovement .byte 75 @@ -312,78 +312,78 @@ _0380: .balign 4, 0 _039C: - MoveAction_010 2 + MoveAction_016 2 EndMovement .balign 4, 0 _03A4: - MoveAction_011 8 + MoveAction_017 8 EndMovement .balign 4, 0 _03AC: - MoveAction_026 + MoveAction_038 EndMovement .balign 4, 0 _03B4: - MoveAction_011 + MoveAction_017 EndMovement .balign 4, 0 _03BC: - MoveAction_022 - MoveAction_03F - MoveAction_023 - MoveAction_03F - MoveAction_021 + MoveAction_034 + MoveAction_063 + MoveAction_035 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _03D4: - MoveAction_010 + MoveAction_016 EndMovement .balign 4, 0 _03DC: - MoveAction_00F 4 + MoveAction_015 4 EndMovement .balign 4, 0 _03E4: - MoveAction_00F 18 - MoveAction_00C 2 - MoveAction_00F 9 - MoveAction_00C 6 + MoveAction_015 18 + MoveAction_012 2 + MoveAction_015 9 + MoveAction_012 6 EndMovement .balign 4, 0 _03F8: - MoveAction_00C + MoveAction_012 EndMovement .balign 4, 0 _0400: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0408: - MoveAction_03F - MoveAction_025 - MoveAction_03E - MoveAction_024 + MoveAction_063 + MoveAction_037 + MoveAction_062 + MoveAction_036 EndMovement .balign 4, 0 _041C: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _0428: - MoveAction_021 + MoveAction_033 EndMovement .byte 63 @@ -401,13 +401,13 @@ _0428: .balign 4, 0 _043C: - MoveAction_03F 2 - MoveAction_023 + MoveAction_063 2 + MoveAction_035 EndMovement .balign 4, 0 _0448: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 @@ -417,17 +417,17 @@ _0450: .balign 4, 0 _0458: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0460: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0468: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 @@ -437,13 +437,13 @@ _0470: .balign 4, 0 _0478: - MoveAction_00C - MoveAction_00E 2 + MoveAction_012 + MoveAction_014 2 EndMovement .balign 4, 0 _0484: - MoveAction_00D 8 + MoveAction_013 8 EndMovement .byte 34 @@ -656,32 +656,32 @@ _0694: .balign 4, 0 _06B0: MoveAction_001 - MoveAction_040 + MoveAction_064 EndMovement .balign 4, 0 _06BC: - MoveAction_045 + MoveAction_069 EndMovement .balign 4, 0 _06C4: - MoveAction_00D - MoveAction_040 + MoveAction_013 + MoveAction_064 EndMovement .balign 4, 0 _06D0: - MoveAction_00F + MoveAction_015 MoveAction_001 - MoveAction_040 + MoveAction_064 EndMovement .balign 4, 0 _06E0: - MoveAction_00E + MoveAction_014 MoveAction_001 - MoveAction_040 + MoveAction_064 EndMovement _06F0: @@ -727,32 +727,32 @@ _0792: .balign 4, 0 _07A0: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _07A8: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _07B0: - MoveAction_00D - MoveAction_00E 2 - MoveAction_00C + MoveAction_013 + MoveAction_014 2 + MoveAction_012 EndMovement .balign 4, 0 _07C0: - MoveAction_00E - MoveAction_00D - MoveAction_020 + MoveAction_014 + MoveAction_013 + MoveAction_032 EndMovement .balign 4, 0 _07D0: - MoveAction_00E - MoveAction_00C + MoveAction_014 + MoveAction_012 EndMovement _07DC: @@ -813,7 +813,7 @@ _083C: .balign 4, 0 _085C: - MoveAction_022 + MoveAction_034 EndMovement _0864: diff --git a/res/field/scripts/scripts_floaroma_meadow.s b/res/field/scripts/scripts_floaroma_meadow.s index cf396e154e..17c92cd1f8 100644 --- a/res/field/scripts/scripts_floaroma_meadow.s +++ b/res/field/scripts/scripts_floaroma_meadow.s @@ -37,18 +37,18 @@ _006E: .balign 4, 0 _0074: - MoveAction_021 - MoveAction_04B + MoveAction_033 + MoveAction_075 EndMovement .balign 4, 0 _0080: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0088: - MoveAction_021 + MoveAction_033 EndMovement .byte 12 @@ -70,19 +70,19 @@ _0088: .balign 4, 0 _00A0: - MoveAction_00D - MoveAction_023 - MoveAction_03F 3 - MoveAction_021 + MoveAction_013 + MoveAction_035 + MoveAction_063 3 + MoveAction_033 EndMovement .balign 4, 0 _00B4: - MoveAction_00D - MoveAction_023 - MoveAction_03F 3 - MoveAction_00F - MoveAction_021 + MoveAction_013 + MoveAction_035 + MoveAction_063 3 + MoveAction_015 + MoveAction_033 EndMovement _00CC: diff --git a/res/field/scripts/scripts_floaroma_town.s b/res/field/scripts/scripts_floaroma_town.s index 386d29d5ce..83bd4145a9 100644 --- a/res/field/scripts/scripts_floaroma_town.s +++ b/res/field/scripts/scripts_floaroma_town.s @@ -35,12 +35,12 @@ _0030: .balign 4, 0 _005C: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0064: - MoveAction_022 + MoveAction_034 EndMovement _006C: @@ -67,7 +67,7 @@ _0099: .balign 4, 0 _00A4: MoveAction_000 - MoveAction_03F 3 + MoveAction_063 3 EndMovement _00B0: diff --git a/res/field/scripts/scripts_footstep_house.s b/res/field/scripts/scripts_footstep_house.s index c6e568d50c..ccbed55b98 100644 --- a/res/field/scripts/scripts_footstep_house.s +++ b/res/field/scripts/scripts_footstep_house.s @@ -443,48 +443,48 @@ _0664: .balign 4, 0 _0698: - MoveAction_047 - MoveAction_00F - MoveAction_048 + MoveAction_071 + MoveAction_015 + MoveAction_072 EndMovement .balign 4, 0 _06A8: - MoveAction_047 - MoveAction_00E - MoveAction_048 + MoveAction_071 + MoveAction_014 + MoveAction_072 EndMovement .balign 4, 0 _06B8: - MoveAction_047 - MoveAction_00D - MoveAction_048 + MoveAction_071 + MoveAction_013 + MoveAction_072 EndMovement .balign 4, 0 _06C8: - MoveAction_047 - MoveAction_00C - MoveAction_048 + MoveAction_071 + MoveAction_012 + MoveAction_072 EndMovement .balign 4, 0 _06D8: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _06E0: - MoveAction_00F + MoveAction_015 EndMovement .balign 4, 0 _06E8: - MoveAction_00C + MoveAction_012 EndMovement .balign 4, 0 _06F0: - MoveAction_00D + MoveAction_013 EndMovement diff --git a/res/field/scripts/scripts_fullmoon_island.s b/res/field/scripts/scripts_fullmoon_island.s index 5ad6493c7b..563320c982 100644 --- a/res/field/scripts/scripts_fullmoon_island.s +++ b/res/field/scripts/scripts_fullmoon_island.s @@ -79,31 +79,31 @@ _00F1: .balign 4, 0 _010C: - MoveAction_00F - MoveAction_040 + MoveAction_015 + MoveAction_064 EndMovement .balign 4, 0 _0118: - MoveAction_045 + MoveAction_069 EndMovement .balign 4, 0 _0120: - MoveAction_00D - MoveAction_00F 2 - MoveAction_040 + MoveAction_013 + MoveAction_015 2 + MoveAction_064 EndMovement .balign 4, 0 _0130: - MoveAction_00F 2 - MoveAction_040 + MoveAction_015 2 + MoveAction_064 EndMovement .balign 4, 0 _013C: - MoveAction_00C - MoveAction_00F 2 - MoveAction_040 + MoveAction_012 + MoveAction_015 2 + MoveAction_064 EndMovement diff --git a/res/field/scripts/scripts_fullmoon_island_forest.s b/res/field/scripts/scripts_fullmoon_island_forest.s index 0dc9c0670a..dd242fbe19 100644 --- a/res/field/scripts/scripts_fullmoon_island_forest.s +++ b/res/field/scripts/scripts_fullmoon_island_forest.s @@ -48,7 +48,7 @@ _007E: .balign 4, 0 _0094: - MoveAction_047 - MoveAction_00C - MoveAction_048 + MoveAction_071 + MoveAction_012 + MoveAction_072 EndMovement diff --git a/res/field/scripts/scripts_galactic_hq_1f.s b/res/field/scripts/scripts_galactic_hq_1f.s index 1437089dac..5bb4fe49ca 100644 --- a/res/field/scripts/scripts_galactic_hq_1f.s +++ b/res/field/scripts/scripts_galactic_hq_1f.s @@ -140,12 +140,12 @@ _015E: .balign 4, 0 _0164: - MoveAction_012 + MoveAction_018 EndMovement .balign 4, 0 _016C: - MoveAction_013 + MoveAction_019 EndMovement _0174: diff --git a/res/field/scripts/scripts_galactic_hq_3f.s b/res/field/scripts/scripts_galactic_hq_3f.s index f2796be210..e30c007c6d 100644 --- a/res/field/scripts/scripts_galactic_hq_3f.s +++ b/res/field/scripts/scripts_galactic_hq_3f.s @@ -59,12 +59,12 @@ _00A0: .balign 4, 0 _00A8: - MoveAction_012 + MoveAction_018 EndMovement .balign 4, 0 _00B0: - MoveAction_013 + MoveAction_019 EndMovement _00B8: diff --git a/res/field/scripts/scripts_galactic_hq_4f.s b/res/field/scripts/scripts_galactic_hq_4f.s index cdaa5889ce..2ec268b730 100644 --- a/res/field/scripts/scripts_galactic_hq_4f.s +++ b/res/field/scripts/scripts_galactic_hq_4f.s @@ -66,37 +66,37 @@ _00E1: .balign 4, 0 _00E8: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _00F0: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _00F8: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _0100: - MoveAction_00D - MoveAction_00F - MoveAction_021 + MoveAction_013 + MoveAction_015 + MoveAction_033 EndMovement .balign 4, 0 _0110: - MoveAction_00C - MoveAction_00F 4 - MoveAction_00C 3 - MoveAction_021 + MoveAction_012 + MoveAction_015 4 + MoveAction_012 3 + MoveAction_033 EndMovement .balign 4, 0 _0124: - MoveAction_00F 7 + MoveAction_015 7 EndMovement _012C: @@ -141,12 +141,12 @@ _01AB: .balign 4, 0 _01B4: - MoveAction_012 + MoveAction_018 EndMovement .balign 4, 0 _01BC: - MoveAction_013 + MoveAction_019 EndMovement _01C4: diff --git a/res/field/scripts/scripts_galactic_hq_b2f.s b/res/field/scripts/scripts_galactic_hq_b2f.s index 1a685ca6e7..770bde8a06 100644 --- a/res/field/scripts/scripts_galactic_hq_b2f.s +++ b/res/field/scripts/scripts_galactic_hq_b2f.s @@ -69,10 +69,10 @@ _00B3: .balign 4, 0 _00BC: - MoveAction_012 + MoveAction_018 EndMovement .balign 4, 0 _00C4: - MoveAction_013 + MoveAction_019 EndMovement diff --git a/res/field/scripts/scripts_galactic_hq_control_room.s b/res/field/scripts/scripts_galactic_hq_control_room.s index 324ba9ae6f..03c6aeae1c 100644 --- a/res/field/scripts/scripts_galactic_hq_control_room.s +++ b/res/field/scripts/scripts_galactic_hq_control_room.s @@ -93,20 +93,20 @@ _011F: .balign 4, 0 _0128: - MoveAction_00F - MoveAction_021 + MoveAction_015 + MoveAction_033 EndMovement .balign 4, 0 _0134: - MoveAction_00D - MoveAction_020 + MoveAction_013 + MoveAction_032 EndMovement .balign 4, 0 _0140: - MoveAction_00F - MoveAction_022 + MoveAction_015 + MoveAction_034 EndMovement _014C: @@ -268,39 +268,39 @@ _0347: .balign 4, 0 _0354: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _0360: - MoveAction_03F - MoveAction_020 + MoveAction_063 + MoveAction_032 EndMovement .balign 4, 0 _036C: - MoveAction_00D 2 + MoveAction_013 2 EndMovement .balign 4, 0 _0374: - MoveAction_00D 2 + MoveAction_013 2 EndMovement .balign 4, 0 _037C: - MoveAction_00D 2 + MoveAction_013 2 EndMovement .balign 4, 0 _0384: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _038C: - MoveAction_021 + MoveAction_033 EndMovement _0394: @@ -316,12 +316,12 @@ _0394: .balign 4, 0 _03B4: - MoveAction_00C + MoveAction_012 EndMovement .balign 4, 0 _03BC: - MoveAction_021 + MoveAction_033 EndMovement _03C4: @@ -387,15 +387,15 @@ _0450: .balign 4, 0 _0460: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0468: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0470: - MoveAction_020 + MoveAction_032 EndMovement diff --git a/res/field/scripts/scripts_galactic_hq_hall.s b/res/field/scripts/scripts_galactic_hq_hall.s index 9735d0375c..7efd61e1a7 100644 --- a/res/field/scripts/scripts_galactic_hq_hall.s +++ b/res/field/scripts/scripts_galactic_hq_hall.s @@ -114,75 +114,75 @@ _01C1: .balign 4, 0 _01D8: - MoveAction_00D 3 - MoveAction_00E 4 - MoveAction_00D + MoveAction_013 3 + MoveAction_014 4 + MoveAction_013 EndMovement .balign 4, 0 _01E8: - MoveAction_00C - MoveAction_00F 4 - MoveAction_00C 3 + MoveAction_012 + MoveAction_015 4 + MoveAction_012 3 EndMovement .balign 4, 0 _01F8: - MoveAction_00E 6 - MoveAction_00C 6 + MoveAction_014 6 + MoveAction_012 6 EndMovement .balign 4, 0 _0204: - MoveAction_00D 6 - MoveAction_00F 6 + MoveAction_013 6 + MoveAction_015 6 EndMovement .balign 4, 0 _0210: - MoveAction_00D - MoveAction_00E + MoveAction_013 + MoveAction_014 EndMovement .balign 4, 0 _021C: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _0224: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _022C: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0234: - MoveAction_027 - MoveAction_04B + MoveAction_039 + MoveAction_075 EndMovement .balign 4, 0 _0240: - MoveAction_026 + MoveAction_038 EndMovement .balign 4, 0 _0248: - MoveAction_025 + MoveAction_037 EndMovement .balign 4, 0 _0250: - MoveAction_012 - MoveAction_024 - MoveAction_03F - MoveAction_025 - MoveAction_03E - MoveAction_026 - MoveAction_03F - MoveAction_012 9 + MoveAction_018 + MoveAction_036 + MoveAction_063 + MoveAction_037 + MoveAction_062 + MoveAction_038 + MoveAction_063 + MoveAction_018 9 EndMovement diff --git a/res/field/scripts/scripts_global_terminal_1f.s b/res/field/scripts/scripts_global_terminal_1f.s index 2d6df5f8c6..aca3b4e241 100644 --- a/res/field/scripts/scripts_global_terminal_1f.s +++ b/res/field/scripts/scripts_global_terminal_1f.s @@ -67,7 +67,7 @@ _00CD: .balign 4, 0 _00D8: - MoveAction_00D + MoveAction_013 EndMovement .byte 13 @@ -81,7 +81,7 @@ _00D8: .balign 4, 0 _00E8: - MoveAction_00D 2 + MoveAction_013 2 EndMovement _00F0: @@ -240,18 +240,18 @@ _0338: .balign 4, 0 _0344: - MoveAction_00F - MoveAction_020 + MoveAction_015 + MoveAction_032 EndMovement .balign 4, 0 _0350: - MoveAction_00C + MoveAction_012 EndMovement .balign 4, 0 _0358: - MoveAction_00C 2 + MoveAction_012 2 EndMovement .balign 4, 0 diff --git a/res/field/scripts/scripts_hall_of_origin.s b/res/field/scripts/scripts_hall_of_origin.s index 31a6f7024d..7dc1beca2d 100644 --- a/res/field/scripts/scripts_hall_of_origin.s +++ b/res/field/scripts/scripts_hall_of_origin.s @@ -77,8 +77,8 @@ _00E9: .balign 4, 0 _00F8: - MoveAction_04B - MoveAction_041 + MoveAction_075 + MoveAction_065 EndMovement _0104: @@ -115,24 +115,24 @@ _016F: .balign 4, 0 _017C: - MoveAction_00C 4 - MoveAction_00F + MoveAction_012 4 + MoveAction_015 MoveAction_000 EndMovement .balign 4, 0 _018C: - MoveAction_00C 4 + MoveAction_012 4 EndMovement .balign 4, 0 _0194: - MoveAction_00C 4 - MoveAction_00E + MoveAction_012 4 + MoveAction_014 MoveAction_000 EndMovement .balign 4, 0 _01A4: - MoveAction_00C 2 + MoveAction_012 2 EndMovement diff --git a/res/field/scripts/scripts_hearthome_city.s b/res/field/scripts/scripts_hearthome_city.s index 6857c3180d..b41bdb8f68 100644 --- a/res/field/scripts/scripts_hearthome_city.s +++ b/res/field/scripts/scripts_hearthome_city.s @@ -215,61 +215,61 @@ _0225: .balign 4, 0 _0240: - MoveAction_00E 20 - MoveAction_00C 13 - MoveAction_00F 12 - MoveAction_00C 4 - MoveAction_021 + MoveAction_014 20 + MoveAction_012 13 + MoveAction_015 12 + MoveAction_012 4 + MoveAction_033 EndMovement .balign 4, 0 _0258: - MoveAction_00C - MoveAction_00E 2 - MoveAction_00D - MoveAction_00E 18 - MoveAction_00C 13 - MoveAction_00F 12 - MoveAction_00C 4 - MoveAction_021 + MoveAction_012 + MoveAction_014 2 + MoveAction_013 + MoveAction_014 18 + MoveAction_012 13 + MoveAction_015 12 + MoveAction_012 4 + MoveAction_033 EndMovement .balign 4, 0 _027C: - MoveAction_00C - MoveAction_00E 20 - MoveAction_00C 13 - MoveAction_00F 12 - MoveAction_00C 3 + MoveAction_012 + MoveAction_014 20 + MoveAction_012 13 + MoveAction_015 12 + MoveAction_012 3 EndMovement .balign 4, 0 _0294: - MoveAction_00D - MoveAction_00E 20 - MoveAction_00C 13 - MoveAction_00F 12 - MoveAction_00C 3 + MoveAction_013 + MoveAction_014 20 + MoveAction_012 13 + MoveAction_015 12 + MoveAction_012 3 EndMovement .balign 4, 0 _02AC: - MoveAction_00E - MoveAction_00E 20 - MoveAction_00C 13 - MoveAction_00F 12 - MoveAction_00C 3 + MoveAction_014 + MoveAction_014 20 + MoveAction_012 13 + MoveAction_015 12 + MoveAction_012 3 EndMovement .balign 4, 0 _02C4: - MoveAction_03F 2 - MoveAction_03E - MoveAction_022 - MoveAction_00E 19 - MoveAction_00C 13 - MoveAction_00F 12 - MoveAction_00C 3 + MoveAction_063 2 + MoveAction_062 + MoveAction_034 + MoveAction_014 19 + MoveAction_012 13 + MoveAction_015 12 + MoveAction_012 3 EndMovement _02E4: @@ -612,12 +612,12 @@ _0820: .balign 4, 0 _087C: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _0884: - MoveAction_012 9 + MoveAction_018 9 EndMovement .byte 19 @@ -631,12 +631,12 @@ _0884: .balign 4, 0 _0894: - MoveAction_012 8 + MoveAction_018 8 EndMovement .balign 4, 0 _089C: - MoveAction_00F 8 + MoveAction_015 8 EndMovement _08A4: 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 2070dc475a..9a63732cb7 100644 --- a/res/field/scripts/scripts_hearthome_city_gym_entrance_room.s +++ b/res/field/scripts/scripts_hearthome_city_gym_entrance_room.s @@ -78,15 +78,15 @@ _00B6: .balign 4, 0 _00DC: - MoveAction_04B - MoveAction_03F - MoveAction_00E - MoveAction_00D + MoveAction_075 + MoveAction_063 + MoveAction_014 + MoveAction_013 EndMovement .balign 4, 0 _00F0: - MoveAction_00C - MoveAction_00F - MoveAction_021 + MoveAction_012 + MoveAction_015 + MoveAction_033 EndMovement 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 648656b631..240fe6c555 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_00C 2 - MoveAction_021 + MoveAction_012 2 + MoveAction_033 EndMovement .balign 4, 0 _00C4: - MoveAction_00D 2 - MoveAction_021 + MoveAction_013 2 + MoveAction_033 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 e42516a14b..4a3cb710d5 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_00C 2 - MoveAction_021 + MoveAction_012 2 + MoveAction_033 EndMovement .balign 4, 0 _00C4: - MoveAction_00D 2 - MoveAction_021 + MoveAction_013 2 + MoveAction_033 EndMovement diff --git a/res/field/scripts/scripts_iron_island.s b/res/field/scripts/scripts_iron_island.s index 0490aca1de..72bdcf869d 100644 --- a/res/field/scripts/scripts_iron_island.s +++ b/res/field/scripts/scripts_iron_island.s @@ -67,25 +67,25 @@ _00B0: .balign 4, 0 _00CC: MoveAction_002 - MoveAction_040 + MoveAction_064 EndMovement .balign 4, 0 _00D8: - MoveAction_045 + MoveAction_069 EndMovement .balign 4, 0 _00E0: - MoveAction_00D + MoveAction_013 MoveAction_002 - MoveAction_040 + MoveAction_064 EndMovement .balign 4, 0 _00F0: - MoveAction_00E - MoveAction_040 + MoveAction_014 + MoveAction_064 EndMovement _00FC: @@ -124,5 +124,5 @@ _014B: .balign 4, 0 _0168: - MoveAction_020 + MoveAction_032 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 71103935a2..39a0d07c44 100644 --- a/res/field/scripts/scripts_iron_island_b2f_left_room.s +++ b/res/field/scripts/scripts_iron_island_b2f_left_room.s @@ -103,7 +103,7 @@ _014A: .balign 4, 0 _0158: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 @@ -122,28 +122,28 @@ _0160: .balign 4, 0 _0170: - MoveAction_023 - MoveAction_04B - MoveAction_00C - MoveAction_023 + MoveAction_035 + MoveAction_075 + MoveAction_012 + MoveAction_035 EndMovement .balign 4, 0 _0184: - MoveAction_023 - MoveAction_04B + MoveAction_035 + MoveAction_075 EndMovement .balign 4, 0 _0190: - MoveAction_00E - MoveAction_00D - MoveAction_022 + MoveAction_014 + MoveAction_013 + MoveAction_034 EndMovement .balign 4, 0 _01A0: - MoveAction_00E + MoveAction_014 EndMovement _01A8: @@ -294,22 +294,22 @@ _037D: .balign 4, 0 _0384: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _038C: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0394: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _039C: - MoveAction_020 + MoveAction_032 EndMovement .byte 14 @@ -363,16 +363,16 @@ _039C: .balign 4, 0 _03D4: - MoveAction_022 - MoveAction_00D - MoveAction_00E 2 + MoveAction_034 + MoveAction_013 + MoveAction_014 2 EndMovement .balign 4, 0 _03E4: - MoveAction_022 - MoveAction_00C - MoveAction_00E 2 + MoveAction_034 + MoveAction_012 + MoveAction_014 2 EndMovement .byte 13 @@ -402,45 +402,45 @@ _03E4: .balign 4, 0 _040C: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0414: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _041C: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0424: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _042C: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0434: - MoveAction_03F 2 - MoveAction_021 - MoveAction_03F - MoveAction_03D - MoveAction_00E + MoveAction_063 2 + MoveAction_033 + MoveAction_063 + MoveAction_061 + MoveAction_014 EndMovement .balign 4, 0 _044C: - MoveAction_03F 2 - MoveAction_020 - MoveAction_03F - MoveAction_03D - MoveAction_00E + MoveAction_063 2 + MoveAction_032 + MoveAction_063 + MoveAction_061 + MoveAction_014 EndMovement _0464: diff --git a/res/field/scripts/scripts_iron_island_house.s b/res/field/scripts/scripts_iron_island_house.s index 18d0bc7f3c..71aea43a4f 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_00E - MoveAction_00D 3 + MoveAction_014 + MoveAction_013 3 EndMovement .balign 4, 0 _00FC: - MoveAction_00D 2 - MoveAction_00E - MoveAction_00D + MoveAction_013 2 + MoveAction_014 + MoveAction_013 EndMovement diff --git a/res/field/scripts/scripts_jubilife_city.s b/res/field/scripts/scripts_jubilife_city.s index d3b397a0c9..609d344222 100644 --- a/res/field/scripts/scripts_jubilife_city.s +++ b/res/field/scripts/scripts_jubilife_city.s @@ -285,155 +285,155 @@ _042F: .balign 4, 0 _043C: - MoveAction_00D 4 - MoveAction_04B - MoveAction_041 + MoveAction_013 4 + MoveAction_075 + MoveAction_065 EndMovement .balign 4, 0 _044C: - MoveAction_00D 3 + MoveAction_013 3 EndMovement .balign 4, 0 _0454: - MoveAction_00F - MoveAction_00C 18 + MoveAction_015 + MoveAction_012 18 EndMovement .balign 4, 0 _0460: - MoveAction_00E - MoveAction_00C 18 + MoveAction_014 + MoveAction_012 18 EndMovement .balign 4, 0 _046C: - MoveAction_00C 18 + MoveAction_012 18 EndMovement .balign 4, 0 _0474: - MoveAction_00D 9 + MoveAction_013 9 EndMovement .balign 4, 0 _047C: - MoveAction_00C 2 + MoveAction_012 2 EndMovement .balign 4, 0 _0484: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _048C: - MoveAction_00D - MoveAction_00E 2 + MoveAction_013 + MoveAction_014 2 EndMovement .balign 4, 0 _0498: - MoveAction_00C - MoveAction_00F 2 + MoveAction_012 + MoveAction_015 2 EndMovement .balign 4, 0 _04A4: - MoveAction_023 - MoveAction_03F 4 - MoveAction_020 + MoveAction_035 + MoveAction_063 4 + MoveAction_032 EndMovement .balign 4, 0 _04B4: - MoveAction_00C - MoveAction_00F - MoveAction_00C 17 + MoveAction_012 + MoveAction_015 + MoveAction_012 17 EndMovement .balign 4, 0 _04C4: - MoveAction_00C - MoveAction_00E - MoveAction_00C 17 + MoveAction_012 + MoveAction_014 + MoveAction_012 17 EndMovement .balign 4, 0 _04D4: - MoveAction_00C 18 + MoveAction_012 18 EndMovement .balign 4, 0 _04DC: - MoveAction_00C 2 - MoveAction_00F - MoveAction_00C + MoveAction_012 2 + MoveAction_015 + MoveAction_012 EndMovement .balign 4, 0 _04EC: - MoveAction_03E - MoveAction_022 + MoveAction_062 + MoveAction_034 EndMovement .balign 4, 0 _04F8: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _0504: - MoveAction_03F - MoveAction_023 - MoveAction_03F 3 - MoveAction_020 + MoveAction_063 + MoveAction_035 + MoveAction_063 3 + MoveAction_032 EndMovement .balign 4, 0 _0518: - MoveAction_026 - MoveAction_03F 2 - MoveAction_025 - MoveAction_03F - MoveAction_00A - MoveAction_012 5 - MoveAction_027 - MoveAction_03F - MoveAction_024 - MoveAction_03F + MoveAction_038 + MoveAction_063 2 + MoveAction_037 + MoveAction_063 + MoveAction_010 + MoveAction_018 5 + MoveAction_039 + MoveAction_063 + MoveAction_036 + MoveAction_063 EndMovement .balign 4, 0 _0544: - MoveAction_00B - MoveAction_013 2 + MoveAction_011 + MoveAction_019 2 EndMovement .balign 4, 0 _0550: - MoveAction_025 - MoveAction_04B + MoveAction_037 + MoveAction_075 EndMovement .balign 4, 0 _055C: - MoveAction_026 - MoveAction_03F - MoveAction_027 - MoveAction_03F 2 - MoveAction_025 + MoveAction_038 + MoveAction_063 + MoveAction_039 + MoveAction_063 2 + MoveAction_037 EndMovement .balign 4, 0 _0574: - MoveAction_013 3 - MoveAction_026 - MoveAction_03F + MoveAction_019 3 + MoveAction_038 + MoveAction_063 MoveAction_008 - MoveAction_010 7 + MoveAction_016 7 EndMovement _058C: @@ -512,55 +512,55 @@ _067C: .balign 4, 0 _0680: - MoveAction_04B - MoveAction_00D - MoveAction_023 + MoveAction_075 + MoveAction_013 + MoveAction_035 EndMovement .balign 4, 0 _0690: - MoveAction_04B - MoveAction_00D 2 - MoveAction_023 + MoveAction_075 + MoveAction_013 2 + MoveAction_035 EndMovement .balign 4, 0 _06A0: - MoveAction_04B - MoveAction_00D 3 - MoveAction_023 + MoveAction_075 + MoveAction_013 3 + MoveAction_035 EndMovement .balign 4, 0 _06B0: - MoveAction_00F - MoveAction_03F 2 - MoveAction_00E - MoveAction_00C - MoveAction_021 + MoveAction_015 + MoveAction_063 2 + MoveAction_014 + MoveAction_012 + MoveAction_033 EndMovement .balign 4, 0 _06C8: - MoveAction_00F - MoveAction_03F 2 - MoveAction_00E - MoveAction_00C 2 - MoveAction_021 + MoveAction_015 + MoveAction_063 2 + MoveAction_014 + MoveAction_012 2 + MoveAction_033 EndMovement .balign 4, 0 _06E0: - MoveAction_00F - MoveAction_03F 2 - MoveAction_00E - MoveAction_00C 3 - MoveAction_021 + MoveAction_015 + MoveAction_063 2 + MoveAction_014 + MoveAction_012 3 + MoveAction_033 EndMovement .balign 4, 0 _06F8: - MoveAction_00F + MoveAction_015 EndMovement _0700: @@ -671,86 +671,86 @@ _088E: .balign 4, 0 _0894: - MoveAction_03F 5 - MoveAction_022 + MoveAction_063 5 + MoveAction_034 EndMovement .balign 4, 0 _08A0: - MoveAction_03F 5 + MoveAction_063 5 MoveAction_002 EndMovement .balign 4, 0 _08AC: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _08B4: MoveAction_001 - MoveAction_04B - MoveAction_041 - MoveAction_00D - MoveAction_00F + MoveAction_075 + MoveAction_065 + MoveAction_013 + MoveAction_015 EndMovement .balign 4, 0 _08CC: MoveAction_001 - MoveAction_04B - MoveAction_041 - MoveAction_00D 2 - MoveAction_00F + MoveAction_075 + MoveAction_065 + MoveAction_013 2 + MoveAction_015 EndMovement .balign 4, 0 _08E4: MoveAction_001 - MoveAction_04B - MoveAction_041 - MoveAction_00D 3 - MoveAction_00F + MoveAction_075 + MoveAction_065 + MoveAction_013 3 + MoveAction_015 EndMovement .balign 4, 0 _08FC: MoveAction_001 - MoveAction_04B - MoveAction_041 - MoveAction_00D 4 - MoveAction_00F + MoveAction_075 + MoveAction_065 + MoveAction_013 4 + MoveAction_015 EndMovement .balign 4, 0 _0914: - MoveAction_047 - MoveAction_00E - MoveAction_048 + MoveAction_071 + MoveAction_014 + MoveAction_072 EndMovement .balign 4, 0 _0924: - MoveAction_00C - MoveAction_021 + MoveAction_012 + MoveAction_033 EndMovement .balign 4, 0 _0930: - MoveAction_00C 2 - MoveAction_021 + MoveAction_012 2 + MoveAction_033 EndMovement .balign 4, 0 _093C: - MoveAction_00C 3 - MoveAction_021 + MoveAction_012 3 + MoveAction_033 EndMovement .balign 4, 0 _0948: - MoveAction_00C 4 - MoveAction_021 + MoveAction_012 4 + MoveAction_033 EndMovement _0954: @@ -1034,43 +1034,43 @@ _0DB7: .balign 4, 0 _0DC0: - MoveAction_00C 8 + MoveAction_012 8 EndMovement .balign 4, 0 _0DC8: - MoveAction_00D 8 + MoveAction_013 8 EndMovement .balign 4, 0 _0DD0: - MoveAction_03F 2 - MoveAction_00C - MoveAction_00F 2 - MoveAction_00C + MoveAction_063 2 + MoveAction_012 + MoveAction_015 2 + MoveAction_012 EndMovement .balign 4, 0 _0DE4: - MoveAction_03F 2 - MoveAction_00C - MoveAction_00F - MoveAction_00C + MoveAction_063 2 + MoveAction_012 + MoveAction_015 + MoveAction_012 EndMovement .balign 4, 0 _0DF8: - MoveAction_03F 2 - MoveAction_00C 2 - MoveAction_020 + MoveAction_063 2 + MoveAction_012 2 + MoveAction_032 EndMovement .balign 4, 0 _0E08: - MoveAction_03F - MoveAction_023 - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_035 + MoveAction_063 + MoveAction_033 EndMovement .byte 63 @@ -1116,29 +1116,29 @@ _0E08: .balign 4, 0 _0E44: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0E4C: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _0E54: - MoveAction_00E - MoveAction_00D + MoveAction_014 + MoveAction_013 EndMovement .balign 4, 0 _0E60: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0E68: - MoveAction_00F - MoveAction_00D 9 + MoveAction_015 + MoveAction_013 9 EndMovement .byte 15 @@ -1176,48 +1176,48 @@ _0E68: .balign 4, 0 _0E94: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0E9C: - MoveAction_027 2 + MoveAction_039 2 EndMovement .balign 4, 0 _0EA4: - MoveAction_010 9 + MoveAction_016 9 EndMovement .balign 4, 0 _0EAC: - MoveAction_010 10 + MoveAction_016 10 EndMovement .balign 4, 0 _0EB4: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0EBC: - MoveAction_021 - MoveAction_04B + MoveAction_033 + MoveAction_075 EndMovement .balign 4, 0 _0EC8: - MoveAction_026 + MoveAction_038 EndMovement .balign 4, 0 _0ED0: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0ED8: - MoveAction_00D 9 + MoveAction_013 9 EndMovement .byte 13 @@ -1247,12 +1247,12 @@ _0ED8: .balign 4, 0 _0EF8: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0F00: - MoveAction_022 + MoveAction_034 EndMovement .byte 34 @@ -1298,8 +1298,8 @@ _0F00: .balign 4, 0 _0F30: - MoveAction_00E - MoveAction_020 + MoveAction_014 + MoveAction_032 EndMovement _0F3C: @@ -1499,41 +1499,41 @@ _1170: .balign 4, 0 _1178: - MoveAction_021 - MoveAction_04B + MoveAction_033 + MoveAction_075 EndMovement .balign 4, 0 _1184: - MoveAction_00D 2 - MoveAction_00E 2 - MoveAction_00D 2 + MoveAction_013 2 + MoveAction_014 2 + MoveAction_013 2 EndMovement .balign 4, 0 _1194: - MoveAction_00D 2 - MoveAction_00E - MoveAction_00D 2 + MoveAction_013 2 + MoveAction_014 + MoveAction_013 2 EndMovement .balign 4, 0 _11A4: - MoveAction_00D 4 + MoveAction_013 4 EndMovement .balign 4, 0 _11AC: - MoveAction_00D 2 - MoveAction_00F - MoveAction_00D 2 + MoveAction_013 2 + MoveAction_015 + MoveAction_013 2 EndMovement .balign 4, 0 _11BC: - MoveAction_00D 2 - MoveAction_00F 2 - MoveAction_00D 2 + MoveAction_013 2 + MoveAction_015 2 + MoveAction_013 2 EndMovement _11CC: @@ -1608,26 +1608,26 @@ _12D5: .balign 4, 0 _12F0: - MoveAction_00E - MoveAction_00C 9 + MoveAction_014 + MoveAction_012 9 EndMovement .balign 4, 0 _12FC: - MoveAction_00C 9 + MoveAction_012 9 EndMovement .balign 4, 0 _1304: - MoveAction_03F - MoveAction_022 - MoveAction_020 + MoveAction_063 + MoveAction_034 + MoveAction_032 EndMovement .balign 4, 0 _1314: - MoveAction_03F - MoveAction_020 + MoveAction_063 + MoveAction_032 EndMovement _1320: @@ -1802,24 +1802,24 @@ _14CF: .balign 4, 0 _1538: - MoveAction_00B 2 - MoveAction_04B + MoveAction_011 2 + MoveAction_075 EndMovement .balign 4, 0 _1544: - MoveAction_013 6 + MoveAction_019 6 EndMovement .balign 4, 0 _154C: - MoveAction_00A - MoveAction_012 8 + MoveAction_010 + MoveAction_018 8 EndMovement .balign 4, 0 _1558: - MoveAction_022 - MoveAction_03F 2 - MoveAction_023 + MoveAction_034 + MoveAction_063 2 + MoveAction_035 EndMovement diff --git a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s index 446721930f..6d62297648 100644 --- a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s +++ b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s @@ -216,13 +216,13 @@ _0340: .balign 4, 0 _0348: - MoveAction_00A + MoveAction_010 MoveAction_008 EndMovement .balign 4, 0 _0354: - MoveAction_00B + MoveAction_011 MoveAction_008 EndMovement @@ -239,37 +239,37 @@ _0368: .balign 4, 0 _0374: - MoveAction_00E + MoveAction_014 MoveAction_003 EndMovement .balign 4, 0 _0380: - MoveAction_00E + MoveAction_014 MoveAction_003 EndMovement .balign 4, 0 _038C: - MoveAction_00F + MoveAction_015 MoveAction_002 EndMovement .balign 4, 0 _0398: - MoveAction_00F + MoveAction_015 MoveAction_001 EndMovement .balign 4, 0 _03A4: - MoveAction_00F + MoveAction_015 MoveAction_001 EndMovement .balign 4, 0 _03B0: - MoveAction_00E + MoveAction_014 MoveAction_001 EndMovement diff --git a/res/field/scripts/scripts_jubilife_tv_elevator.s b/res/field/scripts/scripts_jubilife_tv_elevator.s index adcbaf8071..c4a46c2d6d 100644 --- a/res/field/scripts/scripts_jubilife_tv_elevator.s +++ b/res/field/scripts/scripts_jubilife_tv_elevator.s @@ -149,5 +149,5 @@ _0283: .balign 4, 0 _029C: - MoveAction_021 + MoveAction_033 EndMovement diff --git a/res/field/scripts/scripts_lake_acuity.s b/res/field/scripts/scripts_lake_acuity.s index 1fc4b19ef6..b8840e3175 100644 --- a/res/field/scripts/scripts_lake_acuity.s +++ b/res/field/scripts/scripts_lake_acuity.s @@ -104,85 +104,85 @@ _018C: .balign 4, 0 _0198: - MoveAction_00C 5 - MoveAction_00F 2 + MoveAction_012 5 + MoveAction_015 2 EndMovement .balign 4, 0 _01A4: - MoveAction_00C 5 - MoveAction_00F + MoveAction_012 5 + MoveAction_015 EndMovement .balign 4, 0 _01B0: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _01B8: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _01C4: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _01CC: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _01D4: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _01DC: - MoveAction_00D 2 - MoveAction_00E 2 - MoveAction_00D 3 + MoveAction_013 2 + MoveAction_014 2 + MoveAction_013 3 EndMovement .balign 4, 0 _01EC: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _01F4: - MoveAction_00E 2 - MoveAction_00D 6 - MoveAction_022 + MoveAction_014 2 + MoveAction_013 6 + MoveAction_034 EndMovement .balign 4, 0 _0204: - MoveAction_00E 2 - MoveAction_00D 5 + MoveAction_014 2 + MoveAction_013 5 EndMovement .balign 4, 0 _0210: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0218: - MoveAction_00E - MoveAction_00D - MoveAction_021 + MoveAction_014 + MoveAction_013 + MoveAction_033 EndMovement .balign 4, 0 _0228: - MoveAction_00C 5 + MoveAction_012 5 EndMovement .balign 4, 0 _0230: - MoveAction_00D 5 + MoveAction_013 5 EndMovement diff --git a/res/field/scripts/scripts_lake_verity.s b/res/field/scripts/scripts_lake_verity.s index 538508fc5b..372db2645a 100644 --- a/res/field/scripts/scripts_lake_verity.s +++ b/res/field/scripts/scripts_lake_verity.s @@ -148,7 +148,7 @@ _01C0: .balign 4, 0 _01C8: - MoveAction_023 + MoveAction_035 EndMovement _01D0: @@ -181,9 +181,9 @@ _0211: .balign 4, 0 _0220: - MoveAction_021 - MoveAction_04B - MoveAction_00D + MoveAction_033 + MoveAction_075 + MoveAction_013 EndMovement _0230: @@ -254,17 +254,17 @@ _02DB: .balign 4, 0 _02F4: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _02FC: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0304: - MoveAction_022 + MoveAction_034 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 0d812c3605..c07e5f27fc 100644 --- a/res/field/scripts/scripts_lake_verity_low_water.s +++ b/res/field/scripts/scripts_lake_verity_low_water.s @@ -116,13 +116,13 @@ _01A1: .balign 4, 0 _01B4: - MoveAction_03F - MoveAction_00C 9 + MoveAction_063 + MoveAction_012 9 EndMovement .balign 4, 0 _01C0: - MoveAction_00D 9 + MoveAction_013 9 EndMovement .byte 35 @@ -152,15 +152,15 @@ _01C0: .balign 4, 0 _01E0: - MoveAction_00D 5 - MoveAction_00E - MoveAction_00D 4 + MoveAction_013 5 + MoveAction_014 + MoveAction_013 4 EndMovement .balign 4, 0 _01F0: - MoveAction_00D 3 - MoveAction_045 + MoveAction_013 3 + MoveAction_069 EndMovement .byte 63 @@ -322,52 +322,52 @@ _01F0: .balign 4, 0 _0298: - MoveAction_010 + MoveAction_016 EndMovement .balign 4, 0 _02A0: - MoveAction_00F - MoveAction_022 + MoveAction_015 + MoveAction_034 EndMovement .balign 4, 0 _02AC: - MoveAction_00E - MoveAction_021 + MoveAction_014 + MoveAction_033 EndMovement .balign 4, 0 _02B8: - MoveAction_026 + MoveAction_038 EndMovement .balign 4, 0 _02C0: - MoveAction_04B - MoveAction_010 3 - MoveAction_03F 3 - MoveAction_026 - MoveAction_03F - MoveAction_024 - MoveAction_03F 2 - MoveAction_011 3 - MoveAction_026 + MoveAction_075 + MoveAction_016 3 + MoveAction_063 3 + MoveAction_038 + MoveAction_063 + MoveAction_036 + MoveAction_063 2 + MoveAction_017 3 + MoveAction_038 EndMovement .balign 4, 0 _02E8: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _02F0: - MoveAction_026 4 + MoveAction_038 4 EndMovement .balign 4, 0 _02F8: - MoveAction_011 2 + MoveAction_017 2 EndMovement .byte 35 @@ -477,35 +477,35 @@ _02F8: .balign 4, 0 _0368: - MoveAction_00C + MoveAction_012 EndMovement .balign 4, 0 _0370: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0378: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0380: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0388: - MoveAction_03F 4 - MoveAction_020 - MoveAction_03F 9 - MoveAction_023 + MoveAction_063 4 + MoveAction_032 + MoveAction_063 9 + MoveAction_035 EndMovement .balign 4, 0 _039C: - MoveAction_021 + MoveAction_033 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 c0f96055ec..c42ce60bef 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 @@ -34,15 +34,15 @@ _001D: .balign 4, 0 _0058: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0060: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0068: - MoveAction_022 + MoveAction_034 EndMovement diff --git a/res/field/scripts/scripts_mt_coronet_1f_south.s b/res/field/scripts/scripts_mt_coronet_1f_south.s index 21a771e24a..cce145a89e 100644 --- a/res/field/scripts/scripts_mt_coronet_1f_south.s +++ b/res/field/scripts/scripts_mt_coronet_1f_south.s @@ -30,45 +30,45 @@ _0006: .balign 4, 0 _0064: - MoveAction_00D 6 - MoveAction_022 + MoveAction_013 6 + MoveAction_034 EndMovement .balign 4, 0 _0070: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0078: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0080: - MoveAction_03F 3 - MoveAction_00E 10 + MoveAction_063 3 + MoveAction_014 10 EndMovement .balign 4, 0 _008C: - MoveAction_020 - MoveAction_03F 4 - MoveAction_023 + MoveAction_032 + MoveAction_063 4 + MoveAction_035 EndMovement .balign 4, 0 _009C: - MoveAction_03F 3 - MoveAction_020 - MoveAction_03F - MoveAction_023 + MoveAction_063 3 + MoveAction_032 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _00B0: - MoveAction_00D - MoveAction_020 - MoveAction_03F 2 - MoveAction_022 + MoveAction_013 + MoveAction_032 + MoveAction_063 2 + MoveAction_034 EndMovement diff --git a/res/field/scripts/scripts_mt_coronet_2f.s b/res/field/scripts/scripts_mt_coronet_2f.s index fc10a2dd38..1281ca2000 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_012 4 - MoveAction_03F - MoveAction_04B - MoveAction_03F + MoveAction_018 4 + MoveAction_063 + MoveAction_075 + MoveAction_063 EndMovement .balign 4, 0 _015C: - MoveAction_012 4 - MoveAction_010 - MoveAction_026 + MoveAction_018 4 + MoveAction_016 + MoveAction_038 EndMovement .balign 4, 0 _016C: - MoveAction_012 4 + MoveAction_018 4 EndMovement .balign 4, 0 _0174: - MoveAction_012 4 - MoveAction_011 - MoveAction_026 + MoveAction_018 4 + MoveAction_017 + MoveAction_038 EndMovement .balign 4, 0 _0184: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _018C: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0194: - MoveAction_03F 4 - MoveAction_023 + MoveAction_063 4 + MoveAction_035 EndMovement _01A0: diff --git a/res/field/scripts/scripts_newmoon_island.s b/res/field/scripts/scripts_newmoon_island.s index 3d1d76c036..42675d6865 100644 --- a/res/field/scripts/scripts_newmoon_island.s +++ b/res/field/scripts/scripts_newmoon_island.s @@ -81,31 +81,31 @@ _00F6: .balign 4, 0 _0110: - MoveAction_00E - MoveAction_040 + MoveAction_014 + MoveAction_064 EndMovement .balign 4, 0 _011C: - MoveAction_045 + MoveAction_069 EndMovement .balign 4, 0 _0124: - MoveAction_00D - MoveAction_00E 2 - MoveAction_040 + MoveAction_013 + MoveAction_014 2 + MoveAction_064 EndMovement .balign 4, 0 _0134: - MoveAction_00E 2 - MoveAction_040 + MoveAction_014 2 + MoveAction_064 EndMovement .balign 4, 0 _0140: - MoveAction_00C - MoveAction_00E 2 - MoveAction_040 + MoveAction_012 + MoveAction_014 2 + MoveAction_064 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 5780ce3db4..79d31314ab 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_041 + MoveAction_065 MoveAction_001 - MoveAction_041 - MoveAction_049 - MoveAction_00D 2 - MoveAction_04A - MoveAction_045 + MoveAction_065 + MoveAction_073 + MoveAction_013 2 + MoveAction_074 + MoveAction_069 EndMovement diff --git a/res/field/scripts/scripts_old_chateau_dining_area.s b/res/field/scripts/scripts_old_chateau_dining_area.s index d13b995899..41ff09616e 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_00C - MoveAction_042 + MoveAction_012 + MoveAction_066 MoveAction_002 EndMovement .balign 4, 0 _0064: - MoveAction_03F + MoveAction_063 MoveAction_002 - MoveAction_041 - MoveAction_049 - MoveAction_00E 10 - MoveAction_04A - MoveAction_045 + MoveAction_065 + MoveAction_073 + MoveAction_014 10 + MoveAction_074 + MoveAction_069 EndMovement diff --git a/res/field/scripts/scripts_oreburgh_city.s b/res/field/scripts/scripts_oreburgh_city.s index 5cc362c971..2912b56ff9 100644 --- a/res/field/scripts/scripts_oreburgh_city.s +++ b/res/field/scripts/scripts_oreburgh_city.s @@ -184,82 +184,82 @@ _0287: .balign 4, 0 _02A0: - MoveAction_03E 7 - MoveAction_047 - MoveAction_012 - MoveAction_048 + MoveAction_062 7 + MoveAction_071 + MoveAction_018 + MoveAction_072 MoveAction_003 EndMovement .balign 4, 0 _02B8: - MoveAction_012 9 + MoveAction_018 9 EndMovement .balign 4, 0 _02C0: - MoveAction_011 - MoveAction_012 4 - MoveAction_026 + MoveAction_017 + MoveAction_018 4 + MoveAction_038 EndMovement .balign 4, 0 _02D0: - MoveAction_011 - MoveAction_012 3 - MoveAction_010 - MoveAction_012 - MoveAction_026 + MoveAction_017 + MoveAction_018 3 + MoveAction_016 + MoveAction_018 + MoveAction_038 EndMovement .balign 4, 0 _02E8: - MoveAction_010 - MoveAction_012 4 - MoveAction_026 + MoveAction_016 + MoveAction_018 4 + MoveAction_038 EndMovement .balign 4, 0 _02F8: - MoveAction_010 - MoveAction_012 3 - MoveAction_010 - MoveAction_012 - MoveAction_026 + MoveAction_016 + MoveAction_018 3 + MoveAction_016 + MoveAction_018 + MoveAction_038 EndMovement .balign 4, 0 _0310: - MoveAction_021 - MoveAction_022 + MoveAction_033 + MoveAction_034 EndMovement .balign 4, 0 _031C: - MoveAction_021 - MoveAction_022 + MoveAction_033 + MoveAction_034 EndMovement .balign 4, 0 _0328: - MoveAction_020 - MoveAction_022 + MoveAction_032 + MoveAction_034 EndMovement .balign 4, 0 _0334: - MoveAction_020 - MoveAction_022 + MoveAction_032 + MoveAction_034 EndMovement .balign 4, 0 _0340: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0348: - MoveAction_022 + MoveAction_034 EndMovement _0350: @@ -417,95 +417,95 @@ _0544: .balign 4, 0 _055C: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0564: - MoveAction_00D - MoveAction_00F - MoveAction_00D 10 - MoveAction_00F 12 + MoveAction_013 + MoveAction_015 + MoveAction_013 10 + MoveAction_015 12 EndMovement .balign 4, 0 _0578: - MoveAction_00D - MoveAction_00F - MoveAction_00D 9 - MoveAction_00F 12 + MoveAction_013 + MoveAction_015 + MoveAction_013 9 + MoveAction_015 12 EndMovement .balign 4, 0 _058C: - MoveAction_00D - MoveAction_00F - MoveAction_00D 8 - MoveAction_00F 12 + MoveAction_013 + MoveAction_015 + MoveAction_013 8 + MoveAction_015 12 EndMovement .balign 4, 0 _05A0: - MoveAction_00D - MoveAction_00F - MoveAction_00D 7 - MoveAction_00F 12 + MoveAction_013 + MoveAction_015 + MoveAction_013 7 + MoveAction_015 12 EndMovement .balign 4, 0 _05B4: - MoveAction_00F - MoveAction_00D 10 - MoveAction_00F 13 - MoveAction_022 + MoveAction_015 + MoveAction_013 10 + MoveAction_015 13 + MoveAction_034 EndMovement .balign 4, 0 _05C8: - MoveAction_00F - MoveAction_00D 9 - MoveAction_00F 13 - MoveAction_022 + MoveAction_015 + MoveAction_013 9 + MoveAction_015 13 + MoveAction_034 EndMovement .balign 4, 0 _05DC: - MoveAction_00F - MoveAction_00D 8 - MoveAction_00F 13 - MoveAction_022 + MoveAction_015 + MoveAction_013 8 + MoveAction_015 13 + MoveAction_034 EndMovement .balign 4, 0 _05F0: - MoveAction_00F - MoveAction_00D 7 - MoveAction_00F 13 - MoveAction_022 + MoveAction_015 + MoveAction_013 7 + MoveAction_015 13 + MoveAction_034 EndMovement .balign 4, 0 _0604: - MoveAction_04B - MoveAction_00C 3 + MoveAction_075 + MoveAction_012 3 EndMovement .balign 4, 0 _0610: - MoveAction_04B - MoveAction_00C 2 + MoveAction_075 + MoveAction_012 2 EndMovement .balign 4, 0 _061C: - MoveAction_04B - MoveAction_00C + MoveAction_075 + MoveAction_012 EndMovement .balign 4, 0 _0628: - MoveAction_04B - MoveAction_020 + MoveAction_075 + MoveAction_032 EndMovement _0634: diff --git a/res/field/scripts/scripts_oreburgh_gate_1f.s b/res/field/scripts/scripts_oreburgh_gate_1f.s index 1fca70500f..0157713ecf 100644 --- a/res/field/scripts/scripts_oreburgh_gate_1f.s +++ b/res/field/scripts/scripts_oreburgh_gate_1f.s @@ -62,13 +62,13 @@ _007B: .balign 4, 0 _00B4: - MoveAction_03F - MoveAction_020 + MoveAction_063 + MoveAction_032 EndMovement .balign 4, 0 _00C0: - MoveAction_021 - MoveAction_04B - MoveAction_00D + MoveAction_033 + MoveAction_075 + MoveAction_013 EndMovement diff --git a/res/field/scripts/scripts_oreburgh_mine_b1f.s b/res/field/scripts/scripts_oreburgh_mine_b1f.s index 9e76c5328e..4ac0f8758d 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_00E - MoveAction_00C 3 + MoveAction_014 + MoveAction_012 3 EndMovement .balign 4, 0 _0144: - MoveAction_00C 3 + MoveAction_012 3 EndMovement diff --git a/res/field/scripts/scripts_oreburgh_mine_b2f.s b/res/field/scripts/scripts_oreburgh_mine_b2f.s index e90cd6cccd..a37cdd4472 100644 --- a/res/field/scripts/scripts_oreburgh_mine_b2f.s +++ b/res/field/scripts/scripts_oreburgh_mine_b2f.s @@ -106,7 +106,7 @@ _00A1: .balign 4, 0 _00C0: - MoveAction_00F 10 + MoveAction_015 10 EndMovement .byte 63 @@ -128,9 +128,9 @@ _00C0: .balign 4, 0 _00D8: - MoveAction_03F 2 - MoveAction_023 - MoveAction_03F 4 + MoveAction_063 2 + MoveAction_035 + MoveAction_063 4 EndMovement .byte 63 diff --git a/res/field/scripts/scripts_pal_park.s b/res/field/scripts/scripts_pal_park.s index e0bb5b88cb..dff793d40c 100644 --- a/res/field/scripts/scripts_pal_park.s +++ b/res/field/scripts/scripts_pal_park.s @@ -108,7 +108,7 @@ _0114: .balign 4, 0 _0124: - MoveAction_00C + MoveAction_012 EndMovement _012C: @@ -131,7 +131,7 @@ _0159: .balign 4, 0 _0168: - MoveAction_022 + MoveAction_034 EndMovement _0170: diff --git a/res/field/scripts/scripts_pal_park_lobby.s b/res/field/scripts/scripts_pal_park_lobby.s index 7d2874a8ed..b4ae5519cf 100644 --- a/res/field/scripts/scripts_pal_park_lobby.s +++ b/res/field/scripts/scripts_pal_park_lobby.s @@ -186,16 +186,16 @@ _02AD: .balign 4, 0 _02B8: - MoveAction_024 - MoveAction_00C 2 - MoveAction_00F - MoveAction_026 + MoveAction_036 + MoveAction_012 2 + MoveAction_015 + MoveAction_038 EndMovement .balign 4, 0 _02CC: - MoveAction_00C 5 - MoveAction_045 + MoveAction_012 5 + MoveAction_069 EndMovement _02D8: @@ -267,24 +267,24 @@ _03BD: .balign 4, 0 _03D8: - MoveAction_00E - MoveAction_00D 2 + MoveAction_014 + MoveAction_013 2 EndMovement .balign 4, 0 _03E4: - MoveAction_00D 5 + MoveAction_013 5 EndMovement .balign 4, 0 _03EC: - MoveAction_00D 2 - MoveAction_027 + MoveAction_013 2 + MoveAction_039 EndMovement .balign 4, 0 _03F8: - MoveAction_00D 4 + MoveAction_013 4 EndMovement _0400: @@ -412,27 +412,27 @@ _04F6: .balign 4, 0 _0548: - MoveAction_04B - MoveAction_03F - MoveAction_00D 3 + MoveAction_075 + MoveAction_063 + MoveAction_013 3 EndMovement .balign 4, 0 _0558: - MoveAction_04B - MoveAction_03F + MoveAction_075 + MoveAction_063 EndMovement .balign 4, 0 _0564: - MoveAction_00D - MoveAction_021 + MoveAction_013 + MoveAction_033 EndMovement .balign 4, 0 _0570: - MoveAction_00F - MoveAction_022 + MoveAction_015 + MoveAction_034 EndMovement _057C: diff --git a/res/field/scripts/scripts_pastoria_city.s b/res/field/scripts/scripts_pastoria_city.s index a93577fca1..87d7f8acf4 100644 --- a/res/field/scripts/scripts_pastoria_city.s +++ b/res/field/scripts/scripts_pastoria_city.s @@ -253,8 +253,8 @@ _02D2: .balign 4, 0 _02EC: - MoveAction_021 - MoveAction_023 + MoveAction_033 + MoveAction_035 EndMovement .byte 32 @@ -272,12 +272,12 @@ _02EC: .balign 4, 0 _0304: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _030C: - MoveAction_023 + MoveAction_035 EndMovement .byte 33 @@ -399,15 +399,15 @@ _030C: .balign 4, 0 _0388: - MoveAction_011 - MoveAction_013 2 - MoveAction_027 + MoveAction_017 + MoveAction_019 2 + MoveAction_039 EndMovement .balign 4, 0 _0398: - MoveAction_013 2 - MoveAction_027 + MoveAction_019 2 + MoveAction_039 EndMovement .byte 17 @@ -553,7 +553,7 @@ _04AE: .balign 4, 0 _04C0: - MoveAction_021 + MoveAction_033 EndMovement _04C8: @@ -614,32 +614,32 @@ _0597: .balign 4, 0 _05A4: - MoveAction_03E 13 - MoveAction_023 + MoveAction_062 13 + MoveAction_035 EndMovement .balign 4, 0 _05B0: - MoveAction_011 9 - MoveAction_026 - MoveAction_04B + MoveAction_017 9 + MoveAction_038 + MoveAction_075 EndMovement .balign 4, 0 _05C0: - MoveAction_012 4 - MoveAction_026 + MoveAction_018 4 + MoveAction_038 EndMovement .balign 4, 0 _05CC: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _05D4: - MoveAction_013 5 - MoveAction_010 9 + MoveAction_019 5 + MoveAction_016 9 EndMovement _05E0: @@ -733,75 +733,75 @@ _074D: .balign 4, 0 _0764: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _076C: - MoveAction_023 - MoveAction_03F 2 - MoveAction_021 + MoveAction_035 + MoveAction_063 2 + MoveAction_033 EndMovement .balign 4, 0 _077C: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0784: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _078C: - MoveAction_013 6 - MoveAction_010 8 + MoveAction_019 6 + MoveAction_016 8 EndMovement .balign 4, 0 _0798: - MoveAction_011 9 - MoveAction_012 5 + MoveAction_017 9 + MoveAction_018 5 EndMovement .balign 4, 0 _07A4: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _07AC: - MoveAction_047 - MoveAction_011 - MoveAction_048 - MoveAction_027 + MoveAction_071 + MoveAction_017 + MoveAction_072 + MoveAction_039 EndMovement .balign 4, 0 _07C0: - MoveAction_013 5 - MoveAction_010 8 + MoveAction_019 5 + MoveAction_016 8 EndMovement .balign 4, 0 _07CC: - MoveAction_03E 11 - MoveAction_023 + MoveAction_062 11 + MoveAction_035 EndMovement .balign 4, 0 _07D8: - MoveAction_020 - MoveAction_03F 2 - MoveAction_00D - MoveAction_020 + MoveAction_032 + MoveAction_063 2 + MoveAction_013 + MoveAction_032 EndMovement .balign 4, 0 _07EC: - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_035 EndMovement _07F8: @@ -906,7 +906,7 @@ _098D: .balign 4, 0 _099C: - MoveAction_03F + MoveAction_063 MoveAction_000 EndMovement @@ -968,42 +968,42 @@ _0AA4: .balign 4, 0 _0AAC: - MoveAction_011 - MoveAction_013 - MoveAction_025 + MoveAction_017 + MoveAction_019 + MoveAction_037 EndMovement .balign 4, 0 _0ABC: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _0AC8: - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _0AD4: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0ADC: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0AE4: - MoveAction_010 3 - MoveAction_013 + MoveAction_016 3 + MoveAction_019 EndMovement .balign 4, 0 _0AF0: - MoveAction_024 + MoveAction_036 EndMovement .byte 17 @@ -1025,52 +1025,52 @@ _0AF0: .balign 4, 0 _0B08: - MoveAction_025 + MoveAction_037 EndMovement .balign 4, 0 _0B10: - MoveAction_03F - MoveAction_025 + MoveAction_063 + MoveAction_037 EndMovement .balign 4, 0 _0B1C: - MoveAction_013 2 - MoveAction_010 + MoveAction_019 2 + MoveAction_016 EndMovement .balign 4, 0 _0B28: - MoveAction_013 - MoveAction_010 - MoveAction_013 - MoveAction_024 + MoveAction_019 + MoveAction_016 + MoveAction_019 + MoveAction_036 EndMovement .balign 4, 0 _0B3C: - MoveAction_027 + MoveAction_039 EndMovement .balign 4, 0 _0B44: - MoveAction_011 4 + MoveAction_017 4 EndMovement .balign 4, 0 _0B4C: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0B54: - MoveAction_013 12 + MoveAction_019 12 EndMovement .balign 4, 0 _0B5C: - MoveAction_020 + MoveAction_032 EndMovement .byte 33 @@ -1084,23 +1084,23 @@ _0B5C: .balign 4, 0 _0B6C: - MoveAction_025 + MoveAction_037 EndMovement .balign 4, 0 _0B74: - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _0B80: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0B88: - MoveAction_00C 2 + MoveAction_012 2 EndMovement _0B90: @@ -1120,24 +1120,24 @@ _0B90: .balign 4, 0 _0BC8: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0BD0: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _0BD8: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0BE0: - MoveAction_00E - MoveAction_00F - MoveAction_020 + MoveAction_014 + MoveAction_015 + MoveAction_032 EndMovement _0BF0: @@ -1172,16 +1172,16 @@ _0C22: .balign 4, 0 _0C64: - MoveAction_00C 7 - MoveAction_022 + MoveAction_012 7 + MoveAction_034 EndMovement .balign 4, 0 _0C70: - MoveAction_00C 5 + MoveAction_012 5 EndMovement .balign 4, 0 _0C78: - MoveAction_021 + MoveAction_033 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 d49a946290..b48d22edd1 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_00E + MoveAction_014 EndMovement .balign 4, 0 _0194: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _019C: - MoveAction_020 - MoveAction_00C 3 - MoveAction_00F - MoveAction_00C - MoveAction_045 + MoveAction_032 + MoveAction_012 3 + MoveAction_015 + MoveAction_012 + MoveAction_069 EndMovement .balign 4, 0 _01B4: - MoveAction_020 - MoveAction_00C 4 - MoveAction_045 + MoveAction_032 + MoveAction_012 4 + MoveAction_069 EndMovement .balign 4, 0 _01C4: - MoveAction_00D + MoveAction_013 EndMovement _01CC: @@ -186,14 +186,14 @@ _024E: .balign 4, 0 _0280: - MoveAction_00D 5 + MoveAction_013 5 EndMovement .balign 4, 0 _0288: MoveAction_000 - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 EndMovement _0298: @@ -252,8 +252,8 @@ _0329: .balign 4, 0 _0334: - MoveAction_00F 4 - MoveAction_020 + MoveAction_015 4 + MoveAction_032 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 6d3d955373..212aa4fef7 100644 --- a/res/field/scripts/scripts_pokemon_league_aaron_room.s +++ b/res/field/scripts/scripts_pokemon_league_aaron_room.s @@ -70,5 +70,5 @@ _00B7: .balign 4, 0 _00DC: - MoveAction_00C 2 + MoveAction_012 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 4b6c9226ff..fb0bbdd48c 100644 --- a/res/field/scripts/scripts_pokemon_league_bertha_room.s +++ b/res/field/scripts/scripts_pokemon_league_bertha_room.s @@ -70,5 +70,5 @@ _00B7: .balign 4, 0 _00DC: - MoveAction_00C 2 + MoveAction_012 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 44cb7d3fc2..b82e7c9eac 100644 --- a/res/field/scripts/scripts_pokemon_league_champion_room.s +++ b/res/field/scripts/scripts_pokemon_league_champion_room.s @@ -82,26 +82,26 @@ _0121: .balign 4, 0 _012C: - MoveAction_00C 4 + MoveAction_012 4 EndMovement .balign 4, 0 _0134: - MoveAction_00C 6 + MoveAction_012 6 EndMovement .balign 4, 0 _013C: - MoveAction_00C 6 + MoveAction_012 6 EndMovement .balign 4, 0 _0144: - MoveAction_00E - MoveAction_021 + MoveAction_014 + MoveAction_033 EndMovement .balign 4, 0 _0150: - MoveAction_020 + MoveAction_032 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 6210f5cf5b..35524ec231 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 @@ -71,55 +71,55 @@ _00C9: .balign 4, 0 _0114: - MoveAction_00C 8 - MoveAction_023 + MoveAction_012 8 + MoveAction_035 EndMovement .balign 4, 0 _0120: - MoveAction_03F 3 - MoveAction_00C 2 - MoveAction_00F - MoveAction_00C 2 - MoveAction_045 + MoveAction_063 3 + MoveAction_012 2 + MoveAction_015 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _0138: - MoveAction_00C 8 - MoveAction_022 + MoveAction_012 8 + MoveAction_034 EndMovement .balign 4, 0 _0144: - MoveAction_022 - MoveAction_04B + MoveAction_034 + MoveAction_075 EndMovement .balign 4, 0 _0150: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0158: - MoveAction_00C 2 - MoveAction_00E - MoveAction_00C 2 - MoveAction_045 + MoveAction_012 2 + MoveAction_014 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _016C: - MoveAction_00C 17 - MoveAction_03F - MoveAction_021 + MoveAction_012 17 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _017C: - MoveAction_03F 6 - MoveAction_023 + MoveAction_063 6 + MoveAction_035 EndMovement .byte 35 @@ -133,13 +133,13 @@ _017C: .balign 4, 0 _0190: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0198: - MoveAction_03F - MoveAction_020 - MoveAction_03F 6 - MoveAction_00C 4 + MoveAction_063 + MoveAction_032 + MoveAction_063 6 + MoveAction_012 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 b84be25c97..10e2b262e0 100644 --- a/res/field/scripts/scripts_pokemon_league_flint_room.s +++ b/res/field/scripts/scripts_pokemon_league_flint_room.s @@ -90,11 +90,11 @@ _0118: .balign 4, 0 _0120: - MoveAction_047 - MoveAction_021 3 - MoveAction_025 4 - MoveAction_029 2 - MoveAction_048 + MoveAction_071 + MoveAction_033 3 + MoveAction_037 4 + MoveAction_041 2 + MoveAction_072 EndMovement _0138: @@ -110,5 +110,5 @@ _0138: .balign 4, 0 _015C: - MoveAction_00C 2 + MoveAction_012 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 3ba283be9e..2cd7f10ae9 100644 --- a/res/field/scripts/scripts_pokemon_league_hall_of_fame.s +++ b/res/field/scripts/scripts_pokemon_league_hall_of_fame.s @@ -79,43 +79,43 @@ _0119: .balign 4, 0 _0124: - MoveAction_00C 8 + MoveAction_012 8 EndMovement .balign 4, 0 _012C: - MoveAction_00C 2 + MoveAction_012 2 EndMovement .balign 4, 0 _0134: - MoveAction_020 - MoveAction_03F 2 - MoveAction_023 + MoveAction_032 + MoveAction_063 2 + MoveAction_035 EndMovement .balign 4, 0 _0144: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _014C: - MoveAction_03F - MoveAction_023 - MoveAction_020 + MoveAction_063 + MoveAction_035 + MoveAction_032 EndMovement .balign 4, 0 _015C: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0164: - MoveAction_03F - MoveAction_022 - MoveAction_020 + MoveAction_063 + MoveAction_034 + MoveAction_032 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 d11923c1ee..1a9ae14b1e 100644 --- a/res/field/scripts/scripts_pokemon_league_lucian_room.s +++ b/res/field/scripts/scripts_pokemon_league_lucian_room.s @@ -70,5 +70,5 @@ _00B7: .balign 4, 0 _00DC: - MoveAction_00C 2 + MoveAction_012 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 ef3697ea6a..d9bc493d20 100644 --- a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s +++ b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s @@ -80,20 +80,20 @@ _00F7: .balign 4, 0 _0104: - MoveAction_00F - MoveAction_021 + MoveAction_015 + MoveAction_033 EndMovement .balign 4, 0 _0110: - MoveAction_00E - MoveAction_023 + MoveAction_014 + MoveAction_035 EndMovement .balign 4, 0 _011C: - MoveAction_00F - MoveAction_022 + MoveAction_015 + MoveAction_034 EndMovement _0128: @@ -209,45 +209,45 @@ _02AC: .balign 4, 0 _02B8: - MoveAction_025 + MoveAction_037 EndMovement .balign 4, 0 _02C0: - MoveAction_010 3 - MoveAction_012 - MoveAction_010 3 + MoveAction_016 3 + MoveAction_018 + MoveAction_016 3 EndMovement .balign 4, 0 _02D0: - MoveAction_010 6 + MoveAction_016 6 EndMovement .balign 4, 0 _02D8: - MoveAction_010 3 - MoveAction_013 - MoveAction_010 3 + MoveAction_016 3 + MoveAction_019 + MoveAction_016 3 EndMovement .balign 4, 0 _02E8: - MoveAction_011 3 - MoveAction_013 - MoveAction_011 3 + MoveAction_017 3 + MoveAction_019 + MoveAction_017 3 EndMovement .balign 4, 0 _02F8: - MoveAction_011 6 + MoveAction_017 6 EndMovement .balign 4, 0 _0300: - MoveAction_011 3 - MoveAction_012 - MoveAction_011 3 + MoveAction_017 3 + MoveAction_018 + MoveAction_017 3 EndMovement _0310: diff --git a/res/field/scripts/scripts_pokemon_mansion.s b/res/field/scripts/scripts_pokemon_mansion.s index 8a451d7541..4fd0ebd683 100644 --- a/res/field/scripts/scripts_pokemon_mansion.s +++ b/res/field/scripts/scripts_pokemon_mansion.s @@ -242,50 +242,50 @@ _03E6: .balign 4, 0 _03EC: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _03F4: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _03FC: - MoveAction_00C - MoveAction_021 + MoveAction_012 + MoveAction_033 EndMovement .balign 4, 0 _0408: - MoveAction_00D - MoveAction_023 + MoveAction_013 + MoveAction_035 EndMovement .balign 4, 0 _0414: - MoveAction_022 - MoveAction_045 + MoveAction_034 + MoveAction_069 EndMovement .balign 4, 0 _0420: - MoveAction_046 - MoveAction_023 + MoveAction_070 + MoveAction_035 EndMovement .balign 4, 0 _042C: - MoveAction_00F - MoveAction_00C - MoveAction_022 + MoveAction_015 + MoveAction_012 + MoveAction_034 EndMovement .balign 4, 0 _043C: - MoveAction_00F - MoveAction_00D - MoveAction_022 + MoveAction_015 + MoveAction_013 + MoveAction_034 EndMovement _044C: diff --git a/res/field/scripts/scripts_pokemon_mansion_office.s b/res/field/scripts/scripts_pokemon_mansion_office.s index 9d7767f7f7..a35da68957 100644 --- a/res/field/scripts/scripts_pokemon_mansion_office.s +++ b/res/field/scripts/scripts_pokemon_mansion_office.s @@ -130,43 +130,43 @@ _01CC: .balign 4, 0 _01D4: - MoveAction_04B - MoveAction_041 + MoveAction_075 + MoveAction_065 MoveAction_003 EndMovement .balign 4, 0 _01E4: - MoveAction_04B - MoveAction_022 + MoveAction_075 + MoveAction_034 EndMovement .balign 4, 0 _01F0: - MoveAction_00D 2 - MoveAction_00F + MoveAction_013 2 + MoveAction_015 MoveAction_001 - MoveAction_045 + MoveAction_069 EndMovement .balign 4, 0 _0204: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _020C: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0214: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _021C: - MoveAction_021 + MoveAction_033 EndMovement _0224: @@ -280,7 +280,7 @@ _0354: .balign 4, 0 _037C: - MoveAction_00D + MoveAction_013 MoveAction_000 EndMovement diff --git a/res/field/scripts/scripts_resort_area.s b/res/field/scripts/scripts_resort_area.s index ce614fabf0..39f14730fe 100644 --- a/res/field/scripts/scripts_resort_area.s +++ b/res/field/scripts/scripts_resort_area.s @@ -231,87 +231,87 @@ _0312: .balign 4, 0 _0328: - MoveAction_00C - MoveAction_022 + MoveAction_012 + MoveAction_034 EndMovement .balign 4, 0 _0334: - MoveAction_00D - MoveAction_022 + MoveAction_013 + MoveAction_034 EndMovement .balign 4, 0 _0340: - MoveAction_00D - MoveAction_022 + MoveAction_013 + MoveAction_034 EndMovement .balign 4, 0 _034C: - MoveAction_00C - MoveAction_022 + MoveAction_012 + MoveAction_034 EndMovement .balign 4, 0 _0358: - MoveAction_00F 6 - MoveAction_00C 2 - MoveAction_021 + MoveAction_015 6 + MoveAction_012 2 + MoveAction_033 EndMovement .balign 4, 0 _0368: - MoveAction_00F 6 - MoveAction_00C 3 - MoveAction_021 + MoveAction_015 6 + MoveAction_012 3 + MoveAction_033 EndMovement .balign 4, 0 _0378: - MoveAction_00F 6 - MoveAction_00C 4 - MoveAction_021 + MoveAction_015 6 + MoveAction_012 4 + MoveAction_033 EndMovement .balign 4, 0 _0388: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0390: - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 EndMovement .balign 4, 0 _039C: - MoveAction_00F 7 - MoveAction_00C + MoveAction_015 7 + MoveAction_012 EndMovement .balign 4, 0 _03A8: - MoveAction_00F 7 - MoveAction_00C 2 + MoveAction_015 7 + MoveAction_012 2 EndMovement .balign 4, 0 _03B4: - MoveAction_00F 7 - MoveAction_00C 3 + MoveAction_015 7 + MoveAction_012 3 EndMovement .balign 4, 0 _03C0: - MoveAction_00C 2 - MoveAction_045 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _03CC: - MoveAction_00E + MoveAction_014 EndMovement _03D4: diff --git a/res/field/scripts/scripts_resort_area_house.s b/res/field/scripts/scripts_resort_area_house.s index 54e556f5f2..30cc9106c9 100644 --- a/res/field/scripts/scripts_resort_area_house.s +++ b/res/field/scripts/scripts_resort_area_house.s @@ -21,7 +21,7 @@ _000E: .balign 4, 0 _002C: - MoveAction_020 + MoveAction_032 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 9b367d66ef..ebb412fcc5 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s @@ -51,9 +51,9 @@ _0078: .balign 4, 0 _00AC: MoveAction_002 - MoveAction_047 - MoveAction_00F - MoveAction_048 + MoveAction_071 + MoveAction_015 + MoveAction_072 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 5052e958bf..b74df22239 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s @@ -147,92 +147,92 @@ _01F3: .balign 4, 0 _0210: - MoveAction_00F 2 - MoveAction_00D 2 - MoveAction_00F 3 - MoveAction_022 + MoveAction_015 2 + MoveAction_013 2 + MoveAction_015 3 + MoveAction_034 EndMovement .balign 4, 0 _0224: - MoveAction_00D - MoveAction_00F - MoveAction_00D - MoveAction_00F 4 - MoveAction_022 + MoveAction_013 + MoveAction_015 + MoveAction_013 + MoveAction_015 4 + MoveAction_034 EndMovement .balign 4, 0 _023C: - MoveAction_00F 2 - MoveAction_00D 2 - MoveAction_00F 3 - MoveAction_022 + MoveAction_015 2 + MoveAction_013 2 + MoveAction_015 3 + MoveAction_034 EndMovement .balign 4, 0 _0250: - MoveAction_00F - MoveAction_00D - MoveAction_00F 2 - MoveAction_00D - MoveAction_00F 2 - MoveAction_022 + MoveAction_015 + MoveAction_013 + MoveAction_015 2 + MoveAction_013 + MoveAction_015 2 + MoveAction_034 EndMovement .balign 4, 0 _026C: - MoveAction_00F 3 - MoveAction_00D 2 - MoveAction_00F 2 - MoveAction_021 + MoveAction_015 3 + MoveAction_013 2 + MoveAction_015 2 + MoveAction_033 EndMovement .balign 4, 0 _0280: - MoveAction_03F 2 - MoveAction_00D 2 - MoveAction_00F 3 - MoveAction_021 + MoveAction_063 2 + MoveAction_013 2 + MoveAction_015 3 + MoveAction_033 EndMovement .balign 4, 0 _0294: - MoveAction_00D - MoveAction_00F 3 - MoveAction_00D 2 - MoveAction_00F - MoveAction_021 + MoveAction_013 + MoveAction_015 3 + MoveAction_013 2 + MoveAction_015 + MoveAction_033 EndMovement .balign 4, 0 _02AC: - MoveAction_03F 2 - MoveAction_00F 3 - MoveAction_00D - MoveAction_00F - MoveAction_021 + MoveAction_063 2 + MoveAction_015 3 + MoveAction_013 + MoveAction_015 + MoveAction_033 EndMovement .balign 4, 0 _02C4: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _02CC: - MoveAction_00F 3 + MoveAction_015 3 EndMovement .balign 4, 0 _02D4: - MoveAction_00C 4 + MoveAction_012 4 EndMovement .balign 4, 0 _02DC: - MoveAction_00C - MoveAction_021 + MoveAction_012 + MoveAction_033 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 d7d0a7daa9..0d730b6235 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s @@ -100,5 +100,5 @@ _0164: .balign 4, 0 _017C: - MoveAction_021 + MoveAction_033 EndMovement diff --git a/res/field/scripts/scripts_rotoms_room.s b/res/field/scripts/scripts_rotoms_room.s index 51867864d7..c334eea4af 100644 --- a/res/field/scripts/scripts_rotoms_room.s +++ b/res/field/scripts/scripts_rotoms_room.s @@ -555,8 +555,8 @@ _08AA: .balign 4, 0 _08AC: - MoveAction_021 - MoveAction_04B + MoveAction_033 + MoveAction_075 EndMovement .byte 34 @@ -590,27 +590,27 @@ _08AC: .balign 4, 0 _08D4: - MoveAction_00C 2 + MoveAction_012 2 EndMovement .balign 4, 0 _08DC: - MoveAction_00E 2 - MoveAction_020 - MoveAction_03F 2 - MoveAction_00F 4 - MoveAction_020 + MoveAction_014 2 + MoveAction_032 + MoveAction_063 2 + MoveAction_015 4 + MoveAction_032 EndMovement .balign 4, 0 _08F4: - MoveAction_00E 2 - MoveAction_020 + MoveAction_014 2 + MoveAction_032 EndMovement .balign 4, 0 _0900: - MoveAction_00D 2 + MoveAction_013 2 EndMovement _0908: diff --git a/res/field/scripts/scripts_route_201.s b/res/field/scripts/scripts_route_201.s index 175d1eb431..56da6cc1ee 100644 --- a/res/field/scripts/scripts_route_201.s +++ b/res/field/scripts/scripts_route_201.s @@ -418,76 +418,76 @@ _0656: .balign 4, 0 _0664: - MoveAction_025 - MoveAction_04B + MoveAction_037 + MoveAction_075 EndMovement .balign 4, 0 _0670: - MoveAction_011 - MoveAction_012 2 - MoveAction_021 + MoveAction_017 + MoveAction_018 2 + MoveAction_033 EndMovement .balign 4, 0 _0680: - MoveAction_011 - MoveAction_012 - MoveAction_021 + MoveAction_017 + MoveAction_018 + MoveAction_033 EndMovement .balign 4, 0 _0690: - MoveAction_011 + MoveAction_017 EndMovement .balign 4, 0 _0698: - MoveAction_011 - MoveAction_013 - MoveAction_021 + MoveAction_017 + MoveAction_019 + MoveAction_033 EndMovement .balign 4, 0 _06A8: - MoveAction_00C - MoveAction_00F 4 - MoveAction_00C 2 - MoveAction_00F - MoveAction_022 + MoveAction_012 + MoveAction_015 4 + MoveAction_012 2 + MoveAction_015 + MoveAction_034 EndMovement .balign 4, 0 _06C0: - MoveAction_00C - MoveAction_00F 3 - MoveAction_00C 2 - MoveAction_00F - MoveAction_022 + MoveAction_012 + MoveAction_015 3 + MoveAction_012 2 + MoveAction_015 + MoveAction_034 EndMovement .balign 4, 0 _06D8: - MoveAction_00C - MoveAction_00F 2 - MoveAction_00C 2 - MoveAction_00F - MoveAction_022 + MoveAction_012 + MoveAction_015 2 + MoveAction_012 2 + MoveAction_015 + MoveAction_034 EndMovement .balign 4, 0 _06F0: - MoveAction_00C - MoveAction_00F - MoveAction_00C 2 - MoveAction_00F - MoveAction_022 + MoveAction_012 + MoveAction_015 + MoveAction_012 2 + MoveAction_015 + MoveAction_034 EndMovement .balign 4, 0 _0708: - MoveAction_00E - MoveAction_021 + MoveAction_014 + MoveAction_033 EndMovement .byte 15 @@ -501,40 +501,40 @@ _0708: .balign 4, 0 _071C: - MoveAction_00E 3 - MoveAction_023 + MoveAction_014 3 + MoveAction_035 EndMovement .balign 4, 0 _0728: - MoveAction_013 3 + MoveAction_019 3 EndMovement .balign 4, 0 _0730: - MoveAction_04B - MoveAction_041 - MoveAction_022 + MoveAction_075 + MoveAction_065 + MoveAction_034 EndMovement .balign 4, 0 _0740: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0748: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0750: - MoveAction_025 + MoveAction_037 EndMovement .balign 4, 0 _0758: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 @@ -544,30 +544,30 @@ _0760: .balign 4, 0 _0768: - MoveAction_026 + MoveAction_038 EndMovement .balign 4, 0 _0770: - MoveAction_025 + MoveAction_037 EndMovement .balign 4, 0 _0778: - MoveAction_026 + MoveAction_038 EndMovement .balign 4, 0 _0780: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0788: - MoveAction_00C - MoveAction_021 - MoveAction_03F 2 - MoveAction_023 + MoveAction_012 + MoveAction_033 + MoveAction_063 2 + MoveAction_035 EndMovement .byte 63 @@ -585,110 +585,110 @@ _0788: .balign 4, 0 _07A8: - MoveAction_021 - MoveAction_03F 3 - MoveAction_025 8 - MoveAction_012 - MoveAction_011 + MoveAction_033 + MoveAction_063 3 + MoveAction_037 8 + MoveAction_018 + MoveAction_017 EndMovement .balign 4, 0 _07C0: - MoveAction_00F 8 + MoveAction_015 8 EndMovement .balign 4, 0 _07C8: - MoveAction_00E 3 + MoveAction_014 3 EndMovement .balign 4, 0 _07D0: - MoveAction_00F 3 + MoveAction_015 3 EndMovement .balign 4, 0 _07D8: - MoveAction_022 - MoveAction_03F 2 - MoveAction_023 + MoveAction_034 + MoveAction_063 2 + MoveAction_035 EndMovement .balign 4, 0 _07E8: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _07F0: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _07F8: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0800: - MoveAction_03F 2 - MoveAction_03E - MoveAction_00F 9 + MoveAction_063 2 + MoveAction_062 + MoveAction_015 9 EndMovement .balign 4, 0 _0810: - MoveAction_00C 2 - MoveAction_00F 4 - MoveAction_00C - MoveAction_023 + MoveAction_012 2 + MoveAction_015 4 + MoveAction_012 + MoveAction_035 EndMovement .balign 4, 0 _0824: - MoveAction_00C 2 - MoveAction_00F 3 - MoveAction_00C - MoveAction_023 + MoveAction_012 2 + MoveAction_015 3 + MoveAction_012 + MoveAction_035 EndMovement .balign 4, 0 _0838: - MoveAction_00C 2 - MoveAction_00F 2 - MoveAction_00C - MoveAction_023 + MoveAction_012 2 + MoveAction_015 2 + MoveAction_012 + MoveAction_035 EndMovement .balign 4, 0 _084C: - MoveAction_00C 2 - MoveAction_00F - MoveAction_00C - MoveAction_023 + MoveAction_012 2 + MoveAction_015 + MoveAction_012 + MoveAction_035 EndMovement .balign 4, 0 _0860: - MoveAction_03E - MoveAction_020 + MoveAction_062 + MoveAction_032 EndMovement .balign 4, 0 _086C: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _0878: - MoveAction_03F - MoveAction_024 + MoveAction_063 + MoveAction_036 EndMovement .balign 4, 0 _0884: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 @@ -698,50 +698,50 @@ _088C: .balign 4, 0 _0894: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _089C: - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _08A8: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _08B0: - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _08BC: - MoveAction_03F - MoveAction_020 + MoveAction_063 + MoveAction_032 EndMovement .balign 4, 0 _08C8: - MoveAction_00F 7 + MoveAction_015 7 EndMovement .balign 4, 0 _08D0: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _08D8: - MoveAction_00F + MoveAction_015 EndMovement .balign 4, 0 _08E0: - MoveAction_00F 9 + MoveAction_015 9 EndMovement _08E8: @@ -795,14 +795,14 @@ _0986: .balign 4, 0 _0998: - MoveAction_00E - MoveAction_023 + MoveAction_014 + MoveAction_035 EndMovement .balign 4, 0 _09A4: - MoveAction_00C - MoveAction_021 + MoveAction_012 + MoveAction_033 EndMovement .balign 4, 0 @@ -817,22 +817,22 @@ _09B8: .balign 4, 0 _09C0: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _09C8: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _09D0: - MoveAction_026 + MoveAction_038 EndMovement .balign 4, 0 _09D8: - MoveAction_025 + MoveAction_037 EndMovement _09E0: @@ -866,23 +866,23 @@ _0A5B: .balign 4, 0 _0A68: - MoveAction_00C - MoveAction_021 + MoveAction_012 + MoveAction_033 EndMovement .balign 4, 0 _0A74: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0A7C: - MoveAction_00C + MoveAction_012 EndMovement .balign 4, 0 _0A84: - MoveAction_024 + MoveAction_036 EndMovement _0A8C: @@ -915,17 +915,17 @@ _0ADD: .balign 4, 0 _0AE4: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0AEC: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _0AF4: - MoveAction_00C + MoveAction_012 EndMovement .byte 12 @@ -1090,37 +1090,37 @@ _0CF1: .balign 4, 0 _0D48: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0D50: - MoveAction_03F 4 - MoveAction_00E 2 + MoveAction_063 4 + MoveAction_014 2 EndMovement .balign 4, 0 _0D5C: - MoveAction_03F 4 - MoveAction_00E - MoveAction_00D - MoveAction_00E + MoveAction_063 4 + MoveAction_014 + MoveAction_013 + MoveAction_014 EndMovement .balign 4, 0 _0D70: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0D78: - MoveAction_00F 8 + MoveAction_015 8 EndMovement .balign 4, 0 _0D80: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .byte 34 @@ -1134,44 +1134,44 @@ _0D80: .balign 4, 0 _0D94: - MoveAction_03F 3 - MoveAction_023 + MoveAction_063 3 + MoveAction_035 EndMovement .balign 4, 0 _0DA0: - MoveAction_03E - MoveAction_00C - MoveAction_021 - MoveAction_023 + MoveAction_062 + MoveAction_012 + MoveAction_033 + MoveAction_035 EndMovement .balign 4, 0 _0DB4: - MoveAction_013 8 + MoveAction_019 8 EndMovement .balign 4, 0 _0DBC: - MoveAction_023 - MoveAction_04B - MoveAction_041 + MoveAction_035 + MoveAction_075 + MoveAction_065 EndMovement .balign 4, 0 _0DCC: - MoveAction_00C - MoveAction_023 - MoveAction_04B + MoveAction_012 + MoveAction_035 + MoveAction_075 EndMovement .balign 4, 0 _0DDC: - MoveAction_03F - MoveAction_022 - MoveAction_03F - MoveAction_00C - MoveAction_023 + MoveAction_063 + MoveAction_034 + MoveAction_063 + MoveAction_012 + MoveAction_035 EndMovement _0DF4: diff --git a/res/field/scripts/scripts_route_202.s b/res/field/scripts/scripts_route_202.s index 53df9c6fd1..720f70bae5 100644 --- a/res/field/scripts/scripts_route_202.s +++ b/res/field/scripts/scripts_route_202.s @@ -259,120 +259,120 @@ _03B1: .balign 4, 0 _03C4: - MoveAction_023 - MoveAction_04B - MoveAction_041 + MoveAction_035 + MoveAction_075 + MoveAction_065 EndMovement .balign 4, 0 _03D4: - MoveAction_00F 4 - MoveAction_00C 2 - MoveAction_00F + MoveAction_015 4 + MoveAction_012 2 + MoveAction_015 EndMovement .balign 4, 0 _03E4: - MoveAction_00F 4 - MoveAction_00C - MoveAction_00F + MoveAction_015 4 + MoveAction_012 + MoveAction_015 EndMovement .balign 4, 0 _03F4: - MoveAction_00F 4 - MoveAction_00F + MoveAction_015 4 + MoveAction_015 EndMovement .balign 4, 0 _0400: - MoveAction_00F 4 - MoveAction_00D - MoveAction_00F + MoveAction_015 4 + MoveAction_013 + MoveAction_015 EndMovement .balign 4, 0 _0410: - MoveAction_00F 4 - MoveAction_00D 2 - MoveAction_00F + MoveAction_015 4 + MoveAction_013 2 + MoveAction_015 EndMovement .balign 4, 0 _0420: - MoveAction_00F - MoveAction_00E 4 - MoveAction_00E 2 - MoveAction_00D 2 + MoveAction_015 + MoveAction_014 4 + MoveAction_014 2 + MoveAction_013 2 EndMovement .balign 4, 0 _0434: - MoveAction_00F - MoveAction_00E 4 - MoveAction_00E 2 - MoveAction_00D + MoveAction_015 + MoveAction_014 4 + MoveAction_014 2 + MoveAction_013 EndMovement .balign 4, 0 _0448: - MoveAction_00F - MoveAction_00E 4 - MoveAction_00E 2 + MoveAction_015 + MoveAction_014 4 + MoveAction_014 2 EndMovement .balign 4, 0 _0458: - MoveAction_00F - MoveAction_00E 4 - MoveAction_00E 2 - MoveAction_00C + MoveAction_015 + MoveAction_014 4 + MoveAction_014 2 + MoveAction_012 EndMovement .balign 4, 0 _046C: - MoveAction_00F - MoveAction_00E 4 - MoveAction_00E 2 - MoveAction_00C 2 + MoveAction_015 + MoveAction_014 4 + MoveAction_014 2 + MoveAction_012 2 EndMovement .balign 4, 0 _0480: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0488: - MoveAction_00E 2 + MoveAction_014 2 EndMovement .balign 4, 0 _0490: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0498: - MoveAction_00E 12 + MoveAction_014 12 EndMovement .balign 4, 0 _04A0: - MoveAction_03F + MoveAction_063 MoveAction_002 EndMovement .balign 4, 0 _04AC: - MoveAction_047 - MoveAction_00F - MoveAction_048 + MoveAction_071 + MoveAction_015 + MoveAction_072 EndMovement .balign 4, 0 _04BC: - MoveAction_00E 2 + MoveAction_014 2 EndMovement _04C4: @@ -488,15 +488,15 @@ _066C: .balign 4, 0 _0674: - MoveAction_00E - MoveAction_00D 3 - MoveAction_00E 10 + MoveAction_014 + MoveAction_013 3 + MoveAction_014 10 EndMovement .balign 4, 0 _0684: - MoveAction_00D 3 - MoveAction_00E 10 + MoveAction_013 3 + MoveAction_014 10 EndMovement .balign 4, 0 @@ -506,12 +506,12 @@ _0690: .balign 4, 0 _0698: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _06A0: - MoveAction_020 + MoveAction_032 EndMovement .byte 35 @@ -525,7 +525,7 @@ _06A0: .balign 4, 0 _06B0: - MoveAction_022 + MoveAction_034 EndMovement .byte 63 @@ -560,17 +560,17 @@ _06D0: .balign 4, 0 _06D8: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _06E0: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _06E8: - MoveAction_022 + MoveAction_034 EndMovement .byte 35 @@ -584,5 +584,5 @@ _06E8: .balign 4, 0 _06F8: - MoveAction_00F + MoveAction_015 EndMovement diff --git a/res/field/scripts/scripts_route_203.s b/res/field/scripts/scripts_route_203.s index 8929a8fad1..1895f5cac2 100644 --- a/res/field/scripts/scripts_route_203.s +++ b/res/field/scripts/scripts_route_203.s @@ -152,53 +152,53 @@ _0207: .balign 4, 0 _0210: - MoveAction_013 10 + MoveAction_019 10 EndMovement .balign 4, 0 _0218: - MoveAction_013 10 + MoveAction_019 10 EndMovement .balign 4, 0 _0220: - MoveAction_013 10 + MoveAction_019 10 EndMovement .balign 4, 0 _0228: - MoveAction_013 10 + MoveAction_019 10 EndMovement .balign 4, 0 _0230: - MoveAction_012 4 + MoveAction_018 4 EndMovement .balign 4, 0 _0238: - MoveAction_012 2 - MoveAction_011 - MoveAction_012 2 + MoveAction_018 2 + MoveAction_017 + MoveAction_018 2 EndMovement .balign 4, 0 _0248: - MoveAction_012 2 - MoveAction_011 2 - MoveAction_012 2 + MoveAction_018 2 + MoveAction_017 2 + MoveAction_018 2 EndMovement .balign 4, 0 _0258: - MoveAction_012 2 - MoveAction_011 3 - MoveAction_012 2 + MoveAction_018 2 + MoveAction_017 3 + MoveAction_018 2 EndMovement .balign 4, 0 _0268: - MoveAction_03F - MoveAction_04B - MoveAction_03F + MoveAction_063 + MoveAction_075 + MoveAction_063 EndMovement diff --git a/res/field/scripts/scripts_route_205_south.s b/res/field/scripts/scripts_route_205_south.s index 0ab055b79c..78961c66ef 100644 --- a/res/field/scripts/scripts_route_205_south.s +++ b/res/field/scripts/scripts_route_205_south.s @@ -36,12 +36,12 @@ _002C: .balign 4, 0 _0060: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0068: - MoveAction_021 + MoveAction_033 EndMovement _0070: @@ -69,32 +69,32 @@ _00B6: .balign 4, 0 _00BC: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _00C4: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _00CC: - MoveAction_013 - MoveAction_025 - MoveAction_03F 2 - MoveAction_00E - MoveAction_021 + MoveAction_019 + MoveAction_037 + MoveAction_063 2 + MoveAction_014 + MoveAction_033 EndMovement .balign 4, 0 _00E4: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _00EC: - MoveAction_00D - MoveAction_024 + MoveAction_013 + MoveAction_036 EndMovement _00F8: @@ -193,42 +193,42 @@ _0216: .balign 4, 0 _0228: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0230: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0238: - MoveAction_020 - MoveAction_04B - MoveAction_03F - MoveAction_00C + MoveAction_032 + MoveAction_075 + MoveAction_063 + MoveAction_012 EndMovement .balign 4, 0 _024C: - MoveAction_020 - MoveAction_04B - MoveAction_03F + MoveAction_032 + MoveAction_075 + MoveAction_063 EndMovement .balign 4, 0 _025C: - MoveAction_021 - MoveAction_04B - MoveAction_03F + MoveAction_033 + MoveAction_075 + MoveAction_063 EndMovement .balign 4, 0 _026C: - MoveAction_021 - MoveAction_04B - MoveAction_03F - MoveAction_00D + MoveAction_033 + MoveAction_075 + MoveAction_063 + MoveAction_013 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 75cb7ab19a..709a1c2b82 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 @@ -59,12 +59,12 @@ _0091: .balign 4, 0 _00A0: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _00A8: - MoveAction_00C + MoveAction_012 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 5678fe993c..f948b19ae2 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 @@ -54,12 +54,12 @@ _0080: .balign 4, 0 _0090: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _0098: - MoveAction_00D + MoveAction_013 EndMovement _00A0: diff --git a/res/field/scripts/scripts_route_207.s b/res/field/scripts/scripts_route_207.s index be488247fb..1cbc8502d8 100644 --- a/res/field/scripts/scripts_route_207.s +++ b/res/field/scripts/scripts_route_207.s @@ -106,7 +106,7 @@ _0156: .balign 4, 0 _0174: - MoveAction_022 + MoveAction_034 EndMovement .byte 63 @@ -136,18 +136,18 @@ _0174: .balign 4, 0 _0194: - MoveAction_00F 3 - MoveAction_04B + MoveAction_015 3 + MoveAction_075 EndMovement .balign 4, 0 _01A0: - MoveAction_00F 5 + MoveAction_015 5 EndMovement .balign 4, 0 _01A8: - MoveAction_00E 8 + MoveAction_014 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 cc60145f8d..6ccab30d2a 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 @@ -144,73 +144,73 @@ _01BA: .balign 4, 0 _01D4: - MoveAction_012 2 - MoveAction_010 2 - MoveAction_026 + MoveAction_018 2 + MoveAction_016 2 + MoveAction_038 EndMovement .balign 4, 0 _01E4: - MoveAction_012 2 - MoveAction_010 - MoveAction_026 + MoveAction_018 2 + MoveAction_016 + MoveAction_038 EndMovement .balign 4, 0 _01F4: - MoveAction_012 2 + MoveAction_018 2 EndMovement .balign 4, 0 _01FC: - MoveAction_012 2 - MoveAction_011 - MoveAction_026 + MoveAction_018 2 + MoveAction_017 + MoveAction_038 EndMovement .balign 4, 0 _020C: - MoveAction_012 2 - MoveAction_011 2 - MoveAction_026 + MoveAction_018 2 + MoveAction_017 2 + MoveAction_038 EndMovement .balign 4, 0 _021C: - MoveAction_013 2 - MoveAction_011 2 - MoveAction_013 2 + MoveAction_019 2 + MoveAction_017 2 + MoveAction_019 2 EndMovement .balign 4, 0 _022C: - MoveAction_013 2 - MoveAction_011 - MoveAction_013 2 + MoveAction_019 2 + MoveAction_017 + MoveAction_019 2 EndMovement .balign 4, 0 _023C: - MoveAction_013 4 + MoveAction_019 4 EndMovement .balign 4, 0 _0244: - MoveAction_013 2 - MoveAction_010 - MoveAction_013 2 + MoveAction_019 2 + MoveAction_016 + MoveAction_019 2 EndMovement .balign 4, 0 _0254: - MoveAction_013 2 - MoveAction_010 2 - MoveAction_013 2 + MoveAction_019 2 + MoveAction_016 2 + MoveAction_019 2 EndMovement .balign 4, 0 _0264: - MoveAction_03F - MoveAction_04B - MoveAction_03F + MoveAction_063 + MoveAction_075 + MoveAction_063 EndMovement diff --git a/res/field/scripts/scripts_route_210_south.s b/res/field/scripts/scripts_route_210_south.s index 3fe81bcb50..df730fda8e 100644 --- a/res/field/scripts/scripts_route_210_south.s +++ b/res/field/scripts/scripts_route_210_south.s @@ -141,67 +141,67 @@ _0240: .balign 4, 0 _024C: - MoveAction_04B - MoveAction_03F 4 + MoveAction_075 + MoveAction_063 4 EndMovement .balign 4, 0 _0258: - MoveAction_00C - MoveAction_021 - MoveAction_03F 8 - MoveAction_00C 8 + MoveAction_012 + MoveAction_033 + MoveAction_063 8 + MoveAction_012 8 EndMovement .balign 4, 0 _026C: - MoveAction_00C 2 - MoveAction_021 2 - MoveAction_03F 6 - MoveAction_00C 8 + MoveAction_012 2 + MoveAction_033 2 + MoveAction_063 6 + MoveAction_012 8 EndMovement .balign 4, 0 _0280: - MoveAction_023 - MoveAction_022 - MoveAction_023 - MoveAction_03F 2 - MoveAction_020 - MoveAction_010 2 - MoveAction_03F 2 - MoveAction_00E 3 - MoveAction_023 - MoveAction_04B - MoveAction_013 3 - MoveAction_010 8 + 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 EndMovement .balign 4, 0 _02B4: - MoveAction_00C 2 - MoveAction_03F 8 - MoveAction_00C 8 + MoveAction_012 2 + MoveAction_063 8 + MoveAction_012 8 EndMovement .balign 4, 0 _02C4: - MoveAction_00C 7 + MoveAction_012 7 EndMovement .balign 4, 0 _02CC: - MoveAction_00D 9 + MoveAction_013 9 EndMovement .balign 4, 0 _02D4: - MoveAction_00D 9 + MoveAction_013 9 EndMovement .balign 4, 0 _02DC: - MoveAction_021 + MoveAction_033 EndMovement .byte 63 diff --git a/res/field/scripts/scripts_route_211_east.s b/res/field/scripts/scripts_route_211_east.s index 051901d98e..7b648220c1 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_04B + MoveAction_075 EndMovement _0088: diff --git a/res/field/scripts/scripts_route_213.s b/res/field/scripts/scripts_route_213.s index 447caebf26..da356f50e4 100644 --- a/res/field/scripts/scripts_route_213.s +++ b/res/field/scripts/scripts_route_213.s @@ -197,120 +197,120 @@ _02F3: .balign 4, 0 _0308: - MoveAction_013 10 - MoveAction_010 2 - MoveAction_027 + MoveAction_019 10 + MoveAction_016 2 + MoveAction_039 EndMovement .balign 4, 0 _0318: - MoveAction_013 10 - MoveAction_010 2 - MoveAction_013 2 + MoveAction_019 10 + MoveAction_016 2 + MoveAction_019 2 EndMovement .balign 4, 0 _0328: - MoveAction_013 10 - MoveAction_010 3 - MoveAction_013 + MoveAction_019 10 + MoveAction_016 3 + MoveAction_019 EndMovement .balign 4, 0 _0338: - MoveAction_013 10 - MoveAction_010 - MoveAction_013 + MoveAction_019 10 + MoveAction_016 + MoveAction_019 EndMovement .balign 4, 0 _0348: - MoveAction_025 + MoveAction_037 EndMovement .balign 4, 0 _0350: - MoveAction_010 - MoveAction_013 10 + MoveAction_016 + MoveAction_019 10 EndMovement .balign 4, 0 _035C: - MoveAction_010 - MoveAction_013 10 + MoveAction_016 + MoveAction_019 10 EndMovement .balign 4, 0 _0368: - MoveAction_011 - MoveAction_013 4 - MoveAction_010 - MoveAction_013 6 + MoveAction_017 + MoveAction_019 4 + MoveAction_016 + MoveAction_019 6 EndMovement .balign 4, 0 _037C: - MoveAction_010 2 - MoveAction_013 10 + MoveAction_016 2 + MoveAction_019 10 EndMovement .balign 4, 0 _0388: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _0390: - MoveAction_013 10 + MoveAction_019 10 EndMovement .balign 4, 0 _0398: - MoveAction_011 2 - MoveAction_013 9 + MoveAction_017 2 + MoveAction_019 9 EndMovement .balign 4, 0 _03A4: - MoveAction_013 4 - MoveAction_010 - MoveAction_013 6 + MoveAction_019 4 + MoveAction_016 + MoveAction_019 6 EndMovement .balign 4, 0 _03B4: - MoveAction_010 - MoveAction_013 10 + MoveAction_016 + MoveAction_019 10 EndMovement .balign 4, 0 _03C0: - MoveAction_03F + MoveAction_063 MoveAction_003 EndMovement .balign 4, 0 _03CC: - MoveAction_03E 10 - MoveAction_022 + MoveAction_062 10 + MoveAction_034 EndMovement .balign 4, 0 _03D8: - MoveAction_03E 11 - MoveAction_022 + MoveAction_062 11 + MoveAction_034 EndMovement .balign 4, 0 _03E4: - MoveAction_03E 3 - MoveAction_023 + MoveAction_062 3 + MoveAction_035 EndMovement .balign 4, 0 _03F0: - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_035 EndMovement _03FC: diff --git a/res/field/scripts/scripts_route_217.s b/res/field/scripts/scripts_route_217.s index 30f1e01291..258fdcf188 100644 --- a/res/field/scripts/scripts_route_217.s +++ b/res/field/scripts/scripts_route_217.s @@ -84,49 +84,49 @@ _00F6: .balign 4, 0 _010C: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0114: - MoveAction_03F 2 - MoveAction_03E - MoveAction_020 + MoveAction_063 2 + MoveAction_062 + MoveAction_032 EndMovement .balign 4, 0 _0124: - MoveAction_00C 4 - MoveAction_00E 3 - MoveAction_00C - MoveAction_04B + MoveAction_012 4 + MoveAction_014 3 + MoveAction_012 + MoveAction_075 EndMovement .balign 4, 0 _0138: - MoveAction_00C 4 - MoveAction_00E 2 - MoveAction_00C - MoveAction_04B + MoveAction_012 4 + MoveAction_014 2 + MoveAction_012 + MoveAction_075 EndMovement .balign 4, 0 _014C: - MoveAction_00C + MoveAction_012 EndMovement .balign 4, 0 _0154: - MoveAction_00F - MoveAction_00C 3 - MoveAction_00F 2 - MoveAction_00C 9 + MoveAction_015 + MoveAction_012 3 + MoveAction_015 2 + MoveAction_012 9 EndMovement .balign 4, 0 _0168: - MoveAction_00E - MoveAction_00C 3 - MoveAction_00F 3 - MoveAction_00C 9 + MoveAction_014 + MoveAction_012 3 + MoveAction_015 3 + MoveAction_012 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 2a238bd9fd..0e5b822c57 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 @@ -108,72 +108,72 @@ _015A: .balign 4, 0 _0168: - MoveAction_04B - MoveAction_00F - MoveAction_00C 2 - MoveAction_023 + MoveAction_075 + MoveAction_015 + MoveAction_012 2 + MoveAction_035 EndMovement .balign 4, 0 _017C: - MoveAction_04B - MoveAction_00F - MoveAction_00C - MoveAction_023 + MoveAction_075 + MoveAction_015 + MoveAction_012 + MoveAction_035 EndMovement .balign 4, 0 _0190: - MoveAction_04B - MoveAction_00F + MoveAction_075 + MoveAction_015 EndMovement .balign 4, 0 _019C: - MoveAction_04B - MoveAction_00F - MoveAction_00D - MoveAction_023 + MoveAction_075 + MoveAction_015 + MoveAction_013 + MoveAction_035 EndMovement .balign 4, 0 _01B0: - MoveAction_04B - MoveAction_00F - MoveAction_00D 2 - MoveAction_023 + MoveAction_075 + MoveAction_015 + MoveAction_013 2 + MoveAction_035 EndMovement .balign 4, 0 _01C4: - MoveAction_00D 2 - MoveAction_00F 4 + MoveAction_013 2 + MoveAction_015 4 EndMovement .balign 4, 0 _01D0: - MoveAction_00D - MoveAction_00F 4 + MoveAction_013 + MoveAction_015 4 EndMovement .balign 4, 0 _01DC: - MoveAction_00C - MoveAction_00F 3 - MoveAction_00D - MoveAction_00F + MoveAction_012 + MoveAction_015 3 + MoveAction_013 + MoveAction_015 EndMovement .balign 4, 0 _01F0: - MoveAction_00C - MoveAction_00F 4 + MoveAction_012 + MoveAction_015 4 EndMovement .balign 4, 0 _01FC: - MoveAction_00C 2 - MoveAction_00F 4 + MoveAction_012 2 + MoveAction_015 4 EndMovement _0208: diff --git a/res/field/scripts/scripts_route_224.s b/res/field/scripts/scripts_route_224.s index 2b0a33ddea..0d7e0656d1 100644 --- a/res/field/scripts/scripts_route_224.s +++ b/res/field/scripts/scripts_route_224.s @@ -210,38 +210,38 @@ _02B8: .balign 4, 0 _0328: MoveAction_000 - MoveAction_041 + MoveAction_065 MoveAction_003 EndMovement .balign 4, 0 _0338: - MoveAction_00E - MoveAction_00C - MoveAction_041 + MoveAction_014 + MoveAction_012 + MoveAction_065 MoveAction_003 EndMovement .balign 4, 0 _034C: - MoveAction_00D - MoveAction_00E 2 - MoveAction_00C - MoveAction_041 + MoveAction_013 + MoveAction_014 2 + MoveAction_012 + MoveAction_065 MoveAction_003 EndMovement .balign 4, 0 _0364: - MoveAction_03F + MoveAction_063 MoveAction_002 EndMovement .balign 4, 0 _0370: - MoveAction_03F + MoveAction_063 MoveAction_001 - MoveAction_03F 2 + MoveAction_063 2 MoveAction_002 EndMovement @@ -253,23 +253,23 @@ _0384: .balign 4, 0 _038C: MoveAction_003 - MoveAction_04B - MoveAction_041 + MoveAction_075 + MoveAction_065 EndMovement .balign 4, 0 _039C: - MoveAction_041 + MoveAction_065 MoveAction_003 - MoveAction_04B - MoveAction_041 + MoveAction_075 + MoveAction_065 EndMovement .balign 4, 0 _03B0: MoveAction_002 - MoveAction_04B - MoveAction_041 + MoveAction_075 + MoveAction_065 EndMovement .balign 4, 0 @@ -280,33 +280,33 @@ _03C0: .balign 4, 0 _03C8: MoveAction_002 - MoveAction_041 + MoveAction_065 MoveAction_001 - MoveAction_041 + MoveAction_065 MoveAction_003 - MoveAction_041 + MoveAction_065 MoveAction_001 - MoveAction_041 + MoveAction_065 MoveAction_002 - MoveAction_041 + MoveAction_065 MoveAction_000 - MoveAction_041 + MoveAction_065 MoveAction_001 - MoveAction_041 + MoveAction_065 EndMovement .balign 4, 0 _0404: MoveAction_001 - MoveAction_041 + MoveAction_065 MoveAction_003 - MoveAction_041 + MoveAction_065 MoveAction_001 - MoveAction_041 + MoveAction_065 MoveAction_002 - MoveAction_041 + MoveAction_065 MoveAction_000 - MoveAction_041 + MoveAction_065 EndMovement .byte 33 @@ -320,19 +320,19 @@ _0404: .balign 4, 0 _0438: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0440: - MoveAction_00D 12 + MoveAction_013 12 EndMovement .balign 4, 0 _0448: MoveAction_000 - MoveAction_041 - MoveAction_04C 12 + MoveAction_065 + MoveAction_076 12 EndMovement _0458: @@ -414,46 +414,46 @@ _057F: .balign 4, 0 _0598: - MoveAction_00C 8 - MoveAction_023 + MoveAction_012 8 + MoveAction_035 EndMovement .balign 4, 0 _05A4: - MoveAction_00C 8 - MoveAction_023 + MoveAction_012 8 + MoveAction_035 EndMovement .balign 4, 0 _05B0: - MoveAction_00C 8 - MoveAction_023 + MoveAction_012 8 + MoveAction_035 EndMovement .balign 4, 0 _05BC: - MoveAction_00D - MoveAction_00F 5 - MoveAction_00C 4 + MoveAction_013 + MoveAction_015 5 + MoveAction_012 4 EndMovement .balign 4, 0 _05CC: - MoveAction_00C - MoveAction_00F 5 - MoveAction_00C 3 + MoveAction_012 + MoveAction_015 5 + MoveAction_012 3 EndMovement .balign 4, 0 _05DC: - MoveAction_00C 2 - MoveAction_00F 5 - MoveAction_00C 3 + MoveAction_012 2 + MoveAction_015 5 + MoveAction_012 3 EndMovement .balign 4, 0 _05EC: - MoveAction_023 + MoveAction_035 EndMovement _05F4: @@ -478,29 +478,29 @@ _061C: .balign 4, 0 _0628: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0630: - MoveAction_03F 2 - MoveAction_023 - MoveAction_03F 4 - MoveAction_020 + MoveAction_063 2 + MoveAction_035 + MoveAction_063 4 + MoveAction_032 EndMovement .balign 4, 0 _0644: - MoveAction_03F 2 - MoveAction_023 - MoveAction_03F 3 - MoveAction_020 + MoveAction_063 2 + MoveAction_035 + MoveAction_063 3 + MoveAction_032 EndMovement .balign 4, 0 _0658: - MoveAction_03F 2 - MoveAction_020 + MoveAction_063 2 + MoveAction_032 EndMovement .balign 4, 0 @@ -511,5 +511,5 @@ _0664: .balign 4, 0 _066C: MoveAction_003 - MoveAction_04B + MoveAction_075 EndMovement diff --git a/res/field/scripts/scripts_route_227.s b/res/field/scripts/scripts_route_227.s index 23025d38ef..9e646071cc 100644 --- a/res/field/scripts/scripts_route_227.s +++ b/res/field/scripts/scripts_route_227.s @@ -63,8 +63,8 @@ _00E7: .balign 4, 0 _00F4: - MoveAction_00E - MoveAction_020 + MoveAction_014 + MoveAction_032 EndMovement .balign 4, 0 @@ -74,15 +74,15 @@ _0100: .balign 4, 0 _0108: - MoveAction_00F - MoveAction_00C - MoveAction_023 + MoveAction_015 + MoveAction_012 + MoveAction_035 EndMovement .balign 4, 0 _0118: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .byte 32 @@ -96,10 +96,10 @@ _0118: .balign 4, 0 _012C: - MoveAction_00E - MoveAction_023 - MoveAction_03E - MoveAction_021 + MoveAction_014 + MoveAction_035 + MoveAction_062 + MoveAction_033 EndMovement .byte 63 @@ -125,28 +125,28 @@ _012C: .balign 4, 0 _0154: - MoveAction_021 - MoveAction_04B + MoveAction_033 + MoveAction_075 EndMovement .balign 4, 0 _0160: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0168: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0170: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0178: - MoveAction_011 9 + MoveAction_017 9 EndMovement .byte 17 @@ -160,18 +160,18 @@ _0178: .balign 4, 0 _0188: - MoveAction_021 - MoveAction_04B + MoveAction_033 + MoveAction_075 EndMovement .balign 4, 0 _0194: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _019C: - MoveAction_021 + MoveAction_033 EndMovement .byte 63 @@ -197,8 +197,8 @@ _019C: .balign 4, 0 _01B8: - MoveAction_03F 2 - MoveAction_00D 9 + MoveAction_063 2 + MoveAction_013 9 EndMovement .byte 13 @@ -281,17 +281,17 @@ _026C: .balign 4, 0 _0280: - MoveAction_021 - MoveAction_04B - MoveAction_00D + MoveAction_033 + MoveAction_075 + MoveAction_013 EndMovement .balign 4, 0 _0290: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0298: - MoveAction_021 + MoveAction_033 EndMovement diff --git a/res/field/scripts/scripts_sandgem_town.s b/res/field/scripts/scripts_sandgem_town.s index c352756911..f27c104cdd 100644 --- a/res/field/scripts/scripts_sandgem_town.s +++ b/res/field/scripts/scripts_sandgem_town.s @@ -221,104 +221,104 @@ _035E: .balign 4, 0 _03AC: - MoveAction_04B - MoveAction_041 + MoveAction_075 + MoveAction_065 EndMovement .balign 4, 0 _03B8: - MoveAction_00E 4 - MoveAction_00C + MoveAction_014 4 + MoveAction_012 EndMovement .balign 4, 0 _03C4: - MoveAction_00E 2 - MoveAction_00C - MoveAction_00E + MoveAction_014 2 + MoveAction_012 + MoveAction_014 EndMovement .balign 4, 0 _03D4: - MoveAction_00E 3 + MoveAction_014 3 EndMovement .balign 4, 0 _03DC: - MoveAction_00E 4 + MoveAction_014 4 MoveAction_001 EndMovement .balign 4, 0 _03E8: - MoveAction_00E 4 - MoveAction_00D + MoveAction_014 4 + MoveAction_013 EndMovement .balign 4, 0 _03F4: - MoveAction_00E 4 - MoveAction_00D 2 + MoveAction_014 4 + MoveAction_013 2 EndMovement .balign 4, 0 _0400: - MoveAction_00F 5 - MoveAction_020 + MoveAction_015 5 + MoveAction_032 EndMovement .balign 4, 0 _040C: - MoveAction_00F 4 - MoveAction_020 + MoveAction_015 4 + MoveAction_032 EndMovement .balign 4, 0 _0418: - MoveAction_00C - MoveAction_00F 4 - MoveAction_020 + MoveAction_012 + MoveAction_015 4 + MoveAction_032 EndMovement .balign 4, 0 _0428: - MoveAction_00F 2 - MoveAction_00C - MoveAction_00F 3 - MoveAction_020 + MoveAction_015 2 + MoveAction_012 + MoveAction_015 3 + MoveAction_032 EndMovement .balign 4, 0 _043C: - MoveAction_00C 2 - MoveAction_00F 5 - MoveAction_020 + MoveAction_012 2 + MoveAction_015 5 + MoveAction_032 EndMovement .balign 4, 0 _044C: - MoveAction_00C 2 - MoveAction_00F 5 - MoveAction_020 + MoveAction_012 2 + MoveAction_015 5 + MoveAction_032 EndMovement .balign 4, 0 _045C: - MoveAction_00C - MoveAction_00E - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_014 + MoveAction_012 + MoveAction_069 EndMovement .balign 4, 0 _0470: - MoveAction_03E - MoveAction_023 + MoveAction_062 + MoveAction_035 EndMovement .balign 4, 0 _047C: - MoveAction_03F 3 + MoveAction_063 3 MoveAction_001 EndMovement @@ -349,102 +349,102 @@ _047C: .balign 4, 0 _04A0: - MoveAction_03F 3 - MoveAction_020 + MoveAction_063 3 + MoveAction_032 EndMovement .balign 4, 0 _04AC: - MoveAction_03F 3 - MoveAction_020 + MoveAction_063 3 + MoveAction_032 EndMovement .balign 4, 0 _04B8: - MoveAction_03F 3 - MoveAction_020 + MoveAction_063 3 + MoveAction_032 EndMovement .balign 4, 0 _04C4: - MoveAction_00D - MoveAction_00F 4 - MoveAction_020 + MoveAction_013 + MoveAction_015 4 + MoveAction_032 EndMovement .balign 4, 0 _04D4: - MoveAction_00F 2 - MoveAction_00F 2 - MoveAction_020 + MoveAction_015 2 + MoveAction_015 2 + MoveAction_032 EndMovement .balign 4, 0 _04E4: - MoveAction_00F - MoveAction_00C - MoveAction_00F 3 - MoveAction_020 + MoveAction_015 + MoveAction_012 + MoveAction_015 3 + MoveAction_032 EndMovement .balign 4, 0 _04F8: - MoveAction_00C - MoveAction_00F 2 - MoveAction_00C - MoveAction_00F 2 - MoveAction_020 + MoveAction_012 + MoveAction_015 2 + MoveAction_012 + MoveAction_015 2 + MoveAction_032 EndMovement .balign 4, 0 _0510: - MoveAction_00C 3 - MoveAction_00F 4 - MoveAction_020 + MoveAction_012 3 + MoveAction_015 4 + MoveAction_032 EndMovement .balign 4, 0 _0520: - MoveAction_00C 4 - MoveAction_00F 4 - MoveAction_020 + MoveAction_012 4 + MoveAction_015 4 + MoveAction_032 EndMovement .balign 4, 0 _0530: - MoveAction_03F - MoveAction_020 - MoveAction_03F 2 - MoveAction_00C 2 - MoveAction_045 + MoveAction_063 + MoveAction_032 + MoveAction_063 2 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _0548: - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _0554: - MoveAction_011 + MoveAction_017 EndMovement .balign 4, 0 _055C: - MoveAction_025 2 + MoveAction_037 2 EndMovement .balign 4, 0 _0564: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _056C: - MoveAction_013 2 - MoveAction_011 - MoveAction_013 7 + MoveAction_019 2 + MoveAction_017 + MoveAction_019 7 EndMovement _057C: @@ -591,89 +591,89 @@ _0772: .balign 4, 0 _0798: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _07A0: - MoveAction_020 - MoveAction_045 + MoveAction_032 + MoveAction_069 EndMovement .balign 4, 0 _07AC: - MoveAction_04B - MoveAction_020 + MoveAction_075 + MoveAction_032 EndMovement .balign 4, 0 _07B8: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _07C0: - MoveAction_00D - MoveAction_00F 9 - MoveAction_020 + MoveAction_013 + MoveAction_015 9 + MoveAction_032 EndMovement .balign 4, 0 _07D0: - MoveAction_00F 10 - MoveAction_020 + MoveAction_015 10 + MoveAction_032 EndMovement .balign 4, 0 _07DC: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _07E4: - MoveAction_03F - MoveAction_021 - MoveAction_03E - MoveAction_022 + MoveAction_063 + MoveAction_033 + MoveAction_062 + MoveAction_034 EndMovement .balign 4, 0 _07F8: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _0800: - MoveAction_00C + MoveAction_012 EndMovement .balign 4, 0 _0808: - MoveAction_00F 10 - MoveAction_020 + MoveAction_015 10 + MoveAction_032 EndMovement .balign 4, 0 _0814: - MoveAction_00F 10 - MoveAction_020 + MoveAction_015 10 + MoveAction_032 EndMovement .balign 4, 0 _0820: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0828: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _0830: - MoveAction_00D - MoveAction_00E 5 - MoveAction_00C 10 + MoveAction_013 + MoveAction_014 5 + MoveAction_012 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 8fdc314105..63d2a5d06e 100644 --- a/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s +++ b/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s @@ -117,9 +117,9 @@ _016A: .balign 4, 0 _019C: - MoveAction_023 - MoveAction_03E - MoveAction_021 + MoveAction_035 + MoveAction_062 + MoveAction_033 EndMovement _01AC: @@ -324,67 +324,67 @@ _044D: .balign 4, 0 _047C: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0484: - MoveAction_041 - MoveAction_00C 8 - MoveAction_00F - MoveAction_022 + MoveAction_065 + MoveAction_012 8 + MoveAction_015 + MoveAction_034 EndMovement .balign 4, 0 _0498: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _04A0: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _04A8: - MoveAction_041 - MoveAction_00C 9 + MoveAction_065 + MoveAction_012 9 EndMovement .balign 4, 0 _04B4: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _04BC: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _04C4: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _04D0: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _04D8: - MoveAction_00D 10 + MoveAction_013 10 EndMovement .balign 4, 0 _04E0: - MoveAction_066 + MoveAction_102 EndMovement .balign 4, 0 _04E8: - MoveAction_068 + MoveAction_104 EndMovement _04F0: @@ -652,20 +652,20 @@ _07E3: .balign 4, 0 _07F8: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _0804: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _080C: - MoveAction_022 - MoveAction_03F 2 - MoveAction_021 + MoveAction_034 + MoveAction_063 2 + MoveAction_033 EndMovement .byte 34 @@ -679,60 +679,60 @@ _080C: .balign 4, 0 _0824: - MoveAction_00E - MoveAction_00D 2 - MoveAction_00F - MoveAction_020 + MoveAction_014 + MoveAction_013 2 + MoveAction_015 + MoveAction_032 EndMovement .balign 4, 0 _0838: - MoveAction_00D - MoveAction_00E - MoveAction_020 + MoveAction_013 + MoveAction_014 + MoveAction_032 EndMovement .balign 4, 0 _0848: - MoveAction_00D - MoveAction_00F - MoveAction_020 + MoveAction_013 + MoveAction_015 + MoveAction_032 EndMovement .balign 4, 0 _0858: - MoveAction_021 - MoveAction_03F 5 - MoveAction_00E - MoveAction_023 + MoveAction_033 + MoveAction_063 5 + MoveAction_014 + MoveAction_035 EndMovement .balign 4, 0 _086C: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _0878: - MoveAction_00F - MoveAction_020 + MoveAction_015 + MoveAction_032 EndMovement .balign 4, 0 _0884: - MoveAction_00C 7 + MoveAction_012 7 EndMovement .balign 4, 0 _088C: - MoveAction_00E - MoveAction_020 + MoveAction_014 + MoveAction_032 EndMovement .balign 4, 0 _0898: - MoveAction_00D 9 + MoveAction_013 9 EndMovement _08A0: diff --git a/res/field/scripts/scripts_sendoff_spring.s b/res/field/scripts/scripts_sendoff_spring.s index 548dcf314b..c667e33967 100644 --- a/res/field/scripts/scripts_sendoff_spring.s +++ b/res/field/scripts/scripts_sendoff_spring.s @@ -49,21 +49,21 @@ _0021: .balign 4, 0 _0098: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _00A0: - MoveAction_026 - MoveAction_03F - MoveAction_027 - MoveAction_03F 2 - MoveAction_024 + MoveAction_038 + MoveAction_063 + MoveAction_039 + MoveAction_063 2 + MoveAction_036 EndMovement .balign 4, 0 _00B8: - MoveAction_023 + MoveAction_035 EndMovement _00C0: diff --git a/res/field/scripts/scripts_snowpoint_city.s b/res/field/scripts/scripts_snowpoint_city.s index b4e12cfb32..5af079cbaa 100644 --- a/res/field/scripts/scripts_snowpoint_city.s +++ b/res/field/scripts/scripts_snowpoint_city.s @@ -48,17 +48,17 @@ _0088: .balign 4, 0 _009C: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _00A4: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _00AC: - MoveAction_00D + MoveAction_013 EndMovement _00B4: @@ -121,12 +121,12 @@ _015C: .balign 4, 0 _0164: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _016C: - MoveAction_00C 7 + MoveAction_012 7 EndMovement _0174: @@ -278,40 +278,40 @@ _02A0: .balign 4, 0 _030C: - MoveAction_04B - MoveAction_020 + MoveAction_075 + MoveAction_032 EndMovement .balign 4, 0 _0318: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0320: - MoveAction_00E 4 - MoveAction_00D 2 - MoveAction_00E 6 - MoveAction_00D 2 + MoveAction_014 4 + MoveAction_013 2 + MoveAction_014 6 + MoveAction_013 2 EndMovement .balign 4, 0 _0334: - MoveAction_00F + MoveAction_015 EndMovement .balign 4, 0 _033C: - MoveAction_00E - MoveAction_021 + MoveAction_014 + MoveAction_033 EndMovement .balign 4, 0 _0348: - MoveAction_00C 2 - MoveAction_00F 3 - MoveAction_00C 2 - MoveAction_00F 7 + MoveAction_012 2 + MoveAction_015 3 + MoveAction_012 2 + MoveAction_015 7 EndMovement _035C: @@ -333,16 +333,16 @@ _0376: .balign 4, 0 _0390: MoveAction_001 - MoveAction_040 + MoveAction_064 EndMovement .balign 4, 0 _039C: - MoveAction_045 + MoveAction_069 EndMovement .balign 4, 0 _03A4: - MoveAction_00D - MoveAction_040 + MoveAction_013 + MoveAction_064 EndMovement diff --git a/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s b/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s index 1f52e8c8f6..12a9d3cd85 100644 --- a/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s @@ -90,15 +90,15 @@ _00EC: .balign 4, 0 _00FC: - MoveAction_029 2 + MoveAction_041 2 EndMovement .balign 4, 0 _0104: - MoveAction_02B 2 + MoveAction_043 2 EndMovement .balign 4, 0 _010C: - MoveAction_02A 2 + MoveAction_042 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 ea9ca21080..24a2f20320 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_04B + MoveAction_075 EndMovement diff --git a/res/field/scripts/scripts_solaceon_town.s b/res/field/scripts/scripts_solaceon_town.s index 88f36c5fb1..90607c0112 100644 --- a/res/field/scripts/scripts_solaceon_town.s +++ b/res/field/scripts/scripts_solaceon_town.s @@ -175,33 +175,33 @@ _0168: .balign 4, 0 _01E8: - MoveAction_011 7 + MoveAction_017 7 EndMovement .balign 4, 0 _01F0: - MoveAction_026 - MoveAction_03F - MoveAction_027 - MoveAction_03F - MoveAction_025 + MoveAction_038 + MoveAction_063 + MoveAction_039 + MoveAction_063 + MoveAction_037 EndMovement .balign 4, 0 _0208: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _0210: - MoveAction_010 7 + MoveAction_016 7 EndMovement .balign 4, 0 _0218: - MoveAction_03F - MoveAction_04B - MoveAction_03F 3 + MoveAction_063 + MoveAction_075 + MoveAction_063 3 EndMovement .balign 4, 0 diff --git a/res/field/scripts/scripts_spear_pillar.s b/res/field/scripts/scripts_spear_pillar.s index 229f693990..924ca653c2 100644 --- a/res/field/scripts/scripts_spear_pillar.s +++ b/res/field/scripts/scripts_spear_pillar.s @@ -147,28 +147,28 @@ _01DB: .balign 4, 0 _01E4: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _01EC: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _01F4: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _01FC: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0204: - MoveAction_03E 5 - MoveAction_00D + MoveAction_062 5 + MoveAction_013 EndMovement _0210: @@ -306,32 +306,32 @@ _03D8: .balign 4, 0 _03F4: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _03FC: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _0404: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _040C: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _0414: - MoveAction_00F + MoveAction_015 EndMovement .balign 4, 0 _041C: - MoveAction_022 + MoveAction_034 EndMovement _0424: @@ -433,13 +433,13 @@ _04A7: .balign 4, 0 _04F4: - MoveAction_03E 2 - MoveAction_010 8 + MoveAction_062 2 + MoveAction_016 8 EndMovement .balign 4, 0 _0500: - MoveAction_011 8 + MoveAction_017 8 EndMovement _0508: @@ -484,7 +484,7 @@ _0567: .balign 4, 0 _05B8: - MoveAction_020 + MoveAction_032 EndMovement _05C0: @@ -519,34 +519,34 @@ _0637: .balign 4, 0 _0644: - MoveAction_03F - MoveAction_00C 6 - MoveAction_00F 2 + MoveAction_063 + MoveAction_012 6 + MoveAction_015 2 EndMovement .balign 4, 0 _0654: - MoveAction_03F - MoveAction_00C 6 - MoveAction_00F + MoveAction_063 + MoveAction_012 6 + MoveAction_015 EndMovement .balign 4, 0 _0664: - MoveAction_03F - MoveAction_00C 6 + MoveAction_063 + MoveAction_012 6 EndMovement .balign 4, 0 _0670: - MoveAction_03F - MoveAction_00C 6 - MoveAction_00E + MoveAction_063 + MoveAction_012 6 + MoveAction_014 EndMovement .balign 4, 0 _0680: - MoveAction_03F - MoveAction_00C 6 - MoveAction_00E 2 + MoveAction_063 + MoveAction_012 6 + MoveAction_014 2 EndMovement diff --git a/res/field/scripts/scripts_spear_pillar_distorted.s b/res/field/scripts/scripts_spear_pillar_distorted.s index 6c42792da8..7e02fc2d0d 100644 --- a/res/field/scripts/scripts_spear_pillar_distorted.s +++ b/res/field/scripts/scripts_spear_pillar_distorted.s @@ -82,38 +82,38 @@ _0130: .balign 4, 0 _013C: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0144: - MoveAction_00C 4 + MoveAction_012 4 EndMovement .balign 4, 0 _014C: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0154: - MoveAction_023 - MoveAction_03F 2 - MoveAction_021 - MoveAction_03F - MoveAction_020 + MoveAction_035 + MoveAction_063 2 + MoveAction_033 + MoveAction_063 + MoveAction_032 EndMovement .balign 4, 0 _016C: - MoveAction_00F - MoveAction_00C 5 + MoveAction_015 + MoveAction_012 5 EndMovement .balign 4, 0 _0178: - MoveAction_00D 5 - MoveAction_00E + MoveAction_013 5 + MoveAction_014 EndMovement _0184: diff --git a/res/field/scripts/scripts_stark_mountain_outside.s b/res/field/scripts/scripts_stark_mountain_outside.s index 9acf255c3b..30a5a3ebd3 100644 --- a/res/field/scripts/scripts_stark_mountain_outside.s +++ b/res/field/scripts/scripts_stark_mountain_outside.s @@ -51,14 +51,14 @@ _002F: .balign 4, 0 _00A4: - MoveAction_00F 4 + MoveAction_015 4 EndMovement .balign 4, 0 _00AC: - MoveAction_00D 2 - MoveAction_00F 4 - MoveAction_00C + MoveAction_013 2 + MoveAction_015 4 + MoveAction_012 EndMovement .byte 34 @@ -72,41 +72,41 @@ _00AC: .balign 4, 0 _00C4: - MoveAction_022 - MoveAction_03F 2 - MoveAction_020 + MoveAction_034 + MoveAction_063 2 + MoveAction_032 EndMovement .balign 4, 0 _00D4: - MoveAction_00C 2 - MoveAction_045 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _00E0: - MoveAction_00C - MoveAction_00F 3 + MoveAction_012 + MoveAction_015 3 EndMovement .balign 4, 0 _00EC: - MoveAction_00F - MoveAction_00D 2 - MoveAction_00F 3 - MoveAction_00C + MoveAction_015 + MoveAction_013 2 + MoveAction_015 3 + MoveAction_012 EndMovement .balign 4, 0 _0100: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0108: - MoveAction_00F - MoveAction_00C 2 - MoveAction_045 + MoveAction_015 + MoveAction_012 2 + MoveAction_069 EndMovement _0118: @@ -154,58 +154,58 @@ _0118: .balign 4, 0 _01CC: - MoveAction_022 - MoveAction_03F 2 - MoveAction_021 + MoveAction_034 + MoveAction_063 2 + MoveAction_033 EndMovement .balign 4, 0 _01DC: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _01E8: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _01F0: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _01F8: - MoveAction_00C 2 - MoveAction_045 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _0204: - MoveAction_046 - MoveAction_00D - MoveAction_023 + MoveAction_070 + MoveAction_013 + MoveAction_035 EndMovement .balign 4, 0 _0214: - MoveAction_00D 2 - MoveAction_00E 5 - MoveAction_00C 2 - MoveAction_00E 3 - MoveAction_015 9 - MoveAction_017 10 - MoveAction_00C 6 - MoveAction_00F 8 + MoveAction_013 2 + MoveAction_014 5 + MoveAction_012 2 + MoveAction_014 3 + MoveAction_021 9 + MoveAction_023 10 + MoveAction_012 6 + MoveAction_015 8 EndMovement .balign 4, 0 _0238: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0240: - MoveAction_020 + MoveAction_032 EndMovement diff --git a/res/field/scripts/scripts_stark_mountain_room_1.s b/res/field/scripts/scripts_stark_mountain_room_1.s index 2bb4d8c8ac..f5bbcf0541 100644 --- a/res/field/scripts/scripts_stark_mountain_room_1.s +++ b/res/field/scripts/scripts_stark_mountain_room_1.s @@ -89,107 +89,107 @@ _0150: .balign 4, 0 _0158: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0160: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _0168: - MoveAction_00C - MoveAction_021 + MoveAction_012 + MoveAction_033 EndMovement .balign 4, 0 _0174: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _017C: - MoveAction_020 - MoveAction_03F 2 - MoveAction_021 - MoveAction_03F 2 + MoveAction_032 + MoveAction_063 2 + MoveAction_033 + MoveAction_063 2 EndMovement .balign 4, 0 _0190: - MoveAction_00D 2 - MoveAction_03F - MoveAction_00D - MoveAction_045 + MoveAction_013 2 + MoveAction_063 + MoveAction_013 + MoveAction_069 EndMovement .balign 4, 0 _01A4: - MoveAction_03F 2 - MoveAction_00E - MoveAction_023 + MoveAction_063 2 + MoveAction_014 + MoveAction_035 EndMovement .balign 4, 0 _01B4: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _01BC: - MoveAction_022 - MoveAction_03F 2 - MoveAction_021 + MoveAction_034 + MoveAction_063 2 + MoveAction_033 EndMovement .balign 4, 0 _01CC: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _01D4: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _01DC: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _01E4: - MoveAction_00E - MoveAction_00D 2 - MoveAction_045 + MoveAction_014 + MoveAction_013 2 + MoveAction_069 EndMovement .balign 4, 0 _01F4: - MoveAction_03F - MoveAction_020 + MoveAction_063 + MoveAction_032 EndMovement .balign 4, 0 _0200: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0208: - MoveAction_00C 7 + MoveAction_012 7 EndMovement .balign 4, 0 _0210: - MoveAction_00F - MoveAction_00C 7 + MoveAction_015 + MoveAction_012 7 EndMovement .balign 4, 0 _021C: - MoveAction_03F - MoveAction_00E - MoveAction_00C 7 + MoveAction_063 + MoveAction_014 + MoveAction_012 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 ce818feac0..2d05b911a2 100644 --- a/res/field/scripts/scripts_stark_mountain_room_2.s +++ b/res/field/scripts/scripts_stark_mountain_room_2.s @@ -67,7 +67,7 @@ _00B7: .balign 4, 0 _00DC: - MoveAction_00C 8 + MoveAction_012 8 EndMovement .byte 12 @@ -81,7 +81,7 @@ _00DC: .balign 4, 0 _00EC: - MoveAction_021 + MoveAction_033 EndMovement .byte 12 @@ -110,22 +110,22 @@ _00FC: .balign 4, 0 _0134: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _013C: - MoveAction_00C + MoveAction_012 EndMovement .balign 4, 0 _0144: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _014C: - MoveAction_021 + MoveAction_033 EndMovement _0154: @@ -169,31 +169,31 @@ _01AB: .balign 4, 0 _01E4: - MoveAction_00E - MoveAction_023 + MoveAction_014 + MoveAction_035 EndMovement .balign 4, 0 _01F0: - MoveAction_00C - MoveAction_022 + MoveAction_012 + MoveAction_034 EndMovement .balign 4, 0 _01FC: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _0204: - MoveAction_020 - MoveAction_03F 2 - MoveAction_022 + MoveAction_032 + MoveAction_063 2 + MoveAction_034 EndMovement .balign 4, 0 _0214: - MoveAction_00C + MoveAction_012 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 e35e1e3912..7c8f14f168 100644 --- a/res/field/scripts/scripts_stark_mountain_room_3.s +++ b/res/field/scripts/scripts_stark_mountain_room_3.s @@ -63,7 +63,7 @@ _0096: .balign 4, 0 _00B4: - MoveAction_020 + MoveAction_032 EndMovement .byte 32 @@ -287,179 +287,179 @@ _019C: .balign 4, 0 _0388: - MoveAction_00C 3 + MoveAction_012 3 EndMovement .balign 4, 0 _0390: - MoveAction_03F 2 - MoveAction_023 - MoveAction_03F 2 - MoveAction_020 + MoveAction_063 2 + MoveAction_035 + MoveAction_063 2 + MoveAction_032 EndMovement .balign 4, 0 _03A4: - MoveAction_03F - MoveAction_00C 2 + MoveAction_063 + MoveAction_012 2 EndMovement .balign 4, 0 _03B0: - MoveAction_00C 2 - MoveAction_03F 2 - MoveAction_021 + MoveAction_012 2 + MoveAction_063 2 + MoveAction_033 EndMovement .balign 4, 0 _03C0: - MoveAction_026 - MoveAction_03F - MoveAction_027 - MoveAction_03F - MoveAction_025 + MoveAction_038 + MoveAction_063 + MoveAction_039 + MoveAction_063 + MoveAction_037 EndMovement .balign 4, 0 _03D8: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _03E0: - MoveAction_03F 2 - MoveAction_00D 3 + MoveAction_063 2 + MoveAction_013 3 EndMovement .balign 4, 0 _03EC: - MoveAction_00D - MoveAction_00F - MoveAction_00D 3 - MoveAction_00E - MoveAction_00D - MoveAction_045 + MoveAction_013 + MoveAction_015 + MoveAction_013 3 + MoveAction_014 + MoveAction_013 + MoveAction_069 EndMovement .balign 4, 0 _0408: - MoveAction_03F 3 - MoveAction_03E - MoveAction_020 + MoveAction_063 3 + MoveAction_062 + MoveAction_032 EndMovement .balign 4, 0 _0418: - MoveAction_03F - MoveAction_021 - MoveAction_03F - MoveAction_022 - MoveAction_03E - MoveAction_020 + MoveAction_063 + MoveAction_033 + MoveAction_063 + MoveAction_034 + MoveAction_062 + MoveAction_032 EndMovement .balign 4, 0 _0434: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _043C: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0444: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _044C: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0454: - MoveAction_027 3 + MoveAction_039 3 EndMovement .balign 4, 0 _045C: - MoveAction_026 3 + MoveAction_038 3 EndMovement .balign 4, 0 _0464: - MoveAction_013 2 - MoveAction_011 5 - MoveAction_012 - MoveAction_011 - MoveAction_045 + MoveAction_019 2 + MoveAction_017 5 + MoveAction_018 + MoveAction_017 + MoveAction_069 EndMovement .balign 4, 0 _047C: - MoveAction_011 5 - MoveAction_012 - MoveAction_011 - MoveAction_045 + MoveAction_017 5 + MoveAction_018 + MoveAction_017 + MoveAction_069 EndMovement .balign 4, 0 _0490: - MoveAction_012 2 - MoveAction_010 3 - MoveAction_020 - MoveAction_011 3 - MoveAction_013 2 + MoveAction_018 2 + MoveAction_016 3 + MoveAction_032 + MoveAction_017 3 + MoveAction_019 2 EndMovement .balign 4, 0 _04A8: - MoveAction_00E 3 - MoveAction_00C 3 + MoveAction_014 3 + MoveAction_012 3 EndMovement .balign 4, 0 _04B4: - MoveAction_00E - MoveAction_00C - MoveAction_00F - MoveAction_00D 2 + MoveAction_014 + MoveAction_012 + MoveAction_015 + MoveAction_013 2 EndMovement .balign 4, 0 _04C8: - MoveAction_00C 2 - MoveAction_00F - MoveAction_00C 3 - MoveAction_00E 2 - MoveAction_020 + MoveAction_012 2 + MoveAction_015 + MoveAction_012 3 + MoveAction_014 2 + MoveAction_032 EndMovement .balign 4, 0 _04E0: - MoveAction_00F - MoveAction_00D - MoveAction_00F - MoveAction_00D 3 - MoveAction_00E - MoveAction_00D 2 + MoveAction_015 + MoveAction_013 + MoveAction_015 + MoveAction_013 3 + MoveAction_014 + MoveAction_013 2 EndMovement .balign 4, 0 _04FC: - MoveAction_00F - MoveAction_00C 4 - MoveAction_00E - MoveAction_020 + MoveAction_015 + MoveAction_012 4 + MoveAction_014 + MoveAction_032 EndMovement .balign 4, 0 _0510: - MoveAction_00F - MoveAction_00D 3 - MoveAction_00E - MoveAction_00D 2 - MoveAction_045 + MoveAction_015 + MoveAction_013 3 + MoveAction_014 + MoveAction_013 2 + MoveAction_069 EndMovement diff --git a/res/field/scripts/scripts_sunyshore_city.s b/res/field/scripts/scripts_sunyshore_city.s index 6b08158bcf..e82c5c94a0 100644 --- a/res/field/scripts/scripts_sunyshore_city.s +++ b/res/field/scripts/scripts_sunyshore_city.s @@ -235,180 +235,180 @@ _03C2: .balign 4, 0 _03D0: - MoveAction_00E 4 - MoveAction_00D + MoveAction_014 4 + MoveAction_013 EndMovement .balign 4, 0 _03DC: - MoveAction_00E 3 - MoveAction_00D + MoveAction_014 3 + MoveAction_013 EndMovement .balign 4, 0 _03E8: - MoveAction_00E 2 - MoveAction_00D + MoveAction_014 2 + MoveAction_013 EndMovement .balign 4, 0 _03F4: - MoveAction_00E - MoveAction_00D + MoveAction_014 + MoveAction_013 EndMovement .balign 4, 0 _0400: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _0408: - MoveAction_00C - MoveAction_00F 4 - MoveAction_021 + MoveAction_012 + MoveAction_015 4 + MoveAction_033 EndMovement .balign 4, 0 _0418: - MoveAction_00C - MoveAction_00F 3 - MoveAction_021 + MoveAction_012 + MoveAction_015 3 + MoveAction_033 EndMovement .balign 4, 0 _0428: - MoveAction_00C - MoveAction_00F 2 - MoveAction_021 + MoveAction_012 + MoveAction_015 2 + MoveAction_033 EndMovement .balign 4, 0 _0438: - MoveAction_00C - MoveAction_00F - MoveAction_021 + MoveAction_012 + MoveAction_015 + MoveAction_033 EndMovement .balign 4, 0 _0448: - MoveAction_00C - MoveAction_021 + MoveAction_012 + MoveAction_033 EndMovement .balign 4, 0 _0454: - MoveAction_03F - MoveAction_010 4 - MoveAction_012 + MoveAction_063 + MoveAction_016 4 + MoveAction_018 EndMovement .balign 4, 0 _0464: - MoveAction_03F - MoveAction_010 4 - MoveAction_026 + MoveAction_063 + MoveAction_016 4 + MoveAction_038 EndMovement .balign 4, 0 _0474: - MoveAction_03F - MoveAction_010 3 + MoveAction_063 + MoveAction_016 3 EndMovement .balign 4, 0 _0480: - MoveAction_03F - MoveAction_010 4 - MoveAction_027 + MoveAction_063 + MoveAction_016 4 + MoveAction_039 EndMovement .balign 4, 0 _0490: - MoveAction_03F - MoveAction_010 4 - MoveAction_013 + MoveAction_063 + MoveAction_016 4 + MoveAction_019 EndMovement .balign 4, 0 _04A0: - MoveAction_025 + MoveAction_037 EndMovement .balign 4, 0 _04A8: - MoveAction_026 + MoveAction_038 EndMovement .balign 4, 0 _04B0: - MoveAction_024 + MoveAction_036 EndMovement .balign 4, 0 _04B8: - MoveAction_027 + MoveAction_039 EndMovement .balign 4, 0 _04C0: - MoveAction_011 8 + MoveAction_017 8 EndMovement .balign 4, 0 _04C8: - MoveAction_011 8 + MoveAction_017 8 EndMovement .balign 4, 0 _04D0: - MoveAction_011 8 + MoveAction_017 8 EndMovement .balign 4, 0 _04D8: - MoveAction_011 8 + MoveAction_017 8 EndMovement .balign 4, 0 _04E0: - MoveAction_011 8 + MoveAction_017 8 EndMovement .balign 4, 0 _04E8: - MoveAction_021 - MoveAction_04B + MoveAction_033 + MoveAction_075 EndMovement .balign 4, 0 _04F4: - MoveAction_021 - MoveAction_03F - MoveAction_023 + MoveAction_033 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _0504: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _050C: - MoveAction_021 - MoveAction_03F 2 - MoveAction_022 + MoveAction_033 + MoveAction_063 2 + MoveAction_034 EndMovement .balign 4, 0 _051C: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _0528: - MoveAction_020 + MoveAction_032 EndMovement _0530: @@ -488,34 +488,34 @@ _05D7: .balign 4, 0 _063C: - MoveAction_00E 3 - MoveAction_022 - MoveAction_04B - MoveAction_00E 5 + MoveAction_014 3 + MoveAction_034 + MoveAction_075 + MoveAction_014 5 EndMovement .balign 4, 0 _0650: - MoveAction_00D - MoveAction_00E 3 - MoveAction_022 - MoveAction_04B - MoveAction_00E 5 + MoveAction_013 + MoveAction_014 3 + MoveAction_034 + MoveAction_075 + MoveAction_014 5 EndMovement .balign 4, 0 _0668: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0670: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0678: - MoveAction_00F 9 + MoveAction_015 9 EndMovement _0680: @@ -729,26 +729,26 @@ _08EE: .balign 4, 0 _08F8: - MoveAction_00F - MoveAction_00D 2 - MoveAction_00F 8 + MoveAction_015 + MoveAction_013 2 + MoveAction_015 8 EndMovement .balign 4, 0 _0908: - MoveAction_00D 2 - MoveAction_00F 9 + MoveAction_013 2 + MoveAction_015 9 EndMovement .balign 4, 0 _0914: - MoveAction_03F + MoveAction_063 MoveAction_003 EndMovement .balign 4, 0 _0920: - MoveAction_03F - MoveAction_021 - MoveAction_023 + MoveAction_063 + MoveAction_033 + MoveAction_035 EndMovement diff --git a/res/field/scripts/scripts_survival_area.s b/res/field/scripts/scripts_survival_area.s index 13f1814850..503d656ec5 100644 --- a/res/field/scripts/scripts_survival_area.s +++ b/res/field/scripts/scripts_survival_area.s @@ -110,13 +110,13 @@ _00D5: .balign 4, 0 _011C: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0124: - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 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 a3d6d1d154..f1a099134b 100644 --- a/res/field/scripts/scripts_team_galactic_eterna_building_1f.s +++ b/res/field/scripts/scripts_team_galactic_eterna_building_1f.s @@ -86,28 +86,28 @@ _006A: .balign 4, 0 _00F0: - MoveAction_03F 9 - MoveAction_023 + MoveAction_063 9 + MoveAction_035 EndMovement .balign 4, 0 _00FC: - MoveAction_026 - MoveAction_04B - MoveAction_03F 2 - MoveAction_00E 2 + MoveAction_038 + MoveAction_075 + MoveAction_063 2 + MoveAction_014 2 EndMovement .balign 4, 0 _0110: MoveAction_001 - MoveAction_03D + MoveAction_061 MoveAction_003 - MoveAction_03E + MoveAction_062 MoveAction_000 - MoveAction_03E + MoveAction_062 MoveAction_002 - MoveAction_03D + MoveAction_061 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 576a9c845f..cf0104a6b3 100644 --- a/res/field/scripts/scripts_team_galactic_eterna_building_4f.s +++ b/res/field/scripts/scripts_team_galactic_eterna_building_4f.s @@ -92,12 +92,12 @@ _0135: .balign 4, 0 _013C: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0144: - MoveAction_00C + MoveAction_012 EndMovement .byte 63 @@ -119,20 +119,20 @@ _0144: .balign 4, 0 _015C: - MoveAction_00C 3 - MoveAction_023 + MoveAction_012 3 + MoveAction_035 EndMovement .balign 4, 0 _0168: - MoveAction_00C 3 - MoveAction_022 + MoveAction_012 3 + MoveAction_034 EndMovement .balign 4, 0 _0174: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .byte 34 diff --git a/res/field/scripts/scripts_trainers_school.s b/res/field/scripts/scripts_trainers_school.s index a3babcfea0..5c30fc66d2 100644 --- a/res/field/scripts/scripts_trainers_school.s +++ b/res/field/scripts/scripts_trainers_school.s @@ -78,30 +78,30 @@ _00F2: .balign 4, 0 _0114: - MoveAction_013 - MoveAction_011 8 - MoveAction_025 + MoveAction_019 + MoveAction_017 8 + MoveAction_037 EndMovement .balign 4, 0 _0124: - MoveAction_011 4 - MoveAction_013 - MoveAction_011 4 - MoveAction_025 + MoveAction_017 4 + MoveAction_019 + MoveAction_017 4 + MoveAction_037 EndMovement .balign 4, 0 _0138: - MoveAction_03F - MoveAction_023 - MoveAction_021 + MoveAction_063 + MoveAction_035 + MoveAction_033 EndMovement .balign 4, 0 _0148: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement _0154: diff --git a/res/field/scripts/scripts_twinleaf_town.s b/res/field/scripts/scripts_twinleaf_town.s index 491de77ea6..510344aa4f 100644 --- a/res/field/scripts/scripts_twinleaf_town.s +++ b/res/field/scripts/scripts_twinleaf_town.s @@ -192,197 +192,197 @@ _02EC: .balign 4, 0 _02F0: - MoveAction_03E 6 - MoveAction_047 - MoveAction_00D - MoveAction_048 - MoveAction_024 + MoveAction_062 6 + MoveAction_071 + MoveAction_013 + MoveAction_072 + MoveAction_036 EndMovement .balign 4, 0 _0308: - MoveAction_03E 5 - MoveAction_047 - MoveAction_00D - MoveAction_048 - MoveAction_024 + MoveAction_062 5 + MoveAction_071 + MoveAction_013 + MoveAction_072 + MoveAction_036 EndMovement .balign 4, 0 _0320: - MoveAction_03E 6 - MoveAction_047 - MoveAction_00D - MoveAction_048 - MoveAction_024 + MoveAction_062 6 + MoveAction_071 + MoveAction_013 + MoveAction_072 + MoveAction_036 EndMovement .balign 4, 0 _0338: - MoveAction_03E 7 - MoveAction_047 - MoveAction_00D - MoveAction_048 - MoveAction_024 + MoveAction_062 7 + MoveAction_071 + MoveAction_013 + MoveAction_072 + MoveAction_036 EndMovement .balign 4, 0 _0350: - MoveAction_03E 8 - MoveAction_047 - MoveAction_00D - MoveAction_048 - MoveAction_024 + MoveAction_062 8 + MoveAction_071 + MoveAction_013 + MoveAction_072 + MoveAction_036 EndMovement .balign 4, 0 _0368: - MoveAction_03E 9 - MoveAction_047 - MoveAction_00D - MoveAction_048 - MoveAction_024 + MoveAction_062 9 + MoveAction_071 + MoveAction_013 + MoveAction_072 + MoveAction_036 EndMovement .balign 4, 0 _0380: - MoveAction_03E 10 - MoveAction_047 - MoveAction_00D - MoveAction_048 - MoveAction_024 + MoveAction_062 10 + MoveAction_071 + MoveAction_013 + MoveAction_072 + MoveAction_036 EndMovement .balign 4, 0 _0398: - MoveAction_03E 11 - MoveAction_047 - MoveAction_00D - MoveAction_048 - MoveAction_024 + MoveAction_062 11 + MoveAction_071 + MoveAction_013 + MoveAction_072 + MoveAction_036 EndMovement .balign 4, 0 _03B0: - MoveAction_024 - MoveAction_04B - MoveAction_03F - MoveAction_03E + MoveAction_036 + MoveAction_075 + MoveAction_063 + MoveAction_062 EndMovement .balign 4, 0 _03C4: - MoveAction_010 + MoveAction_016 + MoveAction_019 + MoveAction_016 2 + MoveAction_018 + MoveAction_037 MoveAction_013 - MoveAction_010 2 - MoveAction_012 - MoveAction_025 - MoveAction_00D EndMovement .balign 4, 0 _03E0: - MoveAction_010 3 + MoveAction_016 3 + MoveAction_019 + MoveAction_037 MoveAction_013 - MoveAction_025 - MoveAction_00D EndMovement .balign 4, 0 _03F4: - MoveAction_010 3 - MoveAction_013 2 - MoveAction_025 - MoveAction_00D + MoveAction_016 3 + MoveAction_019 2 + MoveAction_037 + MoveAction_013 EndMovement .balign 4, 0 _0408: - MoveAction_010 3 - MoveAction_013 3 - MoveAction_025 - MoveAction_00D + MoveAction_016 3 + MoveAction_019 3 + MoveAction_037 + MoveAction_013 EndMovement .balign 4, 0 _041C: - MoveAction_010 3 - MoveAction_013 4 - MoveAction_025 - MoveAction_00D + MoveAction_016 3 + MoveAction_019 4 + MoveAction_037 + MoveAction_013 EndMovement .balign 4, 0 _0430: - MoveAction_010 3 - MoveAction_013 5 - MoveAction_025 - MoveAction_00D + MoveAction_016 3 + MoveAction_019 5 + MoveAction_037 + MoveAction_013 EndMovement .balign 4, 0 _0444: - MoveAction_010 3 - MoveAction_013 6 - MoveAction_025 - MoveAction_00D + MoveAction_016 3 + MoveAction_019 6 + MoveAction_037 + MoveAction_013 EndMovement .balign 4, 0 _0458: - MoveAction_010 3 - MoveAction_013 7 - MoveAction_025 - MoveAction_00D + MoveAction_016 3 + MoveAction_019 7 + MoveAction_037 + MoveAction_013 EndMovement .balign 4, 0 _046C: - MoveAction_00F - MoveAction_00D 2 - MoveAction_00E + MoveAction_015 + MoveAction_013 2 + MoveAction_014 EndMovement .balign 4, 0 _047C: - MoveAction_00E - MoveAction_00D 2 + MoveAction_014 + MoveAction_013 2 EndMovement .balign 4, 0 _0488: - MoveAction_00E 2 - MoveAction_00D 2 + MoveAction_014 2 + MoveAction_013 2 EndMovement .balign 4, 0 _0494: - MoveAction_00E 3 - MoveAction_00D 2 + MoveAction_014 3 + MoveAction_013 2 EndMovement .balign 4, 0 _04A0: - MoveAction_00E 4 - MoveAction_00D 2 + MoveAction_014 4 + MoveAction_013 2 EndMovement .balign 4, 0 _04AC: - MoveAction_00E 5 - MoveAction_00D 2 + MoveAction_014 5 + MoveAction_013 2 EndMovement .balign 4, 0 _04B8: - MoveAction_00E 6 - MoveAction_00D 2 + MoveAction_014 6 + MoveAction_013 2 EndMovement .balign 4, 0 _04C4: - MoveAction_00E 7 - MoveAction_00D 2 + MoveAction_014 7 + MoveAction_013 2 EndMovement _04D0: @@ -426,45 +426,45 @@ _04D0: .balign 4, 0 _0570: - MoveAction_03F - MoveAction_03E - MoveAction_023 - MoveAction_03F 5 - MoveAction_020 + MoveAction_063 + MoveAction_062 + MoveAction_035 + MoveAction_063 5 + MoveAction_032 EndMovement .balign 4, 0 _0588: MoveAction_000 - MoveAction_047 - MoveAction_00D - MoveAction_048 + MoveAction_071 + MoveAction_013 + MoveAction_072 EndMovement .balign 4, 0 _059C: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _05A4: - MoveAction_011 - MoveAction_024 + MoveAction_017 + MoveAction_036 EndMovement .balign 4, 0 _05B0: - MoveAction_013 4 - MoveAction_04B - MoveAction_03F - MoveAction_012 4 - MoveAction_025 + MoveAction_019 4 + MoveAction_075 + MoveAction_063 + MoveAction_018 4 + MoveAction_037 EndMovement .balign 4, 0 _05C8: - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 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 04d9af18b5..e8971af8f0 100644 --- a/res/field/scripts/scripts_twinleaf_town_player_house_1f.s +++ b/res/field/scripts/scripts_twinleaf_town_player_house_1f.s @@ -49,26 +49,26 @@ _0064: .balign 4, 0 _00A4: - MoveAction_03E - MoveAction_021 + MoveAction_062 + MoveAction_033 EndMovement .balign 4, 0 _00B0: - MoveAction_020 - MoveAction_04B - MoveAction_03F - MoveAction_00C - MoveAction_00F 3 - MoveAction_00C 3 + MoveAction_032 + MoveAction_075 + MoveAction_063 + MoveAction_012 + MoveAction_015 3 + MoveAction_012 3 EndMovement .balign 4, 0 _00CC: - MoveAction_00D 2 - MoveAction_00E 3 - MoveAction_00D 2 - MoveAction_020 + MoveAction_013 2 + MoveAction_014 3 + MoveAction_013 2 + MoveAction_032 EndMovement _00E0: @@ -105,14 +105,14 @@ _0158: .balign 4, 0 _0164: - MoveAction_03E - MoveAction_021 + MoveAction_062 + MoveAction_033 EndMovement .balign 4, 0 _0170: - MoveAction_020 - MoveAction_04B + MoveAction_032 + MoveAction_075 EndMovement _017C: @@ -143,24 +143,24 @@ _017C: .balign 4, 0 _01D4: - MoveAction_00E + MoveAction_014 MoveAction_000 - MoveAction_03F 2 - MoveAction_00F 3 - MoveAction_00D 2 - MoveAction_00F 3 - MoveAction_00D 2 - MoveAction_022 + MoveAction_063 2 + MoveAction_015 3 + MoveAction_013 2 + MoveAction_015 3 + MoveAction_013 2 + MoveAction_034 EndMovement .balign 4, 0 _01F8: - MoveAction_03F 4 - MoveAction_023 - MoveAction_03F 4 - MoveAction_00F 3 - MoveAction_00D 2 - MoveAction_00F + MoveAction_063 4 + MoveAction_035 + MoveAction_063 4 + MoveAction_015 3 + MoveAction_013 2 + MoveAction_015 EndMovement _0214: @@ -604,12 +604,12 @@ _0792: .balign 4, 0 _079C: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _07A4: - MoveAction_020 + MoveAction_032 EndMovement .byte 34 @@ -623,159 +623,159 @@ _07A4: .balign 4, 0 _07B4: - MoveAction_021 - MoveAction_04B + MoveAction_033 + MoveAction_075 EndMovement .balign 4, 0 _07C0: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _07C8: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _07D0: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _07D8: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _07E0: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _07E8: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _07F4: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _07FC: - MoveAction_00C - MoveAction_023 + MoveAction_012 + MoveAction_035 EndMovement .balign 4, 0 _0808: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0810: - MoveAction_00C 2 - MoveAction_023 + MoveAction_012 2 + MoveAction_035 EndMovement .balign 4, 0 _081C: - MoveAction_00F 2 - MoveAction_020 + MoveAction_015 2 + MoveAction_032 EndMovement .balign 4, 0 _0828: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0830: - MoveAction_00D - MoveAction_021 + MoveAction_013 + MoveAction_033 EndMovement .balign 4, 0 _083C: - MoveAction_00D 3 - MoveAction_021 + MoveAction_013 3 + MoveAction_033 EndMovement .balign 4, 0 _0848: - MoveAction_00E 2 - MoveAction_00D - MoveAction_021 + MoveAction_014 2 + MoveAction_013 + MoveAction_033 EndMovement .balign 4, 0 _0858: - MoveAction_00D - MoveAction_021 + MoveAction_013 + MoveAction_033 EndMovement .balign 4, 0 _0864: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _086C: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0874: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _087C: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0884: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _088C: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0894: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _089C: - MoveAction_03F 2 - MoveAction_022 + MoveAction_063 2 + MoveAction_034 EndMovement .balign 4, 0 _08A8: - MoveAction_03F 2 - MoveAction_021 + MoveAction_063 2 + MoveAction_033 EndMovement .balign 4, 0 _08B4: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _08BC: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _08C4: - MoveAction_021 + MoveAction_033 EndMovement .byte 63 @@ -793,7 +793,7 @@ _08C4: .balign 4, 0 _08D8: - MoveAction_021 + MoveAction_033 EndMovement _08E0: @@ -819,8 +819,8 @@ _0904: .balign 4, 0 _0918: - MoveAction_03F 2 - MoveAction_020 + MoveAction_063 2 + MoveAction_032 EndMovement .byte 62 @@ -838,7 +838,7 @@ _0918: .balign 4, 0 _0930: - MoveAction_021 + MoveAction_033 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 9e586908e6..d67849c7a6 100644 --- a/res/field/scripts/scripts_twinleaf_town_player_house_2f.s +++ b/res/field/scripts/scripts_twinleaf_town_player_house_2f.s @@ -255,189 +255,189 @@ _037D: .balign 4, 0 _0394: - MoveAction_012 2 - MoveAction_04B - MoveAction_03F + MoveAction_018 2 + MoveAction_075 + MoveAction_063 EndMovement .balign 4, 0 _03A4: - MoveAction_012 - MoveAction_011 - MoveAction_012 2 + MoveAction_018 + MoveAction_017 + MoveAction_018 2 EndMovement .balign 4, 0 _03B4: - MoveAction_012 - MoveAction_011 2 - MoveAction_012 3 + MoveAction_018 + MoveAction_017 2 + MoveAction_018 3 EndMovement .balign 4, 0 _03C4: - MoveAction_011 2 - MoveAction_012 2 + MoveAction_017 2 + MoveAction_018 2 EndMovement .balign 4, 0 _03D0: - MoveAction_012 - MoveAction_011 3 - MoveAction_012 2 + MoveAction_018 + MoveAction_017 3 + MoveAction_018 2 EndMovement .balign 4, 0 _03E0: - MoveAction_04B - MoveAction_03F + MoveAction_075 + MoveAction_063 EndMovement .balign 4, 0 _03EC: - MoveAction_011 - MoveAction_012 4 - MoveAction_010 + MoveAction_017 + MoveAction_018 4 + MoveAction_016 EndMovement .balign 4, 0 _03FC: - MoveAction_010 - MoveAction_012 3 - MoveAction_024 + MoveAction_016 + MoveAction_018 3 + MoveAction_036 EndMovement .balign 4, 0 _040C: - MoveAction_010 - MoveAction_012 5 - MoveAction_024 + MoveAction_016 + MoveAction_018 5 + MoveAction_036 EndMovement .balign 4, 0 _041C: - MoveAction_010 - MoveAction_012 4 - MoveAction_010 + MoveAction_016 + MoveAction_018 4 + MoveAction_016 EndMovement .balign 4, 0 _042C: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0434: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _043C: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0444: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _044C: - MoveAction_013 2 + MoveAction_019 2 EndMovement .balign 4, 0 _0454: - MoveAction_013 - MoveAction_011 - MoveAction_027 + MoveAction_019 + MoveAction_017 + MoveAction_039 EndMovement .balign 4, 0 _0464: - MoveAction_013 - MoveAction_011 - MoveAction_013 2 + MoveAction_019 + MoveAction_017 + MoveAction_019 2 EndMovement .balign 4, 0 _0474: - MoveAction_013 - MoveAction_011 2 - MoveAction_013 + MoveAction_019 + MoveAction_017 2 + MoveAction_019 EndMovement .balign 4, 0 _0484: - MoveAction_011 - MoveAction_013 3 - MoveAction_010 2 - MoveAction_013 4 + MoveAction_017 + MoveAction_019 3 + MoveAction_016 2 + MoveAction_019 4 EndMovement .balign 4, 0 _0498: - MoveAction_010 - MoveAction_013 4 - MoveAction_010 - MoveAction_013 3 + MoveAction_016 + MoveAction_019 4 + MoveAction_016 + MoveAction_019 3 EndMovement .balign 4, 0 _04AC: - MoveAction_010 - MoveAction_013 2 - MoveAction_010 - MoveAction_013 3 + MoveAction_016 + MoveAction_019 2 + MoveAction_016 + MoveAction_019 3 EndMovement .balign 4, 0 _04C0: - MoveAction_010 - MoveAction_013 3 - MoveAction_010 2 - MoveAction_013 3 + MoveAction_016 + MoveAction_019 3 + MoveAction_016 2 + MoveAction_019 3 EndMovement .balign 4, 0 _04D4: - MoveAction_03F - MoveAction_03E - MoveAction_023 + MoveAction_063 + MoveAction_062 + MoveAction_035 EndMovement .balign 4, 0 _04E4: - MoveAction_03F 2 - MoveAction_023 + MoveAction_063 2 + MoveAction_035 EndMovement .balign 4, 0 _04F0: - MoveAction_03F 2 - MoveAction_026 + MoveAction_063 2 + MoveAction_038 EndMovement .balign 4, 0 _04FC: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _0508: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _0514: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _0520: - MoveAction_03F 2 - MoveAction_023 + MoveAction_063 2 + MoveAction_035 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 cd759785e7..baf0ffb4bc 100644 --- a/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s +++ b/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s @@ -32,23 +32,23 @@ _000E: .balign 4, 0 _0060: - MoveAction_022 - MoveAction_04B + MoveAction_034 + MoveAction_075 EndMovement .balign 4, 0 _006C: - MoveAction_012 4 - MoveAction_010 - MoveAction_012 3 - MoveAction_045 + MoveAction_018 4 + MoveAction_016 + MoveAction_018 3 + MoveAction_069 EndMovement .balign 4, 0 _0080: - MoveAction_03F 2 - MoveAction_00D - MoveAction_020 + MoveAction_063 2 + MoveAction_013 + MoveAction_032 EndMovement _0090: diff --git a/res/field/scripts/scripts_underground.s b/res/field/scripts/scripts_underground.s index d018fa1922..ba11794bb4 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_022 - MoveAction_04B - MoveAction_03F + MoveAction_034 + MoveAction_075 + MoveAction_063 EndMovement .balign 4, 0 _02E4: - MoveAction_021 - MoveAction_03F 2 + MoveAction_033 + MoveAction_063 2 EndMovement .balign 4, 0 _02F0: MoveAction_003 - MoveAction_03D + MoveAction_061 MoveAction_000 - MoveAction_03D + MoveAction_061 MoveAction_002 - MoveAction_03D + MoveAction_061 MoveAction_001 - MoveAction_03D + MoveAction_061 MoveAction_003 - MoveAction_03C + MoveAction_060 MoveAction_000 - MoveAction_03C + MoveAction_060 MoveAction_002 - MoveAction_03C + MoveAction_060 MoveAction_001 - MoveAction_043 - MoveAction_03F 2 + MoveAction_067 + MoveAction_063 2 EndMovement diff --git a/res/field/scripts/scripts_unk_0211.s b/res/field/scripts/scripts_unk_0211.s index c6e08310fd..f4f150c0dd 100644 --- a/res/field/scripts/scripts_unk_0211.s +++ b/res/field/scripts/scripts_unk_0211.s @@ -209,18 +209,18 @@ _02D4: .balign 4, 0 _02E0: - MoveAction_064 - MoveAction_03E + MoveAction_100 + MoveAction_062 EndMovement .balign 4, 0 _02EC: - MoveAction_066 + MoveAction_102 EndMovement .balign 4, 0 _02F4: - MoveAction_068 + MoveAction_104 EndMovement _02FC: diff --git a/res/field/scripts/scripts_unk_0212.s b/res/field/scripts/scripts_unk_0212.s index 18db192ca0..eb250603e3 100644 --- a/res/field/scripts/scripts_unk_0212.s +++ b/res/field/scripts/scripts_unk_0212.s @@ -91,24 +91,24 @@ _0115: .balign 4, 0 _0120: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _0128: - MoveAction_00D 2 + MoveAction_013 2 EndMovement .balign 4, 0 _0130: - MoveAction_00E - MoveAction_024 + MoveAction_014 + MoveAction_036 EndMovement .balign 4, 0 _013C: - MoveAction_00E 2 - MoveAction_024 + MoveAction_014 2 + MoveAction_036 EndMovement _0148: @@ -889,22 +889,22 @@ _0D98: .balign 4, 0 _0DA0: - MoveAction_00F 2 - MoveAction_00C 3 - MoveAction_022 + MoveAction_015 2 + MoveAction_012 3 + MoveAction_034 EndMovement .balign 4, 0 _0DB0: - MoveAction_00F 2 - MoveAction_00C 3 - MoveAction_022 + MoveAction_015 2 + MoveAction_012 3 + MoveAction_034 EndMovement .balign 4, 0 _0DC0: - MoveAction_00F - MoveAction_00C 3 + MoveAction_015 + MoveAction_012 3 EndMovement .byte 62 @@ -962,58 +962,58 @@ _0DC0: .balign 4, 0 _0E00: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0E08: - MoveAction_03F 2 - MoveAction_00C - MoveAction_00F + MoveAction_063 2 + MoveAction_012 + MoveAction_015 EndMovement .balign 4, 0 _0E18: - MoveAction_03F 2 - MoveAction_00C - MoveAction_00F + MoveAction_063 2 + MoveAction_012 + MoveAction_015 EndMovement .balign 4, 0 _0E28: - MoveAction_03F 2 - MoveAction_00C - MoveAction_023 + MoveAction_063 2 + MoveAction_012 + MoveAction_035 EndMovement .balign 4, 0 _0E38: - MoveAction_03F 2 - MoveAction_022 - MoveAction_03F - MoveAction_023 - MoveAction_03F - MoveAction_025 + MoveAction_063 2 + MoveAction_034 + MoveAction_063 + MoveAction_035 + MoveAction_063 + MoveAction_037 EndMovement .balign 4, 0 _0E54: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0E5C: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0E64: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0E6C: - MoveAction_021 + MoveAction_033 EndMovement _0E74: diff --git a/res/field/scripts/scripts_unk_0213.s b/res/field/scripts/scripts_unk_0213.s index 571c84992e..49b906cb9d 100644 --- a/res/field/scripts/scripts_unk_0213.s +++ b/res/field/scripts/scripts_unk_0213.s @@ -65,17 +65,17 @@ _008F: .balign 4, 0 _00F0: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _00F8: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _0100: - MoveAction_00D 2 + MoveAction_013 2 EndMovement _0108: @@ -405,19 +405,19 @@ _051E: .balign 4, 0 _0524: - MoveAction_00F - MoveAction_00C 2 + MoveAction_015 + MoveAction_012 2 EndMovement .balign 4, 0 _0530: - MoveAction_00C + MoveAction_012 EndMovement .balign 4, 0 _0538: - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 EndMovement _0544: diff --git a/res/field/scripts/scripts_unk_0423.s b/res/field/scripts/scripts_unk_0423.s index b426ddbc41..b3df07de3a 100644 --- a/res/field/scripts/scripts_unk_0423.s +++ b/res/field/scripts/scripts_unk_0423.s @@ -59,12 +59,12 @@ _00C6: .balign 4, 0 _00D8: - MoveAction_020 - MoveAction_03F 2 - MoveAction_00C 4 - MoveAction_00E + MoveAction_032 + MoveAction_063 2 + MoveAction_012 4 + MoveAction_014 MoveAction_000 - MoveAction_03F 2 + MoveAction_063 2 EndMovement _00F4: @@ -252,65 +252,65 @@ _035C: .balign 4, 0 _03B8: - MoveAction_00F - MoveAction_020 + MoveAction_015 + MoveAction_032 EndMovement .balign 4, 0 _03C4: - MoveAction_00C 2 + MoveAction_012 2 EndMovement .balign 4, 0 _03CC: - MoveAction_00C + MoveAction_012 EndMovement .balign 4, 0 _03D4: - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 EndMovement .balign 4, 0 _03E0: - MoveAction_00C 2 - MoveAction_045 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _03EC: MoveAction_001 - MoveAction_046 - MoveAction_00D + MoveAction_070 + MoveAction_013 EndMovement .balign 4, 0 _03FC: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _0404: - MoveAction_00D 2 + MoveAction_013 2 EndMovement .balign 4, 0 _040C: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0414: - MoveAction_00C - MoveAction_00F - MoveAction_020 + MoveAction_012 + MoveAction_015 + MoveAction_032 EndMovement .balign 4, 0 _0424: - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 EndMovement _0430: diff --git a/res/field/scripts/scripts_unk_0497.s b/res/field/scripts/scripts_unk_0497.s index aa0eb27172..6113e895f0 100644 --- a/res/field/scripts/scripts_unk_0497.s +++ b/res/field/scripts/scripts_unk_0497.s @@ -373,36 +373,36 @@ _070C: .balign 4, 0 _0718: - MoveAction_00F 3 - MoveAction_045 + MoveAction_015 3 + MoveAction_069 EndMovement .balign 4, 0 _0724: - MoveAction_00F 4 - MoveAction_045 + MoveAction_015 4 + MoveAction_069 EndMovement .balign 4, 0 _0730: - MoveAction_00E 3 - MoveAction_045 + MoveAction_014 3 + MoveAction_069 EndMovement .balign 4, 0 _073C: - MoveAction_00E 4 - MoveAction_045 + MoveAction_014 4 + MoveAction_069 EndMovement .balign 4, 0 _0748: - MoveAction_046 - MoveAction_00F 3 + MoveAction_070 + MoveAction_015 3 EndMovement .balign 4, 0 _0754: - MoveAction_046 - MoveAction_00E 3 + MoveAction_070 + MoveAction_014 3 EndMovement diff --git a/res/field/scripts/scripts_unk_0501.s b/res/field/scripts/scripts_unk_0501.s index 62a9ae7590..5290b40400 100644 --- a/res/field/scripts/scripts_unk_0501.s +++ b/res/field/scripts/scripts_unk_0501.s @@ -313,18 +313,18 @@ _045E: .balign 4, 0 _046C: - MoveAction_03E 3 + MoveAction_062 3 MoveAction_002 - MoveAction_03E 3 + MoveAction_062 3 MoveAction_003 - MoveAction_03E 3 + MoveAction_062 3 MoveAction_000 - MoveAction_00C 2 - MoveAction_045 - MoveAction_03F 3 + MoveAction_012 2 + MoveAction_069 + MoveAction_063 3 MoveAction_001 - MoveAction_046 - MoveAction_00D 2 + MoveAction_070 + MoveAction_013 2 EndMovement _04A0: diff --git a/res/field/scripts/scripts_unk_1051.s b/res/field/scripts/scripts_unk_1051.s index 4fe810e966..1a82903ac2 100644 --- a/res/field/scripts/scripts_unk_1051.s +++ b/res/field/scripts/scripts_unk_1051.s @@ -318,26 +318,26 @@ _046C: .balign 4, 0 _0474: - MoveAction_00F 10 + MoveAction_015 10 EndMovement .balign 4, 0 _047C: - MoveAction_00C - MoveAction_00F 10 + MoveAction_012 + MoveAction_015 10 EndMovement .balign 4, 0 _0488: - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _0494: - MoveAction_03F - MoveAction_020 - MoveAction_023 + MoveAction_063 + MoveAction_032 + MoveAction_035 EndMovement _04A4: diff --git a/res/field/scripts/scripts_unk_1114.s b/res/field/scripts/scripts_unk_1114.s index 12b632d6db..3c473ac8b7 100644 --- a/res/field/scripts/scripts_unk_1114.s +++ b/res/field/scripts/scripts_unk_1114.s @@ -1045,7 +1045,7 @@ _1043: .balign 4, 0 _104C: - MoveAction_065 + MoveAction_101 EndMovement _1054: diff --git a/res/field/scripts/scripts_valley_windworks_building.s b/res/field/scripts/scripts_valley_windworks_building.s index d403b658d3..a15a7ecbe0 100644 --- a/res/field/scripts/scripts_valley_windworks_building.s +++ b/res/field/scripts/scripts_valley_windworks_building.s @@ -42,18 +42,18 @@ _005F: .balign 4, 0 _0090: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _0098: - MoveAction_012 9 + MoveAction_018 9 EndMovement .balign 4, 0 _00A0: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement _00AC: @@ -200,88 +200,88 @@ _02B9: .balign 4, 0 _02C0: - MoveAction_013 4 - MoveAction_010 - MoveAction_013 6 - MoveAction_024 + MoveAction_019 4 + MoveAction_016 + MoveAction_019 6 + MoveAction_036 EndMovement .balign 4, 0 _02D4: - MoveAction_013 4 - MoveAction_010 2 - MoveAction_013 6 - MoveAction_025 + MoveAction_019 4 + MoveAction_016 2 + MoveAction_019 6 + MoveAction_037 EndMovement .balign 4, 0 _02E8: - MoveAction_00D 3 - MoveAction_00E + MoveAction_013 3 + MoveAction_014 EndMovement .balign 4, 0 _02F4: - MoveAction_00D 4 - MoveAction_00E + MoveAction_013 4 + MoveAction_014 EndMovement .balign 4, 0 _0300: - MoveAction_03F 6 - MoveAction_021 + MoveAction_063 6 + MoveAction_033 EndMovement .balign 4, 0 _030C: - MoveAction_03F 6 - MoveAction_020 + MoveAction_063 6 + MoveAction_032 EndMovement .balign 4, 0 _0318: MoveAction_003 - MoveAction_03F 2 + MoveAction_063 2 MoveAction_002 - MoveAction_03F 2 + MoveAction_063 2 MoveAction_001 EndMovement .balign 4, 0 _0330: MoveAction_003 - MoveAction_03F 2 + MoveAction_063 2 MoveAction_002 - MoveAction_03F 2 + MoveAction_063 2 MoveAction_000 EndMovement .balign 4, 0 _0348: - MoveAction_04B - MoveAction_00C - MoveAction_022 + MoveAction_075 + MoveAction_012 + MoveAction_034 EndMovement .balign 4, 0 _0358: - MoveAction_04B - MoveAction_022 + MoveAction_075 + MoveAction_034 EndMovement .balign 4, 0 _0364: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _036C: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0374: - MoveAction_021 + MoveAction_033 EndMovement _037C: diff --git a/res/field/scripts/scripts_valley_windworks_outside.s b/res/field/scripts/scripts_valley_windworks_outside.s index 9193c42de7..8d7d9b8dc5 100644 --- a/res/field/scripts/scripts_valley_windworks_outside.s +++ b/res/field/scripts/scripts_valley_windworks_outside.s @@ -91,13 +91,13 @@ _0133: .balign 4, 0 _013C: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0144: - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 EndMovement _0150: @@ -200,62 +200,62 @@ _0201: .balign 4, 0 _02AC: - MoveAction_03F 5 - MoveAction_03E - MoveAction_022 + MoveAction_063 5 + MoveAction_062 + MoveAction_034 EndMovement .balign 4, 0 _02BC: - MoveAction_00D - MoveAction_020 + MoveAction_013 + MoveAction_032 EndMovement .balign 4, 0 _02C8: - MoveAction_03F - MoveAction_022 - MoveAction_021 + MoveAction_063 + MoveAction_034 + MoveAction_033 EndMovement .balign 4, 0 _02D8: - MoveAction_04B - MoveAction_03F - MoveAction_010 4 - MoveAction_027 + MoveAction_075 + MoveAction_063 + MoveAction_016 4 + MoveAction_039 EndMovement .balign 4, 0 _02EC: - MoveAction_03F - MoveAction_03E - MoveAction_00F - MoveAction_020 + MoveAction_063 + MoveAction_062 + MoveAction_015 + MoveAction_032 EndMovement .balign 4, 0 _0300: - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 MoveAction_001 EndMovement .balign 4, 0 _0310: - MoveAction_046 - MoveAction_011 + MoveAction_070 + MoveAction_017 EndMovement .balign 4, 0 _031C: - MoveAction_025 + MoveAction_037 EndMovement .balign 4, 0 _0324: - MoveAction_012 - MoveAction_011 - MoveAction_011 6 - MoveAction_012 9 + MoveAction_018 + MoveAction_017 + MoveAction_017 6 + MoveAction_018 9 EndMovement diff --git a/res/field/scripts/scripts_valor_cavern.s b/res/field/scripts/scripts_valor_cavern.s index ce38ea5b4c..be77331b2f 100644 --- a/res/field/scripts/scripts_valor_cavern.s +++ b/res/field/scripts/scripts_valor_cavern.s @@ -93,7 +93,7 @@ _00D3: .balign 4, 0 _013C: - MoveAction_04B + MoveAction_075 EndMovement _0144: diff --git a/res/field/scripts/scripts_valor_lakefront.s b/res/field/scripts/scripts_valor_lakefront.s index 3309d355b5..9f92427ee2 100644 --- a/res/field/scripts/scripts_valor_lakefront.s +++ b/res/field/scripts/scripts_valor_lakefront.s @@ -125,54 +125,54 @@ _01D9: .balign 4, 0 _01E0: - MoveAction_023 - MoveAction_020 + MoveAction_035 + MoveAction_032 EndMovement .balign 4, 0 _01EC: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _01F4: - MoveAction_03F - MoveAction_023 - MoveAction_03F - MoveAction_020 + MoveAction_063 + MoveAction_035 + MoveAction_063 + MoveAction_032 EndMovement .balign 4, 0 _0208: - MoveAction_03F - MoveAction_020 + MoveAction_063 + MoveAction_032 EndMovement .balign 4, 0 _0214: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _021C: - MoveAction_013 - MoveAction_010 11 + MoveAction_019 + MoveAction_016 11 EndMovement .balign 4, 0 _0228: - MoveAction_010 10 + MoveAction_016 10 EndMovement .balign 4, 0 _0230: - MoveAction_00F + MoveAction_015 MoveAction_008 9 EndMovement .balign 4, 0 _023C: - MoveAction_00C + MoveAction_012 MoveAction_008 9 EndMovement @@ -366,58 +366,58 @@ _053A: .balign 4, 0 _055C: - MoveAction_010 10 - MoveAction_026 + MoveAction_016 10 + MoveAction_038 EndMovement .balign 4, 0 _0568: - MoveAction_010 10 - MoveAction_027 + MoveAction_016 10 + MoveAction_039 EndMovement .balign 4, 0 _0574: - MoveAction_024 + MoveAction_036 EndMovement .balign 4, 0 _057C: - MoveAction_026 + MoveAction_038 EndMovement .balign 4, 0 _0584: - MoveAction_027 + MoveAction_039 EndMovement .balign 4, 0 _058C: - MoveAction_010 8 + MoveAction_016 8 EndMovement .balign 4, 0 _0594: - MoveAction_00D 4 - MoveAction_020 - MoveAction_03F 2 - MoveAction_00D 4 + MoveAction_013 4 + MoveAction_032 + MoveAction_063 2 + MoveAction_013 4 EndMovement .balign 4, 0 _05A8: - MoveAction_03F - MoveAction_020 + MoveAction_063 + MoveAction_032 EndMovement .balign 4, 0 _05B4: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _05BC: - MoveAction_00C 9 + MoveAction_012 9 EndMovement .byte 63 @@ -435,20 +435,20 @@ _05BC: .balign 4, 0 _05D0: - MoveAction_03F 4 - MoveAction_023 + MoveAction_063 4 + MoveAction_035 EndMovement .balign 4, 0 _05DC: - MoveAction_03F 4 - MoveAction_022 + MoveAction_063 4 + MoveAction_034 EndMovement .balign 4, 0 _05E8: - MoveAction_03F 2 - MoveAction_020 + MoveAction_063 2 + MoveAction_032 EndMovement .byte 63 @@ -466,7 +466,7 @@ _05E8: .balign 4, 0 _0600: - MoveAction_03F + MoveAction_063 MoveAction_000 EndMovement @@ -524,12 +524,12 @@ _065A: .balign 4, 0 _06A8: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _06B0: - MoveAction_00C + MoveAction_012 EndMovement _06B8: @@ -601,54 +601,54 @@ _0799: .balign 4, 0 _07A8: - MoveAction_04B - MoveAction_041 + MoveAction_075 + MoveAction_065 EndMovement .balign 4, 0 _07B4: - MoveAction_00F - MoveAction_00D + MoveAction_015 + MoveAction_013 EndMovement .balign 4, 0 _07C0: - MoveAction_00F - MoveAction_00D 2 + MoveAction_015 + MoveAction_013 2 EndMovement .balign 4, 0 _07CC: - MoveAction_00F - MoveAction_00D 3 + MoveAction_015 + MoveAction_013 3 EndMovement .balign 4, 0 _07D8: - MoveAction_00C + MoveAction_012 MoveAction_001 EndMovement .balign 4, 0 _07E4: - MoveAction_00C 2 + MoveAction_012 2 MoveAction_001 EndMovement .balign 4, 0 _07F0: - MoveAction_00C 3 + MoveAction_012 3 MoveAction_001 EndMovement .balign 4, 0 _07FC: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _0804: - MoveAction_047 - MoveAction_00E - MoveAction_048 + MoveAction_071 + MoveAction_014 + MoveAction_072 EndMovement diff --git a/res/field/scripts/scripts_veilstone_city.s b/res/field/scripts/scripts_veilstone_city.s index 8d19f95471..8d3392b88a 100644 --- a/res/field/scripts/scripts_veilstone_city.s +++ b/res/field/scripts/scripts_veilstone_city.s @@ -256,80 +256,80 @@ _042D: .balign 4, 0 _0444: - MoveAction_03F - MoveAction_021 - MoveAction_04B - MoveAction_03F + MoveAction_063 + MoveAction_033 + MoveAction_075 + MoveAction_063 EndMovement .balign 4, 0 _0458: - MoveAction_00E - MoveAction_00D + MoveAction_014 + MoveAction_013 EndMovement .balign 4, 0 _0464: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _046C: - MoveAction_00F - MoveAction_00D + MoveAction_015 + MoveAction_013 EndMovement .balign 4, 0 _0478: - MoveAction_00F 2 - MoveAction_00D + MoveAction_015 2 + MoveAction_013 EndMovement .balign 4, 0 _0484: - MoveAction_024 + MoveAction_036 EndMovement .balign 4, 0 _048C: - MoveAction_03F 4 - MoveAction_023 + MoveAction_063 4 + MoveAction_035 EndMovement .balign 4, 0 _0498: - MoveAction_03F 3 - MoveAction_023 + MoveAction_063 3 + MoveAction_035 EndMovement .balign 4, 0 _04A4: - MoveAction_03F 2 - MoveAction_023 + MoveAction_063 2 + MoveAction_035 EndMovement .balign 4, 0 _04B0: - MoveAction_03F 4 - MoveAction_022 + MoveAction_063 4 + MoveAction_034 EndMovement .balign 4, 0 _04BC: - MoveAction_00F - MoveAction_00D 9 + MoveAction_015 + MoveAction_013 9 EndMovement .balign 4, 0 _04C8: - MoveAction_00E - MoveAction_00D 9 + MoveAction_014 + MoveAction_013 9 EndMovement .balign 4, 0 _04D4: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .byte 63 @@ -347,112 +347,112 @@ _04D4: .balign 4, 0 _04EC: - MoveAction_03F 4 - MoveAction_03E - MoveAction_023 + MoveAction_063 4 + MoveAction_062 + MoveAction_035 EndMovement .balign 4, 0 _04FC: - MoveAction_03F 3 - MoveAction_03E - MoveAction_023 + MoveAction_063 3 + MoveAction_062 + MoveAction_035 EndMovement .balign 4, 0 _050C: - MoveAction_03F 2 - MoveAction_03E - MoveAction_023 + MoveAction_063 2 + MoveAction_062 + MoveAction_035 EndMovement .balign 4, 0 _051C: - MoveAction_03F 4 - MoveAction_03E - MoveAction_022 + MoveAction_063 4 + MoveAction_062 + MoveAction_034 EndMovement .balign 4, 0 _052C: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0534: - MoveAction_03F 2 - MoveAction_023 - MoveAction_021 + MoveAction_063 2 + MoveAction_035 + MoveAction_033 EndMovement .balign 4, 0 _0544: - MoveAction_03F 2 - MoveAction_022 - MoveAction_021 + MoveAction_063 2 + MoveAction_034 + MoveAction_033 EndMovement .balign 4, 0 _0554: - MoveAction_03F - MoveAction_03E - MoveAction_021 + MoveAction_063 + MoveAction_062 + MoveAction_033 EndMovement .balign 4, 0 _0564: - MoveAction_00D + MoveAction_013 EndMovement .balign 4, 0 _056C: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _0574: - MoveAction_00D 4 - MoveAction_00E 2 + MoveAction_013 4 + MoveAction_014 2 EndMovement .balign 4, 0 _0580: - MoveAction_00D 4 - MoveAction_00E + MoveAction_013 4 + MoveAction_014 EndMovement .balign 4, 0 _058C: - MoveAction_00D 4 - MoveAction_022 + MoveAction_013 4 + MoveAction_034 EndMovement .balign 4, 0 _0598: - MoveAction_00D - MoveAction_00E - MoveAction_00D 3 - MoveAction_023 + MoveAction_013 + MoveAction_014 + MoveAction_013 3 + MoveAction_035 EndMovement .balign 4, 0 _05AC: - MoveAction_00D 8 + MoveAction_013 8 EndMovement .balign 4, 0 _05B4: - MoveAction_00D 8 + MoveAction_013 8 EndMovement .balign 4, 0 _05BC: - MoveAction_00D 8 + MoveAction_013 8 EndMovement .balign 4, 0 _05C4: - MoveAction_00D 8 + MoveAction_013 8 EndMovement _05CC: @@ -765,51 +765,51 @@ _0A73: .balign 4, 0 _0A7C: - MoveAction_010 10 - MoveAction_013 3 + MoveAction_016 10 + MoveAction_019 3 EndMovement .balign 4, 0 _0A88: - MoveAction_03F 2 - MoveAction_022 + MoveAction_063 2 + MoveAction_034 EndMovement .balign 4, 0 _0A94: - MoveAction_00F - MoveAction_020 + MoveAction_015 + MoveAction_032 EndMovement .balign 4, 0 _0AA0: - MoveAction_00F - MoveAction_021 + MoveAction_015 + MoveAction_033 EndMovement .balign 4, 0 _0AAC: - MoveAction_00F 5 - MoveAction_00C 4 - MoveAction_045 + MoveAction_015 5 + MoveAction_012 4 + MoveAction_069 EndMovement .balign 4, 0 _0ABC: - MoveAction_00D - MoveAction_023 + MoveAction_013 + MoveAction_035 EndMovement .balign 4, 0 _0AC8: - MoveAction_00D - MoveAction_023 + MoveAction_013 + MoveAction_035 EndMovement .balign 4, 0 _0AD4: - MoveAction_00C - MoveAction_023 + MoveAction_012 + MoveAction_035 EndMovement .byte 62 @@ -891,39 +891,39 @@ _0AD4: .balign 4, 0 _0B2C: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0B34: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0B3C: - MoveAction_026 + MoveAction_038 EndMovement .balign 4, 0 _0B44: - MoveAction_00E 3 - MoveAction_00D 10 + MoveAction_014 3 + MoveAction_013 10 EndMovement .balign 4, 0 _0B50: - MoveAction_00C - MoveAction_00F + MoveAction_012 + MoveAction_015 EndMovement .balign 4, 0 _0B5C: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0B64: - MoveAction_023 + MoveAction_035 EndMovement .byte 63 @@ -961,17 +961,17 @@ _0B64: .balign 4, 0 _0B8C: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _0B94: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0B9C: - MoveAction_022 + MoveAction_034 EndMovement .byte 63 @@ -989,49 +989,49 @@ _0B9C: .balign 4, 0 _0BB0: - MoveAction_03F + MoveAction_063 MoveAction_001 EndMovement .balign 4, 0 _0BBC: - MoveAction_03F + MoveAction_063 MoveAction_000 EndMovement .balign 4, 0 _0BC8: - MoveAction_00D - MoveAction_00F 5 - MoveAction_00C 5 - MoveAction_045 + MoveAction_013 + MoveAction_015 5 + MoveAction_012 5 + MoveAction_069 EndMovement .balign 4, 0 _0BDC: - MoveAction_00C - MoveAction_00F 5 - MoveAction_00C 5 - MoveAction_045 + MoveAction_012 + MoveAction_015 5 + MoveAction_012 5 + MoveAction_069 EndMovement .balign 4, 0 _0BF0: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0BF8: - MoveAction_013 4 - MoveAction_010 4 - MoveAction_024 + MoveAction_019 4 + MoveAction_016 4 + MoveAction_036 EndMovement .balign 4, 0 _0C08: - MoveAction_013 4 - MoveAction_010 6 - MoveAction_024 + MoveAction_019 4 + MoveAction_016 6 + MoveAction_036 EndMovement _0C18: @@ -1146,27 +1146,27 @@ _0CF7: .balign 4, 0 _0D28: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0D30: - MoveAction_021 - MoveAction_04B + MoveAction_033 + MoveAction_075 EndMovement .balign 4, 0 _0D3C: - MoveAction_011 - MoveAction_022 - MoveAction_03F 2 - MoveAction_00C - MoveAction_022 + MoveAction_017 + MoveAction_034 + MoveAction_063 2 + MoveAction_012 + MoveAction_034 EndMovement .balign 4, 0 _0D54: - MoveAction_00E + MoveAction_014 EndMovement _0D5C: @@ -1300,69 +1300,69 @@ _0F0B: .balign 4, 0 _0F1C: - MoveAction_04B + MoveAction_075 EndMovement .balign 4, 0 _0F24: - MoveAction_013 - MoveAction_011 2 - MoveAction_013 - MoveAction_011 9 + MoveAction_019 + MoveAction_017 2 + MoveAction_019 + MoveAction_017 9 EndMovement .balign 4, 0 _0F38: - MoveAction_011 2 - MoveAction_013 2 - MoveAction_011 9 + MoveAction_017 2 + MoveAction_019 2 + MoveAction_017 9 EndMovement .balign 4, 0 _0F48: - MoveAction_03F - MoveAction_023 - MoveAction_021 + MoveAction_063 + MoveAction_035 + MoveAction_033 EndMovement .balign 4, 0 _0F58: - MoveAction_03F 2 - MoveAction_021 + MoveAction_063 2 + MoveAction_033 EndMovement .balign 4, 0 _0F64: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _0F70: - MoveAction_00C 6 - MoveAction_00E 2 - MoveAction_00C 2 + MoveAction_012 6 + MoveAction_014 2 + MoveAction_012 2 EndMovement .balign 4, 0 _0F80: - MoveAction_00C 6 - MoveAction_00E 2 - MoveAction_020 + MoveAction_012 6 + MoveAction_014 2 + MoveAction_032 EndMovement .balign 4, 0 _0F90: - MoveAction_00C 6 - MoveAction_00E 3 - MoveAction_00C + MoveAction_012 6 + MoveAction_014 3 + MoveAction_012 EndMovement .balign 4, 0 _0FA0: - MoveAction_00C 6 - MoveAction_00E - MoveAction_00C + MoveAction_012 6 + MoveAction_014 + MoveAction_012 EndMovement _0FB0: @@ -1383,9 +1383,9 @@ _0FB0: .balign 4, 0 _0FE0: - MoveAction_03F - MoveAction_04B - MoveAction_03F + MoveAction_063 + MoveAction_075 + MoveAction_063 EndMovement _0FF0: @@ -1555,15 +1555,15 @@ _11DE: .balign 4, 0 _11E8: - MoveAction_020 - MoveAction_04B - MoveAction_00F 2 - MoveAction_00C + MoveAction_032 + MoveAction_075 + MoveAction_015 2 + MoveAction_012 EndMovement .balign 4, 0 _11FC: - MoveAction_00D 9 + MoveAction_013 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 28035ea8e1..2542602088 100644 --- a/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s +++ b/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s @@ -62,12 +62,12 @@ _00C2: .balign 4, 0 _00C8: - MoveAction_012 + MoveAction_018 EndMovement .balign 4, 0 _00D0: - MoveAction_013 + MoveAction_019 EndMovement _00D8: @@ -95,39 +95,39 @@ _00D8: .balign 4, 0 _012C: - MoveAction_00C 2 + MoveAction_012 2 EndMovement .balign 4, 0 _0134: - MoveAction_00D 2 - MoveAction_022 - MoveAction_03F 2 - MoveAction_023 - MoveAction_03F 2 - MoveAction_00F 5 - MoveAction_020 - MoveAction_04B - MoveAction_022 + MoveAction_013 2 + MoveAction_034 + MoveAction_063 2 + MoveAction_035 + MoveAction_063 2 + MoveAction_015 5 + MoveAction_032 + MoveAction_075 + MoveAction_034 EndMovement .balign 4, 0 _015C: - MoveAction_00E 5 - MoveAction_021 + MoveAction_014 5 + MoveAction_033 EndMovement .balign 4, 0 _0168: - MoveAction_03F 9 - MoveAction_023 + MoveAction_063 9 + MoveAction_035 EndMovement .balign 4, 0 _0174: - MoveAction_03F 4 - MoveAction_03D - MoveAction_020 + MoveAction_063 4 + MoveAction_061 + MoveAction_032 EndMovement _0184: @@ -212,65 +212,65 @@ _02AE: .balign 4, 0 _02C4: - MoveAction_03F 4 - MoveAction_023 + MoveAction_063 4 + MoveAction_035 EndMovement .balign 4, 0 _02D0: - MoveAction_03F 3 - MoveAction_022 + MoveAction_063 3 + MoveAction_034 EndMovement .balign 4, 0 _02DC: - MoveAction_03F - MoveAction_020 + MoveAction_063 + MoveAction_032 EndMovement .balign 4, 0 _02E8: - MoveAction_00C 2 - MoveAction_00F - MoveAction_00C - MoveAction_022 + MoveAction_012 2 + MoveAction_015 + MoveAction_012 + MoveAction_034 EndMovement .balign 4, 0 _02FC: - MoveAction_00C 3 - MoveAction_023 + MoveAction_012 3 + MoveAction_035 EndMovement .balign 4, 0 _0308: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _0310: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0318: - MoveAction_022 + MoveAction_034 EndMovement .balign 4, 0 _0320: - MoveAction_00C 5 - MoveAction_026 - MoveAction_027 - MoveAction_03F 2 - MoveAction_013 6 + MoveAction_012 5 + MoveAction_038 + MoveAction_039 + MoveAction_063 2 + MoveAction_019 6 EndMovement .balign 4, 0 _0338: - MoveAction_00C 5 - MoveAction_026 - MoveAction_027 - MoveAction_03F 2 - MoveAction_013 7 + MoveAction_012 5 + MoveAction_038 + MoveAction_039 + MoveAction_063 2 + MoveAction_019 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 a47fd12cac..d757af62da 100644 --- a/res/field/scripts/scripts_veilstone_city_southeast_house.s +++ b/res/field/scripts/scripts_veilstone_city_southeast_house.s @@ -75,49 +75,49 @@ _00EF: .balign 4, 0 _00FC: MoveAction_000 - MoveAction_03D + MoveAction_061 MoveAction_003 - MoveAction_03D + MoveAction_061 MoveAction_001 - MoveAction_03D + MoveAction_061 MoveAction_002 - MoveAction_03D + MoveAction_061 EndMovement .balign 4, 0 _0120: MoveAction_003 - MoveAction_03D + MoveAction_061 MoveAction_001 - MoveAction_03D + MoveAction_061 MoveAction_002 - MoveAction_03D + MoveAction_061 MoveAction_000 - MoveAction_03D + MoveAction_061 EndMovement .balign 4, 0 _0144: MoveAction_001 - MoveAction_03D + MoveAction_061 MoveAction_002 - MoveAction_03D + MoveAction_061 MoveAction_000 - MoveAction_03D + MoveAction_061 MoveAction_003 - MoveAction_03D + MoveAction_061 EndMovement .balign 4, 0 _0168: MoveAction_002 - MoveAction_03D + MoveAction_061 MoveAction_000 - MoveAction_03D + MoveAction_061 MoveAction_003 - MoveAction_03D + MoveAction_061 MoveAction_001 - MoveAction_03D + MoveAction_061 EndMovement _018C: diff --git a/res/field/scripts/scripts_veilstone_store_elevator.s b/res/field/scripts/scripts_veilstone_store_elevator.s index b2376e3e2d..1c2268750f 100644 --- a/res/field/scripts/scripts_veilstone_store_elevator.s +++ b/res/field/scripts/scripts_veilstone_store_elevator.s @@ -216,5 +216,5 @@ _03F6: .balign 4, 0 _0410: - MoveAction_021 + MoveAction_033 EndMovement diff --git a/res/field/scripts/scripts_verity_cavern.s b/res/field/scripts/scripts_verity_cavern.s index d17c216b38..476b189ea9 100644 --- a/res/field/scripts/scripts_verity_cavern.s +++ b/res/field/scripts/scripts_verity_cavern.s @@ -108,19 +108,19 @@ _0184: .balign 4, 0 _0190: - MoveAction_00C 7 + MoveAction_012 7 EndMovement .balign 4, 0 _0198: - MoveAction_021 - MoveAction_03F 2 - MoveAction_020 + MoveAction_033 + MoveAction_063 2 + MoveAction_032 EndMovement .balign 4, 0 _01A8: - MoveAction_00D 9 + MoveAction_013 9 EndMovement .balign 4, 0 diff --git a/res/field/scripts/scripts_verity_lakefront.s b/res/field/scripts/scripts_verity_lakefront.s index 7bf78fbe0f..9bc1a85939 100644 --- a/res/field/scripts/scripts_verity_lakefront.s +++ b/res/field/scripts/scripts_verity_lakefront.s @@ -64,24 +64,24 @@ _00F0: .balign 4, 0 _0124: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _012C: - MoveAction_00C 2 - MoveAction_045 + MoveAction_012 2 + MoveAction_069 EndMovement .balign 4, 0 _0138: - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 EndMovement .balign 4, 0 _0144: - MoveAction_021 + MoveAction_033 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 64b008f663..2fcbbd4dd7 100644 --- a/res/field/scripts/scripts_victory_road_1f_room_2.s +++ b/res/field/scripts/scripts_victory_road_1f_room_2.s @@ -89,43 +89,43 @@ _0139: .balign 4, 0 _0140: - MoveAction_022 - MoveAction_04B + MoveAction_034 + MoveAction_075 EndMovement .balign 4, 0 _014C: - MoveAction_00C 3 - MoveAction_00E + MoveAction_012 3 + MoveAction_014 EndMovement .balign 4, 0 _0158: - MoveAction_00C 2 - MoveAction_00E + MoveAction_012 2 + MoveAction_014 EndMovement .balign 4, 0 _0164: - MoveAction_00C - MoveAction_00E + MoveAction_012 + MoveAction_014 EndMovement .balign 4, 0 _0170: - MoveAction_00E + MoveAction_014 EndMovement .balign 4, 0 _0178: - MoveAction_00D - MoveAction_00E + MoveAction_013 + MoveAction_014 EndMovement .balign 4, 0 _0184: - MoveAction_00D 2 - MoveAction_00E + MoveAction_013 2 + MoveAction_014 EndMovement _0190: @@ -183,7 +183,7 @@ _026D: .balign 4, 0 _0274: - MoveAction_023 + MoveAction_035 EndMovement .byte 12 @@ -197,42 +197,42 @@ _0274: .balign 4, 0 _0284: - MoveAction_00F 2 - MoveAction_00D 3 - MoveAction_023 + MoveAction_015 2 + MoveAction_013 3 + MoveAction_035 EndMovement .balign 4, 0 _0294: - MoveAction_00F 2 - MoveAction_00D 2 - MoveAction_023 + MoveAction_015 2 + MoveAction_013 2 + MoveAction_035 EndMovement .balign 4, 0 _02A4: - MoveAction_00F 2 - MoveAction_00D - MoveAction_023 + MoveAction_015 2 + MoveAction_013 + MoveAction_035 EndMovement .balign 4, 0 _02B4: - MoveAction_00F 2 + MoveAction_015 2 EndMovement .balign 4, 0 _02BC: - MoveAction_00F 2 - MoveAction_00C - MoveAction_023 + MoveAction_015 2 + MoveAction_012 + MoveAction_035 EndMovement .balign 4, 0 _02CC: - MoveAction_00F 2 - MoveAction_00C 2 - MoveAction_023 + MoveAction_015 2 + MoveAction_012 2 + MoveAction_035 EndMovement .balign 4, 0 @@ -289,58 +289,58 @@ _03A1: .balign 4, 0 _03B4: - MoveAction_03F - MoveAction_021 + MoveAction_063 + MoveAction_033 EndMovement .balign 4, 0 _03C0: - MoveAction_03F - MoveAction_023 - MoveAction_020 + MoveAction_063 + MoveAction_035 + MoveAction_032 EndMovement .balign 4, 0 _03D0: - MoveAction_03F - MoveAction_022 - MoveAction_020 + MoveAction_063 + MoveAction_034 + MoveAction_032 EndMovement .balign 4, 0 _03E0: - MoveAction_020 - MoveAction_04B + MoveAction_032 + MoveAction_075 EndMovement .balign 4, 0 _03EC: - MoveAction_00F - MoveAction_00C 7 - MoveAction_00F 4 - MoveAction_023 + MoveAction_015 + MoveAction_012 7 + MoveAction_015 4 + MoveAction_035 EndMovement .balign 4, 0 _0400: - MoveAction_00F - MoveAction_00C 7 - MoveAction_00F 3 - MoveAction_023 + MoveAction_015 + MoveAction_012 7 + MoveAction_015 3 + MoveAction_035 EndMovement .balign 4, 0 _0414: - MoveAction_00F - MoveAction_00C 7 - MoveAction_00F 2 - MoveAction_023 + MoveAction_015 + MoveAction_012 7 + MoveAction_015 2 + MoveAction_035 EndMovement .balign 4, 0 _0428: - MoveAction_00E - MoveAction_00C 7 - MoveAction_00F 3 - MoveAction_023 + MoveAction_014 + MoveAction_012 7 + MoveAction_015 3 + MoveAction_035 EndMovement diff --git a/res/field/scripts/scripts_villa.s b/res/field/scripts/scripts_villa.s index bc83404b5b..49827eb69b 100644 --- a/res/field/scripts/scripts_villa.s +++ b/res/field/scripts/scripts_villa.s @@ -658,13 +658,13 @@ _0917: .balign 4, 0 _0930: - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _093C: - MoveAction_022 + MoveAction_034 EndMovement _0944: @@ -779,13 +779,13 @@ _0AC8: .balign 4, 0 _0AD8: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _0AE0: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement _0AEC: @@ -813,16 +813,16 @@ _0AF4: .balign 4, 0 _0B3C: - MoveAction_021 - MoveAction_03F 5 - MoveAction_022 + MoveAction_033 + MoveAction_063 5 + MoveAction_034 EndMovement .balign 4, 0 _0B4C: - MoveAction_00E 2 - MoveAction_00C 5 - MoveAction_00E 3 + MoveAction_014 2 + MoveAction_012 5 + MoveAction_014 3 EndMovement _0B5C: @@ -844,14 +844,14 @@ _0B5C: .balign 4, 0 _0BA4: - MoveAction_00F 8 + MoveAction_015 8 EndMovement .balign 4, 0 _0BAC: - MoveAction_021 - MoveAction_03F 3 - MoveAction_023 + MoveAction_033 + MoveAction_063 3 + MoveAction_035 EndMovement _0BBC: @@ -873,16 +873,16 @@ _0BBC: .balign 4, 0 _0C04: - MoveAction_00E 2 - MoveAction_00C 3 - MoveAction_00E 2 + MoveAction_014 2 + MoveAction_012 3 + MoveAction_014 2 EndMovement .balign 4, 0 _0C14: - MoveAction_021 - MoveAction_03F 4 - MoveAction_022 + MoveAction_033 + MoveAction_063 4 + MoveAction_034 EndMovement _0C24: @@ -904,15 +904,15 @@ _0C24: .balign 4, 0 _0C6C: - MoveAction_00E 8 - MoveAction_00C 6 + MoveAction_014 8 + MoveAction_012 6 EndMovement .balign 4, 0 _0C78: - MoveAction_021 - MoveAction_03F 5 - MoveAction_022 + MoveAction_033 + MoveAction_063 5 + MoveAction_034 EndMovement _0C88: @@ -1431,20 +1431,20 @@ _1436: .balign 4, 0 _1454: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _145C: - MoveAction_00E - MoveAction_00C 3 + MoveAction_014 + MoveAction_012 3 EndMovement .balign 4, 0 _1468: - MoveAction_00D 3 - MoveAction_00F - MoveAction_021 + MoveAction_013 3 + MoveAction_015 + MoveAction_033 EndMovement _1478: @@ -1480,13 +1480,13 @@ _1485: .balign 4, 0 _14F0: - MoveAction_03F - MoveAction_022 + MoveAction_063 + MoveAction_034 EndMovement .balign 4, 0 _14FC: - MoveAction_023 + MoveAction_035 EndMovement .byte 13 @@ -1559,12 +1559,12 @@ _15F3: .balign 4, 0 _1614: - MoveAction_021 + MoveAction_033 EndMovement .balign 4, 0 _161C: - MoveAction_00C + MoveAction_012 EndMovement _1624: diff --git a/res/field/scripts/scripts_vista_lighthouse.s b/res/field/scripts/scripts_vista_lighthouse.s index 509b3b5a22..db6d34199a 100644 --- a/res/field/scripts/scripts_vista_lighthouse.s +++ b/res/field/scripts/scripts_vista_lighthouse.s @@ -86,37 +86,37 @@ _00D2: .balign 4, 0 _0104: - MoveAction_00F 3 - MoveAction_00D 6 - MoveAction_00E 3 - MoveAction_020 + MoveAction_015 3 + MoveAction_013 6 + MoveAction_014 3 + MoveAction_032 EndMovement .balign 4, 0 _0118: - MoveAction_00D - MoveAction_00F 3 - MoveAction_00D 5 - MoveAction_00E 3 - MoveAction_020 + MoveAction_013 + MoveAction_015 3 + MoveAction_013 5 + MoveAction_014 3 + MoveAction_032 EndMovement .balign 4, 0 _0130: - MoveAction_00C - MoveAction_045 + MoveAction_012 + MoveAction_069 EndMovement .balign 4, 0 _013C: - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_035 EndMovement .balign 4, 0 _0148: - MoveAction_03F - MoveAction_021 - MoveAction_03F - MoveAction_023 + MoveAction_063 + MoveAction_033 + MoveAction_063 + MoveAction_035 EndMovement diff --git a/res/field/scripts/scripts_vista_lighthouse_elevator.s b/res/field/scripts/scripts_vista_lighthouse_elevator.s index 822789c59c..4a6dda53a1 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_00C 2 - MoveAction_021 + MoveAction_012 2 + MoveAction_033 EndMovement .balign 4, 0 _00C4: - MoveAction_00D 2 - MoveAction_021 + MoveAction_013 2 + MoveAction_033 EndMovement diff --git a/res/field/scripts/scripts_wayward_cave_1f.s b/res/field/scripts/scripts_wayward_cave_1f.s index 810ac9aa4c..72f576922f 100644 --- a/res/field/scripts/scripts_wayward_cave_1f.s +++ b/res/field/scripts/scripts_wayward_cave_1f.s @@ -127,24 +127,24 @@ _0182: .balign 4, 0 _0194: - MoveAction_023 + MoveAction_035 EndMovement .balign 4, 0 _019C: - MoveAction_020 + MoveAction_032 EndMovement .balign 4, 0 _01A4: - MoveAction_00C - MoveAction_021 + MoveAction_012 + MoveAction_033 EndMovement .balign 4, 0 _01B0: - MoveAction_00F - MoveAction_022 + MoveAction_015 + MoveAction_034 EndMovement .byte 63 @@ -178,26 +178,26 @@ _01B0: .balign 4, 0 _01D8: - MoveAction_022 - MoveAction_04B + MoveAction_034 + MoveAction_075 EndMovement .balign 4, 0 _01E4: - MoveAction_021 - MoveAction_04B + MoveAction_033 + MoveAction_075 EndMovement .balign 4, 0 _01F0: - MoveAction_03F 3 - MoveAction_00E - MoveAction_021 + MoveAction_063 3 + MoveAction_014 + MoveAction_033 EndMovement .balign 4, 0 _0200: - MoveAction_03F 3 - MoveAction_00D - MoveAction_021 + MoveAction_063 3 + MoveAction_013 + MoveAction_033 EndMovement diff --git a/res/field/scripts/scripts_wifi_plaza_entrance.s b/res/field/scripts/scripts_wifi_plaza_entrance.s index c291d30309..cf250b4117 100644 --- a/res/field/scripts/scripts_wifi_plaza_entrance.s +++ b/res/field/scripts/scripts_wifi_plaza_entrance.s @@ -78,103 +78,103 @@ _00D9: .balign 4, 0 _0148: - MoveAction_00C 7 - MoveAction_00E 11 + MoveAction_012 7 + MoveAction_014 11 EndMovement .balign 4, 0 _0154: - MoveAction_00C 7 - MoveAction_00E 9 + MoveAction_012 7 + MoveAction_014 9 EndMovement .balign 4, 0 _0160: - MoveAction_00C 7 - MoveAction_00E 7 + MoveAction_012 7 + MoveAction_014 7 EndMovement .balign 4, 0 _016C: - MoveAction_00C 7 - MoveAction_00E 5 + MoveAction_012 7 + MoveAction_014 5 EndMovement .balign 4, 0 _0178: - MoveAction_00C 7 - MoveAction_00E 3 + MoveAction_012 7 + MoveAction_014 3 EndMovement .balign 4, 0 _0184: - MoveAction_00C + MoveAction_012 MoveAction_002 - MoveAction_03D + MoveAction_061 MoveAction_001 - MoveAction_03D + MoveAction_061 MoveAction_003 - MoveAction_03D + MoveAction_061 MoveAction_000 - MoveAction_03D + MoveAction_061 MoveAction_002 - MoveAction_03D + MoveAction_061 MoveAction_001 - MoveAction_03D + MoveAction_061 MoveAction_003 - MoveAction_03D + MoveAction_061 MoveAction_000 - MoveAction_03D + MoveAction_061 MoveAction_002 - MoveAction_03D + MoveAction_061 MoveAction_001 - MoveAction_03D + MoveAction_061 MoveAction_003 - MoveAction_03D + MoveAction_061 MoveAction_000 EndMovement .balign 4, 0 _01E8: - MoveAction_043 + MoveAction_067 EndMovement .balign 4, 0 _01F0: - MoveAction_00C 6 - MoveAction_00E 12 - MoveAction_023 + MoveAction_012 6 + MoveAction_014 12 + MoveAction_035 EndMovement .balign 4, 0 _0200: - MoveAction_00C 6 - MoveAction_00E 10 - MoveAction_023 + MoveAction_012 6 + MoveAction_014 10 + MoveAction_035 EndMovement .balign 4, 0 _0210: - MoveAction_00C 6 - MoveAction_00E 8 - MoveAction_023 + MoveAction_012 6 + MoveAction_014 8 + MoveAction_035 EndMovement .balign 4, 0 _0220: - MoveAction_00C 6 - MoveAction_00E 6 - MoveAction_023 + MoveAction_012 6 + MoveAction_014 6 + MoveAction_035 EndMovement .balign 4, 0 _0230: - MoveAction_00C 6 - MoveAction_00E 4 - MoveAction_023 + MoveAction_012 6 + MoveAction_014 4 + MoveAction_035 EndMovement .balign 4, 0 _0240: - MoveAction_020 + MoveAction_032 EndMovement diff --git a/src/unk_020655F4.c b/src/unk_020655F4.c index 2a9839ee1e..9150663022 100644 --- a/src/unk_020655F4.c +++ b/src/unk_020655F4.c @@ -3,6 +3,8 @@ #include #include +#include "consts/movement.h" + #include "struct_decls/struct_02061AB4_decl.h" #include "overlay005/map_object_anim_cmd.h" @@ -139,7 +141,7 @@ int LocalMapObj_IsAnimationSet(const MapObject *mapObj) void LocalMapObj_SetAnimationCode(MapObject *mapObj, int param1) { - GF_ASSERT(param1 < 0x9a); + GF_ASSERT(param1 < MAX_MOVEMENT_ACTION); MapObject_SetMovementAction(mapObj, param1); sub_02062BC0(mapObj, 0); diff --git a/src/unk_020EDBAC.c b/src/unk_020EDBAC.c index 2df499fb05..292e9301f1 100644 --- a/src/unk_020EDBAC.c +++ b/src/unk_020EDBAC.c @@ -1,6 +1,8 @@ #include #include +#include "consts/movement.h" + #include "struct_decls/struct_02061AB4_decl.h" #include "struct_defs/struct_020EDF0C.h" @@ -783,7 +785,7 @@ const UnkStruct_020EDF0C *const Unk_020EE3A8[] = { &Unk_020EE2B8 }; -int (*const *const Unk_020EE4B8[0x9a])(MapObject *) = { +int (*const *const Unk_020EE4B8[MAX_MOVEMENT_ACTION])(MapObject *) = { Unk_020EEC78, Unk_020EEC48, Unk_020EEC88, From 63de4d751b4c8f4c7d40cf36ef94f15ad94b46fc Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Fri, 13 Dec 2024 22:05:57 +0800 Subject: [PATCH 2/2] Document some movement action functions --- consts/movement.json | 3 +- include/constdata/const_020EE31C.h | 6 - include/constdata/const_020EE3A8.h | 8 - include/constdata/const_020EE4B8.h | 8 - include/map_object.h | 10 +- include/map_object_move.h | 6 +- include/unk_020655F4.h | 2 +- include/unk_020EDBAC.h | 13 + src/map_object.c | 39 +- src/map_object_move.c | 21 +- src/overlay005/ov5_021DFB54.c | 4 +- src/overlay008/ov8_02249960.c | 2 +- src/overlay009/ov9_02249960.c | 22 +- src/unk_0205F180.c | 2 +- src/unk_0206450C.c | 6 +- src/unk_020655F4.c | 1498 +++++++++++++--------------- src/unk_020EDBAC.c | 622 ++++++------ 17 files changed, 1083 insertions(+), 1189 deletions(-) delete mode 100644 include/constdata/const_020EE31C.h delete mode 100644 include/constdata/const_020EE3A8.h delete mode 100644 include/constdata/const_020EE4B8.h create mode 100644 include/unk_020EDBAC.h diff --git a/consts/movement.json b/consts/movement.json index 699c10b5b6..624f38e5a9 100644 --- a/consts/movement.json +++ b/consts/movement.json @@ -158,7 +158,8 @@ "MOVEMENT_ACTION_152", "MOVEMENT_ACTION_153", "MAX_MOVEMENT_ACTION", - "MOVEMENT_ACTION_END" + "MOVEMENT_ACTION_END", + "MOVEMENT_ACTION_NONE" ], "overrides": { "MOVEMENT_ACTION_END": 254 diff --git a/include/constdata/const_020EE31C.h b/include/constdata/const_020EE31C.h deleted file mode 100644 index 02b1c4c37a..0000000000 --- a/include/constdata/const_020EE31C.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_CONST_020EE31C_H -#define POKEPLATINUM_CONST_020EE31C_H - -extern const int *const Unk_020EE31C[]; - -#endif // POKEPLATINUM_CONST_020EE31C_H diff --git a/include/constdata/const_020EE3A8.h b/include/constdata/const_020EE3A8.h deleted file mode 100644 index b68c80e4b4..0000000000 --- a/include/constdata/const_020EE3A8.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef POKEPLATINUM_CONST_020EE3A8_H -#define POKEPLATINUM_CONST_020EE3A8_H - -#include "struct_defs/struct_020EDF0C.h" - -extern const UnkStruct_020EDF0C *const Unk_020EE3A8[]; - -#endif // POKEPLATINUM_CONST_020EE3A8_H diff --git a/include/constdata/const_020EE4B8.h b/include/constdata/const_020EE4B8.h deleted file mode 100644 index 124fe5431b..0000000000 --- a/include/constdata/const_020EE4B8.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef POKEPLATINUM_CONST_020EE4B8_H -#define POKEPLATINUM_CONST_020EE4B8_H - -#include "struct_decls/struct_02061AB4_decl.h" - -extern int (*const *const Unk_020EE4B8[0x9a])(MapObject *); - -#endif // POKEPLATINUM_CONST_020EE4B8_H diff --git a/include/map_object.h b/include/map_object.h index a98a388eae..7fe12249d5 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -116,8 +116,8 @@ void *sub_02062A54(MapObject *param0, int param1); void *sub_02062A78(MapObject *param0); void *sub_02062A7C(MapObject *param0, int param1); void *sub_02062AA0(MapObject *param0); -void *sub_02062AA4(MapObject *param0, int param1); -void *sub_02062AC8(MapObject *param0); +void *MapObject_InitMovementData(MapObject *mapObj, int size); +void *MapObject_GetMovementData(MapObject *mapObj); void *sub_02062ACC(MapObject *param0, int param1); void *sub_02062AF0(MapObject *param0); void sub_02062AF8(MapObject *param0, UnkFuncPtr_020EDF0C param1); @@ -139,9 +139,9 @@ void sub_02062B9C(MapObject *param0, UnkFuncPtr_ov5_021FB0F0_4 param1); void sub_02062BA4(MapObject *param0); void MapObject_SetMovementAction(MapObject *mapObj, int movementAction); int MapObject_GetMovementAction(const MapObject *mapObj); -void sub_02062BC0(MapObject *param0, int param1); -void sub_02062BC8(MapObject *param0); -int sub_02062BD8(const MapObject *param0); +void MapObject_SetMovementStep(MapObject *mapObj, int movementStep); +void MapObject_AdvanceMovementStep(MapObject *mapObj); +int MapObject_GetMovementStep(const MapObject *mapObj); void sub_02062BE0(MapObject *param0, u32 param1); u32 sub_02062BE8(const MapObject *param0); void sub_02062BF0(MapObject *param0, u32 param1); diff --git a/include/map_object_move.h b/include/map_object_move.h index 69bbd37843..f6a998c370 100644 --- a/include/map_object_move.h +++ b/include/map_object_move.h @@ -24,11 +24,11 @@ int sub_0206415C(MapObject *param0, u32 param1); int sub_0206417C(MapObject *param0, u32 param1); int MapObject_GetDxFromDir(int param0); int MapObject_GetDyFromDir(int param0); -void sub_020641B4(MapObject *param0, int param1); -void sub_02064208(MapObject *param0); +void MapObject_StepDir(MapObject *mapObj, int dir); +void MapObject_UpdateCoords(MapObject *mapObj); u32 sub_02064238(MapObject *param0, int param1); void MapObject_AddVecToPos(MapObject *param0, const VecFx32 *param1); -void MapObject_StepDirection(MapObject *param0, int param1, fx32 param2); +void MapObject_MovePosInDir(MapObject *mapObj, int dir, fx32 distance); int sub_020642F8(MapObject *param0); int sub_02064390(MapObject *param0); void VecFx32_StepDirection(int param0, VecFx32 *param1, fx32 param2); diff --git a/include/unk_020655F4.h b/include/unk_020655F4.h index aada61e863..6ad0054955 100644 --- a/include/unk_020655F4.h +++ b/include/unk_020655F4.h @@ -18,7 +18,7 @@ int MapObject_HasAnimationEnded(SysTask *param0); void MapObject_FinishAnimation(SysTask *param0); int sub_02065838(int param0, int param1); int sub_0206587C(int param0); -void sub_020658B4(MapObject *param0); +void MapObject_DoMovementAction(MapObject *param0); int sub_020658DC(MapObject *param0); #endif // POKEPLATINUM_UNK_020655F4_H diff --git a/include/unk_020EDBAC.h b/include/unk_020EDBAC.h new file mode 100644 index 0000000000..77c4c209bf --- /dev/null +++ b/include/unk_020EDBAC.h @@ -0,0 +1,13 @@ +#ifndef POKEPLATINUM_UNK_020EDBAC_H +#define POKEPLATINUM_UNK_020EDBAC_H + +#include "consts/movement.h" + +#include "struct_decls/struct_02061AB4_decl.h" +#include "struct_defs/struct_020EDF0C.h" + +extern int (*const *const gMovementActionFuncs[MAX_MOVEMENT_ACTION])(MapObject *); +extern const UnkStruct_020EDF0C *const Unk_020EE3A8[]; +extern const int *const Unk_020EE31C[]; + +#endif // POKEPLATINUM_UNK_020EDBAC_H diff --git a/src/map_object.c b/src/map_object.c index 56adc2e348..a248aac2d3 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -33,8 +33,7 @@ #include "sys_task_manager.h" #include "unk_020655F4.h" #include "unk_020677F4.h" - -#include "constdata/const_020EE3A8.h" +#include "unk_020EDBAC.h" typedef struct MapObjectMan { u32 unk_00; @@ -82,7 +81,7 @@ typedef struct MapObject { VecFx32 unk_94; u32 unk_A0; int movementAction; - int unk_A8; + int movementStep; u16 unk_AC; u16 unk_AE; SysTask *unk_B0; @@ -97,7 +96,7 @@ typedef struct MapObject { UnkFuncPtr_ov5_021FB0F0_4 unk_D4; u8 unk_D8[16]; u8 unk_E8[16]; - u8 unk_F8[16]; + u8 movementData[16]; u8 unk_108[32]; } MapObject; @@ -1503,21 +1502,19 @@ void *sub_02062AA0(MapObject *mapObj) return mapObj->unk_E8; } -void *sub_02062AA4(MapObject *mapObj, int param1) +void *MapObject_InitMovementData(MapObject *mapObj, int size) { - u8 *v0; - - GF_ASSERT(param1 <= 16); + GF_ASSERT(size <= 16); - v0 = sub_02062AC8(mapObj); - memset(v0, 0, param1); + void *movementData = MapObject_GetMovementData(mapObj); + memset(movementData, 0, size); - return v0; + return movementData; } -void *sub_02062AC8(MapObject *mapObj) +void *MapObject_GetMovementData(MapObject *mapObj) { - return mapObj->unk_F8; + return mapObj->movementData; } void *sub_02062ACC(MapObject *mapObj, int param1) @@ -1633,19 +1630,19 @@ int MapObject_GetMovementAction(const MapObject *mapObj) return mapObj->movementAction; } -void sub_02062BC0(MapObject *mapObj, int param1) +void MapObject_SetMovementStep(MapObject *mapObj, int movementStep) { - mapObj->unk_A8 = param1; + mapObj->movementStep = movementStep; } -void sub_02062BC8(MapObject *mapObj) +void MapObject_AdvanceMovementStep(MapObject *mapObj) { - mapObj->unk_A8++; + mapObj->movementStep++; } -int sub_02062BD8(const MapObject *mapObj) +int MapObject_GetMovementStep(const MapObject *mapObj) { - return mapObj->unk_A8; + return mapObj->movementStep; } void sub_02062BE0(MapObject *mapObj, u32 param1) @@ -2498,7 +2495,7 @@ void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2) MapObject_SetZ(mapObj, v2); MapObject_SetPos(mapObj, param1); - sub_02064208(mapObj); + MapObject_UpdateCoords(mapObj); MapObject_Face(mapObj, param2); @@ -2521,7 +2518,7 @@ void MapObject_SetPosDir(MapObject *mapObj, int param1, int param2, int param3, MapObject_SetZ(mapObj, param3); MapObject_SetPos(mapObj, &v0); - sub_02064208(mapObj); + MapObject_UpdateCoords(mapObj); MapObject_Face(mapObj, param4); diff --git a/src/map_object_move.c b/src/map_object_move.c index 32c020d282..df842928e0 100644 --- a/src/map_object_move.c +++ b/src/map_object_move.c @@ -80,7 +80,7 @@ void MapObject_Move(MapObject *mapObj) sub_02063518(mapObj); if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_4)) { - sub_020658B4(mapObj); + MapObject_DoMovementAction(mapObj); } else if (MapObject_IsMovementPaused(mapObj) == FALSE && sub_02063478(mapObj) == 1 && sub_020673C0(mapObj) == 0) { sub_02062B14(mapObj); } @@ -830,18 +830,18 @@ int MapObject_GetDyFromDir(int param0) return sMapObjectDyDir[param0]; } -void sub_020641B4(MapObject *mapObj, int param1) +void MapObject_StepDir(MapObject *mapObj, int dir) { MapObject_SetXPrev(mapObj, MapObject_GetX(mapObj)); MapObject_SetYPrev(mapObj, MapObject_GetY(mapObj)); MapObject_SetZPrev(mapObj, MapObject_GetZ(mapObj)); - MapObject_AddX(mapObj, MapObject_GetDxFromDir(param1)); + MapObject_AddX(mapObj, MapObject_GetDxFromDir(dir)); MapObject_AddY(mapObj, 0); - MapObject_AddZ(mapObj, MapObject_GetDyFromDir(param1)); + MapObject_AddZ(mapObj, MapObject_GetDyFromDir(dir)); } -void sub_02064208(MapObject *mapObj) +void MapObject_UpdateCoords(MapObject *mapObj) { MapObject_SetXPrev(mapObj, MapObject_GetX(mapObj)); MapObject_SetYPrev(mapObj, MapObject_GetY(mapObj)); @@ -871,8 +871,7 @@ void MapObject_AddVecToPos(MapObject *mapObj, const VecFx32 *vec) MapObject_SetPos(mapObj, &pos); } -// TODO: This could really use a better name -void MapObject_StepDirection(MapObject *mapObj, int dir, fx32 param2) +void MapObject_MovePosInDir(MapObject *mapObj, int dir, fx32 distance) { VecFx32 pos; @@ -880,16 +879,16 @@ void MapObject_StepDirection(MapObject *mapObj, int dir, fx32 param2) switch (dir) { case DIR_NORTH: - pos.z -= param2; + pos.z -= distance; break; case DIR_SOUTH: - pos.z += param2; + pos.z += distance; break; case DIR_WEST: - pos.x -= param2; + pos.x -= distance; break; case DIR_EAST: - pos.x += param2; + pos.x += distance; break; } diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c index 1571a19731..5e354c6b73 100644 --- a/src/overlay005/ov5_021DFB54.c +++ b/src/overlay005/ov5_021DFB54.c @@ -1303,7 +1303,7 @@ static int ov5_021E0B64(UnkStruct_ov5_021F9B10 *param0) MapObject_SetX(param0->unk_3C, param0->unk_0C); MapObject_SetY(param0->unk_3C, param0->unk_10); MapObject_SetZ(param0->unk_3C, param0->unk_14); - sub_02064208(param0->unk_3C); + MapObject_UpdateCoords(param0->unk_3C); ov6_02248608(param0->unk_50); return 1; @@ -1433,7 +1433,7 @@ static int ov5_021E0D40(UnkStruct_ov5_021F9B10 *param0) MapObject_SetX(param0->unk_3C, param0->unk_0C); MapObject_SetY(param0->unk_3C, param0->unk_10); MapObject_SetZ(param0->unk_3C, param0->unk_14); - sub_02064208(param0->unk_3C); + MapObject_UpdateCoords(param0->unk_3C); ov6_02248608(param0->unk_50); diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index 5d17bdcc99..af7cb1334a 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -3365,7 +3365,7 @@ static int ov8_0224BCA8(UnkStruct_ov8_0224C098 *param0) sub_02064450(v0->unk_08.unk_00, v0->unk_08.unk_04, ¶m0->unk_20); MapObject_SetX(v0->unk_08.unk_08, v0->unk_08.unk_00); MapObject_SetZ(v0->unk_08.unk_08, v0->unk_08.unk_04); - sub_02064208(v0->unk_08.unk_08); + MapObject_UpdateCoords(v0->unk_08.unk_08); ov5_021F4714(v0->unk_08.unk_0C, FX32_ONE); Sound_StopEffect(1356, 0); Sound_PlayEffect(1367); diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c index 00225c0ea7..e2335bb253 100644 --- a/src/overlay009/ov9_02249960.c +++ b/src/overlay009/ov9_02249960.c @@ -2552,7 +2552,7 @@ static BOOL ov9_0224AC58(UnkStruct_ov9_0224AC58 *param0, MapObject *param1) if (param0->unk_04 <= 0) { *v4 = 0; - sub_02064208(param1); + MapObject_UpdateCoords(param1); sub_02062B68(param1); MapObject_TryFace(param1, v0->unk_22); sub_02062A0C(param1, 0x0); @@ -5216,11 +5216,11 @@ static int ov9_0224D4C4(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224D078 * MapObject_SetX(v5, param1->unk_0A); MapObject_SetY(v5, param1->unk_0C); MapObject_SetZ(v5, param1->unk_0E); - sub_02064208(v5); + MapObject_UpdateCoords(v5); if (param1->unk_68 != NULL) { MapObject_SetY(param1->unk_68, param1->unk_0C); - sub_02064208(param1->unk_68); + MapObject_UpdateCoords(param1->unk_68); } { @@ -5247,12 +5247,12 @@ static int ov9_0224D5E8(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224D078 * MapObject_SetX(v0, param1->unk_0A); MapObject_SetY(v0, param1->unk_0C); MapObject_SetZ(v0, param1->unk_0E); - sub_02064208(v0); + MapObject_UpdateCoords(v0); sub_0205ED48(param0->fieldSystem->playerAvatar, 1); if (param1->unk_68 != NULL) { MapObject_SetY(param1->unk_68, param1->unk_0C); - sub_02064208(param1->unk_68); + MapObject_UpdateCoords(param1->unk_68); } if (param1->unk_00 == 1) { @@ -6503,7 +6503,7 @@ static int ov9_0224E798(UnkStruct_ov9_02249B04 *param0, FieldTask *param1, u16 * MapObject_SetX(v1, v2); MapObject_SetY(v1, v3); MapObject_SetZ(v1, v4); - sub_02064208(v1); + MapObject_UpdateCoords(v1); { u32 v5; @@ -7493,7 +7493,7 @@ static BOOL ov9_0224F3BC(UnkStruct_ov9_0224F6EC *param0) MapObject_GetPosPtr(v1, &v0); v0.y -= FX32_ONE * 2; MapObject_SetPos(v1, &v0); - MapObject_StepDirection(v1, MapObject_GetMovingDir(v1), (FX32_ONE * 2)); + MapObject_MovePosInDir(v1, MapObject_GetMovingDir(v1), (FX32_ONE * 2)); } param0->unk_18++; @@ -7561,7 +7561,7 @@ static BOOL ov9_0224F3BC(UnkStruct_ov9_0224F6EC *param0) MapObject_SetX(v6, v8); MapObject_SetY(v6, v9); MapObject_SetZ(v6, v10); - sub_02064208(v6); + MapObject_UpdateCoords(v6); } } @@ -7658,7 +7658,7 @@ static BOOL ov9_0224F5D8(UnkStruct_ov9_0224F6EC *param0) MapObject_GetPosPtr(v1, &v0); v0.y -= FX32_ONE * 2; MapObject_SetPos(v1, &v0); - MapObject_StepDirection(v1, MapObject_GetMovingDir(v1), (FX32_ONE * 2)); + MapObject_MovePosInDir(v1, MapObject_GetMovingDir(v1), (FX32_ONE * 2)); } param0->unk_18++; @@ -8286,7 +8286,7 @@ static int ov9_0224FEDC(UnkStruct_ov9_02249B04 *param0, FieldTask *param1, u16 * MapObject_SetX(v2, v8); MapObject_SetY(v2, v9); MapObject_SetZ(v2, v10); - sub_02064208(v2); + MapObject_UpdateCoords(v2); MapObject_TryFace(v2, 2); MapObject_Turn(v2, 2); sub_02063088(v2, &v13); @@ -8604,7 +8604,7 @@ static int ov9_02250468(UnkStruct_ov9_02249B04 *param0, FieldTask *param1, u16 * MapObject_SetX(v2, v8); MapObject_SetY(v2, v9); MapObject_SetZ(v2, v10); - sub_02064208(v2); + MapObject_UpdateCoords(v2); MapObject_TryFace(v2, 3); MapObject_Turn(v2, 3); sub_02063088(v2, &v13); diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c index ec71a142d8..eb3e9d2159 100644 --- a/src/unk_0205F180.c +++ b/src/unk_0205F180.c @@ -433,7 +433,7 @@ void sub_0205F5E4(PlayerAvatar *playerAvatar, int param1) MapObject_TryFace(mapObj, param1); sub_02062A0C(mapObj, 0x0); - sub_02064208(mapObj); + MapObject_UpdateCoords(mapObj); sub_020656DC(mapObj); LocalMapObj_SetAnimationCode(mapObj, sub_02065838(param1, 0x0)); } diff --git a/src/unk_0206450C.c b/src/unk_0206450C.c index 88e5e8e72e..4e3ec0f2a5 100644 --- a/src/unk_0206450C.c +++ b/src/unk_0206450C.c @@ -242,7 +242,7 @@ void sub_020645C0(MapObject *mapObj) } } - sub_02064208(mapObj); + MapObject_UpdateCoords(mapObj); } void sub_02064624(MapObject *mapObj) @@ -455,7 +455,7 @@ static void sub_020648F4(MapObject *mapObj, int param1) sub_02062A0C(mapObj, 0x0); sub_02062D10(mapObj); - sub_02064208(mapObj); + MapObject_UpdateCoords(mapObj); } void sub_02064918(MapObject *mapObj) @@ -503,7 +503,7 @@ static void sub_0206496C(MapObject *mapObj, int param1) sub_02062A0C(mapObj, 0x0); sub_02062D10(mapObj); - sub_02064208(mapObj); + MapObject_UpdateCoords(mapObj); } void sub_02064990(MapObject *mapObj) diff --git a/src/unk_020655F4.c b/src/unk_020655F4.c index 9150663022..972192bd16 100644 --- a/src/unk_020655F4.c +++ b/src/unk_020655F4.c @@ -3,6 +3,7 @@ #include #include +#include "constants/map_object.h" #include "consts/movement.h" #include "struct_decls/struct_02061AB4_decl.h" @@ -21,11 +22,9 @@ #include "unk_02005474.h" #include "unk_02069BE0.h" #include "unk_020711EC.h" +#include "unk_020EDBAC.h" -#include "constdata/const_020EE31C.h" -#include "constdata/const_020EE4B8.h" - -typedef struct { +typedef struct UnkStruct_020EEE54 { int unk_00; int unk_04; int unk_08; @@ -33,56 +32,56 @@ typedef struct { const MapObjectAnimCmd *unk_10; } UnkStruct_020EEE54; -typedef struct { - u16 unk_00; - s16 unk_02; - int unk_04; - fx32 unk_08; -} UnkStruct_02065980; +typedef struct WalkMovementData { + u16 unused; + s16 duration; + int dir; + fx32 distance; +} WalkMovementData; -typedef struct { - u16 unk_00; - s16 unk_02; -} UnkStruct_02065C64; +typedef struct WalkOnSpotMovementData { + u16 unused; + s16 duration; +} WalkOnSpotMovementData; -typedef struct { - fx32 unk_00; +typedef struct JumpMovementData { + fx32 distance; fx32 unk_04; u16 unk_08; u16 unk_0A; - s8 unk_0C; - s8 unk_0D; - u8 unk_0E; + s8 dir; + s8 duration; + u8 unused; s8 unk_0F; -} UnkStruct_02065E0C; +} JumpMovementData; -typedef struct { - int unk_00; -} UnkStruct_020662AC; +typedef struct DelayMovementData { + int delay; +} DelayMovementData; -typedef struct { - fx32 unk_00; - fx32 unk_04; +typedef struct UnkStruct_02066338 { + fx32 y; + fx32 dy; } UnkStruct_02066338; -typedef struct { +typedef struct UnkStruct_020664A0 { int unk_00; UnkStruct_ov101_021D5D90 *unk_04; } UnkStruct_020664A0; -typedef struct { - s16 unk_00; - u16 unk_02; - s16 unk_04; - s16 unk_06; +typedef struct UnkStruct_02066520 { + s16 dir; + u16 unused; + s16 duration; + s16 timer; } UnkStruct_02066520; -typedef struct { - int unk_00; +typedef struct UnkStruct_02066824 { + int duration; VecFx32 unk_04; } UnkStruct_02066824; -typedef struct { +typedef struct UnkStruct_02066F88 { u8 unk_00; u8 unk_01; u8 unk_02; @@ -93,28 +92,20 @@ typedef struct { u16 unk_0E; } UnkStruct_02066F88; -typedef struct { +typedef struct UnkStruct_020666C8 { int unk_00; } UnkStruct_020666C8; -typedef struct { +typedef struct UnkStruct_02066710 { u32 unk_00; } UnkStruct_02066710; -typedef struct { +typedef struct UnkStruct_020667CC { u32 unk_00; } UnkStruct_020667CC; static void sub_02065788(SysTask *param0, void *param1); -static int sub_02065910(MapObject *param0, int param1, int param2); -static int sub_02065924(MapObject *param0); -static void sub_02065930(MapObject *param0, int param1); -static void sub_02065980(MapObject *param0, int param1, fx32 param2, s16 param3, u16 param4); -static int sub_020659C8(MapObject *param0); -static void sub_02065C64(MapObject *param0, int param1, s16 param2, u16 param3); -static int sub_02065C98(MapObject *param0); -static void sub_020664A0(MapObject *param0, int param1, int param2); -static int sub_020664C8(MapObject *param0); +static int MapObject_DoMovementActionStep(MapObject *mapObj, int movementAction, int movementStep); int (*const Unk_020EEE54[])(UnkStruct_020EEE54 *); const fx32 *Unk_02100B84[]; @@ -144,7 +135,7 @@ void LocalMapObj_SetAnimationCode(MapObject *mapObj, int param1) GF_ASSERT(param1 < MAX_MOVEMENT_ACTION); MapObject_SetMovementAction(mapObj, param1); - sub_02062BC0(mapObj, 0); + MapObject_SetMovementStep(mapObj, 0); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_4); MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_5); } @@ -152,7 +143,7 @@ void LocalMapObj_SetAnimationCode(MapObject *mapObj, int param1) void sub_02065668(MapObject *mapObj, int param1) { MapObject_SetMovementAction(mapObj, param1); - sub_02062BC0(mapObj, 0); + MapObject_SetMovementStep(mapObj, 0); MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_5); } @@ -188,8 +179,8 @@ void sub_020656DC(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_4); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_5); - MapObject_SetMovementAction(mapObj, 0xff); - sub_02062BC0(mapObj, 0); + MapObject_SetMovementAction(mapObj, MOVEMENT_ACTION_NONE); + MapObject_SetMovementStep(mapObj, 0); } SysTask *MapObject_StartAnimation(MapObject *mapObj, const MapObjectAnimCmd *param1) @@ -197,18 +188,14 @@ SysTask *MapObject_StartAnimation(MapObject *mapObj, const MapObjectAnimCmd *par SysTask *v0; UnkStruct_020EEE54 *v1; - v1 = Heap_AllocFromHeapAtEnd(4, (sizeof(UnkStruct_020EEE54))); + v1 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_020EEE54)); GF_ASSERT(v1 != NULL); - memset(v1, 0, (sizeof(UnkStruct_020EEE54))); - - { - int v2; + memset(v1, 0, sizeof(UnkStruct_020EEE54)); - v2 = sub_02062858(MapObject_MapObjectManager(mapObj)) - 1; - v0 = SysTask_Start(sub_02065788, v1, v2); - GF_ASSERT(v0 != NULL); - } + int v2 = sub_02062858(MapObject_MapObjectManager(mapObj)) - 1; + v0 = SysTask_Start(sub_02065788, v1, v2); + GF_ASSERT(v0 != NULL); v1->unk_0C = mapObj; v1->unk_10 = param1; @@ -384,39 +371,39 @@ int sub_0206587C(int param0) return -1; } -void sub_020658B4(MapObject *mapObj) +void MapObject_DoMovementAction(MapObject *mapObj) { - int v0, v1; + int movementAction, movementStep; do { - v0 = MapObject_GetMovementAction(mapObj); + movementAction = MapObject_GetMovementAction(mapObj); - if (v0 == 0xff) { + if (movementAction == MOVEMENT_ACTION_NONE) { break; } - v1 = sub_02062BD8(mapObj); - } while (sub_02065910(mapObj, v0, v1)); + movementStep = MapObject_GetMovementStep(mapObj); + } while (MapObject_DoMovementActionStep(mapObj, movementAction, movementStep)); } int sub_020658DC(MapObject *mapObj) { - sub_020658B4(mapObj); + MapObject_DoMovementAction(mapObj); if (!MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_5)) { return 0; } MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_5); - MapObject_SetMovementAction(mapObj, 0xff); - sub_02062BC0(mapObj, 0); + MapObject_SetMovementAction(mapObj, MOVEMENT_ACTION_NONE); + MapObject_SetMovementStep(mapObj, 0); return 1; } -static int sub_02065910(MapObject *mapObj, int param1, int param2) +static int MapObject_DoMovementActionStep(MapObject *mapObj, int movementAction, int movementStep) { - return Unk_020EE4B8[param1][param2](mapObj); + return gMovementActionFuncs[movementAction][movementStep](mapObj); } static int sub_02065924(MapObject *mapObj) @@ -425,498 +412,474 @@ static int sub_02065924(MapObject *mapObj) return 0; } -static void sub_02065930(MapObject *mapObj, int param1) +static void MovementAction_InitFace(MapObject *mapObj, int dir) { - MapObject_TryFace(mapObj, param1); + MapObject_TryFace(mapObj, dir); sub_02062A0C(mapObj, 0x0); - sub_02064208(mapObj); - sub_02062BC8(mapObj); + MapObject_UpdateCoords(mapObj); + MapObject_AdvanceMovementStep(mapObj); } -static int sub_02065950(MapObject *mapObj) +static int MovementAction_FaceNorth_Step0(MapObject *mapObj) { - sub_02065930(mapObj, 0); + MovementAction_InitFace(mapObj, DIR_NORTH); return 1; } -static int sub_0206595C(MapObject *mapObj) +static int MovementAction_FaceSouth_Step0(MapObject *mapObj) { - sub_02065930(mapObj, 1); + MovementAction_InitFace(mapObj, DIR_SOUTH); return 1; } -static int sub_02065968(MapObject *mapObj) +static int MovementAction_FaceWest_Step0(MapObject *mapObj) { - sub_02065930(mapObj, 2); + MovementAction_InitFace(mapObj, DIR_WEST); return 1; } -static int sub_02065974(MapObject *mapObj) +static int MovementAction_FaceEast_Step0(MapObject *mapObj) { - sub_02065930(mapObj, 3); + MovementAction_InitFace(mapObj, DIR_EAST); return 1; } -static void sub_02065980(MapObject *mapObj, int param1, fx32 param2, s16 param3, u16 param4) +static void MovementAction_InitWalk(MapObject *mapObj, int dir, fx32 distance, s16 duration, u16 param4) { - UnkStruct_02065980 *v0; + WalkMovementData *data = MapObject_InitMovementData(mapObj, sizeof(WalkMovementData)); - v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02065980))); + data->unused = param4; + data->duration = duration; + data->dir = dir; + data->distance = distance; - v0->unk_00 = param4; - v0->unk_02 = param3; - v0->unk_04 = param1; - v0->unk_08 = param2; - - sub_020641B4(mapObj, param1); - MapObject_TryFaceAndTurn(mapObj, param1); + MapObject_StepDir(mapObj, dir); + MapObject_TryFaceAndTurn(mapObj, dir); sub_02062A0C(mapObj, param4); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); } -static int sub_020659C8(MapObject *mapObj) +static int MovementAction_Walk_Step1(MapObject *mapObj) { - UnkStruct_02065980 *v0; - - v0 = sub_02062AC8(mapObj); + WalkMovementData *data = MapObject_GetMovementData(mapObj); - MapObject_StepDirection(mapObj, v0->unk_04, v0->unk_08); + MapObject_MovePosInDir(mapObj, data->dir, data->distance); sub_020642F8(mapObj); - v0->unk_02--; - - if (v0->unk_02 > 0) { + if (--(data->duration) > 0) { return 0; } MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_5); - sub_02064208(mapObj); + MapObject_UpdateCoords(mapObj); sub_02062B68(mapObj); sub_02062A0C(mapObj, 0x0); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } -static int sub_02065A1C(MapObject *mapObj) +static int MovementAction_WalkSlowerNorth_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 32), 32, 0x1); + MovementAction_InitWalk(mapObj, DIR_NORTH, ((16 * FX32_ONE) / 32), 32, 0x1); return 1; } -static int sub_02065A30(MapObject *mapObj) +static int MovementAction_WalkSlowerSouth_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 32), 32, 0x1); + MovementAction_InitWalk(mapObj, DIR_SOUTH, ((16 * FX32_ONE) / 32), 32, 0x1); return 1; } -static int sub_02065A44(MapObject *mapObj) +static int MovementAction_WalkSlowerWest_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 32), 32, 0x1); + MovementAction_InitWalk(mapObj, DIR_WEST, ((16 * FX32_ONE) / 32), 32, 0x1); return 1; } -static int sub_02065A58(MapObject *mapObj) +static int MovementAction_WalkSlowerEast_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 32), 32, 0x1); + MovementAction_InitWalk(mapObj, DIR_EAST, ((16 * FX32_ONE) / 32), 32, 0x1); return 1; } -static int sub_02065A6C(MapObject *mapObj) +static int MovementAction_WalkSlowNorth_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 16), 16, 0x2); + MovementAction_InitWalk(mapObj, DIR_NORTH, ((16 * FX32_ONE) / 16), 16, 0x2); return 1; } -static int sub_02065A80(MapObject *mapObj) +static int MovementAction_WalkSlowSouth_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 16), 16, 0x2); + MovementAction_InitWalk(mapObj, DIR_SOUTH, ((16 * FX32_ONE) / 16), 16, 0x2); return 1; } -static int sub_02065A94(MapObject *mapObj) +static int MovementAction_WalkSlowWest_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 16), 16, 0x2); + MovementAction_InitWalk(mapObj, DIR_WEST, ((16 * FX32_ONE) / 16), 16, 0x2); return 1; } -static int sub_02065AA8(MapObject *mapObj) +static int MovementAction_WalkSlowEast_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 16), 16, 0x2); + MovementAction_InitWalk(mapObj, DIR_EAST, ((16 * FX32_ONE) / 16), 16, 0x2); return 1; } -static int sub_02065ABC(MapObject *mapObj) +static int MovementAction_WalkNormalNorth_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 8), 8, 0x3); + MovementAction_InitWalk(mapObj, DIR_NORTH, ((16 * FX32_ONE) / 8), 8, 0x3); return 1; } -static int sub_02065AD4(MapObject *mapObj) +static int MovementAction_WalkNormalSouth_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 8), 8, 0x3); + MovementAction_InitWalk(mapObj, DIR_SOUTH, ((16 * FX32_ONE) / 8), 8, 0x3); return 1; } -static int sub_02065AE8(MapObject *mapObj) +static int MovementAction_WalkNormalWest_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 8), 8, 0x3); + MovementAction_InitWalk(mapObj, DIR_WEST, ((16 * FX32_ONE) / 8), 8, 0x3); return 1; } -static int sub_02065AFC(MapObject *mapObj) +static int MovementAction_WalkNormalEast_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 8), 8, 0x3); + MovementAction_InitWalk(mapObj, DIR_EAST, ((16 * FX32_ONE) / 8), 8, 0x3); return 1; } -static int sub_02065B10(MapObject *mapObj) +static int MovementAction_WalkFastNorth_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 4), 4, 0x4); + MovementAction_InitWalk(mapObj, DIR_NORTH, ((16 * FX32_ONE) / 4), 4, 0x4); return 1; } -static int sub_02065B24(MapObject *mapObj) +static int MovementAction_WalkFastSouth_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 4), 4, 0x4); + MovementAction_InitWalk(mapObj, DIR_SOUTH, ((16 * FX32_ONE) / 4), 4, 0x4); return 1; } -static int sub_02065B38(MapObject *mapObj) +static int MovementAction_WalkFastWest_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 4), 4, 0x4); + MovementAction_InitWalk(mapObj, DIR_WEST, ((16 * FX32_ONE) / 4), 4, 0x4); return 1; } -static int sub_02065B4C(MapObject *mapObj) +static int MovementAction_WalkFastEast_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 4), 4, 0x4); + MovementAction_InitWalk(mapObj, DIR_EAST, ((16 * FX32_ONE) / 4), 4, 0x4); return 1; } -static int sub_02065B60(MapObject *mapObj) +static int MovementAction_WalkFasterNorth_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 2), 2, 0x5); + MovementAction_InitWalk(mapObj, DIR_NORTH, ((16 * FX32_ONE) / 2), 2, 0x5); return 1; } -static int sub_02065B78(MapObject *mapObj) +static int MovementAction_WalkFasterSouth_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 2), 2, 0x5); + MovementAction_InitWalk(mapObj, DIR_SOUTH, ((16 * FX32_ONE) / 2), 2, 0x5); return 1; } -static int sub_02065B8C(MapObject *mapObj) +static int MovementAction_WalkFasterWest_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 2), 2, 0x5); + MovementAction_InitWalk(mapObj, DIR_WEST, ((16 * FX32_ONE) / 2), 2, 0x5); return 1; } -static int sub_02065BA0(MapObject *mapObj) +static int MovementAction_WalkFasterEast_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 2), 2, 0x5); + MovementAction_InitWalk(mapObj, DIR_EAST, ((16 * FX32_ONE) / 2), 2, 0x5); return 1; } -static int sub_02065BB8(MapObject *mapObj) +static int MovementAction_WalkFastestNorth_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 1), 1, 0x0); + MovementAction_InitWalk(mapObj, DIR_NORTH, ((16 * FX32_ONE) / 1), 1, 0x0); return 1; } -static int sub_02065BCC(MapObject *mapObj) +static int MovementAction_WalkFastestSouth_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 1), 1, 0x0); + MovementAction_InitWalk(mapObj, DIR_SOUTH, ((16 * FX32_ONE) / 1), 1, 0x0); return 1; } -static int sub_02065BE0(MapObject *mapObj) +static int MovementAction_WalkFastestWest_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 1), 1, 0x0); + MovementAction_InitWalk(mapObj, DIR_WEST, ((16 * FX32_ONE) / 1), 1, 0x0); return 1; } -static int sub_02065BF4(MapObject *mapObj) +static int MovementAction_WalkFastestEast_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 1), 1, 0x0); + MovementAction_InitWalk(mapObj, DIR_EAST, ((16 * FX32_ONE) / 1), 1, 0x0); return 1; } -static int sub_02065C0C(MapObject *mapObj) +static int MovementAction_RunNorth_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 4), 4, (0x8 + 1)); + MovementAction_InitWalk(mapObj, DIR_NORTH, ((16 * FX32_ONE) / 4), 4, (0x8 + 1)); return 1; } -static int sub_02065C24(MapObject *mapObj) +static int MovementAction_RunSouth_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 4), 4, (0x8 + 1)); + MovementAction_InitWalk(mapObj, DIR_SOUTH, ((16 * FX32_ONE) / 4), 4, (0x8 + 1)); return 1; } -static int sub_02065C38(MapObject *mapObj) +static int MovementAction_RunWest_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 4), 4, (0x8 + 1)); + MovementAction_InitWalk(mapObj, DIR_WEST, ((16 * FX32_ONE) / 4), 4, (0x8 + 1)); return 1; } -static int sub_02065C4C(MapObject *mapObj) +static int MovementAction_RunEast_Step0(MapObject *mapObj) { - sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 4), 4, (0x8 + 1)); + MovementAction_InitWalk(mapObj, DIR_EAST, ((16 * FX32_ONE) / 4), 4, (0x8 + 1)); return 1; } -static void sub_02065C64(MapObject *mapObj, int param1, s16 param2, u16 param3) +static void MovementAction_InitWalkOnSpot(MapObject *mapObj, int dir, s16 duration, u16 param3) { - UnkStruct_02065C64 *v0; - - v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02065980))); + // the extra 8 bytes are needed only for matching + WalkOnSpotMovementData *data = MapObject_InitMovementData(mapObj, sizeof(WalkOnSpotMovementData) + 8); - v0->unk_00 = param3; - v0->unk_02 = param2 + 1; + data->unused = param3; + data->duration = duration + 1; - MapObject_TryFace(mapObj, param1); + MapObject_TryFace(mapObj, dir); sub_02062A0C(mapObj, param3); - sub_02064208(mapObj); - sub_02062BC8(mapObj); + MapObject_UpdateCoords(mapObj); + MapObject_AdvanceMovementStep(mapObj); } -static int sub_02065C98(MapObject *mapObj) +static int MovementAction_WalkOnSpot_Step1(MapObject *mapObj) { - UnkStruct_02065C64 *v0; - - v0 = sub_02062AC8(mapObj); - v0->unk_02--; + WalkOnSpotMovementData *data = MapObject_GetMovementData(mapObj); - if (v0->unk_02 > 0) { + if (--(data->duration) > 0) { return 0; } MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_5); sub_02062A0C(mapObj, 0x0); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } -static int sub_02065CCC(MapObject *mapObj) +static int MovementAction_WalkOnSpotSlowerNorth_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 0, 32, 0x1); + MovementAction_InitWalkOnSpot(mapObj, DIR_NORTH, 32, 0x1); return 1; } -static int sub_02065CDC(MapObject *mapObj) +static int MovementAction_WalkOnSpotSlowerSouth_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 1, 32, 0x1); + MovementAction_InitWalkOnSpot(mapObj, DIR_SOUTH, 32, 0x1); return 1; } -static int sub_02065CEC(MapObject *mapObj) +static int MovementAction_WalkOnSpotSlowerWest_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 2, 32, 0x1); + MovementAction_InitWalkOnSpot(mapObj, DIR_WEST, 32, 0x1); return 1; } -static int sub_02065CFC(MapObject *mapObj) +static int MovementAction_WalkOnSpotSlowerEast_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 3, 32, 0x1); + MovementAction_InitWalkOnSpot(mapObj, DIR_EAST, 32, 0x1); return 1; } -static int sub_02065D0C(MapObject *mapObj) +static int MovementAction_WalkOnSpotSlowNorth_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 0, 16, 0x2); + MovementAction_InitWalkOnSpot(mapObj, DIR_NORTH, 16, 0x2); return 1; } -static int sub_02065D1C(MapObject *mapObj) +static int MovementAction_WalkOnSpotSlowSouth_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 1, 16, 0x2); + MovementAction_InitWalkOnSpot(mapObj, DIR_SOUTH, 16, 0x2); return 1; } -static int sub_02065D2C(MapObject *mapObj) +static int MovementAction_WalkOnSpotSlowWest_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 2, 16, 0x2); + MovementAction_InitWalkOnSpot(mapObj, DIR_WEST, 16, 0x2); return 1; } -static int sub_02065D3C(MapObject *mapObj) +static int MovementAction_WalkOnSpotSlowEast_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 3, 16, 0x2); + MovementAction_InitWalkOnSpot(mapObj, DIR_EAST, 16, 0x2); return 1; } -static int sub_02065D4C(MapObject *mapObj) +static int MovementAction_WalkOnSpotNormalNorth_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 0, 8, 0x3); + MovementAction_InitWalkOnSpot(mapObj, DIR_NORTH, 8, 0x3); return 1; } -static int sub_02065D5C(MapObject *mapObj) +static int MovementAction_WalkOnSpotNormalSouth_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 1, 8, 0x3); + MovementAction_InitWalkOnSpot(mapObj, DIR_SOUTH, 8, 0x3); return 1; } -static int sub_02065D6C(MapObject *mapObj) +static int MovementAction_WalkOnSpotNormalWest_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 2, 8, 0x3); + MovementAction_InitWalkOnSpot(mapObj, DIR_WEST, 8, 0x3); return 1; } -static int sub_02065D7C(MapObject *mapObj) +static int MovementAction_WalkOnSpotNormalEast_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 3, 8, 0x3); + MovementAction_InitWalkOnSpot(mapObj, DIR_EAST, 8, 0x3); return 1; } -static int sub_02065D8C(MapObject *mapObj) +static int MovementAction_WalkOnSpotFastNorth_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 0, 4, 0x4); + MovementAction_InitWalkOnSpot(mapObj, DIR_NORTH, 4, 0x4); return 1; } -static int sub_02065D9C(MapObject *mapObj) +static int MovementAction_WalkOnSpotFastSouth_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 1, 4, 0x4); + MovementAction_InitWalkOnSpot(mapObj, DIR_SOUTH, 4, 0x4); return 1; } -static int sub_02065DAC(MapObject *mapObj) +static int MovementAction_WalkOnSpotFastWest_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 2, 4, 0x4); + MovementAction_InitWalkOnSpot(mapObj, DIR_WEST, 4, 0x4); return 1; } -static int sub_02065DBC(MapObject *mapObj) +static int MovementAction_WalkOnSpotFastEast_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 3, 4, 0x4); + MovementAction_InitWalkOnSpot(mapObj, DIR_EAST, 4, 0x4); return 1; } -static int sub_02065DCC(MapObject *mapObj) +static int MovementAction_WalkOnSpotFasterNorth_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 0, 2, 0x5); + MovementAction_InitWalkOnSpot(mapObj, DIR_NORTH, 2, 0x5); return 1; } -static int sub_02065DDC(MapObject *mapObj) +static int MovementAction_WalkOnSpotFasterSouth_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 1, 2, 0x5); + MovementAction_InitWalkOnSpot(mapObj, DIR_SOUTH, 2, 0x5); return 1; } -static int sub_02065DEC(MapObject *mapObj) +static int MovementAction_WalkOnSpotFasterWest_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 2, 2, 0x5); + MovementAction_InitWalkOnSpot(mapObj, DIR_WEST, 2, 0x5); return 1; } -static int sub_02065DFC(MapObject *mapObj) +static int MovementAction_WalkOnSpotFasterEast_Step0(MapObject *mapObj) { - sub_02065C64(mapObj, 3, 2, 0x5); + MovementAction_InitWalkOnSpot(mapObj, DIR_EAST, 2, 0x5); return 1; } -static void sub_02065E0C(MapObject *mapObj, int param1, fx32 param2, s16 param3, u16 param4, s16 param5, u16 param6, u32 param7) +static void MovementAction_InitJumpCustomSound(MapObject *mapObj, int dir, fx32 distance, s16 duration, u16 param4, s16 param5, u16 param6, u32 param7) { - UnkStruct_02065E0C *v0; + JumpMovementData *data = MapObject_InitMovementData(mapObj, sizeof(JumpMovementData)); - v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02065E0C))); + data->dir = dir; + data->distance = distance; + data->duration = duration; + data->unused = param4; + data->unk_0F = param5; + data->unk_08 = param6; - v0->unk_0C = param1; - v0->unk_00 = param2; - v0->unk_0D = param3; - v0->unk_0E = param4; - v0->unk_0F = param5; - v0->unk_08 = param6; - - if (param2 == 0) { - sub_02064208(mapObj); + if (distance == 0) { + MapObject_UpdateCoords(mapObj); } else { - sub_020641B4(mapObj, param1); + MapObject_StepDir(mapObj, dir); } MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_16); - MapObject_TryFaceAndTurn(mapObj, param1); + MapObject_TryFaceAndTurn(mapObj, dir); sub_02062A0C(mapObj, param4); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); if (param7) { Sound_PlayEffect(param7); } } -static void sub_02065E7C(MapObject *mapObj, int param1, fx32 param2, s16 param3, u16 param4, s16 param5, u16 param6) +static void MovementAction_InitJump(MapObject *mapObj, int dir, fx32 distance, s16 duration, u16 param4, s16 param5, u16 param6) { - sub_02065E0C(mapObj, param1, param2, param3, param4, param5, param6, 1547); + MovementAction_InitJumpCustomSound(mapObj, dir, distance, duration, param4, param5, param6, 1547); } -static int sub_02065EA0(MapObject *mapObj) +static int MovementAction_Jump_Step1(MapObject *mapObj) { - UnkStruct_02065E0C *v0; - - v0 = sub_02062AC8(mapObj); + JumpMovementData *data = MapObject_GetMovementData(mapObj); - if (v0->unk_00) { - MapObject_StepDirection(mapObj, v0->unk_0C, v0->unk_00); + if (data->distance) { + MapObject_MovePosInDir(mapObj, data->dir, data->distance); sub_020642F8(mapObj); - if (v0->unk_04 >= (16 * FX32_ONE)) { - v0->unk_04 = 0; - sub_020641B4(mapObj, v0->unk_0C); + if (data->unk_04 >= (16 * FX32_ONE)) { + data->unk_04 = 0; + MapObject_StepDir(mapObj, data->dir); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT); } - { - fx32 v1 = v0->unk_00; + fx32 distance = data->distance; - if (v1 < 0) { - v1 = -v1; - } - - v0->unk_04 += v1; + if (distance < 0) { + distance = -distance; } - } - { - v0->unk_0A += v0->unk_08; + data->unk_04 += distance; + } - if (v0->unk_0A > (0x100 * (16 - 1))) { - v0->unk_0A = (0x100 * (16 - 1)); - } + data->unk_0A += data->unk_08; - { - VecFx32 v2; - u16 v3 = (v0->unk_0A) / 0x100; - const fx32 *v4 = Unk_02100B84[v0->unk_0F]; + if (data->unk_0A > (0x100 * (16 - 1))) { + data->unk_0A = (0x100 * (16 - 1)); + } - v2.x = 0; - v2.y = v4[v3]; - v2.z = 0; + VecFx32 v2; + u16 v3 = (data->unk_0A) / 0x100; + const fx32 *v4 = Unk_02100B84[data->unk_0F]; - sub_02063088(mapObj, &v2); - } - } + v2.x = 0; + v2.y = v4[v3]; + v2.z = 0; - v0->unk_0D--; + sub_02063088(mapObj, &v2); - if (v0->unk_0D > 0) { + if (--(data->duration) > 0) { return 0; } - { - VecFx32 v5 = { 0, 0, 0 }; - sub_02063088(mapObj, &v5); - } + VecFx32 v5 = { 0, 0, 0 }; + sub_02063088(mapObj, &v5); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_17 | MAP_OBJ_STATUS_5); - sub_02064208(mapObj); + MapObject_UpdateCoords(mapObj); sub_02062B68(mapObj); sub_02062A0C(mapObj, 0x0); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); Sound_PlayEffect(1607); return 1; @@ -924,323 +887,304 @@ static int sub_02065EA0(MapObject *mapObj) static int sub_02065F88(MapObject *mapObj) { - sub_02065E7C(mapObj, 0, 0, 16, 0x2, 0, (0x100 * 1)); + MovementAction_InitJump(mapObj, DIR_NORTH, 0, 16, 0x2, 0, (0x100 * 1)); return 1; } static int sub_02065FA8(MapObject *mapObj) { - sub_02065E7C(mapObj, 1, 0, 16, 0x2, 0, (0x100 * 1)); + MovementAction_InitJump(mapObj, DIR_SOUTH, 0, 16, 0x2, 0, (0x100 * 1)); return 1; } static int sub_02065FC8(MapObject *mapObj) { - sub_02065E7C(mapObj, 2, 0, 16, 0x2, 0, (0x100 * 1)); + MovementAction_InitJump(mapObj, DIR_WEST, 0, 16, 0x2, 0, (0x100 * 1)); return 1; } static int sub_02065FE8(MapObject *mapObj) { - sub_02065E7C(mapObj, 3, 0, 16, 0x2, 0, (0x100 * 1)); + MovementAction_InitJump(mapObj, DIR_EAST, 0, 16, 0x2, 0, (0x100 * 1)); return 1; } static int sub_02066008(MapObject *mapObj) { - sub_02065E7C(mapObj, 0, 0, 8, 0x3, 0, (0x100 * 2)); + MovementAction_InitJump(mapObj, DIR_NORTH, 0, 8, 0x3, 0, (0x100 * 2)); return 1; } static int sub_02066028(MapObject *mapObj) { - sub_02065E7C(mapObj, 1, 0, 8, 0x3, 0, (0x100 * 2)); + MovementAction_InitJump(mapObj, DIR_SOUTH, 0, 8, 0x3, 0, (0x100 * 2)); return 1; } static int sub_02066048(MapObject *mapObj) { - sub_02065E7C(mapObj, 2, 0, 8, 0x3, 0, (0x100 * 2)); + MovementAction_InitJump(mapObj, DIR_WEST, 0, 8, 0x3, 0, (0x100 * 2)); return 1; } static int sub_02066068(MapObject *mapObj) { - sub_02065E7C(mapObj, 3, 0, 8, 0x3, 0, (0x100 * 2)); + MovementAction_InitJump(mapObj, DIR_EAST, 0, 8, 0x3, 0, (0x100 * 2)); return 1; } static int sub_02066088(MapObject *mapObj) { - sub_02065E7C(mapObj, 0, ((16 * FX32_ONE) / 8), 8, 0x3, 0, (0x100 * 2)); + MovementAction_InitJump(mapObj, DIR_NORTH, ((16 * FX32_ONE) / 8), 8, 0x3, 0, (0x100 * 2)); return 1; } static int sub_020660A8(MapObject *mapObj) { - sub_02065E7C(mapObj, 1, ((16 * FX32_ONE) / 8), 8, 0x3, 0, (0x100 * 2)); + MovementAction_InitJump(mapObj, DIR_SOUTH, ((16 * FX32_ONE) / 8), 8, 0x3, 0, (0x100 * 2)); return 1; } static int sub_020660CC(MapObject *mapObj) { - sub_02065E7C(mapObj, 2, ((16 * FX32_ONE) / 8), 8, 0x3, 0, (0x100 * 2)); + MovementAction_InitJump(mapObj, DIR_WEST, ((16 * FX32_ONE) / 8), 8, 0x3, 0, (0x100 * 2)); return 1; } static int sub_020660F0(MapObject *mapObj) { - sub_02065E7C(mapObj, 3, ((16 * FX32_ONE) / 8), 8, 0x3, 0, (0x100 * 2)); + MovementAction_InitJump(mapObj, DIR_EAST, ((16 * FX32_ONE) / 8), 8, 0x3, 0, (0x100 * 2)); return 1; } static int sub_02066110(MapObject *mapObj) { - sub_02065E7C(mapObj, 0, ((16 * FX32_ONE) / 8), 8 * 2, 0x3, 0, (0x100 * 1)); + MovementAction_InitJump(mapObj, DIR_NORTH, ((16 * FX32_ONE) / 8), 8 * 2, 0x3, 0, (0x100 * 1)); return 1; } static int sub_02066130(MapObject *mapObj) { - sub_02065E7C(mapObj, 1, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1)); + MovementAction_InitJump(mapObj, DIR_SOUTH, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1)); return 1; } static int sub_02066150(MapObject *mapObj) { - sub_02065E7C(mapObj, 2, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1)); + MovementAction_InitJump(mapObj, DIR_WEST, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1)); return 1; } static int sub_02066170(MapObject *mapObj) { - sub_02065E7C(mapObj, 3, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1)); + MovementAction_InitJump(mapObj, DIR_EAST, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1)); return 1; } static int sub_02066194(MapObject *mapObj) { - sub_02065E7C(mapObj, 2, ((16 * FX32_ONE) / 16), 16, (0x8 + 1), 0, ((0x100 * (16 - 1)) / 16)); + MovementAction_InitJump(mapObj, DIR_WEST, ((16 * FX32_ONE) / 16), 16, (0x8 + 1), 0, ((0x100 * (16 - 1)) / 16)); return 1; } static int sub_020661B4(MapObject *mapObj) { - sub_02065E7C(mapObj, 3, ((16 * FX32_ONE) / 16), 16, (0x8 + 1), 0, ((0x100 * (16 - 1)) / 16)); + MovementAction_InitJump(mapObj, DIR_EAST, ((16 * FX32_ONE) / 16), 16, (0x8 + 1), 0, ((0x100 * (16 - 1)) / 16)); return 1; } static int sub_020661D8(MapObject *mapObj) { - sub_02065E7C(mapObj, 2, ((16 * FX32_ONE) / 4), 12, ((0x8 + 1) + 1), 0, ((0x100 * (16 - 1)) / 12)); + MovementAction_InitJump(mapObj, DIR_WEST, ((16 * FX32_ONE) / 4), 12, ((0x8 + 1) + 1), 0, ((0x100 * (16 - 1)) / 12)); return 1; } static int sub_020661F8(MapObject *mapObj) { - sub_02065E7C(mapObj, 3, ((16 * FX32_ONE) / 4), 12, ((0x8 + 1) + 1), 0, ((0x100 * (16 - 1)) / 12)); + MovementAction_InitJump(mapObj, DIR_EAST, ((16 * FX32_ONE) / 4), 12, ((0x8 + 1) + 1), 0, ((0x100 * (16 - 1)) / 12)); return 1; } static int sub_0206621C(MapObject *mapObj) { - sub_02065E0C(mapObj, 0, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, ((0x100 * (16 - 1)) / 24), 0); + MovementAction_InitJumpCustomSound(mapObj, DIR_NORTH, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, ((0x100 * (16 - 1)) / 24), 0); return 1; } static int sub_02066240(MapObject *mapObj) { - sub_02065E0C(mapObj, 1, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, ((0x100 * (16 - 1)) / 24), 0); + MovementAction_InitJumpCustomSound(mapObj, DIR_SOUTH, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, ((0x100 * (16 - 1)) / 24), 0); return 1; } static int sub_02066264(MapObject *mapObj) { - sub_02065E0C(mapObj, 2, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, ((0x100 * (16 - 1)) / 24), 0); + MovementAction_InitJumpCustomSound(mapObj, DIR_WEST, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, ((0x100 * (16 - 1)) / 24), 0); return 1; } static int sub_02066288(MapObject *mapObj) { - sub_02065E0C(mapObj, 3, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, ((0x100 * (16 - 1)) / 24), 0); + MovementAction_InitJumpCustomSound(mapObj, DIR_EAST, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, ((0x100 * (16 - 1)) / 24), 0); return 1; } -static void sub_020662AC(MapObject *mapObj, int param1) +static void MovementAction_InitDelay(MapObject *mapObj, int delay) { - UnkStruct_020662AC *v0; - - v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_020662AC))); - v0->unk_00 = param1; + DelayMovementData *data = MapObject_InitMovementData(mapObj, sizeof(DelayMovementData)); + data->delay = delay; - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); } -static int sub_020662C4(MapObject *mapObj) +static int MovementAction_Delay_Step1(MapObject *mapObj) { - UnkStruct_020662AC *v0; - - v0 = sub_02062AC8(mapObj); + DelayMovementData *data = MapObject_GetMovementData(mapObj); - if (v0->unk_00) { - v0->unk_00--; + if (data->delay) { + data->delay--; return 0; } - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } -static int sub_020662E4(MapObject *mapObj) +static int MovementAction_Delay1_Step0(MapObject *mapObj) { - sub_020662AC(mapObj, 1); + MovementAction_InitDelay(mapObj, 1); return 1; } -static int sub_020662F0(MapObject *mapObj) +static int MovementAction_Delay2_Step0(MapObject *mapObj) { - sub_020662AC(mapObj, 2); + MovementAction_InitDelay(mapObj, 2); return 1; } -static int sub_020662FC(MapObject *mapObj) +static int MovementAction_Delay4_Step0(MapObject *mapObj) { - sub_020662AC(mapObj, 4); + MovementAction_InitDelay(mapObj, 4); return 1; } -static int sub_02066308(MapObject *mapObj) +static int MovementAction_Delay8_Step0(MapObject *mapObj) { - sub_020662AC(mapObj, 8); + MovementAction_InitDelay(mapObj, 8); return 1; } -static int sub_02066314(MapObject *mapObj) +static int MovementAction_Delay15_Step0(MapObject *mapObj) { - sub_020662AC(mapObj, 15); + MovementAction_InitDelay(mapObj, 15); return 1; } -static int sub_02066320(MapObject *mapObj) +static int MovementAction_Delay16_Step0(MapObject *mapObj) { - sub_020662AC(mapObj, 16); + MovementAction_InitDelay(mapObj, 16); return 1; } -static int sub_0206632C(MapObject *mapObj) +static int MovementAction_Delay32_Step0(MapObject *mapObj) { - sub_020662AC(mapObj, 32); + MovementAction_InitDelay(mapObj, 32); return 1; } static int sub_02066338(MapObject *mapObj) { - UnkStruct_02066338 *v0; - - v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02066338))); - v0->unk_04 = FX32_ONE * 16; + UnkStruct_02066338 *data = MapObject_InitMovementData(mapObj, sizeof(UnkStruct_02066338)); + data->dy = FX32_ONE * 16; sub_02062A0C(mapObj, 0x0); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } static int sub_0206635C(MapObject *mapObj) { - int v0; - UnkStruct_02066338 *v1; + UnkStruct_02066338 *data = MapObject_GetMovementData(mapObj); + data->y += data->dy; - v1 = sub_02062AC8(mapObj); - v1->unk_00 += v1->unk_04; - - { - VecFx32 v2 = { 0, 0, 0 }; - - v2.y = v1->unk_00; - sub_02063088(mapObj, &v2); - } + VecFx32 v2 = { 0, 0, 0 }; - v0 = v1->unk_00 / ((16 * FX32_ONE) >> 1); + v2.y = data->y; + sub_02063088(mapObj, &v2); - if (v0 < 40) { + if (data->y / ((16 * FX32_ONE) >> 1) < 40) { return 0; } - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } static int sub_020663A4(MapObject *mapObj) { - UnkStruct_02066338 *v0; + UnkStruct_02066338 *data = MapObject_InitMovementData(mapObj, sizeof(UnkStruct_02066338)); - v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02066338))); - - v0->unk_00 = ((16 * FX32_ONE) >> 1) * 40; - v0->unk_04 = -(FX32_ONE * 16); + data->y = ((16 * FX32_ONE) >> 1) * 40; + data->dy = -(FX32_ONE * 16); sub_02062A0C(mapObj, 0x0); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } static int sub_020663D0(MapObject *mapObj) { - UnkStruct_02066338 *v0; - - v0 = sub_02062AC8(mapObj); - v0->unk_00 += v0->unk_04; + UnkStruct_02066338 *data = MapObject_GetMovementData(mapObj); + data->y += data->dy; - if (v0->unk_00 < 0) { - v0->unk_00 = 0; + if (data->y < 0) { + data->y = 0; } - { - VecFx32 v1 = { 0, 0, 0 }; + VecFx32 v1 = { 0, 0, 0 }; - v1.y = v0->unk_00; - sub_02063088(mapObj, &v1); - } + v1.y = data->y; + sub_02063088(mapObj, &v1); - if (v0->unk_00 > 0) { + if (data->y > 0) { return 0; } - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } -static int sub_02066418(MapObject *mapObj) +static int MovementAction_SetInvisible_Step0(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } -static int sub_02066430(MapObject *mapObj) +static int MovementAction_SetVisible_Step0(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_HIDE); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } -static int sub_02066448(MapObject *mapObj) +static int MovementAction_LockDir_Step0(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_LOCK_DIR); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } -static int sub_0206645C(MapObject *mapObj) +static int MovementAction_UnlockDir_Step0(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_LOCK_DIR); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } @@ -1248,7 +1192,7 @@ static int sub_0206645C(MapObject *mapObj) static int sub_02066470(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_PAUSE_ANIMATION); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } @@ -1256,32 +1200,28 @@ static int sub_02066470(MapObject *mapObj) static int sub_02066488(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_PAUSE_ANIMATION); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } static void sub_020664A0(MapObject *mapObj, int param1, int param2) { - UnkStruct_020664A0 *v0; - - v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_020664A0))); + UnkStruct_020664A0 *data = MapObject_InitMovementData(mapObj, sizeof(UnkStruct_020664A0)); - v0->unk_00 = param1; - v0->unk_04 = ov5_021F5D8C(mapObj, param1, 1, param2); + data->unk_00 = param1; + data->unk_04 = ov5_021F5D8C(mapObj, param1, 1, param2); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); } static int sub_020664C8(MapObject *mapObj) { - UnkStruct_020664A0 *v0; + UnkStruct_020664A0 *data = MapObject_GetMovementData(mapObj); - v0 = sub_02062AC8(mapObj); - - if (ov5_021F5C4C(v0->unk_04) == 1) { - sub_0207136C(v0->unk_04); - sub_02062BC8(mapObj); + if (ov5_021F5C4C(data->unk_04) == 1) { + sub_0207136C(data->unk_04); + MapObject_AdvanceMovementStep(mapObj); return 1; } @@ -1306,43 +1246,37 @@ static int sub_02066510(MapObject *mapObj) return 0; } -static void sub_02066520(MapObject *mapObj, int param1, s16 param2, u16 param3) +static void sub_02066520(MapObject *mapObj, int dir, s16 duration, u16 param3) { - UnkStruct_02066520 *v0; - - v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02066520))); + UnkStruct_02066520 *data = MapObject_InitMovementData(mapObj, sizeof(UnkStruct_02066520)); - v0->unk_00 = param1; - v0->unk_02 = param3; - v0->unk_04 = param2; + data->dir = dir; + data->unused = param3; + data->duration = duration; - sub_020641B4(mapObj, param1); - MapObject_TryFaceAndTurn(mapObj, param1); + MapObject_StepDir(mapObj, dir); + MapObject_TryFaceAndTurn(mapObj, dir); sub_02062A0C(mapObj, param3); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); } static int sub_02066560(MapObject *mapObj, const fx32 *param1) { - UnkStruct_02066520 *v0; - - v0 = sub_02062AC8(mapObj); + UnkStruct_02066520 *data = MapObject_GetMovementData(mapObj); - MapObject_StepDirection(mapObj, v0->unk_00, param1[v0->unk_06]); + MapObject_MovePosInDir(mapObj, data->dir, param1[data->timer]); sub_020642F8(mapObj); - v0->unk_06++; - - if (v0->unk_06 < v0->unk_04) { + if (++(data->timer) < data->duration) { return 0; } MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_5); - sub_02064208(mapObj); + MapObject_UpdateCoords(mapObj); sub_02062B68(mapObj); sub_02062A0C(mapObj, 0x0); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } @@ -1448,24 +1382,22 @@ static int sub_020666B0(MapObject *mapObj) static int sub_020666C8(MapObject *mapObj) { - UnkStruct_020666C8 *v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_020666C8))); + UnkStruct_020666C8 *data = MapObject_InitMovementData(mapObj, sizeof(UnkStruct_020666C8)); sub_02062A0C(mapObj, 0x9); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 0; } static int sub_020666E4(MapObject *mapObj) { - UnkStruct_020666C8 *v0 = sub_02062AC8(mapObj); - - v0->unk_00++; + UnkStruct_020666C8 *data = MapObject_GetMovementData(mapObj); - if (v0->unk_00 >= 8) { - MapObject_TryFace(mapObj, 1); + if (++(data->unk_00) >= 8) { + MapObject_TryFace(mapObj, DIR_SOUTH); sub_02062A0C(mapObj, 0x0); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); } return 0; @@ -1473,42 +1405,38 @@ static int sub_020666E4(MapObject *mapObj) static int sub_02066710(MapObject *mapObj) { - UnkStruct_02066710 *v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02066710))); + UnkStruct_02066710 *data = MapObject_InitMovementData(mapObj, sizeof(UnkStruct_02066710)); - { - UnkStruct_ov101_021D5D90 *v1 = sub_0206A224(mapObj); + UnkStruct_ov101_021D5D90 *v1 = sub_0206A224(mapObj); - if (v1 != NULL) { - sub_0207136C(v1); - } + if (v1 != NULL) { + sub_0207136C(v1); } - { - VecFx32 v2 = { 0, 0, 0 }; - sub_02063088(mapObj, &v2); - } + VecFx32 v2 = { 0, 0, 0 }; + sub_02063088(mapObj, &v2); ov5_021F3F10(mapObj); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_16); MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 0; } static int sub_02066764(MapObject *mapObj) { - UnkStruct_02066710 *v0 = sub_02062AC8(mapObj); + UnkStruct_02066710 *data = MapObject_GetMovementData(mapObj); const fx32 *v1 = Unk_02100B84[0]; VecFx32 v2 = { 0, 0, 0 }; - v2.y = v1[v0->unk_00]; + v2.y = v1[data->unk_00]; sub_02063088(mapObj, &v2); - v0->unk_00 += 2; + data->unk_00 += 2; - if (v0->unk_00 < 16) { + if (data->unk_00 < 16) { return 0; } @@ -1517,52 +1445,48 @@ static int sub_02066764(MapObject *mapObj) sub_02063088(mapObj, &v2); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_17 | MAP_OBJ_STATUS_5); sub_0206A230(mapObj); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } static int sub_020667CC(MapObject *mapObj) { - UnkStruct_020667CC *v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_020667CC))); + UnkStruct_020667CC *data = MapObject_InitMovementData(mapObj, sizeof(UnkStruct_020667CC)); sub_02062A0C(mapObj, 0x0); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 0; } static int sub_020667E8(MapObject *mapObj) { - UnkStruct_020667CC *v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_020667CC))); + UnkStruct_020667CC *data = MapObject_InitMovementData(mapObj, sizeof(UnkStruct_020667CC)); sub_02062A0C(mapObj, 0x1); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 0; } static int sub_02066804(MapObject *mapObj) { - UnkStruct_020667CC *v0 = sub_02062AC8(mapObj); - - v0->unk_00++; + UnkStruct_020667CC *data = MapObject_GetMovementData(mapObj); - if (v0->unk_00 < 21) { + if (++(data->unk_00) < 21) { return 0; } - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } static void sub_02066824(MapObject *mapObj, const VecFx32 *param1, int param2, int param3, int param4, u8 param5) { - UnkStruct_02066824 *v0; - - v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02066824))); - v0->unk_00 = param4; - v0->unk_04 = *param1; + UnkStruct_02066824 *data = MapObject_InitMovementData(mapObj, sizeof(UnkStruct_02066824)); + data->duration = param4; + data->unk_04 = *param1; MapObject_TryFace(mapObj, param2); MapObject_Turn(mapObj, param3); @@ -1591,29 +1515,24 @@ static void sub_02066824(MapObject *mapObj, const VecFx32 *param1, int param2, i MapObject_AddZ(mapObj, 1); } - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); } static int sub_020668EC(MapObject *mapObj) { - UnkStruct_02066824 *v0; - - v0 = sub_02062AC8(mapObj); - MapObject_AddVecToPos(mapObj, &v0->unk_04); - - v0->unk_00--; + UnkStruct_02066824 *data = MapObject_GetMovementData(mapObj); + MapObject_AddVecToPos(mapObj, &data->unk_04); - if (v0->unk_00 > 0) { + if (--(data->duration) > 0) { return 0; } - MapObject_SetStatusFlagOn( - mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_5); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_5); - sub_02064208(mapObj); + MapObject_UpdateCoords(mapObj); sub_02062B68(mapObj); sub_02062A0C(mapObj, 0x0); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); return 1; } @@ -1874,22 +1793,20 @@ static int sub_02066F54(MapObject *mapObj) return 1; } -static void sub_02066F88(MapObject *mapObj, fx32 param1, int param2, int param3, u8 param4, u8 param5, u8 param6, u8 param7, u8 param8) +static void sub_02066F88(MapObject *mapObj, fx32 distance, int facingDir, int movingDir, u8 duration, u8 param5, u8 param6, u8 param7, u8 param8) { int v0 = 1; - UnkStruct_02066F88 *v1; - - v1 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02066F88))); + UnkStruct_02066F88 *v1 = MapObject_InitMovementData(mapObj, sizeof(UnkStruct_02066F88)); - v1->unk_00 = param4; - v1->unk_04 = param1; + v1->unk_00 = duration; + v1->unk_04 = distance; v1->unk_02 = param6; v1->unk_01 = param7; v1->unk_03 = param8; v1->unk_0E = (0x100 * 16) / v1->unk_00; - MapObject_TryFace(mapObj, param2); - MapObject_Turn(mapObj, param3); + MapObject_TryFace(mapObj, facingDir); + MapObject_Turn(mapObj, movingDir); sub_02062A0C(mapObj, param5); sub_02062D28(mapObj); @@ -1899,24 +1816,24 @@ static void sub_02066F88(MapObject *mapObj, fx32 param1, int param2, int param3, GF_ASSERT(param6 <= 2); - if (param1) { + if (distance) { switch (param6) { case 0: - if (param1 < 0) { + if (distance < 0) { v0 = -v0; } MapObject_AddX(mapObj, v0); break; case 1: - if (param1 < 0) { + if (distance < 0) { v0 = -v0; } MapObject_AddY(mapObj, v0 * 2); break; case 2: - if (param1 < 0) { + if (distance < 0) { v0 = -v0; } @@ -1925,16 +1842,13 @@ static void sub_02066F88(MapObject *mapObj, fx32 param1, int param2, int param3, } } - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); } static int sub_02067068(MapObject *mapObj) { - fx32 v0; VecFx32 v1; - UnkStruct_02066F88 *v2; - - v2 = sub_02062AC8(mapObj); + UnkStruct_02066F88 *v2 = MapObject_GetMovementData(mapObj); MapObject_GetPosPtr(mapObj, &v1); switch (v2->unk_02) { @@ -1951,7 +1865,7 @@ static int sub_02067068(MapObject *mapObj) MapObject_SetPos(mapObj, &v1); - v0 = v2->unk_04; + fx32 v0 = v2->unk_04; if (v0 < 0) { v0 = -v0; @@ -1964,32 +1878,30 @@ static int sub_02067068(MapObject *mapObj) v2->unk_0C = (0x100 * (16 - 1)); } - { - VecFx32 v3 = { 0, 0, 0 }; - const fx32 *v4 = Unk_02100B84[1]; - u16 v5 = (v2->unk_0C) / 0x100; + VecFx32 v3 = { 0, 0, 0 }; + const fx32 *v4 = Unk_02100B84[1]; + u16 v5 = (v2->unk_0C) / 0x100; - v0 = v4[v5]; + v0 = v4[v5]; - if (v2->unk_03 == 1) { - v0 = -v0; - } - - switch (v2->unk_01) { - case 0: - v3.x = v0; - break; - case 1: - v3.y = v0; - break; - case 2: - v3.z = v0; - break; - } + if (v2->unk_03 == 1) { + v0 = -v0; + } - sub_02063088(mapObj, &v3); + switch (v2->unk_01) { + case 0: + v3.x = v0; + break; + case 1: + v3.y = v0; + break; + case 2: + v3.z = v0; + break; } + sub_02063088(mapObj, &v3); + v2->unk_00--; if ((v2->unk_08 >= (16 * FX32_ONE)) && v2->unk_00) { @@ -2031,16 +1943,14 @@ static int sub_02067068(MapObject *mapObj) return 0; } - { - VecFx32 v7 = { 0, 0, 0 }; - sub_02063088(mapObj, &v7); - } + VecFx32 v7 = { 0, 0, 0 }; + sub_02063088(mapObj, &v7); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_17 | MAP_OBJ_STATUS_5); - sub_02064208(mapObj); + MapObject_UpdateCoords(mapObj); sub_02062B68(mapObj); sub_02062A0C(mapObj, 0x0); - sub_02062BC8(mapObj); + MapObject_AdvanceMovementStep(mapObj); Sound_PlayEffect(1607); return 1; @@ -2118,915 +2028,915 @@ static int sub_02067394(MapObject *mapObj) return 1; } -int (*const Unk_020EEC78[])(MapObject *) = { - sub_02065950, +int (*const gMovementActionFuncs_000[])(MapObject *) = { + MovementAction_FaceNorth_Step0, sub_02065924, }; -int (*const Unk_020EEC48[])(MapObject *) = { - sub_0206595C, +int (*const gMovementActionFuncs_001[])(MapObject *) = { + MovementAction_FaceSouth_Step0, sub_02065924, }; -int (*const Unk_020EEC88[])(MapObject *) = { - sub_02065968, +int (*const gMovementActionFuncs_002[])(MapObject *) = { + MovementAction_FaceWest_Step0, sub_02065924, }; -int (*const Unk_020EEC80[])(MapObject *) = { - sub_02065974, +int (*const gMovementActionFuncs_003[])(MapObject *) = { + MovementAction_FaceEast_Step0, sub_02065924, }; -int (*const Unk_020EF59C[])(MapObject *) = { - sub_02065A1C, - sub_020659C8, +int (*const gMovementActionFuncs_004[])(MapObject *) = { + MovementAction_WalkSlowerNorth_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF590[])(MapObject *) = { - sub_02065A30, - sub_020659C8, +int (*const gMovementActionFuncs_005[])(MapObject *) = { + MovementAction_WalkSlowerSouth_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF584[])(MapObject *) = { - sub_02065A44, - sub_020659C8, +int (*const gMovementActionFuncs_006[])(MapObject *) = { + MovementAction_WalkSlowerWest_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF578[])(MapObject *) = { - sub_02065A58, - sub_020659C8, +int (*const gMovementActionFuncs_007[])(MapObject *) = { + MovementAction_WalkSlowerEast_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF56C[])(MapObject *) = { - sub_02065A6C, - sub_020659C8, +int (*const gMovementActionFuncs_008[])(MapObject *) = { + MovementAction_WalkSlowNorth_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF560[])(MapObject *) = { - sub_02065A80, - sub_020659C8, +int (*const gMovementActionFuncs_009[])(MapObject *) = { + MovementAction_WalkSlowSouth_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF554[])(MapObject *) = { - sub_02065A94, - sub_020659C8, +int (*const gMovementActionFuncs_010[])(MapObject *) = { + MovementAction_WalkSlowWest_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF548[])(MapObject *) = { - sub_02065AA8, - sub_020659C8, +int (*const gMovementActionFuncs_011[])(MapObject *) = { + MovementAction_WalkSlowEast_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF53C[])(MapObject *) = { - sub_02065ABC, - sub_020659C8, +int (*const gMovementActionFuncs_012[])(MapObject *) = { + MovementAction_WalkNormalNorth_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF530[])(MapObject *) = { - sub_02065AD4, - sub_020659C8, +int (*const gMovementActionFuncs_013[])(MapObject *) = { + MovementAction_WalkNormalSouth_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF524[])(MapObject *) = { - sub_02065AE8, - sub_020659C8, +int (*const gMovementActionFuncs_014[])(MapObject *) = { + MovementAction_WalkNormalWest_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF518[])(MapObject *) = { - sub_02065AFC, - sub_020659C8, +int (*const gMovementActionFuncs_015[])(MapObject *) = { + MovementAction_WalkNormalEast_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF50C[])(MapObject *) = { - sub_02065B10, - sub_020659C8, +int (*const gMovementActionFuncs_016[])(MapObject *) = { + MovementAction_WalkFastNorth_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF500[])(MapObject *) = { - sub_02065B24, - sub_020659C8, +int (*const gMovementActionFuncs_017[])(MapObject *) = { + MovementAction_WalkFastSouth_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF4F4[])(MapObject *) = { - sub_02065B38, - sub_020659C8, +int (*const gMovementActionFuncs_018[])(MapObject *) = { + MovementAction_WalkFastWest_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF4E8[])(MapObject *) = { - sub_02065B4C, - sub_020659C8, +int (*const gMovementActionFuncs_019[])(MapObject *) = { + MovementAction_WalkFastEast_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF4DC[])(MapObject *) = { - sub_02065B60, - sub_020659C8, +int (*const gMovementActionFuncs_020[])(MapObject *) = { + MovementAction_WalkFasterNorth_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF4D0[])(MapObject *) = { - sub_02065B78, - sub_020659C8, +int (*const gMovementActionFuncs_021[])(MapObject *) = { + MovementAction_WalkFasterSouth_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF4C4[])(MapObject *) = { - sub_02065B8C, - sub_020659C8, +int (*const gMovementActionFuncs_022[])(MapObject *) = { + MovementAction_WalkFasterWest_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF4B8[])(MapObject *) = { - sub_02065BA0, - sub_020659C8, +int (*const gMovementActionFuncs_023[])(MapObject *) = { + MovementAction_WalkFasterEast_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF4AC[])(MapObject *) = { - sub_02065BB8, - sub_020659C8, +int (*const gMovementActionFuncs_084[])(MapObject *) = { + MovementAction_WalkFastestNorth_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF4A0[])(MapObject *) = { - sub_02065BCC, - sub_020659C8, +int (*const gMovementActionFuncs_085[])(MapObject *) = { + MovementAction_WalkFastestSouth_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF494[])(MapObject *) = { - sub_02065BE0, - sub_020659C8, +int (*const gMovementActionFuncs_086[])(MapObject *) = { + MovementAction_WalkFastestWest_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF488[])(MapObject *) = { - sub_02065BF4, - sub_020659C8, +int (*const gMovementActionFuncs_087[])(MapObject *) = { + MovementAction_WalkFastestEast_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF47C[])(MapObject *) = { - sub_02065CCC, - sub_02065C98, +int (*const gMovementActionFuncs_024[])(MapObject *) = { + MovementAction_WalkOnSpotSlowerNorth_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF230[])(MapObject *) = { - sub_02065CDC, - sub_02065C98, +int (*const gMovementActionFuncs_025[])(MapObject *) = { + MovementAction_WalkOnSpotSlowerSouth_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF458[])(MapObject *) = { - sub_02065CEC, - sub_02065C98, +int (*const gMovementActionFuncs_026[])(MapObject *) = { + MovementAction_WalkOnSpotSlowerWest_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF464[])(MapObject *) = { - sub_02065CFC, - sub_02065C98, +int (*const gMovementActionFuncs_027[])(MapObject *) = { + MovementAction_WalkOnSpotSlowerEast_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF5A8[])(MapObject *) = { - sub_02065D0C, - sub_02065C98, +int (*const gMovementActionFuncs_028[])(MapObject *) = { + MovementAction_WalkOnSpotSlowNorth_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF5B4[])(MapObject *) = { - sub_02065D1C, - sub_02065C98, +int (*const gMovementActionFuncs_029[])(MapObject *) = { + MovementAction_WalkOnSpotSlowSouth_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF434[])(MapObject *) = { - sub_02065D2C, - sub_02065C98, +int (*const gMovementActionFuncs_030[])(MapObject *) = { + MovementAction_WalkOnSpotSlowWest_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF428[])(MapObject *) = { - sub_02065D3C, - sub_02065C98, +int (*const gMovementActionFuncs_031[])(MapObject *) = { + MovementAction_WalkOnSpotSlowEast_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF41C[])(MapObject *) = { - sub_02065D4C, - sub_02065C98, +int (*const gMovementActionFuncs_032[])(MapObject *) = { + MovementAction_WalkOnSpotNormalNorth_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF410[])(MapObject *) = { - sub_02065D5C, - sub_02065C98, +int (*const gMovementActionFuncs_033[])(MapObject *) = { + MovementAction_WalkOnSpotNormalSouth_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF404[])(MapObject *) = { - sub_02065D6C, - sub_02065C98, +int (*const gMovementActionFuncs_034[])(MapObject *) = { + MovementAction_WalkOnSpotNormalWest_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF3F8[])(MapObject *) = { - sub_02065D7C, - sub_02065C98, +int (*const gMovementActionFuncs_035[])(MapObject *) = { + MovementAction_WalkOnSpotNormalEast_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF3EC[])(MapObject *) = { - sub_02065D8C, - sub_02065C98, +int (*const gMovementActionFuncs_036[])(MapObject *) = { + MovementAction_WalkOnSpotFastNorth_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF3E0[])(MapObject *) = { - sub_02065D9C, - sub_02065C98, +int (*const gMovementActionFuncs_037[])(MapObject *) = { + MovementAction_WalkOnSpotFastSouth_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF3D4[])(MapObject *) = { - sub_02065DAC, - sub_02065C98, +int (*const gMovementActionFuncs_038[])(MapObject *) = { + MovementAction_WalkOnSpotFastWest_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF3C8[])(MapObject *) = { - sub_02065DBC, - sub_02065C98, +int (*const gMovementActionFuncs_039[])(MapObject *) = { + MovementAction_WalkOnSpotFastEast_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF3BC[])(MapObject *) = { - sub_02065DCC, - sub_02065C98, +int (*const gMovementActionFuncs_040[])(MapObject *) = { + MovementAction_WalkOnSpotFasterNorth_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF3B0[])(MapObject *) = { - sub_02065DDC, - sub_02065C98, +int (*const gMovementActionFuncs_041[])(MapObject *) = { + MovementAction_WalkOnSpotFasterSouth_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF3A4[])(MapObject *) = { - sub_02065DEC, - sub_02065C98, +int (*const gMovementActionFuncs_042[])(MapObject *) = { + MovementAction_WalkOnSpotFasterWest_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF398[])(MapObject *) = { - sub_02065DFC, - sub_02065C98, +int (*const gMovementActionFuncs_043[])(MapObject *) = { + MovementAction_WalkOnSpotFasterEast_Step0, + MovementAction_WalkOnSpot_Step1, sub_02065924, }; -int (*const Unk_020EF38C[])(MapObject *) = { +int (*const gMovementActionFuncs_044[])(MapObject *) = { sub_02065F88, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF380[])(MapObject *) = { +int (*const gMovementActionFuncs_045[])(MapObject *) = { sub_02065FA8, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF374[])(MapObject *) = { +int (*const gMovementActionFuncs_046[])(MapObject *) = { sub_02065FC8, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF368[])(MapObject *) = { +int (*const gMovementActionFuncs_047[])(MapObject *) = { sub_02065FE8, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF35C[])(MapObject *) = { +int (*const gMovementActionFuncs_048[])(MapObject *) = { sub_02066008, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF350[])(MapObject *) = { +int (*const gMovementActionFuncs_049[])(MapObject *) = { sub_02066028, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF344[])(MapObject *) = { +int (*const gMovementActionFuncs_050[])(MapObject *) = { sub_02066048, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF338[])(MapObject *) = { +int (*const gMovementActionFuncs_051[])(MapObject *) = { sub_02066068, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF32C[])(MapObject *) = { +int (*const gMovementActionFuncs_052[])(MapObject *) = { sub_02066088, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF320[])(MapObject *) = { +int (*const gMovementActionFuncs_053[])(MapObject *) = { sub_020660A8, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF314[])(MapObject *) = { +int (*const gMovementActionFuncs_054[])(MapObject *) = { sub_020660CC, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF308[])(MapObject *) = { +int (*const gMovementActionFuncs_055[])(MapObject *) = { sub_020660F0, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF2FC[])(MapObject *) = { +int (*const gMovementActionFuncs_056[])(MapObject *) = { sub_02066110, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF2F0[])(MapObject *) = { +int (*const gMovementActionFuncs_057[])(MapObject *) = { sub_02066130, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF2E4[])(MapObject *) = { +int (*const gMovementActionFuncs_058[])(MapObject *) = { sub_02066150, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF2D8[])(MapObject *) = { +int (*const gMovementActionFuncs_059[])(MapObject *) = { sub_02066170, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EEC98[])(MapObject *) = { +int (*const gMovementActionFuncs_092[])(MapObject *) = { sub_02066194, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF2C0[])(MapObject *) = { +int (*const gMovementActionFuncs_093[])(MapObject *) = { sub_020661B4, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF2B4[])(MapObject *) = { +int (*const gMovementActionFuncs_094[])(MapObject *) = { sub_020661D8, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF2A8[])(MapObject *) = { +int (*const gMovementActionFuncs_095[])(MapObject *) = { sub_020661F8, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF29C[])(MapObject *) = { - sub_020662E4, - sub_020662C4, +int (*const gMovementActionFuncs_060[])(MapObject *) = { + MovementAction_Delay1_Step0, + MovementAction_Delay_Step1, sub_02065924, }; -int (*const Unk_020EF290[])(MapObject *) = { - sub_020662F0, - sub_020662C4, +int (*const gMovementActionFuncs_061[])(MapObject *) = { + MovementAction_Delay2_Step0, + MovementAction_Delay_Step1, sub_02065924, }; -int (*const Unk_020EF284[])(MapObject *) = { - sub_020662FC, - sub_020662C4, +int (*const gMovementActionFuncs_062[])(MapObject *) = { + MovementAction_Delay4_Step0, + MovementAction_Delay_Step1, sub_02065924, }; -int (*const Unk_020EF278[])(MapObject *) = { - sub_02066308, - sub_020662C4, +int (*const gMovementActionFuncs_063[])(MapObject *) = { + MovementAction_Delay8_Step0, + MovementAction_Delay_Step1, sub_02065924, }; -int (*const Unk_020EF26C[])(MapObject *) = { - sub_02066314, - sub_020662C4, +int (*const gMovementActionFuncs_064[])(MapObject *) = { + MovementAction_Delay15_Step0, + MovementAction_Delay_Step1, sub_02065924, }; -int (*const Unk_020EF260[])(MapObject *) = { - sub_02066320, - sub_020662C4, +int (*const gMovementActionFuncs_065[])(MapObject *) = { + MovementAction_Delay16_Step0, + MovementAction_Delay_Step1, sub_02065924, }; -int (*const Unk_020EF254[])(MapObject *) = { - sub_0206632C, - sub_020662C4, +int (*const gMovementActionFuncs_066[])(MapObject *) = { + MovementAction_Delay32_Step0, + MovementAction_Delay_Step1, sub_02065924, }; -int (*const Unk_020EF248[])(MapObject *) = { +int (*const gMovementActionFuncs_067[])(MapObject *) = { sub_02066338, sub_0206635C, sub_02065924, }; -int (*const Unk_020EF23C[])(MapObject *) = { +int (*const gMovementActionFuncs_068[])(MapObject *) = { sub_020663A4, sub_020663D0, sub_02065924, }; -int (*const Unk_020EEC70[])(MapObject *) = { - sub_02066418, +int (*const gMovementActionFuncs_069[])(MapObject *) = { + MovementAction_SetInvisible_Step0, sub_02065924, }; -int (*const Unk_020EEC68[])(MapObject *) = { - sub_02066430, +int (*const gMovementActionFuncs_070[])(MapObject *) = { + MovementAction_SetVisible_Step0, sub_02065924, }; -int (*const Unk_020EEC50[])(MapObject *) = { - sub_02066448, +int (*const gMovementActionFuncs_071[])(MapObject *) = { + MovementAction_LockDir_Step0, sub_02065924, }; -int (*const Unk_020EEC90[])(MapObject *) = { - sub_0206645C, +int (*const gMovementActionFuncs_072[])(MapObject *) = { + MovementAction_UnlockDir_Step0, sub_02065924, }; -int (*const Unk_020EEC58[])(MapObject *) = { +int (*const gMovementActionFuncs_073[])(MapObject *) = { sub_02066470, sub_02065924, }; -int (*const Unk_020EEC60[])(MapObject *) = { +int (*const gMovementActionFuncs_074[])(MapObject *) = { sub_02066488, sub_02065924, }; -int (*const Unk_020EF218[])(MapObject *) = { +int (*const gMovementActionFuncs_075[])(MapObject *) = { sub_020664F0, sub_020664C8, sub_02065924, }; -int (*const Unk_020EF20C[])(MapObject *) = { +int (*const gMovementActionFuncs_103[])(MapObject *) = { sub_02066500, sub_020664C8, sub_02065924, }; -int (*const Unk_020EF200[])(MapObject *) = { +int (*const gMovementActionFuncs_076[])(MapObject *) = { sub_020665C0, sub_02066600, sub_02065924, }; -int (*const Unk_020EF1F4[])(MapObject *) = { +int (*const gMovementActionFuncs_077[])(MapObject *) = { sub_020665D0, sub_02066600, sub_02065924, }; -int (*const Unk_020EF1E8[])(MapObject *) = { +int (*const gMovementActionFuncs_078[])(MapObject *) = { sub_020665E0, sub_02066600, sub_02065924, }; -int (*const Unk_020EF1DC[])(MapObject *) = { +int (*const gMovementActionFuncs_079[])(MapObject *) = { sub_020665F0, sub_02066600, sub_02065924, }; -int (*const Unk_020EF1D0[])(MapObject *) = { +int (*const gMovementActionFuncs_080[])(MapObject *) = { sub_02066618, sub_02066658, sub_02065924, }; -int (*const Unk_020EF1C4[])(MapObject *) = { +int (*const gMovementActionFuncs_081[])(MapObject *) = { sub_02066628, sub_02066658, sub_02065924, }; -int (*const Unk_020EF1B8[])(MapObject *) = { +int (*const gMovementActionFuncs_082[])(MapObject *) = { sub_02066638, sub_02066658, sub_02065924, }; -int (*const Unk_020EF188[])(MapObject *) = { +int (*const gMovementActionFuncs_083[])(MapObject *) = { sub_02066648, sub_02066658, sub_02065924, }; -int (*const Unk_020EF194[])(MapObject *) = { - sub_02065C0C, - sub_020659C8, +int (*const gMovementActionFuncs_088[])(MapObject *) = { + MovementAction_RunNorth_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF224[])(MapObject *) = { - sub_02065C24, - sub_020659C8, +int (*const gMovementActionFuncs_089[])(MapObject *) = { + MovementAction_RunSouth_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF440[])(MapObject *) = { - sub_02065C38, - sub_020659C8, +int (*const gMovementActionFuncs_090[])(MapObject *) = { + MovementAction_RunWest_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF470[])(MapObject *) = { - sub_02065C4C, - sub_020659C8, +int (*const gMovementActionFuncs_091[])(MapObject *) = { + MovementAction_RunEast_Step0, + MovementAction_Walk_Step1, sub_02065924, }; -int (*const Unk_020EF5C0[])(MapObject *) = { +int (*const gMovementActionFuncs_096[])(MapObject *) = { sub_02066670, sub_020666B0, sub_02065924, }; -int (*const Unk_020EF164[])(MapObject *) = { +int (*const gMovementActionFuncs_097[])(MapObject *) = { sub_02066680, sub_020666B0, sub_02065924, }; -int (*const Unk_020EF158[])(MapObject *) = { +int (*const gMovementActionFuncs_098[])(MapObject *) = { sub_02066690, sub_020666B0, sub_02065924, }; -int (*const Unk_020EF14C[])(MapObject *) = { +int (*const gMovementActionFuncs_099[])(MapObject *) = { sub_020666A0, sub_020666B0, sub_02065924, }; -int (*const Unk_020EF140[])(MapObject *) = { +int (*const gMovementActionFuncs_100[])(MapObject *) = { sub_020666C8, sub_020666E4, sub_02065924, }; -int (*const Unk_020EF134[])(MapObject *) = { +int (*const gMovementActionFuncs_101[])(MapObject *) = { sub_02066710, sub_02066764, sub_02065924, }; -int (*const Unk_020EF128[])(MapObject *) = { +int (*const gMovementActionFuncs_102[])(MapObject *) = { sub_020667CC, sub_02066804, sub_02065924, }; -int (*const Unk_020EF11C[])(MapObject *) = { +int (*const gMovementActionFuncs_104[])(MapObject *) = { sub_020667E8, sub_02066804, sub_02065924, }; -int (*const Unk_020EF110[])(MapObject *) = { +int (*const gMovementActionFuncs_105[])(MapObject *) = { sub_02066934, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF104[])(MapObject *) = { +int (*const gMovementActionFuncs_106[])(MapObject *) = { sub_02066968, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF0F8[])(MapObject *) = { +int (*const gMovementActionFuncs_107[])(MapObject *) = { sub_02066998, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF0EC[])(MapObject *) = { +int (*const gMovementActionFuncs_108[])(MapObject *) = { sub_020669CC, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF0E0[])(MapObject *) = { +int (*const gMovementActionFuncs_109[])(MapObject *) = { sub_020669FC, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF0D4[])(MapObject *) = { +int (*const gMovementActionFuncs_110[])(MapObject *) = { sub_02066A2C, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF0C8[])(MapObject *) = { +int (*const gMovementActionFuncs_111[])(MapObject *) = { sub_02066A60, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF0BC[])(MapObject *) = { +int (*const gMovementActionFuncs_112[])(MapObject *) = { sub_02066A94, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF2CC[])(MapObject *) = { +int (*const gMovementActionFuncs_113[])(MapObject *) = { sub_02066AC8, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF0A4[])(MapObject *) = { +int (*const gMovementActionFuncs_114[])(MapObject *) = { sub_02066AFC, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF098[])(MapObject *) = { +int (*const gMovementActionFuncs_115[])(MapObject *) = { sub_02066B30, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF08C[])(MapObject *) = { +int (*const gMovementActionFuncs_116[])(MapObject *) = { sub_02066B60, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF080[])(MapObject *) = { +int (*const gMovementActionFuncs_145[])(MapObject *) = { sub_02066B90, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF074[])(MapObject *) = { +int (*const gMovementActionFuncs_146[])(MapObject *) = { sub_02066BC0, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF068[])(MapObject *) = { +int (*const gMovementActionFuncs_147[])(MapObject *) = { sub_02066BF0, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF05C[])(MapObject *) = { +int (*const gMovementActionFuncs_148[])(MapObject *) = { sub_02066C20, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF050[])(MapObject *) = { +int (*const gMovementActionFuncs_149[])(MapObject *) = { sub_02066C50, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF044[])(MapObject *) = { +int (*const gMovementActionFuncs_150[])(MapObject *) = { sub_02066C84, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF038[])(MapObject *) = { +int (*const gMovementActionFuncs_151[])(MapObject *) = { sub_02066CB8, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF014[])(MapObject *) = { +int (*const gMovementActionFuncs_152[])(MapObject *) = { sub_02066CE8, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF020[])(MapObject *) = { +int (*const gMovementActionFuncs_117[])(MapObject *) = { sub_0206621C, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF17C[])(MapObject *) = { +int (*const gMovementActionFuncs_118[])(MapObject *) = { sub_02066240, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF1A0[])(MapObject *) = { +int (*const gMovementActionFuncs_119[])(MapObject *) = { sub_02066264, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF44C[])(MapObject *) = { +int (*const gMovementActionFuncs_120[])(MapObject *) = { sub_02066288, - sub_02065EA0, + MovementAction_Jump_Step1, sub_02065924, }; -int (*const Unk_020EF5CC[])(MapObject *) = { +int (*const gMovementActionFuncs_121[])(MapObject *) = { sub_02066D18, sub_020668EC, sub_02065924, }; -int (*const Unk_020EEFF0[])(MapObject *) = { +int (*const gMovementActionFuncs_122[])(MapObject *) = { sub_02066D4C, sub_020668EC, sub_02065924, }; -int (*const Unk_020EEFE4[])(MapObject *) = { +int (*const gMovementActionFuncs_123[])(MapObject *) = { sub_02066D80, sub_020668EC, sub_02065924, }; -int (*const Unk_020EEFD8[])(MapObject *) = { +int (*const gMovementActionFuncs_124[])(MapObject *) = { sub_02066DB4, sub_020668EC, sub_02065924, }; -int (*const Unk_020EEFCC[])(MapObject *) = { +int (*const gMovementActionFuncs_125[])(MapObject *) = { sub_02066DE8, sub_020668EC, sub_02065924, }; -int (*const Unk_020EEFC0[])(MapObject *) = { +int (*const gMovementActionFuncs_126[])(MapObject *) = { sub_02066E1C, sub_020668EC, sub_02065924, }; -int (*const Unk_020EEFB4[])(MapObject *) = { +int (*const gMovementActionFuncs_127[])(MapObject *) = { sub_02066E50, sub_020668EC, sub_02065924, }; -int (*const Unk_020EEFA8[])(MapObject *) = { +int (*const gMovementActionFuncs_128[])(MapObject *) = { sub_02066E84, sub_020668EC, sub_02065924, }; -int (*const Unk_020EF0B0[])(MapObject *) = { +int (*const gMovementActionFuncs_129[])(MapObject *) = { sub_02066EB8, sub_020668EC, sub_02065924, }; -int (*const Unk_020EEF90[])(MapObject *) = { +int (*const gMovementActionFuncs_130[])(MapObject *) = { sub_02066EEC, sub_020668EC, sub_02065924, }; -int (*const Unk_020EEF84[])(MapObject *) = { +int (*const gMovementActionFuncs_131[])(MapObject *) = { sub_02066F20, sub_020668EC, sub_02065924, }; -int (*const Unk_020EEF6C[])(MapObject *) = { +int (*const gMovementActionFuncs_132[])(MapObject *) = { sub_02066F54, sub_020668EC, sub_02065924, }; -int (*const Unk_020EEF78[])(MapObject *) = { +int (*const gMovementActionFuncs_133[])(MapObject *) = { sub_020671F0, sub_02067068, sub_02065924, }; -int (*const Unk_020EF008[])(MapObject *) = { +int (*const gMovementActionFuncs_134[])(MapObject *) = { sub_02067214, sub_02067068, sub_02065924, }; -int (*const Unk_020EF02C[])(MapObject *) = { +int (*const gMovementActionFuncs_135[])(MapObject *) = { sub_0206723C, sub_02067068, sub_02065924, }; -int (*const Unk_020EF1AC[])(MapObject *) = { +int (*const gMovementActionFuncs_136[])(MapObject *) = { sub_02067260, sub_02067068, sub_02065924, }; -int (*const Unk_020EF5D8[])(MapObject *) = { +int (*const gMovementActionFuncs_137[])(MapObject *) = { sub_02067288, sub_02067068, sub_02065924, }; -int (*const Unk_020EECBC[])(MapObject *) = { +int (*const gMovementActionFuncs_138[])(MapObject *) = { sub_020672AC, sub_02067068, sub_02065924, }; -int (*const Unk_020EECB0[])(MapObject *) = { +int (*const gMovementActionFuncs_139[])(MapObject *) = { sub_020672D4, sub_02067068, sub_02065924, }; -int (*const Unk_020EECA4[])(MapObject *) = { +int (*const gMovementActionFuncs_140[])(MapObject *) = { sub_020672FC, sub_02067068, sub_02065924, }; -int (*const Unk_020EEF9C[])(MapObject *) = { +int (*const gMovementActionFuncs_141[])(MapObject *) = { sub_02067320, sub_02067068, sub_02065924, }; -int (*const Unk_020EEF60[])(MapObject *) = { +int (*const gMovementActionFuncs_142[])(MapObject *) = { sub_02067344, sub_02067068, sub_02065924, }; -int (*const Unk_020EEFFC[])(MapObject *) = { +int (*const gMovementActionFuncs_143[])(MapObject *) = { sub_0206736C, sub_02067068, sub_02065924, }; -int (*const Unk_020EF170[])(MapObject *) = { +int (*const gMovementActionFuncs_144[])(MapObject *) = { sub_02067394, sub_02067068, sub_02065924, }; -int (*const Unk_020EF5E4[])(MapObject *) = { +int (*const gMovementActionFuncs_153[])(MapObject *) = { sub_02066510, sub_020664C8, sub_02065924, diff --git a/src/unk_020EDBAC.c b/src/unk_020EDBAC.c index 292e9301f1..33b64fce3f 100644 --- a/src/unk_020EDBAC.c +++ b/src/unk_020EDBAC.c @@ -11,164 +11,160 @@ #include "unk_020677F4.h" #include "unk_02069BE0.h" -#include "constdata/const_020EE31C.h" -#include "constdata/const_020EE3A8.h" -#include "constdata/const_020EE4B8.h" - -extern int (*const Unk_020EEC78[])(MapObject *); -extern int (*const Unk_020EEC48[])(MapObject *); -extern int (*const Unk_020EEC88[])(MapObject *); -extern int (*const Unk_020EEC80[])(MapObject *); -extern int (*const Unk_020EF59C[])(MapObject *); -extern int (*const Unk_020EF590[])(MapObject *); -extern int (*const Unk_020EF584[])(MapObject *); -extern int (*const Unk_020EF578[])(MapObject *); -extern int (*const Unk_020EF56C[])(MapObject *); -extern int (*const Unk_020EF560[])(MapObject *); -extern int (*const Unk_020EF554[])(MapObject *); -extern int (*const Unk_020EF548[])(MapObject *); -extern int (*const Unk_020EF53C[])(MapObject *); -extern int (*const Unk_020EF530[])(MapObject *); -extern int (*const Unk_020EF524[])(MapObject *); -extern int (*const Unk_020EF518[])(MapObject *); -extern int (*const Unk_020EF50C[])(MapObject *); -extern int (*const Unk_020EF500[])(MapObject *); -extern int (*const Unk_020EF4F4[])(MapObject *); -extern int (*const Unk_020EF4E8[])(MapObject *); -extern int (*const Unk_020EF4DC[])(MapObject *); -extern int (*const Unk_020EF4D0[])(MapObject *); -extern int (*const Unk_020EF4C4[])(MapObject *); -extern int (*const Unk_020EF4B8[])(MapObject *); -extern int (*const Unk_020EF4AC[])(MapObject *); -extern int (*const Unk_020EF4A0[])(MapObject *); -extern int (*const Unk_020EF494[])(MapObject *); -extern int (*const Unk_020EF488[])(MapObject *); -extern int (*const Unk_020EF194[])(MapObject *); -extern int (*const Unk_020EF224[])(MapObject *); -extern int (*const Unk_020EF440[])(MapObject *); -extern int (*const Unk_020EF470[])(MapObject *); -extern int (*const Unk_020EF47C[])(MapObject *); -extern int (*const Unk_020EF230[])(MapObject *); -extern int (*const Unk_020EF458[])(MapObject *); -extern int (*const Unk_020EF464[])(MapObject *); -extern int (*const Unk_020EF5A8[])(MapObject *); -extern int (*const Unk_020EF5B4[])(MapObject *); -extern int (*const Unk_020EF434[])(MapObject *); -extern int (*const Unk_020EF428[])(MapObject *); -extern int (*const Unk_020EF41C[])(MapObject *); -extern int (*const Unk_020EF410[])(MapObject *); -extern int (*const Unk_020EF404[])(MapObject *); -extern int (*const Unk_020EF3F8[])(MapObject *); -extern int (*const Unk_020EF3EC[])(MapObject *); -extern int (*const Unk_020EF3E0[])(MapObject *); -extern int (*const Unk_020EF3D4[])(MapObject *); -extern int (*const Unk_020EF3C8[])(MapObject *); -extern int (*const Unk_020EF3BC[])(MapObject *); -extern int (*const Unk_020EF3B0[])(MapObject *); -extern int (*const Unk_020EF3A4[])(MapObject *); -extern int (*const Unk_020EF398[])(MapObject *); -extern int (*const Unk_020EF38C[])(MapObject *); -extern int (*const Unk_020EF380[])(MapObject *); -extern int (*const Unk_020EF374[])(MapObject *); -extern int (*const Unk_020EF368[])(MapObject *); -extern int (*const Unk_020EF35C[])(MapObject *); -extern int (*const Unk_020EF350[])(MapObject *); -extern int (*const Unk_020EF344[])(MapObject *); -extern int (*const Unk_020EF338[])(MapObject *); -extern int (*const Unk_020EF32C[])(MapObject *); -extern int (*const Unk_020EF320[])(MapObject *); -extern int (*const Unk_020EF314[])(MapObject *); -extern int (*const Unk_020EF308[])(MapObject *); -extern int (*const Unk_020EF2FC[])(MapObject *); -extern int (*const Unk_020EF2F0[])(MapObject *); -extern int (*const Unk_020EF2E4[])(MapObject *); -extern int (*const Unk_020EF2D8[])(MapObject *); -extern int (*const Unk_020EEC98[])(MapObject *); -extern int (*const Unk_020EF2C0[])(MapObject *); -extern int (*const Unk_020EF2B4[])(MapObject *); -extern int (*const Unk_020EF2A8[])(MapObject *); -extern int (*const Unk_020EF020[])(MapObject *); -extern int (*const Unk_020EF17C[])(MapObject *); -extern int (*const Unk_020EF1A0[])(MapObject *); -extern int (*const Unk_020EF44C[])(MapObject *); -extern int (*const Unk_020EF29C[])(MapObject *); -extern int (*const Unk_020EF290[])(MapObject *); -extern int (*const Unk_020EF284[])(MapObject *); -extern int (*const Unk_020EF278[])(MapObject *); -extern int (*const Unk_020EF26C[])(MapObject *); -extern int (*const Unk_020EF260[])(MapObject *); -extern int (*const Unk_020EF254[])(MapObject *); -extern int (*const Unk_020EF248[])(MapObject *); -extern int (*const Unk_020EF23C[])(MapObject *); -extern int (*const Unk_020EEC70[])(MapObject *); -extern int (*const Unk_020EEC68[])(MapObject *); -extern int (*const Unk_020EEC50[])(MapObject *); -extern int (*const Unk_020EEC90[])(MapObject *); -extern int (*const Unk_020EEC58[])(MapObject *); -extern int (*const Unk_020EEC60[])(MapObject *); -extern int (*const Unk_020EF218[])(MapObject *); -extern int (*const Unk_020EF20C[])(MapObject *); -extern int (*const Unk_020EF200[])(MapObject *); -extern int (*const Unk_020EF1F4[])(MapObject *); -extern int (*const Unk_020EF1E8[])(MapObject *); -extern int (*const Unk_020EF1DC[])(MapObject *); -extern int (*const Unk_020EF1D0[])(MapObject *); -extern int (*const Unk_020EF1C4[])(MapObject *); -extern int (*const Unk_020EF1B8[])(MapObject *); -extern int (*const Unk_020EF188[])(MapObject *); -extern int (*const Unk_020EF5C0[])(MapObject *); -extern int (*const Unk_020EF164[])(MapObject *); -extern int (*const Unk_020EF158[])(MapObject *); -extern int (*const Unk_020EF14C[])(MapObject *); -extern int (*const Unk_020EF140[])(MapObject *); -extern int (*const Unk_020EF134[])(MapObject *); -extern int (*const Unk_020EF128[])(MapObject *); -extern int (*const Unk_020EF11C[])(MapObject *); -extern int (*const Unk_020EF110[])(MapObject *); -extern int (*const Unk_020EF104[])(MapObject *); -extern int (*const Unk_020EF0F8[])(MapObject *); -extern int (*const Unk_020EF0EC[])(MapObject *); -extern int (*const Unk_020EF0E0[])(MapObject *); -extern int (*const Unk_020EF0D4[])(MapObject *); -extern int (*const Unk_020EF0C8[])(MapObject *); -extern int (*const Unk_020EF0BC[])(MapObject *); -extern int (*const Unk_020EF2CC[])(MapObject *); -extern int (*const Unk_020EF0A4[])(MapObject *); -extern int (*const Unk_020EF098[])(MapObject *); -extern int (*const Unk_020EF08C[])(MapObject *); -extern int (*const Unk_020EF080[])(MapObject *); -extern int (*const Unk_020EF074[])(MapObject *); -extern int (*const Unk_020EF068[])(MapObject *); -extern int (*const Unk_020EF05C[])(MapObject *); -extern int (*const Unk_020EF050[])(MapObject *); -extern int (*const Unk_020EF044[])(MapObject *); -extern int (*const Unk_020EF038[])(MapObject *); -extern int (*const Unk_020EF014[])(MapObject *); -extern int (*const Unk_020EF5CC[])(MapObject *); -extern int (*const Unk_020EEFF0[])(MapObject *); -extern int (*const Unk_020EEFE4[])(MapObject *); -extern int (*const Unk_020EEFD8[])(MapObject *); -extern int (*const Unk_020EEFCC[])(MapObject *); -extern int (*const Unk_020EEFC0[])(MapObject *); -extern int (*const Unk_020EEFB4[])(MapObject *); -extern int (*const Unk_020EEFA8[])(MapObject *); -extern int (*const Unk_020EF0B0[])(MapObject *); -extern int (*const Unk_020EEF90[])(MapObject *); -extern int (*const Unk_020EEF84[])(MapObject *); -extern int (*const Unk_020EEF6C[])(MapObject *); -extern int (*const Unk_020EEF78[])(MapObject *); -extern int (*const Unk_020EF008[])(MapObject *); -extern int (*const Unk_020EF02C[])(MapObject *); -extern int (*const Unk_020EF1AC[])(MapObject *); -extern int (*const Unk_020EF5D8[])(MapObject *); -extern int (*const Unk_020EECBC[])(MapObject *); -extern int (*const Unk_020EECB0[])(MapObject *); -extern int (*const Unk_020EECA4[])(MapObject *); -extern int (*const Unk_020EEF9C[])(MapObject *); -extern int (*const Unk_020EEF60[])(MapObject *); -extern int (*const Unk_020EEFFC[])(MapObject *); -extern int (*const Unk_020EF170[])(MapObject *); -extern int (*const Unk_020EF5E4[])(MapObject *); +extern int (*const gMovementActionFuncs_000[])(MapObject *); +extern int (*const gMovementActionFuncs_001[])(MapObject *); +extern int (*const gMovementActionFuncs_002[])(MapObject *); +extern int (*const gMovementActionFuncs_003[])(MapObject *); +extern int (*const gMovementActionFuncs_004[])(MapObject *); +extern int (*const gMovementActionFuncs_005[])(MapObject *); +extern int (*const gMovementActionFuncs_006[])(MapObject *); +extern int (*const gMovementActionFuncs_007[])(MapObject *); +extern int (*const gMovementActionFuncs_008[])(MapObject *); +extern int (*const gMovementActionFuncs_009[])(MapObject *); +extern int (*const gMovementActionFuncs_010[])(MapObject *); +extern int (*const gMovementActionFuncs_011[])(MapObject *); +extern int (*const gMovementActionFuncs_012[])(MapObject *); +extern int (*const gMovementActionFuncs_013[])(MapObject *); +extern int (*const gMovementActionFuncs_014[])(MapObject *); +extern int (*const gMovementActionFuncs_015[])(MapObject *); +extern int (*const gMovementActionFuncs_016[])(MapObject *); +extern int (*const gMovementActionFuncs_017[])(MapObject *); +extern int (*const gMovementActionFuncs_018[])(MapObject *); +extern int (*const gMovementActionFuncs_019[])(MapObject *); +extern int (*const gMovementActionFuncs_020[])(MapObject *); +extern int (*const gMovementActionFuncs_021[])(MapObject *); +extern int (*const gMovementActionFuncs_022[])(MapObject *); +extern int (*const gMovementActionFuncs_023[])(MapObject *); +extern int (*const gMovementActionFuncs_084[])(MapObject *); +extern int (*const gMovementActionFuncs_085[])(MapObject *); +extern int (*const gMovementActionFuncs_086[])(MapObject *); +extern int (*const gMovementActionFuncs_087[])(MapObject *); +extern int (*const gMovementActionFuncs_088[])(MapObject *); +extern int (*const gMovementActionFuncs_089[])(MapObject *); +extern int (*const gMovementActionFuncs_090[])(MapObject *); +extern int (*const gMovementActionFuncs_091[])(MapObject *); +extern int (*const gMovementActionFuncs_024[])(MapObject *); +extern int (*const gMovementActionFuncs_025[])(MapObject *); +extern int (*const gMovementActionFuncs_026[])(MapObject *); +extern int (*const gMovementActionFuncs_027[])(MapObject *); +extern int (*const gMovementActionFuncs_028[])(MapObject *); +extern int (*const gMovementActionFuncs_029[])(MapObject *); +extern int (*const gMovementActionFuncs_030[])(MapObject *); +extern int (*const gMovementActionFuncs_031[])(MapObject *); +extern int (*const gMovementActionFuncs_032[])(MapObject *); +extern int (*const gMovementActionFuncs_033[])(MapObject *); +extern int (*const gMovementActionFuncs_034[])(MapObject *); +extern int (*const gMovementActionFuncs_035[])(MapObject *); +extern int (*const gMovementActionFuncs_036[])(MapObject *); +extern int (*const gMovementActionFuncs_037[])(MapObject *); +extern int (*const gMovementActionFuncs_038[])(MapObject *); +extern int (*const gMovementActionFuncs_039[])(MapObject *); +extern int (*const gMovementActionFuncs_040[])(MapObject *); +extern int (*const gMovementActionFuncs_041[])(MapObject *); +extern int (*const gMovementActionFuncs_042[])(MapObject *); +extern int (*const gMovementActionFuncs_043[])(MapObject *); +extern int (*const gMovementActionFuncs_044[])(MapObject *); +extern int (*const gMovementActionFuncs_045[])(MapObject *); +extern int (*const gMovementActionFuncs_046[])(MapObject *); +extern int (*const gMovementActionFuncs_047[])(MapObject *); +extern int (*const gMovementActionFuncs_048[])(MapObject *); +extern int (*const gMovementActionFuncs_049[])(MapObject *); +extern int (*const gMovementActionFuncs_050[])(MapObject *); +extern int (*const gMovementActionFuncs_051[])(MapObject *); +extern int (*const gMovementActionFuncs_052[])(MapObject *); +extern int (*const gMovementActionFuncs_053[])(MapObject *); +extern int (*const gMovementActionFuncs_054[])(MapObject *); +extern int (*const gMovementActionFuncs_055[])(MapObject *); +extern int (*const gMovementActionFuncs_056[])(MapObject *); +extern int (*const gMovementActionFuncs_057[])(MapObject *); +extern int (*const gMovementActionFuncs_058[])(MapObject *); +extern int (*const gMovementActionFuncs_059[])(MapObject *); +extern int (*const gMovementActionFuncs_092[])(MapObject *); +extern int (*const gMovementActionFuncs_093[])(MapObject *); +extern int (*const gMovementActionFuncs_094[])(MapObject *); +extern int (*const gMovementActionFuncs_095[])(MapObject *); +extern int (*const gMovementActionFuncs_117[])(MapObject *); +extern int (*const gMovementActionFuncs_118[])(MapObject *); +extern int (*const gMovementActionFuncs_119[])(MapObject *); +extern int (*const gMovementActionFuncs_120[])(MapObject *); +extern int (*const gMovementActionFuncs_060[])(MapObject *); +extern int (*const gMovementActionFuncs_061[])(MapObject *); +extern int (*const gMovementActionFuncs_062[])(MapObject *); +extern int (*const gMovementActionFuncs_063[])(MapObject *); +extern int (*const gMovementActionFuncs_064[])(MapObject *); +extern int (*const gMovementActionFuncs_065[])(MapObject *); +extern int (*const gMovementActionFuncs_066[])(MapObject *); +extern int (*const gMovementActionFuncs_067[])(MapObject *); +extern int (*const gMovementActionFuncs_068[])(MapObject *); +extern int (*const gMovementActionFuncs_069[])(MapObject *); +extern int (*const gMovementActionFuncs_070[])(MapObject *); +extern int (*const gMovementActionFuncs_071[])(MapObject *); +extern int (*const gMovementActionFuncs_072[])(MapObject *); +extern int (*const gMovementActionFuncs_073[])(MapObject *); +extern int (*const gMovementActionFuncs_074[])(MapObject *); +extern int (*const gMovementActionFuncs_075[])(MapObject *); +extern int (*const gMovementActionFuncs_103[])(MapObject *); +extern int (*const gMovementActionFuncs_076[])(MapObject *); +extern int (*const gMovementActionFuncs_077[])(MapObject *); +extern int (*const gMovementActionFuncs_078[])(MapObject *); +extern int (*const gMovementActionFuncs_079[])(MapObject *); +extern int (*const gMovementActionFuncs_080[])(MapObject *); +extern int (*const gMovementActionFuncs_081[])(MapObject *); +extern int (*const gMovementActionFuncs_082[])(MapObject *); +extern int (*const gMovementActionFuncs_083[])(MapObject *); +extern int (*const gMovementActionFuncs_096[])(MapObject *); +extern int (*const gMovementActionFuncs_097[])(MapObject *); +extern int (*const gMovementActionFuncs_098[])(MapObject *); +extern int (*const gMovementActionFuncs_099[])(MapObject *); +extern int (*const gMovementActionFuncs_100[])(MapObject *); +extern int (*const gMovementActionFuncs_101[])(MapObject *); +extern int (*const gMovementActionFuncs_102[])(MapObject *); +extern int (*const gMovementActionFuncs_104[])(MapObject *); +extern int (*const gMovementActionFuncs_105[])(MapObject *); +extern int (*const gMovementActionFuncs_106[])(MapObject *); +extern int (*const gMovementActionFuncs_107[])(MapObject *); +extern int (*const gMovementActionFuncs_108[])(MapObject *); +extern int (*const gMovementActionFuncs_109[])(MapObject *); +extern int (*const gMovementActionFuncs_110[])(MapObject *); +extern int (*const gMovementActionFuncs_111[])(MapObject *); +extern int (*const gMovementActionFuncs_112[])(MapObject *); +extern int (*const gMovementActionFuncs_113[])(MapObject *); +extern int (*const gMovementActionFuncs_114[])(MapObject *); +extern int (*const gMovementActionFuncs_115[])(MapObject *); +extern int (*const gMovementActionFuncs_116[])(MapObject *); +extern int (*const gMovementActionFuncs_145[])(MapObject *); +extern int (*const gMovementActionFuncs_146[])(MapObject *); +extern int (*const gMovementActionFuncs_147[])(MapObject *); +extern int (*const gMovementActionFuncs_148[])(MapObject *); +extern int (*const gMovementActionFuncs_149[])(MapObject *); +extern int (*const gMovementActionFuncs_150[])(MapObject *); +extern int (*const gMovementActionFuncs_151[])(MapObject *); +extern int (*const gMovementActionFuncs_152[])(MapObject *); +extern int (*const gMovementActionFuncs_121[])(MapObject *); +extern int (*const gMovementActionFuncs_122[])(MapObject *); +extern int (*const gMovementActionFuncs_123[])(MapObject *); +extern int (*const gMovementActionFuncs_124[])(MapObject *); +extern int (*const gMovementActionFuncs_125[])(MapObject *); +extern int (*const gMovementActionFuncs_126[])(MapObject *); +extern int (*const gMovementActionFuncs_127[])(MapObject *); +extern int (*const gMovementActionFuncs_128[])(MapObject *); +extern int (*const gMovementActionFuncs_129[])(MapObject *); +extern int (*const gMovementActionFuncs_130[])(MapObject *); +extern int (*const gMovementActionFuncs_131[])(MapObject *); +extern int (*const gMovementActionFuncs_132[])(MapObject *); +extern int (*const gMovementActionFuncs_133[])(MapObject *); +extern int (*const gMovementActionFuncs_134[])(MapObject *); +extern int (*const gMovementActionFuncs_135[])(MapObject *); +extern int (*const gMovementActionFuncs_136[])(MapObject *); +extern int (*const gMovementActionFuncs_137[])(MapObject *); +extern int (*const gMovementActionFuncs_138[])(MapObject *); +extern int (*const gMovementActionFuncs_139[])(MapObject *); +extern int (*const gMovementActionFuncs_140[])(MapObject *); +extern int (*const gMovementActionFuncs_141[])(MapObject *); +extern int (*const gMovementActionFuncs_142[])(MapObject *); +extern int (*const gMovementActionFuncs_143[])(MapObject *); +extern int (*const gMovementActionFuncs_144[])(MapObject *); +extern int (*const gMovementActionFuncs_153[])(MapObject *); static const UnkStruct_020EDF0C Unk_020EDF0C = { 0x0, @@ -785,161 +781,161 @@ const UnkStruct_020EDF0C *const Unk_020EE3A8[] = { &Unk_020EE2B8 }; -int (*const *const Unk_020EE4B8[MAX_MOVEMENT_ACTION])(MapObject *) = { - Unk_020EEC78, - Unk_020EEC48, - Unk_020EEC88, - Unk_020EEC80, - Unk_020EF59C, - Unk_020EF590, - Unk_020EF584, - Unk_020EF578, - Unk_020EF56C, - Unk_020EF560, - Unk_020EF554, - Unk_020EF548, - Unk_020EF53C, - Unk_020EF530, - Unk_020EF524, - Unk_020EF518, - Unk_020EF50C, - Unk_020EF500, - Unk_020EF4F4, - Unk_020EF4E8, - Unk_020EF4DC, - Unk_020EF4D0, - Unk_020EF4C4, - Unk_020EF4B8, - Unk_020EF47C, - Unk_020EF230, - Unk_020EF458, - Unk_020EF464, - Unk_020EF5A8, - Unk_020EF5B4, - Unk_020EF434, - Unk_020EF428, - Unk_020EF41C, - Unk_020EF410, - Unk_020EF404, - Unk_020EF3F8, - Unk_020EF3EC, - Unk_020EF3E0, - Unk_020EF3D4, - Unk_020EF3C8, - Unk_020EF3BC, - Unk_020EF3B0, - Unk_020EF3A4, - Unk_020EF398, - Unk_020EF38C, - Unk_020EF380, - Unk_020EF374, - Unk_020EF368, - Unk_020EF35C, - Unk_020EF350, - Unk_020EF344, - Unk_020EF338, - Unk_020EF32C, - Unk_020EF320, - Unk_020EF314, - Unk_020EF308, - Unk_020EF2FC, - Unk_020EF2F0, - Unk_020EF2E4, - Unk_020EF2D8, - Unk_020EF29C, - Unk_020EF290, - Unk_020EF284, - Unk_020EF278, - Unk_020EF26C, - Unk_020EF260, - Unk_020EF254, - Unk_020EF248, - Unk_020EF23C, - Unk_020EEC70, - Unk_020EEC68, - Unk_020EEC50, - Unk_020EEC90, - Unk_020EEC58, - Unk_020EEC60, - Unk_020EF218, - Unk_020EF200, - Unk_020EF1F4, - Unk_020EF1E8, - Unk_020EF1DC, - Unk_020EF1D0, - Unk_020EF1C4, - Unk_020EF1B8, - Unk_020EF188, - Unk_020EF4AC, - Unk_020EF4A0, - Unk_020EF494, - Unk_020EF488, - Unk_020EF194, - Unk_020EF224, - Unk_020EF440, - Unk_020EF470, - Unk_020EEC98, - Unk_020EF2C0, - Unk_020EF2B4, - Unk_020EF2A8, - Unk_020EF5C0, - Unk_020EF164, - Unk_020EF158, - Unk_020EF14C, - Unk_020EF140, - Unk_020EF134, - Unk_020EF128, - Unk_020EF20C, - Unk_020EF11C, - Unk_020EF110, - Unk_020EF104, - Unk_020EF0F8, - Unk_020EF0EC, - Unk_020EF0E0, - Unk_020EF0D4, - Unk_020EF0C8, - Unk_020EF0BC, - Unk_020EF2CC, - Unk_020EF0A4, - Unk_020EF098, - Unk_020EF08C, - Unk_020EF020, - Unk_020EF17C, - Unk_020EF1A0, - Unk_020EF44C, - Unk_020EF5CC, - Unk_020EEFF0, - Unk_020EEFE4, - Unk_020EEFD8, - Unk_020EEFCC, - Unk_020EEFC0, - Unk_020EEFB4, - Unk_020EEFA8, - Unk_020EF0B0, - Unk_020EEF90, - Unk_020EEF84, - Unk_020EEF6C, - Unk_020EEF78, - Unk_020EF008, - Unk_020EF02C, - Unk_020EF1AC, - Unk_020EF5D8, - Unk_020EECBC, - Unk_020EECB0, - Unk_020EECA4, - Unk_020EEF9C, - Unk_020EEF60, - Unk_020EEFFC, - Unk_020EF170, - Unk_020EF080, - Unk_020EF074, - Unk_020EF068, - Unk_020EF05C, - Unk_020EF050, - Unk_020EF044, - Unk_020EF038, - Unk_020EF014, - Unk_020EF5E4 +int (*const *const gMovementActionFuncs[MAX_MOVEMENT_ACTION])(MapObject *) = { + gMovementActionFuncs_000, + gMovementActionFuncs_001, + gMovementActionFuncs_002, + gMovementActionFuncs_003, + gMovementActionFuncs_004, + gMovementActionFuncs_005, + gMovementActionFuncs_006, + gMovementActionFuncs_007, + gMovementActionFuncs_008, + gMovementActionFuncs_009, + gMovementActionFuncs_010, + gMovementActionFuncs_011, + gMovementActionFuncs_012, + gMovementActionFuncs_013, + gMovementActionFuncs_014, + gMovementActionFuncs_015, + gMovementActionFuncs_016, + gMovementActionFuncs_017, + gMovementActionFuncs_018, + gMovementActionFuncs_019, + gMovementActionFuncs_020, + gMovementActionFuncs_021, + gMovementActionFuncs_022, + gMovementActionFuncs_023, + gMovementActionFuncs_024, + gMovementActionFuncs_025, + gMovementActionFuncs_026, + gMovementActionFuncs_027, + gMovementActionFuncs_028, + gMovementActionFuncs_029, + gMovementActionFuncs_030, + gMovementActionFuncs_031, + gMovementActionFuncs_032, + gMovementActionFuncs_033, + gMovementActionFuncs_034, + gMovementActionFuncs_035, + gMovementActionFuncs_036, + gMovementActionFuncs_037, + gMovementActionFuncs_038, + gMovementActionFuncs_039, + gMovementActionFuncs_040, + gMovementActionFuncs_041, + gMovementActionFuncs_042, + gMovementActionFuncs_043, + gMovementActionFuncs_044, + gMovementActionFuncs_045, + gMovementActionFuncs_046, + gMovementActionFuncs_047, + gMovementActionFuncs_048, + gMovementActionFuncs_049, + gMovementActionFuncs_050, + gMovementActionFuncs_051, + gMovementActionFuncs_052, + gMovementActionFuncs_053, + gMovementActionFuncs_054, + gMovementActionFuncs_055, + gMovementActionFuncs_056, + gMovementActionFuncs_057, + gMovementActionFuncs_058, + gMovementActionFuncs_059, + gMovementActionFuncs_060, + gMovementActionFuncs_061, + gMovementActionFuncs_062, + gMovementActionFuncs_063, + gMovementActionFuncs_064, + gMovementActionFuncs_065, + gMovementActionFuncs_066, + gMovementActionFuncs_067, + gMovementActionFuncs_068, + gMovementActionFuncs_069, + gMovementActionFuncs_070, + gMovementActionFuncs_071, + gMovementActionFuncs_072, + gMovementActionFuncs_073, + gMovementActionFuncs_074, + gMovementActionFuncs_075, + gMovementActionFuncs_076, + gMovementActionFuncs_077, + gMovementActionFuncs_078, + gMovementActionFuncs_079, + gMovementActionFuncs_080, + gMovementActionFuncs_081, + gMovementActionFuncs_082, + gMovementActionFuncs_083, + gMovementActionFuncs_084, + gMovementActionFuncs_085, + gMovementActionFuncs_086, + gMovementActionFuncs_087, + gMovementActionFuncs_088, + gMovementActionFuncs_089, + gMovementActionFuncs_090, + gMovementActionFuncs_091, + gMovementActionFuncs_092, + gMovementActionFuncs_093, + gMovementActionFuncs_094, + gMovementActionFuncs_095, + gMovementActionFuncs_096, + gMovementActionFuncs_097, + gMovementActionFuncs_098, + gMovementActionFuncs_099, + gMovementActionFuncs_100, + gMovementActionFuncs_101, + gMovementActionFuncs_102, + gMovementActionFuncs_103, + gMovementActionFuncs_104, + gMovementActionFuncs_105, + gMovementActionFuncs_106, + gMovementActionFuncs_107, + gMovementActionFuncs_108, + gMovementActionFuncs_109, + gMovementActionFuncs_110, + gMovementActionFuncs_111, + gMovementActionFuncs_112, + gMovementActionFuncs_113, + gMovementActionFuncs_114, + gMovementActionFuncs_115, + gMovementActionFuncs_116, + gMovementActionFuncs_117, + gMovementActionFuncs_118, + gMovementActionFuncs_119, + gMovementActionFuncs_120, + gMovementActionFuncs_121, + gMovementActionFuncs_122, + gMovementActionFuncs_123, + gMovementActionFuncs_124, + gMovementActionFuncs_125, + gMovementActionFuncs_126, + gMovementActionFuncs_127, + gMovementActionFuncs_128, + gMovementActionFuncs_129, + gMovementActionFuncs_130, + gMovementActionFuncs_131, + gMovementActionFuncs_132, + gMovementActionFuncs_133, + gMovementActionFuncs_134, + gMovementActionFuncs_135, + gMovementActionFuncs_136, + gMovementActionFuncs_137, + gMovementActionFuncs_138, + gMovementActionFuncs_139, + gMovementActionFuncs_140, + gMovementActionFuncs_141, + gMovementActionFuncs_142, + gMovementActionFuncs_143, + gMovementActionFuncs_144, + gMovementActionFuncs_145, + gMovementActionFuncs_146, + gMovementActionFuncs_147, + gMovementActionFuncs_148, + gMovementActionFuncs_149, + gMovementActionFuncs_150, + gMovementActionFuncs_151, + gMovementActionFuncs_152, + gMovementActionFuncs_153, }; static const int Unk_020EDD5C[] = {