From f033bbae6da4f9265de3d6368fd4b7f8d0863bbb Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Fri, 17 Feb 2023 02:44:14 -0500 Subject: [PATCH] all data done (#945) * misc fold * omo cleanup * projectile target offset * missing actor part fields * msg chars * decimal offsets * partIndex -> partID * callables * EVT_PLAY_EFFECT * fix out of range offsets * some renames * battle_area -> battle/area * renames * battle names last * more power * hammer moves * hammer directory * all moves migrated * moved items * moved starpowers * fixed jp --------- Co-authored-by: HailSanta --- include/common.h | 4 +- include/common_structs.h | 20 +- include/enums.h | 46 +- include/functions.h | 12 +- include/macros.h | 4 - include/script_api/battle.h | 2 +- include/script_api/common.h | 1 + src/16F740.c | 73 +- src/16c8e0.c | 38 +- src/17FEB0.c | 91 +- src/181810.c | 14 +- src/182B30.c | 32 +- src/190B20.c | 70 +- src/19FAF0.c | 238 ++-- src/1A5830.c | 88 +- src/1AC760.c | 21 +- src/1AF230.c | 130 --- src/415D90.c | 4 +- src/77480.c | 21 +- src/7bb60_len_41b0.c | 58 +- src/7fd10_len_b40.c | 16 +- src/actor_api.c | 337 +++--- src/battle/action_cmd.c | 44 +- src/battle/action_cmd/07.c | 4 +- src/battle/action_cmd/07.h | 4 +- src/battle/action_cmd/0A.c | 2 +- src/battle/action_cmd/0A.h | 4 +- src/battle/action_cmd/air_lift.c | 4 +- src/battle/action_cmd/air_lift.h | 4 +- src/battle/action_cmd/air_raid.c | 2 +- src/battle/action_cmd/air_raid.h | 4 +- src/battle/action_cmd/body_slam.c | 2 +- src/battle/action_cmd/body_slam.h | 4 +- src/battle/action_cmd/bomb.c | 2 +- src/battle/action_cmd/bomb.h | 4 +- src/battle/action_cmd/break_free.c | 4 +- src/battle/action_cmd/break_free.h | 4 +- .../common/MashActionCommandStart.inc.c | 2 +- src/battle/action_cmd/dizzy_shell.c | 2 +- src/battle/action_cmd/dizzy_shell.h | 4 +- src/battle/action_cmd/fire_shell.c | 2 +- src/battle/action_cmd/fire_shell.h | 4 +- src/battle/action_cmd/flee.c | 4 +- src/battle/action_cmd/flee.h | 4 +- src/battle/action_cmd/hammer.c | 4 +- src/battle/action_cmd/hammer.h | 4 +- src/battle/action_cmd/hurricane.c | 4 +- src/battle/action_cmd/hurricane.h | 4 +- src/battle/action_cmd/jump.c | 4 +- src/battle/action_cmd/jump.h | 4 +- src/battle/action_cmd/mega_shock.c | 4 +- src/battle/action_cmd/mega_shock.h | 4 +- src/battle/action_cmd/power_shock.c | 4 +- src/battle/action_cmd/power_shock.h | 4 +- src/battle/action_cmd/smack.c | 2 +- src/battle/action_cmd/smack.h | 4 +- src/battle/action_cmd/spiny_surge.c | 4 +- src/battle/action_cmd/spiny_surge.h | 4 +- src/battle/action_cmd/spook.c | 2 +- src/battle/action_cmd/spook.h | 4 +- src/battle/action_cmd/squirt.c | 4 +- src/battle/action_cmd/squirt.h | 4 +- src/battle/action_cmd/stop_leech.c | 4 +- src/battle/action_cmd/stop_leech.h | 4 +- src/battle/action_cmd/tidal_wave.c | 4 +- src/battle/action_cmd/tidal_wave.h | 4 +- src/battle/action_cmd/water_block.c | 4 +- src/battle/action_cmd/water_block.h | 4 +- src/battle/action_cmd/whirlwind.c | 4 +- src/battle/action_cmd/whirlwind.h | 4 +- .../arn}/actor/hyper_cleft.c | 6 +- .../arn}/actor/hyper_paragoomba.c | 8 +- .../arn}/actor/hypergoomba.c | 2 +- .../arn}/actor/tubba_blubba.c | 2 +- .../arn}/actor/tubbas_heart.c | 6 +- src/battle/{area_arn => area/arn}/area.c | 72 +- .../{area_arn => area/arn}/stage/arn_01.c | 0 .../{area_arn => area/arn}/stage/arn_02.c | 0 .../{area_arn => area/arn}/stage/arn_03.c | 0 .../{area_arn => area/arn}/stage/arn_04.c | 0 .../{area_arn => area/arn}/stage/arn_05.c | 0 .../{area_arn => area/arn}/stage/arn_06.c | 0 .../{area_dgb => area/dgb}/actor/clubba.c | 0 .../dgb}/actor/tubba_blubba.c | 2 +- src/battle/{area_dgb => area/dgb}/area.c | 28 +- .../{area_dgb => area/dgb}/stage/dgb_01.c | 0 .../{area_dgb => area/dgb}/stage/dgb_02.c | 0 .../{area_dgb => area/dgb}/stage/dgb_03.c | 0 .../{area_dgb => area/dgb}/stage/dgb_04.c | 0 .../{area_dgb => area/dgb}/stage/dgb_05.c | 0 .../{area_dig => area/dig}/actor/bandit.c | 0 .../{area_dig => area/dig}/actor/fuzzy.c | 0 .../dig}/actor/koopa_troopa.c | 0 .../{area_dig => area/dig}/actor/monty_mole.c | 0 .../{area_dig => area/dig}/actor/pokey.c | 0 .../dig}/actor/red_shy_guy.c | 0 .../dig}/actor/tubba_blubba.c | 3 +- .../{area_dig => area/dig}/actor/whacka.c | 0 src/battle/{area_dig => area/dig}/area.c | 24 +- .../{area_dig => area/dig}/script/dig_01.c | 2 +- .../{area_dig => area/dig}/script/dig_02.c | 2 +- .../{area_dig => area/dig}/script/dig_03.c | 2 +- .../{area_dig => area/dig}/script/dig_04.c | 2 +- .../{area_dig => area/dig}/script/dig_05.c | 0 .../{area_dig => area/dig}/stage/dig_01.c | 0 .../{area_dig => area/dig}/stage/dig_02.c | 0 .../{area_dig => area/dig}/stage/dig_03.c | 0 .../{area_dig => area/dig}/stage/dig_04.c | 0 .../{area_dig => area/dig}/stage/dig_05.c | 0 .../flo}/actor/amazy_dayzee.c | 3 +- .../{area_flo => area/flo}/actor/bzzap.c | 0 .../flo}/actor/crazee_dayzee.c | 3 +- .../flo}/actor/green_magikoopa.c | 0 .../{area_flo => area/flo}/actor/lakitu.c | 9 +- .../{area_flo => area/flo}/actor/medi_guy.c | 0 .../flo}/actor/red_magikoopa.c | 0 .../{area_flo => area/flo}/actor/ruff_puff.c | 3 +- .../{area_flo => area/flo}/actor/spiny.c | 0 .../flo}/actor/white_magikoopa.c | 0 .../flo}/actor/yellow_magikoopa.c | 0 src/battle/{area_flo => area/flo}/area.c | 152 +-- .../{area_flo => area/flo}/stage/flo_01.c | 0 .../{area_flo => area/flo}/stage/flo_01b.c | 0 .../{area_flo => area/flo}/stage/flo_01c.c | 0 .../{area_flo => area/flo}/stage/flo_02.c | 0 .../{area_flo => area/flo}/stage/flo_02b.c | 0 .../{area_flo => area/flo}/stage/flo_02c.c | 0 .../{area_flo => area/flo}/stage/flo_03.c | 0 .../{area_flo => area/flo}/stage/flo_04.c | 0 .../{area_flo => area/flo}/stage/flo_05.c | 0 .../{area_flo => area/flo}/stage/flo_06.c | 0 .../flo2}/actor/huff_n_puff.c | 34 +- .../flo2}/actor/monty_mole_boss.c | 12 +- .../{area_flo2 => area/flo2}/actor/spike.c | 6 +- .../flo2}/actor/tuff_puff.c | 14 +- src/battle/{area_flo2 => area/flo2}/area.c | 28 +- .../{area_flo2 => area/flo2}/stage/flo_01.c | 0 .../{area_flo2 => area/flo2}/stage/flo_01b.c | 0 .../{area_flo2 => area/flo2}/stage/flo_01c.c | 0 .../{area_flo2 => area/flo2}/stage/flo_02.c | 0 .../{area_flo2 => area/flo2}/stage/flo_02b.c | 0 .../{area_flo2 => area/flo2}/stage/flo_02c.c | 0 .../{area_flo2 => area/flo2}/stage/flo_03.c | 0 .../{area_flo2 => area/flo2}/stage/flo_04.c | 0 .../{area_flo2 => area/flo2}/stage/flo_05.c | 0 .../{area_flo2 => area/flo2}/stage/flo_06.c | 0 .../{area_hos => area/hos}/actor/ember.c | 0 .../hos}/actor/goombario_tutor.c | 4 +- .../{area_hos => area/hos}/actor/magikoopa.c | 15 +- src/battle/{area_hos => area/hos}/area.c | 20 +- .../{area_hos => area/hos}/stage/hos_00.c | 0 .../{area_hos => area/hos}/stage/hos_01.c | 0 .../{area_hos => area/hos}/stage/hos_02.c | 0 .../isk_part_1}/actor/buzzy_beetle.c | 0 .../isk_part_1}/actor/pokey_mummy.c | 12 +- .../isk_part_1}/actor/stone_chomp.c | 26 +- .../isk_part_1}/actor/swooper.c | 0 .../isk_part_1}/area.c | 84 +- .../isk_part_1}/stage/isk_00.c | 0 .../isk_part_1}/stage/isk_01.c | 0 .../isk_part_1}/stage/isk_02.c | 0 .../isk_part_1}/stage/isk_02b.c | 0 .../isk_part_1}/stage/isk_02c.c | 0 .../isk_part_1}/stage/isk_03.c | 0 .../isk_part_1}/stage/isk_03b.c | 0 .../isk_part_1}/stage/isk_04.c | 4 +- .../isk_part_1}/stage/isk_05.c | 4 +- .../isk_part_1}/stage/isk_06.c | 4 +- .../isk_part_1}/stage/isk_06b.c | 4 +- .../isk_part_1}/stage/isk_07.c | 4 +- .../isk_part_1}/stage/isk_08.c | 4 +- .../isk_part_2}/actor/chain_chomp.c | 28 +- .../isk_part_2}/actor/tutankoopa.c | 25 +- .../isk_part_2}/area.c | 8 +- .../isk_part_2}/stage/isk_00.c | 0 .../isk_part_2}/stage/isk_01.c | 0 .../isk_part_2}/stage/isk_02.c | 0 .../isk_part_2}/stage/isk_02b.c | 0 .../isk_part_2}/stage/isk_02c.c | 0 .../isk_part_2}/stage/isk_03.c | 0 .../isk_part_2}/stage/isk_03b.c | 0 .../isk_part_2}/stage/isk_04.c | 4 +- .../isk_part_2}/stage/isk_05.c | 4 +- .../isk_part_2}/stage/isk_06.c | 4 +- .../isk_part_2}/stage/isk_06b.c | 4 +- .../isk_part_2}/stage/isk_07.c | 4 +- .../{area_iwa => area/iwa}/actor/buzzar.c | 10 +- .../{area_iwa => area/iwa}/actor/cleft.c | 6 +- .../{area_iwa => area/iwa}/actor/monty_mole.c | 0 .../{area_iwa => area/iwa}/actor/whacka.c | 0 src/battle/{area_iwa => area/iwa}/area.c | 60 +- .../{area_iwa => area/iwa}/stage/iwa_01.c | 0 .../{area_iwa => area/iwa}/stage/iwa_01b.c | 0 .../{area_iwa => area/iwa}/stage/iwa_02.c | 0 .../{area_jan => area/jan}/actor/hurt_plant.c | 7 +- .../jan}/actor/jungle_fuzzy.c | 2 +- .../{area_jan => area/jan}/actor/m_bush.c | 2 +- .../{area_jan => area/jan}/actor/medi_guy.c | 0 .../{area_jan => area/jan}/actor/spear_guy.c | 14 +- .../{area_jan => area/jan}/actor/spike_top.c | 0 src/battle/{area_jan => area/jan}/area.c | 72 +- .../{area_jan => area/jan}/stage/jan_00.c | 0 .../{area_jan => area/jan}/stage/jan_01.c | 0 .../{area_jan => area/jan}/stage/jan_01b.c | 0 .../{area_jan => area/jan}/stage/jan_02.c | 0 .../{area_jan => area/jan}/stage/jan_03.c | 0 .../{area_jan => area/jan}/stage/jan_03b.c | 0 .../{area_jan => area/jan}/stage/jan_04.c | 0 .../{area_jan => area/jan}/stage/jan_04b.c | 0 .../jan2}/actor/putrid_piranha.c | 0 .../jan2}/actor/white_magikoopa.c | 0 src/battle/{area_jan2 => area/jan2}/area.c | 20 +- .../{area_jan2 => area/jan2}/stage/jan_00.c | 0 .../{area_jan2 => area/jan2}/stage/jan_01.c | 0 .../{area_jan2 => area/jan2}/stage/jan_01b.c | 0 .../{area_jan2 => area/jan2}/stage/jan_02.c | 0 .../{area_jan2 => area/jan2}/stage/jan_03.c | 0 .../{area_jan2 => area/jan2}/stage/jan_03b.c | 0 .../{area_jan2 => area/jan2}/stage/jan_04.c | 0 .../{area_jan2 => area/jan2}/stage/jan_04b.c | 0 .../{area_kgr => area/kgr}/actor/fuzzipede.c | 14 +- src/battle/{area_kgr => area/kgr}/area.c | 8 +- .../{area_kgr => area/kgr}/stage/kgr_01.c | 0 .../kkj}/actor/kammy_koopa.c | 16 +- src/battle/{area_kkj => area/kkj}/area.c | 8 +- .../{area_kkj => area/kkj}/stage/kpa_05.c | 0 .../kmr_part_1}/actor/goomba.c | 0 .../kmr_part_1}/actor/paragoomba.c | 0 .../kmr_part_1}/actor/spiked_goomba.c | 0 .../kmr_part_1}/area.c | 52 +- .../kmr_part_1}/stage/kmr_02.c | 0 .../kmr_part_1}/stage/kmr_03.c | 0 .../kmr_part_1}/stage/kmr_04.c | 0 .../kmr_part_1}/stage/kmr_05.c | 0 .../kmr_part_1}/stage/kmr_06.c | 0 .../kmr_part_2}/actor/blue_goomba.c | 2 +- .../kmr_part_2}/actor/blue_goomba2.c | 2 +- .../kmr_part_2}/actor/goomba_king.c | 6 +- .../kmr_part_2}/actor/goomnut_tree.c | 10 +- .../kmr_part_2}/actor/red_goomba.c | 2 +- .../kmr_part_2}/actor/red_goomba2.c | 2 +- .../kmr_part_2}/area.c | 12 +- .../kmr_part_2}/stage/kmr_02.c | 0 .../kmr_part_2}/stage/kmr_03.c | 0 .../kmr_part_2}/stage/kmr_04.c | 0 .../kmr_part_2}/stage/kmr_05.c | 0 .../kmr_part_2}/stage/kmr_06.c | 0 .../kmr_part_3}/actor/egg_jr_troopa.c | 3 +- .../kmr_part_3}/actor/final_jr_troopa.c | 14 +- .../kmr_part_3}/actor/jr_troopa.c | 2 +- .../kmr_part_3}/actor/mage_jr_troopa.c | 5 +- .../kmr_part_3}/actor/para_jr_troopa.c | 8 +- .../kmr_part_3}/actor/paragoomba.c | 8 +- .../kmr_part_3}/actor/paragoomba2.c | 0 .../kmr_part_3}/actor/spiked_goomba.c | 2 +- .../kmr_part_3}/actor/spiked_para_jr_troopa.c | 10 +- .../kmr_part_3}/area.c | 36 +- .../kmr_part_3}/stage/kmr_02.c | 0 .../kmr_part_3}/stage/kmr_03.c | 0 .../kmr_part_3}/stage/kmr_04.c | 0 .../kmr_part_3}/stage/kmr_05.c | 0 .../kmr_part_3}/stage/kmr_06.c | 0 .../kmr_part_3}/stage/kpa_01.c | 0 .../kmr_part_3}/stage/mac_01.c | 0 .../kmr_part_3}/stage/mim_01.c | 0 .../kmr_part_3}/stage/nok_01.c | 0 .../kmr_part_3}/stage/sam_01.c | 0 .../kpa}/actor/bony_beetle.c | 15 +- .../{area_kpa => area/kpa}/actor/dry_bones.c | 18 +- .../{area_kpa => area/kpa}/actor/ember.c | 0 .../{area_kpa => area/kpa}/actor/hammer_bro.c | 0 .../{area_kpa => area/kpa}/actor/koopatrol.c | 0 .../{area_kpa => area/kpa}/actor/magikoopa.c | 0 src/battle/{area_kpa => area/kpa}/area.c | 246 ++-- .../{area_kpa => area/kpa}/stage/kpa_01.c | 0 .../{area_kpa => area/kpa}/stage/kpa_01b.c | 0 .../{area_kpa => area/kpa}/stage/kpa_02.c | 0 .../{area_kpa => area/kpa}/stage/kpa_03.c | 0 .../{area_kpa => area/kpa}/stage/kpa_04.c | 0 .../{area_kpa => area/kpa}/stage/kpa_04b.c | 0 .../{area_kpa => area/kpa}/stage/kpa_04c.c | 0 .../{area_kpa => area/kpa}/stage/kpa_05.c | 0 .../{area_kpa => area/kpa}/stage/kpa_07.c | 0 .../{area_kpa => area/kpa}/stage/kpa_08.c | 0 .../{area_kpa => area/kpa}/stage/kpa_09.c | 0 .../{area_kpa => area/kpa}/stage/kpa_11.c | 0 .../{area_kpa => area/kpa}/stage/kpa_13.c | 0 .../{area_kpa => area/kpa}/stage/kpa_14.c | 0 .../{area_kpa2 => area/kpa2}/actor/bowser.c | 3 +- .../kpa2}/actor/bowser_intro.c | 3 +- .../kpa2}/actor/bowser_phase_1.c | 3 +- .../kpa2}/actor/bowser_phase_2.c | 3 +- .../kpa2}/actor/bowser_phase_3.c | 5 +- src/battle/{area_kpa2 => area/kpa2}/area.c | 24 +- .../{area_kpa2 => area/kpa2}/stage/kpa_01.c | 0 .../{area_kpa2 => area/kpa2}/stage/kpa_02.c | 0 .../{area_kpa2 => area/kpa2}/stage/kpa_03.c | 0 .../{area_kpa3 => area/kpa3}/actor/anti_guy.c | 7 +- .../kpa3}/actor/duplighost.c | 0 src/battle/{area_kpa3 => area/kpa3}/area.c | 16 +- .../{area_kpa3 => area/kpa3}/stage/kpa_01.c | 0 .../kpa4}/actor/bombshell_bill.c | 3 +- .../kpa4}/actor/bombshell_bill_blaster.c | 5 +- .../kpa4}/actor/koopatrol.c | 0 .../kpa4}/actor/magikoopa.c | 0 src/battle/{area_kpa4 => area/kpa4}/area.c | 24 +- .../{area_kpa4 => area/kpa4}/stage/kpa_01.c | 0 .../{area_kpa4 => area/kpa4}/stage/kpa_01b.c | 0 .../{area_kpa4 => area/kpa4}/stage/kpa_02.c | 0 .../{area_kpa4 => area/kpa4}/stage/kpa_03.c | 0 .../{area_kpa4 => area/kpa4}/stage/kpa_04.c | 0 .../{area_kpa4 => area/kpa4}/stage/kpa_04b.c | 0 .../{area_kpa4 => area/kpa4}/stage/kpa_04c.c | 0 .../{area_kpa4 => area/kpa4}/stage/kpa_05.c | 0 .../{area_kpa4 => area/kpa4}/stage/kpa_07.c | 0 .../{area_kpa4 => area/kpa4}/stage/kpa_08.c | 0 .../{area_kpa4 => area/kpa4}/stage/kpa_09.c | 0 .../{area_kpa4 => area/kpa4}/stage/kpa_11.c | 0 .../{area_kpa4 => area/kpa4}/stage/kpa_13.c | 0 .../{area_kpa4 => area/kpa4}/stage/kpa_14.c | 0 .../kzn}/actor/lava_bubble.c | 15 +- .../{area_kzn => area/kzn}/actor/medi_guy.c | 0 .../kzn}/actor/putrid_piranha.c | 0 .../kzn}/actor/red_magikoopa.c | 0 .../{area_kzn => area/kzn}/actor/spike_top.c | 0 .../kzn}/actor/white_magikoopa.c | 0 src/battle/{area_kzn => area/kzn}/area.c | 88 +- .../{area_kzn => area/kzn}/stage/kzn_01.c | 0 .../{area_kzn => area/kzn}/stage/kzn_01b.c | 0 .../{area_kzn => area/kzn}/stage/kzn_02.c | 0 .../{area_kzn => area/kzn}/stage/kzn_04.c | 0 .../{area_kzn => area/kzn}/stage/kzn_04b.c | 0 .../{area_kzn => area/kzn}/stage/kzn_04c.c | 0 .../{area_kzn => area/kzn}/stage/kzn_05.c | 0 .../{area_kzn2 => area/kzn2}/actor/lava_bud.c | 10 +- .../kzn2}/actor/lava_piranha.c | 16 +- .../kzn2}/actor/petit_piranha.c | 7 +- .../kzn2}/actor/petit_piranha_bomb.c | 3 +- .../kzn2}/anim/lava_piranha_anim.c | 0 .../kzn2}/anim/lava_piranha_anim1.inc.c | 0 .../kzn2}/anim/lava_piranha_anim2.inc.c | 0 .../kzn2}/anim/lava_piranha_anim3.inc.c | 0 .../kzn2}/anim/lava_piranha_anim4.inc.c | 0 src/battle/area/kzn2/anim/unused_gfx.c | 32 + src/battle/{area_kzn2 => area/kzn2}/area.c | 12 +- .../{area_kzn2 => area/kzn2}/stage/kzn_01.c | 0 .../{area_kzn2 => area/kzn2}/stage/kzn_01b.c | 0 .../{area_kzn2 => area/kzn2}/stage/kzn_02.c | 0 .../{area_kzn2 => area/kzn2}/stage/kzn_04.c | 0 .../{area_kzn2 => area/kzn2}/stage/kzn_04b.c | 0 .../{area_kzn2 => area/kzn2}/stage/kzn_04c.c | 0 .../{area_kzn2 => area/kzn2}/stage/kzn_05.c | 0 .../{area_mac => area/mac}/actor/chan.c | 13 +- src/battle/{area_mac => area/mac}/actor/lee.c | 60 +- .../{area_mac => area/mac}/actor/master1.c | 3 +- .../{area_mac => area/mac}/actor/master2.c | 3 +- .../{area_mac => area/mac}/actor/master3.c | 5 +- src/battle/{area_mac => area/mac}/area.c | 24 +- .../{area_mac => area/mac}/stage/mac_01.c | 0 .../{area_mac => area/mac}/stage/mac_02.c | 0 .../{area_mim => area/mim}/actor/bzzap.c | 0 .../mim}/actor/forest_fuzzy.c | 2 +- .../mim}/actor/piranha_plant.c | 2 +- src/battle/{area_mim => area/mim}/area.c | 76 +- .../{area_mim => area/mim}/stage/mim_01.c | 0 .../{area_nok => area/nok}/actor/fuzzy.c | 0 .../{area_nok => area/nok}/actor/goomba.c | 0 .../nok}/actor/kent_c_koopa.c | 22 +- .../nok}/actor/koopa_troopa.c | 0 .../{area_nok => area/nok}/actor/paragoomba.c | 0 .../{area_nok => area/nok}/actor/paratroopa.c | 0 .../nok}/actor/spiked_goomba.c | 0 src/battle/{area_nok => area/nok}/area.c | 104 +- .../{area_nok => area/nok}/stage/nok_01.c | 0 .../{area_nok => area/nok}/stage/nok_02.c | 0 .../{area_nok => area/nok}/stage/nok_03.c | 0 .../{area_nok => area/nok}/stage/nok_04.c | 0 .../{area_omo => area/omo}/actor/anti_guy.c | 89 +- .../omo}/actor/blue_shy_guy.c | 89 +- .../omo}/actor/green_shy_guy.c | 89 +- .../{area_omo => area/omo}/actor/groove_guy.c | 114 +- .../{area_omo => area/omo}/actor/medi_guy.c | 0 .../omo}/actor/pink_shy_guy.c | 89 +- .../{area_omo => area/omo}/actor/pyro_guy.c | 41 +- .../omo}/actor/red_shy_guy.c | 0 .../{area_omo => area/omo}/actor/sky_guy.c | 284 ++--- .../{area_omo => area/omo}/actor/spy_guy.c | 165 +-- .../omo}/actor/yellow_shy_guy.c | 89 +- src/battle/{area_omo => area/omo}/area.c | 184 +-- .../{area_omo => area/omo}/stage/omo_01.c | 2 +- .../{area_omo => area/omo}/stage/omo_02.c | 0 .../{area_omo => area/omo}/stage/omo_03.c | 0 .../{area_omo => area/omo}/stage/omo_03b.c | 0 .../{area_omo => area/omo}/stage/omo_04.c | 0 .../{area_omo => area/omo}/stage/omo_05.c | 0 .../{area_omo => area/omo}/stage/omo_05b.c | 0 .../{area_omo => area/omo}/stage/omo_06.c | 0 .../{area_omo => area/omo}/stage/omo_07.c | 0 .../omo2}/actor/animation.inc.c | 0 .../omo2}/actor/general_guy.c | 6 +- .../omo2}/actor/light_bulb.c | 5 +- .../{area_omo2 => area/omo2}/actor/toy_tank.c | 17 +- src/battle/{area_omo2 => area/omo2}/area.c | 8 +- .../{area_omo2 => area/omo2}/stage/omo_07.c | 0 .../omo2_1}/actor/shy_squad.c | 54 +- .../omo2_2}/actor/stilt_guy.c | 30 +- .../omo2_3}/actor/shy_stack.c | 44 +- .../omo2_4}/actor/signal_guy.c | 3 +- .../omo2_5}/actor/shy_squad_dup.c | 48 +- .../omo2_6}/actor/shy_guy_dup.c | 27 +- .../omo3}/actor/big_lantern_ghost.c | 12 +- .../{area_omo3 => area/omo3}/actor/clubba.c | 0 .../{area_omo3 => area/omo3}/actor/fuzzy.c | 0 .../{area_omo3 => area/omo3}/actor/goomba.c | 0 .../omo3}/actor/hammer_bro.c | 0 .../omo3}/actor/koopatrol.c | 0 .../{area_omo3 => area/omo3}/actor/pokey.c | 0 .../omo3}/actor/red_shy_guy.c | 0 src/battle/{area_omo3 => area/omo3}/area.c | 48 +- .../{area_omo3 => area/omo3}/stage/omo_01.c | 2 +- .../{area_omo3 => area/omo3}/stage/omo_02.c | 0 .../{area_omo3 => area/omo3}/stage/omo_03.c | 0 .../{area_omo3 => area/omo3}/stage/omo_03b.c | 0 .../{area_omo3 => area/omo3}/stage/omo_04.c | 0 .../{area_omo3 => area/omo3}/stage/omo_05.c | 0 .../{area_omo3 => area/omo3}/stage/omo_05b.c | 0 .../{area_omo3 => area/omo3}/stage/omo_06.c | 0 .../{area_omo3 => area/omo3}/stage/omo_07.c | 0 .../pra}/actor/albino_dino.c | 3 +- .../pra}/actor/gray_magikoopa.c | 0 .../pra}/actor/green_magikoopa.c | 0 .../pra}/actor/red_magikoopa.c | 2 +- .../{area_pra => area/pra}/actor/swoopula.c | 0 .../pra}/actor/white_clubba.c | 0 .../pra}/actor/white_magikoopa.c | 0 .../pra}/actor/yellow_magikoopa.c | 0 src/battle/{area_pra => area/pra}/area.c | 64 +- .../{area_pra => area/pra}/stage/pra_01.c | 0 .../{area_pra => area/pra}/stage/pra_02.c | 0 .../{area_pra => area/pra}/stage/pra_03.c | 0 .../{area_pra => area/pra}/stage/pra_03b.c | 0 .../{area_pra => area/pra}/stage/pra_03c.c | 0 .../{area_pra => area/pra}/stage/pra_04.c | 0 .../pra2}/actor/crystal_bit.c | 20 +- .../pra2}/actor/crystal_king.c | 19 +- src/battle/{area_pra2 => area/pra2}/area.c | 8 +- .../{area_pra2 => area/pra2}/stage/sam_04.c | 0 .../pra3}/actor/duplighost.c | 0 .../pra3}/actor/gray_magikoopa.c | 0 .../pra3}/actor/red_magikoopa.c | 0 .../{area_pra3 => area/pra3}/actor/swoopula.c | 0 .../pra3}/actor/white_clubba.c | 0 src/battle/{area_pra3 => area/pra3}/area.c | 52 +- .../{area_pra3 => area/pra3}/stage/pra_01.c | 0 .../{area_pra3 => area/pra3}/stage/pra_02.c | 0 .../{area_pra3 => area/pra3}/stage/pra_03.c | 0 .../{area_pra3 => area/pra3}/stage/pra_03b.c | 0 .../{area_pra3 => area/pra3}/stage/pra_03c.c | 0 .../{area_pra3 => area/pra3}/stage/pra_04.c | 0 .../{area_sam => area/sam}/actor/duplighost.c | 0 .../sam}/actor/frost_piranha.c | 7 +- .../sam}/actor/gray_magikoopa.c | 0 .../{area_sam => area/sam}/actor/gulpit.c | 9 +- .../sam}/actor/gulpit_rocks.c | 3 +- .../sam}/actor/white_clubba.c | 0 src/battle/{area_sam => area/sam}/area.c | 60 +- .../{area_sam => area/sam}/stage/sam_01.c | 0 .../{area_sam => area/sam}/stage/sam_02.c | 0 .../{area_sam => area/sam}/stage/sam_02b.c | 0 .../{area_sam => area/sam}/stage/sam_02c.c | 0 .../{area_sam => area/sam}/stage/sam_02d.c | 0 .../{area_sam => area/sam}/stage/sam_03.c | 0 .../sam2}/actor/gray_magikoopa.c | 0 .../{area_sam2 => area/sam2}/actor/monstar.c | 20 +- .../sam2}/actor/paragoomba.c | 0 src/battle/{area_sam2 => area/sam2}/area.c | 12 +- src/battle/{area_sam2 => area/sam2}/dlist.c | 0 .../{area_sam2 => area/sam2}/stage/sam_01.c | 0 .../{area_sam2 => area/sam2}/stage/sam_02.c | 0 .../{area_sam2 => area/sam2}/stage/sam_02b.c | 0 .../{area_sam2 => area/sam2}/stage/sam_02c.c | 0 .../{area_sam2 => area/sam2}/stage/sam_02d.c | 0 .../{area_sam2 => area/sam2}/stage/sam_03.c | 0 src/battle/area/sam2/vtx.c | 5 + .../{area_sbk => area/sbk}/actor/bandit.c | 0 .../{area_sbk => area/sbk}/actor/pokey.c | 0 src/battle/{area_sbk => area/sbk}/area.c | 72 +- .../{area_sbk => area/sbk}/stage/sbk_02.c | 0 .../tik}/actor/buzzy_beetle.c | 0 .../{area_tik => area/tik}/actor/dark_koopa.c | 13 +- .../tik}/actor/dark_paratroopa.c | 23 +- .../{area_tik => area/tik}/actor/gloomba.c | 3 +- .../tik}/actor/paragloomba.c | 12 +- .../{area_tik => area/tik}/actor/spike_top.c | 0 .../tik}/actor/spiked_gloomba.c | 3 +- .../{area_tik => area/tik}/actor/spiny.c | 0 src/battle/{area_tik => area/tik}/area.c | 104 +- .../{area_tik => area/tik}/stage/tik_01.c | 0 .../{area_tik => area/tik}/stage/tik_02.c | 0 .../{area_tik => area/tik}/stage/tik_03.c | 0 .../{area_tik => area/tik}/stage/tik_04.c | 0 .../{area_tik => area/tik}/stage/tik_05.c | 0 .../{area_tik2 => area/tik2}/actor/blooper.c | 6 +- .../tik2}/actor/blooper_baby.c | 6 +- .../tik2}/actor/electro_blooper.c | 10 +- .../tik2}/actor/super_blooper.c | 8 +- src/battle/{area_tik2 => area/tik2}/area.c | 16 +- .../{area_tik2 => area/tik2}/stage/tik_01.c | 0 .../{area_tik2 => area/tik2}/stage/tik_02.c | 0 .../{area_tik2 => area/tik2}/stage/tik_03.c | 0 .../{area_tik2 => area/tik2}/stage/tik_04.c | 0 .../{area_tik2 => area/tik2}/stage/tik_05.c | 0 .../{area_tik3 => area/tik3}/actor/swooper.c | 0 .../{area_tik3 => area/tik3}/actor/swoopula.c | 0 src/battle/{area_tik3 => area/tik3}/area.c | 20 +- .../{area_tik3 => area/tik3}/stage/tik_01.c | 0 .../{area_tik3 => area/tik3}/stage/tik_02.c | 0 .../{area_tik3 => area/tik3}/stage/tik_03.c | 0 .../{area_tik3 => area/tik3}/stage/tik_04.c | 0 .../{area_tik3 => area/tik3}/stage/tik_05.c | 0 .../trd_part_1}/actor/bill_blaster.c | 6 +- .../trd_part_1}/actor/bob_omb.c | 2 +- .../trd_part_1}/actor/bullet_bill.c | 2 +- .../trd_part_1}/actor/koopa_troopa.c | 0 .../trd_part_1}/actor/paratroopa.c | 0 .../trd_part_1}/area.c | 112 +- .../trd_part_1}/stage/trd_00.c | 0 .../trd_part_1}/stage/trd_01.c | 0 .../trd_part_1}/stage/trd_02.c | 0 .../trd_part_1}/stage/trd_02b.c | 0 .../trd_part_1}/stage/trd_02c.c | 0 .../trd_part_1}/stage/trd_02d.c | 0 .../trd_part_1}/stage/trd_03.c | 0 .../trd_part_1}/stage/trd_04.c | 0 .../trd_part_1}/stage/trd_05.c | 0 .../trd_part_1}/stage/trd_05b.c | 0 .../trd_part_1}/stage/trd_05c.c | 0 .../trd_part_1}/stage/trd_05d.c | 0 .../trd_part_1}/stage/trd_05e.c | 0 .../trd_part_1}/stage/trd_05f.c | 0 .../trd_part_2}/actor/blue_ninja_koopa.c | 2 +- .../trd_part_2}/actor/fake_bowser.c | 26 +- .../trd_part_2}/actor/green_ninja_koopa.c | 2 +- .../trd_part_2}/actor/red_ninja_koopa.c | 2 +- .../trd_part_2}/actor/yellow_ninja_koopa.c | 2 +- .../trd_part_2}/area.c | 8 +- .../trd_part_2}/stage/trd_00.c | 0 .../trd_part_2}/stage/trd_01.c | 0 .../trd_part_2}/stage/trd_02.c | 0 .../trd_part_2}/stage/trd_02b.c | 0 .../trd_part_2}/stage/trd_03.c | 0 .../trd_part_2}/stage/trd_04.c | 0 .../trd_part_2}/stage/trd_05.c | 0 .../trd_part_2}/stage/trd_05b.c | 0 .../trd_part_2}/stage/trd_05c.c | 0 .../trd_part_2}/stage/trd_05d.c | 0 .../trd_part_2}/stage/trd_05e.c | 0 .../trd_part_2}/stage/trd_05f.c | 0 .../trd_part_3}/actor/eldstar.c | 2 +- .../trd_part_3}/area.c | 8 +- .../trd_part_3}/stage/nok_01.c | 0 src/battle/area_kzn2/anim/unused_gfx.c | 32 - src/battle/area_sam2/vtx.c | 5 - src/battle/battle.c | 340 ++---- src/battle/battle.h | 124 +- src/battle/battle_formation_names.h | 565 --------- src/battle/battle_stage_names.h | 248 ---- src/battle/battle_tables.h | 160 +-- src/battle/common/actor/bandit.inc.c | 6 +- src/battle/common/actor/buzzy_beetle.inc.c | 13 +- src/battle/common/actor/bzzap.inc.c | 24 +- src/battle/common/actor/clubba.inc.c | 3 +- src/battle/common/actor/duplighost.inc.c | 7 +- src/battle/common/actor/ember.inc.c | 15 +- src/battle/common/actor/fuzzy.inc.c | 2 +- src/battle/common/actor/ghost_bombette.inc.c | 3 +- src/battle/common/actor/ghost_bow.inc.c | 6 +- src/battle/common/actor/ghost_goombario.inc.c | 7 +- src/battle/common/actor/ghost_kooper.inc.c | 13 +- .../common/actor/ghost_lakilester.inc.c | 6 +- src/battle/common/actor/ghost_parakarry.inc.c | 6 +- src/battle/common/actor/ghost_sushie.inc.c | 3 +- src/battle/common/actor/ghost_watt.inc.c | 16 +- src/battle/common/actor/goomba.inc.c | 2 +- src/battle/common/actor/gray_magikoopa.inc.c | 12 +- src/battle/common/actor/green_magikoopa.inc.c | 12 +- src/battle/common/actor/hammer_bro.inc.c | 24 +- src/battle/common/actor/koopa_troopa.inc.c | 12 +- src/battle/common/actor/koopatrol.inc.c | 15 +- src/battle/common/actor/magikoopa.inc.c | 18 +- src/battle/common/actor/medi_guy.inc.c | 7 +- src/battle/common/actor/monty_mole.inc.c | 8 +- src/battle/common/actor/paragoomba.inc.c | 8 +- src/battle/common/actor/paratroopa.inc.c | 21 +- src/battle/common/actor/pokey.inc.c | 12 +- src/battle/common/actor/putrid_piranha.inc.c | 7 +- src/battle/common/actor/red_magikoopa.inc.c | 12 +- src/battle/common/actor/red_shy_guy.inc.c | 7 +- src/battle/common/actor/slot_machine.inc.c | 6 +- src/battle/common/actor/spike_top.inc.c | 12 +- src/battle/common/actor/spiked_goomba.inc.c | 2 +- src/battle/common/actor/spiny.inc.c | 6 +- src/battle/common/actor/swooper.inc.c | 5 +- src/battle/common/actor/swoopula.inc.c | 5 +- src/battle/common/actor/whacka.inc.c | 4 +- src/battle/common/actor/white_clubba.inc.c | 3 +- src/battle/common/actor/white_magikoopa.inc.c | 10 +- .../common/actor/yellow_magikoopa.inc.c | 12 +- .../move/HammerSupport.inc.c} | 279 ++--- .../move/JumpSupport.inc.c} | 245 +--- .../move/StarBeamSupport.inc.c} | 10 +- src/battle/formation_names.h | 565 +++++++++ src/battle/item/food.h | 24 - src/battle/item/life_shroom.h | 21 - src/battle/item/mushroom.h | 23 - src/battle/item/shooting_star.h | 18 - src/battle/item/sleepy_sheep.h | 23 - src/battle/item/strange_cake.h | 27 - src/battle/item/super_soda.h | 20 - .../move/auto_multibounce/auto_multibounce.c | 813 ------------- src/battle/move/d_down_jump/781920.c | 21 - src/battle/move/d_down_pound/74AD90.c | 23 - src/battle/move/dizzy_stomp/748DD0.c | 5 - src/battle/move/earthquake_jump/785B20.c | 12 - src/battle/move/hammer/attack.c | 353 ++++++ src/battle/move/hammer/auto_smash.c | 131 +++ src/battle/move/hammer/d_down_pound.c | 147 +++ src/battle/move/hammer/hammer.c | 942 --------------- src/battle/move/hammer/hammer_charge_0.c | 339 ++++++ src/battle/move/hammer/hammer_charge_1.c | 349 ++++++ src/battle/move/hammer/hammer_charge_2.c | 343 ++++++ src/battle/move/hammer/hammer_throw.c | 427 +++++++ src/battle/move/hammer/mega_quake.c | 215 ++++ src/battle/move/hammer/mega_smash.c | 110 ++ src/battle/move/hammer/power_quake.c | 162 +++ src/battle/move/hammer/power_smash.c | 105 ++ src/battle/move/hammer/quake_hammer.c | 147 +++ src/battle/move/hammer/shell_crack.c | 126 ++ src/battle/move/hammer/shrink_smash.c | 131 +++ src/battle/move/hammer/spin_smash.c | 424 +++++++ src/battle/move/hammer/super_smash.c | 106 ++ src/battle/move/hammer_charge_0/74F130.c | 43 - src/battle/move/hammer_charge_1/7595B0.c | 53 - src/battle/move/hammer_charge_2/75E5D0.c | 52 - src/battle/move/hammer_throw/752450.c | 7 - src/battle/{ => move}/item/ItemRefund.inc.c | 4 +- src/battle/{ => move}/item/UseItem.inc.c | 0 src/battle/{ => move}/item/coconut.c | 6 +- src/battle/{ => move}/item/coconut.h | 4 +- src/battle/{ => move}/item/dizzy_dial.c | 2 +- src/battle/{ => move}/item/dizzy_dial.h | 4 +- src/battle/{ => move}/item/dried_shroom.c | 4 +- src/battle/{ => move}/item/dried_shroom.h | 4 +- src/battle/{ => move}/item/dusty_hammer.c | 6 +- src/battle/{ => move}/item/dusty_hammer.h | 0 src/battle/{ => move}/item/egg_missile.c | 26 +- src/battle/{ => move}/item/egg_missile.h | 2 +- src/battle/{ => move}/item/electro_pop.c | 12 +- src/battle/{ => move}/item/electro_pop.h | 8 +- src/battle/{ => move}/item/fire_flower.c | 4 +- src/battle/{ => move}/item/fire_flower.h | 6 +- src/battle/{ => move}/item/food.c | 10 +- src/battle/move/item/food.h | 24 + src/battle/{ => move}/item/fright_jar.c | 2 +- src/battle/{ => move}/item/fright_jar.h | 4 +- src/battle/{ => move}/item/hustle_drink.c | 4 +- src/battle/{ => move}/item/hustle_drink.h | 4 +- src/battle/{ => move}/item/insecticide_herb.c | 12 +- src/battle/{ => move}/item/insecticide_herb.h | 6 +- src/battle/{ => move}/item/life_shroom.c | 10 +- src/battle/move/item/life_shroom.h | 21 + src/battle/{ => move}/item/mushroom.c | 10 +- src/battle/move/item/mushroom.h | 23 + src/battle/{ => move}/item/mystery.c | 8 +- src/battle/{ => move}/item/mystery.h | 4 +- src/battle/{ => move}/item/pebble.c | 6 +- src/battle/{ => move}/item/pebble.h | 0 src/battle/{ => move}/item/please_come_back.c | 2 +- src/battle/{ => move}/item/please_come_back.h | 0 src/battle/{ => move}/item/pow_block.c | 8 +- src/battle/{ => move}/item/pow_block.h | 6 +- src/battle/{ => move}/item/repel_gel.c | 4 +- src/battle/{ => move}/item/repel_gel.h | 2 +- src/battle/{ => move}/item/shooting_star.c | 10 +- src/battle/move/item/shooting_star.h | 18 + src/battle/{ => move}/item/sleepy_sheep.c | 24 +- src/battle/move/item/sleepy_sheep.h | 23 + src/battle/{ => move}/item/snowman_doll.c | 4 +- src/battle/{ => move}/item/snowman_doll.h | 6 +- src/battle/{ => move}/item/stone_cap.c | 2 +- src/battle/{ => move}/item/stone_cap.h | 2 +- src/battle/{ => move}/item/stop_watch.c | 2 +- src/battle/{ => move}/item/stop_watch.h | 6 +- src/battle/{ => move}/item/strange_cake.c | 32 +- src/battle/move/item/strange_cake.h | 27 + src/battle/{ => move}/item/super_soda.c | 8 +- src/battle/move/item/super_soda.h | 20 + src/battle/{ => move}/item/tasty_tonic.c | 2 +- src/battle/{ => move}/item/tasty_tonic.h | 2 +- src/battle/{ => move}/item/thunder_bolt.c | 4 +- src/battle/{ => move}/item/thunder_bolt.h | 6 +- src/battle/{ => move}/item/thunder_rage.c | 4 +- src/battle/{ => move}/item/thunder_rage.h | 6 +- src/battle/{ => move}/item/ultra_shroom.c | 4 +- src/battle/{ => move}/item/ultra_shroom.h | 4 +- src/battle/{ => move}/item/unknown_item.c | 4 +- src/battle/{ => move}/item/unknown_item.h | 4 +- src/battle/{ => move}/item/volt_shroom.c | 2 +- src/battle/{ => move}/item/volt_shroom.h | 2 +- src/battle/move/jump/attack.c | 569 +++++++++ src/battle/move/jump/auto_jump.c | 198 ++++ src/battle/move/jump/auto_multibounce.c | 456 ++++++++ src/battle/move/jump/d_down_jump.c | 222 ++++ src/battle/move/jump/demo_power_bounce.c | 470 ++++++++ src/battle/move/jump/dizzy_stomp.c | 185 +++ src/battle/move/jump/earthquake_jump.c | 705 ++++++++++++ src/battle/move/jump/jump.c | 926 --------------- src/battle/move/jump/jump_charge_0.c | 105 ++ src/battle/move/jump/jump_charge_1.c | 115 ++ src/battle/move/jump/jump_charge_2.c | 114 ++ src/battle/move/jump/mega_jump.c | 130 +++ src/battle/move/jump/multibounce.c | 487 ++++++++ src/battle/move/jump/power_bounce.c | 501 ++++++++ src/battle/move/jump/power_jump.c | 124 ++ src/battle/move/jump/shrink_stomp.c | 185 +++ src/battle/move/jump/sleep_stomp.c | 185 +++ src/battle/move/jump/super_jump.c | 125 ++ src/battle/move/jump_charge_0/74D570.c | 42 - src/battle/move/jump_charge_1/75C980.c | 50 - src/battle/move/jump_charge_2/761920.c | 50 - src/battle/move/mega_jump/770F30.c | 5 - src/battle/move/mega_quake/756780.c | 36 - src/battle/move/mega_smash/777690.c | 7 - src/battle/move/multibounce/740CC0.c | 5 - src/battle/move/power_bounce/743DF0.c | 48 - src/battle/move/power_jump/76D760.c | 5 - src/battle/move/power_quake/767C90.c | 7 - src/battle/move/power_smash/772BA0.c | 7 - src/battle/move/quake_hammer/quake_hammer.c | 739 ------------ src/battle/move/shell_crack/77F240.c | 24 - src/battle/move/shrink_smash/77CB80.c | 7 - src/battle/move/shrink_stomp/783BA0.c | 5 - src/battle/move/sleep_stomp/746E10.c | 5 - src/battle/move/spin_smash/spin_smash.c | 1017 ----------------- .../7900D0.c => move/star_power/chill_out.c} | 14 +- .../789E60.c => move/star_power/focus.c} | 8 +- .../78D150.c => move/star_power/lullaby.c} | 6 +- .../7997B0.c => move/star_power/peach_beam.c} | 6 +- .../star_power/peach_focus.c} | 6 +- .../78B600.c => move/star_power/refresh.c} | 12 +- .../791D90.c => move/star_power/smooch.c} | 6 +- .../796FC0.c => move/star_power/star_beam.c} | 6 +- .../78E7D0.c => move/star_power/star_storm.c} | 8 +- .../793D20.c => move/star_power/time_out.c} | 4 +- .../79D8A0.c => move/star_power/twink_dash.c} | 6 +- .../star_power/up_and_away.c} | 10 +- src/battle/move/super_jump/76F330.c | 5 - src/battle/move/super_smash/775100.c | 7 - src/battle/move/unknown_move/779C90.c | 32 - src/battle/partner/bombette.c | 12 +- src/battle/partner/bow.c | 17 +- src/battle/partner/goombario.c | 31 +- src/battle/partner/kooper.c | 10 +- src/battle/partner/lakilester.c | 36 +- src/battle/partner/parakarry.c | 51 +- src/battle/partner/sushie.c | 25 +- src/battle/partner/twink.c | 7 +- src/battle/partner/watt.c | 37 +- src/battle/stage_names.h | 248 ++++ src/{load_script.c => battle/use_items.c} | 76 +- src/battle/use_moves.c | 115 ++ src/battle/use_star_powers.c | 126 ++ src/common/UnkBowserFunc1.inc.c | 6 +- src/d0a70_len_4fe0.c | 144 +-- src/encounter_api.c | 9 +- src/entity/Shadow.c | 5 +- src/evt/npc_api.c | 14 +- src/evt/player_api.c | 4 +- src/evt/virtual_entity.c | 6 +- src/hud_element.c | 4 +- src/i_spy.c | 66 +- src/move_script.c | 125 -- src/msg.c | 6 +- src/npc.c | 36 +- src/pause/pause_main.c | 2 +- src/pause/pause_partners.c | 8 +- src/pause/pause_spirits.c | 14 +- src/trigger.c | 9 +- src/world/area_dro/dro_01/dro_01.h | 6 +- src/world/area_dro/dro_01/dro_01_3_npc.c | 24 +- src/world/area_end/common/Credits.inc.c | 14 +- src/world/area_hos/hos_05/hos_05_5_intro.c | 14 +- src/world/area_isk/isk_02/isk_02_5_npc.c | 6 +- src/world/area_isk/isk_04/isk_04_5_npc.c | 4 +- src/world/area_isk/isk_05/isk_05_3_npc.c | 4 +- src/world/area_isk/isk_07/isk_07_3_npc.c | 6 +- src/world/area_isk/isk_08/isk_08_2_npc.c | 2 +- src/world/area_isk/isk_13/isk_13_3_npc.c | 4 +- src/world/area_isk/isk_14/isk_14_3_npc.c | 4 +- src/world/area_isk/isk_16/isk_16_2_npc.c | 2 +- src/world/area_isk/isk_18/isk_18_2_npc.c | 10 +- src/world/area_iwa/iwa_10/iwa_10.h | 18 +- src/world/area_iwa/iwa_10/iwa_10_3_npc.c | 38 +- .../area_kkj/kkj_25/kkj_25_3_npc_midpoint.c | 14 +- .../area_kkj/kkj_25/kkj_25_7_kammy_defeated.c | 2 +- src/world/area_kmr/kmr_00/kmr_00_4_npc.c | 4 +- src/world/area_kmr/kmr_02/kmr_02_3_npc.c | 4 +- src/world/area_kmr/kmr_02/kmr_02_7_kammy.c | 4 +- src/world/area_kmr/kmr_03/kmr_03_3_npc.c | 2 +- src/world/area_kmr/kmr_04/kmr_04_3_npc.c | 2 +- src/world/area_kmr/kmr_05/kmr_05_3_npc.c | 16 +- src/world/area_kmr/kmr_06/kmr_06_3_npc.c | 4 +- .../area_kmr/kmr_06/kmr_06_5_sticker_sign.c | 2 +- src/world/area_kmr/kmr_07/kmr_07_3_npc.c | 2 +- src/world/area_kmr/kmr_09/kmr_09_3_npc.c | 12 +- src/world/area_kmr/kmr_11/kmr_11_4_npc.c | 2 +- src/world/area_kmr/kmr_12/kmr_12_3_npc.c | 4 +- src/world/area_kmr/kmr_22/npc/chapter_1.inc.c | 4 +- src/world/area_kmr/kmr_22/npc/chapter_7.inc.c | 10 +- src/world/area_kmr/kmr_22/npc/chapter_8.inc.c | 2 +- src/world/area_kpa/kpa_10/kpa_10_3_npc.c | 2 +- src/world/area_kpa/kpa_11/kpa_11_1_music.c | 2 +- src/world/area_kpa/kpa_11/kpa_11_4_npc.c | 2 +- src/world/area_kpa/kpa_12/kpa_12_1_music.c | 2 +- src/world/area_kpa/kpa_13/kpa_13_1_music.c | 2 +- src/world/area_kpa/kpa_14/kpa_14_1_music.c | 2 +- src/world/area_kpa/kpa_15/kpa_15_1_music.c | 2 +- src/world/area_kpa/kpa_16/kpa_16_1_music.c | 2 +- src/world/area_kpa/kpa_62/kpa_62_1_music.c | 2 +- src/world/area_kpa/kpa_70/kpa_70_1_music.c | 2 +- src/world/area_kpa/kpa_81/kpa_81_3_npc.c | 2 +- src/world/area_kpa/kpa_83/kpa_83_3_npc.c | 2 +- src/world/area_kzn/kzn_02/kzn_02_1_main.c | 2 +- src/world/area_kzn/kzn_03/kzn_03_1_main.c | 2 +- src/world/area_kzn/kzn_04/kzn_04_1_main.c | 2 +- src/world/area_kzn/kzn_05/kzn_05_1_main.c | 2 +- src/world/area_kzn/kzn_06/kzn_06_1_main.c | 4 +- src/world/area_kzn/kzn_07/kzn_07_1_music.c | 2 +- src/world/area_kzn/kzn_08/kzn_08_1_main.c | 2 +- src/world/area_kzn/kzn_09/kzn_09_1_main.c | 2 +- src/world/area_kzn/kzn_10/kzn_10_1_main.c | 2 +- src/world/area_kzn/kzn_11/kzn_11_1_main.c | 2 +- src/world/area_kzn/kzn_17/kzn_17_1_main.c | 2 +- src/world/area_kzn/kzn_18/kzn_18_1_main.c | 2 +- src/world/area_kzn/kzn_19/kzn_19_1_music.c | 4 +- src/world/area_kzn/kzn_20/kzn_20_1_music.c | 4 +- src/world/area_kzn/kzn_22/kzn_22_1_music.c | 2 +- src/world/area_kzn/kzn_23/kzn_23_1_music.c | 2 +- .../area_mac/mac_00/mac_00_10_shared_npc.c | 8 +- src/world/area_mac/mac_03/mac_03.h | 48 +- src/world/area_mac/mac_03/mac_03_4_npc.c | 40 +- src/world/area_mac/mac_05/mac_05_4_npc.c | 2 +- src/world/area_mac/machi/machi_5_npc.c | 4 +- src/world/area_mim/mim_07/mim_07_6_npc.c | 2 +- src/world/area_nok/nok_11/nok_11_4_npc.c | 2 +- src/world/area_obk/obk_04/obk_04_3_npc.c | 24 +- src/world/area_obk/obk_08/obk_08_5_npc.c | 24 +- src/world/area_sam/sam_01/sam_01_4_npc.c | 14 +- src/world/area_sam/sam_02/sam_02_4_npc.c | 6 +- src/world/area_sam/sam_03/sam_03_3_npc1.c | 2 +- src/world/area_sam/sam_06/sam_06_4_npc.c | 2 +- src/world/area_sam/sam_11/sam_11_5_npc.c | 18 +- src/world/area_sam/sam_12/sam_12_3_npc.c | 2 +- src/world/area_tik/tik_15/tik_15_5_npc.c | 2 +- src/world/area_trd/trd_00/trd_00_3_npc.c | 2 +- src/world/area_trd/trd_01/trd_01_3_npc.c | 8 +- src/world/area_trd/trd_02/trd_02_3_npc.c | 6 +- src/world/area_trd/trd_03/trd_03_3_npc.c | 8 +- src/world/area_trd/trd_04/trd_04_3_npc.c | 8 +- .../area_trd/trd_06/trd_06_3_npc_prisoners.c | 2 +- src/world/area_trd/trd_07/trd_07_2_npc.c | 6 +- src/world/area_trd/trd_08/trd_08_3_npc.c | 4 +- src/world/area_trd/trd_09/trd_09_3_npc.c | 32 +- src/world/area_trd/trd_10/trd_10_2_npc.c | 2 +- src/world/common/enemy/ai/MagikoopaAI.inc.c | 12 +- src/world/common/enemy/ai/SentinelAI.inc.c | 6 +- .../dead/area_kzn/kzn_11/kzn_11_1_main.c | 2 +- .../dead/area_kzn/kzn_17/kzn_17_1_main.c | 2 +- .../dead/area_kzn/kzn_18/kzn_18_1_main.c | 2 +- .../dead/area_kzn/kzn_19/kzn_19_1_music.c | 4 +- .../dead/area_kzn/kzn_20/kzn_20_1_music.c | 4 +- .../dead/area_kzn/kzn_22/kzn_22_1_music.c | 2 +- .../dead/area_kzn/kzn_23/kzn_23_1_music.c | 2 +- tools/disasm_script.py | 2 +- ver/jp/undefined_funcs_auto.txt | 82 -- ver/jp/undefined_syms.txt | 81 ++ .../battle/move/d_down_jump/781AF0.data.s | 45 - .../battle/move/d_down_pound/74AF40.data.s | 39 - .../battle/move/dizzy_stomp/748EC0.data.s | 45 - .../battle/move/earthquake_jump/785C20.data.s | 42 - .../battle/move/hammer_charge_0/74F3D0.data.s | 48 - .../battle/move/hammer_charge_1/7598D0.data.s | 48 - .../battle/move/hammer_charge_2/75E8F0.data.s | 48 - .../battle/move/hammer_throw/752500.data.s | 87 -- .../battle/move/jump_charge_0/74D850.data.s | 27 - .../battle/move/jump_charge_1/75CCE0.data.s | 27 - .../battle/move/jump_charge_2/761C80.data.s | 27 - .../data/battle/move/mega_jump/771020.data.s | 48 - .../data/battle/move/mega_quake/756900.data.s | 36 - .../data/battle/move/mega_smash/777740.data.s | 42 - .../battle/move/multibounce/740DB0.data.s | 48 - .../battle/move/power_bounce/743FF0.data.s | 48 - .../data/battle/move/power_jump/76D850.data.s | 48 - .../battle/move/power_quake/767D40.data.s | 36 - .../battle/move/power_smash/772C50.data.s | 42 - .../battle/move/shell_crack/77F3D0.data.s | 42 - .../battle/move/shrink_smash/77CC30.data.s | 39 - .../battle/move/shrink_stomp/783C90.data.s | 45 - .../battle/move/sleep_stomp/746F00.data.s | 45 - .../data/battle/move/super_jump/76F420.data.s | 48 - .../battle/move/super_smash/7751B0.data.s | 42 - .../battle/move/unknown_move/779E30.data.s | 45 - ver/us/splat.yaml | 457 ++++---- ver/us/symbol_addrs.txt | 776 +++++++------ ver/us/undefined_syms.txt | 30 +- 915 files changed, 14574 insertions(+), 12841 deletions(-) delete mode 100644 src/1AF230.c rename src/battle/{area_arn => area/arn}/actor/hyper_cleft.c (99%) rename src/battle/{area_arn => area/arn}/actor/hyper_paragoomba.c (99%) rename src/battle/{area_arn => area/arn}/actor/hypergoomba.c (99%) rename src/battle/{area_arn => area/arn}/actor/tubba_blubba.c (99%) rename src/battle/{area_arn => area/arn}/actor/tubbas_heart.c (99%) rename src/battle/{area_arn => area/arn}/area.c (66%) rename src/battle/{area_arn => area/arn}/stage/arn_01.c (100%) rename src/battle/{area_arn => area/arn}/stage/arn_02.c (100%) rename src/battle/{area_arn => area/arn}/stage/arn_03.c (100%) rename src/battle/{area_arn => area/arn}/stage/arn_04.c (100%) rename src/battle/{area_arn => area/arn}/stage/arn_05.c (100%) rename src/battle/{area_arn => area/arn}/stage/arn_06.c (100%) rename src/battle/{area_dgb => area/dgb}/actor/clubba.c (100%) rename src/battle/{area_dgb => area/dgb}/actor/tubba_blubba.c (99%) rename src/battle/{area_dgb => area/dgb}/area.c (68%) rename src/battle/{area_dgb => area/dgb}/stage/dgb_01.c (100%) rename src/battle/{area_dgb => area/dgb}/stage/dgb_02.c (100%) rename src/battle/{area_dgb => area/dgb}/stage/dgb_03.c (100%) rename src/battle/{area_dgb => area/dgb}/stage/dgb_04.c (100%) rename src/battle/{area_dgb => area/dgb}/stage/dgb_05.c (100%) rename src/battle/{area_dig => area/dig}/actor/bandit.c (100%) rename src/battle/{area_dig => area/dig}/actor/fuzzy.c (100%) rename src/battle/{area_dig => area/dig}/actor/koopa_troopa.c (100%) rename src/battle/{area_dig => area/dig}/actor/monty_mole.c (100%) rename src/battle/{area_dig => area/dig}/actor/pokey.c (100%) rename src/battle/{area_dig => area/dig}/actor/red_shy_guy.c (100%) rename src/battle/{area_dig => area/dig}/actor/tubba_blubba.c (99%) rename src/battle/{area_dig => area/dig}/actor/whacka.c (100%) rename src/battle/{area_dig => area/dig}/area.c (72%) rename src/battle/{area_dig => area/dig}/script/dig_01.c (94%) rename src/battle/{area_dig => area/dig}/script/dig_02.c (95%) rename src/battle/{area_dig => area/dig}/script/dig_03.c (94%) rename src/battle/{area_dig => area/dig}/script/dig_04.c (95%) rename src/battle/{area_dig => area/dig}/script/dig_05.c (100%) rename src/battle/{area_dig => area/dig}/stage/dig_01.c (100%) rename src/battle/{area_dig => area/dig}/stage/dig_02.c (100%) rename src/battle/{area_dig => area/dig}/stage/dig_03.c (100%) rename src/battle/{area_dig => area/dig}/stage/dig_04.c (100%) rename src/battle/{area_dig => area/dig}/stage/dig_05.c (100%) rename src/battle/{area_flo => area/flo}/actor/amazy_dayzee.c (99%) rename src/battle/{area_flo => area/flo}/actor/bzzap.c (100%) rename src/battle/{area_flo => area/flo}/actor/crazee_dayzee.c (99%) rename src/battle/{area_flo => area/flo}/actor/green_magikoopa.c (100%) rename src/battle/{area_flo => area/flo}/actor/lakitu.c (99%) rename src/battle/{area_flo => area/flo}/actor/medi_guy.c (100%) rename src/battle/{area_flo => area/flo}/actor/red_magikoopa.c (100%) rename src/battle/{area_flo => area/flo}/actor/ruff_puff.c (99%) rename src/battle/{area_flo => area/flo}/actor/spiny.c (100%) rename src/battle/{area_flo => area/flo}/actor/white_magikoopa.c (100%) rename src/battle/{area_flo => area/flo}/actor/yellow_magikoopa.c (100%) rename src/battle/{area_flo => area/flo}/area.c (68%) rename src/battle/{area_flo => area/flo}/stage/flo_01.c (100%) rename src/battle/{area_flo => area/flo}/stage/flo_01b.c (100%) rename src/battle/{area_flo => area/flo}/stage/flo_01c.c (100%) rename src/battle/{area_flo => area/flo}/stage/flo_02.c (100%) rename src/battle/{area_flo => area/flo}/stage/flo_02b.c (100%) rename src/battle/{area_flo => area/flo}/stage/flo_02c.c (100%) rename src/battle/{area_flo => area/flo}/stage/flo_03.c (100%) rename src/battle/{area_flo => area/flo}/stage/flo_04.c (100%) rename src/battle/{area_flo => area/flo}/stage/flo_05.c (100%) rename src/battle/{area_flo => area/flo}/stage/flo_06.c (100%) rename src/battle/{area_flo2 => area/flo2}/actor/huff_n_puff.c (99%) rename src/battle/{area_flo2 => area/flo2}/actor/monty_mole_boss.c (98%) rename src/battle/{area_flo2 => area/flo2}/actor/spike.c (99%) rename src/battle/{area_flo2 => area/flo2}/actor/tuff_puff.c (97%) rename src/battle/{area_flo2 => area/flo2}/area.c (72%) rename src/battle/{area_flo2 => area/flo2}/stage/flo_01.c (100%) rename src/battle/{area_flo2 => area/flo2}/stage/flo_01b.c (100%) rename src/battle/{area_flo2 => area/flo2}/stage/flo_01c.c (100%) rename src/battle/{area_flo2 => area/flo2}/stage/flo_02.c (100%) rename src/battle/{area_flo2 => area/flo2}/stage/flo_02b.c (100%) rename src/battle/{area_flo2 => area/flo2}/stage/flo_02c.c (100%) rename src/battle/{area_flo2 => area/flo2}/stage/flo_03.c (100%) rename src/battle/{area_flo2 => area/flo2}/stage/flo_04.c (100%) rename src/battle/{area_flo2 => area/flo2}/stage/flo_05.c (100%) rename src/battle/{area_flo2 => area/flo2}/stage/flo_06.c (100%) rename src/battle/{area_hos => area/hos}/actor/ember.c (100%) rename src/battle/{area_hos => area/hos}/actor/goombario_tutor.c (99%) rename src/battle/{area_hos => area/hos}/actor/magikoopa.c (99%) rename src/battle/{area_hos => area/hos}/area.c (66%) rename src/battle/{area_hos => area/hos}/stage/hos_00.c (100%) rename src/battle/{area_hos => area/hos}/stage/hos_01.c (100%) rename src/battle/{area_hos => area/hos}/stage/hos_02.c (100%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/actor/buzzy_beetle.c (100%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/actor/pokey_mummy.c (99%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/actor/stone_chomp.c (98%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/actor/swooper.c (100%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/area.c (74%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/stage/isk_00.c (100%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/stage/isk_01.c (100%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/stage/isk_02.c (100%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/stage/isk_02b.c (100%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/stage/isk_02c.c (100%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/stage/isk_03.c (100%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/stage/isk_03b.c (100%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/stage/isk_04.c (90%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/stage/isk_05.c (88%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/stage/isk_06.c (85%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/stage/isk_06b.c (87%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/stage/isk_07.c (85%) rename src/battle/{area_isk_part_1 => area/isk_part_1}/stage/isk_08.c (85%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/actor/chain_chomp.c (98%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/actor/tutankoopa.c (98%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/area.c (85%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/stage/isk_00.c (100%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/stage/isk_01.c (100%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/stage/isk_02.c (100%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/stage/isk_02b.c (100%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/stage/isk_02c.c (100%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/stage/isk_03.c (100%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/stage/isk_03b.c (100%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/stage/isk_04.c (89%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/stage/isk_05.c (87%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/stage/isk_06.c (85%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/stage/isk_06b.c (87%) rename src/battle/{area_isk_part_2 => area/isk_part_2}/stage/isk_07.c (85%) rename src/battle/{area_iwa => area/iwa}/actor/buzzar.c (99%) rename src/battle/{area_iwa => area/iwa}/actor/cleft.c (99%) rename src/battle/{area_iwa => area/iwa}/actor/monty_mole.c (100%) rename src/battle/{area_iwa => area/iwa}/actor/whacka.c (100%) rename src/battle/{area_iwa => area/iwa}/area.c (66%) rename src/battle/{area_iwa => area/iwa}/stage/iwa_01.c (100%) rename src/battle/{area_iwa => area/iwa}/stage/iwa_01b.c (100%) rename src/battle/{area_iwa => area/iwa}/stage/iwa_02.c (100%) rename src/battle/{area_jan => area/jan}/actor/hurt_plant.c (98%) rename src/battle/{area_jan => area/jan}/actor/jungle_fuzzy.c (99%) rename src/battle/{area_jan => area/jan}/actor/m_bush.c (99%) rename src/battle/{area_jan => area/jan}/actor/medi_guy.c (100%) rename src/battle/{area_jan => area/jan}/actor/spear_guy.c (99%) rename src/battle/{area_jan => area/jan}/actor/spike_top.c (100%) rename src/battle/{area_jan => area/jan}/area.c (71%) rename src/battle/{area_jan => area/jan}/stage/jan_00.c (100%) rename src/battle/{area_jan => area/jan}/stage/jan_01.c (100%) rename src/battle/{area_jan => area/jan}/stage/jan_01b.c (100%) rename src/battle/{area_jan => area/jan}/stage/jan_02.c (100%) rename src/battle/{area_jan => area/jan}/stage/jan_03.c (100%) rename src/battle/{area_jan => area/jan}/stage/jan_03b.c (100%) rename src/battle/{area_jan => area/jan}/stage/jan_04.c (100%) rename src/battle/{area_jan => area/jan}/stage/jan_04b.c (100%) rename src/battle/{area_jan2 => area/jan2}/actor/putrid_piranha.c (100%) rename src/battle/{area_jan2 => area/jan2}/actor/white_magikoopa.c (100%) rename src/battle/{area_jan2 => area/jan2}/area.c (74%) rename src/battle/{area_jan2 => area/jan2}/stage/jan_00.c (100%) rename src/battle/{area_jan2 => area/jan2}/stage/jan_01.c (100%) rename src/battle/{area_jan2 => area/jan2}/stage/jan_01b.c (100%) rename src/battle/{area_jan2 => area/jan2}/stage/jan_02.c (100%) rename src/battle/{area_jan2 => area/jan2}/stage/jan_03.c (100%) rename src/battle/{area_jan2 => area/jan2}/stage/jan_03b.c (100%) rename src/battle/{area_jan2 => area/jan2}/stage/jan_04.c (100%) rename src/battle/{area_jan2 => area/jan2}/stage/jan_04b.c (100%) rename src/battle/{area_kgr => area/kgr}/actor/fuzzipede.c (99%) rename src/battle/{area_kgr => area/kgr}/area.c (64%) rename src/battle/{area_kgr => area/kgr}/stage/kgr_01.c (100%) rename src/battle/{area_kkj => area/kkj}/actor/kammy_koopa.c (97%) rename src/battle/{area_kkj => area/kkj}/area.c (59%) rename src/battle/{area_kkj => area/kkj}/stage/kpa_05.c (100%) rename src/battle/{area_kmr_part_1 => area/kmr_part_1}/actor/goomba.c (100%) rename src/battle/{area_kmr_part_1 => area/kmr_part_1}/actor/paragoomba.c (100%) rename src/battle/{area_kmr_part_1 => area/kmr_part_1}/actor/spiked_goomba.c (100%) rename src/battle/{area_kmr_part_1 => area/kmr_part_1}/area.c (63%) rename src/battle/{area_kmr_part_1 => area/kmr_part_1}/stage/kmr_02.c (100%) rename src/battle/{area_kmr_part_1 => area/kmr_part_1}/stage/kmr_03.c (100%) rename src/battle/{area_kmr_part_1 => area/kmr_part_1}/stage/kmr_04.c (100%) rename src/battle/{area_kmr_part_1 => area/kmr_part_1}/stage/kmr_05.c (100%) rename src/battle/{area_kmr_part_1 => area/kmr_part_1}/stage/kmr_06.c (100%) rename src/battle/{area_kmr_part_2 => area/kmr_part_2}/actor/blue_goomba.c (99%) rename src/battle/{area_kmr_part_2 => area/kmr_part_2}/actor/blue_goomba2.c (99%) rename src/battle/{area_kmr_part_2 => area/kmr_part_2}/actor/goomba_king.c (99%) rename src/battle/{area_kmr_part_2 => area/kmr_part_2}/actor/goomnut_tree.c (98%) rename src/battle/{area_kmr_part_2 => area/kmr_part_2}/actor/red_goomba.c (99%) rename src/battle/{area_kmr_part_2 => area/kmr_part_2}/actor/red_goomba2.c (99%) rename src/battle/{area_kmr_part_2 => area/kmr_part_2}/area.c (81%) rename src/battle/{area_kmr_part_2 => area/kmr_part_2}/stage/kmr_02.c (100%) rename src/battle/{area_kmr_part_2 => area/kmr_part_2}/stage/kmr_03.c (100%) rename src/battle/{area_kmr_part_2 => area/kmr_part_2}/stage/kmr_04.c (100%) rename src/battle/{area_kmr_part_2 => area/kmr_part_2}/stage/kmr_05.c (100%) rename src/battle/{area_kmr_part_2 => area/kmr_part_2}/stage/kmr_06.c (100%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/actor/egg_jr_troopa.c (99%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/actor/final_jr_troopa.c (99%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/actor/jr_troopa.c (99%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/actor/mage_jr_troopa.c (99%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/actor/para_jr_troopa.c (99%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/actor/paragoomba.c (99%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/actor/paragoomba2.c (100%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/actor/spiked_goomba.c (99%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/actor/spiked_para_jr_troopa.c (99%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/area.c (65%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/stage/kmr_02.c (100%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/stage/kmr_03.c (100%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/stage/kmr_04.c (100%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/stage/kmr_05.c (100%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/stage/kmr_06.c (100%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/stage/kpa_01.c (100%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/stage/mac_01.c (100%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/stage/mim_01.c (100%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/stage/nok_01.c (100%) rename src/battle/{area_kmr_part_3 => area/kmr_part_3}/stage/sam_01.c (100%) rename src/battle/{area_kpa => area/kpa}/actor/bony_beetle.c (99%) rename src/battle/{area_kpa => area/kpa}/actor/dry_bones.c (97%) rename src/battle/{area_kpa => area/kpa}/actor/ember.c (100%) rename src/battle/{area_kpa => area/kpa}/actor/hammer_bro.c (100%) rename src/battle/{area_kpa => area/kpa}/actor/koopatrol.c (100%) rename src/battle/{area_kpa => area/kpa}/actor/magikoopa.c (100%) rename src/battle/{area_kpa => area/kpa}/area.c (68%) rename src/battle/{area_kpa => area/kpa}/stage/kpa_01.c (100%) rename src/battle/{area_kpa => area/kpa}/stage/kpa_01b.c (100%) rename src/battle/{area_kpa => area/kpa}/stage/kpa_02.c (100%) rename src/battle/{area_kpa => area/kpa}/stage/kpa_03.c (100%) rename src/battle/{area_kpa => area/kpa}/stage/kpa_04.c (100%) rename src/battle/{area_kpa => area/kpa}/stage/kpa_04b.c (100%) rename src/battle/{area_kpa => area/kpa}/stage/kpa_04c.c (100%) rename src/battle/{area_kpa => area/kpa}/stage/kpa_05.c (100%) rename src/battle/{area_kpa => area/kpa}/stage/kpa_07.c (100%) rename src/battle/{area_kpa => area/kpa}/stage/kpa_08.c (100%) rename src/battle/{area_kpa => area/kpa}/stage/kpa_09.c (100%) rename src/battle/{area_kpa => area/kpa}/stage/kpa_11.c (100%) rename src/battle/{area_kpa => area/kpa}/stage/kpa_13.c (100%) rename src/battle/{area_kpa => area/kpa}/stage/kpa_14.c (100%) rename src/battle/{area_kpa2 => area/kpa2}/actor/bowser.c (99%) rename src/battle/{area_kpa2 => area/kpa2}/actor/bowser_intro.c (99%) rename src/battle/{area_kpa2 => area/kpa2}/actor/bowser_phase_1.c (99%) rename src/battle/{area_kpa2 => area/kpa2}/actor/bowser_phase_2.c (99%) rename src/battle/{area_kpa2 => area/kpa2}/actor/bowser_phase_3.c (99%) rename src/battle/{area_kpa2 => area/kpa2}/area.c (61%) rename src/battle/{area_kpa2 => area/kpa2}/stage/kpa_01.c (100%) rename src/battle/{area_kpa2 => area/kpa2}/stage/kpa_02.c (100%) rename src/battle/{area_kpa2 => area/kpa2}/stage/kpa_03.c (100%) rename src/battle/{area_kpa3 => area/kpa3}/actor/anti_guy.c (99%) rename src/battle/{area_kpa3 => area/kpa3}/actor/duplighost.c (100%) rename src/battle/{area_kpa3 => area/kpa3}/area.c (72%) rename src/battle/{area_kpa3 => area/kpa3}/stage/kpa_01.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/actor/bombshell_bill.c (99%) rename src/battle/{area_kpa4 => area/kpa4}/actor/bombshell_bill_blaster.c (98%) rename src/battle/{area_kpa4 => area/kpa4}/actor/koopatrol.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/actor/magikoopa.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/area.c (78%) rename src/battle/{area_kpa4 => area/kpa4}/stage/kpa_01.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/stage/kpa_01b.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/stage/kpa_02.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/stage/kpa_03.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/stage/kpa_04.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/stage/kpa_04b.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/stage/kpa_04c.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/stage/kpa_05.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/stage/kpa_07.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/stage/kpa_08.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/stage/kpa_09.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/stage/kpa_11.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/stage/kpa_13.c (100%) rename src/battle/{area_kpa4 => area/kpa4}/stage/kpa_14.c (100%) rename src/battle/{area_kzn => area/kzn}/actor/lava_bubble.c (99%) rename src/battle/{area_kzn => area/kzn}/actor/medi_guy.c (100%) rename src/battle/{area_kzn => area/kzn}/actor/putrid_piranha.c (100%) rename src/battle/{area_kzn => area/kzn}/actor/red_magikoopa.c (100%) rename src/battle/{area_kzn => area/kzn}/actor/spike_top.c (100%) rename src/battle/{area_kzn => area/kzn}/actor/white_magikoopa.c (100%) rename src/battle/{area_kzn => area/kzn}/area.c (70%) rename src/battle/{area_kzn => area/kzn}/stage/kzn_01.c (100%) rename src/battle/{area_kzn => area/kzn}/stage/kzn_01b.c (100%) rename src/battle/{area_kzn => area/kzn}/stage/kzn_02.c (100%) rename src/battle/{area_kzn => area/kzn}/stage/kzn_04.c (100%) rename src/battle/{area_kzn => area/kzn}/stage/kzn_04b.c (100%) rename src/battle/{area_kzn => area/kzn}/stage/kzn_04c.c (100%) rename src/battle/{area_kzn => area/kzn}/stage/kzn_05.c (100%) rename src/battle/{area_kzn2 => area/kzn2}/actor/lava_bud.c (99%) rename src/battle/{area_kzn2 => area/kzn2}/actor/lava_piranha.c (99%) rename src/battle/{area_kzn2 => area/kzn2}/actor/petit_piranha.c (98%) rename src/battle/{area_kzn2 => area/kzn2}/actor/petit_piranha_bomb.c (98%) rename src/battle/{area_kzn2 => area/kzn2}/anim/lava_piranha_anim.c (100%) rename src/battle/{area_kzn2 => area/kzn2}/anim/lava_piranha_anim1.inc.c (100%) rename src/battle/{area_kzn2 => area/kzn2}/anim/lava_piranha_anim2.inc.c (100%) rename src/battle/{area_kzn2 => area/kzn2}/anim/lava_piranha_anim3.inc.c (100%) rename src/battle/{area_kzn2 => area/kzn2}/anim/lava_piranha_anim4.inc.c (100%) create mode 100644 src/battle/area/kzn2/anim/unused_gfx.c rename src/battle/{area_kzn2 => area/kzn2}/area.c (89%) rename src/battle/{area_kzn2 => area/kzn2}/stage/kzn_01.c (100%) rename src/battle/{area_kzn2 => area/kzn2}/stage/kzn_01b.c (100%) rename src/battle/{area_kzn2 => area/kzn2}/stage/kzn_02.c (100%) rename src/battle/{area_kzn2 => area/kzn2}/stage/kzn_04.c (100%) rename src/battle/{area_kzn2 => area/kzn2}/stage/kzn_04b.c (100%) rename src/battle/{area_kzn2 => area/kzn2}/stage/kzn_04c.c (100%) rename src/battle/{area_kzn2 => area/kzn2}/stage/kzn_05.c (100%) rename src/battle/{area_mac => area/mac}/actor/chan.c (99%) rename src/battle/{area_mac => area/mac}/actor/lee.c (99%) rename src/battle/{area_mac => area/mac}/actor/master1.c (99%) rename src/battle/{area_mac => area/mac}/actor/master2.c (99%) rename src/battle/{area_mac => area/mac}/actor/master3.c (99%) rename src/battle/{area_mac => area/mac}/area.c (59%) rename src/battle/{area_mac => area/mac}/stage/mac_01.c (100%) rename src/battle/{area_mac => area/mac}/stage/mac_02.c (100%) rename src/battle/{area_mim => area/mim}/actor/bzzap.c (100%) rename src/battle/{area_mim => area/mim}/actor/forest_fuzzy.c (99%) rename src/battle/{area_mim => area/mim}/actor/piranha_plant.c (99%) rename src/battle/{area_mim => area/mim}/area.c (65%) rename src/battle/{area_mim => area/mim}/stage/mim_01.c (100%) rename src/battle/{area_nok => area/nok}/actor/fuzzy.c (100%) rename src/battle/{area_nok => area/nok}/actor/goomba.c (100%) rename src/battle/{area_nok => area/nok}/actor/kent_c_koopa.c (98%) rename src/battle/{area_nok => area/nok}/actor/koopa_troopa.c (100%) rename src/battle/{area_nok => area/nok}/actor/paragoomba.c (100%) rename src/battle/{area_nok => area/nok}/actor/paratroopa.c (100%) rename src/battle/{area_nok => area/nok}/actor/spiked_goomba.c (100%) rename src/battle/{area_nok => area/nok}/area.c (63%) rename src/battle/{area_nok => area/nok}/stage/nok_01.c (100%) rename src/battle/{area_nok => area/nok}/stage/nok_02.c (100%) rename src/battle/{area_nok => area/nok}/stage/nok_03.c (100%) rename src/battle/{area_nok => area/nok}/stage/nok_04.c (100%) rename src/battle/{area_omo => area/omo}/actor/anti_guy.c (84%) rename src/battle/{area_omo => area/omo}/actor/blue_shy_guy.c (84%) rename src/battle/{area_omo => area/omo}/actor/green_shy_guy.c (84%) rename src/battle/{area_omo => area/omo}/actor/groove_guy.c (87%) rename src/battle/{area_omo => area/omo}/actor/medi_guy.c (100%) rename src/battle/{area_omo => area/omo}/actor/pink_shy_guy.c (84%) rename src/battle/{area_omo => area/omo}/actor/pyro_guy.c (89%) rename src/battle/{area_omo => area/omo}/actor/red_shy_guy.c (100%) rename src/battle/{area_omo => area/omo}/actor/sky_guy.c (75%) rename src/battle/{area_omo => area/omo}/actor/spy_guy.c (79%) rename src/battle/{area_omo => area/omo}/actor/yellow_shy_guy.c (83%) rename src/battle/{area_omo => area/omo}/area.c (69%) rename src/battle/{area_omo => area/omo}/stage/omo_01.c (97%) rename src/battle/{area_omo => area/omo}/stage/omo_02.c (100%) rename src/battle/{area_omo => area/omo}/stage/omo_03.c (100%) rename src/battle/{area_omo => area/omo}/stage/omo_03b.c (100%) rename src/battle/{area_omo => area/omo}/stage/omo_04.c (100%) rename src/battle/{area_omo => area/omo}/stage/omo_05.c (100%) rename src/battle/{area_omo => area/omo}/stage/omo_05b.c (100%) rename src/battle/{area_omo => area/omo}/stage/omo_06.c (100%) rename src/battle/{area_omo => area/omo}/stage/omo_07.c (100%) rename src/battle/{area_omo2 => area/omo2}/actor/animation.inc.c (100%) rename src/battle/{area_omo2 => area/omo2}/actor/general_guy.c (99%) rename src/battle/{area_omo2 => area/omo2}/actor/light_bulb.c (98%) rename src/battle/{area_omo2 => area/omo2}/actor/toy_tank.c (98%) rename src/battle/{area_omo2 => area/omo2}/area.c (75%) rename src/battle/{area_omo2 => area/omo2}/stage/omo_07.c (100%) rename src/battle/{area_omo2_1 => area/omo2_1}/actor/shy_squad.c (98%) rename src/battle/{area_omo2_2 => area/omo2_2}/actor/stilt_guy.c (98%) rename src/battle/{area_omo2_3 => area/omo2_3}/actor/shy_stack.c (98%) rename src/battle/{area_omo2_4 => area/omo2_4}/actor/signal_guy.c (99%) rename src/battle/{area_omo2_5 => area/omo2_5}/actor/shy_squad_dup.c (98%) rename src/battle/{area_omo2_6 => area/omo2_6}/actor/shy_guy_dup.c (95%) rename src/battle/{area_omo3 => area/omo3}/actor/big_lantern_ghost.c (99%) rename src/battle/{area_omo3 => area/omo3}/actor/clubba.c (100%) rename src/battle/{area_omo3 => area/omo3}/actor/fuzzy.c (100%) rename src/battle/{area_omo3 => area/omo3}/actor/goomba.c (100%) rename src/battle/{area_omo3 => area/omo3}/actor/hammer_bro.c (100%) rename src/battle/{area_omo3 => area/omo3}/actor/koopatrol.c (100%) rename src/battle/{area_omo3 => area/omo3}/actor/pokey.c (100%) rename src/battle/{area_omo3 => area/omo3}/actor/red_shy_guy.c (100%) rename src/battle/{area_omo3 => area/omo3}/area.c (65%) rename src/battle/{area_omo3 => area/omo3}/stage/omo_01.c (97%) rename src/battle/{area_omo3 => area/omo3}/stage/omo_02.c (100%) rename src/battle/{area_omo3 => area/omo3}/stage/omo_03.c (100%) rename src/battle/{area_omo3 => area/omo3}/stage/omo_03b.c (100%) rename src/battle/{area_omo3 => area/omo3}/stage/omo_04.c (100%) rename src/battle/{area_omo3 => area/omo3}/stage/omo_05.c (100%) rename src/battle/{area_omo3 => area/omo3}/stage/omo_05b.c (100%) rename src/battle/{area_omo3 => area/omo3}/stage/omo_06.c (100%) rename src/battle/{area_omo3 => area/omo3}/stage/omo_07.c (100%) rename src/battle/{area_pra => area/pra}/actor/albino_dino.c (99%) rename src/battle/{area_pra => area/pra}/actor/gray_magikoopa.c (100%) rename src/battle/{area_pra => area/pra}/actor/green_magikoopa.c (100%) rename src/battle/{area_pra => area/pra}/actor/red_magikoopa.c (90%) rename src/battle/{area_pra => area/pra}/actor/swoopula.c (100%) rename src/battle/{area_pra => area/pra}/actor/white_clubba.c (100%) rename src/battle/{area_pra => area/pra}/actor/white_magikoopa.c (100%) rename src/battle/{area_pra => area/pra}/actor/yellow_magikoopa.c (100%) rename src/battle/{area_pra => area/pra}/area.c (72%) rename src/battle/{area_pra => area/pra}/stage/pra_01.c (100%) rename src/battle/{area_pra => area/pra}/stage/pra_02.c (100%) rename src/battle/{area_pra => area/pra}/stage/pra_03.c (100%) rename src/battle/{area_pra => area/pra}/stage/pra_03b.c (100%) rename src/battle/{area_pra => area/pra}/stage/pra_03c.c (100%) rename src/battle/{area_pra => area/pra}/stage/pra_04.c (100%) rename src/battle/{area_pra2 => area/pra2}/actor/crystal_bit.c (97%) rename src/battle/{area_pra2 => area/pra2}/actor/crystal_king.c (99%) rename src/battle/{area_pra2 => area/pra2}/area.c (85%) rename src/battle/{area_pra2 => area/pra2}/stage/sam_04.c (100%) rename src/battle/{area_pra3 => area/pra3}/actor/duplighost.c (100%) rename src/battle/{area_pra3 => area/pra3}/actor/gray_magikoopa.c (100%) rename src/battle/{area_pra3 => area/pra3}/actor/red_magikoopa.c (100%) rename src/battle/{area_pra3 => area/pra3}/actor/swoopula.c (100%) rename src/battle/{area_pra3 => area/pra3}/actor/white_clubba.c (100%) rename src/battle/{area_pra3 => area/pra3}/area.c (70%) rename src/battle/{area_pra3 => area/pra3}/stage/pra_01.c (100%) rename src/battle/{area_pra3 => area/pra3}/stage/pra_02.c (100%) rename src/battle/{area_pra3 => area/pra3}/stage/pra_03.c (100%) rename src/battle/{area_pra3 => area/pra3}/stage/pra_03b.c (100%) rename src/battle/{area_pra3 => area/pra3}/stage/pra_03c.c (100%) rename src/battle/{area_pra3 => area/pra3}/stage/pra_04.c (100%) rename src/battle/{area_sam => area/sam}/actor/duplighost.c (100%) rename src/battle/{area_sam => area/sam}/actor/frost_piranha.c (99%) rename src/battle/{area_sam => area/sam}/actor/gray_magikoopa.c (100%) rename src/battle/{area_sam => area/sam}/actor/gulpit.c (99%) rename src/battle/{area_sam => area/sam}/actor/gulpit_rocks.c (99%) rename src/battle/{area_sam => area/sam}/actor/white_clubba.c (100%) rename src/battle/{area_sam => area/sam}/area.c (83%) rename src/battle/{area_sam => area/sam}/stage/sam_01.c (100%) rename src/battle/{area_sam => area/sam}/stage/sam_02.c (100%) rename src/battle/{area_sam => area/sam}/stage/sam_02b.c (100%) rename src/battle/{area_sam => area/sam}/stage/sam_02c.c (100%) rename src/battle/{area_sam => area/sam}/stage/sam_02d.c (100%) rename src/battle/{area_sam => area/sam}/stage/sam_03.c (100%) rename src/battle/{area_sam2 => area/sam2}/actor/gray_magikoopa.c (100%) rename src/battle/{area_sam2 => area/sam2}/actor/monstar.c (97%) rename src/battle/{area_sam2 => area/sam2}/actor/paragoomba.c (100%) rename src/battle/{area_sam2 => area/sam2}/area.c (74%) rename src/battle/{area_sam2 => area/sam2}/dlist.c (100%) rename src/battle/{area_sam2 => area/sam2}/stage/sam_01.c (100%) rename src/battle/{area_sam2 => area/sam2}/stage/sam_02.c (100%) rename src/battle/{area_sam2 => area/sam2}/stage/sam_02b.c (100%) rename src/battle/{area_sam2 => area/sam2}/stage/sam_02c.c (100%) rename src/battle/{area_sam2 => area/sam2}/stage/sam_02d.c (100%) rename src/battle/{area_sam2 => area/sam2}/stage/sam_03.c (100%) create mode 100644 src/battle/area/sam2/vtx.c rename src/battle/{area_sbk => area/sbk}/actor/bandit.c (100%) rename src/battle/{area_sbk => area/sbk}/actor/pokey.c (100%) rename src/battle/{area_sbk => area/sbk}/area.c (68%) rename src/battle/{area_sbk => area/sbk}/stage/sbk_02.c (100%) rename src/battle/{area_tik => area/tik}/actor/buzzy_beetle.c (100%) rename src/battle/{area_tik => area/tik}/actor/dark_koopa.c (98%) rename src/battle/{area_tik => area/tik}/actor/dark_paratroopa.c (98%) rename src/battle/{area_tik => area/tik}/actor/gloomba.c (99%) rename src/battle/{area_tik => area/tik}/actor/paragloomba.c (99%) rename src/battle/{area_tik => area/tik}/actor/spike_top.c (100%) rename src/battle/{area_tik => area/tik}/actor/spiked_gloomba.c (99%) rename src/battle/{area_tik => area/tik}/actor/spiny.c (100%) rename src/battle/{area_tik => area/tik}/area.c (70%) rename src/battle/{area_tik => area/tik}/stage/tik_01.c (100%) rename src/battle/{area_tik => area/tik}/stage/tik_02.c (100%) rename src/battle/{area_tik => area/tik}/stage/tik_03.c (100%) rename src/battle/{area_tik => area/tik}/stage/tik_04.c (100%) rename src/battle/{area_tik => area/tik}/stage/tik_05.c (100%) rename src/battle/{area_tik2 => area/tik2}/actor/blooper.c (99%) rename src/battle/{area_tik2 => area/tik2}/actor/blooper_baby.c (99%) rename src/battle/{area_tik2 => area/tik2}/actor/electro_blooper.c (99%) rename src/battle/{area_tik2 => area/tik2}/actor/super_blooper.c (99%) rename src/battle/{area_tik2 => area/tik2}/area.c (72%) rename src/battle/{area_tik2 => area/tik2}/stage/tik_01.c (100%) rename src/battle/{area_tik2 => area/tik2}/stage/tik_02.c (100%) rename src/battle/{area_tik2 => area/tik2}/stage/tik_03.c (100%) rename src/battle/{area_tik2 => area/tik2}/stage/tik_04.c (100%) rename src/battle/{area_tik2 => area/tik2}/stage/tik_05.c (100%) rename src/battle/{area_tik3 => area/tik3}/actor/swooper.c (100%) rename src/battle/{area_tik3 => area/tik3}/actor/swoopula.c (100%) rename src/battle/{area_tik3 => area/tik3}/area.c (72%) rename src/battle/{area_tik3 => area/tik3}/stage/tik_01.c (100%) rename src/battle/{area_tik3 => area/tik3}/stage/tik_02.c (100%) rename src/battle/{area_tik3 => area/tik3}/stage/tik_03.c (100%) rename src/battle/{area_tik3 => area/tik3}/stage/tik_04.c (100%) rename src/battle/{area_tik3 => area/tik3}/stage/tik_05.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/actor/bill_blaster.c (98%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/actor/bob_omb.c (99%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/actor/bullet_bill.c (99%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/actor/koopa_troopa.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/actor/paratroopa.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/area.c (71%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/stage/trd_00.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/stage/trd_01.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/stage/trd_02.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/stage/trd_02b.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/stage/trd_02c.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/stage/trd_02d.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/stage/trd_03.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/stage/trd_04.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/stage/trd_05.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/stage/trd_05b.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/stage/trd_05c.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/stage/trd_05d.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/stage/trd_05e.c (100%) rename src/battle/{area_trd_part_1 => area/trd_part_1}/stage/trd_05f.c (100%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/actor/blue_ninja_koopa.c (99%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/actor/fake_bowser.c (99%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/actor/green_ninja_koopa.c (99%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/actor/red_ninja_koopa.c (99%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/actor/yellow_ninja_koopa.c (99%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/area.c (90%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/stage/trd_00.c (100%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/stage/trd_01.c (100%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/stage/trd_02.c (100%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/stage/trd_02b.c (100%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/stage/trd_03.c (100%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/stage/trd_04.c (100%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/stage/trd_05.c (100%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/stage/trd_05b.c (100%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/stage/trd_05c.c (100%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/stage/trd_05d.c (100%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/stage/trd_05e.c (100%) rename src/battle/{area_trd_part_2 => area/trd_part_2}/stage/trd_05f.c (100%) rename src/battle/{area_trd_part_3 => area/trd_part_3}/actor/eldstar.c (99%) rename src/battle/{area_trd_part_3 => area/trd_part_3}/area.c (64%) rename src/battle/{area_trd_part_3 => area/trd_part_3}/stage/nok_01.c (100%) delete mode 100644 src/battle/area_kzn2/anim/unused_gfx.c delete mode 100644 src/battle/area_sam2/vtx.c delete mode 100644 src/battle/battle_formation_names.h delete mode 100644 src/battle/battle_stage_names.h rename src/battle/{move/auto_smash/auto_smash.c => common/move/HammerSupport.inc.c} (73%) rename src/battle/{move/auto_jump/auto_jump.c => common/move/JumpSupport.inc.c} (60%) rename src/battle/{star/common/peach_star_beam.inc.c => common/move/StarBeamSupport.inc.c} (99%) create mode 100644 src/battle/formation_names.h delete mode 100644 src/battle/item/food.h delete mode 100644 src/battle/item/life_shroom.h delete mode 100644 src/battle/item/mushroom.h delete mode 100644 src/battle/item/shooting_star.h delete mode 100644 src/battle/item/sleepy_sheep.h delete mode 100644 src/battle/item/strange_cake.h delete mode 100644 src/battle/item/super_soda.h delete mode 100644 src/battle/move/auto_multibounce/auto_multibounce.c delete mode 100644 src/battle/move/d_down_jump/781920.c delete mode 100644 src/battle/move/d_down_pound/74AD90.c delete mode 100644 src/battle/move/dizzy_stomp/748DD0.c delete mode 100644 src/battle/move/earthquake_jump/785B20.c create mode 100644 src/battle/move/hammer/attack.c create mode 100644 src/battle/move/hammer/auto_smash.c create mode 100644 src/battle/move/hammer/d_down_pound.c delete mode 100644 src/battle/move/hammer/hammer.c create mode 100644 src/battle/move/hammer/hammer_charge_0.c create mode 100644 src/battle/move/hammer/hammer_charge_1.c create mode 100644 src/battle/move/hammer/hammer_charge_2.c create mode 100644 src/battle/move/hammer/hammer_throw.c create mode 100644 src/battle/move/hammer/mega_quake.c create mode 100644 src/battle/move/hammer/mega_smash.c create mode 100644 src/battle/move/hammer/power_quake.c create mode 100644 src/battle/move/hammer/power_smash.c create mode 100644 src/battle/move/hammer/quake_hammer.c create mode 100644 src/battle/move/hammer/shell_crack.c create mode 100644 src/battle/move/hammer/shrink_smash.c create mode 100644 src/battle/move/hammer/spin_smash.c create mode 100644 src/battle/move/hammer/super_smash.c delete mode 100644 src/battle/move/hammer_charge_0/74F130.c delete mode 100644 src/battle/move/hammer_charge_1/7595B0.c delete mode 100644 src/battle/move/hammer_charge_2/75E5D0.c delete mode 100644 src/battle/move/hammer_throw/752450.c rename src/battle/{ => move}/item/ItemRefund.inc.c (93%) rename src/battle/{ => move}/item/UseItem.inc.c (100%) rename src/battle/{ => move}/item/coconut.c (96%) rename src/battle/{ => move}/item/coconut.h (65%) rename src/battle/{ => move}/item/dizzy_dial.c (97%) rename src/battle/{ => move}/item/dizzy_dial.h (66%) rename src/battle/{ => move}/item/dried_shroom.c (91%) rename src/battle/{ => move}/item/dried_shroom.h (68%) rename src/battle/{ => move}/item/dusty_hammer.c (95%) rename src/battle/{ => move}/item/dusty_hammer.h (100%) rename src/battle/{ => move}/item/egg_missile.c (91%) rename src/battle/{ => move}/item/egg_missile.h (79%) rename src/battle/{ => move}/item/electro_pop.c (89%) rename src/battle/{ => move}/item/electro_pop.h (53%) rename src/battle/{ => move}/item/fire_flower.c (95%) rename src/battle/{ => move}/item/fire_flower.h (56%) rename src/battle/{ => move}/item/food.c (95%) create mode 100644 src/battle/move/item/food.h rename src/battle/{ => move}/item/fright_jar.c (97%) rename src/battle/{ => move}/item/fright_jar.h (65%) rename src/battle/{ => move}/item/hustle_drink.c (97%) rename src/battle/{ => move}/item/hustle_drink.h (68%) rename src/battle/{ => move}/item/insecticide_herb.c (93%) rename src/battle/{ => move}/item/insecticide_herb.h (57%) rename src/battle/{ => move}/item/life_shroom.c (94%) create mode 100644 src/battle/move/item/life_shroom.h rename src/battle/{ => move}/item/mushroom.c (95%) create mode 100644 src/battle/move/item/mushroom.h rename src/battle/{ => move}/item/mystery.c (97%) rename src/battle/{ => move}/item/mystery.h (72%) rename src/battle/{ => move}/item/pebble.c (96%) rename src/battle/{ => move}/item/pebble.h (100%) rename src/battle/{ => move}/item/please_come_back.c (88%) rename src/battle/{ => move}/item/please_come_back.h (100%) rename src/battle/{ => move}/item/pow_block.c (95%) rename src/battle/{ => move}/item/pow_block.h (57%) rename src/battle/{ => move}/item/repel_gel.c (91%) rename src/battle/{ => move}/item/repel_gel.h (79%) rename src/battle/{ => move}/item/shooting_star.c (92%) create mode 100644 src/battle/move/item/shooting_star.h rename src/battle/{ => move}/item/sleepy_sheep.c (96%) create mode 100644 src/battle/move/item/sleepy_sheep.h rename src/battle/{ => move}/item/snowman_doll.c (96%) rename src/battle/{ => move}/item/snowman_doll.h (56%) rename src/battle/{ => move}/item/stone_cap.c (96%) rename src/battle/{ => move}/item/stone_cap.h (79%) rename src/battle/{ => move}/item/stop_watch.c (96%) rename src/battle/{ => move}/item/stop_watch.h (57%) rename src/battle/{ => move}/item/strange_cake.c (91%) create mode 100644 src/battle/move/item/strange_cake.h rename src/battle/{ => move}/item/super_soda.c (95%) create mode 100644 src/battle/move/item/super_soda.h rename src/battle/{ => move}/item/tasty_tonic.c (97%) rename src/battle/{ => move}/item/tasty_tonic.h (81%) rename src/battle/{ => move}/item/thunder_bolt.c (94%) rename src/battle/{ => move}/item/thunder_bolt.h (56%) rename src/battle/{ => move}/item/thunder_rage.c (95%) rename src/battle/{ => move}/item/thunder_rage.h (56%) rename src/battle/{ => move}/item/ultra_shroom.c (92%) rename src/battle/{ => move}/item/ultra_shroom.h (68%) rename src/battle/{ => move}/item/unknown_item.c (91%) rename src/battle/{ => move}/item/unknown_item.h (68%) rename src/battle/{ => move}/item/volt_shroom.c (94%) rename src/battle/{ => move}/item/volt_shroom.h (81%) create mode 100644 src/battle/move/jump/attack.c create mode 100644 src/battle/move/jump/auto_jump.c create mode 100644 src/battle/move/jump/auto_multibounce.c create mode 100644 src/battle/move/jump/d_down_jump.c create mode 100644 src/battle/move/jump/demo_power_bounce.c create mode 100644 src/battle/move/jump/dizzy_stomp.c create mode 100644 src/battle/move/jump/earthquake_jump.c delete mode 100644 src/battle/move/jump/jump.c create mode 100644 src/battle/move/jump/jump_charge_0.c create mode 100644 src/battle/move/jump/jump_charge_1.c create mode 100644 src/battle/move/jump/jump_charge_2.c create mode 100644 src/battle/move/jump/mega_jump.c create mode 100644 src/battle/move/jump/multibounce.c create mode 100644 src/battle/move/jump/power_bounce.c create mode 100644 src/battle/move/jump/power_jump.c create mode 100644 src/battle/move/jump/shrink_stomp.c create mode 100644 src/battle/move/jump/sleep_stomp.c create mode 100644 src/battle/move/jump/super_jump.c delete mode 100644 src/battle/move/jump_charge_0/74D570.c delete mode 100644 src/battle/move/jump_charge_1/75C980.c delete mode 100644 src/battle/move/jump_charge_2/761920.c delete mode 100644 src/battle/move/mega_jump/770F30.c delete mode 100644 src/battle/move/mega_quake/756780.c delete mode 100644 src/battle/move/mega_smash/777690.c delete mode 100644 src/battle/move/multibounce/740CC0.c delete mode 100644 src/battle/move/power_bounce/743DF0.c delete mode 100644 src/battle/move/power_jump/76D760.c delete mode 100644 src/battle/move/power_quake/767C90.c delete mode 100644 src/battle/move/power_smash/772BA0.c delete mode 100644 src/battle/move/quake_hammer/quake_hammer.c delete mode 100644 src/battle/move/shell_crack/77F240.c delete mode 100644 src/battle/move/shrink_smash/77CB80.c delete mode 100644 src/battle/move/shrink_stomp/783BA0.c delete mode 100644 src/battle/move/sleep_stomp/746E10.c delete mode 100644 src/battle/move/spin_smash/spin_smash.c rename src/battle/{star/chill_out/7900D0.c => move/star_power/chill_out.c} (97%) rename src/battle/{star/focus/789E60.c => move/star_power/focus.c} (98%) rename src/battle/{star/lullaby/78D150.c => move/star_power/lullaby.c} (98%) rename src/battle/{star/peach_beam/7997B0.c => move/star_power/peach_beam.c} (90%) rename src/battle/{star/peach_focus/79BFA0.c => move/star_power/peach_focus.c} (98%) rename src/battle/{star/refresh/78B600.c => move/star_power/refresh.c} (97%) rename src/battle/{star/smooch/791D90.c => move/star_power/smooch.c} (99%) rename src/battle/{star/star_beam/796FC0.c => move/star_power/star_beam.c} (90%) rename src/battle/{star/star_storm/78E7D0.c => move/star_power/star_storm.c} (98%) rename src/battle/{star/time_out/793D20.c => move/star_power/time_out.c} (99%) rename src/battle/{star/peach_dash/79D8A0.c => move/star_power/twink_dash.c} (98%) rename src/battle/{star/up_and_away/7952E0.c => move/star_power/up_and_away.c} (98%) delete mode 100644 src/battle/move/super_jump/76F330.c delete mode 100644 src/battle/move/super_smash/775100.c delete mode 100644 src/battle/move/unknown_move/779C90.c create mode 100644 src/battle/stage_names.h rename src/{load_script.c => battle/use_items.c} (75%) create mode 100644 src/battle/use_moves.c create mode 100644 src/battle/use_star_powers.c delete mode 100644 src/move_script.c delete mode 100644 ver/us/asm/data/battle/move/d_down_jump/781AF0.data.s delete mode 100644 ver/us/asm/data/battle/move/d_down_pound/74AF40.data.s delete mode 100644 ver/us/asm/data/battle/move/dizzy_stomp/748EC0.data.s delete mode 100644 ver/us/asm/data/battle/move/earthquake_jump/785C20.data.s delete mode 100644 ver/us/asm/data/battle/move/hammer_charge_0/74F3D0.data.s delete mode 100644 ver/us/asm/data/battle/move/hammer_charge_1/7598D0.data.s delete mode 100644 ver/us/asm/data/battle/move/hammer_charge_2/75E8F0.data.s delete mode 100644 ver/us/asm/data/battle/move/hammer_throw/752500.data.s delete mode 100644 ver/us/asm/data/battle/move/jump_charge_0/74D850.data.s delete mode 100644 ver/us/asm/data/battle/move/jump_charge_1/75CCE0.data.s delete mode 100644 ver/us/asm/data/battle/move/jump_charge_2/761C80.data.s delete mode 100644 ver/us/asm/data/battle/move/mega_jump/771020.data.s delete mode 100644 ver/us/asm/data/battle/move/mega_quake/756900.data.s delete mode 100644 ver/us/asm/data/battle/move/mega_smash/777740.data.s delete mode 100644 ver/us/asm/data/battle/move/multibounce/740DB0.data.s delete mode 100644 ver/us/asm/data/battle/move/power_bounce/743FF0.data.s delete mode 100644 ver/us/asm/data/battle/move/power_jump/76D850.data.s delete mode 100644 ver/us/asm/data/battle/move/power_quake/767D40.data.s delete mode 100644 ver/us/asm/data/battle/move/power_smash/772C50.data.s delete mode 100644 ver/us/asm/data/battle/move/shell_crack/77F3D0.data.s delete mode 100644 ver/us/asm/data/battle/move/shrink_smash/77CC30.data.s delete mode 100644 ver/us/asm/data/battle/move/shrink_stomp/783C90.data.s delete mode 100644 ver/us/asm/data/battle/move/sleep_stomp/746F00.data.s delete mode 100644 ver/us/asm/data/battle/move/super_jump/76F420.data.s delete mode 100644 ver/us/asm/data/battle/move/super_smash/7751B0.data.s delete mode 100644 ver/us/asm/data/battle/move/unknown_move/779E30.data.s diff --git a/include/common.h b/include/common.h index 8e3bbb8f09..58ed44eb0c 100644 --- a/include/common.h +++ b/include/common.h @@ -11,8 +11,8 @@ #include "enums.h" #include "evt.h" #include "messages.h" -#include "battle/battle_formation_names.h" -#include "battle/battle_stage_names.h" +#include "battle/formation_names.h" +#include "battle/stage_names.h" #ifdef PERMUTER extern int TEXEL0, TEXEL1, PRIMITIVE, PRIMITIVE_ALPHA; diff --git a/include/common_structs.h b/include/common_structs.h index 9691005128..573e474036 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -245,12 +245,12 @@ typedef struct Npc { /* 0x08E */ s16 duration; // TODO: name less vaguely /* 0x090 */ Vec3s homePos; /* 0x096 */ s16 unk_96; - /* 0x098 */ s16 unk_98; - /* 0x09A */ s16 unk_9A; - /* 0x09C */ s16 unk_9C; - /* 0x09E */ s16 unk_9E; - /* 0x0A0 */ s16 unk_A0; - /* 0x0A2 */ u16 unk_A2; + /* 0x098 */ s16 foldType; + /* 0x09A */ s16 foldArg1; + /* 0x09C */ s16 foldArg2; + /* 0x09E */ s16 foldArg3; + /* 0x0A0 */ s16 foldArg4; + /* 0x0A2 */ u16 foldArg5; /* 0x0A4 */ s8 npcID; /* 0x0A5 */ char unk_A5; /* 0x0A6 */ s16 collisionRadius; @@ -1546,10 +1546,9 @@ typedef struct ActorPartBlueprint { /* 0x10 */ s32* defenseTable; /* 0x14 */ s32 eventFlags; /* 0x18 */ s32 elementImmunityFlags; - /* 0x1C */ s8 unk_1C; - /* 0x1D */ s8 unk_1D; + /* 0x1C */ Vec2b projectileTargetOffset; /* 0x1E */ char unk_1E[2]; - /* 0x20 */ s32 unk_20; + /* 0x20 */ s32 overrideNameMsg; // name when this part is targeted; overrides name from actor type } ActorPartBlueprint; // size = 0x24 typedef struct ActorPart { @@ -1573,8 +1572,7 @@ typedef struct ActorPart { /* 0x70 */ s16 unk_70; /* 0x72 */ Vec2bu size; /* 0x74 */ s8 verticalStretch; - /* 0x75 */ s8 unk_75; - /* 0x76 */ s8 unk_76; + /* 0x75 */ Vec2b projectileTargetOffset; /* 0x77 */ char unk_77[1]; /* 0x78 */ u32* defenseTable; /* 0x7C */ s32 eventFlags; diff --git a/include/enums.h b/include/enums.h index 29798c4da5..b2cbf502a8 100644 --- a/include/enums.h +++ b/include/enums.h @@ -737,7 +737,11 @@ enum SoundIDs { SOUND_151 = 0x00000151, SOUND_152 = 0x00000152, SOUND_SEARCH_BUSH = 0x00000153, + SOUND_156 = 0x00000156, SOUND_158 = 0x00000158, + SOUND_15A = 0x0000015A, + SOUND_15B = 0x0000015B, + SOUND_15C = 0x0000015C, SOUND_15D = 0x0000015D, SOUND_15E = 0x0000015E, SOUND_160 = 0x00000160, @@ -1461,6 +1465,9 @@ enum SoundIDs { SOUND_2106 = 0x00002106, SOUND_2107 = 0x00002107, SOUND_2108 = 0x00002108, + SOUND_210A = 0x0000210A, + SOUND_210B = 0x0000210B, + SOUND_210C = 0x0000210C, SOUND_2111 = 0x00002111, SOUND_2112 = 0x00002112, SOUND_2113 = 0x00002113, @@ -1471,6 +1478,12 @@ enum SoundIDs { SOUND_2118 = 0x00002118, SOUND_2119 = 0x00002119, SOUND_211A = 0x0000211A, + SOUND_211B = 0x0000211B, + SOUND_211C = 0x0000211C, + SOUND_211D = 0x0000211D, + SOUND_211E = 0x0000211E, + SOUND_211F = 0x0000211F, + SOUND_2120 = 0x00002120, SOUND_2121 = 0x00002121, SOUND_2122 = 0x00002122, SOUND_2123 = 0x00002123, @@ -2529,22 +2542,21 @@ enum PlayerAnims { }; enum AmbientSounds { - AMBIENT_SPOOKY = 0, - AMBIENT_WIND = 1, - AMBIENT_BEACH = 2, - AMBIENT_JUNGLE = 3, - // actually, 'undersea' are all lava-related. sort these out when map data is done - AMBIENT_UNDER_SEA1 = 4, - AMBIENT_UNDER_SEA2 = 5, - AMBIENT_SILENCE = 6, - AMBIENT_UNDER_SEA3 = 7, - AMBIENT_UNDER_SEA4 = 8, - AMBIENT_EXIT_SEA = 9, - AMBIENT_UNDER_SEA5 = 10, - AMBIENT_UNDER_SEA6 = 11, - AMBIENT_BIRDS = 12, - AMBIENT_SEA = 13, - AMBIENT_RADIO = 16, // radio songs for nok + AMBIENT_SPOOKY = 0, + AMBIENT_WIND = 1, + AMBIENT_BEACH = 2, + AMBIENT_JUNGLE = 3, + AMBIENT_LAVA_1 = 4, + AMBIENT_LAVA_2 = 5, + AMBIENT_SILENCE = 6, + AMBIENT_LAVA_3 = 7, + AMBIENT_LAVA_4 = 8, + AMBIENT_LAVA_5 = 9, + AMBIENT_LAVA_6 = 10, + AMBIENT_LAVA_7 = 11, + AMBIENT_BIRDS = 12, + AMBIENT_SEA = 13, + AMBIENT_RADIO = 16, // radio songs for nok // the following 4 IDs are reserved for additional radio songs, // and no more are expected to follow after that // see: au_ambient_load @@ -5753,7 +5765,7 @@ enum FoldStateFlags { FOLD_STATE_FLAG_2000 = 0x00002000, FOLD_STATE_FLAG_4000 = 0x00004000, FOLD_STATE_FLAG_8000 = 0x00008000, - FOLD_STATE_FLAG_10000 = 0x00010000, + FOLD_STATE_FLAG_NO_FILTERING = 0x00010000, FOLD_STATE_FLAG_20000 = 0x00020000, FOLD_STATE_FLAG_40000 = 0x00040000, FOLD_STATE_FLAG_80000 = 0x00080000, diff --git a/include/functions.h b/include/functions.h index 282909b5d4..e4b730c04f 100644 --- a/include/functions.h +++ b/include/functions.h @@ -241,7 +241,7 @@ s32 evt_trigger_on_activate_exec_script(Trigger* trigger); Trigger* get_trigger_by_id(s32 triggerID); Actor* get_actor(s32 actorID); -ActorPart* get_actor_part(Actor* actor, s32 partIndex); +ActorPart* get_actor_part(Actor* actor, s32 partID); s32 add_coins(s32 amt); s32 is_partner_ability_active(s32); s32 count_power_plus(s32); @@ -447,7 +447,7 @@ void set_npc_animation(Npc* npc, u32 animID); void set_peach_shadow_scale(Shadow* shadow, f32 scale); s32 is_block_on_ground(Entity* block); void set_animation(s32 actorID, s32, s32 animationIndex); -void set_animation_rate(s32 actorID, s32 partIndex, f32 rate); +void set_animation_rate(s32 actorID, s32 partID, f32 rate); void set_model_flags(u16, s32, s32); void init_enter_world_shared(void); s16 update_enter_map_screen_overlay(s16* progress); @@ -549,7 +549,7 @@ void player_create_target_list(Actor* actor); void enemy_create_target_list(Actor* actor); void set_actor_yaw(s32 actorID, s32 yaw); -void set_part_yaw(s32 actorID, s32 partIndex, s32 value); +void set_part_yaw(s32 actorID, s32 partID, s32 value); void add_part_decoration(ActorPart* part, s32 decorationIndex, s32 decorationType); void add_actor_decoration(Actor* actor, s32 decorationIndex, s32 decorationType); @@ -558,8 +558,8 @@ void remove_actor_decoration(Actor* actor, s32 decorationIndex); s32 player_team_is_ability_active(Actor* actor, s32 ability); -void create_part_shadow(s32 actorID, s32 partIndex); -void remove_part_shadow(s32 actorID, s32 partIndex); +void create_part_shadow(s32 actorID, s32 partID); +void remove_part_shadow(s32 actorID, s32 partID); void create_part_shadow_by_ref(s32 arg0, ActorPart* part); void spawn_drops(Enemy* enemy); @@ -996,7 +996,7 @@ void func_802549C0(void); void func_8023E104(void); void func_8023E11C(void); -void set_goal_pos_to_part(ActorState* state, s32 actorID, s32 partIndex); +void set_goal_pos_to_part(ActorState* state, s32 actorID, s32 partID); void init_encounters_ui(void); void initialize_collision(void); diff --git a/include/macros.h b/include/macros.h index 9ae2a1526e..b9cf2319be 100644 --- a/include/macros.h +++ b/include/macros.h @@ -53,10 +53,6 @@ #define MAP_RODATA_PAD(n,name) const s32 N(rodata_pad_##name)[n] = {}; #define MAP_STATIC_PAD(n,name) BSS s32 N(static_pad_##name)[n]; -// standardized macro for reseting data section after a INCLUDE_ASM -//TODO these should all be removed after map decomp is done -#define MAP_DATA_SECTION_START __asm__(".section .data\n"); - #define PHYSICAL_TO_VIRTUAL(addr) (void*)((u32)(addr) + 0x80000000) #define VIRTUAL_TO_PHYSICAL(addr) (u32)((u8*)(addr) - 0x80000000) diff --git a/include/script_api/battle.h b/include/script_api/battle.h index d43d0a135e..ecc3cb395d 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -243,7 +243,7 @@ ApiStatus DispatchDamageEvent(Evt* script, s32 isInitialCall); ApiStatus DispatchEvent(Evt* script, s32 isInitialCall); ApiStatus func_8027D2D8(Evt* script, s32 isInitialCall); ApiStatus SetTargetOffset(Evt* script, s32 isInitialCall); -ApiStatus func_8027D4C8(Evt* script, s32 isInitialCall); +ApiStatus SetProjectileTargetOffset(Evt* script, s32 isInitialCall); ApiStatus EnableActorBlur(Evt* script, s32 isInitialCall); ApiStatus AfflictActor(Evt* script, s32 isInitialCall); ApiStatus GetInstigatorValue(Evt* script, s32 isInitialCall); diff --git a/include/script_api/common.h b/include/script_api/common.h index 4c2c402371..7528c7645a 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -307,6 +307,7 @@ ApiStatus SetVirtualEntityJumpGravity(Evt* script, s32 isInitialCall); ApiStatus SetVirtualEntityFlags(Evt* script, s32 isInitialCall); ApiStatus GetVirtualEntityPosition(Evt* script, s32 isInitialCall); ApiStatus VirtualEntityJumpTo(Evt* script, s32 isInitialCall); +ApiStatus VirtualEntityLandJump(Evt* script, s32 isInitialCall); ApiStatus FacePlayerTowardPoint(Evt* script, s32 isInitialCall); ApiStatus func_802D2C14(Evt* script, s32 isInitialCall); ApiStatus ShowConsumableChoicePopup(Evt* script, s32 isInitialCall); diff --git a/src/16F740.c b/src/16F740.c index 5ea67be029..4e76be9df0 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -37,11 +37,11 @@ void btl_merlee_on_start_turn(void) { PlayerData* playerData = &gPlayerData; do { - if (!(gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) && - battleStatus->nextMerleeSpellType != MERLEE_SPELL_EXP_BOOST && - battleStatus->nextMerleeSpellType != MERLEE_SPELL_COIN_BOOST && - playerData->merleeCastsLeft > 0) - { + if (!(gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) + && battleStatus->nextMerleeSpellType != MERLEE_SPELL_EXP_BOOST + && battleStatus->nextMerleeSpellType != MERLEE_SPELL_COIN_BOOST + && playerData->merleeCastsLeft > 0 + ) { if (playerData->merleeTurnCount <= 0) { s32 temp = rand_int(100); @@ -94,10 +94,10 @@ void btl_merlee_on_first_strike(void) { PlayerData* playerData = &gPlayerData; do { - if (!(gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) && - battleStatus->nextMerleeSpellType != MERLEE_SPELL_EXP_BOOST && - battleStatus->nextMerleeSpellType != MERLEE_SPELL_COIN_BOOST && - playerData->merleeCastsLeft > 0) + if (!(gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) + && battleStatus->nextMerleeSpellType != MERLEE_SPELL_EXP_BOOST + && battleStatus->nextMerleeSpellType != MERLEE_SPELL_COIN_BOOST + && playerData->merleeCastsLeft > 0) { if (playerData->merleeTurnCount <= 0) { s32 temp = rand_int(100); @@ -456,10 +456,10 @@ void btl_state_update_normal_start(void) { script->owner1.actorID = ACTOR_PLAYER; } - if (currentEncounter->currentEnemy != NULL && - currentEncounter->currentEnemy->encountered == ENCOUNTER_TRIGGER_SPIN && - is_ability_active(ABILITY_DIZZY_ATTACK)) - { + if (currentEncounter->currentEnemy != NULL + && currentEncounter->currentEnemy->encountered == ENCOUNTER_TRIGGER_SPIN + && is_ability_active(ABILITY_DIZZY_ATTACK) + ) { actor = battleStatus->enemyActors[0]; script = start_script(&DoDizzyAttack, EVT_PRIORITY_A, 0); actor->takeTurnScript = script; @@ -2333,10 +2333,10 @@ void btl_state_update_run_away(void) { D_8029F248--; return; } - if (!does_script_exist(player->takeTurnScriptID) && - (partner == NULL || !does_script_exist(partner->takeTurnScriptID)) && - battleStatus->unk_8C == 0) - { + if (!does_script_exist(player->takeTurnScriptID) + && (partner == NULL || !does_script_exist(partner->takeTurnScriptID)) + && battleStatus->unk_8C == 0 + ) { btl_set_state(BATTLE_STATE_9); } break; @@ -2363,7 +2363,7 @@ void btl_state_update_defeat(void) { battleStatus->unk_8C = 0; if (player->debuff != 0) { - if (player->debuff == 7) { + if (player->debuff == STATUS_FROZEN) { sfx_play_sound(SOUND_FROZEN_SHATTER); player->icePillarEffect->flags |= EFFECT_INSTANCE_FLAG_10; player->icePillarEffect = NULL; @@ -2764,21 +2764,20 @@ void btl_state_update_player_move(void) { return; } - if (battleStatus->moveCategory == BTL_MENU_TYPE_SMASH) { - if ((battleStatus->selectedMoveID != MOVE_SMASH_CHARGE0) && - (battleStatus->selectedMoveID != MOVE_SMASH_CHARGE) && - (battleStatus->selectedMoveID != MOVE_SUPER_SMASH_CHARGE)) - { - gBattleStatus.flags1 &= ~BS_FLAGS1_HAMMER_CHARGED; - } + if ((battleStatus->moveCategory == BTL_MENU_TYPE_SMASH) + && (battleStatus->selectedMoveID != MOVE_SMASH_CHARGE0) + && (battleStatus->selectedMoveID != MOVE_SMASH_CHARGE) + && (battleStatus->selectedMoveID != MOVE_SUPER_SMASH_CHARGE) + ) { + gBattleStatus.flags1 &= ~BS_FLAGS1_HAMMER_CHARGED; } - if (battleStatus->moveCategory == BTL_MENU_TYPE_JUMP) { - if ((battleStatus->selectedMoveID != MOVE_JUMP_CHARGE0) && - (battleStatus->selectedMoveID != MOVE_JUMP_CHARGE) && - (battleStatus->selectedMoveID != MOVE_SUPER_JUMP_CHARGE)) - { - gBattleStatus.flags1 &= ~BS_FLAGS1_JUMP_CHARGED; - } + + if ((battleStatus->moveCategory == BTL_MENU_TYPE_JUMP) + && (battleStatus->selectedMoveID != MOVE_JUMP_CHARGE0) + && (battleStatus->selectedMoveID != MOVE_JUMP_CHARGE) + && (battleStatus->selectedMoveID != MOVE_SUPER_JUMP_CHARGE) + ) { + gBattleStatus.flags1 &= ~BS_FLAGS1_JUMP_CHARGED; } if (!(gBattleStatus.flags1 & BS_FLAGS1_JUMP_CHARGED)) { @@ -2949,11 +2948,11 @@ void btl_state_update_end_player_turn(void) { if (battleStatus->moveCategory == BTL_MENU_TYPE_ITEMS && battleStatus->itemUsesLeft >= 2) { gBattleSubState = BTL_SUBSTATE_END_PLAYER_TURN_AWAIT_HAPPY; } else if ( - !(gBattleStatus.flags2 & BS_FLAGS2_HAS_DRAINED_HP) && - !is_ability_active(ABILITY_HAPPY_HEART) && - !is_ability_active(ABILITY_CRAZY_HEART) && - !is_ability_active(ABILITY_HAPPY_FLOWER)) - { + !(gBattleStatus.flags2 & BS_FLAGS2_HAS_DRAINED_HP) + && !is_ability_active(ABILITY_HAPPY_HEART) + && !is_ability_active(ABILITY_CRAZY_HEART) + && !is_ability_active(ABILITY_HAPPY_FLOWER) + ) { gBattleSubState = BTL_SUBSTATE_END_PLAYER_TURN_AWAIT_HAPPY; } else if (player->stoneStatus == STATUS_STONE || battleStatus->outtaSightActive) { gBattleSubState = BTL_SUBSTATE_END_PLAYER_TURN_AWAIT_HAPPY; diff --git a/src/16c8e0.c b/src/16c8e0.c index f254767bb8..40a626cca0 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -885,10 +885,10 @@ void btl_draw_enemy_health_bars(void) { } } - if (!(enemy->flags & (ACTOR_FLAG_40000 | ACTOR_FLAG_TARGET_ONLY)) && - ((gBattleStatus.flags1 & BS_FLAGS1_MENU_OPEN) || (enemy->flags & ACTOR_FLAG_80000)) && - is_actor_hp_bar_visible(enemy)) - { + if (!(enemy->flags & (ACTOR_FLAG_40000 | ACTOR_FLAG_TARGET_ONLY)) + && ((gBattleStatus.flags1 & BS_FLAGS1_MENU_OPEN) || (enemy->flags & ACTOR_FLAG_80000)) + && is_actor_hp_bar_visible(enemy) + ) { f32 x = enemy->healthBarPosition.x; f32 y = enemy->healthBarPosition.y; f32 z = enemy->healthBarPosition.z; @@ -1104,7 +1104,7 @@ void btl_restore_world_cameras(void) { } void btl_delete_actor(Actor* actor) { - ActorPart* partsTable; + ActorPart* part; ActorPart* actorPartTemp; BattleStatus* battleStatus; s32 i; @@ -1124,29 +1124,29 @@ void btl_delete_actor(Actor* actor) { } func_80266EE8(actor, 0); - partsTable = actor->partsTable; + part = actor->partsTable; - while (partsTable != NULL) { - if (!(partsTable->flags & 0x4)) { - delete_shadow(partsTable->shadowIndex); + while (part != NULL) { + if (!(part->flags & ACTOR_PART_FLAG_4)) { + delete_shadow(part->shadowIndex); } - if (partsTable->idleAnimations != NULL) { - func_802DE894(partsTable->spriteInstanceID, 0, 0, 0, 0, 0, 0); + if (part->idleAnimations != NULL) { + func_802DE894(part->spriteInstanceID, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); - ASSERT(spr_free_sprite(partsTable->spriteInstanceID) == 0); + ASSERT(spr_free_sprite(part->spriteInstanceID) == 0); - if (!(partsTable->flags & 0x80000000)) { - heap_free(partsTable->movement); + if (!(part->flags & ACTOR_PART_FLAG_80000000)) { + heap_free(part->movement); } - if (!(partsTable->flags & 0x2)) { - heap_free(partsTable->decorationTable); + if (!(part->flags & 0x2)) { + heap_free(part->decorationTable); } } - actorPartTemp = partsTable->nextPart; - heap_free(partsTable); - partsTable = actorPartTemp; + actorPartTemp = part->nextPart; + heap_free(part); + part = actorPartTemp; } delete_shadow(actor->shadow.id); diff --git a/src/17FEB0.c b/src/17FEB0.c index caa9b4cce6..9af285c210 100644 --- a/src/17FEB0.c +++ b/src/17FEB0.c @@ -287,42 +287,39 @@ HitResult calc_item_damage_enemy(void) { } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { - if ((battleStatus->currentAttackElement & (DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POW)) && - (targetPart->eventFlags & ACTOR_EVENT_FLAG_GROUNDABLE)) - { - if (dispatchEvent == EVENT_HIT) { - dispatchEvent = EVENT_FALL_TRIGGER; - } - if (dispatchEvent == EVENT_IMMUNE) { - dispatchEvent = EVENT_FALL_TRIGGER; - } + if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + && (battleStatus->currentAttackElement & (DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POW)) + && (targetPart->eventFlags & ACTOR_EVENT_FLAG_GROUNDABLE) + ) { + if (dispatchEvent == EVENT_HIT) { + dispatchEvent = EVENT_FALL_TRIGGER; + } + if (dispatchEvent == EVENT_IMMUNE) { + dispatchEvent = EVENT_FALL_TRIGGER; } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { - if ((battleStatus->currentAttackElement & DAMAGE_TYPE_POW) && - (targetPart->eventFlags & ACTOR_EVENT_FLAG_800000)) - { - if (dispatchEvent == EVENT_HIT) { - dispatchEvent = EVENT_FALL_TRIGGER; - } - if (dispatchEvent == EVENT_IMMUNE) { - dispatchEvent = EVENT_FALL_TRIGGER; - } + if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + && (battleStatus->currentAttackElement & DAMAGE_TYPE_POW) + && (targetPart->eventFlags & ACTOR_EVENT_FLAG_800000) + ) { + if (dispatchEvent == EVENT_HIT) { + dispatchEvent = EVENT_FALL_TRIGGER; + } + if (dispatchEvent == EVENT_IMMUNE) { + dispatchEvent = EVENT_FALL_TRIGGER; } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { - if ((battleStatus->currentAttackElement & (DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POW | DAMAGE_TYPE_QUAKE)) && - (targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE)) - { - if (dispatchEvent == EVENT_HIT) { - dispatchEvent = EVENT_FLIP_TRIGGER; - } - if (dispatchEvent == EVENT_IMMUNE) { - dispatchEvent = EVENT_FLIP_TRIGGER; - } + if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + && (battleStatus->currentAttackElement & (DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POW | DAMAGE_TYPE_QUAKE)) + && (targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE) + ) { + if (dispatchEvent == EVENT_HIT) { + dispatchEvent = EVENT_FLIP_TRIGGER; + } + if (dispatchEvent == EVENT_IMMUNE) { + dispatchEvent = EVENT_FLIP_TRIGGER; } } @@ -338,12 +335,12 @@ HitResult calc_item_damage_enemy(void) { } } - if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) && - battleStatus->lastAttackDamage >= 0 && - dispatchEvent != EVENT_DEATH && - dispatchEvent != EVENT_SPIN_SMASH_DEATH && - dispatchEvent != EVENT_EXPLODE_TRIGGER) - { + if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + && battleStatus->lastAttackDamage >= 0 + && dispatchEvent != EVENT_DEATH + && dispatchEvent != EVENT_SPIN_SMASH_DEATH + && dispatchEvent != EVENT_EXPLODE_TRIGGER + ) { // Using this macro because it's nicer to look at, and it also is necessary to wrap the first 5 of these in a // do-while-0 OR to wrap each one individually. It's more likely that it's a macro instead, and much cleaner #define INFLICT_STATUS(STATUS_TYPE) \ @@ -381,14 +378,14 @@ HitResult calc_item_damage_enemy(void) { temp = (battleStatus->statusChance * temp) / 100; if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) && (battleStatus->currentAttackElement & DAMAGE_TYPE_FEAR)) { - if (rand_int(99) < temp && - !(target->debuff == STATUS_FEAR || - target->debuff == STATUS_DIZZY || - target->debuff == STATUS_PARALYZE || - target->debuff == STATUS_SLEEP || - target->debuff == STATUS_FROZEN || - target->debuff == STATUS_STOP) && - !(target->flags & ACTOR_FLAG_400)) + if (rand_int(99) < temp + && (target->debuff != STATUS_FEAR + && target->debuff != STATUS_DIZZY + && target->debuff != STATUS_PARALYZE + && target->debuff != STATUS_SLEEP + && target->debuff != STATUS_FROZEN + && target->debuff != STATUS_STOP) + && !(target->flags & ACTOR_FLAG_400)) { dispatchEvent = EVENT_SCARE_AWAY; hitResult = HIT_RESULT_HIT; @@ -405,9 +402,9 @@ HitResult calc_item_damage_enemy(void) { battleStatus->wasStatusInflicted = wasStatusInflicted; - if ( - (sp1C && (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200))) || - ((gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) && !(gBattleStatus.flags1 & BS_FLAGS1_80)) + if ((sp1C + && (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200))) + || ((gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) && !(gBattleStatus.flags1 & BS_FLAGS1_80)) ) { if (battleStatus->lastAttackDamage > 0) { sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); diff --git a/src/181810.c b/src/181810.c index f82909a0b6..4244f5cc8d 100644 --- a/src/181810.c +++ b/src/181810.c @@ -116,7 +116,7 @@ ApiStatus ActorSpeak(Evt* script, s32 isInitialCall) { ActorPart* part; s32 msgID; s32 actorID; - s32 partIndex; + s32 partID; s32 anim; f32 headX, headY, headZ; @@ -126,7 +126,7 @@ ApiStatus ActorSpeak(Evt* script, s32 isInitialCall) { if (isInitialCall) { msgID = evt_get_variable(script, *args++); actorID = evt_get_variable(script, *args++); - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); gSpeakingActorTalkAnim = evt_get_variable(script, *args++); gSpeakingActorIdleAnim = evt_get_variable(script, *args++); msgID2 = msgID; @@ -136,7 +136,7 @@ ApiStatus ActorSpeak(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - part = get_actor_part(actor, partIndex); + part = get_actor_part(actor, partID); gSpeakingActor = actor; gSpeakingActorPart = part; @@ -212,7 +212,7 @@ ApiStatus EndActorSpeech(Evt* script, s32 isInitialCall) { if (isInitialCall) { s32 actor = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); ActorPart* actorPart; gSpeakingActorTalkAnim = evt_get_variable(script, *args++); @@ -222,7 +222,7 @@ ApiStatus EndActorSpeech(Evt* script, s32 isInitialCall) { actor = script->owner1.actorID; } actor = (s32) get_actor(actor); - actorPart = get_actor_part((Actor*)actor, partIndex); + actorPart = get_actor_part((Actor*)actor, partID); gSpeakingActor = (Actor*) actor; gSpeakingActorPart = actorPart; close_message(gSpeakingActorPrintCtx); @@ -405,7 +405,7 @@ ApiStatus PlaySoundAtActor(Evt* script, s32 isInitialCall) { ApiStatus PlaySoundAtPart(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); Bytecode soundID = *args++; ActorPart* part; @@ -413,7 +413,7 @@ ApiStatus PlaySoundAtPart(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - part = get_actor_part(get_actor(actorID), partIndex); + part = get_actor_part(get_actor(actorID), partID); sfx_play_sound_at_position(soundID, SOUND_SPACE_MODE_0, part->currentPos.x, part->currentPos.y, part->currentPos.z); return ApiStatus_DONE2; diff --git a/src/182B30.c b/src/182B30.c index 473ab11ae6..e5e61fd7de 100644 --- a/src/182B30.c +++ b/src/182B30.c @@ -1515,25 +1515,25 @@ void appendGfx_player_actor(void* arg0) { lastAnim = playerParts->currentAnimation; } while (0); // required to match - if (((((gBattleStatus.flags2 & (BS_FLAGS2_8 | BS_FLAGS2_2)) == BS_FLAGS2_2) && (partner != NULL)) || (battleStatus->outtaSightActive > 0)) && - !(player->flags & ACTOR_FLAG_20000000) && - ((partner == NULL) || !(partner->flags & ACTOR_FLAG_NO_ATTACK))) + if (((((gBattleStatus.flags2 & (BS_FLAGS2_8 | BS_FLAGS2_2)) == BS_FLAGS2_2) && (partner != NULL)) || (battleStatus->outtaSightActive > 0)) + && !(player->flags & ACTOR_FLAG_20000000) + && ((partner == NULL) || !(partner->flags & ACTOR_FLAG_NO_ATTACK))) { if (!(gBattleStatus.flags2 & BS_FLAGS2_100000)) { - if ((player->debuff != STATUS_FEAR) && - (player->debuff != STATUS_PARALYZE) && - (player->debuff != STATUS_FROZEN) && - (player->debuff != STATUS_STOP)) - { + if ((player->debuff != STATUS_FEAR) + && (player->debuff != STATUS_PARALYZE) + && (player->debuff != STATUS_FROZEN) + && (player->debuff != STATUS_STOP) + ) { if ((player->transparentStatus != STATUS_TRANSPARENT) && (player->stoneStatus != STATUS_STONE) && ((battleStatus->outtaSightActive > 0) || (gBattleStatus.flags2 & BS_FLAGS2_2))) { if (is_ability_active(ABILITY_BERSERKER)) { playerParts->currentAnimation = func_80265D44(0x13); - } else if (player->debuff == 6) { + } else if (player->debuff == STATUS_SLEEP) { playerParts->currentAnimation = func_80265D44(0x15); - } else if (player->debuff == 4) { + } else if (player->debuff == STATUS_DIZZY) { playerParts->currentAnimation = func_80265D44(0x18); } else { playerParts->currentAnimation = func_80265D44(0x12); @@ -3223,9 +3223,9 @@ void func_8025C8A0(s32 isNpcSprite, ActorPart* part, s32 yaw, s32 arg3) { if (part->decorationTable->unk_751 != 0) { part->decorationTable->unk_751 = 0; if (isNpcSprite == SPRITE_MODE_PLAYER) { - func_802DDFF8(PLAYER_SPRITE_MAIN, 0, 0, 0, 0, 0, 0); + func_802DDFF8(PLAYER_SPRITE_MAIN, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); } else { - func_802DE894(part->spriteInstanceID, 0, 0, 0, 0, 0, 0); + func_802DE894(part->spriteInstanceID, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); } } } @@ -3246,9 +3246,9 @@ void func_8025C918(s32 isNpcSprite, ActorPart* part, s32 yaw, s32 arg3) { decor->unk_751 = 0; decor->unk758 = 0; if (isNpcSprite == SPRITE_MODE_PLAYER) { - func_802DDFF8(0, FOLD_TYPE_11, 0x14, 0, 0, 0xFF, 0); + func_802DDFF8(0, FOLD_TYPE_11, 20, 0, 0, 255, 0); } else { - func_802DE894(part->spriteInstanceID, FOLD_TYPE_11, 0x14, 0, 0, 0xFF, 0); + func_802DE894(part->spriteInstanceID, FOLD_TYPE_11, 20, 0, 0, 255, 0); } } @@ -3276,9 +3276,9 @@ void func_8025C918(s32 isNpcSprite, ActorPart* part, s32 yaw, s32 arg3) { for (i = 0; i < ARRAY_COUNT(rbuf); i++) { color = (rbuf[i] << 0x18) | (gbuf[i] << 0x10) | (bbuf[i] << 8) | alpha; if (isNpcSprite == SPRITE_MODE_PLAYER) { - func_802DDFF8(PLAYER_SPRITE_MAIN, 0xC, i, color, 0, 0xFF, 0); + func_802DDFF8(PLAYER_SPRITE_MAIN, FOLD_TYPE_C, i, color, 0, 0xFF, 0); } else { - func_802DE894(part->spriteInstanceID, 0xC, i, color, 0, 0xFF, 0); + func_802DE894(part->spriteInstanceID, FOLD_TYPE_C, i, color, 0, 0xFF, 0); } } diff --git a/src/190B20.c b/src/190B20.c index 9b5049bb93..208a1e9766 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -135,7 +135,7 @@ void create_target_list(Actor* actor, s32 arg1) { for (j = 0; j < numParts; targetPart = targetPart->nextPart, j++) { if (!(targetPart->flags & 0x20000)) { ActorPartBlueprint* partBlueprint = targetPart->staticData; - s8 partIndex; + s8 partID; if (!(targetPart->flags & 0x100000)) { fp = !arg1; // TODO ?????? if (fp) { @@ -173,12 +173,12 @@ void create_target_list(Actor* actor, s32 arg1) { } targetData->actorID = ACTOR_CLASS_ENEMY | i; - partIndex = partBlueprint->index; + partID = partBlueprint->index; targetData->pos.x = f6; targetData->pos.y = f8; targetData->pos.z = f10; targetData->unk_10 = 0; - targetData->partID = partIndex; + targetData->partID = partID; if ((targetActor->flags & 0x4000) && !(targetActor->flags & 0x10)) { targetData->unk_10 = 100; @@ -967,7 +967,7 @@ void func_80263CC4(s32 arg0) { start_script(&D_80293820, 10, 0)->varTable[0] = arg0; } -void set_animation(s32 actorID, s32 partIdx, s32 animationIndex) { +void set_animation(s32 actorID, s32 partID, s32 animationIndex) { if (animationIndex >= 0) { Actor* actor = get_actor(actorID); ActorPart* part; @@ -981,8 +981,8 @@ void set_animation(s32 actorID, s32 partIdx, s32 animationIndex) { } break; case ACTOR_CLASS_PARTNER: - if (partIdx != 0) { - part = get_actor_part(actor, partIdx); + if (partID != 0) { + part = get_actor_part(actor, partID); if (part == NULL) { part = &actor->partsTable[0]; @@ -998,7 +998,7 @@ void set_animation(s32 actorID, s32 partIdx, s32 animationIndex) { } break; case ACTOR_CLASS_ENEMY: - part = get_actor_part(actor, partIdx); + part = get_actor_part(actor, partID); if (part->currentAnimation != animationIndex) { part->currentAnimation = animationIndex; spr_update_sprite(part->spriteInstanceID, animationIndex, part->animationRate); @@ -1030,14 +1030,14 @@ void func_80263E08(Actor* actor, ActorPart* part, s32 anim) { } } -void set_animation_rate(s32 actorID, s32 partIndex, f32 rate) { +void set_animation_rate(s32 actorID, s32 partID, f32 rate) { Actor* actor = get_actor(actorID); ActorPart* part; switch (actorID & ACTOR_CLASS_MASK) { case ACTOR_CLASS_PARTNER: - if (partIndex != 0) { - part = get_actor_part(actor, partIndex); + if (partID != 0) { + part = get_actor_part(actor, partID); if (part != NULL) { part->animationRate = rate; return; @@ -1047,7 +1047,7 @@ void set_animation_rate(s32 actorID, s32 partIndex, f32 rate) { break; case ACTOR_CLASS_PLAYER: case ACTOR_CLASS_ENEMY: - part = get_actor_part(actor, partIndex); + part = get_actor_part(actor, partID); part->animationRate = rate; break; } @@ -1057,11 +1057,11 @@ void set_actor_yaw(s32 actorID, s32 yaw) { get_actor(actorID)->yaw = yaw; } -void set_part_yaw(s32 actorID, s32 partIndex, s32 value) { - get_actor_part(get_actor(actorID), partIndex)->yaw = value; +void set_part_yaw(s32 actorID, s32 partID, s32 value) { + get_actor_part(get_actor(actorID), partID)->yaw = value; } -void set_part_flag_bits(s32 actorID, s32 partIndex, s32 flags) { +void set_part_flag_bits(s32 actorID, s32 partID, s32 flags) { Actor* actor = get_actor(actorID); ActorPart* part; @@ -1071,17 +1071,17 @@ void set_part_flag_bits(s32 actorID, s32 partIndex, s32 flags) { break; case ACTOR_CLASS_PARTNER: case ACTOR_CLASS_ENEMY: - if (partIndex == 0) { + if (partID == 0) { actor->flags |= flags; } else { - part = get_actor_part(actor, partIndex); + part = get_actor_part(actor, partID); part->flags |= flags; } break; } } -void clear_part_flag_bits(s32 actorID, s32 partIndex, s32 flags) { +void clear_part_flag_bits(s32 actorID, s32 partID, s32 flags) { Actor* actor = get_actor(actorID); ActorPart* part; @@ -1091,10 +1091,10 @@ void clear_part_flag_bits(s32 actorID, s32 partIndex, s32 flags) { break; case ACTOR_CLASS_PARTNER: case ACTOR_CLASS_ENEMY: - if (partIndex == 0) { + if (partID == 0) { actor->flags &= ~flags; } else { - part = get_actor_part(actor, partIndex); + part = get_actor_part(actor, partID); part->flags &= ~flags; } break; @@ -1153,15 +1153,15 @@ void play_movement_dust_effects(s32 var0, f32 xPos, f32 yPos, f32 zPos, f32 angl } } -ActorPart* get_actor_part(Actor* actor, s32 partIndex) { +ActorPart* get_actor_part(Actor* actor, s32 partID) { ActorPart* part = &actor->partsTable[0]; - if (partIndex < 0 || part->nextPart == NULL) { + if (partID < 0 || part->nextPart == NULL) { return part; } while (part != NULL) { - if (part->staticData->index == partIndex) { + if (part->staticData->index == partID) { return part; } part = part->nextPart; @@ -1809,8 +1809,8 @@ Actor* create_actor(Formation formation) { part->targetOffset.x = actorPartBP->targetOffset.x; part->targetOffset.y = actorPartBP->targetOffset.y; part->unk_70 = 0; - part->unk_75 = actorPartBP->unk_1C; - part->unk_76 = actorPartBP->unk_1D; + part->projectileTargetOffset.x = actorPartBP->projectileTargetOffset.x; + part->projectileTargetOffset.y = actorPartBP->projectileTargetOffset.y; part->rotation.x = 0.0f; part->rotation.y = 0.0f; part->rotation.z = 0.0f; @@ -2731,9 +2731,10 @@ void add_part_decoration(ActorPart* part, s32 decorationIndex, s32 decorationTyp void add_actor_decoration(Actor* actor, s32 decorationIndex, s32 decorationType) { ActorPart* part; for (part = actor->partsTable; part != NULL; part = part->nextPart) { - if (!(part->flags & (ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) && part->idleAnimations && - !(part->flags & ACTOR_PART_FLAG_2)) - { + if (!(part->flags & (ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) + && part->idleAnimations + && !(part->flags & ACTOR_PART_FLAG_2) + ) { add_part_decoration(part, decorationIndex, decorationType); } } @@ -2747,9 +2748,10 @@ void remove_actor_decoration(Actor* actor, s32 decorationIndex) { ActorPart* part; for (part = actor->partsTable; part != NULL; part = part->nextPart) { - if (!(part->flags & (ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) && part->idleAnimations && - !(part->flags & ACTOR_PART_FLAG_2)) - { + if (!(part->flags & (ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) + && part->idleAnimations + && !(part->flags & ACTOR_PART_FLAG_2) + ) { remove_part_decoration(part, decorationIndex); } } @@ -2775,16 +2777,16 @@ s32 player_team_is_ability_active(Actor* actor, s32 ability) { return hasAbility; } -void create_part_shadow(s32 actorID, s32 partIndex) { - ActorPart* part = get_actor_part(get_actor(actorID), partIndex); +void create_part_shadow(s32 actorID, s32 partID) { + ActorPart* part = get_actor_part(get_actor(actorID), partID); part->flags &= ~ACTOR_PART_FLAG_4; part->shadowIndex = create_shadow_type(0, part->currentPos.x, part->currentPos.y, part->currentPos.z); part->shadowScale = part->size.x / 24.0; } -void remove_part_shadow(s32 actorID, s32 partIndex) { - ActorPart* part = get_actor_part(get_actor(actorID), partIndex); +void remove_part_shadow(s32 actorID, s32 partID) { + ActorPart* part = get_actor_part(get_actor(actorID), partID); part->flags |= ACTOR_PART_FLAG_4; delete_shadow(part->shadowIndex); diff --git a/src/19FAF0.c b/src/19FAF0.c index 39c37d58e9..3a839b4bba 100644 --- a/src/19FAF0.c +++ b/src/19FAF0.c @@ -551,8 +551,10 @@ HitResult calc_player_damage_enemy(void) { } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE && battleStatus->currentAttackElement & DAMAGE_TYPE_BLAST && - targetPart->eventFlags & ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION) { + if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + && battleStatus->currentAttackElement & DAMAGE_TYPE_BLAST + && targetPart->eventFlags & ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION + ) { targetDefense = 0; currentAttackDamage = target->currentHP; } @@ -654,12 +656,12 @@ HitResult calc_player_damage_enemy(void) { if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { if (battleStatus->currentAttackElement & DAMAGE_TYPE_FEAR && rand_int(99) < (target->actorBlueprint->escapeChance * battleStatus->statusChance) / 100 - && !(target->debuff == STATUS_FEAR - || target->debuff == STATUS_DIZZY - || target->debuff == STATUS_PARALYZE - || target->debuff == STATUS_SLEEP - || target->debuff == STATUS_FROZEN - || target->debuff == STATUS_STOP) + && (target->debuff != STATUS_FEAR + && target->debuff != STATUS_DIZZY + && target->debuff != STATUS_PARALYZE + && target->debuff != STATUS_SLEEP + && target->debuff != STATUS_FROZEN + && target->debuff != STATUS_STOP) && !(target->flags & ACTOR_FLAG_400) ) { dispatch_event_actor(target, EVENT_SCARE_AWAY); @@ -721,65 +723,68 @@ HitResult calc_player_damage_enemy(void) { } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { - if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT) && targetPart->eventFlags & ACTOR_EVENT_FLAG_POWER_BOUNCE) { - if (dispatchEvent == EVENT_HIT_COMBO) { - dispatchEvent = EVENT_POWER_BOUNCE_HIT; - } - - if (dispatchEvent == EVENT_HIT) { - dispatchEvent = EVENT_POWER_BOUNCE_HIT; - } - - if (dispatchEvent == EVENT_ZERO_DAMAGE) { - dispatchEvent = EVENT_POWER_BOUNCE_HIT; - } - - if (dispatchEvent == EVENT_IMMUNE) { - dispatchEvent = EVENT_POWER_BOUNCE_HIT; - } - - if (dispatchEvent == EVENT_DEATH) { - dispatchEvent = EVENT_POWER_BOUNCE_DEATH; - } + if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + && !(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT) + && targetPart->eventFlags & ACTOR_EVENT_FLAG_POWER_BOUNCE + ) { + if (dispatchEvent == EVENT_HIT_COMBO) { + dispatchEvent = EVENT_POWER_BOUNCE_HIT; } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { - if (battleStatus->currentAttackElement & (DAMAGE_TYPE_POW | DAMAGE_TYPE_JUMP) && targetPart->eventFlags & ACTOR_EVENT_FLAG_GROUNDABLE) { - if (dispatchEvent == EVENT_HIT) { - dispatchEvent = EVENT_FALL_TRIGGER; - } + if (dispatchEvent == EVENT_HIT) { + dispatchEvent = EVENT_POWER_BOUNCE_HIT; + } - if (dispatchEvent == EVENT_IMMUNE) { - dispatchEvent = EVENT_FALL_TRIGGER; - } + if (dispatchEvent == EVENT_ZERO_DAMAGE) { + dispatchEvent = EVENT_POWER_BOUNCE_HIT; + } - tempBinary = TRUE; - } + if (dispatchEvent == EVENT_IMMUNE) { + dispatchEvent = EVENT_POWER_BOUNCE_HIT; + } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { - if (battleStatus->currentAttackElement & (DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_POW | DAMAGE_TYPE_JUMP) && - targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE) { - if (dispatchEvent == EVENT_HIT) { - dispatchEvent = EVENT_FLIP_TRIGGER; - } + if (dispatchEvent == EVENT_DEATH) { + dispatchEvent = EVENT_POWER_BOUNCE_DEATH; + } + } - if (dispatchEvent == EVENT_IMMUNE) { - dispatchEvent = EVENT_FLIP_TRIGGER; - } + if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + && (battleStatus->currentAttackElement & (DAMAGE_TYPE_POW | DAMAGE_TYPE_JUMP)) + && targetPart->eventFlags & ACTOR_EVENT_FLAG_GROUNDABLE + ) { + if (dispatchEvent == EVENT_HIT) { + dispatchEvent = EVENT_FALL_TRIGGER; + } - if (!(target->flags & ACTOR_FLAG_400)) { - tempBinary = TRUE; - } - } - } + if (dispatchEvent == EVENT_IMMUNE) { + dispatchEvent = EVENT_FALL_TRIGGER; + } + + tempBinary = TRUE; + } + + if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + && (battleStatus->currentAttackElement & (DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_POW | DAMAGE_TYPE_JUMP)) + && targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE + ) { + if (dispatchEvent == EVENT_HIT) { + dispatchEvent = EVENT_FLIP_TRIGGER; + } + + if (dispatchEvent == EVENT_IMMUNE) { + dispatchEvent = EVENT_FLIP_TRIGGER; + } + + if (!(target->flags & ACTOR_FLAG_400)) { + tempBinary = TRUE; } } } - if (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) && - battleStatus->currentAttackElement & (DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_POW | DAMAGE_TYPE_JUMP) && - targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE) { + if (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + && battleStatus->currentAttackElement & (DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_POW | DAMAGE_TYPE_JUMP) + && targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE + ) { if (dispatchEvent == EVENT_HIT_COMBO) { dispatchEvent = EVENT_FLIP_TRIGGER; } @@ -793,70 +798,73 @@ HitResult calc_player_damage_enemy(void) { } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { - if (battleStatus->currentAttackElement & DAMAGE_TYPE_SHELL_CRACK && targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE) { - if (dispatchEvent == EVENT_HIT) { - dispatchEvent = EVENT_SHELL_CRACK_HIT; - } - - if (dispatchEvent == EVENT_IMMUNE) { - dispatchEvent = EVENT_SHELL_CRACK_HIT; - } - tempBinary = TRUE; + if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + && battleStatus->currentAttackElement & DAMAGE_TYPE_SHELL_CRACK + && targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE + ) { + if (dispatchEvent == EVENT_HIT) { + dispatchEvent = EVENT_SHELL_CRACK_HIT; } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { - if (battleStatus->currentAttackElement & (DAMAGE_TYPE_BLAST | DAMAGE_TYPE_FIRE)) { - if (dispatchEvent == EVENT_HIT) { - dispatchEvent = EVENT_BURN_HIT; - } - - if (dispatchEvent == EVENT_DEATH) { - dispatchEvent = EVENT_BURN_DEATH; - } - - isFireDamage = TRUE; - } - - do { // TODO remove this do while - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE && battleStatus->lastAttackDamage >= 0 && dispatchEvent != EVENT_DEATH && - dispatchEvent != EVENT_SPIN_SMASH_DEATH && dispatchEvent != EVENT_EXPLODE_TRIGGER) { - if (!(targetPart->targetFlags & ACTOR_PART_FLAG_4)) { - - #define INFLICT_STATUS(STATUS_TYPE) \ - if ((battleStatus->currentAttackStatus & STATUS_FLAG_##STATUS_TYPE) && \ - try_inflict_status(target, STATUS_##STATUS_TYPE, STATUS_##STATUS_TYPE##_TURN_MOD)) { \ - tempBinary = TRUE; \ - wasStatusInflicted = TRUE; \ - } \ - - INFLICT_STATUS(SHRINK); - INFLICT_STATUS(POISON); - INFLICT_STATUS(STONE); - INFLICT_STATUS(SLEEP); - INFLICT_STATUS(STOP); - INFLICT_STATUS(STATIC); - INFLICT_STATUS(FEAR); - INFLICT_STATUS(PARALYZE); - INFLICT_STATUS(DIZZY); - - #undef INFLICT_STATUS - - if (wasStatusInflicted) { - if (dispatchEvent == EVENT_ZERO_DAMAGE) { - dispatchEvent = EVENT_HIT_COMBO; - } - - if (dispatchEvent == EVENT_IMMUNE) { - dispatchEvent = EVENT_HIT; - } - } - } - } - } while (0); + if (dispatchEvent == EVENT_IMMUNE) { + dispatchEvent = EVENT_SHELL_CRACK_HIT; } + tempBinary = TRUE; } + if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + && (battleStatus->currentAttackElement & (DAMAGE_TYPE_BLAST | DAMAGE_TYPE_FIRE)) + ) { + if (dispatchEvent == EVENT_HIT) { + dispatchEvent = EVENT_BURN_HIT; + } + + if (dispatchEvent == EVENT_DEATH) { + dispatchEvent = EVENT_BURN_DEATH; + } + + isFireDamage = TRUE; + } + + do { // TODO remove this do while + if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + && battleStatus->lastAttackDamage >= 0 + && dispatchEvent != EVENT_DEATH + && dispatchEvent != EVENT_SPIN_SMASH_DEATH + && dispatchEvent != EVENT_EXPLODE_TRIGGER + && !(targetPart->targetFlags & ACTOR_PART_FLAG_4) + ) { + #define INFLICT_STATUS(STATUS_TYPE) \ + if ((battleStatus->currentAttackStatus & STATUS_FLAG_##STATUS_TYPE) && \ + try_inflict_status(target, STATUS_##STATUS_TYPE, STATUS_##STATUS_TYPE##_TURN_MOD)) { \ + tempBinary = TRUE; \ + wasStatusInflicted = TRUE; \ + } \ + + INFLICT_STATUS(SHRINK); + INFLICT_STATUS(POISON); + INFLICT_STATUS(STONE); + INFLICT_STATUS(SLEEP); + INFLICT_STATUS(STOP); + INFLICT_STATUS(STATIC); + INFLICT_STATUS(FEAR); + INFLICT_STATUS(PARALYZE); + INFLICT_STATUS(DIZZY); + + #undef INFLICT_STATUS + + if (wasStatusInflicted) { + if (dispatchEvent == EVENT_ZERO_DAMAGE) { + dispatchEvent = EVENT_HIT_COMBO; + } + + if (dispatchEvent == EVENT_IMMUNE) { + dispatchEvent = EVENT_HIT; + } + } + } + } while (0); + battleStatus->wasStatusInflicted = wasStatusInflicted; dispatch_event_actor(target, dispatchEvent); diff --git a/src/1A5830.c b/src/1A5830.c index 36f4b4cb2b..21489b71c0 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -1736,7 +1736,7 @@ ApiStatus JumpPartTo(Evt* script, s32 isInitialCall) { Actor* actor; ActorPart* part; ActorPartMovement* movement; - s32 actorID, partIndex; + s32 actorID, partID; f32 posX, posY, posZ; f32 goalX, goalY, goalZ; f32 deltaDist; @@ -1750,10 +1750,10 @@ ApiStatus JumpPartTo(Evt* script, s32 isInitialCall) { if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); actor = get_actor(actorID); - part = get_actor_part(actor, partIndex); + part = get_actor_part(actor, partID); script->functionTempPtr[1] = actor; script->functionTempPtr[2] = part; movement = part->movement; @@ -1830,7 +1830,7 @@ ApiStatus FallPartTo(Evt* script, s32 isInitialCall) { Actor* actor; ActorPart* part; ActorPartMovement* movement; - s32 actorID, partIndex; + s32 actorID, partID; f32 posX, posY, posZ; f32 goalX, goalY, goalZ; @@ -1843,10 +1843,10 @@ ApiStatus FallPartTo(Evt* script, s32 isInitialCall) { if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); actor = get_actor(actorID); - part = get_actor_part(actor, partIndex); + part = get_actor_part(actor, partID); script->functionTempPtr[1] = actor; script->functionTempPtr[2] = part; movement = part->movement; @@ -1926,14 +1926,14 @@ ApiStatus LandJumpPart(Evt* script, s32 isInitialCall) { if (script->functionTemp[0] == 0) { s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } actor = get_actor(actorID); - part = get_actor_part(actor, partIndex); + part = get_actor_part(actor, partID); script->functionTempPtr[1] = actor; script->functionTempPtr[2] = part; movement = part->movement; @@ -1966,7 +1966,7 @@ ApiStatus RunPartTo(Evt* script, s32 isInitialCall) { Actor* actor; ActorPart* part; ActorPartMovement* movement; - s32 actorID, partIndex; + s32 actorID, partID; f32 posX, posY, posZ; f32 goalX, goalY, goalZ; f32 deltaDist; @@ -1980,10 +1980,10 @@ ApiStatus RunPartTo(Evt* script, s32 isInitialCall) { if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); actor = get_actor(actorID); - part = get_actor_part(actor, partIndex); + part = get_actor_part(actor, partID); script->functionTempPtr[1] = actor; script->functionTempPtr[2] = part; movement = part->movement; @@ -2353,7 +2353,7 @@ ApiStatus FlyPartTo(Evt* script, s32 isInitialCall) { ActorPart* part; ActorPartMovement* partMovement; s32 actorID; - s32 partIndex; + s32 partID; f32 posX, posY, posZ; f32 goalX, goalY, goalZ; @@ -2366,10 +2366,10 @@ ApiStatus FlyPartTo(Evt* script, s32 isInitialCall) { if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); actor = get_actor(actorID); - part = get_actor_part(actor, partIndex); + part = get_actor_part(actor, partID); script->functionTempPtr[1] = actor; script->functionTempPtr[2] = part; partMovement = part->movement; @@ -2695,16 +2695,16 @@ ApiStatus DropStarPoints(Evt* script, s32 isInitialCall) { ApiStatus SetDefenseTable(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIdx; + s32 partID; u32* table; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIdx = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); table = (u32*) evt_get_variable(script, *args++); - get_actor_part(get_actor(actorID), partIdx)->defenseTable = table; + get_actor_part(get_actor(actorID), partID)->defenseTable = table; return ApiStatus_DONE2; } @@ -2725,35 +2725,35 @@ ApiStatus SetStatusTable(Evt* script, s32 isInitialCall) { ApiStatus SetIdleAnimations(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIdx; - u32* var2; + s32 partID; + AnimID* idleAnims; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIdx = evt_get_variable(script, *args++); - var2 = (u32*) evt_get_variable(script, *args++); - get_actor_part(get_actor(actorID), partIdx)->idleAnimations = var2; + partID = evt_get_variable(script, *args++); + idleAnims = (u32*) evt_get_variable(script, *args++); + get_actor_part(get_actor(actorID), partID)->idleAnimations = idleAnims; return ApiStatus_DONE2; } ApiStatus func_8027CC10(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); // weirdly unused evt_get_variable(script, *args++); evt_get_variable(script, *args++); - get_actor_part(get_actor(actorID), partIndex); + get_actor_part(get_actor(actorID), partID); return ApiStatus_DONE2; } @@ -2997,7 +2997,7 @@ ApiStatus func_8027D32C(Evt* script, s32 isInitialCall) { ApiStatus SetTargetOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; ActorPart* part; s32 x; s32 y; @@ -3006,8 +3006,8 @@ ApiStatus SetTargetOffset(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); - part = get_actor_part(get_actor(actorID), partIndex); + partID = evt_get_variable(script, *args++); + part = get_actor_part(get_actor(actorID), partID); x = evt_get_variable(script, *args++); y = evt_get_variable(script, *args++); @@ -3021,39 +3021,39 @@ ApiStatus SetTargetOffset(Evt* script, s32 isInitialCall) { ApiStatus func_8027D434(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; ActorPart* part; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); - part = get_actor_part(get_actor(actorID), partIndex); + partID = evt_get_variable(script, *args++); + part = get_actor_part(get_actor(actorID), partID); part->unk_70 = evt_get_variable(script, *args++); return ApiStatus_DONE2; } -ApiStatus func_8027D4C8(Evt* script, s32 isInitialCall) { +ApiStatus SetProjectileTargetOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; ActorPart* part; - s32 temp; - s32 temp2; + s32 dx; + s32 dy; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); - part = get_actor_part(get_actor(actorID), partIndex); + partID = evt_get_variable(script, *args++); + part = get_actor_part(get_actor(actorID), partID); - temp = evt_get_variable(script, *args++); - temp2 = evt_get_variable(script, *args++); + dx = evt_get_variable(script, *args++); + dy = evt_get_variable(script, *args++); - part->unk_75 = temp; - part->unk_76 = temp2; + part->projectileTargetOffset.x = dx; + part->projectileTargetOffset.y = dy; return ApiStatus_DONE2; } @@ -3197,7 +3197,7 @@ ApiStatus GetActorSize(Evt* script, s32 isInitialCall) { ApiStatus SetPartSize(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); s32 sizeY = evt_get_variable(script, *args++); s32 sizeX = evt_get_variable(script, *args++); ActorPart* part; @@ -3206,7 +3206,7 @@ ApiStatus SetPartSize(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - part = get_actor_part(get_actor(actorID), partIndex); + part = get_actor_part(get_actor(actorID), partID); if (sizeY != EVT_IGNORE_ARG) { part->size.y = sizeY; @@ -3280,7 +3280,7 @@ ApiStatus EnableActorGlow(Evt* script, s32 isInitialCall) { while (it != NULL) { if (it->idleAnimations != NULL) { - func_802DE894(it->spriteInstanceID, 0, 0, 0, 0, 0, 0); + func_802DE894(it->spriteInstanceID, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); } it = it->nextPart; } diff --git a/src/1AC760.c b/src/1AC760.c index a8b678af40..69f1d29e36 100644 --- a/src/1AC760.c +++ b/src/1AC760.c @@ -134,10 +134,10 @@ HitResult calc_partner_test_enemy(void) { } // check partner airlifting electrified enemy - if (partner->staticStatus != STATUS_STATIC && - (target->staticStatus == STATUS_STATIC || (part->eventFlags & ACTOR_EVENT_FLAG_ELECTRIFIED)) && - !(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT) && - !(battleStatus->currentAttackEventSuppression & SUPPRESS_EVENT_SHOCK_CONTACT)) + if (partner->staticStatus != STATUS_STATIC + && (target->staticStatus == STATUS_STATIC || (part->eventFlags & ACTOR_EVENT_FLAG_ELECTRIFIED)) + && !(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT) + && !(battleStatus->currentAttackEventSuppression & SUPPRESS_EVENT_SHOCK_CONTACT)) { sfx_play_sound_at_position(SOUND_HIT_SHOCK, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); apply_shock_effect(partner); @@ -146,9 +146,9 @@ HitResult calc_partner_test_enemy(void) { } // check partner airlifting fiery enemy - if (!(battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_SMASH)) && - (part->eventFlags & ACTOR_EVENT_FLAG_FIREY) && - !(battleStatus->currentAttackEventSuppression & SUPPRESS_EVENT_BURN_CONTACT)) + if (!(battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_SMASH)) + && (part->eventFlags & ACTOR_EVENT_FLAG_FIREY) + && !(battleStatus->currentAttackEventSuppression & SUPPRESS_EVENT_BURN_CONTACT)) { sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_damage_event_partner_1(1, EVENT_BURN_CONTACT); @@ -752,8 +752,11 @@ HitResult calc_partner_damage_enemy(void) { } } - if (tempBinary && gBattleStatus.flags1 & (BS_FLAGS1_200 | BS_FLAGS1_40) || gBattleStatus.flags1 & (BS_FLAGS1_200 | BS_FLAGS1_40) && - !(gBattleStatus.flags1 & BS_FLAGS1_80)) { + if (tempBinary + && gBattleStatus.flags1 & (BS_FLAGS1_200 | BS_FLAGS1_40) + || gBattleStatus.flags1 & (BS_FLAGS1_200 | BS_FLAGS1_40) + && !(gBattleStatus.flags1 & BS_FLAGS1_80) + ) { if ((battleStatus->lastAttackDamage > 0 && ((sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z), //TODO remove sfx_play from conditional diff --git a/src/1AF230.c b/src/1AF230.c deleted file mode 100644 index bf4a7bff11..0000000000 --- a/src/1AF230.c +++ /dev/null @@ -1,130 +0,0 @@ -#include "common.h" -#include "ld_addrs.h" -#include "sprite/npc/WorldGoombario.h" -#include "sprite/npc/BattleGoombario.h" -#include "sprite/npc/BattleKooper.h" -#include "sprite/npc/BattleBombette.h" -#include "sprite/npc/BattleParakarry.h" -#include "sprite/npc/BattleWatt.h" -#include "sprite/npc/BattleSushie.h" -#include "sprite/npc/BattleLakilester.h" -#include "sprite/npc/BattleBow.h" - -typedef struct StarPowerEntry { - /* 0x04 */ void* dmaStart; - /* 0x08 */ void* dmaEnd; - /* 0x0C */ void* dmaDest; - /* 0x10 */ Bytecode* init; -} StarPowerEntry; // size = 0x14 - -extern EvtScript battle_star_focus_usePower; -extern EvtScript battle_star_refresh_usePower; -extern EvtScript battle_star_lullaby_usePower; -extern EvtScript battle_star_star_storm_usePower; -extern EvtScript battle_star_chill_out_usePower; -extern EvtScript battle_star_smooch_usePower; -extern EvtScript battle_star_time_out_usePower; -extern EvtScript battle_star_up_and_away_usePower; -extern EvtScript battle_star_star_beam_usePower; -extern EvtScript battle_star_peach_beam_usePower; -extern EvtScript battle_star_peach_focus_usePower; -extern EvtScript battle_star_peach_dash_usePower; - -StarPowerEntry D_8029C7D0[] = { - { battle_star_focus_ROM_START, battle_star_focus_ROM_END, battle_star_focus_VRAM, battle_star_focus_usePower, }, - { battle_star_refresh_ROM_START, battle_star_refresh_ROM_END, battle_star_refresh_VRAM, battle_star_refresh_usePower, }, - { battle_star_lullaby_ROM_START, battle_star_lullaby_ROM_END, battle_star_lullaby_VRAM, battle_star_lullaby_usePower, }, - { battle_star_star_storm_ROM_START, battle_star_star_storm_ROM_END, battle_star_star_storm_VRAM, battle_star_star_storm_usePower, }, - { battle_star_chill_out_ROM_START, battle_star_chill_out_ROM_END, battle_star_chill_out_VRAM, battle_star_chill_out_usePower, }, - { battle_star_smooch_ROM_START, battle_star_smooch_ROM_END, battle_star_smooch_VRAM, battle_star_smooch_usePower, }, - { battle_star_time_out_ROM_START, battle_star_time_out_ROM_END, battle_star_time_out_VRAM, battle_star_time_out_usePower, }, - { battle_star_up_and_away_ROM_START, battle_star_up_and_away_ROM_END, battle_star_up_and_away_VRAM, battle_star_up_and_away_usePower, }, - { battle_star_star_beam_ROM_START, battle_star_star_beam_ROM_END, battle_star_star_beam_VRAM, battle_star_star_beam_usePower, }, - { battle_star_peach_beam_ROM_START, battle_star_peach_beam_ROM_END, battle_star_peach_beam_VRAM, battle_star_peach_beam_usePower, }, - { battle_star_peach_focus_ROM_START, battle_star_peach_focus_ROM_END, battle_star_peach_focus_VRAM, battle_star_peach_focus_usePower, }, - { battle_star_peach_dash_ROM_START, battle_star_peach_dash_ROM_END, battle_star_peach_dash_VRAM, battle_star_peach_dash_usePower, }, -}; - -s32 D_8029C890[][5] = { - [PARTNER_NONE] { - ANIM_Mario_GotItem, - ANIM_Mario_AnimPray, - ANIM_Mario_1002A, - ANIM_Mario_Running, - 0, - }, - [PARTNER_GOOMBARIO] { - ANIM_BattleGoombario_Run, - ANIM_BattleGoombario_CloseEyes, - ANIM_BattleGoombario_CloseEyes, - ANIM_BattleGoombario_Run, - ANIM_BattleGoombario_Idle, - }, - [PARTNER_KOOPER] { - ANIM_BattleKooper_Run, - ANIM_BattleKooper_Pray, - ANIM_BattleKooper_Pray, - ANIM_BattleKooper_Run, - ANIM_BattleKooper_Idle, - }, - [PARTNER_BOMBETTE] { - ANIM_BattleBombette_Run, - ANIM_BattleBombette_Sleep, - ANIM_BattleBombette_Sleep, - ANIM_BattleBombette_Run, - ANIM_BattleBombette_Idle, - }, - [PARTNER_PARAKARRY] { - ANIM_BattleParakarry_Run, - ANIM_BattleParakarry_Pray, - ANIM_BattleParakarry_Pray, - ANIM_BattleParakarry_Run, - ANIM_BattleParakarry_Idle, - }, - [PARTNER_GOOMPA] { - // no data - }, - [PARTNER_WATT] { - ANIM_BattleWatt_Run, - ANIM_BattleWatt_Sleep, - ANIM_BattleWatt_Sleep, - ANIM_BattleWatt_Run, - ANIM_BattleParakarry_Idle, // @bug uses wrong sprite! - }, - [PARTNER_SUSHIE] { - ANIM_BattleSushie_Run, - ANIM_BattleSushie_Pray, - ANIM_BattleSushie_Pray, - ANIM_BattleSushie_Run, - ANIM_BattleSushie_Idle, - }, - [PARTNER_LAKILESTER] { - ANIM_BattleLakilester_Run, - ANIM_BattleLakilester_Pray, - ANIM_BattleLakilester_Pray, - ANIM_BattleLakilester_Run, - ANIM_BattleLakilester_Idle, - }, - [PARTNER_BOW] { - ANIM_BattleBow_Run, - ANIM_BattleBow_Pray, - ANIM_BattleBow_Pray, - ANIM_BattleBow_Run, - ANIM_BattleBow_Idle, - }, -}; - -ApiStatus LoadStarPowerScript(Evt* script, s32 isInitialCall) { - BattleStatus* battleStatus = &gBattleStatus; - PlayerData* playerData = &gPlayerData; - s16 starPowerIdx; - - playerData->specialBarsFilled -= gMoveTable[battleStatus->selectedMoveID].costFP * 256; - starPowerIdx = battleStatus->moveArgument; - dma_copy((&D_8029C7D0[starPowerIdx])->dmaStart, (&D_8029C7D0[starPowerIdx])->dmaEnd, - (&D_8029C7D0[starPowerIdx])->dmaDest); - script->varTable[0] = (s32) (&D_8029C7D0[starPowerIdx])->init; - return ApiStatus_DONE2; -} - -MATCHING_BSS(0x1390); diff --git a/src/415D90.c b/src/415D90.c index ea087ae1b2..a261fa8628 100644 --- a/src/415D90.c +++ b/src/415D90.c @@ -5157,7 +5157,7 @@ void btl_state_draw_select_target(void) { } else { target = &actor->targetData[targetIndexList[selectedTargetIndex]]; anotherActor = get_actor(target->actorID); - msgID = get_actor_part(anotherActor, target->partID)->staticData->unk_20; + msgID = get_actor_part(anotherActor, target->partID)->staticData->overrideNameMsg; if (msgID == MSG_NONE) { msgID = bActorNames[anotherActor->actorType]; } @@ -5189,7 +5189,7 @@ void btl_state_draw_select_target(void) { } else { target = &actor->targetData[targetIndexList[selectedTargetIndex]]; anotherActor = get_actor(target->actorID); - msgID = get_actor_part(anotherActor, target->partID)->staticData->unk_20; + msgID = get_actor_part(anotherActor, target->partID)->staticData->overrideNameMsg; if (msgID == MSG_NONE) { msgID = bActorNames[anotherActor->actorType]; } diff --git a/src/77480.c b/src/77480.c index 8bde43ff2a..aec442e7c4 100644 --- a/src/77480.c +++ b/src/77480.c @@ -686,18 +686,17 @@ void check_input_use_partner(void) { PlayerData* playerData = &gPlayerData; u32 actionState = playerStatus->actionState; - if (!(playerStatus->animFlags & PA_FLAG_8BIT_MARIO)) { - if (playerStatus->animFlags & PA_FLAG_FORCE_USE_PARTNER || playerStatus->inputEnabledCounter == 0) { - if (playerStatus->pressedButtons & BUTTON_C_DOWN && !(playerStatus->flags & PS_FLAG_NO_PARTNER_USAGE) && - !(playerStatus->pressedButtons & BUTTON_B) && !(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) && - actionState <= ACTION_STATE_RUN) { - - if (playerData->currentPartner == PARTNER_GOOMBARIO) { - GoombarioGetTattleID = playerStatus->interactingWithID; - } - partner_use_ability(); - } + if (!(playerStatus->animFlags & PA_FLAG_8BIT_MARIO) + && (playerStatus->animFlags & PA_FLAG_FORCE_USE_PARTNER || playerStatus->inputEnabledCounter == 0) + && (playerStatus->pressedButtons & BUTTON_C_DOWN && !(playerStatus->flags & PS_FLAG_NO_PARTNER_USAGE)) + && !(playerStatus->pressedButtons & BUTTON_B) + && !(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) + && actionState <= ACTION_STATE_RUN + ) { + if (playerData->currentPartner == PARTNER_GOOMBARIO) { + GoombarioGetTattleID = playerStatus->interactingWithID; } + partner_use_ability(); } } diff --git a/src/7bb60_len_41b0.c b/src/7bb60_len_41b0.c index c2a3dc4c9a..92e92970f7 100644 --- a/src/7bb60_len_41b0.c +++ b/src/7bb60_len_41b0.c @@ -90,10 +90,10 @@ s32 collision_main_above(void) { collisionStatus->currentCeiling = hitResult; if (hitResult >= 0) { - if (playerStatus->actionState != ACTION_STATE_FALLING && - playerStatus->actionState != ACTION_STATE_STEP_DOWN && - collisionStatus->currentFloor < 0) - { + if (playerStatus->actionState != ACTION_STATE_FALLING + && playerStatus->actionState != ACTION_STATE_STEP_DOWN + && collisionStatus->currentFloor < 0 + ) { if (sp2C <= fabsf(new_var + playerStatus->gravityIntegrator[0])) { do { if ((hitResult & COLLISION_WITH_ENTITY_BIT) && get_entity_type(hitResult) == ENTITY_TYPE_BRICK_BLOCK) { @@ -102,9 +102,9 @@ s32 collision_main_above(void) { } while (0); playerStatus->position.y = y - ((playerStatus->colliderHeight / 5.0f) * 3.0f); - if (playerStatus->actionState != ACTION_STATE_TORNADO_JUMP && - playerStatus->actionState != ACTION_STATE_SPIN_JUMP) - { + if (playerStatus->actionState != ACTION_STATE_TORNADO_JUMP + && playerStatus->actionState != ACTION_STATE_SPIN_JUMP + ) { playerStatus->gravityIntegrator[0] = 0.0f; playerStatus->gravityIntegrator[1] = 0.0f; playerStatus->gravityIntegrator[2] = 0.0f; @@ -323,9 +323,9 @@ void gravity_use_fall_parms(void) { } void phys_update_falling(void) { - if (gPlayerStatus.actionState != ACTION_STATE_LANDING_ON_SWITCH && - gPlayerStatus.actionState != ACTION_STATE_BOUNCE) - { + if (gPlayerStatus.actionState != ACTION_STATE_LANDING_ON_SWITCH + && gPlayerStatus.actionState != ACTION_STATE_BOUNCE + ) { s32 colliderID; gPlayerStatus.position.y = player_check_collision_below(player_fall_distance(), &colliderID); player_handle_floor_collider_type(colliderID); @@ -401,11 +401,11 @@ void phys_player_land(void) { Entity* entity = get_entity_by_index(collisionStatus->currentFloor); entity->collisionFlags |= ENTITY_COLLISION_PLAYER_TOUCH_FLOOR; - if (playerStatus->actionState != ACTION_STATE_TORNADO_JUMP && - playerStatus->actionState != ACTION_STATE_TORNADO_POUND && - playerStatus->actionState != ACTION_STATE_SPIN_JUMP && - playerStatus->actionState != ACTION_STATE_SPIN_POUND) - { + if (playerStatus->actionState != ACTION_STATE_TORNADO_JUMP + && playerStatus->actionState != ACTION_STATE_TORNADO_POUND + && playerStatus->actionState != ACTION_STATE_SPIN_JUMP + && playerStatus->actionState != ACTION_STATE_SPIN_POUND + ) { set_action_state(ACTION_STATE_LANDING_ON_SWITCH); } else { disable_player_input(); @@ -971,9 +971,9 @@ void phys_main_collision_below(void) { } break; } - } else if (!(playerStatus->flags & PS_FLAG_FLYING) && - playerStatus->actionState != ACTION_STATE_USE_SPINNING_FLOWER) - { + } else if (!(playerStatus->flags & PS_FLAG_FLYING) + && playerStatus->actionState != ACTION_STATE_USE_SPINNING_FLOWER + ) { if (outLength <= collHeightHalf + temp_f24 && hitDirX == 0.0f && hitDirZ == 0.0f) { set_action_state(ACTION_STATE_STEP_DOWN); } else { @@ -1076,22 +1076,22 @@ void collision_lateral_peach(void) { playerStatus->position.z = z; // If there was a climbable step in this direction, but no wall, we can climb up it - if (climbableStep && - wall < 0 && - playerStatus->actionState != ACTION_STATE_STEP_UP_PEACH && - playerStatus->currentSpeed != 0.0f) - { + if (climbableStep + && wall < 0 + && playerStatus->actionState != ACTION_STATE_STEP_UP_PEACH + && playerStatus->currentSpeed != 0.0f + ) { set_action_state(ACTION_STATE_STEP_UP_PEACH); } } void check_input_midair_jump(void) { - if (!(gPlayerStatus.flags & (PS_FLAG_SCRIPTED_FALL | PS_FLAG_SLIDING | PS_FLAG_FLYING)) && - !(gPlayerStatus.animFlags & (PA_FLAG_8BIT_MARIO | PA_FLAG_USING_WATT)) && - gPlayerStatus.peakJumpTime >= 6 && - gPlayerStatus.timeInAir < 18 && - gPlayerStatus.pressedButtons & BUTTON_A) { - + if (!(gPlayerStatus.flags & (PS_FLAG_SCRIPTED_FALL | PS_FLAG_SLIDING | PS_FLAG_FLYING)) + && !(gPlayerStatus.animFlags & (PA_FLAG_8BIT_MARIO | PA_FLAG_USING_WATT)) + && gPlayerStatus.peakJumpTime >= 6 + && gPlayerStatus.timeInAir < 18 + && gPlayerStatus.pressedButtons & BUTTON_A + ) { switch (gPlayerData.bootsLevel) { case 0: break; diff --git a/src/7fd10_len_b40.c b/src/7fd10_len_b40.c index 1c2b31018c..761b573b78 100644 --- a/src/7fd10_len_b40.c +++ b/src/7fd10_len_b40.c @@ -72,14 +72,14 @@ s32 can_pause(s32 currentButtons, s32 pressedButtons) { PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; s32 actionState = gPlayerStatus.actionState; - if (!(gPlayerStatus.animFlags & PA_FLAG_CHANGING_MAP) && - !(gPlayerStatus.flags & PS_FLAG_PAUSE_DISABLED) && - !(currentButtons & (BUTTON_Z | BUTTON_R)) && - (pressedButtons & (BUTTON_START | BUTTON_C_LEFT | BUTTON_C_RIGHT)) && - ((gGameStatusPtr->mapShop == NULL) || !(gGameStatusPtr->mapShop->flags & 1)) && - !(gOverrideFlags & GLOBAL_OVERRIDES_DISABLE_MENUS) && - !is_picking_up_item()) - { + if (!(gPlayerStatus.animFlags & PA_FLAG_CHANGING_MAP) + && !(gPlayerStatus.flags & PS_FLAG_PAUSE_DISABLED) + && !(currentButtons & (BUTTON_Z | BUTTON_R)) + && (pressedButtons & (BUTTON_START | BUTTON_C_LEFT | BUTTON_C_RIGHT)) + && ((gGameStatusPtr->mapShop == NULL) || !(gGameStatusPtr->mapShop->flags & SHOP_FLAG_1)) + && !(gOverrideFlags & GLOBAL_OVERRIDES_DISABLE_MENUS) + && !is_picking_up_item() + ) { if (!(gPlayerStatus.animFlags & PA_FLAG_8BIT_MARIO)) { if (partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE) { if (!(gPlayerStatus.flags & PS_FLAG_NO_STATIC_COLLISION)) { diff --git a/src/actor_api.c b/src/actor_api.c index 246d47d99e..76cfb20f38 100644 --- a/src/actor_api.c +++ b/src/actor_api.c @@ -41,7 +41,7 @@ s32 get_nearest_home_index(f32 x, f32 y, f32 z) { return col | (row << 2); } -void set_goal_pos_to_part(ActorState* state, s32 actorID, s32 partIndex) { +void set_goal_pos_to_part(ActorState* state, s32 actorID, s32 partID) { s32 actorClass = actorID & ACTOR_CLASS_MASK; Actor* actor = get_actor(actorID); ActorPart* part; @@ -58,7 +58,7 @@ void set_goal_pos_to_part(ActorState* state, s32 actorID, s32 partIndex) { break; case ACTOR_CLASS_PARTNER: case ACTOR_CLASS_ENEMY: - part = get_actor_part(actor, partIndex); + part = get_actor_part(actor, partID); if (!(part->flags & ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) { state->goalPos.x = actor->currentPos.x + (part->partOffset.x + part->targetOffset.x) * actor->scalingFactor; if (!(actor->flags & ACTOR_PART_FLAG_800)) { @@ -80,7 +80,7 @@ void set_goal_pos_to_part(ActorState* state, s32 actorID, s32 partIndex) { } } -void set_part_goal_to_actor_part(ActorPartMovement* movement, s32 actorID, s32 partIndex) { +void set_part_goal_to_actor_part(ActorPartMovement* movement, s32 actorID, s32 partID) { s32 actorClass = actorID & ACTOR_CLASS_MASK; Actor* actor = get_actor(actorID); ActorPart* part; @@ -94,7 +94,7 @@ void set_part_goal_to_actor_part(ActorPartMovement* movement, s32 actorID, s32 p break; case ACTOR_CLASS_PARTNER: case ACTOR_CLASS_ENEMY: - part = get_actor_part(actor, partIndex); + part = get_actor_part(actor, partID); if (!(part->flags & ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) { part->movement->goalPos.x = actor->currentPos.x + (part->partOffset.x + part->targetOffset.x) * actor->scalingFactor; if (!(actor->flags & ACTOR_PART_FLAG_800)) { @@ -124,7 +124,7 @@ void set_actor_current_position(s32 actorID, f32 x, f32 y, f32 z) { actor->currentPos.z = z; } -void set_part_absolute_position(s32 actorID, s32 partIndex, f32 x, f32 y, f32 z) { +void set_part_absolute_position(s32 actorID, s32 partID, f32 x, f32 y, f32 z) { Actor* actor = get_actor(actorID); ActorPart* actorPart; @@ -136,7 +136,7 @@ void set_part_absolute_position(s32 actorID, s32 partIndex, f32 x, f32 y, f32 z) break; case ACTOR_CLASS_PARTNER: case ACTOR_CLASS_ENEMY: - actorPart = get_actor_part(actor, partIndex); + actorPart = get_actor_part(actor, partID); actorPart->absolutePosition.x = x; actorPart->absolutePosition.y = y; actorPart->absolutePosition.z = z; @@ -367,7 +367,7 @@ ApiStatus SetGoalToTarget(Evt* script, s32 isInitialCall) { ApiStatus SetPartGoalToTarget(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); Actor* actor; if (actorID == ACTOR_SELF) { @@ -375,7 +375,7 @@ ApiStatus SetPartGoalToTarget(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - set_part_goal_to_actor_part(get_actor_part(actor, partIndex)->movement, actor->targetActorID, actor->targetPartIndex); + set_part_goal_to_actor_part(get_actor_part(actor, partID)->movement, actor->targetActorID, actor->targetPartIndex); return ApiStatus_DONE2; } @@ -558,7 +558,7 @@ ApiStatus GetIdleGoal(Evt* script, s32 isInitialCall) { ApiStatus GetPartTarget(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); Actor* actor; ActorPart* actorPart; s32 outX, outY, outZ; @@ -569,7 +569,7 @@ ApiStatus GetPartTarget(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - actorPart = get_actor_part(actor, partIndex); + actorPart = get_actor_part(actor, partID); outX = *args++; outY = *args++; @@ -617,7 +617,7 @@ ApiStatus GetActorPos(Evt* script, s32 isInitialCall) { ApiStatus GetPartOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; ActorPart* actorPart; s32 outX, outY, outZ; s32 x, y, z; @@ -626,8 +626,8 @@ ApiStatus GetPartOffset(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); - actorPart = get_actor_part(get_actor(actorID), partIndex); + partID = evt_get_variable(script, *args++); + actorPart = get_actor_part(get_actor(actorID), partID); outX = *args++; outY = *args++; @@ -653,7 +653,7 @@ ApiStatus GetPartOffset(Evt* script, s32 isInitialCall) { ApiStatus GetPartPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; ActorPart* actorPart; s32 outX, outY, outZ; s32 x, y, z; @@ -662,8 +662,8 @@ ApiStatus GetPartPos(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); - actorPart = get_actor_part(get_actor(actorID), partIndex); + partID = evt_get_variable(script, *args++); + actorPart = get_actor_part(get_actor(actorID), partID); outX = *args++; outY = *args++; @@ -734,7 +734,7 @@ ApiStatus SetPartPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); Actor* actor; - s32 partIndex; + s32 partID; f32 x, y, z; ActorPart* actorPart; @@ -742,7 +742,7 @@ ApiStatus SetPartPos(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); x = evt_get_variable(script, *args++); y = evt_get_variable(script, *args++); z = evt_get_variable(script, *args++); @@ -757,7 +757,7 @@ ApiStatus SetPartPos(Evt* script, s32 isInitialCall) { break; case ACTOR_CLASS_PARTNER: case ACTOR_CLASS_ENEMY: - actorPart = get_actor_part(actor, partIndex); + actorPart = get_actor_part(actor, partID); if (!(actorPart->flags & ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) { actorPart->partOffset.x = x; @@ -778,7 +778,7 @@ ApiStatus SetEnemyTargetOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); Actor* actor; - s32 partIndex; + s32 partID; f32 x, y; ActorPart* actorPart; @@ -786,7 +786,7 @@ ApiStatus SetEnemyTargetOffset(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); x = evt_get_variable(script, *args++); y = evt_get_variable(script, *args++); @@ -797,7 +797,7 @@ ApiStatus SetEnemyTargetOffset(Evt* script, s32 isInitialCall) { break; case ACTOR_CLASS_PARTNER: case ACTOR_CLASS_ENEMY: - actorPart = get_actor_part(actor, partIndex); + actorPart = get_actor_part(actor, partID); actorPart->targetOffset.x = x; actorPart->targetOffset.y = y; break; @@ -850,17 +850,17 @@ ApiStatus SetAnimationRate(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); Actor* actor; - s32 partIndex; + s32 partID; f32 rate; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); rate = evt_get_float_variable(script, *args++); - set_animation_rate(actorID, partIndex, rate); + set_animation_rate(actorID, partID, rate); return ApiStatus_DONE2; } @@ -895,34 +895,34 @@ ApiStatus GetActorYaw(Evt* script, s32 isInitialCall) { ApiStatus SetPartYaw(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; s32 yaw; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); yaw = evt_get_variable(script, *args++); - set_part_yaw(actorID, partIndex, yaw); + set_part_yaw(actorID, partID, yaw); return ApiStatus_DONE2; } ApiStatus GetPartYaw(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; s32 a1; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); a1 = *args++; - evt_set_variable(script, a1, get_actor_part(get_actor(actorID), partIndex)->yaw); + evt_set_variable(script, a1, get_actor_part(get_actor(actorID), partID)->yaw); return ApiStatus_DONE2; } @@ -986,34 +986,34 @@ ApiStatus SetActorIdleSpeed(Evt* script, s32 isInitialCall) { ApiStatus SetPartJumpGravity(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; f32 jumpScale; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); jumpScale = evt_get_float_variable(script, *args++); - get_actor_part(get_actor(actorID), partIndex)->movement->jumpScale = jumpScale; + get_actor_part(get_actor(actorID), partID)->movement->jumpScale = jumpScale; return ApiStatus_DONE2; } ApiStatus SetPartMoveSpeed(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; f32 moveSpeed; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); moveSpeed = evt_get_float_variable(script, *args++); - get_actor_part(get_actor(actorID), partIndex)->movement->moveSpeed = moveSpeed; + get_actor_part(get_actor(actorID), partID)->movement->moveSpeed = moveSpeed; return ApiStatus_DONE2; } @@ -1092,7 +1092,7 @@ ApiStatus GetPartDispOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); ActorPart* actorPart; - s32 partIndex; + s32 partID; s32 outX, outY, outZ; f32 x, y, z; @@ -1100,12 +1100,12 @@ ApiStatus GetPartDispOffset(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); outX = *args++; outY = *args++; outZ = *args++; - actorPart = get_actor_part(get_actor(actorID), partIndex); + actorPart = get_actor_part(get_actor(actorID), partID); if (!(actorPart->flags & ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) { x = actorPart->partOffset.x; @@ -1128,19 +1128,19 @@ ApiStatus SetPartDispOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); ActorPart* actorPart; - s32 partIndex; + s32 partID; f32 x, y, z; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); x = evt_get_float_variable(script, *args++); y = evt_get_float_variable(script, *args++); z = evt_get_float_variable(script, *args++); - actorPart = get_actor_part(get_actor(actorID), partIndex); + actorPart = get_actor_part(get_actor(actorID), partID); if (!(actorPart->flags & ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) { actorPart->partOffset.x = x; @@ -1159,19 +1159,19 @@ ApiStatus AddPartDispOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); ActorPart* actorPart; - s32 partIndex; + s32 partID; f32 x, y, z; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); x = evt_get_float_variable(script, *args++); y = evt_get_float_variable(script, *args++); z = evt_get_float_variable(script, *args++); - actorPart = get_actor_part(get_actor(actorID), partIndex); + actorPart = get_actor_part(get_actor(actorID), partID); if (!(actorPart->flags & ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) { actorPart->partOffset.x += x; @@ -1259,7 +1259,7 @@ ApiStatus AddActorVar(Evt* script, s32 isInitialCall) { ApiStatus GetPartMovementVar(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; s32 tableIndex; s32 outVar; @@ -1267,11 +1267,11 @@ ApiStatus GetPartMovementVar(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); tableIndex = evt_get_variable(script, *args++); outVar = *args++; - evt_set_variable(script, outVar, get_actor_part(get_actor(actorID), partIndex)->movement->varTable[tableIndex]); + evt_set_variable(script, outVar, get_actor_part(get_actor(actorID), partID)->movement->varTable[tableIndex]); return ApiStatus_DONE2; } @@ -1279,7 +1279,7 @@ ApiStatus GetPartMovementVar(Evt* script, s32 isInitialCall) { ApiStatus SetPartMovementVar(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; s32 tableIndex; s32 val; @@ -1287,11 +1287,11 @@ ApiStatus SetPartMovementVar(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); tableIndex = evt_get_variable(script, *args++); val = evt_get_variable(script, *args++); - get_actor_part(get_actor(actorID), partIndex)->movement->varTable[tableIndex] = val; + get_actor_part(get_actor(actorID), partID)->movement->varTable[tableIndex] = val; return ApiStatus_DONE2; } @@ -1299,7 +1299,7 @@ ApiStatus SetPartMovementVar(Evt* script, s32 isInitialCall) { ApiStatus AddPartMovementVar(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; s32 tableIndex; s32 val; @@ -1307,11 +1307,11 @@ ApiStatus AddPartMovementVar(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); tableIndex = evt_get_variable(script, *args++); val = evt_get_variable(script, *args++); - get_actor_part(get_actor(actorID), partIndex)->movement->varTable[tableIndex] += val; + get_actor_part(get_actor(actorID), partID)->movement->varTable[tableIndex] += val; return ApiStatus_DONE2; } @@ -1396,7 +1396,7 @@ ApiStatus GetActorRotation(Evt* script, s32 isInitialCall) { ApiStatus SetPartRotation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 x, y, z; @@ -1408,7 +1408,7 @@ ApiStatus SetPartRotation(Evt* script, s32 isInitialCall) { y = evt_get_float_variable(script, *args++); z = evt_get_float_variable(script, *args++); - actorPart = get_actor_part(get_actor(actorID), partIndex); + actorPart = get_actor_part(get_actor(actorID), partID); actorPart->rotation.x = x; actorPart->rotation.y = y; @@ -1420,7 +1420,7 @@ ApiStatus SetPartRotation(Evt* script, s32 isInitialCall) { ApiStatus SetPartRotationOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 x, y, z; @@ -1432,7 +1432,7 @@ ApiStatus SetPartRotationOffset(Evt* script, s32 isInitialCall) { y = evt_get_float_variable(script, *args++); z = evt_get_float_variable(script, *args++); - actorPart = get_actor_part(get_actor(actorID), partIndex); + actorPart = get_actor_part(get_actor(actorID), partID); actorPart->rotationPivotOffset.x = x; actorPart->rotationPivotOffset.y = y; @@ -1444,7 +1444,7 @@ ApiStatus SetPartRotationOffset(Evt* script, s32 isInitialCall) { ApiStatus GetPartRotation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 x, y, z; @@ -1456,7 +1456,7 @@ ApiStatus GetPartRotation(Evt* script, s32 isInitialCall) { y = *args++; z = *args++; - actorPart = get_actor_part(get_actor(actorID), partIndex); + actorPart = get_actor_part(get_actor(actorID), partID); evt_set_float_variable(script, x, actorPart->rotation.x); evt_set_float_variable(script, y, actorPart->rotation.y); @@ -1537,7 +1537,7 @@ ApiStatus GetActorScale(Evt* script, s32 isInitialCall) { ApiStatus SetPartScale(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); ActorPart* actorPart; f32 x, y, z; @@ -1549,7 +1549,7 @@ ApiStatus SetPartScale(Evt* script, s32 isInitialCall) { y = evt_get_float_variable(script, *args++); z = evt_get_float_variable(script, *args++); - actorPart = get_actor_part(get_actor(actorID), partIndex); + actorPart = get_actor_part(get_actor(actorID), partID); actorPart->scale.x = x; actorPart->scale.y = y; @@ -1561,7 +1561,7 @@ ApiStatus SetPartScale(Evt* script, s32 isInitialCall) { ApiStatus GetPartScale(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 x, y, z; @@ -1573,7 +1573,7 @@ ApiStatus GetPartScale(Evt* script, s32 isInitialCall) { y = *args++; z = *args++; - actorPart = get_actor_part(get_actor(actorID), partIndex); + actorPart = get_actor_part(get_actor(actorID), partID); evt_set_float_variable(script, x, actorPart->scale.x); evt_set_float_variable(script, y, actorPart->scale.y); @@ -1589,12 +1589,13 @@ ApiStatus GetBattleFlags(Evt* script, s32 isInitialCall) { ApiStatus SetBattleFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Bytecode flagBits = *args++; + s32 bits = *args++; + s32 mode = evt_get_variable(script, *args++); - if (evt_get_variable(script, *args)) { - gBattleStatus.flags1 |= flagBits; + if (mode) { + gBattleStatus.flags1 |= bits; } else { - gBattleStatus.flags1 &= ~flagBits; + gBattleStatus.flags1 &= ~bits; } return ApiStatus_DONE2; @@ -1607,14 +1608,13 @@ ApiStatus GetBattleFlags2(Evt* script, s32 isInitialCall) { ApiStatus SetBattleFlagBits2(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Bytecode flagBits = *args++; + s32 bits = *args++; + s32 mode = evt_get_variable(script, *args++); - if (evt_get_variable(script, *args)) { - BattleStatus* battleStatus = &gBattleStatus; - battleStatus->flags2 |= flagBits; + if (mode) { + gBattleStatus.flags2 |= bits; } else { - BattleStatus* battleStatus = &gBattleStatus; - battleStatus->flags2 &= ~flagBits; + gBattleStatus.flags2 &= ~bits; } return ApiStatus_DONE2; @@ -1638,7 +1638,7 @@ ApiStatus SetActorFlags(Evt* script, s32 isInitialCall) { ApiStatus SetActorFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 flagBits; + s32 bits; s32 mode; Actor* actor; @@ -1646,14 +1646,14 @@ ApiStatus SetActorFlagBits(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - flagBits = *args++; + bits = *args++; mode = evt_get_variable(script, *args++); actor = get_actor(actorID); - if (mode != 0) { - actor->flags |= flagBits; + if (mode) { + actor->flags |= bits; } else { - actor->flags &= ~flagBits; + actor->flags &= ~bits; } return ApiStatus_DONE2; @@ -1679,16 +1679,16 @@ ApiStatus SetPartFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); s32 flagBits; - s32 partIndex; + s32 partID; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); flagBits = *args++; - get_actor_part(get_actor(actorID), partIndex)->flags = flagBits; + get_actor_part(get_actor(actorID), partID)->flags = flagBits; return ApiStatus_DONE2; } @@ -1697,24 +1697,24 @@ ApiStatus SetPartFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); ActorPart* actorPart; - s32 flagBits; - s32 partIndex; + s32 bits; + s32 partID; s32 mode; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); - flagBits = *args++; + partID = evt_get_variable(script, *args++); + bits = *args++; mode = evt_get_variable(script, *args++); - actorPart = get_actor_part(get_actor(actorID), partIndex); + actorPart = get_actor_part(get_actor(actorID), partID); - if (mode != 0) { - actorPart->flags |= flagBits; + if (mode) { + actorPart->flags |= bits; } else { - actorPart->flags &= ~flagBits; + actorPart->flags &= ~bits; } return ApiStatus_DONE2; @@ -1725,16 +1725,16 @@ ApiStatus SetPartTargetFlags(Evt* script, s32 isInitialCall) { s32 actorID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 flagBits; - s32 partIndex; + s32 partID; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); flagBits = *args++; - get_actor_part(get_actor(actorID), partIndex)->targetFlags = flagBits; + get_actor_part(get_actor(actorID), partID)->targetFlags = flagBits; return ApiStatus_DONE2; } @@ -1743,24 +1743,24 @@ ApiStatus SetPartTargetFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); ActorPart* actorPart; - s32 partIndex; - s32 flagBits; + s32 partID; + s32 bits; s32 mode; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); - flagBits = *args++; + partID = evt_get_variable(script, *args++); + bits = *args++; mode = evt_get_variable(script, *args++); - actorPart = get_actor_part(get_actor(actorID), partIndex); + actorPart = get_actor_part(get_actor(actorID), partID); - if (mode != 0) { - actorPart->targetFlags |= flagBits; + if (mode) { + actorPart->targetFlags |= bits; } else { - actorPart->targetFlags &= ~flagBits; + actorPart->targetFlags &= ~bits; } return ApiStatus_DONE2; @@ -1769,7 +1769,7 @@ ApiStatus SetPartTargetFlagBits(Evt* script, s32 isInitialCall) { ApiStatus GetPartFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; ActorPart* actorPart; s32 outVar; @@ -1777,10 +1777,10 @@ ApiStatus GetPartFlags(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); outVar = *args++; - evt_set_variable(script, outVar, get_actor_part(get_actor(actorID), partIndex)->flags); + evt_set_variable(script, outVar, get_actor_part(get_actor(actorID), partID)->flags); return ApiStatus_DONE2; } @@ -1788,7 +1788,7 @@ ApiStatus GetPartFlags(Evt* script, s32 isInitialCall) { ApiStatus GetPartTargetFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; + s32 partID; ActorPart* actorPart; s32 outVar; @@ -1796,10 +1796,10 @@ ApiStatus GetPartTargetFlags(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); outVar = *args++; - evt_set_variable(script, outVar, get_actor_part(get_actor(actorID), partIndex)->targetFlags); + evt_set_variable(script, outVar, get_actor_part(get_actor(actorID), partID)->targetFlags); return ApiStatus_DONE2; } @@ -1809,16 +1809,16 @@ ApiStatus SetPartEventFlags(Evt* script, s32 isInitialCall) { s32 actorID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 flagBits; - s32 partIndex; + s32 partID; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); flagBits = *args++; - get_actor_part(get_actor(actorID), partIndex)->eventFlags = flagBits; + get_actor_part(get_actor(actorID), partID)->eventFlags = flagBits; return ApiStatus_DONE2; } @@ -1826,25 +1826,27 @@ ApiStatus SetPartEventFlags(Evt* script, s32 isInitialCall) { ApiStatus SetPartEventBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - ActorPart* actorPart; - s32 partIndex; - s32 flagBits; + Actor* actor; + ActorPart* part; + s32 partID; + s32 bits; s32 mode; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); - flagBits = *args++; + partID = evt_get_variable(script, *args++); + bits = *args++; mode = evt_get_variable(script, *args++); - actorPart = get_actor_part(get_actor(actorID), partIndex); + actor = get_actor(actorID); + part = get_actor_part(actor, partID); - if (mode != 0) { - actorPart->eventFlags |= flagBits; + if (mode) { + part->eventFlags |= bits; } else { - actorPart->eventFlags &= ~flagBits; + part->eventFlags &= ~bits; } return ApiStatus_DONE2; @@ -1853,18 +1855,21 @@ ApiStatus SetPartEventBits(Evt* script, s32 isInitialCall) { ApiStatus GetPartEventFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex; - ActorPart* actorPart; + s32 partID; + Actor* actor; + ActorPart* part; s32 outVar; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); outVar = *args++; - evt_set_variable(script, outVar, get_actor_part(get_actor(actorID), partIndex)->eventFlags); + actor = get_actor(actorID); + part = get_actor_part(actor, partID); + evt_set_variable(script, outVar, part->eventFlags); return ApiStatus_DONE2; } @@ -1874,16 +1879,16 @@ ApiStatus SetPartImmunityFlags(Evt* script, s32 isInitialCall) { s32 actorID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 flagBits; - s32 partIndex; + s32 partID; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); flagBits = *args++; - get_actor_part(get_actor(actorID), partIndex)->elementalImmunities = flagBits; + get_actor_part(get_actor(actorID), partID)->elementalImmunities = flagBits; return ApiStatus_DONE2; } @@ -1892,26 +1897,26 @@ ApiStatus SetPartImmunityBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); Actor* actor; - ActorPart* actorPart; - s32 partIdx; - s32 flagBits; + ActorPart* part; + s32 partID; + s32 bits; s32 mode; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIdx = evt_get_variable(script, *args++); - flagBits = *args++; + partID = evt_get_variable(script, *args++); + bits = *args++; mode = evt_get_variable(script, *args++); actor = get_actor(actorID); - actorPart = get_actor_part(actor, partIdx); + part = get_actor_part(actor, partID); - if (mode != 0) { - actorPart->elementalImmunities |= flagBits; + if (mode) { + part->elementalImmunities |= bits; } else { - actorPart->elementalImmunities &= ~flagBits; + part->elementalImmunities &= ~bits; } return ApiStatus_DONE2; @@ -2147,14 +2152,14 @@ ApiStatus ActorExists(Evt* script, s32 isInitialCall) { ApiStatus func_8026DEF0(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); s32 a2 = *args++; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - evt_set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->spriteInstanceID); + evt_set_variable(script, a2, get_actor_part(get_actor(actorID), partID)->spriteInstanceID); return ApiStatus_DONE2; } @@ -2162,14 +2167,14 @@ ApiStatus func_8026DEF0(Evt* script, s32 isInitialCall) { ApiStatus func_8026DF88(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); s32 a2 = *args++; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - evt_set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->animNotifyValue); + evt_set_variable(script, a2, get_actor_part(get_actor(actorID), partID)->animNotifyValue); return ApiStatus_DONE2; } @@ -2498,10 +2503,10 @@ ApiStatus GetOwnerTarget(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(script->owner1.enemyID); s32 actorID = *args++; - s32 partIndex = *args++; + s32 partID = *args++; evt_set_variable(script, actorID, actor->targetActorID); - evt_set_variable(script, partIndex, actor->targetPartIndex); + evt_set_variable(script, partID, actor->targetPartIndex); return ApiStatus_DONE2; } @@ -2525,12 +2530,12 @@ ApiStatus GetPlayerActorID(Evt* script, s32 isInitialCall) { ApiStatus func_8026E9A0(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID; - s32 partIndex; + s32 partID; actorID = evt_get_variable(script, *args++); - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); - gBattleStatus.currentTargetPart2 = partIndex; + gBattleStatus.currentTargetPart2 = partID; gBattleStatus.currentTargetID2 = actorID; return ApiStatus_DONE2; @@ -2556,7 +2561,7 @@ ApiStatus GetDistanceToGoal(Evt* script, s32 isInitialCall) { ApiStatus func_8026EA7C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); s32 temp_s3 = evt_get_variable(script, *args++); Actor* actor; ActorPart* actorPart; @@ -2566,7 +2571,7 @@ ApiStatus func_8026EA7C(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - actorPart = get_actor_part(actor, partIndex); + actorPart = get_actor_part(actor, partID); func_80266D6C(actorPart, temp_s3); return ApiStatus_DONE2; } @@ -2593,14 +2598,14 @@ ApiStatus func_8026EB20(Evt* script, s32 isInitialCall) { ApiStatus func_8026EBF8(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); DecorationTable* table; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - table = get_actor_part(get_actor(actorID), partIndex)->decorationTable; + table = get_actor_part(get_actor(actorID), partID)->decorationTable; table->unk_740 = evt_get_variable(script, *args++); table->unk_742 = evt_get_variable(script, *args++); @@ -2638,14 +2643,14 @@ ApiStatus func_8026ED20(Evt* script, s32 isInitialCall) { ApiStatus func_8026EDE4(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); s32 temp_s3 = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - func_80266EA8(get_actor_part(get_actor(actorID), partIndex), temp_s3); + func_80266EA8(get_actor_part(get_actor(actorID), partID), temp_s3); return ApiStatus_DONE2; } @@ -2653,7 +2658,7 @@ ApiStatus func_8026EDE4(Evt* script, s32 isInitialCall) { ApiStatus AddActorDecoration(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); s32 decorationIndex = evt_get_variable(script, *args++); s32 decorationType = evt_get_variable(script, *args++); Actor* actor; @@ -2664,7 +2669,7 @@ ApiStatus AddActorDecoration(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - actorPart = get_actor_part(actor, partIndex); + actorPart = get_actor_part(actor, partID); add_part_decoration(actorPart, decorationIndex, decorationType); return ApiStatus_DONE2; } @@ -2672,7 +2677,7 @@ ApiStatus AddActorDecoration(Evt* script, s32 isInitialCall) { ApiStatus RemoveActorDecoration(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); s32 decorationIndex = evt_get_variable(script, *args++); Actor* actor; ActorPart* actorPart; @@ -2682,7 +2687,7 @@ ApiStatus RemoveActorDecoration(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - actorPart = get_actor_part(actor, partIndex); + actorPart = get_actor_part(actor, partID); remove_part_decoration(actorPart, decorationIndex); return ApiStatus_DONE2; } @@ -2690,7 +2695,7 @@ ApiStatus RemoveActorDecoration(Evt* script, s32 isInitialCall) { ApiStatus ModifyActorDecoration(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); s32 temp_s4 = evt_get_variable(script, *args++); ActorPart* actorPart; DecorationTable* decorationtable; @@ -2701,7 +2706,7 @@ ApiStatus ModifyActorDecoration(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - actorPart = get_actor_part(actor, partIndex); + actorPart = get_actor_part(actor, partID); decorationtable = actorPart->decorationTable; decorationtable->unk_8C6[temp_s4].unk00 = evt_get_variable(script, *args++); decorationtable->unk_8C6[temp_s4].unk02 = evt_get_variable(script, *args++); @@ -2887,7 +2892,7 @@ ApiStatus SetPartAlpha(Evt* script, s32 isInitialCall) { Actor* actor; s32* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); s32 opacity = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { @@ -2895,7 +2900,7 @@ ApiStatus SetPartAlpha(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - get_actor_part(actor, partIndex)->opacity = opacity; + get_actor_part(actor, partID)->opacity = opacity; actor->renderMode = (opacity == 255) ? RENDER_MODE_ALPHATEST : RENDER_MODE_SURFACE_XLU_LAYER3; return ApiStatus_DONE2; @@ -2904,26 +2909,26 @@ ApiStatus SetPartAlpha(Evt* script, s32 isInitialCall) { ApiStatus CreatePartShadow(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - create_part_shadow(actorID, partIndex); + create_part_shadow(actorID, partID); return ApiStatus_DONE2; } ApiStatus RemovePartShadow(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - remove_part_shadow(actorID, partIndex); + remove_part_shadow(actorID, partID); return ApiStatus_DONE2; } @@ -3049,7 +3054,7 @@ ApiStatus SetPartSounds(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); ActorPart* actorPart; - s32 partIndex; + s32 partID; s32 temp_s1_5; s32 temp_s2; s32 temp_s4; @@ -3058,11 +3063,11 @@ ApiStatus SetPartSounds(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = evt_get_variable(script, *args++); + partID = evt_get_variable(script, *args++); temp_s4 = evt_get_variable(script, *args++); temp_s1_5 = evt_get_variable(script, *args++); temp_s2 = evt_get_variable(script, *args++); - actorPart = get_actor_part(get_actor(actorID), partIndex); + actorPart = get_actor_part(get_actor(actorID), partID); switch (temp_s4) { case 0: diff --git a/src/battle/action_cmd.c b/src/battle/action_cmd.c index 50bfb26621..c39e72cc89 100644 --- a/src/battle/action_cmd.c +++ b/src/battle/action_cmd.c @@ -90,7 +90,7 @@ BSS s32 D_8029FBD8_pad[2]; BSS ActionCommandStatus gActionCommandStatus; -ApiStatus LoadActionCommand(Evt* script, s32 isInitialCall) { +API_CALLABLE(LoadActionCommand) { Bytecode* args = script->ptrReadPos; s32 cmd = evt_get_variable(script, *args++); @@ -660,12 +660,12 @@ void func_80269160(void) { } } -ApiStatus SetActionDifficultyTable(Evt* script, s32 isInitialCall) { +API_CALLABLE(SetActionDifficultyTable) { gBattleStatus.actionCmdDifficultyTable = (s32*) evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } -ApiStatus SetupMashMeter(Evt* script, s32 isInitialCall) { +API_CALLABLE(SetupMashMeter) { Bytecode* args = script->ptrReadPos; gActionCommandStatus.mashMeterIntervals = evt_get_variable(script, *args++); gActionCommandStatus.mashMeterCutoffs[1] = evt_get_variable(script, *args++); @@ -677,37 +677,37 @@ ApiStatus SetupMashMeter(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus GetActionSuccess(Evt* script, s32 isInitialCall) { +API_CALLABLE(GetActionSuccess) { evt_set_variable(script, *script->ptrReadPos, gBattleStatus.actionSuccess); return ApiStatus_DONE2; } -ApiStatus SetActionSuccess(Evt* script, s32 isInitialCall) { +API_CALLABLE(SetActionSuccess) { gBattleStatus.actionSuccess = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } -ApiStatus SetActionCommandMode(Evt* script, s32 isInitialCall) { +API_CALLABLE(SetActionCommandMode) { gBattleStatus.actionCommandMode = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } -ApiStatus GetActionCommandMode(Evt* script, s32 isInitialCall) { +API_CALLABLE(GetActionCommandMode) { evt_set_variable(script, *script->ptrReadPos, gBattleStatus.actionCommandMode); return ApiStatus_DONE2; } -ApiStatus SetActionHudPrepareTime(Evt* script, s32 isInitialCall) { +API_CALLABLE(SetActionHudPrepareTime) { gActionCommandStatus.hudPrepareTime = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } -ApiStatus GetCommandAutoSuccess(Evt* script, s32 isInitialCall) { +API_CALLABLE(GetCommandAutoSuccess) { evt_set_variable(script, *script->ptrReadPos, gActionCommandStatus.autoSucceed); return ApiStatus_DONE2; } -ApiStatus SetCommandAutoSuccess(Evt* script, s32 isInitialCall) { +API_CALLABLE(SetCommandAutoSuccess) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; if (evt_get_variable(script, *script->ptrReadPos) != 0) { @@ -718,12 +718,12 @@ ApiStatus SetCommandAutoSuccess(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802693F0(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802693F0) { gBattleStatus.flags1 &= ~BS_FLAGS1_4000; return ApiStatus_DONE2; } -ApiStatus CloseActionCommandInfo(Evt* script, s32 isInitialCall) { +API_CALLABLE(CloseActionCommandInfo) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; if (isInitialCall) { @@ -743,7 +743,7 @@ ApiStatus CloseActionCommandInfo(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80269470(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80269470) { if (isInitialCall) { action_command_free(); return ApiStatus_BLOCK; @@ -753,7 +753,7 @@ ApiStatus func_80269470(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus ShowActionHud(Evt* script, s32 isInitialCall) { +API_CALLABLE(ShowActionHud) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; if (evt_get_variable(script, *script->ptrReadPos) == 0) { @@ -764,42 +764,42 @@ ApiStatus ShowActionHud(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus GetActionSuccessCopy(Evt* script, s32 isInitialCall) { +API_CALLABLE(GetActionSuccessCopy) { evt_set_variable(script, *script->ptrReadPos, gBattleStatus.actionSuccess); return ApiStatus_DONE2; } -ApiStatus func_80269524(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80269524) { evt_set_variable(script, *script->ptrReadPos, gBattleStatus.unk_86); return ApiStatus_DONE2; } -ApiStatus func_80269550(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80269550) { gBattleStatus.unk_86 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } -ApiStatus GetBlockResult(Evt* script, s32 isInitialCall) { +API_CALLABLE(GetBlockResult) { evt_set_variable(script, *script->ptrReadPos, gBattleStatus.blockResult); return ApiStatus_DONE2; } -ApiStatus GetActionResult(Evt* script, s32 isInitialCall) { +API_CALLABLE(GetActionResult) { evt_set_variable(script, *script->ptrReadPos, gBattleStatus.actionResult); return ApiStatus_DONE2; } -ApiStatus SetActionResult(Evt* script, s32 isInitialCall) { +API_CALLABLE(SetActionResult) { gBattleStatus.actionResult = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } -ApiStatus func_80269600(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80269600) { evt_set_variable(script, *script->ptrReadPos, gBattleStatus.unk_85); return ApiStatus_DONE2; } -ApiStatus func_8026962C(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_8026962C) { gBattleStatus.unk_85 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/07.c b/src/battle/action_cmd/07.c index 9ddc2fffdd..a31bcb3a83 100644 --- a/src/battle/action_cmd/07.c +++ b/src/battle/action_cmd/07.c @@ -9,7 +9,7 @@ BSS s32 D_802A9620; extern s32 actionCmdTable07[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; @@ -57,7 +57,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32* args = script->ptrReadPos; diff --git a/src/battle/action_cmd/07.h b/src/battle/action_cmd/07.h index 0dc145ebd8..94c399dce2 100644 --- a/src/battle/action_cmd/07.h +++ b/src/battle/action_cmd/07.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_07_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_07_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_07_init); +API_CALLABLE(action_command_07_start); void action_command_07_update(void); void action_command_07_draw(void); void action_command_07_free(void); diff --git a/src/battle/action_cmd/0A.c b/src/battle/action_cmd/0A.c index 791048396b..b90b1ad4b8 100644 --- a/src/battle/action_cmd/0A.c +++ b/src/battle/action_cmd/0A.c @@ -5,7 +5,7 @@ extern s32 actionCmdTable0A[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 hudElement; diff --git a/src/battle/action_cmd/0A.h b/src/battle/action_cmd/0A.h index c3bad736ce..a899a4042a 100644 --- a/src/battle/action_cmd/0A.h +++ b/src/battle/action_cmd/0A.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_0A_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_0A_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_0A_init); +API_CALLABLE(action_command_0A_start); void action_command_0A_update(void); void action_command_0A_draw(void); void action_command_0A_free(void); diff --git a/src/battle/action_cmd/air_lift.c b/src/battle/action_cmd/air_lift.c index bea37c11d4..532461665c 100644 --- a/src/battle/action_cmd/air_lift.c +++ b/src/battle/action_cmd/air_lift.c @@ -10,7 +10,7 @@ BSS s32 air_lift_bss_0; extern s32 actionCmdTableAirLift[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { s32 *args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; @@ -56,7 +56,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; diff --git a/src/battle/action_cmd/air_lift.h b/src/battle/action_cmd/air_lift.h index 2edf23bdf8..264b6f16d3 100644 --- a/src/battle/action_cmd/air_lift.h +++ b/src/battle/action_cmd/air_lift.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_air_lift_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_air_lift_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_air_lift_init); +API_CALLABLE(action_command_air_lift_start); void action_command_air_lift_update(void); void action_command_air_lift_draw(void); void action_command_air_lift_free(void); diff --git a/src/battle/action_cmd/air_raid.c b/src/battle/action_cmd/air_raid.c index 4f19b434ae..3e7d3fc083 100644 --- a/src/battle/action_cmd/air_raid.c +++ b/src/battle/action_cmd/air_raid.c @@ -11,7 +11,7 @@ s32 D_802A99A8_429CC8[] = { 35, 35, 60, 80, 99, 200, }; extern s32 actionCmdTableAirRaid[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 hudElement; diff --git a/src/battle/action_cmd/air_raid.h b/src/battle/action_cmd/air_raid.h index 16e829a435..8d84daf63b 100644 --- a/src/battle/action_cmd/air_raid.h +++ b/src/battle/action_cmd/air_raid.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_air_raid_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_air_raid_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_air_raid_init); +API_CALLABLE(action_command_air_raid_start); void action_command_air_raid_update(void); void action_command_air_raid_draw(void); void action_command_air_raid_free(void); diff --git a/src/battle/action_cmd/body_slam.c b/src/battle/action_cmd/body_slam.c index 96fbd79cff..da57bdfe81 100644 --- a/src/battle/action_cmd/body_slam.c +++ b/src/battle/action_cmd/body_slam.c @@ -5,7 +5,7 @@ extern s32 actionCmdTableBodySlam[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 id; diff --git a/src/battle/action_cmd/body_slam.h b/src/battle/action_cmd/body_slam.h index d95573c84a..23360a0bfe 100644 --- a/src/battle/action_cmd/body_slam.h +++ b/src/battle/action_cmd/body_slam.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_body_slam_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_body_slam_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_body_slam_init); +API_CALLABLE(action_command_body_slam_start); void action_command_body_slam_update(void); void action_command_body_slam_draw(void); void action_command_body_slam_free(void); diff --git a/src/battle/action_cmd/bomb.c b/src/battle/action_cmd/bomb.c index 3a5d49d06e..5602720899 100644 --- a/src/battle/action_cmd/bomb.c +++ b/src/battle/action_cmd/bomb.c @@ -7,7 +7,7 @@ s32 D_802A9810_428280[] = { 0, 25, 50, 75, 75, 0, 0, 0 }; extern s32 actionCmdTableBomb[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 hudElement; diff --git a/src/battle/action_cmd/bomb.h b/src/battle/action_cmd/bomb.h index 586e859374..0f36c8f740 100644 --- a/src/battle/action_cmd/bomb.h +++ b/src/battle/action_cmd/bomb.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_bomb_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_bomb_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_bomb_init); +API_CALLABLE(action_command_bomb_start); void action_command_bomb_update(void); void action_command_bomb_draw(void); void action_command_bomb_free(void); diff --git a/src/battle/action_cmd/break_free.c b/src/battle/action_cmd/break_free.c index 7901d1e9e6..2db742e250 100644 --- a/src/battle/action_cmd/break_free.c +++ b/src/battle/action_cmd/break_free.c @@ -5,7 +5,7 @@ extern s32 actionCmdTableBreakFree[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 id; @@ -58,7 +58,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; diff --git a/src/battle/action_cmd/break_free.h b/src/battle/action_cmd/break_free.h index d32a0f2cdd..e462bbfae2 100644 --- a/src/battle/action_cmd/break_free.h +++ b/src/battle/action_cmd/break_free.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_break_free_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_break_free_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_break_free_init); +API_CALLABLE(action_command_break_free_start); void action_command_break_free_update(void); void action_command_break_free_draw(void); void action_command_break_free_free(void); diff --git a/src/battle/action_cmd/common/MashActionCommandStart.inc.c b/src/battle/action_cmd/common/MashActionCommandStart.inc.c index 5f7b401604..ae8385dbd8 100644 --- a/src/battle/action_cmd/common/MashActionCommandStart.inc.c +++ b/src/battle/action_cmd/common/MashActionCommandStart.inc.c @@ -1,4 +1,4 @@ -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { u8 mashMeterCutoff; ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; diff --git a/src/battle/action_cmd/dizzy_shell.c b/src/battle/action_cmd/dizzy_shell.c index bfce5eef1b..97c83159b8 100644 --- a/src/battle/action_cmd/dizzy_shell.c +++ b/src/battle/action_cmd/dizzy_shell.c @@ -8,7 +8,7 @@ s32 D_802A9800_426970[8] = { 0, 25, 50, 75, 75, 0, 0, 0 }; extern s32 actionCmdTableDizzyShell[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 id; diff --git a/src/battle/action_cmd/dizzy_shell.h b/src/battle/action_cmd/dizzy_shell.h index 2b7caa390c..d00e734a58 100644 --- a/src/battle/action_cmd/dizzy_shell.h +++ b/src/battle/action_cmd/dizzy_shell.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_dizzy_shell_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_dizzy_shell_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_dizzy_shell_init); +API_CALLABLE(action_command_dizzy_shell_start); void action_command_dizzy_shell_update(void); void action_command_dizzy_shell_draw(void); void action_command_dizzy_shell_free(void); diff --git a/src/battle/action_cmd/fire_shell.c b/src/battle/action_cmd/fire_shell.c index 50f038594d..45489359ac 100644 --- a/src/battle/action_cmd/fire_shell.c +++ b/src/battle/action_cmd/fire_shell.c @@ -11,7 +11,7 @@ s32 D_802A9988_427358[6] = { 35, 35, 60, 80, 99, 200 }; extern s32 actionCmdTableFireShell[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 id; diff --git a/src/battle/action_cmd/fire_shell.h b/src/battle/action_cmd/fire_shell.h index 3101b05ee1..3ea2579135 100644 --- a/src/battle/action_cmd/fire_shell.h +++ b/src/battle/action_cmd/fire_shell.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_fire_shell_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_fire_shell_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_fire_shell_init); +API_CALLABLE(action_command_fire_shell_start); void action_command_fire_shell_update(void); void action_command_fire_shell_draw(void); void action_command_fire_shell_free(void); diff --git a/src/battle/action_cmd/flee.c b/src/battle/action_cmd/flee.c index f3bafd2e12..4fdee1b087 100644 --- a/src/battle/action_cmd/flee.c +++ b/src/battle/action_cmd/flee.c @@ -7,7 +7,7 @@ BSS s32 D_802A9920; extern s32 actionCmdTableFlee[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; @@ -70,7 +70,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { Bytecode* args = script->ptrReadPos; ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; diff --git a/src/battle/action_cmd/flee.h b/src/battle/action_cmd/flee.h index 4282cdcef8..c2910bca54 100644 --- a/src/battle/action_cmd/flee.h +++ b/src/battle/action_cmd/flee.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_flee_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_flee_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_flee_init); +API_CALLABLE(action_command_flee_start); void action_command_flee_update(void); void action_command_flee_draw(void); void action_command_flee_free(void); diff --git a/src/battle/action_cmd/hammer.c b/src/battle/action_cmd/hammer.c index b98cbb6980..cb0378cf8f 100644 --- a/src/battle/action_cmd/hammer.c +++ b/src/battle/action_cmd/hammer.c @@ -5,7 +5,7 @@ extern s32 actionCmdTableHammer[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 id; @@ -73,7 +73,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; diff --git a/src/battle/action_cmd/hammer.h b/src/battle/action_cmd/hammer.h index 33eea66670..64112f322d 100644 --- a/src/battle/action_cmd/hammer.h +++ b/src/battle/action_cmd/hammer.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_hammer_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_hammer_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_hammer_init); +API_CALLABLE(action_command_hammer_start); void action_command_hammer_update(void); void action_command_hammer_draw(void); void action_command_hammer_free(void); diff --git a/src/battle/action_cmd/hurricane.c b/src/battle/action_cmd/hurricane.c index 3465e805ba..bf9c37ea6b 100644 --- a/src/battle/action_cmd/hurricane.c +++ b/src/battle/action_cmd/hurricane.c @@ -7,7 +7,7 @@ s32 D_802A98E0_42FFC0[8] = { 0, 25, 50, 75, 75, 0, 0, 0 }; extern s32 actionCmdTableHurricane[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 id; @@ -58,7 +58,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; diff --git a/src/battle/action_cmd/hurricane.h b/src/battle/action_cmd/hurricane.h index 17a3e64df9..9ad0631201 100644 --- a/src/battle/action_cmd/hurricane.h +++ b/src/battle/action_cmd/hurricane.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_hurricane_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_hurricane_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_hurricane_init); +API_CALLABLE(action_command_hurricane_start); void action_command_hurricane_update(void); void action_command_hurricane_draw(void); void action_command_hurricane_free(void); diff --git a/src/battle/action_cmd/jump.c b/src/battle/action_cmd/jump.c index a5b1ca89b1..823d30f218 100644 --- a/src/battle/action_cmd/jump.c +++ b/src/battle/action_cmd/jump.c @@ -5,7 +5,7 @@ extern s32 actionCmdTableJump[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { s32 hudElement; ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; @@ -42,7 +42,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { s32 hudElement; ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; diff --git a/src/battle/action_cmd/jump.h b/src/battle/action_cmd/jump.h index 34529990b5..b88e8a426e 100644 --- a/src/battle/action_cmd/jump.h +++ b/src/battle/action_cmd/jump.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_jump_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_jump_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_jump_init); +API_CALLABLE(action_command_jump_start); void action_command_jump_update(void); void action_command_jump_draw(void); void action_command_jump_free(void); diff --git a/src/battle/action_cmd/mega_shock.c b/src/battle/action_cmd/mega_shock.c index 2401e2b533..c85343f5ac 100644 --- a/src/battle/action_cmd/mega_shock.c +++ b/src/battle/action_cmd/mega_shock.c @@ -8,7 +8,7 @@ s32 D_802A9930_42E340[] = { 0, 25, 50, 75, 75, 0, 0, 0 }; extern s32 actionCmdTableMegaShock[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { BattleStatus* battleStatus = &gBattleStatus; ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; s32 elementID; @@ -58,7 +58,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { Bytecode* readPos = script->ptrReadPos; ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; diff --git a/src/battle/action_cmd/mega_shock.h b/src/battle/action_cmd/mega_shock.h index 3d721cf085..77ebb16578 100644 --- a/src/battle/action_cmd/mega_shock.h +++ b/src/battle/action_cmd/mega_shock.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_mega_shock_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_mega_shock_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_mega_shock_init); +API_CALLABLE(action_command_mega_shock_start); void action_command_mega_shock_update(void); void action_command_mega_shock_draw(void); void action_command_mega_shock_free(void); diff --git a/src/battle/action_cmd/power_shock.c b/src/battle/action_cmd/power_shock.c index ecc43d93a3..4182a11735 100644 --- a/src/battle/action_cmd/power_shock.c +++ b/src/battle/action_cmd/power_shock.c @@ -9,7 +9,7 @@ BSS s32 D_802A9B00; extern s32 actionCmdTablePowerShock[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 id; @@ -68,7 +68,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; diff --git a/src/battle/action_cmd/power_shock.h b/src/battle/action_cmd/power_shock.h index e617da9611..d9dba62e6c 100644 --- a/src/battle/action_cmd/power_shock.h +++ b/src/battle/action_cmd/power_shock.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_power_shock_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_power_shock_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_power_shock_init); +API_CALLABLE(action_command_power_shock_start); void action_command_power_shock_update(void); void action_command_power_shock_draw(void); void action_command_power_shock_free(void); diff --git a/src/battle/action_cmd/smack.c b/src/battle/action_cmd/smack.c index 632cafee49..38caf794da 100644 --- a/src/battle/action_cmd/smack.c +++ b/src/battle/action_cmd/smack.c @@ -35,7 +35,7 @@ s32 D_802A9A20_42EDC0[] = { extern s32 actionCmdTableSmack[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 hudElement; diff --git a/src/battle/action_cmd/smack.h b/src/battle/action_cmd/smack.h index 549c4a46d9..bfa11f5eee 100644 --- a/src/battle/action_cmd/smack.h +++ b/src/battle/action_cmd/smack.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_smack_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_smack_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_smack_init); +API_CALLABLE(action_command_smack_start); void action_command_smack_update(void); void action_command_smack_draw(void); void action_command_smack_free(void); diff --git a/src/battle/action_cmd/spiny_surge.c b/src/battle/action_cmd/spiny_surge.c index ba4945e694..0f2123587d 100644 --- a/src/battle/action_cmd/spiny_surge.c +++ b/src/battle/action_cmd/spiny_surge.c @@ -9,7 +9,7 @@ BSS s32 D_802A98C0; extern s32 actionCmdTableSpinySurge[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 id; @@ -57,7 +57,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; diff --git a/src/battle/action_cmd/spiny_surge.h b/src/battle/action_cmd/spiny_surge.h index bfad65cebb..1ffa63ef60 100644 --- a/src/battle/action_cmd/spiny_surge.h +++ b/src/battle/action_cmd/spiny_surge.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_spiny_surge_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_spiny_surge_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_spiny_surge_init); +API_CALLABLE(action_command_spiny_surge_start); void action_command_spiny_surge_update(void); void action_command_spiny_surge_draw(void); void action_command_spiny_surge_free(void); diff --git a/src/battle/action_cmd/spook.c b/src/battle/action_cmd/spook.c index c9596a0688..30c703e3d8 100644 --- a/src/battle/action_cmd/spook.c +++ b/src/battle/action_cmd/spook.c @@ -8,7 +8,7 @@ s32 D_802A9920_430940[8] = { 0, 25, 50, 75, 75, 0, 0, 0 }; extern s32 actionCmdTableSpook[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 id; diff --git a/src/battle/action_cmd/spook.h b/src/battle/action_cmd/spook.h index ed3bbb53a3..838f4cbc43 100644 --- a/src/battle/action_cmd/spook.h +++ b/src/battle/action_cmd/spook.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_spook_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_spook_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_spook_init); +API_CALLABLE(action_command_spook_start); void action_command_spook_update(void); void action_command_spook_draw(void); void action_command_spook_free(void); diff --git a/src/battle/action_cmd/squirt.c b/src/battle/action_cmd/squirt.c index 6e404bb256..d3f456c9f1 100644 --- a/src/battle/action_cmd/squirt.c +++ b/src/battle/action_cmd/squirt.c @@ -8,7 +8,7 @@ s32 D_802A9778_42A498[] = { 300, 300, 265, 220, 175, 175, }; extern s32 actionCmdTableSquirt[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 id; @@ -46,7 +46,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; diff --git a/src/battle/action_cmd/squirt.h b/src/battle/action_cmd/squirt.h index 3c1a803bf7..6b32649a65 100644 --- a/src/battle/action_cmd/squirt.h +++ b/src/battle/action_cmd/squirt.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_squirt_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_squirt_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_squirt_init); +API_CALLABLE(action_command_squirt_start); void action_command_squirt_update(void); void action_command_squirt_draw(void); void action_command_squirt_free(void); diff --git a/src/battle/action_cmd/stop_leech.c b/src/battle/action_cmd/stop_leech.c index 8936046899..abf09f3b68 100644 --- a/src/battle/action_cmd/stop_leech.c +++ b/src/battle/action_cmd/stop_leech.c @@ -5,7 +5,7 @@ extern s32 actionCmdTableStopLeech[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 hudElement; @@ -40,7 +40,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { Bytecode* args = script->ptrReadPos; ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; diff --git a/src/battle/action_cmd/stop_leech.h b/src/battle/action_cmd/stop_leech.h index 8e7423c8df..606d4669de 100644 --- a/src/battle/action_cmd/stop_leech.h +++ b/src/battle/action_cmd/stop_leech.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_stop_leech_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_stop_leech_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_stop_leech_init); +API_CALLABLE(action_command_stop_leech_start); void action_command_stop_leech_update(void); void action_command_stop_leech_draw(void); void action_command_stop_leech_free(void); diff --git a/src/battle/action_cmd/tidal_wave.c b/src/battle/action_cmd/tidal_wave.c index 62b7293c9c..87f0a05d93 100644 --- a/src/battle/action_cmd/tidal_wave.c +++ b/src/battle/action_cmd/tidal_wave.c @@ -8,7 +8,7 @@ HudScript* D_802A97CC_42CEBC[3] = { &HES_AButtonDown, &HES_BButtonHeld, &HES_CDo extern s32 actionCmdTableTidalWave[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 id; @@ -49,7 +49,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { } } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; diff --git a/src/battle/action_cmd/tidal_wave.h b/src/battle/action_cmd/tidal_wave.h index 829735989c..b82506667b 100644 --- a/src/battle/action_cmd/tidal_wave.h +++ b/src/battle/action_cmd/tidal_wave.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_tidal_wave_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_tidal_wave_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_tidal_wave_init); +API_CALLABLE(action_command_tidal_wave_start); void action_command_tidal_wave_update(void); void action_command_tidal_wave_draw(void); void action_command_tidal_wave_free(void); diff --git a/src/battle/action_cmd/water_block.c b/src/battle/action_cmd/water_block.c index 3003401be8..59cf6a57f3 100644 --- a/src/battle/action_cmd/water_block.c +++ b/src/battle/action_cmd/water_block.c @@ -109,7 +109,7 @@ HudScript* D_802AB184_42C674[] = { extern s32 actionCmdTableWaterBlock[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; @@ -214,7 +214,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; diff --git a/src/battle/action_cmd/water_block.h b/src/battle/action_cmd/water_block.h index 507442f4d8..68f3b348d2 100644 --- a/src/battle/action_cmd/water_block.h +++ b/src/battle/action_cmd/water_block.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_water_block_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_water_block_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_water_block_init); +API_CALLABLE(action_command_water_block_start); void action_command_water_block_update(void); void action_command_water_block_draw(void); void action_command_water_block_free(void); diff --git a/src/battle/action_cmd/whirlwind.c b/src/battle/action_cmd/whirlwind.c index 724633fccc..7f4e70c95d 100644 --- a/src/battle/action_cmd/whirlwind.c +++ b/src/battle/action_cmd/whirlwind.c @@ -61,7 +61,7 @@ s32 D_802AA8B4_425524[] = { 3, 3, 3, 3, 2, 2, 2, 1, 1, 1, 1 }; extern s32 actionCmdTableWhirlwind[]; -ApiStatus N(init)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; @@ -117,7 +117,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(start)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(start)) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; diff --git a/src/battle/action_cmd/whirlwind.h b/src/battle/action_cmd/whirlwind.h index 4959fbbbe2..5f91dce34b 100644 --- a/src/battle/action_cmd/whirlwind.h +++ b/src/battle/action_cmd/whirlwind.h @@ -3,8 +3,8 @@ #include "common_structs.h" -ApiStatus action_command_whirlwind_init(Evt* script, s32 isInitialCall); -ApiStatus action_command_whirlwind_start(Evt* script, s32 isInitialCall); +API_CALLABLE(action_command_whirlwind_init); +API_CALLABLE(action_command_whirlwind_start); void action_command_whirlwind_update(void); void action_command_whirlwind_draw(void); void action_command_whirlwind_free(void); diff --git a/src/battle/area_arn/actor/hyper_cleft.c b/src/battle/area/arn/actor/hyper_cleft.c similarity index 99% rename from src/battle/area_arn/actor/hyper_cleft.c rename to src/battle/area/arn/actor/hyper_cleft.c index 058614a6e6..5308dc71c8 100644 --- a/src/battle/area_arn/actor/hyper_cleft.c +++ b/src/battle/area/arn/actor/hyper_cleft.c @@ -64,7 +64,7 @@ ActorPartBlueprint N(partsTable_80220C14)[] = { .defenseTable = N(defenseTable_80220B40), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; @@ -421,7 +421,7 @@ EvtScript N(80221DE0) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80221D20))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80220B54))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -7) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -7) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 0) EVT_CALL(N(SetSpinSmashable), 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) @@ -708,7 +708,7 @@ EvtScript N(80222F1C) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80221CD4))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80220B40))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 22) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -10) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 1) EVT_WAIT(1) EVT_CALL(N(SetSpinSmashable), 1) diff --git a/src/battle/area_arn/actor/hyper_paragoomba.c b/src/battle/area/arn/actor/hyper_paragoomba.c similarity index 99% rename from src/battle/area_arn/actor/hyper_paragoomba.c rename to src/battle/area/arn/actor/hyper_paragoomba.c index d1b1b068ab..7a8ae4962b 100644 --- a/src/battle/area_arn/actor/hyper_paragoomba.c +++ b/src/battle/area/arn/actor/hyper_paragoomba.c @@ -97,7 +97,7 @@ ActorPartBlueprint N(partsTable_8021B460)[] = { .defenseTable = N(defenseTable_8021B2F0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -109,7 +109,7 @@ ActorPartBlueprint N(partsTable_8021B460)[] = { .defenseTable = N(defenseTable_8021B2FC), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -121,7 +121,7 @@ ActorPartBlueprint N(partsTable_8021B460)[] = { .defenseTable = N(defenseTable_8021B2F0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -133,7 +133,7 @@ ActorPartBlueprint N(partsTable_8021B460)[] = { .defenseTable = N(defenseTable_8021B2F0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/area_arn/actor/hypergoomba.c b/src/battle/area/arn/actor/hypergoomba.c similarity index 99% rename from src/battle/area_arn/actor/hypergoomba.c rename to src/battle/area/arn/actor/hypergoomba.c index d50dfe8592..f73841bdfd 100644 --- a/src/battle/area_arn/actor/hypergoomba.c +++ b/src/battle/area/arn/actor/hypergoomba.c @@ -55,7 +55,7 @@ ActorPartBlueprint N(partsTable_80218828)[] = { .defenseTable = N(defenseTable_80218770), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/area_arn/actor/tubba_blubba.c b/src/battle/area/arn/actor/tubba_blubba.c similarity index 99% rename from src/battle/area_arn/actor/tubba_blubba.c rename to src/battle/area/arn/actor/tubba_blubba.c index b49603a763..1bde11340c 100644 --- a/src/battle/area_arn/actor/tubba_blubba.c +++ b/src/battle/area/arn/actor/tubba_blubba.c @@ -70,7 +70,7 @@ ActorPartBlueprint N(partsTable_80225D4C)[] = { .defenseTable = N(defenseTable_80225C94), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/area_arn/actor/tubbas_heart.c b/src/battle/area/arn/actor/tubbas_heart.c similarity index 99% rename from src/battle/area_arn/actor/tubbas_heart.c rename to src/battle/area/arn/actor/tubbas_heart.c index c108e93785..227e366f41 100644 --- a/src/battle/area_arn/actor/tubbas_heart.c +++ b/src/battle/area/arn/actor/tubbas_heart.c @@ -88,7 +88,7 @@ ActorPartBlueprint N(partsTable_80223D30)[] = { .defenseTable = N(defenseTable_80223C78), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -100,7 +100,7 @@ ActorPartBlueprint N(partsTable_80223D30)[] = { .defenseTable = N(defenseTable_80223C78), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; @@ -142,7 +142,7 @@ EvtScript N(init_80223DA0) = { EVT_END }; -ApiStatus N(func_80218680_4FF0D0)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_80218680_4FF0D0)) { Bytecode *args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); diff --git a/src/battle/area_arn/area.c b/src/battle/area/arn/area.c similarity index 66% rename from src/battle/area_arn/area.c rename to src/battle/area/arn/area.c index 1c87d1af36..b2764ef330 100644 --- a/src/battle/area_arn/area.c +++ b/src/battle/area/arn/area.c @@ -16,85 +16,85 @@ extern Stage N(arn_04); extern Stage N(arn_05); extern Stage N(arn_06); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(hypergoomba), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(hypergoomba), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(hypergoomba), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(hypergoomba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(hypergoomba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(hypergoomba), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(hypergoomba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(hypergoomba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(hyper_paragoomba), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(hypergoomba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(hypergoomba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(hypergoomba), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(hyper_paragoomba), .home = { .index = 7 }, .priority = 7 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(hypergoomba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(hypergoomba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(hyper_paragoomba), .home = { .index = 6 }, .priority = 8 }, { .actor = &N(hypergoomba), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(hyper_paragoomba), .home = { .index = 5 }, .priority = 10 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(hyper_paragoomba), .home = { .index = 5 }, .priority = 10 }, { .actor = &N(hyper_paragoomba), .home = { .index = 6 }, .priority = 9 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(hyper_paragoomba), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(hyper_paragoomba), .home = { .index = 5 }, .priority = 9 }, { .actor = &N(hyper_paragoomba), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(hyper_paragoomba), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(hyper_paragoomba), .home = { .index = 5 }, .priority = 9 }, { .actor = &N(hyper_paragoomba), .home = { .index = 6 }, .priority = 8 }, { .actor = &N(hyper_paragoomba), .home = { .index = 7 }, .priority = 7 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(hyper_cleft), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(hyper_cleft), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(hyper_cleft), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(hyper_cleft), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(hyper_cleft), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(hyper_cleft), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(hyper_cleft), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(hypergoomba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(hypergoomba), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0E) = { +Formation N(Formation_0E) = { { .actor = &N(hyper_cleft), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(hyper_cleft), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(hypergoomba), .home = { .index = 2 }, .priority = 8 }, @@ -103,38 +103,38 @@ Formation N(formation_0E) = { Vec3i N(vector3D_802280C0) = { 90, 20, 0 }; -Formation N(formation_0F) = { +Formation N(Formation_0F) = { { .actor = &N(tubbas_heart), .home = { .vec = &N(vector3D_802280C0) }, .priority = 10 }, }; Vec3i N(vector3D_802280E8) = { 75, 0, 10 }; -Formation N(formation_10) = { +Formation N(Formation_10) = { { .actor = &N(tubba_blubba), .home = { .vec = &N(vector3D_802280E8) }, .priority = 10 }, }; -BattleList N(formationTable) = { - BATTLE("ハイパークリボー", N(formation_00), &N(arn_01)), - BATTLE("ハイパークリボーx２", N(formation_01), &N(arn_01)), - BATTLE("ハイパークリボーx３", N(formation_02), &N(arn_01)), - BATTLE("ハイパークリボーx2,ハイパーパタクリボー", N(formation_03), &N(arn_01)), - BATTLE("ハイパークリボーx3,ハイパーパタクリボー", N(formation_04), &N(arn_01)), - BATTLE("ハイパークリボーx2,ハイパーパタクリボー,ハイパークリボー", N(formation_05), &N(arn_01)), - BATTLE("ハイパーパタクリボー", N(formation_06), &N(arn_01)), - BATTLE("ハイパーパタクリボーx2", N(formation_07), &N(arn_01)), - BATTLE("ハイパーパタクリボーx3", N(formation_08), &N(arn_01)), - BATTLE("ハイパーパタクリボーx4", N(formation_09), &N(arn_01)), - BATTLE("ハイパーシンエモン", N(formation_0A), &N(arn_01)), - BATTLE("ハイパーシンエモンx2", N(formation_0B), &N(arn_01)), - BATTLE("ハイパーシンエモンx3", N(formation_0C), &N(arn_01)), - BATTLE("ハイパーシンエモン,ハイパークリボーx2", N(formation_0D), &N(arn_01)), - BATTLE("ハイパーシンエモンx2,ハイパークリボーx2", N(formation_0E), &N(arn_01)), - BATTLE("ドガボンしんぞう", N(formation_0F), &N(arn_06)), - BATTLE("ドガボン", N(formation_10), &N(arn_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(arn_01), "ハイパークリボー"), + BATTLE(N(Formation_01), &N(arn_01), "ハイパークリボーx２"), + BATTLE(N(Formation_02), &N(arn_01), "ハイパークリボーx３"), + BATTLE(N(Formation_03), &N(arn_01), "ハイパークリボーx2,ハイパーパタクリボー"), + BATTLE(N(Formation_04), &N(arn_01), "ハイパークリボーx3,ハイパーパタクリボー"), + BATTLE(N(Formation_05), &N(arn_01), "ハイパークリボーx2,ハイパーパタクリボー,ハイパークリボー"), + BATTLE(N(Formation_06), &N(arn_01), "ハイパーパタクリボー"), + BATTLE(N(Formation_07), &N(arn_01), "ハイパーパタクリボーx2"), + BATTLE(N(Formation_08), &N(arn_01), "ハイパーパタクリボーx3"), + BATTLE(N(Formation_09), &N(arn_01), "ハイパーパタクリボーx4"), + BATTLE(N(Formation_0A), &N(arn_01), "ハイパーシンエモン"), + BATTLE(N(Formation_0B), &N(arn_01), "ハイパーシンエモンx2"), + BATTLE(N(Formation_0C), &N(arn_01), "ハイパーシンエモンx3"), + BATTLE(N(Formation_0D), &N(arn_01), "ハイパーシンエモン,ハイパークリボーx2"), + BATTLE(N(Formation_0E), &N(arn_01), "ハイパーシンエモンx2,ハイパークリボーx2"), + BATTLE(N(Formation_0F), &N(arn_06), "ドガボンしんぞう"), + BATTLE(N(Formation_10), &N(arn_01), "ドガボン"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "arn_01", &N(arn_01) }, { "arn_02", &N(arn_02) }, { "arn_03", &N(arn_03) }, diff --git a/src/battle/area_arn/stage/arn_01.c b/src/battle/area/arn/stage/arn_01.c similarity index 100% rename from src/battle/area_arn/stage/arn_01.c rename to src/battle/area/arn/stage/arn_01.c diff --git a/src/battle/area_arn/stage/arn_02.c b/src/battle/area/arn/stage/arn_02.c similarity index 100% rename from src/battle/area_arn/stage/arn_02.c rename to src/battle/area/arn/stage/arn_02.c diff --git a/src/battle/area_arn/stage/arn_03.c b/src/battle/area/arn/stage/arn_03.c similarity index 100% rename from src/battle/area_arn/stage/arn_03.c rename to src/battle/area/arn/stage/arn_03.c diff --git a/src/battle/area_arn/stage/arn_04.c b/src/battle/area/arn/stage/arn_04.c similarity index 100% rename from src/battle/area_arn/stage/arn_04.c rename to src/battle/area/arn/stage/arn_04.c diff --git a/src/battle/area_arn/stage/arn_05.c b/src/battle/area/arn/stage/arn_05.c similarity index 100% rename from src/battle/area_arn/stage/arn_05.c rename to src/battle/area/arn/stage/arn_05.c diff --git a/src/battle/area_arn/stage/arn_06.c b/src/battle/area/arn/stage/arn_06.c similarity index 100% rename from src/battle/area_arn/stage/arn_06.c rename to src/battle/area/arn/stage/arn_06.c diff --git a/src/battle/area_dgb/actor/clubba.c b/src/battle/area/dgb/actor/clubba.c similarity index 100% rename from src/battle/area_dgb/actor/clubba.c rename to src/battle/area/dgb/actor/clubba.c diff --git a/src/battle/area_dgb/actor/tubba_blubba.c b/src/battle/area/dgb/actor/tubba_blubba.c similarity index 99% rename from src/battle/area_dgb/actor/tubba_blubba.c rename to src/battle/area/dgb/actor/tubba_blubba.c index 0ea1db4da5..8a1a63e8cf 100644 --- a/src/battle/area_dgb/actor/tubba_blubba.c +++ b/src/battle/area/dgb/actor/tubba_blubba.c @@ -71,7 +71,7 @@ ActorPartBlueprint N(partsTable_80218D24)[] = { .defenseTable = N(defenseTable_80218C6C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/area_dgb/area.c b/src/battle/area/dgb/area.c similarity index 68% rename from src/battle/area_dgb/area.c rename to src/battle/area/dgb/area.c index 6f08b2ddad..532d129522 100644 --- a/src/battle/area_dgb/area.c +++ b/src/battle/area/dgb/area.c @@ -12,22 +12,22 @@ extern Stage N(dgb_03); extern Stage N(dgb_04); extern Stage N(dgb_05); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(clubba), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(clubba), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(clubba), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(clubba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(clubba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(clubba), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(clubba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(clubba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(clubba), .home = { .index = 2 }, .priority = 8 }, @@ -36,25 +36,25 @@ Formation N(formation_03) = { Vec3i N(vector3D_8021B348) = { 75, 0, 10 }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(tubba_blubba), .home = { .vec = &N(vector3D_8021B348) }, .priority = 10 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(tubba_blubba), .home = { .vec = &N(vector3D_8021B348) }, .priority = 10, .var0 = 1 }, }; -BattleList N(formationTable) = { - BATTLE("ガボンへい", N(formation_00), &N(dgb_01)), - BATTLE("ガボンへいx２", N(formation_01), &N(dgb_01)), - BATTLE("ガボンへいx３", N(formation_02), &N(dgb_01)), - BATTLE("ガボンへいx４", N(formation_03), &N(dgb_01)), - BATTLE("むてきドガボン", N(formation_04), &N(dgb_01)), - BATTLE("むてきドガボンせりふなし", N(formation_05), &N(dgb_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(dgb_01), "ガボンへい"), + BATTLE(N(Formation_01), &N(dgb_01), "ガボンへいx２"), + BATTLE(N(Formation_02), &N(dgb_01), "ガボンへいx３"), + BATTLE(N(Formation_03), &N(dgb_01), "ガボンへいx４"), + BATTLE(N(Formation_04), &N(dgb_01), "むてきドガボン"), + BATTLE(N(Formation_05), &N(dgb_01), "むてきドガボンせりふなし"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "dgb_01", &N(dgb_01) }, { "dgb_02", &N(dgb_02) }, { "dgb_03", &N(dgb_03) }, diff --git a/src/battle/area_dgb/stage/dgb_01.c b/src/battle/area/dgb/stage/dgb_01.c similarity index 100% rename from src/battle/area_dgb/stage/dgb_01.c rename to src/battle/area/dgb/stage/dgb_01.c diff --git a/src/battle/area_dgb/stage/dgb_02.c b/src/battle/area/dgb/stage/dgb_02.c similarity index 100% rename from src/battle/area_dgb/stage/dgb_02.c rename to src/battle/area/dgb/stage/dgb_02.c diff --git a/src/battle/area_dgb/stage/dgb_03.c b/src/battle/area/dgb/stage/dgb_03.c similarity index 100% rename from src/battle/area_dgb/stage/dgb_03.c rename to src/battle/area/dgb/stage/dgb_03.c diff --git a/src/battle/area_dgb/stage/dgb_04.c b/src/battle/area/dgb/stage/dgb_04.c similarity index 100% rename from src/battle/area_dgb/stage/dgb_04.c rename to src/battle/area/dgb/stage/dgb_04.c diff --git a/src/battle/area_dgb/stage/dgb_05.c b/src/battle/area/dgb/stage/dgb_05.c similarity index 100% rename from src/battle/area_dgb/stage/dgb_05.c rename to src/battle/area/dgb/stage/dgb_05.c diff --git a/src/battle/area_dig/actor/bandit.c b/src/battle/area/dig/actor/bandit.c similarity index 100% rename from src/battle/area_dig/actor/bandit.c rename to src/battle/area/dig/actor/bandit.c diff --git a/src/battle/area_dig/actor/fuzzy.c b/src/battle/area/dig/actor/fuzzy.c similarity index 100% rename from src/battle/area_dig/actor/fuzzy.c rename to src/battle/area/dig/actor/fuzzy.c diff --git a/src/battle/area_dig/actor/koopa_troopa.c b/src/battle/area/dig/actor/koopa_troopa.c similarity index 100% rename from src/battle/area_dig/actor/koopa_troopa.c rename to src/battle/area/dig/actor/koopa_troopa.c diff --git a/src/battle/area_dig/actor/monty_mole.c b/src/battle/area/dig/actor/monty_mole.c similarity index 100% rename from src/battle/area_dig/actor/monty_mole.c rename to src/battle/area/dig/actor/monty_mole.c diff --git a/src/battle/area_dig/actor/pokey.c b/src/battle/area/dig/actor/pokey.c similarity index 100% rename from src/battle/area_dig/actor/pokey.c rename to src/battle/area/dig/actor/pokey.c diff --git a/src/battle/area_dig/actor/red_shy_guy.c b/src/battle/area/dig/actor/red_shy_guy.c similarity index 100% rename from src/battle/area_dig/actor/red_shy_guy.c rename to src/battle/area/dig/actor/red_shy_guy.c diff --git a/src/battle/area_dig/actor/tubba_blubba.c b/src/battle/area/dig/actor/tubba_blubba.c similarity index 99% rename from src/battle/area_dig/actor/tubba_blubba.c rename to src/battle/area/dig/actor/tubba_blubba.c index a5b991a74b..c85c80c069 100644 --- a/src/battle/area_dig/actor/tubba_blubba.c +++ b/src/battle/area/dig/actor/tubba_blubba.c @@ -70,8 +70,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/area_dig/actor/whacka.c b/src/battle/area/dig/actor/whacka.c similarity index 100% rename from src/battle/area_dig/actor/whacka.c rename to src/battle/area/dig/actor/whacka.c diff --git a/src/battle/area_dig/area.c b/src/battle/area/dig/area.c similarity index 72% rename from src/battle/area_dig/area.c rename to src/battle/area/dig/area.c index 958745cd7d..a91404a9b1 100644 --- a/src/battle/area_dig/area.c +++ b/src/battle/area/dig/area.c @@ -23,46 +23,46 @@ extern EvtScript N(dig_03_script); extern EvtScript N(dig_04_script); extern EvtScript N(dig_05_script); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(fuzzy), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(fuzzy), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(fuzzy), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(fuzzy), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(monty_mole), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(monty_mole), .home = { .index = 2 }, .priority = 9, }, { .actor = &N(monty_mole), .home = { .index = 3 }, .priority = 8, }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(pokey), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(bandit), .home = { .index = 2 }, .priority = 9, }, { .actor = &N(pokey), .home = { .index = 3 }, .priority = 8, }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(red_shy_guy), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(red_shy_guy), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(red_shy_guy), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(red_shy_guy), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(tubba_blubba), .home = { .index = 2 }, .priority = 10, }, }; -BattleList N(formationTable) = { - BATTLE_WITH_SCRIPT("ダイジェスト０１", N(formation_00), &N(dig_01), &N(dig_01_script)), - BATTLE_WITH_SCRIPT("ダイジェスト０２", N(formation_01), &N(dig_02), &N(dig_02_script)), - BATTLE_WITH_SCRIPT("ダイジェスト０３", N(formation_02), &N(dig_03), &N(dig_03_script)), - BATTLE_WITH_SCRIPT("ダイジェスト０４", N(formation_03), &N(dig_04), &N(dig_04_script)), - BATTLE_WITH_SCRIPT("ダイジェスト０５", N(formation_04), &N(dig_05), &N(dig_05_script)), +BattleList N(Formations) = { + BATTLE_WITH_SCRIPT(N(Formation_00), &N(dig_01), &N(dig_01_script), "ダイジェスト０１"), + BATTLE_WITH_SCRIPT(N(Formation_01), &N(dig_02), &N(dig_02_script), "ダイジェスト０２"), + BATTLE_WITH_SCRIPT(N(Formation_02), &N(dig_03), &N(dig_03_script), "ダイジェスト０３"), + BATTLE_WITH_SCRIPT(N(Formation_03), &N(dig_04), &N(dig_04_script), "ダイジェスト０４"), + BATTLE_WITH_SCRIPT(N(Formation_04), &N(dig_05), &N(dig_05_script), "ダイジェスト０５"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "dig_01", &N(dig_01) }, { "dig_02", &N(dig_02) }, { "dig_03", &N(dig_03) }, diff --git a/src/battle/area_dig/script/dig_01.c b/src/battle/area/dig/script/dig_01.c similarity index 94% rename from src/battle/area_dig/script/dig_01.c rename to src/battle/area/dig/script/dig_01.c index c0ba9c6e12..2559aa47dc 100644 --- a/src/battle/area_dig/script/dig_01.c +++ b/src/battle/area/dig/script/dig_01.c @@ -5,7 +5,7 @@ #include "common/Set80218630_Var0.inc.c" -ApiStatus func_80218644_6DE404(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218644_6DE404) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; SelectableTarget* selectableTarget; diff --git a/src/battle/area_dig/script/dig_02.c b/src/battle/area/dig/script/dig_02.c similarity index 95% rename from src/battle/area_dig/script/dig_02.c rename to src/battle/area/dig/script/dig_02.c index a75e39bfc8..466752da03 100644 --- a/src/battle/area_dig/script/dig_02.c +++ b/src/battle/area/dig/script/dig_02.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_dig_dig_02_script -ApiStatus func_802186E0_6DE4A0(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802186E0_6DE4A0) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; SelectableTarget* selectableTarget; diff --git a/src/battle/area_dig/script/dig_03.c b/src/battle/area/dig/script/dig_03.c similarity index 94% rename from src/battle/area_dig/script/dig_03.c rename to src/battle/area/dig/script/dig_03.c index 3332ffd34b..111e823ea6 100644 --- a/src/battle/area_dig/script/dig_03.c +++ b/src/battle/area/dig/script/dig_03.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_dig_dig_03_script -ApiStatus func_80218770_6DE530(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218770_6DE530) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; SelectableTarget* selectableTarget; diff --git a/src/battle/area_dig/script/dig_04.c b/src/battle/area/dig/script/dig_04.c similarity index 95% rename from src/battle/area_dig/script/dig_04.c rename to src/battle/area/dig/script/dig_04.c index 51e65e8953..fcfea02dcd 100644 --- a/src/battle/area_dig/script/dig_04.c +++ b/src/battle/area/dig/script/dig_04.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_dig_dig_04_script -ApiStatus func_802187F0_6DE5B0(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802187F0_6DE5B0) { BattleStatus* battleStatus = &gBattleStatus; PlayerData* playerData = &gPlayerData; s32 selectedItemID; diff --git a/src/battle/area_dig/script/dig_05.c b/src/battle/area/dig/script/dig_05.c similarity index 100% rename from src/battle/area_dig/script/dig_05.c rename to src/battle/area/dig/script/dig_05.c diff --git a/src/battle/area_dig/stage/dig_01.c b/src/battle/area/dig/stage/dig_01.c similarity index 100% rename from src/battle/area_dig/stage/dig_01.c rename to src/battle/area/dig/stage/dig_01.c diff --git a/src/battle/area_dig/stage/dig_02.c b/src/battle/area/dig/stage/dig_02.c similarity index 100% rename from src/battle/area_dig/stage/dig_02.c rename to src/battle/area/dig/stage/dig_02.c diff --git a/src/battle/area_dig/stage/dig_03.c b/src/battle/area/dig/stage/dig_03.c similarity index 100% rename from src/battle/area_dig/stage/dig_03.c rename to src/battle/area/dig/stage/dig_03.c diff --git a/src/battle/area_dig/stage/dig_04.c b/src/battle/area/dig/stage/dig_04.c similarity index 100% rename from src/battle/area_dig/stage/dig_04.c rename to src/battle/area/dig/stage/dig_04.c diff --git a/src/battle/area_dig/stage/dig_05.c b/src/battle/area/dig/stage/dig_05.c similarity index 100% rename from src/battle/area_dig/stage/dig_05.c rename to src/battle/area/dig/stage/dig_05.c diff --git a/src/battle/area_flo/actor/amazy_dayzee.c b/src/battle/area/flo/actor/amazy_dayzee.c similarity index 99% rename from src/battle/area_flo/actor/amazy_dayzee.c rename to src/battle/area/flo/actor/amazy_dayzee.c index 8a1cf312f3..562996df83 100644 --- a/src/battle/area_flo/actor/amazy_dayzee.c +++ b/src/battle/area/flo/actor/amazy_dayzee.c @@ -53,8 +53,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, }; diff --git a/src/battle/area_flo/actor/bzzap.c b/src/battle/area/flo/actor/bzzap.c similarity index 100% rename from src/battle/area_flo/actor/bzzap.c rename to src/battle/area/flo/actor/bzzap.c diff --git a/src/battle/area_flo/actor/crazee_dayzee.c b/src/battle/area/flo/actor/crazee_dayzee.c similarity index 99% rename from src/battle/area_flo/actor/crazee_dayzee.c rename to src/battle/area/flo/actor/crazee_dayzee.c index 96bbd5906c..5dc66e9617 100644 --- a/src/battle/area_flo/actor/crazee_dayzee.c +++ b/src/battle/area/flo/actor/crazee_dayzee.c @@ -53,8 +53,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, }; diff --git a/src/battle/area_flo/actor/green_magikoopa.c b/src/battle/area/flo/actor/green_magikoopa.c similarity index 100% rename from src/battle/area_flo/actor/green_magikoopa.c rename to src/battle/area/flo/actor/green_magikoopa.c diff --git a/src/battle/area_flo/actor/lakitu.c b/src/battle/area/flo/actor/lakitu.c similarity index 99% rename from src/battle/area_flo/actor/lakitu.c rename to src/battle/area/flo/actor/lakitu.c index 3f9d16e734..4534dbf173 100644 --- a/src/battle/area_flo/actor/lakitu.c +++ b/src/battle/area/flo/actor/lakitu.c @@ -79,8 +79,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -13, + .projectileTargetOffset = { 0, -13 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -92,8 +91,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -105,8 +103,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_flo/actor/medi_guy.c b/src/battle/area/flo/actor/medi_guy.c similarity index 100% rename from src/battle/area_flo/actor/medi_guy.c rename to src/battle/area/flo/actor/medi_guy.c diff --git a/src/battle/area_flo/actor/red_magikoopa.c b/src/battle/area/flo/actor/red_magikoopa.c similarity index 100% rename from src/battle/area_flo/actor/red_magikoopa.c rename to src/battle/area/flo/actor/red_magikoopa.c diff --git a/src/battle/area_flo/actor/ruff_puff.c b/src/battle/area/flo/actor/ruff_puff.c similarity index 99% rename from src/battle/area_flo/actor/ruff_puff.c rename to src/battle/area/flo/actor/ruff_puff.c index cf0ee54fd8..cdde10c0a5 100644 --- a/src/battle/area_flo/actor/ruff_puff.c +++ b/src/battle/area/flo/actor/ruff_puff.c @@ -64,8 +64,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -13, + .projectileTargetOffset = { 0, -13 }, }, }; diff --git a/src/battle/area_flo/actor/spiny.c b/src/battle/area/flo/actor/spiny.c similarity index 100% rename from src/battle/area_flo/actor/spiny.c rename to src/battle/area/flo/actor/spiny.c diff --git a/src/battle/area_flo/actor/white_magikoopa.c b/src/battle/area/flo/actor/white_magikoopa.c similarity index 100% rename from src/battle/area_flo/actor/white_magikoopa.c rename to src/battle/area/flo/actor/white_magikoopa.c diff --git a/src/battle/area_flo/actor/yellow_magikoopa.c b/src/battle/area/flo/actor/yellow_magikoopa.c similarity index 100% rename from src/battle/area_flo/actor/yellow_magikoopa.c rename to src/battle/area/flo/actor/yellow_magikoopa.c diff --git a/src/battle/area_flo/area.c b/src/battle/area/flo/area.c similarity index 68% rename from src/battle/area_flo/area.c rename to src/battle/area/flo/area.c index 18791f7691..bee1e4b2a2 100644 --- a/src/battle/area_flo/area.c +++ b/src/battle/area/flo/area.c @@ -27,262 +27,262 @@ extern Stage N(flo_04); extern Stage N(flo_05); extern Stage N(flo_06); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(lakitu), .home = { .index = 5 }, .priority = 10, }, { .actor = &N(lakitu), .home = { .index = 6 }, .priority = 9, }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(lakitu), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(lakitu), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(lakitu), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(lakitu), .home = { .index = 5 }, .priority = 10, }, { .actor = &N(ruff_puff), .home = { .index = 6 }, .priority = 9, }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(lakitu), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(bzzap), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(bzzap), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(lakitu), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(bzzap), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(lakitu), .home = { .index = 6 }, .priority = 8, }, { .actor = &N(bzzap), .home = { .index = 7 }, .priority = 7, }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(lakitu), .home = { .index = 5 }, .priority = 10, }, { .actor = &N(crazee_dayzee), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(lakitu), .home = { .index = 5 }, .priority = 10, }, { .actor = &N(spiny), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(lakitu), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(lakitu), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(spiny), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(spiny), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(lakitu), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(lakitu), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(lakitu), .home = { .index = 6 }, .priority = 8, }, { .actor = &N(spiny), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(lakitu), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(lakitu), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(white_magikoopa), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(lakitu), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(lakitu), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(red_magikoopa), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(lakitu), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(lakitu), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(lakitu), .home = { .index = 6 }, .priority = 8, }, { .actor = &N(yellow_magikoopa), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(spiny), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(spiny), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(spiny), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(spiny), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(spiny), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_0E) = { +Formation N(Formation_0E) = { { .actor = &N(spiny), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(crazee_dayzee), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_0F) = { +Formation N(Formation_0F) = { { .actor = &N(crazee_dayzee), .home = { .index = 1 }, .priority = 10, }, }; -Formation N(formation_10) = { +Formation N(Formation_10) = { { .actor = &N(crazee_dayzee), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(crazee_dayzee), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_11) = { +Formation N(Formation_11) = { { .actor = &N(crazee_dayzee), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(crazee_dayzee), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(crazee_dayzee), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_12) = { +Formation N(Formation_12) = { { .actor = &N(crazee_dayzee), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(crazee_dayzee), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(crazee_dayzee), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(crazee_dayzee), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_13) = { +Formation N(Formation_13) = { { .actor = &N(crazee_dayzee), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(bzzap), .home = { .index = 6 }, .priority = 9, }, }; -Formation N(formation_14) = { +Formation N(Formation_14) = { { .actor = &N(crazee_dayzee), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(bzzap), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(bzzap), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_15) = { +Formation N(Formation_15) = { { .actor = &N(crazee_dayzee), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(crazee_dayzee), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(bzzap), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_16) = { +Formation N(Formation_16) = { { .actor = &N(crazee_dayzee), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(crazee_dayzee), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(amazy_dayzee), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_17) = { +Formation N(Formation_17) = { { .actor = &N(bzzap), .home = { .index = 5 }, .priority = 10, }, { .actor = &N(bzzap), .home = { .index = 6 }, .priority = 9, }, }; -Formation N(formation_18) = { +Formation N(Formation_18) = { { .actor = &N(bzzap), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(bzzap), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(bzzap), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_19) = { +Formation N(Formation_19) = { { .actor = &N(bzzap), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(bzzap), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(green_magikoopa_flying), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_1A) = { +Formation N(Formation_1A) = { { .actor = &N(bzzap), .home = { .index = 5 }, .priority = 10, }, { .actor = &N(ruff_puff), .home = { .index = 6 }, .priority = 9, }, }; -Formation N(formation_1B) = { +Formation N(Formation_1B) = { { .actor = &N(bzzap), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(ruff_puff), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(bzzap), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_1C) = { +Formation N(Formation_1C) = { { .actor = &N(amazy_dayzee), .home = { .index = 1 }, .priority = 10, }, }; -Formation N(formation_1D) = { +Formation N(Formation_1D) = { { .actor = &N(amazy_dayzee), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(bzzap), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(bzzap), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_1E) = { +Formation N(Formation_1E) = { { .actor = &N(amazy_dayzee), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(amazy_dayzee), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(amazy_dayzee), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(amazy_dayzee), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_1F) = { +Formation N(Formation_1F) = { { .actor = &N(ruff_puff), .home = { .index = 5 }, .priority = 10, }, { .actor = &N(ruff_puff), .home = { .index = 6 }, .priority = 9, }, }; -Formation N(formation_20) = { +Formation N(Formation_20) = { { .actor = &N(ruff_puff), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(ruff_puff), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(ruff_puff), .home = { .index = 6 }, .priority = 8, }, { .actor = &N(ruff_puff), .home = { .index = 7 }, .priority = 7, }, }; -Formation N(formation_21) = { +Formation N(Formation_21) = { { .actor = &N(ruff_puff), .home = { .index = 5 }, .priority = 10, }, { .actor = &N(lakitu), .home = { .index = 6 }, .priority = 9, }, }; -Formation N(formation_22) = { +Formation N(Formation_22) = { { .actor = &N(ruff_puff), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(ruff_puff), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(bzzap), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_23) = { +Formation N(Formation_23) = { { .actor = &N(ruff_puff), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(ruff_puff), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(crazee_dayzee), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_24) = { +Formation N(Formation_24) = { { .actor = &N(ruff_puff), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(ruff_puff), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(yellow_magikoopa_flying), .home = { .index = 6 }, .priority = 8, }, }; -BattleList N(formationTable) = { - BATTLE("ジュゲムx2", N(formation_00), &N(flo_01)), - BATTLE("ジュゲムx3", N(formation_01), &N(flo_01)), - BATTLE("ジュゲム,クモクモーン", N(formation_02), &N(flo_01)), - BATTLE("ジュゲム,ハッチーx２", N(formation_03), &N(flo_01)), - BATTLE("ジュゲム,ハッチー,ジュゲム,ハッチー", N(formation_04), &N(flo_01)), - BATTLE("ジュゲム,パンジー", N(formation_05), &N(flo_01)), - BATTLE("ジュゲム,トゲゾー", N(formation_06), &N(flo_01)), - BATTLE("ジュゲムx２,トゲゾーx２", N(formation_07), &N(flo_01)), - BATTLE("ジュゲムx３,トゲゾー", N(formation_08), &N(flo_01)), - BATTLE("ジュゲムx２,ホワイトカメック", N(formation_09), &N(flo_01)), - BATTLE("ジュゲムx２,レッドカメック", N(formation_0A), &N(flo_01)), - BATTLE("ジュゲムx３,イエローカメック", N(formation_0B), &N(flo_01)), - BATTLE("トゲゾーx2", N(formation_0C), &N(flo_01)), - BATTLE("トゲゾーx3", N(formation_0D), &N(flo_01)), - BATTLE("トゲゾー,パンジーさん,かいふくヘイホー", N(formation_0E), &N(flo_01)), - BATTLE("パンジーさん", N(formation_0F), &N(flo_01)), - BATTLE("パンジーさんx2", N(formation_10), &N(flo_01)), - BATTLE("パンジーさんx3", N(formation_11), &N(flo_01)), - BATTLE("パンジーさんx4", N(formation_12), &N(flo_01)), - BATTLE("パンジーさん,ハッチー", N(formation_13), &N(flo_01)), - BATTLE("パンジーさん,ハッチーx2", N(formation_14), &N(flo_01)), - BATTLE("パンジーさんx2,ハッチー", N(formation_15), &N(flo_01)), - BATTLE("パンジーさんx2,きらめくパンジーさん", N(formation_16), &N(flo_01)), - BATTLE("ハッチーx2", N(formation_17), &N(flo_01)), - BATTLE("ハッチーx3", N(formation_18), &N(flo_01)), - BATTLE("ハッチーx2,グリーンカメック（そら）", N(formation_19), &N(flo_01)), - BATTLE("ハッチー,クモクモーン", N(formation_1A), &N(flo_01)), - BATTLE("ハッチー,クモクモーン,ハッチー", N(formation_1B), &N(flo_01)), - BATTLE("きらめくパンジーさん", N(formation_1C), &N(flo_01)), - BATTLE("きらめくパンジーさん,ハッチーx2", N(formation_1D), &N(flo_01)), - BATTLE("きらめくパンジーさんx４", N(formation_1E), &N(flo_01)), - BATTLE("クモクモーンx2", N(formation_1F), &N(flo_01)), - BATTLE("クモクモーンx4", N(formation_20), &N(flo_01)), - BATTLE("クモクモーン,ジュゲム", N(formation_21), &N(flo_01)), - BATTLE("クモクモーンx２,ハッチー", N(formation_22), &N(flo_01)), - BATTLE("クモクモーンx２,パンジー", N(formation_23), &N(flo_01)), - BATTLE("クモクモーンx２,イエローカメック（そら）", N(formation_24), &N(flo_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(flo_01), "ジュゲムx2"), + BATTLE(N(Formation_01), &N(flo_01), "ジュゲムx3"), + BATTLE(N(Formation_02), &N(flo_01), "ジュゲム,クモクモーン"), + BATTLE(N(Formation_03), &N(flo_01), "ジュゲム,ハッチーx２"), + BATTLE(N(Formation_04), &N(flo_01), "ジュゲム,ハッチー,ジュゲム,ハッチー"), + BATTLE(N(Formation_05), &N(flo_01), "ジュゲム,パンジー"), + BATTLE(N(Formation_06), &N(flo_01), "ジュゲム,トゲゾー"), + BATTLE(N(Formation_07), &N(flo_01), "ジュゲムx２,トゲゾーx２"), + BATTLE(N(Formation_08), &N(flo_01), "ジュゲムx３,トゲゾー"), + BATTLE(N(Formation_09), &N(flo_01), "ジュゲムx２,ホワイトカメック"), + BATTLE(N(Formation_0A), &N(flo_01), "ジュゲムx２,レッドカメック"), + BATTLE(N(Formation_0B), &N(flo_01), "ジュゲムx３,イエローカメック"), + BATTLE(N(Formation_0C), &N(flo_01), "トゲゾーx2"), + BATTLE(N(Formation_0D), &N(flo_01), "トゲゾーx3"), + BATTLE(N(Formation_0E), &N(flo_01), "トゲゾー,パンジーさん,かいふくヘイホー"), + BATTLE(N(Formation_0F), &N(flo_01), "パンジーさん"), + BATTLE(N(Formation_10), &N(flo_01), "パンジーさんx2"), + BATTLE(N(Formation_11), &N(flo_01), "パンジーさんx3"), + BATTLE(N(Formation_12), &N(flo_01), "パンジーさんx4"), + BATTLE(N(Formation_13), &N(flo_01), "パンジーさん,ハッチー"), + BATTLE(N(Formation_14), &N(flo_01), "パンジーさん,ハッチーx2"), + BATTLE(N(Formation_15), &N(flo_01), "パンジーさんx2,ハッチー"), + BATTLE(N(Formation_16), &N(flo_01), "パンジーさんx2,きらめくパンジーさん"), + BATTLE(N(Formation_17), &N(flo_01), "ハッチーx2"), + BATTLE(N(Formation_18), &N(flo_01), "ハッチーx3"), + BATTLE(N(Formation_19), &N(flo_01), "ハッチーx2,グリーンカメック（そら）"), + BATTLE(N(Formation_1A), &N(flo_01), "ハッチー,クモクモーン"), + BATTLE(N(Formation_1B), &N(flo_01), "ハッチー,クモクモーン,ハッチー"), + BATTLE(N(Formation_1C), &N(flo_01), "きらめくパンジーさん"), + BATTLE(N(Formation_1D), &N(flo_01), "きらめくパンジーさん,ハッチーx2"), + BATTLE(N(Formation_1E), &N(flo_01), "きらめくパンジーさんx４"), + BATTLE(N(Formation_1F), &N(flo_01), "クモクモーンx2"), + BATTLE(N(Formation_20), &N(flo_01), "クモクモーンx4"), + BATTLE(N(Formation_21), &N(flo_01), "クモクモーン,ジュゲム"), + BATTLE(N(Formation_22), &N(flo_01), "クモクモーンx２,ハッチー"), + BATTLE(N(Formation_23), &N(flo_01), "クモクモーンx２,パンジー"), + BATTLE(N(Formation_24), &N(flo_01), "クモクモーンx２,イエローカメック（そら）"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "flo_01", &N(flo_01) }, { "flo_01b", &N(flo_01b) }, { "flo_01c", &N(flo_01c) }, diff --git a/src/battle/area_flo/stage/flo_01.c b/src/battle/area/flo/stage/flo_01.c similarity index 100% rename from src/battle/area_flo/stage/flo_01.c rename to src/battle/area/flo/stage/flo_01.c diff --git a/src/battle/area_flo/stage/flo_01b.c b/src/battle/area/flo/stage/flo_01b.c similarity index 100% rename from src/battle/area_flo/stage/flo_01b.c rename to src/battle/area/flo/stage/flo_01b.c diff --git a/src/battle/area_flo/stage/flo_01c.c b/src/battle/area/flo/stage/flo_01c.c similarity index 100% rename from src/battle/area_flo/stage/flo_01c.c rename to src/battle/area/flo/stage/flo_01c.c diff --git a/src/battle/area_flo/stage/flo_02.c b/src/battle/area/flo/stage/flo_02.c similarity index 100% rename from src/battle/area_flo/stage/flo_02.c rename to src/battle/area/flo/stage/flo_02.c diff --git a/src/battle/area_flo/stage/flo_02b.c b/src/battle/area/flo/stage/flo_02b.c similarity index 100% rename from src/battle/area_flo/stage/flo_02b.c rename to src/battle/area/flo/stage/flo_02b.c diff --git a/src/battle/area_flo/stage/flo_02c.c b/src/battle/area/flo/stage/flo_02c.c similarity index 100% rename from src/battle/area_flo/stage/flo_02c.c rename to src/battle/area/flo/stage/flo_02c.c diff --git a/src/battle/area_flo/stage/flo_03.c b/src/battle/area/flo/stage/flo_03.c similarity index 100% rename from src/battle/area_flo/stage/flo_03.c rename to src/battle/area/flo/stage/flo_03.c diff --git a/src/battle/area_flo/stage/flo_04.c b/src/battle/area/flo/stage/flo_04.c similarity index 100% rename from src/battle/area_flo/stage/flo_04.c rename to src/battle/area/flo/stage/flo_04.c diff --git a/src/battle/area_flo/stage/flo_05.c b/src/battle/area/flo/stage/flo_05.c similarity index 100% rename from src/battle/area_flo/stage/flo_05.c rename to src/battle/area/flo/stage/flo_05.c diff --git a/src/battle/area_flo/stage/flo_06.c b/src/battle/area/flo/stage/flo_06.c similarity index 100% rename from src/battle/area_flo/stage/flo_06.c rename to src/battle/area/flo/stage/flo_06.c diff --git a/src/battle/area_flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c similarity index 99% rename from src/battle/area_flo2/actor/huff_n_puff.c rename to src/battle/area/flo2/actor/huff_n_puff.c index 38ba38a06d..62f9117719 100644 --- a/src/battle/area_flo2/actor/huff_n_puff.c +++ b/src/battle/area/flo2/actor/huff_n_puff.c @@ -61,7 +61,7 @@ static SuctionPath N(suctionPaths)[10]; #include "common/StartRumbleWithParams.inc.c" -ApiStatus SetHealthBarPos(Evt* script, s32 isInitialCall) { +API_CALLABLE(SetHealthBarPos) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(ACTOR_ENEMY0); @@ -73,7 +73,7 @@ ApiStatus SetHealthBarPos(Evt* script, s32 isInitialCall) { #include "common/CosInterpMinMax.inc.c" -ApiStatus SetTuffPuffPos(Evt* script, s32 isInitialCall) { +API_CALLABLE(SetTuffPuffPos) { Bytecode* args = script->ptrReadPos; Bytecode outVar1 = *args++; @@ -98,7 +98,7 @@ ApiStatus SetTuffPuffPos(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus FindPlaceForTuffPuff(Evt* script, s32 isInitialCall) { +API_CALLABLE(FindPlaceForTuffPuff) { Bytecode* args = script->ptrReadPos; s32 arr[10]; s32 flags = evt_get_variable(script, *args++); @@ -149,14 +149,14 @@ ApiStatus FindPlaceForTuffPuff(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus SetTuffPuffPriority(Evt* script, s32 isInitialCall) { +API_CALLABLE(SetTuffPuffPriority) { s32* actorID = &script->owner1.actorID; N(formation_tuff_puff_small)[0].priority = get_actor(*actorID)->turnPriority; N(formation_tuff_puff_large)[0].priority = get_actor(*actorID)->turnPriority; return ApiStatus_DONE2; } -ApiStatus MakeSuctionPath(Evt* script, s32 isInitialCall) { +API_CALLABLE(MakeSuctionPath) { Bytecode* args = script->ptrReadPos; SuctionPath* path = &N(suctionPaths)[evt_get_variable(script, *args++)]; @@ -173,7 +173,7 @@ ApiStatus MakeSuctionPath(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus HuffPuffBreath(Evt* script, s32 isInitialCall) { +API_CALLABLE(HuffPuffBreath) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); f32 var2 = evt_get_float_variable(script, *args++); @@ -193,7 +193,7 @@ ApiStatus HuffPuffBreath(Evt* script, s32 isInitialCall) { #include "common/SetBackgroundAlpha.inc.c" -ApiStatus SnakingStatic(Evt* script, s32 isInitialCall) { +API_CALLABLE(SnakingStatic) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); @@ -204,7 +204,7 @@ ApiStatus SnakingStatic(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus SetSnakingStaticPos(Evt* script, s32 isInitialCall) { +API_CALLABLE(SetSnakingStaticPos) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++); f32 posX = evt_get_float_variable(script, *args++); @@ -217,7 +217,7 @@ ApiStatus SetSnakingStaticPos(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(Atan2)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(Atan2)) { Bytecode* args = script->ptrReadPos; Bytecode outVar = *args++; f32 startX = evt_get_float_variable(script, *args++); @@ -229,7 +229,7 @@ ApiStatus N(Atan2)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(UpdateLerp)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UpdateLerp)) { Bytecode* args = script->ptrReadPos; s32 easing = evt_get_variable(script, *args++); f32 start = evt_get_float_variable(script, *args++); @@ -353,8 +353,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -15, - .unk_1D = -50, + .projectileTargetOffset = { -15, -50 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -366,8 +365,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -379,8 +377,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -392,8 +389,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -457,7 +453,7 @@ EvtScript N(UpdateSize) = { EVT_MUL(LVar1, -50) EVT_DIV(LVar0, 100) EVT_DIV(LVar1, 100) - EVT_CALL(func_8027D4C8, ACTOR_ENEMY0, 1, LVar0, LVar1) + EVT_CALL(SetProjectileTargetOffset, ACTOR_ENEMY0, 1, LVar0, LVar1) EVT_CALL(GetActorVar, ACTOR_ENEMY0, N(VAR_SCALE_X), LVar0) EVT_CALL(GetActorVar, ACTOR_ENEMY0, N(VAR_SCALE_Y), LVar1) EVT_MUL(LVar0, -17) diff --git a/src/battle/area_flo2/actor/monty_mole_boss.c b/src/battle/area/flo2/actor/monty_mole_boss.c similarity index 98% rename from src/battle/area_flo2/actor/monty_mole_boss.c rename to src/battle/area/flo2/actor/monty_mole_boss.c index 116e408cc7..39b7faa2ef 100644 --- a/src/battle/area_flo2/actor/monty_mole_boss.c +++ b/src/battle/area/flo2/actor/monty_mole_boss.c @@ -56,8 +56,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -7, + .projectileTargetOffset = { 0, -7 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -69,8 +68,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -7, + .projectileTargetOffset = { 0, -7 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -82,8 +80,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -149,8 +146,7 @@ ActorPartBlueprint N(parts_hole)[] = { .defenseTable = NULL, .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_flo2/actor/spike.c b/src/battle/area/flo2/actor/spike.c similarity index 99% rename from src/battle/area_flo2/actor/spike.c rename to src/battle/area/flo2/actor/spike.c index c1e3395358..9f4dd10511 100644 --- a/src/battle/area_flo2/actor/spike.c +++ b/src/battle/area/flo2/actor/spike.c @@ -70,8 +70,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -13, + .projectileTargetOffset = { 0, -13 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -83,8 +82,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_flo2/actor/tuff_puff.c b/src/battle/area/flo2/actor/tuff_puff.c similarity index 97% rename from src/battle/area_flo2/actor/tuff_puff.c rename to src/battle/area/flo2/actor/tuff_puff.c index 0aef561806..1e12fe13f4 100644 --- a/src/battle/area_flo2/actor/tuff_puff.c +++ b/src/battle/area/flo2/actor/tuff_puff.c @@ -95,8 +95,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_20 | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -108,8 +107,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -143,8 +141,8 @@ EvtScript N(init) = { EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn))) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_IS_BIG), LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -9) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 2, -1, -9) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, -1, -9) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -1, 9) EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, -1, -41) EVT_CALL(SetActorSize, ACTOR_SELF, 20, 25) @@ -152,8 +150,8 @@ EvtScript N(init) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_RuffPuff_Anim02) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_IS_BIG), 0) EVT_ELSE - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -8, -13) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 2, -8, -13) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -8, -13) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, -8, -13) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 1, 14) EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, 1, -36) EVT_CALL(SetActorSize, ACTOR_SELF, 28, 35) diff --git a/src/battle/area_flo2/area.c b/src/battle/area/flo2/area.c similarity index 72% rename from src/battle/area_flo2/area.c rename to src/battle/area/flo2/area.c index 610bf8b6c6..66595051c9 100644 --- a/src/battle/area_flo2/area.c +++ b/src/battle/area/flo2/area.c @@ -20,47 +20,47 @@ extern Stage N(flo_06); Vec3i N(huff_n_puff_pos) = { 80, 80, 0 }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(huff_n_puff), .home = { .vec = &N(huff_n_puff_pos) }, .priority = 10, }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(monty_mole_boss), .home = { .index = 1 }, .priority = 10, }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(monty_mole_boss), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(monty_mole_boss), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(monty_mole_boss), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(monty_mole_boss), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(monty_mole_boss), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(monty_mole_boss), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(monty_mole_boss), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(monty_mole_boss), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(monty_mole_boss), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(spike), .home = { .index = 5 }, .priority = 10, }, }; -BattleList N(formationTable) = { - BATTLE("オズモーン", N(formation_01), &N(flo_04)), - BATTLE("フラワーチョロプー", N(formation_02), &N(flo_01)), - BATTLE("フラワーチョロプーx２", N(formation_03), &N(flo_01)), - BATTLE("フラワーチョロプーx３", N(formation_04), &N(flo_01)), - BATTLE("フラワーチョロプーx４", N(formation_05), &N(flo_01)), - BATTLE("ジョナサン？", N(formation_06), &N(flo_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_01), &N(flo_04), "オズモーン"), + BATTLE(N(Formation_02), &N(flo_01), "フラワーチョロプー"), + BATTLE(N(Formation_03), &N(flo_01), "フラワーチョロプーx２"), + BATTLE(N(Formation_04), &N(flo_01), "フラワーチョロプーx３"), + BATTLE(N(Formation_05), &N(flo_01), "フラワーチョロプーx４"), + BATTLE(N(Formation_06), &N(flo_01), "ジョナサン？"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "flo_01", &N(flo_01) }, { "flo_01b", &N(flo_01b) }, { "flo_01c", &N(flo_01c) }, diff --git a/src/battle/area_flo2/stage/flo_01.c b/src/battle/area/flo2/stage/flo_01.c similarity index 100% rename from src/battle/area_flo2/stage/flo_01.c rename to src/battle/area/flo2/stage/flo_01.c diff --git a/src/battle/area_flo2/stage/flo_01b.c b/src/battle/area/flo2/stage/flo_01b.c similarity index 100% rename from src/battle/area_flo2/stage/flo_01b.c rename to src/battle/area/flo2/stage/flo_01b.c diff --git a/src/battle/area_flo2/stage/flo_01c.c b/src/battle/area/flo2/stage/flo_01c.c similarity index 100% rename from src/battle/area_flo2/stage/flo_01c.c rename to src/battle/area/flo2/stage/flo_01c.c diff --git a/src/battle/area_flo2/stage/flo_02.c b/src/battle/area/flo2/stage/flo_02.c similarity index 100% rename from src/battle/area_flo2/stage/flo_02.c rename to src/battle/area/flo2/stage/flo_02.c diff --git a/src/battle/area_flo2/stage/flo_02b.c b/src/battle/area/flo2/stage/flo_02b.c similarity index 100% rename from src/battle/area_flo2/stage/flo_02b.c rename to src/battle/area/flo2/stage/flo_02b.c diff --git a/src/battle/area_flo2/stage/flo_02c.c b/src/battle/area/flo2/stage/flo_02c.c similarity index 100% rename from src/battle/area_flo2/stage/flo_02c.c rename to src/battle/area/flo2/stage/flo_02c.c diff --git a/src/battle/area_flo2/stage/flo_03.c b/src/battle/area/flo2/stage/flo_03.c similarity index 100% rename from src/battle/area_flo2/stage/flo_03.c rename to src/battle/area/flo2/stage/flo_03.c diff --git a/src/battle/area_flo2/stage/flo_04.c b/src/battle/area/flo2/stage/flo_04.c similarity index 100% rename from src/battle/area_flo2/stage/flo_04.c rename to src/battle/area/flo2/stage/flo_04.c diff --git a/src/battle/area_flo2/stage/flo_05.c b/src/battle/area/flo2/stage/flo_05.c similarity index 100% rename from src/battle/area_flo2/stage/flo_05.c rename to src/battle/area/flo2/stage/flo_05.c diff --git a/src/battle/area_flo2/stage/flo_06.c b/src/battle/area/flo2/stage/flo_06.c similarity index 100% rename from src/battle/area_flo2/stage/flo_06.c rename to src/battle/area/flo2/stage/flo_06.c diff --git a/src/battle/area_hos/actor/ember.c b/src/battle/area/hos/actor/ember.c similarity index 100% rename from src/battle/area_hos/actor/ember.c rename to src/battle/area/hos/actor/ember.c diff --git a/src/battle/area_hos/actor/goombario_tutor.c b/src/battle/area/hos/actor/goombario_tutor.c similarity index 99% rename from src/battle/area_hos/actor/goombario_tutor.c rename to src/battle/area/hos/actor/goombario_tutor.c index 0dd6ed5fac..f51bf197ff 100644 --- a/src/battle/area_hos/actor/goombario_tutor.c +++ b/src/battle/area/hos/actor/goombario_tutor.c @@ -62,7 +62,7 @@ ActorPartBlueprint N(partsTable_80219114)[] = { .defenseTable = N(defenseTable_8021905C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -276,7 +276,7 @@ EvtScript N(takeTurn_80219444) = { EVT_END }; -ApiStatus func_80218000_47F0B0(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218000_47F0B0) { PlayerData* playerData = &gPlayerData; playerData->currentPartner = PARTNER_GOOMBARIO; diff --git a/src/battle/area_hos/actor/magikoopa.c b/src/battle/area/hos/actor/magikoopa.c similarity index 99% rename from src/battle/area_hos/actor/magikoopa.c rename to src/battle/area/hos/actor/magikoopa.c index ff912d68d7..8a02346437 100644 --- a/src/battle/area_hos/actor/magikoopa.c +++ b/src/battle/area/hos/actor/magikoopa.c @@ -79,8 +79,7 @@ ActorPartBlueprint N(partsTable_8021D5F0)[] = { .defenseTable = N(defenseTable_8021D480), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFB, - .unk_1D = 0xF4, + .projectileTargetOffset = { -5, -12 }, }, }; @@ -98,8 +97,7 @@ ActorPartBlueprint N(partsTable_8021D614)[] = { .defenseTable = N(defenseTable_8021D48C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFB, - .unk_1D = 0xF4, + .projectileTargetOffset = { -5, -12 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -111,7 +109,7 @@ ActorPartBlueprint N(partsTable_8021D614)[] = { .defenseTable = N(defenseTable_8021D48C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 248, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -123,7 +121,7 @@ ActorPartBlueprint N(partsTable_8021D614)[] = { .defenseTable = N(defenseTable_8021D48C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -1277,8 +1275,7 @@ ActorPartBlueprint N(partsTable_80221624)[] = { .defenseTable = N(defenseTable_802214B4), .eventFlags = ACTOR_EVENT_FLAG_ILLUSORY, .elementImmunityFlags = 0, - .unk_1C = 0xFB, - .unk_1D = 0xF4, + .projectileTargetOffset = { -5, -12 }, }, }; @@ -1293,7 +1290,7 @@ ActorPartBlueprint N(partsTable_80221648)[] = { .defenseTable = N(defenseTable_802214C0), .eventFlags = ACTOR_EVENT_FLAG_ILLUSORY, .elementImmunityFlags = 0, - .unk_1D = 248, + .projectileTargetOffset = { 0, -8 }, }, }; diff --git a/src/battle/area_hos/area.c b/src/battle/area/hos/area.c similarity index 66% rename from src/battle/area_hos/area.c rename to src/battle/area/hos/area.c index f799b44f98..21624e3234 100644 --- a/src/battle/area_hos/area.c +++ b/src/battle/area/hos/area.c @@ -11,34 +11,34 @@ extern Stage N(hos_00); extern Stage N(hos_01); extern Stage N(hos_02); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(goombario_tutor), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(ember), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(ember), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(ember), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(ember), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(ember), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(magikoopa_flying), .home = { .index = 5 }, .priority = 10 }, }; -BattleList N(formationTable) = { - BATTLE("クリオ（ＡＣヘルプ）", N(formation_00), &N(hos_02)), - BATTLE("エルモスx２", N(formation_01), &N(hos_01)), - BATTLE("エルモスx３", N(formation_02), &N(hos_01)), - BATTLE("カメック（ＡＣヘルプご）", N(formation_03), &N(hos_02)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(hos_02), "クリオ（ＡＣヘルプ）"), + BATTLE(N(Formation_01), &N(hos_01), "エルモスx２"), + BATTLE(N(Formation_02), &N(hos_01), "エルモスx３"), + BATTLE(N(Formation_03), &N(hos_02), "カメック（ＡＣヘルプご）"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "hos_00", &N(hos_00) }, { "hos_01", &N(hos_01) }, { "hos_02", &N(hos_02) }, diff --git a/src/battle/area_hos/stage/hos_00.c b/src/battle/area/hos/stage/hos_00.c similarity index 100% rename from src/battle/area_hos/stage/hos_00.c rename to src/battle/area/hos/stage/hos_00.c diff --git a/src/battle/area_hos/stage/hos_01.c b/src/battle/area/hos/stage/hos_01.c similarity index 100% rename from src/battle/area_hos/stage/hos_01.c rename to src/battle/area/hos/stage/hos_01.c diff --git a/src/battle/area_hos/stage/hos_02.c b/src/battle/area/hos/stage/hos_02.c similarity index 100% rename from src/battle/area_hos/stage/hos_02.c rename to src/battle/area/hos/stage/hos_02.c diff --git a/src/battle/area_isk_part_1/actor/buzzy_beetle.c b/src/battle/area/isk_part_1/actor/buzzy_beetle.c similarity index 100% rename from src/battle/area_isk_part_1/actor/buzzy_beetle.c rename to src/battle/area/isk_part_1/actor/buzzy_beetle.c diff --git a/src/battle/area_isk_part_1/actor/pokey_mummy.c b/src/battle/area/isk_part_1/actor/pokey_mummy.c similarity index 99% rename from src/battle/area_isk_part_1/actor/pokey_mummy.c rename to src/battle/area/isk_part_1/actor/pokey_mummy.c index ef911b3ec1..be3da691ff 100644 --- a/src/battle/area_isk_part_1/actor/pokey_mummy.c +++ b/src/battle/area/isk_part_1/actor/pokey_mummy.c @@ -60,7 +60,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .defenseTable = N(defenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -72,7 +72,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .defenseTable = N(defenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1D = 248, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -84,7 +84,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .defenseTable = N(defenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1D = 248, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -96,7 +96,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .defenseTable = N(defenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1D = 248, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -108,7 +108,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .defenseTable = N(defenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1D = 248, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -120,7 +120,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .defenseTable = N(defenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_isk_part_1/actor/stone_chomp.c b/src/battle/area/isk_part_1/actor/stone_chomp.c similarity index 98% rename from src/battle/area_isk_part_1/actor/stone_chomp.c rename to src/battle/area/isk_part_1/actor/stone_chomp.c index 634c679e29..653897837a 100644 --- a/src/battle/area_isk_part_1/actor/stone_chomp.c +++ b/src/battle/area/isk_part_1/actor/stone_chomp.c @@ -102,7 +102,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION | ACTOR_PART_FLAG_MULTI_TARGET, @@ -114,7 +114,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 242, + .projectileTargetOffset = { 0, -14 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -126,7 +126,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -138,7 +138,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -150,7 +150,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -162,7 +162,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -174,7 +174,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -186,7 +186,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -198,7 +198,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -210,7 +210,7 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .defenseTable = N(defenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -243,7 +243,7 @@ ActorBlueprint NAMESPACE = { #include "common/ChompChainUpdateHelperFunc2.inc.c" -ApiStatus b_area_isk_part_1_ChompChainUpdate(Evt* script, s32 isInitialCall) { +API_CALLABLE(b_area_isk_part_1_ChompChainUpdate) { f32 sp18; Actor* actor; ActorPart* part; @@ -426,13 +426,13 @@ EvtScript N(80221BC4) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, 0, 0) EVT_ELSE EVT_CALL(SetIdleGoalToHome, ACTOR_SELF) EVT_CALL(GetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, -13, 40) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 2, 0, -14) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, 0, -14) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/battle/area_isk_part_1/actor/swooper.c b/src/battle/area/isk_part_1/actor/swooper.c similarity index 100% rename from src/battle/area_isk_part_1/actor/swooper.c rename to src/battle/area/isk_part_1/actor/swooper.c diff --git a/src/battle/area_isk_part_1/area.c b/src/battle/area/isk_part_1/area.c similarity index 74% rename from src/battle/area_isk_part_1/area.c rename to src/battle/area/isk_part_1/area.c index 8d3c7cd8b0..778cd96d93 100644 --- a/src/battle/area_isk_part_1/area.c +++ b/src/battle/area/isk_part_1/area.c @@ -38,23 +38,23 @@ Vec3i N(vector3D_802240B8) = { 95, 112, -25 }; Vec3i N(vector3D_802240C4) = { 135, 112, -25 }; -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(pokey_mummy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(pokey_mummy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(pokey_mummy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pokey_mummy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(pokey_mummy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(pokey_mummy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(swooper), .home = { .vec = &N(vector3D_80224088) }, .priority = 8 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(pokey_mummy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pokey_mummy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(swooper), .home = { .vec = &N(vector3D_80224088) }, .priority = 8 }, @@ -64,80 +64,80 @@ Vec3i N(vector3D_802241E8) = { 80, 133, -25 }; Vec3i N(vector3D_802241F4) = { 115, 133, -25 }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(pokey_mummy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pokey_mummy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(swooper), .home = { .vec = &N(vector3D_802241E8) }, .priority = 8 }, { .actor = &N(swooper), .home = { .vec = &N(vector3D_802241F4) }, .priority = 7 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(swooper), .home = { .vec = &N(vector3D_8022407C) }, .priority = 10 }, { .actor = &N(swooper), .home = { .vec = &N(vector3D_80224088) }, .priority = 9 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(swooper), .home = { .vec = &N(vector3D_80224070) }, .priority = 10 }, { .actor = &N(swooper), .home = { .vec = &N(vector3D_8022407C) }, .priority = 9 }, { .actor = &N(swooper), .home = { .vec = &N(vector3D_80224088) }, .priority = 8 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(stone_chomp), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(stone_chomp), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(stone_chomp), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(stone_chomp), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(stone_chomp), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(buzzy_beetle), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(buzzy_beetle), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(buzzy_beetle), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(buzzy_beetle), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(buzzy_beetle), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(buzzy_beetle), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(buzzy_beetle), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_802240AC) }, .priority = 9, .var0 = 1 }, { .actor = &N(swooper), .home = { .vec = &N(vector3D_802240B8) }, .priority = 8 }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(buzzy_beetle), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(swooper), .home = { .vec = &N(vector3D_802240B8) }, .priority = 9 }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_802240AC) }, .priority = 10, .var0 = 1 }, { .actor = &N(buzzy_beetle), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0E) = { +Formation N(Formation_0E) = { { .actor = &N(buzzy_beetle), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_802240B8) }, .priority = 9, .var0 = 1 }, }; -Formation N(formation_0F) = { +Formation N(Formation_0F) = { { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_802240AC) }, .priority = 10, .var0 = 1 }, { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_802240B8) }, .priority = 9, .var0 = 1 }, }; -Formation N(formation_10) = { +Formation N(Formation_10) = { { .actor = &N(buzzy_beetle), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_802240AC) }, .priority = 9, .var0 = 1 }, { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_802240B8) }, .priority = 8, .var0 = 1 }, }; -Formation N(formation_11) = { +Formation N(Formation_11) = { { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_802240A0) }, .priority = 10, .var0 = 1 }, { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_802240AC) }, .priority = 9, .var0 = 1 }, { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_802240B8) }, .priority = 8, .var0 = 1 }, @@ -151,44 +151,44 @@ Vec3i N(vector3D_80224624) = { 80, 112, -25 }; Vec3i N(vector3D_80224630) = { 120, 112, -25 }; -Formation N(formation_12) = { +Formation N(Formation_12) = { { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_8022460C) }, .priority = 10, .var0 = 1 }, { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_80224618) }, .priority = 9, .var0 = 1 }, { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_80224624) }, .priority = 8, .var0 = 1 }, { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_80224630) }, .priority = 7, .var0 = 1 }, }; -Formation N(formation_13) = { +Formation N(Formation_13) = { { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_802240A0) }, .priority = 10, .var0 = 1 }, { .actor = &N(buzzy_beetle), .home = { .vec = &N(vector3D_802240AC) }, .priority = 9, .var0 = 1 }, { .actor = &N(swooper), .home = { .vec = &N(vector3D_802240B8) }, .priority = 8 }, }; -BattleList N(formationTable) = { - BATTLE("サンボマミーx２", N(formation_00), &N(isk_02b)), - BATTLE("サンボマミーx３", N(formation_01), &N(isk_02b)), - BATTLE("サンボマミー,バサバサ", N(formation_02), &N(isk_04)), - BATTLE("サンボマミーx２,バサバサ", N(formation_03), &N(isk_04)), - BATTLE("サンボマミーx２,バサバサx２", N(formation_04), &N(isk_04)), - BATTLE("バサバサx２", N(formation_05), &N(isk_04)), - BATTLE("バサバサx３", N(formation_06), &N(isk_04)), - BATTLE("ストーンワンワンx２", N(formation_07), &N(isk_02b)), - BATTLE("ストーンワンワンx３", N(formation_08), &N(isk_02b)), - BATTLE("メットx２", N(formation_09), &N(isk_02b)), - BATTLE("メットx４", N(formation_0A), &N(isk_02b)), - BATTLE("メット,メット（てんじょう）,バサバサ", N(formation_0B), &N(isk_05)), - BATTLE("メット,バサバサ", N(formation_0C), &N(isk_05)), - BATTLE("メット（てんじょう）,メット", N(formation_0D), &N(isk_05)), - BATTLE("メット,メット(てんじょう)", N(formation_0E), &N(isk_05)), - BATTLE("メット(てんじょう)x２", N(formation_0F), &N(isk_05)), - BATTLE("メット,メット(てんじょう)x２", N(formation_10), &N(isk_05)), - BATTLE("メット(てんじょう)x３", N(formation_11), &N(isk_05)), - BATTLE("メット(てんじょう)x４", N(formation_12), &N(isk_05)), - BATTLE("メット(てんじょう)x２,バサバサ", N(formation_13), &N(isk_05)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(isk_02b), "サンボマミーx２"), + BATTLE(N(Formation_01), &N(isk_02b), "サンボマミーx３"), + BATTLE(N(Formation_02), &N(isk_04), "サンボマミー,バサバサ"), + BATTLE(N(Formation_03), &N(isk_04), "サンボマミーx２,バサバサ"), + BATTLE(N(Formation_04), &N(isk_04), "サンボマミーx２,バサバサx２"), + BATTLE(N(Formation_05), &N(isk_04), "バサバサx２"), + BATTLE(N(Formation_06), &N(isk_04), "バサバサx３"), + BATTLE(N(Formation_07), &N(isk_02b), "ストーンワンワンx２"), + BATTLE(N(Formation_08), &N(isk_02b), "ストーンワンワンx３"), + BATTLE(N(Formation_09), &N(isk_02b), "メットx２"), + BATTLE(N(Formation_0A), &N(isk_02b), "メットx４"), + BATTLE(N(Formation_0B), &N(isk_05), "メット,メット（てんじょう）,バサバサ"), + BATTLE(N(Formation_0C), &N(isk_05), "メット,バサバサ"), + BATTLE(N(Formation_0D), &N(isk_05), "メット（てんじょう）,メット"), + BATTLE(N(Formation_0E), &N(isk_05), "メット,メット(てんじょう)"), + BATTLE(N(Formation_0F), &N(isk_05), "メット(てんじょう)x２"), + BATTLE(N(Formation_10), &N(isk_05), "メット,メット(てんじょう)x２"), + BATTLE(N(Formation_11), &N(isk_05), "メット(てんじょう)x３"), + BATTLE(N(Formation_12), &N(isk_05), "メット(てんじょう)x４"), + BATTLE(N(Formation_13), &N(isk_05), "メット(てんじょう)x２,バサバサ"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "isk_00", &N(isk_00) }, { "isk_01", &N(isk_01) }, { "isk_02", &N(isk_02) }, diff --git a/src/battle/area_isk_part_1/stage/isk_00.c b/src/battle/area/isk_part_1/stage/isk_00.c similarity index 100% rename from src/battle/area_isk_part_1/stage/isk_00.c rename to src/battle/area/isk_part_1/stage/isk_00.c diff --git a/src/battle/area_isk_part_1/stage/isk_01.c b/src/battle/area/isk_part_1/stage/isk_01.c similarity index 100% rename from src/battle/area_isk_part_1/stage/isk_01.c rename to src/battle/area/isk_part_1/stage/isk_01.c diff --git a/src/battle/area_isk_part_1/stage/isk_02.c b/src/battle/area/isk_part_1/stage/isk_02.c similarity index 100% rename from src/battle/area_isk_part_1/stage/isk_02.c rename to src/battle/area/isk_part_1/stage/isk_02.c diff --git a/src/battle/area_isk_part_1/stage/isk_02b.c b/src/battle/area/isk_part_1/stage/isk_02b.c similarity index 100% rename from src/battle/area_isk_part_1/stage/isk_02b.c rename to src/battle/area/isk_part_1/stage/isk_02b.c diff --git a/src/battle/area_isk_part_1/stage/isk_02c.c b/src/battle/area/isk_part_1/stage/isk_02c.c similarity index 100% rename from src/battle/area_isk_part_1/stage/isk_02c.c rename to src/battle/area/isk_part_1/stage/isk_02c.c diff --git a/src/battle/area_isk_part_1/stage/isk_03.c b/src/battle/area/isk_part_1/stage/isk_03.c similarity index 100% rename from src/battle/area_isk_part_1/stage/isk_03.c rename to src/battle/area/isk_part_1/stage/isk_03.c diff --git a/src/battle/area_isk_part_1/stage/isk_03b.c b/src/battle/area/isk_part_1/stage/isk_03b.c similarity index 100% rename from src/battle/area_isk_part_1/stage/isk_03b.c rename to src/battle/area/isk_part_1/stage/isk_03b.c diff --git a/src/battle/area_isk_part_1/stage/isk_04.c b/src/battle/area/isk_part_1/stage/isk_04.c similarity index 90% rename from src/battle/area_isk_part_1/stage/isk_04.c rename to src/battle/area/isk_part_1/stage/isk_04.c index e365ac8a55..666de0a866 100644 --- a/src/battle/area_isk_part_1/stage/isk_04.c +++ b/src/battle/area/isk_part_1/stage/isk_04.c @@ -8,13 +8,13 @@ BSS EffectInstance* N(D_80224D60); BSS EffectInstance* N(D_80224D64); -ApiStatus N(CreateTorchFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CreateTorchFX)) { fx_flame(1, -133.0f, 72.0f, -143.0f, 0.3f, &N(D_80224D60)); fx_flame(1, 129.0f, 72.0f, -143.0f, 0.3f, &N(D_80224D64)); return ApiStatus_DONE2; } -ApiStatus N(DeleteTorchFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(DeleteTorchFX)) { remove_effect(N(D_80224D60)); remove_effect(N(D_80224D64)); return ApiStatus_DONE2; diff --git a/src/battle/area_isk_part_1/stage/isk_05.c b/src/battle/area/isk_part_1/stage/isk_05.c similarity index 88% rename from src/battle/area_isk_part_1/stage/isk_05.c rename to src/battle/area/isk_part_1/stage/isk_05.c index d1366a4d2a..a43c8258f7 100644 --- a/src/battle/area_isk_part_1/stage/isk_05.c +++ b/src/battle/area/isk_part_1/stage/isk_05.c @@ -7,13 +7,13 @@ BSS EffectInstance* N(D_80224D70); BSS EffectInstance* N(D_80224D74); -ApiStatus N(CreateTorchFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CreateTorchFX)) { fx_flame(1, -90.0f, 45.0f, -146.0f, 0.25f, &N(D_80224D70)); fx_flame(1, 80.0f, 45.0f, -146.0f, 0.25f, &N(D_80224D74)); return ApiStatus_DONE2; } -ApiStatus N(DeleteTorchFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(DeleteTorchFX)) { remove_effect(N(D_80224D70)); remove_effect(N(D_80224D74)); return ApiStatus_DONE2; diff --git a/src/battle/area_isk_part_1/stage/isk_06.c b/src/battle/area/isk_part_1/stage/isk_06.c similarity index 85% rename from src/battle/area_isk_part_1/stage/isk_06.c rename to src/battle/area/isk_part_1/stage/isk_06.c index 9971dc8601..80f14e75c6 100644 --- a/src/battle/area_isk_part_1/stage/isk_06.c +++ b/src/battle/area/isk_part_1/stage/isk_06.c @@ -6,12 +6,12 @@ BSS EffectInstance* N(D_80224D80); -ApiStatus func_80218A50_4E3190(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218A50_4E3190) { fx_flame(1, -110.0f, 80.0f, -146.0f, 0.3f, &N(D_80224D80)); return ApiStatus_DONE2; } -ApiStatus func_80218A98_4E31D8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218A98_4E31D8) { remove_effect(N(D_80224D80)); return ApiStatus_DONE2; } diff --git a/src/battle/area_isk_part_1/stage/isk_06b.c b/src/battle/area/isk_part_1/stage/isk_06b.c similarity index 87% rename from src/battle/area_isk_part_1/stage/isk_06b.c rename to src/battle/area/isk_part_1/stage/isk_06b.c index a86764f155..2aad07cec5 100644 --- a/src/battle/area_isk_part_1/stage/isk_06b.c +++ b/src/battle/area/isk_part_1/stage/isk_06b.c @@ -7,12 +7,12 @@ BSS EffectInstance* N(D_80224DA0); -ApiStatus func_80218B30_4E3270(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218B30_4E3270) { fx_flame(1, -110.0f, 80.0f, -146.0, 0.3f, &N(D_80224DA0)); return ApiStatus_DONE2; } -ApiStatus func_80218B78_4E32B8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218B78_4E32B8) { remove_effect(N(D_80224DA0)); return ApiStatus_DONE2; } diff --git a/src/battle/area_isk_part_1/stage/isk_07.c b/src/battle/area/isk_part_1/stage/isk_07.c similarity index 85% rename from src/battle/area_isk_part_1/stage/isk_07.c rename to src/battle/area/isk_part_1/stage/isk_07.c index 8c71be9f22..603a9e20d2 100644 --- a/src/battle/area_isk_part_1/stage/isk_07.c +++ b/src/battle/area/isk_part_1/stage/isk_07.c @@ -6,12 +6,12 @@ BSS EffectInstance* N(D_80224D90); -ApiStatus func_80218AC0_4E3200(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218AC0_4E3200) { fx_flame(1, 110.0f, 80.0f, -146.0f, 0.3f, &N(D_80224D90)); return ApiStatus_DONE2; } -ApiStatus func_80218B08_4E3248(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218B08_4E3248) { remove_effect(N(D_80224D90)); return ApiStatus_DONE2; } diff --git a/src/battle/area_isk_part_1/stage/isk_08.c b/src/battle/area/isk_part_1/stage/isk_08.c similarity index 85% rename from src/battle/area_isk_part_1/stage/isk_08.c rename to src/battle/area/isk_part_1/stage/isk_08.c index be270eba44..237e62150d 100644 --- a/src/battle/area_isk_part_1/stage/isk_08.c +++ b/src/battle/area/isk_part_1/stage/isk_08.c @@ -6,12 +6,12 @@ BSS EffectInstance* N(D_80224DB0); -ApiStatus func_80218BA0_4E32E0(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218BA0_4E32E0) { fx_flame(1, 0, 72.0f, -146.0, 0.3f, &N(D_80224DB0)); return ApiStatus_DONE2; } -ApiStatus func_80218BE8_4E3328(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218BE8_4E3328) { remove_effect(N(D_80224DB0)); return ApiStatus_DONE2; } diff --git a/src/battle/area_isk_part_2/actor/chain_chomp.c b/src/battle/area/isk_part_2/actor/chain_chomp.c similarity index 98% rename from src/battle/area_isk_part_2/actor/chain_chomp.c rename to src/battle/area/isk_part_2/actor/chain_chomp.c index 68aa46245c..c3101681bf 100644 --- a/src/battle/area_isk_part_2/actor/chain_chomp.c +++ b/src/battle/area/isk_part_2/actor/chain_chomp.c @@ -113,7 +113,7 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .defenseTable = N(defenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION | ACTOR_PART_FLAG_MULTI_TARGET, @@ -125,7 +125,7 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .defenseTable = N(defenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 240, + .projectileTargetOffset = { 0, -16 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -137,7 +137,7 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .defenseTable = N(defenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -149,7 +149,7 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .defenseTable = N(defenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -161,7 +161,7 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .defenseTable = N(defenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -173,7 +173,7 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .defenseTable = N(defenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -185,7 +185,7 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .defenseTable = N(defenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -197,7 +197,7 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .defenseTable = N(defenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -209,7 +209,7 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .defenseTable = N(defenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_4000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -221,7 +221,7 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .defenseTable = N(defenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -254,7 +254,7 @@ ActorBlueprint NAMESPACE = { #include "common/ChompChainUpdateHelperFunc2.inc.c" -ApiStatus b_area_isk_part_2_chain_chomp_ChompChainUpdate(Evt* script, s32 isInitialCall) { +API_CALLABLE(b_area_isk_part_2_chain_chomp_ChompChainUpdate) { Bytecode* args = script->ptrReadPos; f32 sp18; Actor* actor; @@ -368,7 +368,7 @@ ApiStatus b_area_isk_part_2_chain_chomp_ChompChainUpdate(Evt* script, s32 isInit return ApiStatus_DONE2; } -ApiStatus func_8021866C_4EFB0C(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_8021866C_4EFB0C) { Bytecode* args = script->ptrReadPos; s32 var1 = *args++; @@ -400,13 +400,13 @@ EvtScript N(80218FCC) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, 0, 0) EVT_ELSE EVT_CALL(SetIdleGoalToHome, ACTOR_SELF) EVT_CALL(GetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, -13, 40) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 2, 0, -14) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, 0, -14) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/battle/area_isk_part_2/actor/tutankoopa.c b/src/battle/area/isk_part_2/actor/tutankoopa.c similarity index 98% rename from src/battle/area_isk_part_2/actor/tutankoopa.c rename to src/battle/area/isk_part_2/actor/tutankoopa.c index bc1beb9517..b6d9cae9af 100644 --- a/src/battle/area_isk_part_2/actor/tutankoopa.c +++ b/src/battle/area/isk_part_2/actor/tutankoopa.c @@ -108,7 +108,7 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .defenseTable = N(defenseTable_8021BA1C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -120,8 +120,7 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .defenseTable = N(defenseTable_8021BA1C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFB, - .unk_1D = 0xF1, + .projectileTargetOffset = { -5, -15 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION | ACTOR_PART_FLAG_40000000, @@ -133,7 +132,7 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION | ACTOR_PART_FLAG_40000000, @@ -145,7 +144,7 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION | ACTOR_PART_FLAG_40000000, @@ -157,7 +156,7 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -169,7 +168,7 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -181,7 +180,7 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -193,7 +192,7 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -222,7 +221,7 @@ ActorBlueprint NAMESPACE = { #include "common/UnkBattleFunc1.inc.c" -ApiStatus func_8021875C_4EFBFC(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_8021875C_4EFBFC) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); @@ -269,16 +268,16 @@ EvtScript N(idle_8021BE28) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_DIZZY) EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, -10, 22) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 2, 2, -8) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, 2, -8) EVT_CALL(N(UnkBattleFunc1), -25, 15, 0, 20) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, 0, 39) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 2, -5, -15) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, -5, -15) EVT_CALL(N(UnkBattleFunc1), -17, 23, 11, 32) EVT_END_IF EVT_CASE_EQ(1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, -10, 22) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 2, 2, -8) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, 2, -8) EVT_CALL(N(UnkBattleFunc1), -25, 15, 0, 20) EVT_END_SWITCH EVT_WAIT(1) diff --git a/src/battle/area_isk_part_2/area.c b/src/battle/area/isk_part_2/area.c similarity index 85% rename from src/battle/area_isk_part_2/area.c rename to src/battle/area/isk_part_2/area.c index 9ed92183d8..7b6c06a9e8 100644 --- a/src/battle/area_isk_part_2/area.c +++ b/src/battle/area/isk_part_2/area.c @@ -20,16 +20,16 @@ extern Stage N(isk_07); Vec3i N(vector3D_80220420) = { 97, 70, 17 }; -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(tutankoopa), .home = { .vec = &N(vector3D_80220420) }, .priority = 10 }, }; -BattleList N(formationTable) = { - BATTLE("カーメン　ワンワン", N(formation_00), &N(isk_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(isk_01), "カーメン　ワンワン"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "isk_00", &N(isk_00) }, { "isk_01", &N(isk_01) }, { "isk_02", &N(isk_02) }, diff --git a/src/battle/area_isk_part_2/stage/isk_00.c b/src/battle/area/isk_part_2/stage/isk_00.c similarity index 100% rename from src/battle/area_isk_part_2/stage/isk_00.c rename to src/battle/area/isk_part_2/stage/isk_00.c diff --git a/src/battle/area_isk_part_2/stage/isk_01.c b/src/battle/area/isk_part_2/stage/isk_01.c similarity index 100% rename from src/battle/area_isk_part_2/stage/isk_01.c rename to src/battle/area/isk_part_2/stage/isk_01.c diff --git a/src/battle/area_isk_part_2/stage/isk_02.c b/src/battle/area/isk_part_2/stage/isk_02.c similarity index 100% rename from src/battle/area_isk_part_2/stage/isk_02.c rename to src/battle/area/isk_part_2/stage/isk_02.c diff --git a/src/battle/area_isk_part_2/stage/isk_02b.c b/src/battle/area/isk_part_2/stage/isk_02b.c similarity index 100% rename from src/battle/area_isk_part_2/stage/isk_02b.c rename to src/battle/area/isk_part_2/stage/isk_02b.c diff --git a/src/battle/area_isk_part_2/stage/isk_02c.c b/src/battle/area/isk_part_2/stage/isk_02c.c similarity index 100% rename from src/battle/area_isk_part_2/stage/isk_02c.c rename to src/battle/area/isk_part_2/stage/isk_02c.c diff --git a/src/battle/area_isk_part_2/stage/isk_03.c b/src/battle/area/isk_part_2/stage/isk_03.c similarity index 100% rename from src/battle/area_isk_part_2/stage/isk_03.c rename to src/battle/area/isk_part_2/stage/isk_03.c diff --git a/src/battle/area_isk_part_2/stage/isk_03b.c b/src/battle/area/isk_part_2/stage/isk_03b.c similarity index 100% rename from src/battle/area_isk_part_2/stage/isk_03b.c rename to src/battle/area/isk_part_2/stage/isk_03b.c diff --git a/src/battle/area_isk_part_2/stage/isk_04.c b/src/battle/area/isk_part_2/stage/isk_04.c similarity index 89% rename from src/battle/area_isk_part_2/stage/isk_04.c rename to src/battle/area/isk_part_2/stage/isk_04.c index ba48b89cd6..5b54eea71e 100644 --- a/src/battle/area_isk_part_2/stage/isk_04.c +++ b/src/battle/area/isk_part_2/stage/isk_04.c @@ -8,13 +8,13 @@ BSS EffectInstance* D_80220740; BSS EffectInstance* D_80220744; -ApiStatus func_80218850_4EFCF0(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218850_4EFCF0) { fx_flame(1, -133.0f, 72.0f, -143.0f, 0.3f, &D_80220740); fx_flame(1, 129.0f, 72.0f, -143.0f, 0.3f, &D_80220744); return ApiStatus_DONE2; } -ApiStatus func_802188E4_4EFD84(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802188E4_4EFD84) { remove_effect(D_80220740); remove_effect(D_80220744); return ApiStatus_DONE2; diff --git a/src/battle/area_isk_part_2/stage/isk_05.c b/src/battle/area/isk_part_2/stage/isk_05.c similarity index 87% rename from src/battle/area_isk_part_2/stage/isk_05.c rename to src/battle/area/isk_part_2/stage/isk_05.c index cc0ec9e172..7540e05f6e 100644 --- a/src/battle/area_isk_part_2/stage/isk_05.c +++ b/src/battle/area/isk_part_2/stage/isk_05.c @@ -7,13 +7,13 @@ BSS EffectInstance* D_80220750; BSS EffectInstance* D_80220754; -ApiStatus func_80218920_4EFDC0(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218920_4EFDC0) { fx_flame(1, -90.0f, 45.0f, -146.0f, 0.25f, &D_80220750); fx_flame(1, 80.0f, 45.0f, -146.0f, 0.25f, &D_80220754); return ApiStatus_DONE2; } -ApiStatus func_802189B0_4EFE50(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802189B0_4EFE50) { remove_effect(D_80220750); remove_effect(D_80220754); return ApiStatus_DONE2; diff --git a/src/battle/area_isk_part_2/stage/isk_06.c b/src/battle/area/isk_part_2/stage/isk_06.c similarity index 85% rename from src/battle/area_isk_part_2/stage/isk_06.c rename to src/battle/area/isk_part_2/stage/isk_06.c index c18c4681c3..235f775831 100644 --- a/src/battle/area_isk_part_2/stage/isk_06.c +++ b/src/battle/area/isk_part_2/stage/isk_06.c @@ -6,12 +6,12 @@ BSS EffectInstance* D_80220760; -ApiStatus func_802189F0_4EFE90(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802189F0_4EFE90) { fx_flame(1, -110.0f, 80.0f, -146.0f, 0.3f, &D_80220760); return ApiStatus_DONE2; } -ApiStatus func_80218A38_4EFED8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218A38_4EFED8) { remove_effect(D_80220760); return ApiStatus_DONE2; } diff --git a/src/battle/area_isk_part_2/stage/isk_06b.c b/src/battle/area/isk_part_2/stage/isk_06b.c similarity index 87% rename from src/battle/area_isk_part_2/stage/isk_06b.c rename to src/battle/area/isk_part_2/stage/isk_06b.c index a14ea2fbc4..d9a80947c8 100644 --- a/src/battle/area_isk_part_2/stage/isk_06b.c +++ b/src/battle/area/isk_part_2/stage/isk_06b.c @@ -7,12 +7,12 @@ BSS EffectInstance* D_80220770; -ApiStatus func_80218A60_4EFF00(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218A60_4EFF00) { fx_flame(1, -110.0f, 80.0f, -146.0f, 0.3f, &D_80220770); return ApiStatus_DONE2; } -ApiStatus func_80218AA8_4EFF48(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218AA8_4EFF48) { remove_effect(D_80220770); return ApiStatus_DONE2; } diff --git a/src/battle/area_isk_part_2/stage/isk_07.c b/src/battle/area/isk_part_2/stage/isk_07.c similarity index 85% rename from src/battle/area_isk_part_2/stage/isk_07.c rename to src/battle/area/isk_part_2/stage/isk_07.c index 997a326249..7735ae0b6d 100644 --- a/src/battle/area_isk_part_2/stage/isk_07.c +++ b/src/battle/area/isk_part_2/stage/isk_07.c @@ -6,12 +6,12 @@ BSS EffectInstance* D_80220780; -ApiStatus func_80218AD0_4EFF70(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218AD0_4EFF70) { fx_flame(1, 110.0f, 80.0f, -146.0f, 0.3f, &D_80220780); return ApiStatus_DONE2; } -ApiStatus func_80218B18_4EFFB8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218B18_4EFFB8) { remove_effect(D_80220780); return ApiStatus_DONE2; } diff --git a/src/battle/area_iwa/actor/buzzar.c b/src/battle/area/iwa/actor/buzzar.c similarity index 99% rename from src/battle/area_iwa/actor/buzzar.c rename to src/battle/area/iwa/actor/buzzar.c index 74ce5ee704..3c3b61e022 100644 --- a/src/battle/area_iwa/actor/buzzar.c +++ b/src/battle/area/iwa/actor/buzzar.c @@ -82,7 +82,7 @@ ActorPartBlueprint N(partsTable_8021B708)[] = { .defenseTable = N(defenseTable_8021B650), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -94,7 +94,7 @@ ActorPartBlueprint N(partsTable_8021B708)[] = { .defenseTable = N(defenseTable_8021B650), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 242, + .projectileTargetOffset = { 0, -14 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -106,7 +106,7 @@ ActorPartBlueprint N(partsTable_8021B708)[] = { .defenseTable = N(defenseTable_8021B650), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -118,7 +118,7 @@ ActorPartBlueprint N(partsTable_8021B708)[] = { .defenseTable = N(defenseTable_8021B650), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -130,7 +130,7 @@ ActorPartBlueprint N(partsTable_8021B708)[] = { .defenseTable = N(defenseTable_8021B650), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_iwa/actor/cleft.c b/src/battle/area/iwa/actor/cleft.c similarity index 99% rename from src/battle/area_iwa/actor/cleft.c rename to src/battle/area/iwa/actor/cleft.c index 5205986519..1e5df1899c 100644 --- a/src/battle/area_iwa/actor/cleft.c +++ b/src/battle/area/iwa/actor/cleft.c @@ -61,7 +61,7 @@ ActorPartBlueprint N(partsTable_802187EC)[] = { .defenseTable = N(defenseTable_80218710), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; @@ -162,7 +162,7 @@ EvtScript N(80218944) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218884))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8021872C))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -7) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -7) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 0) EVT_CALL(N(SetSpinSmashable), 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) @@ -416,7 +416,7 @@ EvtScript N(802197AC) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218838))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80218710))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 22) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -10) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 1) EVT_WAIT(1) EVT_CALL(N(SetSpinSmashable), 1) diff --git a/src/battle/area_iwa/actor/monty_mole.c b/src/battle/area/iwa/actor/monty_mole.c similarity index 100% rename from src/battle/area_iwa/actor/monty_mole.c rename to src/battle/area/iwa/actor/monty_mole.c diff --git a/src/battle/area_iwa/actor/whacka.c b/src/battle/area/iwa/actor/whacka.c similarity index 100% rename from src/battle/area_iwa/actor/whacka.c rename to src/battle/area/iwa/actor/whacka.c diff --git a/src/battle/area_iwa/area.c b/src/battle/area/iwa/area.c similarity index 66% rename from src/battle/area_iwa/area.c rename to src/battle/area/iwa/area.c index aa5660fd7a..e37b260a50 100644 --- a/src/battle/area_iwa/area.c +++ b/src/battle/area/iwa/area.c @@ -12,66 +12,66 @@ extern Stage N(iwa_01); extern Stage N(iwa_01b); extern Stage N(iwa_02); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(cleft), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(cleft), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(cleft), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(cleft), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(cleft), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(cleft), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(cleft), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(monty_mole), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(cleft), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(monty_mole), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(monty_mole), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(monty_mole), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(monty_mole), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(monty_mole), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(monty_mole), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(monty_mole), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(monty_mole), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(monty_mole), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(monty_mole), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(monty_mole), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(monty_mole), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(monty_mole), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(cleft), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(monty_mole), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(monty_mole), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(cleft), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(monty_mole), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(cleft), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(monty_mole), .home = { .index = 2 }, .priority = 8 }, @@ -79,35 +79,35 @@ Formation N(formation_0B) = { Vec3i N(vector3D_8021853C) = { 90, 70, 0, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(buzzar), .home = { .vec = &N(vector3D_8021853C) }, .priority = 10 }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(cleft), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(monty_mole), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(whacka), .home = { .index = 2 }, .priority = 8 }, }; -BattleList N(formationTable) = { - BATTLE("シンエモン", N(formation_00), &N(iwa_01)), - BATTLE("シンエモンx２", N(formation_01), &N(iwa_01)), - BATTLE("シンエモンx３", N(formation_02), &N(iwa_01)), - BATTLE("シンエモン,チョロプー", N(formation_03), &N(iwa_01)), - BATTLE("シンエモン,チョロプーx２", N(formation_04), &N(iwa_01)), - BATTLE("チョロプー", N(formation_05), &N(iwa_01)), - BATTLE("チョロプーx２", N(formation_06), &N(iwa_01)), - BATTLE("チョロプーx３", N(formation_07), &N(iwa_01)), - BATTLE("チョロプーx４", N(formation_08), &N(iwa_01)), - BATTLE("チョロプー,シンエモン", N(formation_09), &N(iwa_01)), - BATTLE("チョロプーx２,シンエモン", N(formation_0A), &N(iwa_01)), - BATTLE("チョロプー,シンエモン,チョロプー", N(formation_0B), &N(iwa_01)), - BATTLE("ゲーハー", N(formation_0C), &N(iwa_02)), - BATTLE("コブロン", N(formation_0D), &N(iwa_02)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(iwa_01), "シンエモン"), + BATTLE(N(Formation_01), &N(iwa_01), "シンエモンx２"), + BATTLE(N(Formation_02), &N(iwa_01), "シンエモンx３"), + BATTLE(N(Formation_03), &N(iwa_01), "シンエモン,チョロプー"), + BATTLE(N(Formation_04), &N(iwa_01), "シンエモン,チョロプーx２"), + BATTLE(N(Formation_05), &N(iwa_01), "チョロプー"), + BATTLE(N(Formation_06), &N(iwa_01), "チョロプーx２"), + BATTLE(N(Formation_07), &N(iwa_01), "チョロプーx３"), + BATTLE(N(Formation_08), &N(iwa_01), "チョロプーx４"), + BATTLE(N(Formation_09), &N(iwa_01), "チョロプー,シンエモン"), + BATTLE(N(Formation_0A), &N(iwa_01), "チョロプーx２,シンエモン"), + BATTLE(N(Formation_0B), &N(iwa_01), "チョロプー,シンエモン,チョロプー"), + BATTLE(N(Formation_0C), &N(iwa_02), "ゲーハー"), + BATTLE(N(Formation_0D), &N(iwa_02), "コブロン"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "iwa_01", &N(iwa_01) }, { "iwa_01b", &N(iwa_01b) }, { "iwa_02", &N(iwa_02) }, diff --git a/src/battle/area_iwa/stage/iwa_01.c b/src/battle/area/iwa/stage/iwa_01.c similarity index 100% rename from src/battle/area_iwa/stage/iwa_01.c rename to src/battle/area/iwa/stage/iwa_01.c diff --git a/src/battle/area_iwa/stage/iwa_01b.c b/src/battle/area/iwa/stage/iwa_01b.c similarity index 100% rename from src/battle/area_iwa/stage/iwa_01b.c rename to src/battle/area/iwa/stage/iwa_01b.c diff --git a/src/battle/area_iwa/stage/iwa_02.c b/src/battle/area/iwa/stage/iwa_02.c similarity index 100% rename from src/battle/area_iwa/stage/iwa_02.c rename to src/battle/area/iwa/stage/iwa_02.c diff --git a/src/battle/area_jan/actor/hurt_plant.c b/src/battle/area/jan/actor/hurt_plant.c similarity index 98% rename from src/battle/area_jan/actor/hurt_plant.c rename to src/battle/area/jan/actor/hurt_plant.c index 7d7182a125..ab865b3780 100644 --- a/src/battle/area_jan/actor/hurt_plant.c +++ b/src/battle/area/jan/actor/hurt_plant.c @@ -65,8 +65,7 @@ ActorPartBlueprint N(partsTable_8021DA4C)[] = { .defenseTable = N(defenseTable_8021D98C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xF8, - .unk_1D = 0xFB, + .projectileTargetOffset = { -8, -5 }, }, }; @@ -109,11 +108,11 @@ EvtScript N(idle_8021DAE4) = { EVT_SWITCH(LVar0) EVT_CASE_FLAG(STATUS_FLAG_SLEEP) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -6, 14) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -2, -5) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -2, -5) EVT_CALL(N(UnkBattleFunc1), -20, 8, 0, 14) EVT_CASE_DEFAULT EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -10, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -8, -5) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -8, -5) EVT_CALL(N(UnkBattleFunc1), -18, 23, 1, 20) EVT_END_SWITCH EVT_WAIT(1) diff --git a/src/battle/area_jan/actor/jungle_fuzzy.c b/src/battle/area/jan/actor/jungle_fuzzy.c similarity index 99% rename from src/battle/area_jan/actor/jungle_fuzzy.c rename to src/battle/area/jan/actor/jungle_fuzzy.c index cd0b7f7a6b..f7272d24e6 100644 --- a/src/battle/area_jan/actor/jungle_fuzzy.c +++ b/src/battle/area/jan/actor/jungle_fuzzy.c @@ -56,7 +56,7 @@ ActorPartBlueprint N(partsTable_8021EA90)[] = { .defenseTable = N(defenseTable_8021E9D0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/area_jan/actor/m_bush.c b/src/battle/area/jan/actor/m_bush.c similarity index 99% rename from src/battle/area_jan/actor/m_bush.c rename to src/battle/area/jan/actor/m_bush.c index a16a765e5a..6daa4a8b24 100644 --- a/src/battle/area_jan/actor/m_bush.c +++ b/src/battle/area/jan/actor/m_bush.c @@ -65,7 +65,7 @@ ActorPartBlueprint N(partsTable_8022193C)[] = { .defenseTable = N(defenseTable_8022187C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/area_jan/actor/medi_guy.c b/src/battle/area/jan/actor/medi_guy.c similarity index 100% rename from src/battle/area_jan/actor/medi_guy.c rename to src/battle/area/jan/actor/medi_guy.c diff --git a/src/battle/area_jan/actor/spear_guy.c b/src/battle/area/jan/actor/spear_guy.c similarity index 99% rename from src/battle/area_jan/actor/spear_guy.c rename to src/battle/area/jan/actor/spear_guy.c index fffab5574c..d493e700c3 100644 --- a/src/battle/area_jan/actor/spear_guy.c +++ b/src/battle/area/jan/actor/spear_guy.c @@ -129,8 +129,7 @@ ActorPartBlueprint N(partsTable_802187F0)[] = { .defenseTable = N(defenseTable_80218670), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_FRONT, .elementImmunityFlags = 0, - .unk_1C = 0xFD, - .unk_1D = 0xF8, + .projectileTargetOffset = { -3, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_NO_TARGET, @@ -142,8 +141,7 @@ ActorPartBlueprint N(partsTable_802187F0)[] = { .defenseTable = N(defenseTable_80218684), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -155,7 +153,7 @@ ActorPartBlueprint N(partsTable_802187F0)[] = { .defenseTable = N(defenseTable_80218684), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -167,7 +165,7 @@ ActorPartBlueprint N(partsTable_802187F0)[] = { .defenseTable = N(defenseTable_80218684), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -1118,11 +1116,11 @@ EvtScript N(idle_8021BFD8) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 14) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 13, 10, 13) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/area_jan/actor/spike_top.c b/src/battle/area/jan/actor/spike_top.c similarity index 100% rename from src/battle/area_jan/actor/spike_top.c rename to src/battle/area/jan/actor/spike_top.c diff --git a/src/battle/area_jan/area.c b/src/battle/area/jan/area.c similarity index 71% rename from src/battle/area_jan/area.c rename to src/battle/area/jan/area.c index d14e781775..9aa31cdc3d 100644 --- a/src/battle/area_jan/area.c +++ b/src/battle/area/jan/area.c @@ -19,129 +19,129 @@ extern Stage N(jan_03b); extern Stage N(jan_04); extern Stage N(jan_04b); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(spear_guy), .home = { .index = 1 }, .priority = 10, .var0 = 0 }, { .actor = &N(spear_guy), .home = { .index = 2 }, .priority = 9, .var0 = 1 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(spear_guy), .home = { .index = 0 }, .priority = 10, .var0 = 0 }, { .actor = &N(spear_guy), .home = { .index = 1 }, .priority = 9, .var0 = 1 }, { .actor = &N(spear_guy), .home = { .index = 2 }, .priority = 8, .var0 = 1 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(spear_guy), .home = { .index = 1 }, .priority = 10, .var0 = 0 }, { .actor = &N(jungle_fuzzy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(spear_guy), .home = { .index = 0 }, .priority = 10, .var0 = 0 }, { .actor = &N(jungle_fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(jungle_fuzzy), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(jungle_fuzzy), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(spear_guy), .home = { .index = 0 }, .priority = 10, .var0 = 0 }, { .actor = &N(jungle_fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(jungle_fuzzy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(spear_guy), .home = { .index = 0 }, .priority = 10, .var0 = 0 }, { .actor = &N(jungle_fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spear_guy), .home = { .index = 2 }, .priority = 8, .var0 = 1 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(spear_guy), .home = { .index = 0 }, .priority = 10, .var0 = 0 }, { .actor = &N(jungle_fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spear_guy), .home = { .index = 2 }, .priority = 8, .var0 = 1 }, { .actor = &N(jungle_fuzzy), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(spear_guy), .home = { .index = 0 }, .priority = 10, .var0 = 0 }, { .actor = &N(medi_guy), .home = { .index = 5 }, .priority = 9 }, { .actor = &N(spike_top), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(hurt_plant), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(hurt_plant), .home = { .index = 2 }, .priority = 10 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(hurt_plant), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(hurt_plant), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(hurt_plant), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(jungle_fuzzy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(jungle_fuzzy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(jungle_fuzzy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(jungle_fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(jungle_fuzzy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(jungle_fuzzy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(jungle_fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(jungle_fuzzy), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(jungle_fuzzy), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(jungle_fuzzy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spear_guy), .home = { .index = 1 }, .priority = 9, .var0 = 1 }, { .actor = &N(jungle_fuzzy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0E) = { +Formation N(Formation_0E) = { { .actor = &N(m_bush), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(m_bush), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0F) = { +Formation N(Formation_0F) = { { .actor = &N(m_bush), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(m_bush), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(m_bush), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_10) = { +Formation N(Formation_10) = { { .actor = &N(m_bush), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(m_bush), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(m_bush), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(m_bush), .home = { .index = 3 }, .priority = 7 }, }; -BattleList N(formationTable) = { - BATTLE("ヤリダンサーx2", N(formation_00), &N(jan_01)), - BATTLE("ヤリダンサーx3", N(formation_01), &N(jan_01)), - BATTLE("ヤリダンサー,トロピカル", N(formation_02), &N(jan_01)), - BATTLE("ヤリダンサー,トロピカルx３", N(formation_03), &N(jan_01)), - BATTLE("ヤリダンサー,トロピカルx２", N(formation_04), &N(jan_01)), - BATTLE("ヤリダンサー,トロピカル,ヤリダンサー", N(formation_05), &N(jan_01)), - BATTLE("ヤリダンサー,トロピカル,ヤリダンサー,トロピカル", N(formation_06), &N(jan_01)), - BATTLE("ヤリダンサー,かいふくヘイホー,トゲメット", N(formation_07), &N(jan_01)), - BATTLE("ピロリンそうだましx2", N(formation_08), &N(jan_01)), - BATTLE("ピロリンそうだましx3", N(formation_09), &N(jan_01)), - BATTLE("トロピカルx2", N(formation_0A), &N(jan_01)), - BATTLE("トロピカルx3", N(formation_0B), &N(jan_01)), - BATTLE("トロピカルx4", N(formation_0C), &N(jan_01)), - BATTLE("トロピカル,ヤリダンサー,トロピカル", N(formation_0D), &N(jan_01)), - BATTLE("ぎたいそうx2", N(formation_0E), &N(jan_01)), - BATTLE("ぎたいそうx3", N(formation_0F), &N(jan_01)), - BATTLE("ぎたいそうx4", N(formation_10), &N(jan_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(jan_01), "ヤリダンサーx2"), + BATTLE(N(Formation_01), &N(jan_01), "ヤリダンサーx3"), + BATTLE(N(Formation_02), &N(jan_01), "ヤリダンサー,トロピカル"), + BATTLE(N(Formation_03), &N(jan_01), "ヤリダンサー,トロピカルx３"), + BATTLE(N(Formation_04), &N(jan_01), "ヤリダンサー,トロピカルx２"), + BATTLE(N(Formation_05), &N(jan_01), "ヤリダンサー,トロピカル,ヤリダンサー"), + BATTLE(N(Formation_06), &N(jan_01), "ヤリダンサー,トロピカル,ヤリダンサー,トロピカル"), + BATTLE(N(Formation_07), &N(jan_01), "ヤリダンサー,かいふくヘイホー,トゲメット"), + BATTLE(N(Formation_08), &N(jan_01), "ピロリンそうだましx2"), + BATTLE(N(Formation_09), &N(jan_01), "ピロリンそうだましx3"), + BATTLE(N(Formation_0A), &N(jan_01), "トロピカルx2"), + BATTLE(N(Formation_0B), &N(jan_01), "トロピカルx3"), + BATTLE(N(Formation_0C), &N(jan_01), "トロピカルx4"), + BATTLE(N(Formation_0D), &N(jan_01), "トロピカル,ヤリダンサー,トロピカル"), + BATTLE(N(Formation_0E), &N(jan_01), "ぎたいそうx2"), + BATTLE(N(Formation_0F), &N(jan_01), "ぎたいそうx3"), + BATTLE(N(Formation_10), &N(jan_01), "ぎたいそうx4"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "jan_00", &N(jan_00) }, { "jan_01", &N(jan_01) }, { "jan_01b", &N(jan_01b) }, diff --git a/src/battle/area_jan/stage/jan_00.c b/src/battle/area/jan/stage/jan_00.c similarity index 100% rename from src/battle/area_jan/stage/jan_00.c rename to src/battle/area/jan/stage/jan_00.c diff --git a/src/battle/area_jan/stage/jan_01.c b/src/battle/area/jan/stage/jan_01.c similarity index 100% rename from src/battle/area_jan/stage/jan_01.c rename to src/battle/area/jan/stage/jan_01.c diff --git a/src/battle/area_jan/stage/jan_01b.c b/src/battle/area/jan/stage/jan_01b.c similarity index 100% rename from src/battle/area_jan/stage/jan_01b.c rename to src/battle/area/jan/stage/jan_01b.c diff --git a/src/battle/area_jan/stage/jan_02.c b/src/battle/area/jan/stage/jan_02.c similarity index 100% rename from src/battle/area_jan/stage/jan_02.c rename to src/battle/area/jan/stage/jan_02.c diff --git a/src/battle/area_jan/stage/jan_03.c b/src/battle/area/jan/stage/jan_03.c similarity index 100% rename from src/battle/area_jan/stage/jan_03.c rename to src/battle/area/jan/stage/jan_03.c diff --git a/src/battle/area_jan/stage/jan_03b.c b/src/battle/area/jan/stage/jan_03b.c similarity index 100% rename from src/battle/area_jan/stage/jan_03b.c rename to src/battle/area/jan/stage/jan_03b.c diff --git a/src/battle/area_jan/stage/jan_04.c b/src/battle/area/jan/stage/jan_04.c similarity index 100% rename from src/battle/area_jan/stage/jan_04.c rename to src/battle/area/jan/stage/jan_04.c diff --git a/src/battle/area_jan/stage/jan_04b.c b/src/battle/area/jan/stage/jan_04b.c similarity index 100% rename from src/battle/area_jan/stage/jan_04b.c rename to src/battle/area/jan/stage/jan_04b.c diff --git a/src/battle/area_jan2/actor/putrid_piranha.c b/src/battle/area/jan2/actor/putrid_piranha.c similarity index 100% rename from src/battle/area_jan2/actor/putrid_piranha.c rename to src/battle/area/jan2/actor/putrid_piranha.c diff --git a/src/battle/area_jan2/actor/white_magikoopa.c b/src/battle/area/jan2/actor/white_magikoopa.c similarity index 100% rename from src/battle/area_jan2/actor/white_magikoopa.c rename to src/battle/area/jan2/actor/white_magikoopa.c diff --git a/src/battle/area_jan2/area.c b/src/battle/area/jan2/area.c similarity index 74% rename from src/battle/area_jan2/area.c rename to src/battle/area/jan2/area.c index c9cde3a6b9..fbf2658a18 100644 --- a/src/battle/area_jan2/area.c +++ b/src/battle/area/jan2/area.c @@ -15,37 +15,37 @@ extern Stage N(jan_03b); extern Stage N(jan_04); extern Stage N(jan_04b); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(putrid_piranha), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(putrid_piranha), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(putrid_piranha), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(putrid_piranha), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(putrid_piranha), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(putrid_piranha), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(putrid_piranha), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(putrid_piranha), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(putrid_piranha), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(white_magikoopa), .home = { .index = 3 }, .priority = 7 }, }; -BattleList N(formationTable) = { - BATTLE("ポイズンパックン", N(formation_00), &N(jan_01)), - BATTLE("ポイズンパックンx２", N(formation_01), &N(jan_01)), - BATTLE("ポイズンパックンx３", N(formation_02), &N(jan_01)), - BATTLE("ポイズンパックンx３,ホワイトカメック", N(formation_03), &N(jan_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(jan_01), "ポイズンパックン"), + BATTLE(N(Formation_01), &N(jan_01), "ポイズンパックンx２"), + BATTLE(N(Formation_02), &N(jan_01), "ポイズンパックンx３"), + BATTLE(N(Formation_03), &N(jan_01), "ポイズンパックンx３,ホワイトカメック"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "jan_00", &N(jan_00) }, { "jan_01", &N(jan_01) }, { "jan_01b", &N(jan_01b) }, diff --git a/src/battle/area_jan2/stage/jan_00.c b/src/battle/area/jan2/stage/jan_00.c similarity index 100% rename from src/battle/area_jan2/stage/jan_00.c rename to src/battle/area/jan2/stage/jan_00.c diff --git a/src/battle/area_jan2/stage/jan_01.c b/src/battle/area/jan2/stage/jan_01.c similarity index 100% rename from src/battle/area_jan2/stage/jan_01.c rename to src/battle/area/jan2/stage/jan_01.c diff --git a/src/battle/area_jan2/stage/jan_01b.c b/src/battle/area/jan2/stage/jan_01b.c similarity index 100% rename from src/battle/area_jan2/stage/jan_01b.c rename to src/battle/area/jan2/stage/jan_01b.c diff --git a/src/battle/area_jan2/stage/jan_02.c b/src/battle/area/jan2/stage/jan_02.c similarity index 100% rename from src/battle/area_jan2/stage/jan_02.c rename to src/battle/area/jan2/stage/jan_02.c diff --git a/src/battle/area_jan2/stage/jan_03.c b/src/battle/area/jan2/stage/jan_03.c similarity index 100% rename from src/battle/area_jan2/stage/jan_03.c rename to src/battle/area/jan2/stage/jan_03.c diff --git a/src/battle/area_jan2/stage/jan_03b.c b/src/battle/area/jan2/stage/jan_03b.c similarity index 100% rename from src/battle/area_jan2/stage/jan_03b.c rename to src/battle/area/jan2/stage/jan_03b.c diff --git a/src/battle/area_jan2/stage/jan_04.c b/src/battle/area/jan2/stage/jan_04.c similarity index 100% rename from src/battle/area_jan2/stage/jan_04.c rename to src/battle/area/jan2/stage/jan_04.c diff --git a/src/battle/area_jan2/stage/jan_04b.c b/src/battle/area/jan2/stage/jan_04b.c similarity index 100% rename from src/battle/area_jan2/stage/jan_04b.c rename to src/battle/area/jan2/stage/jan_04b.c diff --git a/src/battle/area_kgr/actor/fuzzipede.c b/src/battle/area/kgr/actor/fuzzipede.c similarity index 99% rename from src/battle/area_kgr/actor/fuzzipede.c rename to src/battle/area/kgr/actor/fuzzipede.c index fe1dd5a2f8..93000a2164 100644 --- a/src/battle/area_kgr/actor/fuzzipede.c +++ b/src/battle/area/kgr/actor/fuzzipede.c @@ -81,8 +81,7 @@ ActorPartBlueprint N(partsTable_80218B00)[] = { .defenseTable = N(defenseTable_80218A48), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFE, - .unk_1D = 0xF6, + .projectileTargetOffset = { -2, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -94,8 +93,7 @@ ActorPartBlueprint N(partsTable_80218B00)[] = { .defenseTable = N(defenseTable_80218A48), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFE, - .unk_1D = 0xF6, + .projectileTargetOffset = { -2, -10 }, }, }; @@ -183,7 +181,7 @@ EvtScript N(80218D68) = { EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_802197FC))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_HP_OFFSET_BELOW, 0) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -2, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -2, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, 0) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 1) @@ -208,7 +206,7 @@ EvtScript N(80218FC8) = { EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_802197FC))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_HP_OFFSET_BELOW, 0) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -2, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -2, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, 1) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 0) @@ -266,7 +264,7 @@ EvtScript N(802191AC) = { EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80219ED4))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 2, 8) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 2, 8) EVT_CALL(N(UnkBattleFunc1), -10, -25, 10, -30) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, 1) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 0) @@ -413,7 +411,7 @@ EvtScript N(80219D68) = { EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_802197FC))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_HP_OFFSET_BELOW, 0) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -2, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -2, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) diff --git a/src/battle/area_kgr/area.c b/src/battle/area/kgr/area.c similarity index 64% rename from src/battle/area_kgr/area.c rename to src/battle/area/kgr/area.c index 100000454d..c04fc6989e 100644 --- a/src/battle/area_kgr/area.c +++ b/src/battle/area/kgr/area.c @@ -7,16 +7,16 @@ extern ActorBlueprint N(fuzzipede); extern Stage N(kgr_01); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(fuzzipede), .home = { .index = 2 }, .priority = 10 }, }; -BattleList N(formationTable) = { - BATTLE("ケムシ", N(formation_00), &N(kgr_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(kgr_01), "ケムシ"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "kgr_01", &N(kgr_01) }, {}, }; diff --git a/src/battle/area_kgr/stage/kgr_01.c b/src/battle/area/kgr/stage/kgr_01.c similarity index 100% rename from src/battle/area_kgr/stage/kgr_01.c rename to src/battle/area/kgr/stage/kgr_01.c diff --git a/src/battle/area_kkj/actor/kammy_koopa.c b/src/battle/area/kkj/actor/kammy_koopa.c similarity index 97% rename from src/battle/area_kkj/actor/kammy_koopa.c rename to src/battle/area/kkj/actor/kammy_koopa.c index ea621261da..eb601b366e 100644 --- a/src/battle/area_kkj/actor/kammy_koopa.c +++ b/src/battle/area/kkj/actor/kammy_koopa.c @@ -68,8 +68,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -81,8 +80,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -123,7 +121,7 @@ EvtScript N(init) = { s32 N(unknownCounter) = 0; -ApiStatus N(unknownFunction)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(unknownFunction)) { Actor* actor = get_actor(script->owner1.actorID); N(unknownCounter) += 9; @@ -179,7 +177,7 @@ EvtScript N(handleEvent) = { #include "world/common/todo/GetEntityPosition.inc.c" -ApiStatus N(BlockAppear)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(BlockAppear)) { Entity* entity = get_entity_by_index(script->varTable[9]); if (isInitialCall) { @@ -199,7 +197,7 @@ ApiStatus N(BlockAppear)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus func_8021833C_6DC0DC(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_8021833C_6DC0DC) { if (isInitialCall) { script->functionTemp[0] = 20; set_screen_overlay_center(1, 0, 0, 0); @@ -217,7 +215,7 @@ ApiStatus func_8021833C_6DC0DC(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802183EC_6DC18C(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802183EC_6DC18C) { if (isInitialCall) { script->functionTemp[0] = 30; set_screen_overlay_center(1, 0, 0, 0); @@ -235,7 +233,7 @@ ApiStatus func_802183EC_6DC18C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(DropBlock)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(DropBlock)) { CollisionStatus* collisionStatus = &gCollisionStatus; PlayerStatus* playerStatus = &gPlayerStatus; s32 entityIndex = script->varTable[9]; diff --git a/src/battle/area_kkj/area.c b/src/battle/area/kkj/area.c similarity index 59% rename from src/battle/area_kkj/area.c rename to src/battle/area/kkj/area.c index 272ded247e..378607230f 100644 --- a/src/battle/area_kkj/area.c +++ b/src/battle/area/kkj/area.c @@ -7,16 +7,16 @@ extern ActorBlueprint N(kammy_koopa); extern Stage N(kpa_05); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(kammy_koopa), .home = { .index = 6 }, .priority = 10, }, }; -BattleList N(formationTable) = { - BATTLE("カメックばば（ピーチ、ティンクせん）", N(formation_00), &N(kpa_05)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(kpa_05), "カメックばば（ピーチ、ティンクせん）"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "kpa_05", &N(kpa_05) }, {}, }; diff --git a/src/battle/area_kkj/stage/kpa_05.c b/src/battle/area/kkj/stage/kpa_05.c similarity index 100% rename from src/battle/area_kkj/stage/kpa_05.c rename to src/battle/area/kkj/stage/kpa_05.c diff --git a/src/battle/area_kmr_part_1/actor/goomba.c b/src/battle/area/kmr_part_1/actor/goomba.c similarity index 100% rename from src/battle/area_kmr_part_1/actor/goomba.c rename to src/battle/area/kmr_part_1/actor/goomba.c diff --git a/src/battle/area_kmr_part_1/actor/paragoomba.c b/src/battle/area/kmr_part_1/actor/paragoomba.c similarity index 100% rename from src/battle/area_kmr_part_1/actor/paragoomba.c rename to src/battle/area/kmr_part_1/actor/paragoomba.c diff --git a/src/battle/area_kmr_part_1/actor/spiked_goomba.c b/src/battle/area/kmr_part_1/actor/spiked_goomba.c similarity index 100% rename from src/battle/area_kmr_part_1/actor/spiked_goomba.c rename to src/battle/area/kmr_part_1/actor/spiked_goomba.c diff --git a/src/battle/area_kmr_part_1/area.c b/src/battle/area/kmr_part_1/area.c similarity index 63% rename from src/battle/area_kmr_part_1/area.c rename to src/battle/area/kmr_part_1/area.c index 6c59e7fed6..4f4d16c14b 100644 --- a/src/battle/area_kmr_part_1/area.c +++ b/src/battle/area/kmr_part_1/area.c @@ -13,86 +13,86 @@ extern Stage N(kmr_04); extern Stage N(kmr_05); extern Stage N(kmr_06); -Formation N(formation_00) = { +Formation N(Formation_00) = { { &N(goomba), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { &N(goomba), .home = { .index = 1 }, .priority = 10 }, { &N(goomba), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { &N(goomba), .home = { .index = 0 }, .priority = 10 }, { &N(goomba), .home = { .index = 1 }, .priority = 9 }, { &N(goomba), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { &N(goomba), .home = { .index = 1 }, .priority = 10 }, { &N(paragoomba), .home = { .index = 6 }, .priority = 9 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { &N(goomba), .home = { .index = 0 }, .priority = 10 }, { &N(goomba), .home = { .index = 1 }, .priority = 9 }, { &N(goomba), .home = { .index = 2 }, .priority = 8 }, { &N(goomba), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { &N(goomba), .home = { .index = 1 }, .priority = 10 }, { &N(spiked_goomba), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { &N(goomba), .home = { .index = 0 }, .priority = 10 }, { &N(paragoomba), .home = { .index = 5 }, .priority = 9 }, { &N(goomba), .home = { .index = 2 }, .priority = 8 }, { &N(paragoomba), .home = { .index = 7 }, .priority = 7 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { &N(paragoomba), .home = { .index = 5 }, .priority = 10 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { &N(paragoomba), .home = { .index = 5 }, .priority = 10 }, { &N(paragoomba), .home = { .index = 6 }, .priority = 9 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { &N(paragoomba), .home = { .index = 4 }, .priority = 10 }, { &N(paragoomba), .home = { .index = 5 }, .priority = 9 }, { &N(paragoomba), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { &N(spiked_goomba), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { &N(spiked_goomba), .home = { .index = 1 }, .priority = 10 }, { &N(goomba), .home = { .index = 2 }, .priority = 9 }, }; -BattleList N(formationTable) = { - BATTLE("クリボー", N(formation_00), &N(kmr_04)), - BATTLE("クリボーx２", N(formation_01), &N(kmr_04)), - BATTLE("クリボーx３", N(formation_02), &N(kmr_04)), - BATTLE("クリボー、パタクリボー", N(formation_03), &N(kmr_04)), - BATTLE("クリボーx４", N(formation_04), &N(kmr_04)), - BATTLE("クリボー,トゲクリボー", N(formation_05), &N(kmr_04)), - BATTLE("クリボー,パタクリボー,クリボー,パタクリボー", N(formation_06), &N(kmr_04)), - BATTLE("パタクリボー", N(formation_07), &N(kmr_04)), - BATTLE("パタクリボーx２", N(formation_08), &N(kmr_04)), - BATTLE("パタクリボーx３", N(formation_09), &N(kmr_04)), - BATTLE("トゲクリボー", N(formation_0A), &N(kmr_04)), - BATTLE("トゲクリボー、クリボー", N(formation_0B), &N(kmr_04)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(kmr_04), "クリボー"), + BATTLE(N(Formation_01), &N(kmr_04), "クリボーx２"), + BATTLE(N(Formation_02), &N(kmr_04), "クリボーx３"), + BATTLE(N(Formation_03), &N(kmr_04), "クリボー、パタクリボー"), + BATTLE(N(Formation_04), &N(kmr_04), "クリボーx４"), + BATTLE(N(Formation_05), &N(kmr_04), "クリボー,トゲクリボー"), + BATTLE(N(Formation_06), &N(kmr_04), "クリボー,パタクリボー,クリボー,パタクリボー"), + BATTLE(N(Formation_07), &N(kmr_04), "パタクリボー"), + BATTLE(N(Formation_08), &N(kmr_04), "パタクリボーx２"), + BATTLE(N(Formation_09), &N(kmr_04), "パタクリボーx３"), + BATTLE(N(Formation_0A), &N(kmr_04), "トゲクリボー"), + BATTLE(N(Formation_0B), &N(kmr_04), "トゲクリボー、クリボー"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "kmr_02", &N(kmr_02) }, { "kmr_03", &N(kmr_03) }, { "kmr_04", &N(kmr_04) }, diff --git a/src/battle/area_kmr_part_1/stage/kmr_02.c b/src/battle/area/kmr_part_1/stage/kmr_02.c similarity index 100% rename from src/battle/area_kmr_part_1/stage/kmr_02.c rename to src/battle/area/kmr_part_1/stage/kmr_02.c diff --git a/src/battle/area_kmr_part_1/stage/kmr_03.c b/src/battle/area/kmr_part_1/stage/kmr_03.c similarity index 100% rename from src/battle/area_kmr_part_1/stage/kmr_03.c rename to src/battle/area/kmr_part_1/stage/kmr_03.c diff --git a/src/battle/area_kmr_part_1/stage/kmr_04.c b/src/battle/area/kmr_part_1/stage/kmr_04.c similarity index 100% rename from src/battle/area_kmr_part_1/stage/kmr_04.c rename to src/battle/area/kmr_part_1/stage/kmr_04.c diff --git a/src/battle/area_kmr_part_1/stage/kmr_05.c b/src/battle/area/kmr_part_1/stage/kmr_05.c similarity index 100% rename from src/battle/area_kmr_part_1/stage/kmr_05.c rename to src/battle/area/kmr_part_1/stage/kmr_05.c diff --git a/src/battle/area_kmr_part_1/stage/kmr_06.c b/src/battle/area/kmr_part_1/stage/kmr_06.c similarity index 100% rename from src/battle/area_kmr_part_1/stage/kmr_06.c rename to src/battle/area/kmr_part_1/stage/kmr_06.c diff --git a/src/battle/area_kmr_part_2/actor/blue_goomba.c b/src/battle/area/kmr_part_2/actor/blue_goomba.c similarity index 99% rename from src/battle/area_kmr_part_2/actor/blue_goomba.c rename to src/battle/area/kmr_part_2/actor/blue_goomba.c index e57580349b..f4a763e792 100644 --- a/src/battle/area_kmr_part_2/actor/blue_goomba.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba.c @@ -54,7 +54,7 @@ ActorPartBlueprint N(partsTable_80219968)[] = { .defenseTable = N(defenseTable_802198B0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 253, + .projectileTargetOffset = { 0, -3 }, }, }; diff --git a/src/battle/area_kmr_part_2/actor/blue_goomba2.c b/src/battle/area/kmr_part_2/actor/blue_goomba2.c similarity index 99% rename from src/battle/area_kmr_part_2/actor/blue_goomba2.c rename to src/battle/area/kmr_part_2/actor/blue_goomba2.c index 5597e99ffb..6c05a67f54 100644 --- a/src/battle/area_kmr_part_2/actor/blue_goomba2.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba2.c @@ -52,7 +52,7 @@ ActorPartBlueprint N(partsTable_8021D4B8)[] = { .defenseTable = N(defenseTable_8021D400), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1D = 253, + .projectileTargetOffset = { 0, -3 }, }, }; diff --git a/src/battle/area_kmr_part_2/actor/goomba_king.c b/src/battle/area/kmr_part_2/actor/goomba_king.c similarity index 99% rename from src/battle/area_kmr_part_2/actor/goomba_king.c rename to src/battle/area/kmr_part_2/actor/goomba_king.c index 2e63fe4070..83cfdeb598 100644 --- a/src/battle/area_kmr_part_2/actor/goomba_king.c +++ b/src/battle/area/kmr_part_2/actor/goomba_king.c @@ -95,7 +95,7 @@ ActorPartBlueprint N(partsTable_802209C8)[] = { .defenseTable = N(defenseTable_80220910), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_20 | ACTOR_PART_FLAG_MULTI_TARGET, @@ -107,7 +107,7 @@ ActorPartBlueprint N(partsTable_802209C8)[] = { .defenseTable = N(defenseTable_80220910), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -145,7 +145,7 @@ ActorBlueprint NAMESPACE = { }; // Unused function -ApiStatus func_80218A60_43A4F0(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218A60_43A4F0) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); diff --git a/src/battle/area_kmr_part_2/actor/goomnut_tree.c b/src/battle/area/kmr_part_2/actor/goomnut_tree.c similarity index 98% rename from src/battle/area_kmr_part_2/actor/goomnut_tree.c rename to src/battle/area/kmr_part_2/actor/goomnut_tree.c index dbc6141ddf..8858e208df 100644 --- a/src/battle/area_kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area/kmr_part_2/actor/goomnut_tree.c @@ -59,7 +59,7 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .defenseTable = N(defenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -71,7 +71,7 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .defenseTable = N(defenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -83,7 +83,7 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .defenseTable = N(defenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -95,7 +95,7 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .defenseTable = N(defenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -107,7 +107,7 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .defenseTable = N(defenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_kmr_part_2/actor/red_goomba.c b/src/battle/area/kmr_part_2/actor/red_goomba.c similarity index 99% rename from src/battle/area_kmr_part_2/actor/red_goomba.c rename to src/battle/area/kmr_part_2/actor/red_goomba.c index cbf5f09bd1..6fd3f374a0 100644 --- a/src/battle/area_kmr_part_2/actor/red_goomba.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba.c @@ -54,7 +54,7 @@ ActorPartBlueprint N(partsTable_8021B778)[] = { .defenseTable = N(defenseTable_8021B6C0), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1D = 253, + .projectileTargetOffset = { 0, -3 }, }, }; diff --git a/src/battle/area_kmr_part_2/actor/red_goomba2.c b/src/battle/area/kmr_part_2/actor/red_goomba2.c similarity index 99% rename from src/battle/area_kmr_part_2/actor/red_goomba2.c rename to src/battle/area/kmr_part_2/actor/red_goomba2.c index 597e3a8e40..31aa215546 100644 --- a/src/battle/area_kmr_part_2/actor/red_goomba2.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba2.c @@ -52,7 +52,7 @@ ActorPartBlueprint N(partsTable_8021EEB8)[] = { .defenseTable = N(defenseTable_8021EE00), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1D = 253, + .projectileTargetOffset = { 0, -3 }, }, }; diff --git a/src/battle/area_kmr_part_2/area.c b/src/battle/area/kmr_part_2/area.c similarity index 81% rename from src/battle/area_kmr_part_2/area.c rename to src/battle/area/kmr_part_2/area.c index 85b1cb950c..84a82b1d60 100644 --- a/src/battle/area_kmr_part_2/area.c +++ b/src/battle/area/kmr_part_2/area.c @@ -20,7 +20,7 @@ extern Stage N(kmr_06); Vec3i N(pos00) = { 14, 0, -10 }; Vec3i N(pos01) = { 54, 0, 32 }; -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(blue_goomba), .home = { .vec = &N(pos00) }, .priority = 10 }, { .actor = &N(red_goomba), .home = { .vec = &N(pos01) }, .priority = 10 }, }; @@ -30,20 +30,20 @@ Vec3i N(pos03) = { 70, 0, 30 }; Vec3i N(pos04) = { 125, 0, 20 }; Vec3i N(pos05) = { -40, 0, -45 }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(goomba_king), .home = { .vec = &N(pos02) }, .priority = 10 }, { .actor = &N(red_goomba_2), .home = { .vec = &N(pos03) }, .priority = 10 }, { .actor = &N(blue_goomba_2), .home = { .vec = &N(pos04) }, .priority = 10 }, { .actor = &N(goomnut_tree), .home = { .vec = &N(pos05) }, .priority = 10 }, }; -BattleList N(formationTable) = { - BATTLE("クリレッド,クリブルー", N(formation_00), &N(kmr_03)), - BATTLE("クリキング,クリレッド,クリブルー", N(formation_01), &N(kmr_06)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(kmr_03), "クリレッド,クリブルー"), + BATTLE(N(Formation_01), &N(kmr_06), "クリキング,クリレッド,クリブルー"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "kmr_02", &N(kmr_02), }, { "kmr_03", &N(kmr_03), }, { "kmr_04", &N(kmr_04), }, diff --git a/src/battle/area_kmr_part_2/stage/kmr_02.c b/src/battle/area/kmr_part_2/stage/kmr_02.c similarity index 100% rename from src/battle/area_kmr_part_2/stage/kmr_02.c rename to src/battle/area/kmr_part_2/stage/kmr_02.c diff --git a/src/battle/area_kmr_part_2/stage/kmr_03.c b/src/battle/area/kmr_part_2/stage/kmr_03.c similarity index 100% rename from src/battle/area_kmr_part_2/stage/kmr_03.c rename to src/battle/area/kmr_part_2/stage/kmr_03.c diff --git a/src/battle/area_kmr_part_2/stage/kmr_04.c b/src/battle/area/kmr_part_2/stage/kmr_04.c similarity index 100% rename from src/battle/area_kmr_part_2/stage/kmr_04.c rename to src/battle/area/kmr_part_2/stage/kmr_04.c diff --git a/src/battle/area_kmr_part_2/stage/kmr_05.c b/src/battle/area/kmr_part_2/stage/kmr_05.c similarity index 100% rename from src/battle/area_kmr_part_2/stage/kmr_05.c rename to src/battle/area/kmr_part_2/stage/kmr_05.c diff --git a/src/battle/area_kmr_part_2/stage/kmr_06.c b/src/battle/area/kmr_part_2/stage/kmr_06.c similarity index 100% rename from src/battle/area_kmr_part_2/stage/kmr_06.c rename to src/battle/area/kmr_part_2/stage/kmr_06.c diff --git a/src/battle/area_kmr_part_3/actor/egg_jr_troopa.c b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c similarity index 99% rename from src/battle/area_kmr_part_3/actor/egg_jr_troopa.c rename to src/battle/area/kmr_part_3/actor/egg_jr_troopa.c index 9d15764079..998cbfb452 100644 --- a/src/battle/area_kmr_part_3/actor/egg_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c @@ -74,8 +74,7 @@ ActorPartBlueprint N(partsTable_802244C4)[] = { .defenseTable = N(defenseTable_8022440C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 5, - .unk_1D = 0xFC, + .projectileTargetOffset = { 5, -4 }, }, }; diff --git a/src/battle/area_kmr_part_3/actor/final_jr_troopa.c b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c similarity index 99% rename from src/battle/area_kmr_part_3/actor/final_jr_troopa.c rename to src/battle/area/kmr_part_3/actor/final_jr_troopa.c index 063f676933..574694a93f 100644 --- a/src/battle/area_kmr_part_3/actor/final_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c @@ -145,8 +145,7 @@ ActorPartBlueprint N(partsTable_8022C640)[] = { .defenseTable = N(defenseTable_8022C418), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFE, - .unk_1D = 0xFA, + .projectileTargetOffset = { -2, -6 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -158,7 +157,7 @@ ActorPartBlueprint N(partsTable_8022C640)[] = { .defenseTable = N(defenseTable_8022C424), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1D = 245, + .projectileTargetOffset = { 0, -11 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -170,8 +169,7 @@ ActorPartBlueprint N(partsTable_8022C640)[] = { .defenseTable = N(defenseTable_8022C430), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFE, - .unk_1D = 0xF9, + .projectileTargetOffset = { -2, -7 }, }, }; @@ -366,11 +364,11 @@ EvtScript N(idle_8022D058) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, 0x41000) EVT_CALL(SetTargetOffset, -127, 2, -15, 28) - EVT_CALL(func_8027D4C8, -127, 2, 4, -6) + EVT_CALL(SetProjectileTargetOffset, -127, 2, 4, -6) EVT_CALL(N(UnkBattleFunc1), -25, 27, -1, 27) EVT_ELSE EVT_CALL(SetTargetOffset, -127, 2, -8, 33) - EVT_CALL(func_8027D4C8, -127, 2, 0, -6) + EVT_CALL(SetProjectileTargetOffset, -127, 2, 0, -6) EVT_CALL(N(UnkBattleFunc1), -22, 30, 2, 28) EVT_END_IF EVT_CASE_DEFAULT @@ -905,7 +903,7 @@ EvtScript N(8022ED10) = { EVT_END }; -ApiStatus N(CalculateArcsinDeg)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(CalculateArcsinDeg)); EvtScript N(8022F468) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) diff --git a/src/battle/area_kmr_part_3/actor/jr_troopa.c b/src/battle/area/kmr_part_3/actor/jr_troopa.c similarity index 99% rename from src/battle/area_kmr_part_3/actor/jr_troopa.c rename to src/battle/area/kmr_part_3/actor/jr_troopa.c index 5d2a776d18..79fdb44208 100644 --- a/src/battle/area_kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/jr_troopa.c @@ -58,7 +58,7 @@ ActorPartBlueprint N(partsTable_80222AE4)[] = { .defenseTable = N(defenseTable_80222A2C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_kmr_part_3/actor/mage_jr_troopa.c b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c similarity index 99% rename from src/battle/area_kmr_part_3/actor/mage_jr_troopa.c rename to src/battle/area/kmr_part_3/actor/mage_jr_troopa.c index 420c99449c..c8a7d9def7 100644 --- a/src/battle/area_kmr_part_3/actor/mage_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c @@ -89,8 +89,7 @@ ActorPartBlueprint N(partsTable_8022A6E0)[] = { .defenseTable = N(defenseTable_8022A628), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFE, - .unk_1D = 0xF9, + .projectileTargetOffset = { -2, -7 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -102,7 +101,7 @@ ActorPartBlueprint N(partsTable_8022A6E0)[] = { .defenseTable = N(defenseTable_8022A628), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_kmr_part_3/actor/para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c similarity index 99% rename from src/battle/area_kmr_part_3/actor/para_jr_troopa.c rename to src/battle/area/kmr_part_3/actor/para_jr_troopa.c index 32b0480fe6..34d3efc3a7 100644 --- a/src/battle/area_kmr_part_3/actor/para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c @@ -76,7 +76,7 @@ ActorPartBlueprint N(partsTable_80225F0C)[] = { .defenseTable = N(defenseTable_80225E54), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 250, + .projectileTargetOffset = { 0, -6 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -88,7 +88,7 @@ ActorPartBlueprint N(partsTable_80225F0C)[] = { .defenseTable = N(defenseTable_80225E54), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -223,11 +223,11 @@ EvtScript N(idle_802265A0) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, 0x41000) EVT_CALL(SetTargetOffset, -127, 1, -12, 28) - EVT_CALL(func_8027D4C8, -127, 1, 4, -6) + EVT_CALL(SetProjectileTargetOffset, -127, 1, 4, -6) EVT_CALL(N(UnkBattleFunc1), -25, 27, -1, 27) EVT_ELSE EVT_CALL(SetTargetOffset, -127, 1, -5, 33) - EVT_CALL(func_8027D4C8, -127, 1, 0, -6) + EVT_CALL(SetProjectileTargetOffset, -127, 1, 0, -6) EVT_CALL(N(UnkBattleFunc1), -22, 30, 2, 28) EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/area_kmr_part_3/actor/paragoomba.c b/src/battle/area/kmr_part_3/actor/paragoomba.c similarity index 99% rename from src/battle/area_kmr_part_3/actor/paragoomba.c rename to src/battle/area/kmr_part_3/actor/paragoomba.c index 4a74d768e9..0ff227bcec 100644 --- a/src/battle/area_kmr_part_3/actor/paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/paragoomba.c @@ -86,7 +86,7 @@ ActorPartBlueprint N(partsTable)[] = { .defenseTable = N(defenseTable_8021C1B0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -98,7 +98,7 @@ ActorPartBlueprint N(partsTable)[] = { .defenseTable = N(defenseTable_8021C1BC), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -110,7 +110,7 @@ ActorPartBlueprint N(partsTable)[] = { .defenseTable = N(defenseTable_8021C1B0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -122,7 +122,7 @@ ActorPartBlueprint N(partsTable)[] = { .defenseTable = N(defenseTable_8021C1B0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/area_kmr_part_3/actor/paragoomba2.c b/src/battle/area/kmr_part_3/actor/paragoomba2.c similarity index 100% rename from src/battle/area_kmr_part_3/actor/paragoomba2.c rename to src/battle/area/kmr_part_3/actor/paragoomba2.c diff --git a/src/battle/area_kmr_part_3/actor/spiked_goomba.c b/src/battle/area/kmr_part_3/actor/spiked_goomba.c similarity index 99% rename from src/battle/area_kmr_part_3/actor/spiked_goomba.c rename to src/battle/area/kmr_part_3/actor/spiked_goomba.c index 5786528eff..4e65dbf6d9 100644 --- a/src/battle/area_kmr_part_3/actor/spiked_goomba.c +++ b/src/battle/area/kmr_part_3/actor/spiked_goomba.c @@ -52,7 +52,7 @@ ActorPartBlueprint N(partsTable_8021A448)[] = { .defenseTable = N(defenseTable_8021A390), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1D = 244, + .projectileTargetOffset = { 0, -12 }, }, }; diff --git a/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c similarity index 99% rename from src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c rename to src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c index 8085d97f51..163ca161d7 100644 --- a/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c @@ -70,7 +70,7 @@ ActorPartBlueprint N(partsTable_80228014)[] = { .defenseTable = N(defenseTable_80227F5C), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1D = 245, + .projectileTargetOffset = { 0, -11 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -82,7 +82,7 @@ ActorPartBlueprint N(partsTable_80228014)[] = { .defenseTable = N(defenseTable_80227F5C), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -218,11 +218,11 @@ EvtScript N(idle_802286C0) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, 0x41000) EVT_CALL(SetTargetOffset, -127, 1, -15, 28) - EVT_CALL(func_8027D4C8, -127, 1, 4, -6) + EVT_CALL(SetProjectileTargetOffset, -127, 1, 4, -6) EVT_CALL(N(UnkBattleFunc1), -25, 27, -1, 27) EVT_ELSE EVT_CALL(SetTargetOffset, -127, 1, -8, 33) - EVT_CALL(func_8027D4C8, -127, 1, 0, -6) + EVT_CALL(SetProjectileTargetOffset, -127, 1, 0, -6) EVT_CALL(N(UnkBattleFunc1), -22, 30, 2, 28) EVT_END_IF EVT_WAIT(1) @@ -541,7 +541,7 @@ EvtScript N(takeTurn_8022936C) = { EVT_END }; -ApiStatus func_802189DC_447E1C(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802189DC_447E1C) { Bytecode* args = script->ptrReadPos; f32 posX = evt_get_float_variable(script, *args++); f32 posY = evt_get_float_variable(script, *args++); diff --git a/src/battle/area_kmr_part_3/area.c b/src/battle/area/kmr_part_3/area.c similarity index 65% rename from src/battle/area_kmr_part_3/area.c rename to src/battle/area/kmr_part_3/area.c index b7e183f695..2a9790be7f 100644 --- a/src/battle/area_kmr_part_3/area.c +++ b/src/battle/area/kmr_part_3/area.c @@ -24,52 +24,52 @@ extern Stage N(sam_01); extern Stage N(mac_01); extern Stage N(kpa_01); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(spiked_goomba), .home = { .index = 2 }, .priority = 0 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(paragoomba2), .home = { .index = 5 }, .priority = 10 }, { .actor = &N(paragoomba1), .home = { .index = 6 }, .priority = 9 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(jr_troopa), .home = { .index = 2 }, .priority = 0 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(egg_jr_troopa), .home = { .index = 2 }, .priority = 0 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(para_jr_troopa), .home = { .index = 2 }, .priority = 0 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(spiked_para_jr_troopa), .home = { .index = 1 }, .priority = 0 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(mage_jr_troopa), .home = { .index = 2 }, .priority = 0 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(final_jr_troopa), .home = { .index = 2 }, .priority = 0 }, }; -BattleList N(formationTable) = { - BATTLE("トゲクリボー（レクチャー）", N(formation_00), &N(kmr_03)), - BATTLE("パタクリボー（レクチャー）", N(formation_01), &N(kmr_03)), - BATTLE("コワッパ１", N(formation_02), &N(kmr_05)), - BATTLE("コワッパ２", N(formation_03), &N(nok_01)), - BATTLE("コワッパ４", N(formation_04), &N(mim_01)), - BATTLE("コワッパ５", N(formation_05), &N(mac_01)), - BATTLE("コワッパ６", N(formation_06), &N(sam_01)), - BATTLE("コワッパ７", N(formation_07), &N(kpa_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(kmr_03), "トゲクリボー（レクチャー）"), + BATTLE(N(Formation_01), &N(kmr_03), "パタクリボー（レクチャー）"), + BATTLE(N(Formation_02), &N(kmr_05), "コワッパ１"), + BATTLE(N(Formation_03), &N(nok_01), "コワッパ２"), + BATTLE(N(Formation_04), &N(mim_01), "コワッパ４"), + BATTLE(N(Formation_05), &N(mac_01), "コワッパ５"), + BATTLE(N(Formation_06), &N(sam_01), "コワッパ６"), + BATTLE(N(Formation_07), &N(kpa_01), "コワッパ７"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "kmr_02", &N(kmr_02) }, { "kmr_03", &N(kmr_03) }, { "kmr_04", &N(kmr_04) }, diff --git a/src/battle/area_kmr_part_3/stage/kmr_02.c b/src/battle/area/kmr_part_3/stage/kmr_02.c similarity index 100% rename from src/battle/area_kmr_part_3/stage/kmr_02.c rename to src/battle/area/kmr_part_3/stage/kmr_02.c diff --git a/src/battle/area_kmr_part_3/stage/kmr_03.c b/src/battle/area/kmr_part_3/stage/kmr_03.c similarity index 100% rename from src/battle/area_kmr_part_3/stage/kmr_03.c rename to src/battle/area/kmr_part_3/stage/kmr_03.c diff --git a/src/battle/area_kmr_part_3/stage/kmr_04.c b/src/battle/area/kmr_part_3/stage/kmr_04.c similarity index 100% rename from src/battle/area_kmr_part_3/stage/kmr_04.c rename to src/battle/area/kmr_part_3/stage/kmr_04.c diff --git a/src/battle/area_kmr_part_3/stage/kmr_05.c b/src/battle/area/kmr_part_3/stage/kmr_05.c similarity index 100% rename from src/battle/area_kmr_part_3/stage/kmr_05.c rename to src/battle/area/kmr_part_3/stage/kmr_05.c diff --git a/src/battle/area_kmr_part_3/stage/kmr_06.c b/src/battle/area/kmr_part_3/stage/kmr_06.c similarity index 100% rename from src/battle/area_kmr_part_3/stage/kmr_06.c rename to src/battle/area/kmr_part_3/stage/kmr_06.c diff --git a/src/battle/area_kmr_part_3/stage/kpa_01.c b/src/battle/area/kmr_part_3/stage/kpa_01.c similarity index 100% rename from src/battle/area_kmr_part_3/stage/kpa_01.c rename to src/battle/area/kmr_part_3/stage/kpa_01.c diff --git a/src/battle/area_kmr_part_3/stage/mac_01.c b/src/battle/area/kmr_part_3/stage/mac_01.c similarity index 100% rename from src/battle/area_kmr_part_3/stage/mac_01.c rename to src/battle/area/kmr_part_3/stage/mac_01.c diff --git a/src/battle/area_kmr_part_3/stage/mim_01.c b/src/battle/area/kmr_part_3/stage/mim_01.c similarity index 100% rename from src/battle/area_kmr_part_3/stage/mim_01.c rename to src/battle/area/kmr_part_3/stage/mim_01.c diff --git a/src/battle/area_kmr_part_3/stage/nok_01.c b/src/battle/area/kmr_part_3/stage/nok_01.c similarity index 100% rename from src/battle/area_kmr_part_3/stage/nok_01.c rename to src/battle/area/kmr_part_3/stage/nok_01.c diff --git a/src/battle/area_kmr_part_3/stage/sam_01.c b/src/battle/area/kmr_part_3/stage/sam_01.c similarity index 100% rename from src/battle/area_kmr_part_3/stage/sam_01.c rename to src/battle/area/kmr_part_3/stage/sam_01.c diff --git a/src/battle/area_kpa/actor/bony_beetle.c b/src/battle/area/kpa/actor/bony_beetle.c similarity index 99% rename from src/battle/area_kpa/actor/bony_beetle.c rename to src/battle/area/kpa/actor/bony_beetle.c index 03c071253b..17cf231639 100644 --- a/src/battle/area_kpa/actor/bony_beetle.c +++ b/src/battle/area/kpa/actor/bony_beetle.c @@ -131,8 +131,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, }; @@ -189,7 +188,7 @@ EvtScript N(init) = { EVT_END_IF EVT_END_IF EVT_END_IF -EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -8) +EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -8) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 21) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) @@ -330,7 +329,7 @@ EvtScript N(handleEvent_normal) = { EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_FLIPPED)) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -8) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -8) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 21) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), 1) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) @@ -552,7 +551,7 @@ EvtScript N(handleEvent_spiky) = { EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_SPIKY_FLIPPED)) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -8) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -8) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 21) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), 1) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) @@ -866,7 +865,7 @@ EvtScript N(8021B7C8) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -8) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -8) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 21) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim06) @@ -928,7 +927,7 @@ EvtScript N(handleEvent_flipped) = { EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_FLIPPED)) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -8) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -8) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 21) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), 1) @@ -1060,7 +1059,7 @@ EvtScript N(handleEvent_spiky_flipped) = { EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_SPIKY_FLIPPED)) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -8) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -8) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 21) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), 1) diff --git a/src/battle/area_kpa/actor/dry_bones.c b/src/battle/area/kpa/actor/dry_bones.c similarity index 97% rename from src/battle/area_kpa/actor/dry_bones.c rename to src/battle/area/kpa/actor/dry_bones.c index 3a2417e87e..f79debe240 100644 --- a/src/battle/area_kpa/actor/dry_bones.c +++ b/src/battle/area/kpa/actor/dry_bones.c @@ -109,8 +109,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -1, - .unk_1D = -10, + .projectileTargetOffset = { -1, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -122,8 +121,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -211,19 +209,19 @@ EvtScript N(idle) = { EVT_SWITCH(LVar1) EVT_CASE_FLAG(STATUS_FLAG_SLEEP) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -6, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 1, -5) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 1, -5) EVT_CASE_DEFAULT EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -8, 30) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -10) EVT_END_SWITCH EVT_CASE_EQ(1) EVT_SWITCH(LVar1) EVT_CASE_FLAG(STATUS_FLAG_SLEEP) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -1, 10) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CASE_DEFAULT EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -1, 10) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_END_SWITCH EVT_END_SWITCH EVT_WAIT(1) @@ -242,7 +240,7 @@ EvtScript N(reassemble) = { EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_dead))) EVT_CALL(ClearStatusEffects, ACTOR_SELF) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -1, 10) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(RandInt, 0, LVar0) EVT_ADD(LVar0, 2) EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0) @@ -451,7 +449,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_2000, 0) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -8, 30) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -10) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0) EVT_CALL(SetEnemyHP, ACTOR_SELF, LVar0) EVT_ELSE diff --git a/src/battle/area_kpa/actor/ember.c b/src/battle/area/kpa/actor/ember.c similarity index 100% rename from src/battle/area_kpa/actor/ember.c rename to src/battle/area/kpa/actor/ember.c diff --git a/src/battle/area_kpa/actor/hammer_bro.c b/src/battle/area/kpa/actor/hammer_bro.c similarity index 100% rename from src/battle/area_kpa/actor/hammer_bro.c rename to src/battle/area/kpa/actor/hammer_bro.c diff --git a/src/battle/area_kpa/actor/koopatrol.c b/src/battle/area/kpa/actor/koopatrol.c similarity index 100% rename from src/battle/area_kpa/actor/koopatrol.c rename to src/battle/area/kpa/actor/koopatrol.c diff --git a/src/battle/area_kpa/actor/magikoopa.c b/src/battle/area/kpa/actor/magikoopa.c similarity index 100% rename from src/battle/area_kpa/actor/magikoopa.c rename to src/battle/area/kpa/actor/magikoopa.c diff --git a/src/battle/area_kpa/area.c b/src/battle/area/kpa/area.c similarity index 68% rename from src/battle/area_kpa/area.c rename to src/battle/area/kpa/area.c index a3ccfb780b..3889884602 100644 --- a/src/battle/area_kpa/area.c +++ b/src/battle/area/kpa/area.c @@ -26,425 +26,425 @@ extern Stage N(kpa_11); extern Stage N(kpa_13); extern Stage N(kpa_14); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(bony_beetle), .home = { .index = 1 }, .priority = 10, .var0 = 1, }, { .actor = &N(bony_beetle), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(bony_beetle), .home = { .index = 0 }, .priority = 10, .var0 = 1, }, { .actor = &N(bony_beetle), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(bony_beetle), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(bony_beetle), .home = { .index = 0 }, .priority = 10, .var0 = 1, }, { .actor = &N(dry_bones), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(dry_bones), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(bony_beetle), .home = { .index = 0 }, .priority = 10, .var0 = 1, }, { .actor = &N(bony_beetle), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(dry_bones), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(bony_beetle), .home = { .index = 0 }, .priority = 10, .var0 = 1, }, { .actor = &N(bony_beetle), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(magikoopa), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(bony_beetle), .home = { .index = 0 }, .priority = 10, .var0 = 1, }, { .actor = &N(bony_beetle), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(bony_beetle), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(magikoopa), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(bony_beetle), .home = { .index = 0 }, .priority = 10, .var0 = 1, }, { .actor = &N(dry_bones), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(bony_beetle), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(magikoopa), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(dry_bones), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(dry_bones), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(dry_bones), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(dry_bones), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(dry_bones), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(dry_bones), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(dry_bones), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(dry_bones), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(dry_bones), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(dry_bones), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(ember), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(ember), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(ember), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(dry_bones), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(dry_bones), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(magikoopa), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(dry_bones), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(koopatrol), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(dry_bones), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(dry_bones), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(bony_beetle), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_0E) = { +Formation N(Formation_0E) = { { .actor = &N(dry_bones), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(dry_bones), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(bony_beetle), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(bony_beetle), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_0F) = { +Formation N(Formation_0F) = { { .actor = &N(hammer_bro), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(hammer_bro), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_10) = { +Formation N(Formation_10) = { { .actor = &N(hammer_bro), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(hammer_bro), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(hammer_bro), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_11) = { +Formation N(Formation_11) = { { .actor = &N(hammer_bro), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(koopatrol), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_12) = { +Formation N(Formation_12) = { { .actor = &N(hammer_bro), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(hammer_bro), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(koopatrol), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_13) = { +Formation N(Formation_13) = { { .actor = &N(hammer_bro), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(koopatrol), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_14) = { +Formation N(Formation_14) = { { .actor = &N(hammer_bro), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(dry_bones), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(hammer_bro), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(magikoopa), .home = { .index = 3 }, .priority = 9, }, }; -Formation N(formation_15) = { +Formation N(Formation_15) = { { .actor = &N(hammer_bro), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(hammer_bro), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(magikoopa_flying), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_16) = { +Formation N(Formation_16) = { { .actor = &N(hammer_bro), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(hammer_bro), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(hammer_bro), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(magikoopa_flying), .home = { .index = 7 }, .priority = 9, }, }; -Formation N(formation_17) = { +Formation N(Formation_17) = { { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 10, }, }; -Formation N(formation_18) = { +Formation N(Formation_18) = { { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(koopatrol), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_19) = { +Formation N(Formation_19) = { { .actor = &N(koopatrol), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(koopatrol), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_1A) = { +Formation N(Formation_1A) = { { .actor = &N(koopatrol), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(koopatrol), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(koopatrol), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_1B) = { +Formation N(Formation_1B) = { { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(hammer_bro), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_1C) = { +Formation N(Formation_1C) = { { .actor = &N(koopatrol), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(hammer_bro), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(koopatrol), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(hammer_bro), .home = { .index = 3 }, .priority = 7, }, }; -Vec3i N(formation_1D_pos1) = { 5, 0, -20 }; +Vec3i N(Formation_1D_pos1) = { 5, 0, -20 }; -Vec3i N(formation_1D_pos2) = { 45, 0, -10 }; +Vec3i N(Formation_1D_pos2) = { 45, 0, -10 }; -Vec3i N(formation_1D_pos3) = { 85, 0, 0 }; +Vec3i N(Formation_1D_pos3) = { 85, 0, 0 }; -Vec3i N(formation_1D_pos4) = { 125, 0, 5 }; +Vec3i N(Formation_1D_pos4) = { 125, 0, 5 }; -Formation N(formation_1D) = { - { .actor = &N(koopatrol), .home = { .vec = &N(formation_1D_pos1) }, .priority = 10, }, - { .actor = &N(koopatrol), .home = { .vec = &N(formation_1D_pos2) }, .priority = 9, }, - { .actor = &N(koopatrol), .home = { .vec = &N(formation_1D_pos3) }, .priority = 8, }, - { .actor = &N(magikoopa), .home = { .vec = &N(formation_1D_pos4) }, .priority = 7, }, +Formation N(Formation_1D) = { + { .actor = &N(koopatrol), .home = { .vec = &N(Formation_1D_pos1) }, .priority = 10, }, + { .actor = &N(koopatrol), .home = { .vec = &N(Formation_1D_pos2) }, .priority = 9, }, + { .actor = &N(koopatrol), .home = { .vec = &N(Formation_1D_pos3) }, .priority = 8, }, + { .actor = &N(magikoopa), .home = { .vec = &N(Formation_1D_pos4) }, .priority = 7, }, }; -Formation N(formation_1E) = { +Formation N(Formation_1E) = { { .actor = &N(koopatrol), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(magikoopa), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(magikoopa), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_1F) = { +Formation N(Formation_1F) = { { .actor = &N(koopatrol), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(hammer_bro), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(magikoopa), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(magikoopa), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_20) = { +Formation N(Formation_20) = { { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(bony_beetle), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_21) = { +Formation N(Formation_21) = { { .actor = &N(koopatrol), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(bony_beetle), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_22) = { +Formation N(Formation_22) = { { .actor = &N(koopatrol), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(bony_beetle), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(bony_beetle), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_23) = { +Formation N(Formation_23) = { { .actor = &N(koopatrol), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(bony_beetle), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(koopatrol), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_24) = { +Formation N(Formation_24) = { { .actor = &N(koopatrol), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(dry_bones), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(dry_bones), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_25) = { +Formation N(Formation_25) = { { .actor = &N(koopatrol), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(magikoopa), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(magikoopa_flying), .home = { .index = 7 }, .priority = 7, }, }; -Formation N(formation_26) = { +Formation N(Formation_26) = { { .actor = &N(koopatrol), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(magikoopa), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(koopatrol), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(magikoopa), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_27) = { +Formation N(Formation_27) = { { .actor = &N(magikoopa), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(magikoopa), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_28) = { +Formation N(Formation_28) = { { .actor = &N(magikoopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(magikoopa), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(magikoopa), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_29) = { +Formation N(Formation_29) = { { .actor = &N(magikoopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(magikoopa_flying), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(magikoopa_flying), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_2A) = { +Formation N(Formation_2A) = { { .actor = &N(magikoopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(magikoopa), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(magikoopa_flying), .home = { .index = 6 }, .priority = 8, }, { .actor = &N(magikoopa_flying), .home = { .index = 7 }, .priority = 7, }, }; -Formation N(formation_2B) = { +Formation N(Formation_2B) = { { .actor = &N(magikoopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(koopatrol), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(koopatrol), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_2C) = { +Formation N(Formation_2C) = { { .actor = &N(magikoopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(magikoopa), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(dry_bones), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_2D) = { +Formation N(Formation_2D) = { { .actor = &N(magikoopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(bony_beetle), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(magikoopa), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_2E) = { +Formation N(Formation_2E) = { { .actor = &N(magikoopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(bony_beetle), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(bony_beetle), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(magikoopa), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_2F) = { +Formation N(Formation_2F) = { { .actor = &N(magikoopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(magikoopa), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(magikoopa_flying), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_30) = { +Formation N(Formation_30) = { { .actor = &N(magikoopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(magikoopa), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(koopatrol), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_31) = { +Formation N(Formation_31) = { { .actor = &N(magikoopa_flying), .home = { .index = 5 }, .priority = 10, }, { .actor = &N(magikoopa_flying), .home = { .index = 6 }, .priority = 9, }, }; -Formation N(formation_32) = { +Formation N(Formation_32) = { { .actor = &N(magikoopa_flying), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(magikoopa_flying), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(magikoopa_flying), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_33) = { +Formation N(Formation_33) = { { .actor = &N(magikoopa_flying), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(magikoopa), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(magikoopa_flying), .home = { .index = 6 }, .priority = 8, }, { .actor = &N(magikoopa), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_34) = { +Formation N(Formation_34) = { { .actor = &N(magikoopa_flying), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(koopatrol), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_35) = { +Formation N(Formation_35) = { { .actor = &N(magikoopa_flying), .home = { .index = 5 }, .priority = 10, }, { .actor = &N(hammer_bro), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_36) = { +Formation N(Formation_36) = { { .actor = &N(magikoopa_flying), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(dry_bones), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(dry_bones), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_37) = { +Formation N(Formation_37) = { { .actor = &N(magikoopa_flying), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(magikoopa_flying), .home = { .index = 6 }, .priority = 9, }, }; -Formation N(formation_38) = { +Formation N(Formation_38) = { { .actor = &N(magikoopa_flying), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(hammer_bro), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(hammer_bro), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(magikoopa_flying), .home = { .index = 7 }, .priority = 7, }, }; -BattleList N(formationTable) = { - BATTLE("ホネメットx２", N(formation_00), &N(kpa_01)), - BATTLE("ホネメットx３", N(formation_01), &N(kpa_01)), - BATTLE("ホネメット,カロンx２", N(formation_02), &N(kpa_01)), - BATTLE("ホネメットx２,カロン", N(formation_03), &N(kpa_01)), - BATTLE("ホネメットx２,カメック", N(formation_04), &N(kpa_01)), - BATTLE("ホネメットx３,カメック", N(formation_05), &N(kpa_01)), - BATTLE("ホネメット,カロン,ホネメット,カメック", N(formation_06), &N(kpa_01)), - BATTLE("カロンx２", N(formation_07), &N(kpa_01)), - BATTLE("カロンx３", N(formation_08), &N(kpa_01)), - BATTLE("カロンx４", N(formation_09), &N(kpa_01)), - BATTLE("カロン,エルモスx３", N(formation_0A), &N(kpa_01)), - BATTLE("カロンx２,カメック", N(formation_0B), &N(kpa_01)), - BATTLE("カロン,トゲノコx２", N(formation_0C), &N(kpa_01)), - BATTLE("カロンx２,ホネメット", N(formation_0D), &N(kpa_01)), - BATTLE("カロンx２,ホネメットx２", N(formation_0E), &N(kpa_01)), - BATTLE("ハンマーブロスx２", N(formation_0F), &N(kpa_01)), - BATTLE("ハンマーブロスx３", N(formation_10), &N(kpa_01)), - BATTLE("ハンマーブロス,トゲノコ", N(formation_11), &N(kpa_01)), - BATTLE("ハンマーブロスx２,トゲノコ", N(formation_12), &N(kpa_01)), - BATTLE("ハンマーブロス,トゲノコx２", N(formation_13), &N(kpa_01)), - BATTLE("ハンマーブロス,カロン,ハンンマーブロス,カメック", N(formation_14), &N(kpa_01)), - BATTLE("ハンマーブロスx２,くうちゅうカメック", N(formation_15), &N(kpa_01)), - BATTLE("ハンマーブロスx３,くうちゅうカメック", N(formation_16), &N(kpa_01)), - BATTLE("トゲノコ", N(formation_17), &N(kpa_01)), - BATTLE("トゲノコx２", N(formation_18), &N(kpa_01)), - BATTLE("トゲノコx３", N(formation_19), &N(kpa_01)), - BATTLE("トゲノコx４", N(formation_1A), &N(kpa_01)), - BATTLE("トゲノコ,ハンマーブロス", N(formation_1B), &N(kpa_01)), - BATTLE("トゲノコ,ハンマーブロス,トゲノコ,ハンマーブロス", N(formation_1C), &N(kpa_01)), - BATTLE("トゲノコx３,カメック", N(formation_1D), &N(kpa_01)), - BATTLE("トゲノコx２,カメックx２", N(formation_1E), &N(kpa_01)), - BATTLE("トゲノコ,ホネメット", N(formation_20), &N(kpa_01)), - BATTLE("トゲノコx２,ホネメット", N(formation_21), &N(kpa_01)), - BATTLE("トゲノコ,ホネメットx２", N(formation_22), &N(kpa_01)), - BATTLE("トゲノコ,ホネメット,トゲノコ", N(formation_23), &N(kpa_01)), - BATTLE("トゲノコ,カロンx２", N(formation_24), &N(kpa_01)), - BATTLE("トゲノコx２,カメック,くうちゅうカメック", N(formation_25), &N(kpa_01)), - BATTLE("トゲノコ,カメック,トゲノコ,カメック", N(formation_26), &N(kpa_01)), - BATTLE("カメックx２", N(formation_27), &N(kpa_01)), - BATTLE("カメックx３", N(formation_28), &N(kpa_01)), - BATTLE("カメック,くうちゅうカメックx２", N(formation_29), &N(kpa_01)), - BATTLE("カメックx２,くうちゅうカメックx２", N(formation_2A), &N(kpa_01)), - BATTLE("カメック,トゲノコx３", N(formation_2B), &N(kpa_01)), - BATTLE("カメックx２,カロン", N(formation_2C), &N(kpa_01)), - BATTLE("カメック,ホネメット,カメック", N(formation_2D), &N(kpa_01)), - BATTLE("カメック,ホネメットx２,カメック", N(formation_2E), &N(kpa_01)), - BATTLE("カメックx２,くうちゅうカメック", N(formation_2F), &N(kpa_01)), - BATTLE("カメック,トゲノコ,カメック,トゲノコ", N(formation_30), &N(kpa_01)), - BATTLE("くうちゅうカメックx２", N(formation_31), &N(kpa_01)), - BATTLE("くうちゅうカメックx３", N(formation_32), &N(kpa_01)), - BATTLE("くうちゅうカメック,カメック,くうちゅうカメック,カメック", N(formation_33), &N(kpa_01)), - BATTLE("くうちゅうカメック,トゲノコx２", N(formation_34), &N(kpa_01)), - BATTLE("くうちゅうカメック,ハンマーブロス", N(formation_35), &N(kpa_01)), - BATTLE("くうちゅうカメック,カロンx２", N(formation_36), &N(kpa_01)), - BATTLE("くうちゅうカメック,トゲノコ,くうちゅうカメック", N(formation_37), &N(kpa_01)), - BATTLE("くうちゅうカメック,ハンマーブロスx２,くうちゅうカメック", N(formation_38), &N(kpa_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(kpa_01), "ホネメットx２"), + BATTLE(N(Formation_01), &N(kpa_01), "ホネメットx３"), + BATTLE(N(Formation_02), &N(kpa_01), "ホネメット,カロンx２"), + BATTLE(N(Formation_03), &N(kpa_01), "ホネメットx２,カロン"), + BATTLE(N(Formation_04), &N(kpa_01), "ホネメットx２,カメック"), + BATTLE(N(Formation_05), &N(kpa_01), "ホネメットx３,カメック"), + BATTLE(N(Formation_06), &N(kpa_01), "ホネメット,カロン,ホネメット,カメック"), + BATTLE(N(Formation_07), &N(kpa_01), "カロンx２"), + BATTLE(N(Formation_08), &N(kpa_01), "カロンx３"), + BATTLE(N(Formation_09), &N(kpa_01), "カロンx４"), + BATTLE(N(Formation_0A), &N(kpa_01), "カロン,エルモスx３"), + BATTLE(N(Formation_0B), &N(kpa_01), "カロンx２,カメック"), + BATTLE(N(Formation_0C), &N(kpa_01), "カロン,トゲノコx２"), + BATTLE(N(Formation_0D), &N(kpa_01), "カロンx２,ホネメット"), + BATTLE(N(Formation_0E), &N(kpa_01), "カロンx２,ホネメットx２"), + BATTLE(N(Formation_0F), &N(kpa_01), "ハンマーブロスx２"), + BATTLE(N(Formation_10), &N(kpa_01), "ハンマーブロスx３"), + BATTLE(N(Formation_11), &N(kpa_01), "ハンマーブロス,トゲノコ"), + BATTLE(N(Formation_12), &N(kpa_01), "ハンマーブロスx２,トゲノコ"), + BATTLE(N(Formation_13), &N(kpa_01), "ハンマーブロス,トゲノコx２"), + BATTLE(N(Formation_14), &N(kpa_01), "ハンマーブロス,カロン,ハンンマーブロス,カメック"), + BATTLE(N(Formation_15), &N(kpa_01), "ハンマーブロスx２,くうちゅうカメック"), + BATTLE(N(Formation_16), &N(kpa_01), "ハンマーブロスx３,くうちゅうカメック"), + BATTLE(N(Formation_17), &N(kpa_01), "トゲノコ"), + BATTLE(N(Formation_18), &N(kpa_01), "トゲノコx２"), + BATTLE(N(Formation_19), &N(kpa_01), "トゲノコx３"), + BATTLE(N(Formation_1A), &N(kpa_01), "トゲノコx４"), + BATTLE(N(Formation_1B), &N(kpa_01), "トゲノコ,ハンマーブロス"), + BATTLE(N(Formation_1C), &N(kpa_01), "トゲノコ,ハンマーブロス,トゲノコ,ハンマーブロス"), + BATTLE(N(Formation_1D), &N(kpa_01), "トゲノコx３,カメック"), + BATTLE(N(Formation_1E), &N(kpa_01), "トゲノコx２,カメックx２"), + BATTLE(N(Formation_20), &N(kpa_01), "トゲノコ,ホネメット"), + BATTLE(N(Formation_21), &N(kpa_01), "トゲノコx２,ホネメット"), + BATTLE(N(Formation_22), &N(kpa_01), "トゲノコ,ホネメットx２"), + BATTLE(N(Formation_23), &N(kpa_01), "トゲノコ,ホネメット,トゲノコ"), + BATTLE(N(Formation_24), &N(kpa_01), "トゲノコ,カロンx２"), + BATTLE(N(Formation_25), &N(kpa_01), "トゲノコx２,カメック,くうちゅうカメック"), + BATTLE(N(Formation_26), &N(kpa_01), "トゲノコ,カメック,トゲノコ,カメック"), + BATTLE(N(Formation_27), &N(kpa_01), "カメックx２"), + BATTLE(N(Formation_28), &N(kpa_01), "カメックx３"), + BATTLE(N(Formation_29), &N(kpa_01), "カメック,くうちゅうカメックx２"), + BATTLE(N(Formation_2A), &N(kpa_01), "カメックx２,くうちゅうカメックx２"), + BATTLE(N(Formation_2B), &N(kpa_01), "カメック,トゲノコx３"), + BATTLE(N(Formation_2C), &N(kpa_01), "カメックx２,カロン"), + BATTLE(N(Formation_2D), &N(kpa_01), "カメック,ホネメット,カメック"), + BATTLE(N(Formation_2E), &N(kpa_01), "カメック,ホネメットx２,カメック"), + BATTLE(N(Formation_2F), &N(kpa_01), "カメックx２,くうちゅうカメック"), + BATTLE(N(Formation_30), &N(kpa_01), "カメック,トゲノコ,カメック,トゲノコ"), + BATTLE(N(Formation_31), &N(kpa_01), "くうちゅうカメックx２"), + BATTLE(N(Formation_32), &N(kpa_01), "くうちゅうカメックx３"), + BATTLE(N(Formation_33), &N(kpa_01), "くうちゅうカメック,カメック,くうちゅうカメック,カメック"), + BATTLE(N(Formation_34), &N(kpa_01), "くうちゅうカメック,トゲノコx２"), + BATTLE(N(Formation_35), &N(kpa_01), "くうちゅうカメック,ハンマーブロス"), + BATTLE(N(Formation_36), &N(kpa_01), "くうちゅうカメック,カロンx２"), + BATTLE(N(Formation_37), &N(kpa_01), "くうちゅうカメック,トゲノコ,くうちゅうカメック"), + BATTLE(N(Formation_38), &N(kpa_01), "くうちゅうカメック,ハンマーブロスx２,くうちゅうカメック"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "kpa_01", &N(kpa_01) }, { "kpa_01b", &N(kpa_01b) }, { "kpa_02", &N(kpa_02) }, diff --git a/src/battle/area_kpa/stage/kpa_01.c b/src/battle/area/kpa/stage/kpa_01.c similarity index 100% rename from src/battle/area_kpa/stage/kpa_01.c rename to src/battle/area/kpa/stage/kpa_01.c diff --git a/src/battle/area_kpa/stage/kpa_01b.c b/src/battle/area/kpa/stage/kpa_01b.c similarity index 100% rename from src/battle/area_kpa/stage/kpa_01b.c rename to src/battle/area/kpa/stage/kpa_01b.c diff --git a/src/battle/area_kpa/stage/kpa_02.c b/src/battle/area/kpa/stage/kpa_02.c similarity index 100% rename from src/battle/area_kpa/stage/kpa_02.c rename to src/battle/area/kpa/stage/kpa_02.c diff --git a/src/battle/area_kpa/stage/kpa_03.c b/src/battle/area/kpa/stage/kpa_03.c similarity index 100% rename from src/battle/area_kpa/stage/kpa_03.c rename to src/battle/area/kpa/stage/kpa_03.c diff --git a/src/battle/area_kpa/stage/kpa_04.c b/src/battle/area/kpa/stage/kpa_04.c similarity index 100% rename from src/battle/area_kpa/stage/kpa_04.c rename to src/battle/area/kpa/stage/kpa_04.c diff --git a/src/battle/area_kpa/stage/kpa_04b.c b/src/battle/area/kpa/stage/kpa_04b.c similarity index 100% rename from src/battle/area_kpa/stage/kpa_04b.c rename to src/battle/area/kpa/stage/kpa_04b.c diff --git a/src/battle/area_kpa/stage/kpa_04c.c b/src/battle/area/kpa/stage/kpa_04c.c similarity index 100% rename from src/battle/area_kpa/stage/kpa_04c.c rename to src/battle/area/kpa/stage/kpa_04c.c diff --git a/src/battle/area_kpa/stage/kpa_05.c b/src/battle/area/kpa/stage/kpa_05.c similarity index 100% rename from src/battle/area_kpa/stage/kpa_05.c rename to src/battle/area/kpa/stage/kpa_05.c diff --git a/src/battle/area_kpa/stage/kpa_07.c b/src/battle/area/kpa/stage/kpa_07.c similarity index 100% rename from src/battle/area_kpa/stage/kpa_07.c rename to src/battle/area/kpa/stage/kpa_07.c diff --git a/src/battle/area_kpa/stage/kpa_08.c b/src/battle/area/kpa/stage/kpa_08.c similarity index 100% rename from src/battle/area_kpa/stage/kpa_08.c rename to src/battle/area/kpa/stage/kpa_08.c diff --git a/src/battle/area_kpa/stage/kpa_09.c b/src/battle/area/kpa/stage/kpa_09.c similarity index 100% rename from src/battle/area_kpa/stage/kpa_09.c rename to src/battle/area/kpa/stage/kpa_09.c diff --git a/src/battle/area_kpa/stage/kpa_11.c b/src/battle/area/kpa/stage/kpa_11.c similarity index 100% rename from src/battle/area_kpa/stage/kpa_11.c rename to src/battle/area/kpa/stage/kpa_11.c diff --git a/src/battle/area_kpa/stage/kpa_13.c b/src/battle/area/kpa/stage/kpa_13.c similarity index 100% rename from src/battle/area_kpa/stage/kpa_13.c rename to src/battle/area/kpa/stage/kpa_13.c diff --git a/src/battle/area_kpa/stage/kpa_14.c b/src/battle/area/kpa/stage/kpa_14.c similarity index 100% rename from src/battle/area_kpa/stage/kpa_14.c rename to src/battle/area/kpa/stage/kpa_14.c diff --git a/src/battle/area_kpa2/actor/bowser.c b/src/battle/area/kpa2/actor/bowser.c similarity index 99% rename from src/battle/area_kpa2/actor/bowser.c rename to src/battle/area/kpa2/actor/bowser.c index f5fff90858..58633c5671 100644 --- a/src/battle/area_kpa2/actor/bowser.c +++ b/src/battle/area/kpa2/actor/bowser.c @@ -81,8 +81,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = ELEMENT_FIRE, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, }; diff --git a/src/battle/area_kpa2/actor/bowser_intro.c b/src/battle/area/kpa2/actor/bowser_intro.c similarity index 99% rename from src/battle/area_kpa2/actor/bowser_intro.c rename to src/battle/area/kpa2/actor/bowser_intro.c index 9b36129fb1..0bb640a9b7 100644 --- a/src/battle/area_kpa2/actor/bowser_intro.c +++ b/src/battle/area/kpa2/actor/bowser_intro.c @@ -113,8 +113,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, }; diff --git a/src/battle/area_kpa2/actor/bowser_phase_1.c b/src/battle/area/kpa2/actor/bowser_phase_1.c similarity index 99% rename from src/battle/area_kpa2/actor/bowser_phase_1.c rename to src/battle/area/kpa2/actor/bowser_phase_1.c index 046c5f6a19..ae1d3fa9c4 100644 --- a/src/battle/area_kpa2/actor/bowser_phase_1.c +++ b/src/battle/area/kpa2/actor/bowser_phase_1.c @@ -127,8 +127,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, }; diff --git a/src/battle/area_kpa2/actor/bowser_phase_2.c b/src/battle/area/kpa2/actor/bowser_phase_2.c similarity index 99% rename from src/battle/area_kpa2/actor/bowser_phase_2.c rename to src/battle/area/kpa2/actor/bowser_phase_2.c index 4770d64c5b..07b791f113 100644 --- a/src/battle/area_kpa2/actor/bowser_phase_2.c +++ b/src/battle/area/kpa2/actor/bowser_phase_2.c @@ -125,8 +125,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, }; diff --git a/src/battle/area_kpa2/actor/bowser_phase_3.c b/src/battle/area/kpa2/actor/bowser_phase_3.c similarity index 99% rename from src/battle/area_kpa2/actor/bowser_phase_3.c rename to src/battle/area/kpa2/actor/bowser_phase_3.c index d9f179e838..152225b0e5 100644 --- a/src/battle/area_kpa2/actor/bowser_phase_3.c +++ b/src/battle/area/kpa2/actor/bowser_phase_3.c @@ -128,8 +128,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, }; @@ -159,7 +158,7 @@ ActorBlueprint NAMESPACE = { #define BOWSER_LARGE #include "common/StartRumbleWithParams.inc.c" -ApiStatus N(MakeLightnings)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(MakeLightnings)) { Bytecode* args = script->ptrReadPos; s32 angles[] = { 90, 135, 225, 270, 315, 405 }; Actor* actor = get_actor(script->owner1.actorID); diff --git a/src/battle/area_kpa2/area.c b/src/battle/area/kpa2/area.c similarity index 61% rename from src/battle/area_kpa2/area.c rename to src/battle/area/kpa2/area.c index 388e372bdd..737118f7c4 100644 --- a/src/battle/area_kpa2/area.c +++ b/src/battle/area/kpa2/area.c @@ -15,36 +15,36 @@ extern Stage N(kpa_03); Vec3i N(bowser_pos) = { 80, 0, -10 }; -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(bowser), .home = { .index = 2 }, .priority = 10, }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(bowser_intro), .home = { .index = 2 }, .priority = 10, }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(bowser_phase_1), .home = { .index = 2 }, .priority = 10, }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(bowser_phase_2), .home = { .vec = &N(bowser_pos) }, .priority = 10, }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(bowser_phase_3), .home = { .vec = &N(bowser_pos) }, .priority = 10, }, }; -BattleList N(formationTable) = { - BATTLE("クッパ", N(formation_00), &N(kpa_01)), - BATTLE("クッパ(オープニング)", N(formation_01), &N(kpa_02)), - BATTLE("クッパ(ラストバトル１)", N(formation_02), &N(kpa_02)), - BATTLE("クッパ(ラストバトル２)", N(formation_03), &N(kpa_03)), - BATTLE("クッパ(ラストバトル３)", N(formation_04), &N(kpa_03)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(kpa_01), "クッパ"), + BATTLE(N(Formation_01), &N(kpa_02), "クッパ(オープニング)"), + BATTLE(N(Formation_02), &N(kpa_02), "クッパ(ラストバトル１)"), + BATTLE(N(Formation_03), &N(kpa_03), "クッパ(ラストバトル２)"), + BATTLE(N(Formation_04), &N(kpa_03), "クッパ(ラストバトル３)"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "kpa_01", &N(kpa_01) }, { "kpa_02", &N(kpa_02) }, { "kpa_03", &N(kpa_03) }, diff --git a/src/battle/area_kpa2/stage/kpa_01.c b/src/battle/area/kpa2/stage/kpa_01.c similarity index 100% rename from src/battle/area_kpa2/stage/kpa_01.c rename to src/battle/area/kpa2/stage/kpa_01.c diff --git a/src/battle/area_kpa2/stage/kpa_02.c b/src/battle/area/kpa2/stage/kpa_02.c similarity index 100% rename from src/battle/area_kpa2/stage/kpa_02.c rename to src/battle/area/kpa2/stage/kpa_02.c diff --git a/src/battle/area_kpa2/stage/kpa_03.c b/src/battle/area/kpa2/stage/kpa_03.c similarity index 100% rename from src/battle/area_kpa2/stage/kpa_03.c rename to src/battle/area/kpa2/stage/kpa_03.c diff --git a/src/battle/area_kpa3/actor/anti_guy.c b/src/battle/area/kpa3/actor/anti_guy.c similarity index 99% rename from src/battle/area_kpa3/actor/anti_guy.c rename to src/battle/area/kpa3/actor/anti_guy.c index e79a1ccf8b..8820ba4ca0 100644 --- a/src/battle/area_kpa3/actor/anti_guy.c +++ b/src/battle/area/kpa3/actor/anti_guy.c @@ -52,8 +52,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, }; @@ -108,11 +107,11 @@ EvtScript N(idle) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 14) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 13, 10, 13) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/area_kpa3/actor/duplighost.c b/src/battle/area/kpa3/actor/duplighost.c similarity index 100% rename from src/battle/area_kpa3/actor/duplighost.c rename to src/battle/area/kpa3/actor/duplighost.c diff --git a/src/battle/area_kpa3/area.c b/src/battle/area/kpa3/area.c similarity index 72% rename from src/battle/area_kpa3/area.c rename to src/battle/area/kpa3/area.c index 46d4d8788a..75e9b2a197 100644 --- a/src/battle/area_kpa3/area.c +++ b/src/battle/area/kpa3/area.c @@ -8,32 +8,32 @@ extern ActorBlueprint N(anti_guy); extern Stage N(kpa_01); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(anti_guy), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(anti_guy), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(anti_guy), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(duplighost), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(duplighost), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(duplighost), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(duplighost), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(duplighost), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(duplighost), .home = { .index = 3 }, .priority = 7, }, }; -BattleList N(formationTable) = { - BATTLE("ブラックヘイホーx３", N(formation_00), &N(kpa_01)), - BATTLE("バケバケx２", N(formation_01), &N(kpa_01)), - BATTLE("バケバケx４", N(formation_02), &N(kpa_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(kpa_01), "ブラックヘイホーx３"), + BATTLE(N(Formation_01), &N(kpa_01), "バケバケx２"), + BATTLE(N(Formation_02), &N(kpa_01), "バケバケx４"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "kpa_01", &N(kpa_01) }, {}, }; diff --git a/src/battle/area_kpa3/stage/kpa_01.c b/src/battle/area/kpa3/stage/kpa_01.c similarity index 100% rename from src/battle/area_kpa3/stage/kpa_01.c rename to src/battle/area/kpa3/stage/kpa_01.c diff --git a/src/battle/area_kpa4/actor/bombshell_bill.c b/src/battle/area/kpa4/actor/bombshell_bill.c similarity index 99% rename from src/battle/area_kpa4/actor/bombshell_bill.c rename to src/battle/area/kpa4/actor/bombshell_bill.c index 826d1e57a7..ddc7e27971 100644 --- a/src/battle/area_kpa4/actor/bombshell_bill.c +++ b/src/battle/area/kpa4/actor/bombshell_bill.c @@ -55,8 +55,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_400, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -6, + .projectileTargetOffset = { 0, -6 }, }, }; diff --git a/src/battle/area_kpa4/actor/bombshell_bill_blaster.c b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c similarity index 98% rename from src/battle/area_kpa4/actor/bombshell_bill_blaster.c rename to src/battle/area/kpa4/actor/bombshell_bill_blaster.c index ab3c5e6456..3c7731b652 100644 --- a/src/battle/area_kpa4/actor/bombshell_bill_blaster.c +++ b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c @@ -58,8 +58,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -9, + .projectileTargetOffset = { 0, -9 }, }, }; @@ -188,7 +187,7 @@ EvtScript N(takeTurn) = { extern Formation N(formation_bill); -ApiStatus ApplyBillSettings(Evt* script, s32 isInitialCall) { +API_CALLABLE(ApplyBillSettings) { N(formation_bill)[0].var0 = 1; N(formation_bill)[0].var1 = script->owner1.actorID; diff --git a/src/battle/area_kpa4/actor/koopatrol.c b/src/battle/area/kpa4/actor/koopatrol.c similarity index 100% rename from src/battle/area_kpa4/actor/koopatrol.c rename to src/battle/area/kpa4/actor/koopatrol.c diff --git a/src/battle/area_kpa4/actor/magikoopa.c b/src/battle/area/kpa4/actor/magikoopa.c similarity index 100% rename from src/battle/area_kpa4/actor/magikoopa.c rename to src/battle/area/kpa4/actor/magikoopa.c diff --git a/src/battle/area_kpa4/area.c b/src/battle/area/kpa4/area.c similarity index 78% rename from src/battle/area_kpa4/area.c rename to src/battle/area/kpa4/area.c index b9fc7ad045..38e8db3800 100644 --- a/src/battle/area_kpa4/area.c +++ b/src/battle/area/kpa4/area.c @@ -23,12 +23,12 @@ extern Stage N(kpa_11); extern Stage N(kpa_13); extern Stage N(kpa_14); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(bombshell_bill), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(bombshell_bill), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(bombshell_bill), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(bombshell_bill), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(bombshell_bill), .home = { .index = 2 }, .priority = 8, }, @@ -38,35 +38,35 @@ Vec3i N(blaster_pos_1) = { 70, 0, -20 }; Vec3i N(blaster_pos_2) = { 100, 0, 0 }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(bombshell_bill_blaster), .home = { .vec = &N(blaster_pos_1) }, .priority = 10, }, { .actor = &N(bombshell_bill_blaster), .home = { .vec = &N(blaster_pos_2) }, .priority = 9, }, }; Vec3i N(pos_3) = { 130, 0, 25 }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(bombshell_bill_blaster), .home = { .vec = &N(blaster_pos_1) }, .priority = 10, }, { .actor = &N(bombshell_bill_blaster), .home = { .vec = &N(blaster_pos_2) }, .priority = 9, }, { .actor = &N(koopatrol), .home = { .vec = &N(pos_3) }, .priority = 8, }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(bombshell_bill_blaster), .home = { .vec = &N(blaster_pos_1) }, .priority = 10, }, { .actor = &N(bombshell_bill_blaster), .home = { .vec = &N(blaster_pos_2) }, .priority = 9, }, { .actor = &N(magikoopa), .home = { .vec = &N(pos_3) }, .priority = 8, }, }; -BattleList N(formationTable) = { - BATTLE("スーパーキラーx２", N(formation_00), &N(kpa_01)), - BATTLE("スーパーキラーx３", N(formation_01), &N(kpa_01)), - BATTLE("スーパーキラーたいほうx２", N(formation_02), &N(kpa_01)), - BATTLE("スーパーキラーたいほうx２,トゲノコ", N(formation_03), &N(kpa_01)), - BATTLE("スーパーキラーたいほうx２,カメック", N(formation_04), &N(kpa_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(kpa_01), "スーパーキラーx２"), + BATTLE(N(Formation_01), &N(kpa_01), "スーパーキラーx３"), + BATTLE(N(Formation_02), &N(kpa_01), "スーパーキラーたいほうx２"), + BATTLE(N(Formation_03), &N(kpa_01), "スーパーキラーたいほうx２,トゲノコ"), + BATTLE(N(Formation_04), &N(kpa_01), "スーパーキラーたいほうx２,カメック"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "kpa_01", &N(kpa_01) }, { "kpa_01b", &N(kpa_01b) }, { "kpa_02", &N(kpa_02) }, diff --git a/src/battle/area_kpa4/stage/kpa_01.c b/src/battle/area/kpa4/stage/kpa_01.c similarity index 100% rename from src/battle/area_kpa4/stage/kpa_01.c rename to src/battle/area/kpa4/stage/kpa_01.c diff --git a/src/battle/area_kpa4/stage/kpa_01b.c b/src/battle/area/kpa4/stage/kpa_01b.c similarity index 100% rename from src/battle/area_kpa4/stage/kpa_01b.c rename to src/battle/area/kpa4/stage/kpa_01b.c diff --git a/src/battle/area_kpa4/stage/kpa_02.c b/src/battle/area/kpa4/stage/kpa_02.c similarity index 100% rename from src/battle/area_kpa4/stage/kpa_02.c rename to src/battle/area/kpa4/stage/kpa_02.c diff --git a/src/battle/area_kpa4/stage/kpa_03.c b/src/battle/area/kpa4/stage/kpa_03.c similarity index 100% rename from src/battle/area_kpa4/stage/kpa_03.c rename to src/battle/area/kpa4/stage/kpa_03.c diff --git a/src/battle/area_kpa4/stage/kpa_04.c b/src/battle/area/kpa4/stage/kpa_04.c similarity index 100% rename from src/battle/area_kpa4/stage/kpa_04.c rename to src/battle/area/kpa4/stage/kpa_04.c diff --git a/src/battle/area_kpa4/stage/kpa_04b.c b/src/battle/area/kpa4/stage/kpa_04b.c similarity index 100% rename from src/battle/area_kpa4/stage/kpa_04b.c rename to src/battle/area/kpa4/stage/kpa_04b.c diff --git a/src/battle/area_kpa4/stage/kpa_04c.c b/src/battle/area/kpa4/stage/kpa_04c.c similarity index 100% rename from src/battle/area_kpa4/stage/kpa_04c.c rename to src/battle/area/kpa4/stage/kpa_04c.c diff --git a/src/battle/area_kpa4/stage/kpa_05.c b/src/battle/area/kpa4/stage/kpa_05.c similarity index 100% rename from src/battle/area_kpa4/stage/kpa_05.c rename to src/battle/area/kpa4/stage/kpa_05.c diff --git a/src/battle/area_kpa4/stage/kpa_07.c b/src/battle/area/kpa4/stage/kpa_07.c similarity index 100% rename from src/battle/area_kpa4/stage/kpa_07.c rename to src/battle/area/kpa4/stage/kpa_07.c diff --git a/src/battle/area_kpa4/stage/kpa_08.c b/src/battle/area/kpa4/stage/kpa_08.c similarity index 100% rename from src/battle/area_kpa4/stage/kpa_08.c rename to src/battle/area/kpa4/stage/kpa_08.c diff --git a/src/battle/area_kpa4/stage/kpa_09.c b/src/battle/area/kpa4/stage/kpa_09.c similarity index 100% rename from src/battle/area_kpa4/stage/kpa_09.c rename to src/battle/area/kpa4/stage/kpa_09.c diff --git a/src/battle/area_kpa4/stage/kpa_11.c b/src/battle/area/kpa4/stage/kpa_11.c similarity index 100% rename from src/battle/area_kpa4/stage/kpa_11.c rename to src/battle/area/kpa4/stage/kpa_11.c diff --git a/src/battle/area_kpa4/stage/kpa_13.c b/src/battle/area/kpa4/stage/kpa_13.c similarity index 100% rename from src/battle/area_kpa4/stage/kpa_13.c rename to src/battle/area/kpa4/stage/kpa_13.c diff --git a/src/battle/area_kpa4/stage/kpa_14.c b/src/battle/area/kpa4/stage/kpa_14.c similarity index 100% rename from src/battle/area_kpa4/stage/kpa_14.c rename to src/battle/area/kpa4/stage/kpa_14.c diff --git a/src/battle/area_kzn/actor/lava_bubble.c b/src/battle/area/kzn/actor/lava_bubble.c similarity index 99% rename from src/battle/area_kzn/actor/lava_bubble.c rename to src/battle/area/kzn/actor/lava_bubble.c index 4289ff6a51..8dd0604e49 100644 --- a/src/battle/area_kzn/actor/lava_bubble.c +++ b/src/battle/area/kzn/actor/lava_bubble.c @@ -57,8 +57,7 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .defenseTable = N(defenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_FIREY, .elementImmunityFlags = ELEMENT_FIRE, - .unk_1C = 0xFD, - .unk_1D = 0xF6, + .projectileTargetOffset = { -3, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -70,8 +69,7 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .defenseTable = N(defenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -83,8 +81,7 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .defenseTable = N(defenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -96,8 +93,7 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .defenseTable = N(defenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -109,8 +105,7 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .defenseTable = N(defenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, }; diff --git a/src/battle/area_kzn/actor/medi_guy.c b/src/battle/area/kzn/actor/medi_guy.c similarity index 100% rename from src/battle/area_kzn/actor/medi_guy.c rename to src/battle/area/kzn/actor/medi_guy.c diff --git a/src/battle/area_kzn/actor/putrid_piranha.c b/src/battle/area/kzn/actor/putrid_piranha.c similarity index 100% rename from src/battle/area_kzn/actor/putrid_piranha.c rename to src/battle/area/kzn/actor/putrid_piranha.c diff --git a/src/battle/area_kzn/actor/red_magikoopa.c b/src/battle/area/kzn/actor/red_magikoopa.c similarity index 100% rename from src/battle/area_kzn/actor/red_magikoopa.c rename to src/battle/area/kzn/actor/red_magikoopa.c diff --git a/src/battle/area_kzn/actor/spike_top.c b/src/battle/area/kzn/actor/spike_top.c similarity index 100% rename from src/battle/area_kzn/actor/spike_top.c rename to src/battle/area/kzn/actor/spike_top.c diff --git a/src/battle/area_kzn/actor/white_magikoopa.c b/src/battle/area/kzn/actor/white_magikoopa.c similarity index 100% rename from src/battle/area_kzn/actor/white_magikoopa.c rename to src/battle/area/kzn/actor/white_magikoopa.c diff --git a/src/battle/area_kzn/area.c b/src/battle/area/kzn/area.c similarity index 70% rename from src/battle/area_kzn/area.c rename to src/battle/area/kzn/area.c index c35d3f22d7..b76221a51f 100644 --- a/src/battle/area_kzn/area.c +++ b/src/battle/area/kzn/area.c @@ -18,158 +18,158 @@ extern Stage N(kzn_04b); extern Stage N(kzn_04c); extern Stage N(kzn_05); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(lava_bubble), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(lava_bubble), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(lava_bubble), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(lava_bubble), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(lava_bubble), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(lava_bubble), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(lava_bubble), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(lava_bubble), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(lava_bubble), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(lava_bubble), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spike_top), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spike_top), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(spike_top), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(lava_bubble), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(lava_bubble), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(lava_bubble), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(lava_bubble), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(red_magikoopa_flying), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(lava_bubble), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(lava_bubble), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(white_magikoopa_flying), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(lava_bubble), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(lava_bubble), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spike_top), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(spike_top), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(spike_top), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(spike_top), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(lava_bubble), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(spike_top), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spike_top), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(lava_bubble), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(spike_top), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(putrid_piranha), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(spike_top), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spike_top), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(putrid_piranha), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(spike_top), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spike_top), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(putrid_piranha), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(putrid_piranha), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_0E) = { +Formation N(Formation_0E) = { { .actor = &N(spike_top), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(lava_bubble), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(lava_bubble), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(lava_bubble), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_0F) = { +Formation N(Formation_0F) = { { .actor = &N(putrid_piranha), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(putrid_piranha), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_10) = { +Formation N(Formation_10) = { { .actor = &N(putrid_piranha), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(putrid_piranha), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(putrid_piranha), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_11) = { +Formation N(Formation_11) = { { .actor = &N(putrid_piranha), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(lava_bubble), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(putrid_piranha), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_12) = { +Formation N(Formation_12) = { { .actor = &N(putrid_piranha), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(putrid_piranha), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spike_top), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_13) = { +Formation N(Formation_13) = { { .actor = &N(putrid_piranha), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spike_top), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(putrid_piranha), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_14) = { +Formation N(Formation_14) = { { .actor = &N(putrid_piranha), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spike_top), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(putrid_piranha), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(spike_top), .home = { .index = 3 }, .priority = 7 }, }; -BattleList N(formationTable) = { - BATTLE("バブルx2", N(formation_00), &N(kzn_01)), - BATTLE("バブルx3", N(formation_01), &N(kzn_01)), - BATTLE("バブルx4", N(formation_02), &N(kzn_01)), - BATTLE("バブル,トゲメットx３", N(formation_03), &N(kzn_01)), - BATTLE("バブルx2,かいふくヘイホー", N(formation_04), &N(kzn_01)), - BATTLE("バブルx2,レッドカメック", N(formation_05), &N(kzn_01)), - BATTLE("バブルx2,ホワイトカメック", N(formation_06), &N(kzn_01)), - BATTLE("バブルx2,トゲメット", N(formation_07), &N(kzn_01)), - BATTLE("トゲメットx２", N(formation_08), &N(kzn_01)), - BATTLE("トゲメット,バブル", N(formation_09), &N(kzn_01)), - BATTLE("トゲメットx２,バブル", N(formation_0A), &N(kzn_01)), - BATTLE("トゲメット,ポイズンパックン", N(formation_0B), &N(kzn_01)), - BATTLE("トゲメットx２,ポイズンパックン", N(formation_0C), &N(kzn_01)), - BATTLE("トゲメットx２,ポイズンパックンx２", N(formation_0D), &N(kzn_01)), - BATTLE("トゲメット,バブルx３", N(formation_0E), &N(kzn_01)), - BATTLE("ポイズンパックンx２", N(formation_0F), &N(kzn_01)), - BATTLE("ポイズンパックンx３", N(formation_10), &N(kzn_01)), - BATTLE("ポイズンパックン,バブル,ポイズンパックン", N(formation_11), &N(kzn_01)), - BATTLE("ポイズンパックンx２,トゲメット", N(formation_12), &N(kzn_01)), - BATTLE("ポイズンパックン,トゲメット,ポイズンパックン", N(formation_13), &N(kzn_01)), - BATTLE("ポイズンパックン,トゲメット,ポイズンパックン,トゲメット", N(formation_14), &N(kzn_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(kzn_01), "バブルx2"), + BATTLE(N(Formation_01), &N(kzn_01), "バブルx3"), + BATTLE(N(Formation_02), &N(kzn_01), "バブルx4"), + BATTLE(N(Formation_03), &N(kzn_01), "バブル,トゲメットx３"), + BATTLE(N(Formation_04), &N(kzn_01), "バブルx2,かいふくヘイホー"), + BATTLE(N(Formation_05), &N(kzn_01), "バブルx2,レッドカメック"), + BATTLE(N(Formation_06), &N(kzn_01), "バブルx2,ホワイトカメック"), + BATTLE(N(Formation_07), &N(kzn_01), "バブルx2,トゲメット"), + BATTLE(N(Formation_08), &N(kzn_01), "トゲメットx２"), + BATTLE(N(Formation_09), &N(kzn_01), "トゲメット,バブル"), + BATTLE(N(Formation_0A), &N(kzn_01), "トゲメットx２,バブル"), + BATTLE(N(Formation_0B), &N(kzn_01), "トゲメット,ポイズンパックン"), + BATTLE(N(Formation_0C), &N(kzn_01), "トゲメットx２,ポイズンパックン"), + BATTLE(N(Formation_0D), &N(kzn_01), "トゲメットx２,ポイズンパックンx２"), + BATTLE(N(Formation_0E), &N(kzn_01), "トゲメット,バブルx３"), + BATTLE(N(Formation_0F), &N(kzn_01), "ポイズンパックンx２"), + BATTLE(N(Formation_10), &N(kzn_01), "ポイズンパックンx３"), + BATTLE(N(Formation_11), &N(kzn_01), "ポイズンパックン,バブル,ポイズンパックン"), + BATTLE(N(Formation_12), &N(kzn_01), "ポイズンパックンx２,トゲメット"), + BATTLE(N(Formation_13), &N(kzn_01), "ポイズンパックン,トゲメット,ポイズンパックン"), + BATTLE(N(Formation_14), &N(kzn_01), "ポイズンパックン,トゲメット,ポイズンパックン,トゲメット"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "kzn_01", &N(kzn_01) }, { "kzn_01b", &N(kzn_01b) }, { "kzn_02", &N(kzn_02) }, diff --git a/src/battle/area_kzn/stage/kzn_01.c b/src/battle/area/kzn/stage/kzn_01.c similarity index 100% rename from src/battle/area_kzn/stage/kzn_01.c rename to src/battle/area/kzn/stage/kzn_01.c diff --git a/src/battle/area_kzn/stage/kzn_01b.c b/src/battle/area/kzn/stage/kzn_01b.c similarity index 100% rename from src/battle/area_kzn/stage/kzn_01b.c rename to src/battle/area/kzn/stage/kzn_01b.c diff --git a/src/battle/area_kzn/stage/kzn_02.c b/src/battle/area/kzn/stage/kzn_02.c similarity index 100% rename from src/battle/area_kzn/stage/kzn_02.c rename to src/battle/area/kzn/stage/kzn_02.c diff --git a/src/battle/area_kzn/stage/kzn_04.c b/src/battle/area/kzn/stage/kzn_04.c similarity index 100% rename from src/battle/area_kzn/stage/kzn_04.c rename to src/battle/area/kzn/stage/kzn_04.c diff --git a/src/battle/area_kzn/stage/kzn_04b.c b/src/battle/area/kzn/stage/kzn_04b.c similarity index 100% rename from src/battle/area_kzn/stage/kzn_04b.c rename to src/battle/area/kzn/stage/kzn_04b.c diff --git a/src/battle/area_kzn/stage/kzn_04c.c b/src/battle/area/kzn/stage/kzn_04c.c similarity index 100% rename from src/battle/area_kzn/stage/kzn_04c.c rename to src/battle/area/kzn/stage/kzn_04c.c diff --git a/src/battle/area_kzn/stage/kzn_05.c b/src/battle/area/kzn/stage/kzn_05.c similarity index 100% rename from src/battle/area_kzn/stage/kzn_05.c rename to src/battle/area/kzn/stage/kzn_05.c diff --git a/src/battle/area_kzn2/actor/lava_bud.c b/src/battle/area/kzn2/actor/lava_bud.c similarity index 99% rename from src/battle/area_kzn2/actor/lava_bud.c rename to src/battle/area/kzn2/actor/lava_bud.c index c8fa7266d8..0e4947d072 100644 --- a/src/battle/area_kzn2/actor/lava_bud.c +++ b/src/battle/area/kzn2/actor/lava_bud.c @@ -21,7 +21,7 @@ extern EvtScript N(attackPetitSpit); extern EvtScript N(summonPetitPiranha); extern EvtScript N(8022630C); -ApiStatus SetAnimatorFlags(Evt* script, s32 isInitialCall); +API_CALLABLE(SetAnimatorFlags); extern EvtScript b_area_kzn2_lava_piranha_ignite; @@ -129,8 +129,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_20 | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION | ACTOR_PART_FLAG_MULTI_TARGET, @@ -142,8 +141,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, }; @@ -960,7 +958,7 @@ EvtScript N(onHit) = { EVT_END }; -ApiStatus func_80218DF0_59F4D0(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218DF0_59F4D0) { Bytecode* args = script->ptrReadPos; FlameFXData* data = ((EffectInstance*) evt_get_variable(script, *args++))->data.flame; f32 temp_f0 = evt_get_float_variable(script, *args++); diff --git a/src/battle/area_kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c similarity index 99% rename from src/battle/area_kzn2/actor/lava_piranha.c rename to src/battle/area/kzn2/actor/lava_piranha.c index b24f609f00..2a37bcaa13 100644 --- a/src/battle/area_kzn2/actor/lava_piranha.c +++ b/src/battle/area/kzn2/actor/lava_piranha.c @@ -89,9 +89,9 @@ EntityModelScript N(ModelScript4) = { ems_End }; -#include "battle/area_kzn2/lava_piranha_vine.png.inc.c" -#include "battle/area_kzn2/lava_piranha_vine.pal.inc.c" -#include "battle/area_kzn2/lava_piranha_vine.gfx.inc.c" +#include "battle/area/kzn2/lava_piranha_vine.png.inc.c" +#include "battle/area/kzn2/lava_piranha_vine.pal.inc.c" +#include "battle/area/kzn2/lava_piranha_vine.gfx.inc.c" extern EvtScript N(init); extern EvtScript N(idle); @@ -126,8 +126,8 @@ API_CALLABLE(SetAnimatorFlags); API_CALLABLE(GetAnimatedPositionByTreeIndex); API_CALLABLE(GetAnimatedRotationByTreeIndex); API_CALLABLE(GetAnimatedModelRootPosition); -ApiStatus SetPartImmunityBits(Evt* script, s32 isInitialCall); -ApiStatus DeleteAnimatedModel(Evt* script, s32 isInitialCall); +API_CALLABLE(SetPartImmunityBits); +API_CALLABLE(DeleteAnimatedModel); extern Formation N(formation_lava_bud_1); extern Formation N(formation_lava_bud_2); @@ -227,8 +227,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_8 | ACTOR_PART_FLAG_MULTI_TARGET, @@ -240,8 +239,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, }; diff --git a/src/battle/area_kzn2/actor/petit_piranha.c b/src/battle/area/kzn2/actor/petit_piranha.c similarity index 98% rename from src/battle/area_kzn2/actor/petit_piranha.c rename to src/battle/area/kzn2/actor/petit_piranha.c index 4d9f3c25c9..509b866a6e 100644 --- a/src/battle/area_kzn2/actor/petit_piranha.c +++ b/src/battle/area/kzn2/actor/petit_piranha.c @@ -71,8 +71,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_FIREY, .elementImmunityFlags = 0, - .unk_1C = -2, - .unk_1D = -22, + .projectileTargetOffset = { -2, -22 }, }, }; @@ -227,7 +226,7 @@ EvtScript N(recoverHP) = { EVT_END }; -ApiStatus N(SetFlameUnk2C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetFlameUnk2C)) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); FlameFXData* flame = effect->data.flame; @@ -237,7 +236,7 @@ ApiStatus N(SetFlameUnk2C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(SetFlameX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetFlameX)) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); FlameFXData* flame = effect->data.flame; diff --git a/src/battle/area_kzn2/actor/petit_piranha_bomb.c b/src/battle/area/kzn2/actor/petit_piranha_bomb.c similarity index 98% rename from src/battle/area_kzn2/actor/petit_piranha_bomb.c rename to src/battle/area/kzn2/actor/petit_piranha_bomb.c index a88b1c82a5..bbdaa97af5 100644 --- a/src/battle/area_kzn2/actor/petit_piranha_bomb.c +++ b/src/battle/area/kzn2/actor/petit_piranha_bomb.c @@ -69,8 +69,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_FIREY, .elementImmunityFlags = ELEMENT_FIRE, - .unk_1C = -2, - .unk_1D = -22, + .projectileTargetOffset = { -2, -22 }, }, }; diff --git a/src/battle/area_kzn2/anim/lava_piranha_anim.c b/src/battle/area/kzn2/anim/lava_piranha_anim.c similarity index 100% rename from src/battle/area_kzn2/anim/lava_piranha_anim.c rename to src/battle/area/kzn2/anim/lava_piranha_anim.c diff --git a/src/battle/area_kzn2/anim/lava_piranha_anim1.inc.c b/src/battle/area/kzn2/anim/lava_piranha_anim1.inc.c similarity index 100% rename from src/battle/area_kzn2/anim/lava_piranha_anim1.inc.c rename to src/battle/area/kzn2/anim/lava_piranha_anim1.inc.c diff --git a/src/battle/area_kzn2/anim/lava_piranha_anim2.inc.c b/src/battle/area/kzn2/anim/lava_piranha_anim2.inc.c similarity index 100% rename from src/battle/area_kzn2/anim/lava_piranha_anim2.inc.c rename to src/battle/area/kzn2/anim/lava_piranha_anim2.inc.c diff --git a/src/battle/area_kzn2/anim/lava_piranha_anim3.inc.c b/src/battle/area/kzn2/anim/lava_piranha_anim3.inc.c similarity index 100% rename from src/battle/area_kzn2/anim/lava_piranha_anim3.inc.c rename to src/battle/area/kzn2/anim/lava_piranha_anim3.inc.c diff --git a/src/battle/area_kzn2/anim/lava_piranha_anim4.inc.c b/src/battle/area/kzn2/anim/lava_piranha_anim4.inc.c similarity index 100% rename from src/battle/area_kzn2/anim/lava_piranha_anim4.inc.c rename to src/battle/area/kzn2/anim/lava_piranha_anim4.inc.c diff --git a/src/battle/area/kzn2/anim/unused_gfx.c b/src/battle/area/kzn2/anim/unused_gfx.c new file mode 100644 index 0000000000..5db0c0ccd1 --- /dev/null +++ b/src/battle/area/kzn2/anim/unused_gfx.c @@ -0,0 +1,32 @@ +#include "common.h" + +#include "battle/area/kzn2/vtx1.vtx.inc.c" +#include "battle/area/kzn2/vtx2.vtx.inc.c" +#include "battle/area/kzn2/vtx3.vtx.inc.c" +#include "battle/area/kzn2/vtx4.vtx.inc.c" +#include "battle/area/kzn2/vtx5.vtx.inc.c" +#include "battle/area/kzn2/vtx6.vtx.inc.c" +#include "battle/area/kzn2/vtx7.vtx.inc.c" +#include "battle/area/kzn2/vtx8.vtx.inc.c" +#include "battle/area/kzn2/vtx9.vtx.inc.c" +#include "battle/area/kzn2/vtx10.vtx.inc.c" +#include "battle/area/kzn2/vtx11.vtx.inc.c" +#include "battle/area/kzn2/vtx12.vtx.inc.c" +#include "battle/area/kzn2/vtx13.vtx.inc.c" +#include "battle/area/kzn2/vtx14.vtx.inc.c" +#include "battle/area/kzn2/vtx15.vtx.inc.c" +#include "battle/area/kzn2/vtx16.vtx.inc.c" +#include "battle/area/kzn2/vtx17.vtx.inc.c" +#include "battle/area/kzn2/vtx18.vtx.inc.c" + +#include "battle/area/kzn2/gfx1.gfx.inc.c" +#include "battle/area/kzn2/gfx2.gfx.inc.c" +#include "battle/area/kzn2/gfx3.gfx.inc.c" +#include "battle/area/kzn2/gfx4.gfx.inc.c" +#include "battle/area/kzn2/gfx5.gfx.inc.c" +#include "battle/area/kzn2/gfx6.gfx.inc.c" +#include "battle/area/kzn2/gfx7.gfx.inc.c" +#include "battle/area/kzn2/gfx8.gfx.inc.c" +#include "battle/area/kzn2/gfx9.gfx.inc.c" +#include "battle/area/kzn2/gfx10.gfx.inc.c" +#include "battle/area/kzn2/gfx11.gfx.inc.c" diff --git a/src/battle/area_kzn2/area.c b/src/battle/area/kzn2/area.c similarity index 89% rename from src/battle/area_kzn2/area.c rename to src/battle/area/kzn2/area.c index ca3aabd378..66079df686 100644 --- a/src/battle/area_kzn2/area.c +++ b/src/battle/area/kzn2/area.c @@ -17,7 +17,7 @@ extern Stage N(kzn_05); Vec3i N(lava_piranha_pos) = { 60, 60, 0 }; -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(lava_piranha), .home = { .vec = &N(lava_piranha_pos) }, .priority = 60, }, }; @@ -25,18 +25,18 @@ Vec3i N(petit_piranha_pos1) = { 40, 60, 0 }; Vec3i N(petit_piranha_pos2) = { 80, 60, 0 }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(petit_piranha), .home = { .vec = &N(petit_piranha_pos1) }, .priority = 10, }, { .actor = &N(petit_piranha), .home = { .vec = &N(petit_piranha_pos2) }, .priority = 10, }, }; -BattleList N(formationTable) = { - BATTLE("ファイアパックン", N(formation_00), &N(kzn_05)), - BATTLE("プチパックン", N(formation_01), &N(kzn_05)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(kzn_05), "ファイアパックン"), + BATTLE(N(Formation_01), &N(kzn_05), "プチパックン"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "kzn_01", &N(kzn_01) }, { "kzn_01b", &N(kzn_01b) }, { "kzn_02", &N(kzn_02) }, diff --git a/src/battle/area_kzn2/stage/kzn_01.c b/src/battle/area/kzn2/stage/kzn_01.c similarity index 100% rename from src/battle/area_kzn2/stage/kzn_01.c rename to src/battle/area/kzn2/stage/kzn_01.c diff --git a/src/battle/area_kzn2/stage/kzn_01b.c b/src/battle/area/kzn2/stage/kzn_01b.c similarity index 100% rename from src/battle/area_kzn2/stage/kzn_01b.c rename to src/battle/area/kzn2/stage/kzn_01b.c diff --git a/src/battle/area_kzn2/stage/kzn_02.c b/src/battle/area/kzn2/stage/kzn_02.c similarity index 100% rename from src/battle/area_kzn2/stage/kzn_02.c rename to src/battle/area/kzn2/stage/kzn_02.c diff --git a/src/battle/area_kzn2/stage/kzn_04.c b/src/battle/area/kzn2/stage/kzn_04.c similarity index 100% rename from src/battle/area_kzn2/stage/kzn_04.c rename to src/battle/area/kzn2/stage/kzn_04.c diff --git a/src/battle/area_kzn2/stage/kzn_04b.c b/src/battle/area/kzn2/stage/kzn_04b.c similarity index 100% rename from src/battle/area_kzn2/stage/kzn_04b.c rename to src/battle/area/kzn2/stage/kzn_04b.c diff --git a/src/battle/area_kzn2/stage/kzn_04c.c b/src/battle/area/kzn2/stage/kzn_04c.c similarity index 100% rename from src/battle/area_kzn2/stage/kzn_04c.c rename to src/battle/area/kzn2/stage/kzn_04c.c diff --git a/src/battle/area_kzn2/stage/kzn_05.c b/src/battle/area/kzn2/stage/kzn_05.c similarity index 100% rename from src/battle/area_kzn2/stage/kzn_05.c rename to src/battle/area/kzn2/stage/kzn_05.c diff --git a/src/battle/area_mac/actor/chan.c b/src/battle/area/mac/actor/chan.c similarity index 99% rename from src/battle/area_mac/actor/chan.c rename to src/battle/area/mac/actor/chan.c index 5e1121a5c7..576d8d91fe 100644 --- a/src/battle/area_mac/actor/chan.c +++ b/src/battle/area/mac/actor/chan.c @@ -56,8 +56,7 @@ ActorPartBlueprint N(partsTable_80219E24)[] = { .defenseTable = N(defenseTable_80219D50), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 1, - .unk_1D = 7, + .projectileTargetOffset = { 1, 7 }, }, }; @@ -142,7 +141,7 @@ EvtScript N(80219F4C) = { EVT_ELSE EVT_CALL(SetActorVar, -127, 8, 1) EVT_CALL(SetTargetOffset, -127, 1, 0, 16) - EVT_CALL(func_8027D4C8, -127, 1, -1, -9) + EVT_CALL(SetProjectileTargetOffset, -127, 1, -1, -9) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_Chan))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021AAB8))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219E70))) @@ -165,7 +164,7 @@ EvtScript N(8021A12C) = { EVT_CALL(func_8027D32C, -127) EVT_CALL(SetActorVar, -127, 8, 2) EVT_CALL(SetTargetOffset, -127, 1, 0, 16) - EVT_CALL(func_8027D4C8, -127, 1, -1, -9) + EVT_CALL(SetProjectileTargetOffset, -127, 1, -1, -9) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_Chan))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021AAB8))) @@ -374,7 +373,7 @@ EvtScript N(handleEvent_8021AAB8) = { EVT_CASE_EQ(13) EVT_CALL(SetActorVar, -127, 8, 2) EVT_CALL(SetTargetOffset, -127, 1, 0, 16) - EVT_CALL(func_8027D4C8, -127, 1, -1, -9) + EVT_CALL(SetProjectileTargetOffset, -127, 1, -1, -9) EVT_CALL(SetActorVar, -127, 9, 1) EVT_CALL(SetDefenseTable, -127, 1, EVT_PTR(N(defenseTable_80219D6C))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219F08))) @@ -552,7 +551,7 @@ EvtScript N(takeTurn_8021B81C) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetActorVar, -127, 8, 1) EVT_CALL(SetTargetOffset, -127, 1, 0, 16) - EVT_CALL(func_8027D4C8, -127, 1, -1, -9) + EVT_CALL(SetProjectileTargetOffset, -127, 1, -1, -9) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_Chan))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021AAB8))) @@ -711,7 +710,7 @@ EvtScript N(takeTurn_Chan) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorVar, -127, 8, 1) EVT_CALL(SetTargetOffset, -127, 1, 0, 16) - EVT_CALL(func_8027D4C8, -127, 1, -1, -9) + EVT_CALL(SetProjectileTargetOffset, -127, 1, -1, -9) EVT_CALL(SetDefenseTable, -127, 1, EVT_PTR(N(defenseTable_80219D50))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219E70))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8021A11C))) diff --git a/src/battle/area_mac/actor/lee.c b/src/battle/area/mac/actor/lee.c similarity index 99% rename from src/battle/area_mac/actor/lee.c rename to src/battle/area/mac/actor/lee.c index 65daf5cb0f..d29d361214 100644 --- a/src/battle/area_mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -76,8 +76,7 @@ ActorPartBlueprint N(partsTable_8021D47C)[] = { .defenseTable = N(defenseTable_8021D3C4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFE, - .unk_1D = 0xF6, + .projectileTargetOffset = { -2, -10 }, }, }; @@ -115,7 +114,7 @@ extern EvtScript N(copyPartner); BSS s32 D_80232C20[12]; BSS s32 D_80232C50; -ApiStatus func_802180D0_464560(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802180D0_464560) { s32 i; for (i = 0; i < 12; i++) { @@ -504,8 +503,7 @@ ActorPartBlueprint N(partsTable_8021EA50)[] = { .defenseTable = N(defenseTable_8021E998), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF7, + .projectileTargetOffset = { -1, -9 }, }, }; @@ -750,7 +748,7 @@ EvtScript N(8021F5F8) = { EVT_END }; -ApiStatus func_80218100_464590(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218100_464590) { PlayerData* playerData = &gPlayerData; s32 currentPartner = script->varTable[5]; s32 partnerId; @@ -976,7 +974,7 @@ EvtScript N(8021F6E0) = { #include "common/UnkEffect6CFunc.inc.c" -ApiStatus func_80218DF4_465284(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218DF4_465284) { Bytecode* args = script->ptrReadPos; EffectInstance* tattleEffect = (EffectInstance*) evt_get_variable(script, *args++); @@ -984,7 +982,7 @@ ApiStatus func_80218DF4_465284(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80218E2C_4652BC(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218E2C_4652BC) { EffectInstance* tattleEffect = (EffectInstance*) evt_get_variable(script, *script->ptrReadPos); tattleEffect->data.tattleWindow->pos.y = 144.0f; @@ -1140,7 +1138,7 @@ ActorPartBlueprint N(partsTable_8022069C)[] = { .defenseTable = N(defenseTable_802205D8), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1D = 240, + .projectileTargetOffset = { 0, -16 }, }, }; @@ -1196,11 +1194,11 @@ EvtScript N(idle_80220790) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_CALL(SetTargetOffset, -127, 1, -2, 38) - EVT_CALL(func_8027D4C8, -127, 1, -3, -9) + EVT_CALL(SetProjectileTargetOffset, -127, 1, -3, -9) EVT_CALL(N(kooper_UnkBattleFunc1), -10, 25, 10, 25) EVT_CASE_EQ(1) EVT_CALL(SetTargetOffset, -127, 1, 5, 15) - EVT_CALL(func_8027D4C8, -127, 1, 0, -6) + EVT_CALL(SetProjectileTargetOffset, -127, 1, 0, -6) EVT_CALL(N(kooper_UnkBattleFunc1), -10, 20, 10, 20) EVT_END_SWITCH EVT_WAIT(1) @@ -1260,7 +1258,7 @@ EvtScript N(handleEvent_80220908) = { EVT_CALL(SetDefenseTable, -127, 1, EVT_PTR(N(defenseTable_802205E4))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022058C))) EVT_CALL(SetTargetOffset, -127, 1, 5, 15) - EVT_CALL(func_8027D4C8, -127, 1, 0, -6) + EVT_CALL(SetProjectileTargetOffset, -127, 1, 0, -6) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_Hurt) EVT_CALL(SetActorRotationOffset, -127, 0, 12, 0) EVT_THREAD @@ -1413,7 +1411,7 @@ EvtScript N(takeTurn_80221200) = { EVT_CALL(SetDefenseTable, -127, 1, EVT_PTR(N(defenseTable_802205D8))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220540))) EVT_CALL(SetTargetOffset, -127, 1, -2, 38) - EVT_CALL(func_8027D4C8, -127, 1, -3, -9) + EVT_CALL(SetProjectileTargetOffset, -127, 1, -3, -9) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -1651,8 +1649,7 @@ ActorPartBlueprint N(partsTable_80222394)[] = { .defenseTable = N(defenseTable_802222DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFE, - .unk_1D = 0xF9, + .projectileTargetOffset = { -2, -7 }, }, }; @@ -2006,7 +2003,7 @@ ActorPartBlueprint N(partsTable_8022348C)[] = { .defenseTable = N(defenseTable_802233D4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 240, + .projectileTargetOffset = { 0, -16 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -2018,7 +2015,7 @@ ActorPartBlueprint N(partsTable_8022348C)[] = { .defenseTable = N(defenseTable_802233D4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 240, + .projectileTargetOffset = { 0, -16 }, }, }; @@ -2368,7 +2365,7 @@ ActorPartBlueprint N(partsTable_80224514)[] = { .defenseTable = N(defenseTable_8022445C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -2380,7 +2377,7 @@ ActorPartBlueprint N(partsTable_80224514)[] = { .defenseTable = N(defenseTable_8022445C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; @@ -2820,7 +2817,7 @@ ActorPartBlueprint N(partsTable_80225A80)[] = { .defenseTable = N(defenseTable_802259C0), .eventFlags = ACTOR_EVENT_FLAG_ELECTRIFIED, .elementImmunityFlags = 0, - .unk_1D = 248, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -2832,7 +2829,7 @@ ActorPartBlueprint N(partsTable_80225A80)[] = { .defenseTable = N(defenseTable_802259C0), .eventFlags = ACTOR_EVENT_FLAG_ELECTRIFIED, .elementImmunityFlags = 0, - .unk_1D = 248, + .projectileTargetOffset = { 0, -8 }, }, }; @@ -2876,7 +2873,7 @@ EvtScript N(init_Watt) = { EVT_END }; -ApiStatus func_80219188_465618(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80219188_465618) { WattEffectData* wattEffectData; f32 x, y, z; Actor* actor = get_actor(script->owner1.enemyID); @@ -2961,7 +2958,7 @@ ApiStatus func_80219188_465618(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80219604_465A94(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80219604_465A94) { WattEffectData* wattEffectData = (WattEffectData*)get_actor(script->owner1.actorID)->state.varTable[3]; wattEffectData->flags = 0; @@ -2984,7 +2981,7 @@ EvtScript N(idle_80225B68) = { EVT_END }; -ApiStatus func_80219658_465AE8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80219658_465AE8) { Bytecode* args = script->ptrReadPos; WattEffectData* wattEffects = (WattEffectData*)get_actor(script->owner1.enemyID)->state.varTable[3]; @@ -2992,7 +2989,7 @@ ApiStatus func_80219658_465AE8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802196A4_465B34(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802196A4_465B34) { Bytecode* args = script->ptrReadPos; WattEffectData* wattEffects = (WattEffectData*)get_actor(script->owner1.enemyID)->state.varTable[3]; @@ -3000,7 +2997,7 @@ ApiStatus func_802196A4_465B34(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802196F0_465B80(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802196F0_465B80) { Bytecode* args = script->ptrReadPos; WattEffectData* wattEffects = (WattEffectData*)get_actor(script->owner1.enemyID)->state.varTable[3]; @@ -3298,7 +3295,7 @@ ActorPartBlueprint N(partsTable_80226A80)[] = { .defenseTable = N(defenseTable_802269C8), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 244, + .projectileTargetOffset = { 0, -12 }, }, }; @@ -3777,8 +3774,7 @@ ActorPartBlueprint N(partsTable_8022851C)[] = { .defenseTable = N(defenseTable_80228464), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFE, - .unk_1D = 0xF6, + .projectileTargetOffset = { -2, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -3790,7 +3786,7 @@ ActorPartBlueprint N(partsTable_8022851C)[] = { .defenseTable = N(defenseTable_80228464), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -4114,7 +4110,7 @@ Formation N(formation_lakilester) = { { .actor = &N(lakilester), .home = { .vec = &N(vector3D_8021E940) }} }; -ApiStatus func_802197B8_465C48(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802197B8_465C48) { Bytecode* args = script->ptrReadPos; evt_set_variable(script, *args++, gPlayerData.currentPartner); @@ -4122,7 +4118,7 @@ ApiStatus func_802197B8_465C48(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80219824_465CB4(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80219824_465CB4) { Bytecode* args = script->ptrReadPos; s32 partnerID = evt_get_variable(script, *args++); Actor* actor = get_actor(script->owner1.enemyID); diff --git a/src/battle/area_mac/actor/master1.c b/src/battle/area/mac/actor/master1.c similarity index 99% rename from src/battle/area_mac/actor/master1.c rename to src/battle/area/mac/actor/master1.c index d041e873a2..fd221cc4cc 100644 --- a/src/battle/area_mac/actor/master1.c +++ b/src/battle/area/mac/actor/master1.c @@ -59,8 +59,7 @@ ActorPartBlueprint N(partsTable_8022A364)[] = { .defenseTable = N(defenseTable_8022A2AC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 2, - .unk_1D = 0xF9, + .projectileTargetOffset = { 2, -7 }, }, }; diff --git a/src/battle/area_mac/actor/master2.c b/src/battle/area/mac/actor/master2.c similarity index 99% rename from src/battle/area_mac/actor/master2.c rename to src/battle/area/mac/actor/master2.c index a117c68bc8..53075b31ad 100644 --- a/src/battle/area_mac/actor/master2.c +++ b/src/battle/area/mac/actor/master2.c @@ -72,8 +72,7 @@ ActorPartBlueprint N(partsTable_8022B790)[] = { .defenseTable = N(defenseTable_8022B6D8), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 2, - .unk_1D = 0xF9, + .projectileTargetOffset = { 2, -7 }, }, }; diff --git a/src/battle/area_mac/actor/master3.c b/src/battle/area/mac/actor/master3.c similarity index 99% rename from src/battle/area_mac/actor/master3.c rename to src/battle/area/mac/actor/master3.c index 3cc386a662..fbb60fea17 100644 --- a/src/battle/area_mac/actor/master3.c +++ b/src/battle/area/mac/actor/master3.c @@ -72,8 +72,7 @@ ActorPartBlueprint N(partsTable_8022DAF0)[] = { .defenseTable = N(defenseTable_8022DA38), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 2, - .unk_1D = 0xF9, + .projectileTargetOffset = { 2, -7 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -85,7 +84,7 @@ ActorPartBlueprint N(partsTable_8022DAF0)[] = { .defenseTable = N(defenseTable_8022DA38), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_mac/area.c b/src/battle/area/mac/area.c similarity index 59% rename from src/battle/area_mac/area.c rename to src/battle/area/mac/area.c index f0f59bbd9a..933ec6bfc3 100644 --- a/src/battle/area_mac/area.c +++ b/src/battle/area/mac/area.c @@ -13,36 +13,36 @@ extern ActorBlueprint N(master3); extern Stage N(mac_01); extern Stage N(mac_02); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(chan), .home = { .index = 2 }, .priority = 10 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(lee), .home = { .index = 2 }, .priority = 10 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(master1), .home = { .index = 2 }, .priority = 10 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(master2), .home = { .index = 2 }, .priority = 10 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(master3), .home = { .index = 2 }, .priority = 10 }, }; -BattleList N(formationTable) = { - BATTLE("チェン", N(formation_00), &N(mac_02)), - BATTLE("リー", N(formation_01), &N(mac_02)), - BATTLE("シショー その１", N(formation_02), &N(mac_02)), - BATTLE("シショー その２", N(formation_03), &N(mac_02)), - BATTLE("シショー その３", N(formation_04), &N(mac_02)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(mac_02), "チェン"), + BATTLE(N(Formation_01), &N(mac_02), "リー"), + BATTLE(N(Formation_02), &N(mac_02), "シショー その１"), + BATTLE(N(Formation_03), &N(mac_02), "シショー その２"), + BATTLE(N(Formation_04), &N(mac_02), "シショー その３"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "mac_01", &N(mac_01) }, { "mac_02", &N(mac_02) }, {}, diff --git a/src/battle/area_mac/stage/mac_01.c b/src/battle/area/mac/stage/mac_01.c similarity index 100% rename from src/battle/area_mac/stage/mac_01.c rename to src/battle/area/mac/stage/mac_01.c diff --git a/src/battle/area_mac/stage/mac_02.c b/src/battle/area/mac/stage/mac_02.c similarity index 100% rename from src/battle/area_mac/stage/mac_02.c rename to src/battle/area/mac/stage/mac_02.c diff --git a/src/battle/area_mim/actor/bzzap.c b/src/battle/area/mim/actor/bzzap.c similarity index 100% rename from src/battle/area_mim/actor/bzzap.c rename to src/battle/area/mim/actor/bzzap.c diff --git a/src/battle/area_mim/actor/forest_fuzzy.c b/src/battle/area/mim/actor/forest_fuzzy.c similarity index 99% rename from src/battle/area_mim/actor/forest_fuzzy.c rename to src/battle/area/mim/actor/forest_fuzzy.c index ad477672b6..25a2401707 100644 --- a/src/battle/area_mim/actor/forest_fuzzy.c +++ b/src/battle/area/mim/actor/forest_fuzzy.c @@ -54,7 +54,7 @@ ActorPartBlueprint N(partsTable_80218478)[] = { .defenseTable = N(defenseTable_802183C0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/area_mim/actor/piranha_plant.c b/src/battle/area/mim/actor/piranha_plant.c similarity index 99% rename from src/battle/area_mim/actor/piranha_plant.c rename to src/battle/area/mim/actor/piranha_plant.c index d09778e204..27b24d6897 100644 --- a/src/battle/area_mim/actor/piranha_plant.c +++ b/src/battle/area/mim/actor/piranha_plant.c @@ -75,7 +75,7 @@ ActorPartBlueprint N(partsTable_8021D44C)[] = { .defenseTable = N(defenseTable_8021D394), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/area_mim/area.c b/src/battle/area/mim/area.c similarity index 65% rename from src/battle/area_mim/area.c rename to src/battle/area/mim/area.c index 677e98ba36..65345d75ae 100644 --- a/src/battle/area_mim/area.c +++ b/src/battle/area/mim/area.c @@ -10,135 +10,135 @@ extern ActorBlueprint N(bzzap); extern Stage N(mim_01); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(forest_fuzzy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(forest_fuzzy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(forest_fuzzy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(forest_fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(forest_fuzzy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(forest_fuzzy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(forest_fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(forest_fuzzy), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(forest_fuzzy), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(forest_fuzzy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(piranha_plant), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(forest_fuzzy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(forest_fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(piranha_plant), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(forest_fuzzy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(forest_fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(piranha_plant), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(piranha_plant), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(forest_fuzzy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(forest_fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(forest_fuzzy), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(piranha_plant), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(forest_fuzzy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(piranha_plant), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(forest_fuzzy), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(piranha_plant), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(piranha_plant), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(piranha_plant), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(piranha_plant), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(piranha_plant), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(piranha_plant), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(piranha_plant), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(piranha_plant), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(piranha_plant), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(piranha_plant), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(piranha_plant), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(piranha_plant), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(forest_fuzzy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(piranha_plant), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(piranha_plant), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(forest_fuzzy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0E) = { +Formation N(Formation_0E) = { { .actor = &N(piranha_plant), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(forest_fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(forest_fuzzy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0F) = { +Formation N(Formation_0F) = { { .actor = &N(piranha_plant), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(forest_fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(piranha_plant), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_10) = { +Formation N(Formation_10) = { { .actor = &N(bzzap), .home = { .index = 5 }, .priority = 10 }, { .actor = &N(bzzap), .home = { .index = 6 }, .priority = 9 }, }; -Formation N(formation_11) = { +Formation N(Formation_11) = { { .actor = &N(bzzap), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(bzzap), .home = { .index = 5 }, .priority = 9 }, { .actor = &N(bzzap), .home = { .index = 6 }, .priority = 8 }, }; -BattleList N(formationTable) = { - BATTLE("グリーンチョロボンx2", N(formation_00), &N(mim_01)), - BATTLE("グリーンチョロボンx3", N(formation_01), &N(mim_01)), - BATTLE("グリーンチョロボンx4", N(formation_02), &N(mim_01)), - BATTLE("グリーンチョロボン,パックンフラワー", N(formation_03), &N(mim_01)), - BATTLE("グリーンチョロボンx2,パックンフラワー", N(formation_04), &N(mim_01)), - BATTLE("グリーンチョロボンx2,パックンフラワーx2", N(formation_05), &N(mim_01)), - BATTLE("グリーンチョロボンx3,パックンフラワー", N(formation_06), &N(mim_01)), - BATTLE("グリーンチョロボン,パックンフラワー,グリーンチョロボン,パックンフラワー", N(formation_07), &N(mim_01)), - BATTLE("パックンフラワー", N(formation_08), &N(mim_01)), - BATTLE("パックンフラワーx2", N(formation_09), &N(mim_01)), - BATTLE("パックンフラワーx3", N(formation_0A), &N(mim_01)), - BATTLE("パックンフラワーx4", N(formation_0B), &N(mim_01)), - BATTLE("パックンフラワー,グリーンチョロボン", N(formation_0C), &N(mim_01)), - BATTLE("パックンフラワーx2,グリーンチョロボン", N(formation_0D), &N(mim_01)), - BATTLE("パックンフラワー,グリーンチョロボンx2", N(formation_0E), &N(mim_01)), - BATTLE("パックンフラワー,グリーンチョロボン,パックンフラワー", N(formation_0F), &N(mim_01)), - BATTLE("ハッチーx2", N(formation_10), &N(mim_01)), - BATTLE("ハッチーx3", N(formation_11), &N(mim_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(mim_01), "グリーンチョロボンx2"), + BATTLE(N(Formation_01), &N(mim_01), "グリーンチョロボンx3"), + BATTLE(N(Formation_02), &N(mim_01), "グリーンチョロボンx4"), + BATTLE(N(Formation_03), &N(mim_01), "グリーンチョロボン,パックンフラワー"), + BATTLE(N(Formation_04), &N(mim_01), "グリーンチョロボンx2,パックンフラワー"), + BATTLE(N(Formation_05), &N(mim_01), "グリーンチョロボンx2,パックンフラワーx2"), + BATTLE(N(Formation_06), &N(mim_01), "グリーンチョロボンx3,パックンフラワー"), + BATTLE(N(Formation_07), &N(mim_01), "グリーンチョロボン,パックンフラワー,グリーンチョロボン,パックンフラワー"), + BATTLE(N(Formation_08), &N(mim_01), "パックンフラワー"), + BATTLE(N(Formation_09), &N(mim_01), "パックンフラワーx2"), + BATTLE(N(Formation_0A), &N(mim_01), "パックンフラワーx3"), + BATTLE(N(Formation_0B), &N(mim_01), "パックンフラワーx4"), + BATTLE(N(Formation_0C), &N(mim_01), "パックンフラワー,グリーンチョロボン"), + BATTLE(N(Formation_0D), &N(mim_01), "パックンフラワーx2,グリーンチョロボン"), + BATTLE(N(Formation_0E), &N(mim_01), "パックンフラワー,グリーンチョロボンx2"), + BATTLE(N(Formation_0F), &N(mim_01), "パックンフラワー,グリーンチョロボン,パックンフラワー"), + BATTLE(N(Formation_10), &N(mim_01), "ハッチーx2"), + BATTLE(N(Formation_11), &N(mim_01), "ハッチーx3"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "mim_01", &N(mim_01) }, {}, }; diff --git a/src/battle/area_mim/stage/mim_01.c b/src/battle/area/mim/stage/mim_01.c similarity index 100% rename from src/battle/area_mim/stage/mim_01.c rename to src/battle/area/mim/stage/mim_01.c diff --git a/src/battle/area_nok/actor/fuzzy.c b/src/battle/area/nok/actor/fuzzy.c similarity index 100% rename from src/battle/area_nok/actor/fuzzy.c rename to src/battle/area/nok/actor/fuzzy.c diff --git a/src/battle/area_nok/actor/goomba.c b/src/battle/area/nok/actor/goomba.c similarity index 100% rename from src/battle/area_nok/actor/goomba.c rename to src/battle/area/nok/actor/goomba.c diff --git a/src/battle/area_nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c similarity index 98% rename from src/battle/area_nok/actor/kent_c_koopa.c rename to src/battle/area/nok/actor/kent_c_koopa.c index ffa38860ac..264b117096 100644 --- a/src/battle/area_nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -89,7 +89,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279DC), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -101,7 +101,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279F0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -113,7 +113,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -125,7 +125,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -137,7 +137,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -149,7 +149,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -161,7 +161,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -173,7 +173,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -185,7 +185,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .defenseTable = N(defenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -1117,7 +1117,7 @@ EvtScript N(8022B2E8) = { EVT_END }; -ApiStatus func_80218C74_48DE14(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218C74_48DE14) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_variable(script, *args++); s32 z = evt_get_variable(script, *args++); @@ -1139,7 +1139,7 @@ ApiStatus func_80218C74_48DE14(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80218DF8_48DF98(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218DF8_48DF98) { Bytecode* args = script->ptrReadPos; Bytecode var1 = *args++; diff --git a/src/battle/area_nok/actor/koopa_troopa.c b/src/battle/area/nok/actor/koopa_troopa.c similarity index 100% rename from src/battle/area_nok/actor/koopa_troopa.c rename to src/battle/area/nok/actor/koopa_troopa.c diff --git a/src/battle/area_nok/actor/paragoomba.c b/src/battle/area/nok/actor/paragoomba.c similarity index 100% rename from src/battle/area_nok/actor/paragoomba.c rename to src/battle/area/nok/actor/paragoomba.c diff --git a/src/battle/area_nok/actor/paratroopa.c b/src/battle/area/nok/actor/paratroopa.c similarity index 100% rename from src/battle/area_nok/actor/paratroopa.c rename to src/battle/area/nok/actor/paratroopa.c diff --git a/src/battle/area_nok/actor/spiked_goomba.c b/src/battle/area/nok/actor/spiked_goomba.c similarity index 100% rename from src/battle/area_nok/actor/spiked_goomba.c rename to src/battle/area/nok/actor/spiked_goomba.c diff --git a/src/battle/area_nok/area.c b/src/battle/area/nok/area.c similarity index 63% rename from src/battle/area_nok/area.c rename to src/battle/area/nok/area.c index fd43c63c6f..ae4b19473a 100644 --- a/src/battle/area_nok/area.c +++ b/src/battle/area/nok/area.c @@ -17,175 +17,175 @@ extern Stage N(nok_02); extern Stage N(nok_03); extern Stage N(nok_04); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(goomba), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(goomba), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(goomba), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(spiked_goomba), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(paragoomba), .home = { .index = 5 }, .priority = 10 }, { .actor = &N(paragoomba), .home = { .index = 6 }, .priority = 9 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(spiked_goomba), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(paragoomba), .home = { .index = 6 }, .priority = 9 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(spiked_goomba), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(spiked_goomba), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(spiked_goomba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(goomba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(goomba), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(spiked_goomba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spiked_goomba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spiked_goomba), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(spiked_goomba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spiked_goomba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spiked_goomba), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(spiked_goomba), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(goomba), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(koopa_troopa), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(koopa_troopa), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(spiked_goomba), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(koopa_troopa), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spiked_goomba), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(koopa_troopa), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spiked_goomba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spiked_goomba), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0E) = { +Formation N(Formation_0E) = { { .actor = &N(koopa_troopa), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(paragoomba), .home = { .index = 5 }, .priority = 9 }, { .actor = &N(paragoomba), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_0F) = { +Formation N(Formation_0F) = { { .actor = &N(koopa_troopa), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spiked_goomba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(paragoomba), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_10) = { +Formation N(Formation_10) = { { .actor = &N(koopa_troopa), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spiked_goomba), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(paragoomba), .home = { .index = 7 }, .priority = 7 }, }; -Formation N(formation_11) = { +Formation N(Formation_11) = { { .actor = &N(paratroopa), .home = { .index = 5 }, .priority = 10 }, { .actor = &N(paratroopa), .home = { .index = 6 }, .priority = 9 }, }; -Formation N(formation_12) = { +Formation N(Formation_12) = { { .actor = &N(paratroopa), .home = { .index = 5 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_13) = { +Formation N(Formation_13) = { { .actor = &N(paratroopa), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spiked_goomba), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_14) = { +Formation N(Formation_14) = { { .actor = &N(paratroopa), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spiked_goomba), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(spiked_goomba), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_15) = { +Formation N(Formation_15) = { { .actor = &N(fuzzy), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_16) = { +Formation N(Formation_16) = { { .actor = &N(fuzzy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(fuzzy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_17) = { +Formation N(Formation_17) = { { .actor = &N(fuzzy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(fuzzy), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(fuzzy), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_18) = { +Formation N(Formation_18) = { { .actor = &N(kent_c_koopa), .home = { .index = 1 }, .priority = 10 }, }; -BattleList N(formationTable) = { - BATTLE("クリボーx２", N(formation_00), &N(nok_02)), - BATTLE("クリボー,トゲクリボー", N(formation_01), &N(nok_02)), - BATTLE("パタクリボーx２", N(formation_02), &N(nok_02)), - BATTLE("トゲクリボー、パタクリボー", N(formation_03), &N(nok_02)), - BATTLE("トゲクリボーx２", N(formation_04), &N(nok_02)), - BATTLE("トゲクリボー、クリボーx2", N(formation_05), &N(nok_02)), - BATTLE("トゲクリボーx３", N(formation_06), &N(nok_02)), - BATTLE("トゲクリボーx４", N(formation_07), &N(nok_02)), - BATTLE("ノコノコ、クリボー", N(formation_08), &N(nok_02)), - BATTLE("ノコノコx２", N(formation_09), &N(nok_02)), - BATTLE("ノコノコx３", N(formation_0A), &N(nok_02)), - BATTLE("ノコノコ、トゲクリボー", N(formation_0B), &N(nok_02)), - BATTLE("ノコノコx2、トゲクリ", N(formation_0C), &N(nok_02)), - BATTLE("ノコノコ、トゲクリボーx2", N(formation_0D), &N(nok_02)), - BATTLE("ノコノコ、パタクリボーx2", N(formation_0E), &N(nok_02)), - BATTLE("ノコノコ、トゲクリボー,パタクリボー", N(formation_0F), &N(nok_02)), - BATTLE("ノコノコx2、トゲクリボー,パタクリボー", N(formation_10), &N(nok_02)), - BATTLE("パタパタx2", N(formation_11), &N(nok_02)), - BATTLE("パタパタ、ノコノコ", N(formation_12), &N(nok_02)), - BATTLE("パタパタ、ノコノコ、トゲクリボー", N(formation_13), &N(nok_02)), - BATTLE("パタパタ、ノコノコ、トゲクリボーx2", N(formation_14), &N(nok_02)), - BATTLE("チョロボン", N(formation_15), &N(nok_02)), - BATTLE("チョロボンx2", N(formation_16), &N(nok_02)), - BATTLE("チョロボンx4", N(formation_17), &N(nok_02)), - BATTLE("ゼニノコー", N(formation_18), &N(nok_02)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(nok_02), "クリボーx２"), + BATTLE(N(Formation_01), &N(nok_02), "クリボー,トゲクリボー"), + BATTLE(N(Formation_02), &N(nok_02), "パタクリボーx２"), + BATTLE(N(Formation_03), &N(nok_02), "トゲクリボー、パタクリボー"), + BATTLE(N(Formation_04), &N(nok_02), "トゲクリボーx２"), + BATTLE(N(Formation_05), &N(nok_02), "トゲクリボー、クリボーx2"), + BATTLE(N(Formation_06), &N(nok_02), "トゲクリボーx３"), + BATTLE(N(Formation_07), &N(nok_02), "トゲクリボーx４"), + BATTLE(N(Formation_08), &N(nok_02), "ノコノコ、クリボー"), + BATTLE(N(Formation_09), &N(nok_02), "ノコノコx２"), + BATTLE(N(Formation_0A), &N(nok_02), "ノコノコx３"), + BATTLE(N(Formation_0B), &N(nok_02), "ノコノコ、トゲクリボー"), + BATTLE(N(Formation_0C), &N(nok_02), "ノコノコx2、トゲクリ"), + BATTLE(N(Formation_0D), &N(nok_02), "ノコノコ、トゲクリボーx2"), + BATTLE(N(Formation_0E), &N(nok_02), "ノコノコ、パタクリボーx2"), + BATTLE(N(Formation_0F), &N(nok_02), "ノコノコ、トゲクリボー,パタクリボー"), + BATTLE(N(Formation_10), &N(nok_02), "ノコノコx2、トゲクリボー,パタクリボー"), + BATTLE(N(Formation_11), &N(nok_02), "パタパタx2"), + BATTLE(N(Formation_12), &N(nok_02), "パタパタ、ノコノコ"), + BATTLE(N(Formation_13), &N(nok_02), "パタパタ、ノコノコ、トゲクリボー"), + BATTLE(N(Formation_14), &N(nok_02), "パタパタ、ノコノコ、トゲクリボーx2"), + BATTLE(N(Formation_15), &N(nok_02), "チョロボン"), + BATTLE(N(Formation_16), &N(nok_02), "チョロボンx2"), + BATTLE(N(Formation_17), &N(nok_02), "チョロボンx4"), + BATTLE(N(Formation_18), &N(nok_02), "ゼニノコー"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "nok_01", &N(nok_01) }, { "nok_02", &N(nok_02) }, { "nok_03", &N(nok_03) }, diff --git a/src/battle/area_nok/stage/nok_01.c b/src/battle/area/nok/stage/nok_01.c similarity index 100% rename from src/battle/area_nok/stage/nok_01.c rename to src/battle/area/nok/stage/nok_01.c diff --git a/src/battle/area_nok/stage/nok_02.c b/src/battle/area/nok/stage/nok_02.c similarity index 100% rename from src/battle/area_nok/stage/nok_02.c rename to src/battle/area/nok/stage/nok_02.c diff --git a/src/battle/area_nok/stage/nok_03.c b/src/battle/area/nok/stage/nok_03.c similarity index 100% rename from src/battle/area_nok/stage/nok_03.c rename to src/battle/area/nok/stage/nok_03.c diff --git a/src/battle/area_nok/stage/nok_04.c b/src/battle/area/nok/stage/nok_04.c similarity index 100% rename from src/battle/area_nok/stage/nok_04.c rename to src/battle/area/nok/stage/nok_04.c diff --git a/src/battle/area_omo/actor/anti_guy.c b/src/battle/area/omo/actor/anti_guy.c similarity index 84% rename from src/battle/area_omo/actor/anti_guy.c rename to src/battle/area/omo/actor/anti_guy.c index f305f41c01..9f31d9879a 100644 --- a/src/battle/area_omo/actor/anti_guy.c +++ b/src/battle/area/omo/actor/anti_guy.c @@ -41,10 +41,14 @@ s32 N(statusTable_8022191C)[] = { STATUS_END, }; +enum PartIDs { + PT_MAIN = 1, +}; + ActorPartBlueprint N(partsTable_802219C8)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, - .index = 1, + .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, @@ -52,8 +56,7 @@ ActorPartBlueprint N(partsTable_802219C8)[] = { .defenseTable = N(defenseTable_80221910), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, }; @@ -107,12 +110,12 @@ EvtScript N(idle_80221AAC) = { EVT_LABEL(0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP) - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 14) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, -4, 14) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 13, 10, 13) EVT_ELSE - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -10) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, 0, 24) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, -1, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_IF EVT_WAIT(1) @@ -126,7 +129,7 @@ EvtScript N(80221BBC) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Black_Anim03) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim01) EVT_RETURN EVT_END }; @@ -234,7 +237,7 @@ EvtScript N(802220FC) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, -1, 1, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -247,14 +250,14 @@ EvtScript N(802220FC) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 751, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim05) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -271,14 +274,14 @@ EvtScript N(802220FC) = { EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Black_Anim04) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim01) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -288,17 +291,17 @@ EvtScript N(802220FC) = { EVT_WAIT(3) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 10) EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim05) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 10, BS_FLAGS1_SP_EVT_ACTIVE) @@ -311,7 +314,7 @@ EvtScript N(802220FC) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim01) EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(80221BBC)) @@ -330,9 +333,9 @@ EvtScript N(80222824) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_234) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim09) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -340,9 +343,9 @@ EvtScript N(80222824) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim04) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_SUB(LVar0, 40) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -353,10 +356,10 @@ EvtScript N(80222824) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim09) EVT_THREAD EVT_WAIT(12) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim0A) EVT_END_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -368,7 +371,7 @@ EvtScript N(80222824) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim05) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -382,24 +385,24 @@ EvtScript N(80222824) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Black_Anim04) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim01) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim09) EVT_THREAD EVT_WAIT(9) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim0A) EVT_END_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -441,9 +444,9 @@ EvtScript N(80222824) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim09) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim07) EVT_WAIT(15) EVT_GOTO(2) EVT_LABEL(1) @@ -454,18 +457,18 @@ EvtScript N(80222824) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim10) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim10) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C3) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim11) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim11) EVT_ELSE - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim13) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim13) EVT_END_IF EVT_WAIT(25) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_LABEL(2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -473,7 +476,7 @@ EvtScript N(80222824) = { EVT_SET_CONST(LVar1, ANIM_ShyGuy_Black_Anim04) EVT_EXEC_WAIT(DoReturnHome) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Black_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/area_omo/actor/blue_shy_guy.c b/src/battle/area/omo/actor/blue_shy_guy.c similarity index 84% rename from src/battle/area_omo/actor/blue_shy_guy.c rename to src/battle/area/omo/actor/blue_shy_guy.c index a9420ffba1..248b434dd4 100644 --- a/src/battle/area_omo/actor/blue_shy_guy.c +++ b/src/battle/area/omo/actor/blue_shy_guy.c @@ -42,10 +42,14 @@ s32 N(statusTable_8021AD24)[] = { STATUS_END, }; +enum PartIDs { + PT_MAIN = 1, +}; + ActorPartBlueprint N(partsTable_8021ADD0)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, - .index = 1, + .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, @@ -53,8 +57,7 @@ ActorPartBlueprint N(partsTable_8021ADD0)[] = { .defenseTable = N(defenseTable_8021AD10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, }; @@ -108,12 +111,12 @@ EvtScript N(idle_8021AEB4) = { EVT_LABEL(0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP) - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 14) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, -4, 14) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 13, 10, 13) EVT_ELSE - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -10) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, 0, 24) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, -1, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_IF EVT_WAIT(1) @@ -127,7 +130,7 @@ EvtScript N(8021AFC4) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Blue_Anim03) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim01) EVT_RETURN EVT_END }; @@ -235,7 +238,7 @@ EvtScript N(8021B504) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, -1, 1, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -248,14 +251,14 @@ EvtScript N(8021B504) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 751, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim05) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -272,14 +275,14 @@ EvtScript N(8021B504) = { EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Blue_Anim04) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim01) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -289,17 +292,17 @@ EvtScript N(8021B504) = { EVT_WAIT(3) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 10) EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim05) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) @@ -312,7 +315,7 @@ EvtScript N(8021B504) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim01) EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(8021AFC4)) @@ -331,9 +334,9 @@ EvtScript N(8021BC2C) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_234) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim09) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -341,9 +344,9 @@ EvtScript N(8021BC2C) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim04) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_SUB(LVar0, 40) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -354,10 +357,10 @@ EvtScript N(8021BC2C) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim09) EVT_THREAD EVT_WAIT(12) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim0A) EVT_END_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -369,7 +372,7 @@ EvtScript N(8021BC2C) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim05) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -383,24 +386,24 @@ EvtScript N(8021BC2C) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Blue_Anim04) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim01) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim09) EVT_THREAD EVT_WAIT(9) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim0A) EVT_END_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -442,9 +445,9 @@ EvtScript N(8021BC2C) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim09) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim07) EVT_WAIT(15) EVT_GOTO(2) EVT_LABEL(1) @@ -455,18 +458,18 @@ EvtScript N(8021BC2C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim10) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim10) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C3) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim11) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim11) EVT_ELSE - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim13) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim13) EVT_END_IF EVT_WAIT(25) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_LABEL(2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -474,7 +477,7 @@ EvtScript N(8021BC2C) = { EVT_SET_CONST(LVar1, ANIM_ShyGuy_Blue_Anim04) EVT_EXEC_WAIT(DoReturnHome) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Blue_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Blue_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/area_omo/actor/green_shy_guy.c b/src/battle/area/omo/actor/green_shy_guy.c similarity index 84% rename from src/battle/area_omo/actor/green_shy_guy.c rename to src/battle/area/omo/actor/green_shy_guy.c index c53ffa00a5..dae1dae2ab 100644 --- a/src/battle/area_omo/actor/green_shy_guy.c +++ b/src/battle/area/omo/actor/green_shy_guy.c @@ -42,10 +42,14 @@ s32 N(statusTable_8021FE24)[] = { STATUS_END, }; +enum PartIDs { + PT_MAIN = 1, +}; + ActorPartBlueprint N(partsTable_8021FED0)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, - .index = 1, + .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, @@ -53,8 +57,7 @@ ActorPartBlueprint N(partsTable_8021FED0)[] = { .defenseTable = N(defenseTable_8021FE10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, }; @@ -108,12 +111,12 @@ EvtScript N(idle_8021FFB4) = { EVT_LABEL(0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP) - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 14) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, -4, 14) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 13, 10, 13) EVT_ELSE - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -10) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, 0, 24) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, -1, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_IF EVT_WAIT(1) @@ -127,7 +130,7 @@ EvtScript N(802200C4) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Green_Anim03) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim01) EVT_RETURN EVT_END }; @@ -235,7 +238,7 @@ EvtScript N(80220604) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, -1, 1, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -248,14 +251,14 @@ EvtScript N(80220604) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 751, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim05) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -272,14 +275,14 @@ EvtScript N(80220604) = { EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Green_Anim04) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim01) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -289,17 +292,17 @@ EvtScript N(80220604) = { EVT_WAIT(3) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 10) EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim05) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) @@ -312,7 +315,7 @@ EvtScript N(80220604) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim01) EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(802200C4)) @@ -331,9 +334,9 @@ EvtScript N(80220D2C) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_234) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim09) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -341,9 +344,9 @@ EvtScript N(80220D2C) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim04) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_SUB(LVar0, 40) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -354,10 +357,10 @@ EvtScript N(80220D2C) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim09) EVT_THREAD EVT_WAIT(12) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim0A) EVT_END_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -369,7 +372,7 @@ EvtScript N(80220D2C) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim05) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -383,24 +386,24 @@ EvtScript N(80220D2C) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Green_Anim04) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim01) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim09) EVT_THREAD EVT_WAIT(9) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim0A) EVT_END_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -442,9 +445,9 @@ EvtScript N(80220D2C) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim09) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim07) EVT_WAIT(15) EVT_GOTO(2) EVT_LABEL(1) @@ -455,18 +458,18 @@ EvtScript N(80220D2C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim10) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim10) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C3) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim11) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim11) EVT_ELSE - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim13) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim13) EVT_END_IF EVT_WAIT(25) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_LABEL(2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -474,7 +477,7 @@ EvtScript N(80220D2C) = { EVT_SET_CONST(LVar1, ANIM_ShyGuy_Green_Anim04) EVT_EXEC_WAIT(DoReturnHome) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Green_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Green_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/area_omo/actor/groove_guy.c b/src/battle/area/omo/actor/groove_guy.c similarity index 87% rename from src/battle/area_omo/actor/groove_guy.c rename to src/battle/area/omo/actor/groove_guy.c index 08afcecb50..264980a46a 100644 --- a/src/battle/area_omo/actor/groove_guy.c +++ b/src/battle/area/omo/actor/groove_guy.c @@ -67,10 +67,14 @@ s32 N(statusTable_80224A40)[] = { BSS PlayerStatus D_802310D0; +enum PartIDs { + PT_MAIN = 1, +}; + ActorPartBlueprint N(partsTable_80224AEC)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, - .index = 1, + .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, @@ -78,7 +82,7 @@ ActorPartBlueprint N(partsTable_80224AEC)[] = { .defenseTable = N(defenseTable_80224A2C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; @@ -120,12 +124,12 @@ EvtScript N(idle_80224B9C) = { EVT_LABEL(0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP) - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 14) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, -4, 14) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, 0, 0) EVT_CALL(N(UnkBattleFunc1), -13, 15, 4, 13) EVT_ELSE - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -10) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, 0, 24) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, 0, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_IF EVT_WAIT(1) @@ -139,7 +143,7 @@ EvtScript N(80224CAC) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_GrooveGuy_Anim04) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim01) EVT_RETURN EVT_END }; @@ -251,7 +255,7 @@ EvtScript N(basicAttack) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -264,11 +268,11 @@ EvtScript N(basicAttack) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 751, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim10) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -287,10 +291,10 @@ EvtScript N(basicAttack) = { EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(80224CAC)) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -301,10 +305,10 @@ EvtScript N(basicAttack) = { EVT_WAIT(3) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim10) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 10) @@ -324,7 +328,7 @@ EvtScript N(basicAttack) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim01) EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(80224CAC)) @@ -343,9 +347,9 @@ EvtScript N(sleepySpin) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim10) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim10) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -354,7 +358,7 @@ EvtScript N(sleepySpin) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0C) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_SET(LVar0, 0) EVT_LOOP(30) EVT_ADD(LVar0, 48) @@ -367,7 +371,7 @@ EvtScript N(sleepySpin) = { EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0B) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0B) EVT_WAIT(20) EVT_IF_EQ(LVar0, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -400,7 +404,7 @@ EvtScript N(sleepySpin) = { EVT_END_THREAD EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E3) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0B) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0B) EVT_SET(LVar0, 0) EVT_LOOP(15) EVT_ADD(LVar0, 24) @@ -409,7 +413,7 @@ EvtScript N(sleepySpin) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0C) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E4) EVT_THREAD @@ -428,7 +432,7 @@ EvtScript N(sleepySpin) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0A) EVT_WAIT(25) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -446,7 +450,7 @@ EvtScript N(getFirstOpenColumn) = { EVT_SET(LocalFlag(2), 0) EVT_SET(LocalFlag(3), 0) EVT_SET(LocalFlag(4), 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar5) @@ -462,7 +466,7 @@ EvtScript N(getFirstOpenColumn) = { EVT_CASE_EQ(3) EVT_SET(LocalFlag(4), 1) EVT_END_SWITCH - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -489,7 +493,7 @@ EvtScript N(getFirstOpenColumn) = { EvtScript N(countActiveSummoners) = { EVT_SET(LVar9, 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -504,7 +508,7 @@ EvtScript N(countActiveSummoners) = { EVT_END_IF EVT_END_IF EVT_END_SWITCH - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -592,7 +596,7 @@ EvtScript N(randomSummon) = { EVT_EXEC_WAIT(N(802271A0)) EVT_END_SWITCH EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802249E0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(idleAnimations_802249E0))) EVT_RETURN EVT_END }; @@ -622,55 +626,55 @@ EvtScript N(8022671C) = { EVT_WAIT(1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E5) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0C) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E5) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0B) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0B) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E5) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0C) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E5) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0D) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0D) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E5) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0C) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E5) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0B) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0B) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E5) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0C) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E5) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0D) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0D) EVT_WAIT(4) EVT_THREAD EVT_WAIT(1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E5) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0C) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_SETF(LVar3, EVT_FLOAT(1.0)) @@ -692,9 +696,9 @@ EvtScript N(8022671C) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 30, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GrooveGuy_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_GrooveGuy_Anim0A) EVT_WAIT(8) EVT_RETURN EVT_END @@ -710,15 +714,15 @@ EvtScript N(80226C00) = { EVT_SET(LVar1, 0) EVT_SET(LVar2, 0) EVT_CALL(SetActorPos, LVarB, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, LVarB, 1, ANIM_ShyGuy_Red_Anim04) + EVT_CALL(SetAnimation, LVarB, PT_MAIN, ANIM_ShyGuy_Red_Anim04) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetGoalToIndex, LVarB, LVarA) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, LVarB, EVT_FLOAT(4.0)) EVT_CALL(RunToGoal, LVarB, 0, FALSE) - EVT_CALL(SetAnimation, LVarB, 1, ANIM_ShyGuy_Red_Anim01) + EVT_CALL(SetAnimation, LVarB, PT_MAIN, ANIM_ShyGuy_Red_Anim01) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, LVarB) @@ -736,7 +740,7 @@ EvtScript N(80226DEC) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_802273C4)), 0) EVT_SET(LVarB, LVar0) - EVT_CALL(SetAnimation, LVarB, 1, ANIM_GrooveGuy_Anim0C) + EVT_CALL(SetAnimation, LVarB, PT_MAIN, ANIM_GrooveGuy_Anim0C) EVT_CALL(SetGoalToIndex, LVarB, LVarA) EVT_CALL(GetGoalPos, LVarB, LVar3, LVar4, LVar5) EVT_ADD(LVar3, 200) @@ -751,24 +755,24 @@ EvtScript N(80226DEC) = { EVT_END_LOOP EVT_CALL(SetActorYaw, LVarB, 0) EVT_END_THREAD - EVT_CALL(SetActorSounds, LVarB, 0, 0, 0) + EVT_CALL(SetActorSounds, LVarB, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_THREAD EVT_LOOP(2) - EVT_CALL(PlaySoundAtActor, LVarB, 0x2E2) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_2E2) EVT_WAIT(25) EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetActorSpeed, LVarB, EVT_FLOAT(4.0)) EVT_CALL(RunToGoal, LVarB, 0, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F3) - EVT_CALL(SetAnimation, LVarB, 1, ANIM_GrooveGuy_Anim0A) + EVT_CALL(SetAnimation, LVarB, PT_MAIN, ANIM_GrooveGuy_Anim0A) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVarB, LVar0, LVar1, LVar2) EVT_WAIT(25) - EVT_CALL(SetAnimation, LVarB, 1, ANIM_GrooveGuy_Anim01) + EVT_CALL(SetAnimation, LVarB, PT_MAIN, ANIM_GrooveGuy_Anim01) EVT_CALL(HPBarToHome, LVarB) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -789,7 +793,7 @@ EvtScript N(802271A0) = { EVT_EXEC_WAIT(N(8022671C)) EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_802273E0)), 0) EVT_SET(LVarB, LVar0) - EVT_CALL(SetAnimation, LVarB, 1, ANIM_MediGuy_Anim05) + EVT_CALL(SetAnimation, LVarB, PT_MAIN, ANIM_MediGuy_Anim05) EVT_ADD(LVarA, 4) EVT_CALL(SetGoalToIndex, LVarB, LVarA) EVT_CALL(GetGoalPos, LVarB, LVar3, LVar4, LVar5) @@ -797,12 +801,12 @@ EvtScript N(802271A0) = { EVT_SET(LVar1, LVar4) EVT_SET(LVar2, LVar5) EVT_CALL(SetActorPos, LVarB, LVar0, LVar1, LVar2) - EVT_CALL(SetActorSounds, LVarB, 0, 896, 0) + EVT_CALL(SetActorSounds, LVarB, ACTOR_SOUND_WALK, SOUND_380, SOUND_0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetActorSpeed, LVarB, EVT_FLOAT(4.0)) EVT_CALL(RunToGoal, LVarB, 0, FALSE) - EVT_CALL(SetAnimation, LVarB, 1, ANIM_MediGuy_Anim01) + EVT_CALL(SetAnimation, LVarB, PT_MAIN, ANIM_MediGuy_Anim01) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, LVarB) diff --git a/src/battle/area_omo/actor/medi_guy.c b/src/battle/area/omo/actor/medi_guy.c similarity index 100% rename from src/battle/area_omo/actor/medi_guy.c rename to src/battle/area/omo/actor/medi_guy.c diff --git a/src/battle/area_omo/actor/pink_shy_guy.c b/src/battle/area/omo/actor/pink_shy_guy.c similarity index 84% rename from src/battle/area_omo/actor/pink_shy_guy.c rename to src/battle/area/omo/actor/pink_shy_guy.c index 6e3425760e..ea0d7d9045 100644 --- a/src/battle/area_omo/actor/pink_shy_guy.c +++ b/src/battle/area/omo/actor/pink_shy_guy.c @@ -42,10 +42,14 @@ s32 N(statusTable_8021E324)[] = { STATUS_END, }; +enum PartIDs { + PT_MAIN = 1, +}; + ActorPartBlueprint N(partsTable_8021E3D0)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, - .index = 1, + .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, @@ -53,8 +57,7 @@ ActorPartBlueprint N(partsTable_8021E3D0)[] = { .defenseTable = N(defenseTable_8021E310), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, }; @@ -108,12 +111,12 @@ EvtScript N(idle_8021E4B4) = { EVT_LABEL(0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP) - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 14) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, -4, 14) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 13, 10, 13) EVT_ELSE - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -10) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, 0, 24) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, -1, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_IF EVT_WAIT(1) @@ -127,7 +130,7 @@ EvtScript N(8021E5C4) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Pink_Anim03) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim01) EVT_RETURN EVT_END }; @@ -235,7 +238,7 @@ EvtScript N(8021EB04) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, -1, 1, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -248,14 +251,14 @@ EvtScript N(8021EB04) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 751, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim05) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -272,14 +275,14 @@ EvtScript N(8021EB04) = { EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Pink_Anim04) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim01) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -289,17 +292,17 @@ EvtScript N(8021EB04) = { EVT_WAIT(3) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 10) EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim05) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) @@ -312,7 +315,7 @@ EvtScript N(8021EB04) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim01) EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(8021E5C4)) @@ -331,9 +334,9 @@ EvtScript N(8021F22C) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_234) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim09) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -341,9 +344,9 @@ EvtScript N(8021F22C) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim04) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_SUB(LVar0, 40) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -354,10 +357,10 @@ EvtScript N(8021F22C) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim09) EVT_THREAD EVT_WAIT(12) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim0A) EVT_END_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -369,7 +372,7 @@ EvtScript N(8021F22C) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim05) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -383,24 +386,24 @@ EvtScript N(8021F22C) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Pink_Anim04) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim01) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim09) EVT_THREAD EVT_WAIT(9) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim0A) EVT_END_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -442,9 +445,9 @@ EvtScript N(8021F22C) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim09) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim07) EVT_WAIT(15) EVT_GOTO(2) EVT_LABEL(1) @@ -455,18 +458,18 @@ EvtScript N(8021F22C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim10) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim10) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C3) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim11) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim11) EVT_ELSE - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim13) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim13) EVT_END_IF EVT_WAIT(25) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_LABEL(2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -474,7 +477,7 @@ EvtScript N(8021F22C) = { EVT_SET_CONST(LVar1, ANIM_ShyGuy_Pink_Anim04) EVT_EXEC_WAIT(DoReturnHome) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Pink_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Pink_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/area_omo/actor/pyro_guy.c b/src/battle/area/omo/actor/pyro_guy.c similarity index 89% rename from src/battle/area_omo/actor/pyro_guy.c rename to src/battle/area/omo/actor/pyro_guy.c index 14f75bdc5b..dad78c884a 100644 --- a/src/battle/area_omo/actor/pyro_guy.c +++ b/src/battle/area/omo/actor/pyro_guy.c @@ -60,10 +60,14 @@ s32 N(statusTable_8022CB88)[] = { STATUS_END, }; +enum PartIDs { + PT_MAIN = 1, +}; + ActorPartBlueprint N(partsTable_8022CC34)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, - .index = 1, + .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, @@ -71,8 +75,7 @@ ActorPartBlueprint N(partsTable_8022CC34)[] = { .defenseTable = N(defenseTable_8022CB4C), .eventFlags = ACTOR_EVENT_FLAG_FIREY, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, }; @@ -113,12 +116,12 @@ EvtScript N(idle_8022CCCC) = { EVT_LABEL(0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP) - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 14) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, -4, 14) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 13, 10, 13) EVT_ELSE - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -10) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, 0, 24) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, -1, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_IF EVT_WAIT(1) @@ -128,8 +131,8 @@ EvtScript N(idle_8022CCCC) = { }; EvtScript N(8022CDDC) = { - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_PyroGuy_Anim04) EVT_SET_CONST(LVar2, ANIM_PyroGuy_Anim01) @@ -240,7 +243,7 @@ EvtScript N(takeTurn_8022D344) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_PyroGuy_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_PyroGuy_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -248,9 +251,9 @@ EvtScript N(takeTurn_8022D344) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_PyroGuy_Anim04) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_PyroGuy_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -263,8 +266,8 @@ EvtScript N(takeTurn_8022D344) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 751, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_PyroGuy_Anim05) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_PyroGuy_Anim05) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -284,17 +287,17 @@ EvtScript N(takeTurn_8022D344) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_EXEC_WAIT(N(8022CDDC)) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_PyroGuy_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_PyroGuy_Anim05) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 10) @@ -315,7 +318,7 @@ EvtScript N(takeTurn_8022D344) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_PyroGuy_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_PyroGuy_Anim01) EVT_WAIT(8) EVT_CALL(YieldTurn) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) diff --git a/src/battle/area_omo/actor/red_shy_guy.c b/src/battle/area/omo/actor/red_shy_guy.c similarity index 100% rename from src/battle/area_omo/actor/red_shy_guy.c rename to src/battle/area/omo/actor/red_shy_guy.c diff --git a/src/battle/area_omo/actor/sky_guy.c b/src/battle/area/omo/actor/sky_guy.c similarity index 75% rename from src/battle/area_omo/actor/sky_guy.c rename to src/battle/area/omo/actor/sky_guy.c index de90481259..03839a1b97 100644 --- a/src/battle/area_omo/actor/sky_guy.c +++ b/src/battle/area/omo/actor/sky_guy.c @@ -135,10 +135,19 @@ s32 N(statusTable_802296D0)[] = { STATUS_END, }; +enum PartIDs { + PT_MAIN = 1, + PT_2 = 2, + PT_3 = 3, + PT_4 = 4, + PT_5 = 5, + PT_6 = 6, +}; + ActorPartBlueprint N(partsTable_8022977C)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, - .index = 1, + .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 32 }, .opacity = 255, @@ -146,11 +155,11 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .defenseTable = N(defenseTable_80229610), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, - .index = 2, + .index = PT_2, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, @@ -158,12 +167,11 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .defenseTable = N(defenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, - .index = 3, + .index = PT_3, .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 50 }, .opacity = 255, @@ -171,13 +179,12 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .defenseTable = N(defenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, - .unk_20 = 0x29007E, + .projectileTargetOffset = { -1, -10 }, + .overrideNameMsg = MSG_EnemyName_Balloon, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, - .index = 4, + .index = PT_4, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, @@ -185,12 +192,11 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .defenseTable = N(defenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, - .index = 5, + .index = PT_5, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, @@ -198,12 +204,11 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .defenseTable = N(defenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, - .index = 6, + .index = PT_6, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, @@ -211,8 +216,7 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .defenseTable = N(defenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, }; @@ -245,17 +249,17 @@ EvtScript N(init_8022987C) = { EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8022A398))) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) - EVT_CALL(SetPartPos, ACTOR_SELF, 4, LVar0, LVar1, LVar2) - EVT_CALL(SetPartPos, ACTOR_SELF, 5, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 0) + EVT_CALL(SetPartPos, ACTOR_SELF, PT_3, LVar0, LVar1, LVar2) + EVT_CALL(SetPartPos, ACTOR_SELF, PT_4, LVar0, LVar1, LVar2) + EVT_CALL(SetPartPos, ACTOR_SELF, PT_5, LVar0, LVar1, LVar2) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_3, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_4, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_5, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 5) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 3, 4, 1) + EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, PT_3, 4, TRUE) EVT_RETURN EVT_END }; @@ -273,16 +277,16 @@ EvtScript N(80229A34) = { EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(GetActorPos, ACTOR_SELF, LVar7, LVar8, LVar9) EVT_ADD(LVar8, 20) - EVT_CALL(PlayEffect, EFFECT_BALLOON, 2, LVar7, LVar8, LVar9, EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BALLOON, 2, LVar7, LVar8, LVar9, EVT_FLOAT(1.0), 150, 0) EVT_SUB(LVar7, 14) EVT_SUB(LVar8, 4) - EVT_CALL(PlayEffect, EFFECT_BALLOON, 0, LVar7, LVar8, LVar9, EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BALLOON, 0, LVar7, LVar8, LVar9, EVT_FLOAT(1.0), 150, 0) EVT_ADD(LVar7, 28) - EVT_CALL(PlayEffect, EFFECT_BALLOON, 1, LVar7, LVar8, LVar9, EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BALLOON, 1, LVar7, LVar8, LVar9, EVT_FLOAT(1.0), 150, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_3, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_4, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_5, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_EXEC_WAIT(DoDeath) EVT_END_IF EVT_RETURN @@ -290,44 +294,44 @@ EvtScript N(80229A34) = { }; EvtScript N(80229C40) = { - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SkyGuy_Anim02) - EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_SkyGuy_Anim13) - EVT_CALL(SetAnimation, ACTOR_SELF, 4, ANIM_SkyGuy_Anim12) - EVT_CALL(SetAnimation, ACTOR_SELF, 5, ANIM_SkyGuy_Anim14) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_2, ANIM_SkyGuy_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_3, ANIM_SkyGuy_Anim13) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_4, ANIM_SkyGuy_Anim12) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_5, ANIM_SkyGuy_Anim14) EVT_RETURN EVT_END }; EvtScript N(80229CB0) = { - EVT_CALL(MakeLerp, 100, 80, 7, 5) + EVT_CALL(MakeLerp, 100, 80, 7, EASING_CUBIC_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_DIVF(LVar0, EVT_FLOAT(100.0)) EVT_SETF(LVar2, EVT_FLOAT(2.0)) EVT_SUBF(LVar2, LVar0) - EVT_CALL(SetPartScale, ACTOR_SELF, 3, LVar2, LVar0, EVT_FLOAT(1.0)) - EVT_CALL(SetPartScale, ACTOR_SELF, 4, LVar2, LVar0, EVT_FLOAT(1.0)) - EVT_CALL(SetPartScale, ACTOR_SELF, 5, LVar2, LVar0, EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, PT_3, LVar2, LVar0, EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, PT_4, LVar2, LVar0, EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, PT_5, LVar2, LVar0, EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(MakeLerp, 80, 100, 7, 8) + EVT_CALL(MakeLerp, 80, 100, 7, EASING_COS_FAST_OVERSHOOT) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_DIVF(LVar0, EVT_FLOAT(100.0)) EVT_SETF(LVar2, EVT_FLOAT(2.0)) EVT_SUBF(LVar2, LVar0) - EVT_CALL(SetPartScale, ACTOR_SELF, 3, LVar2, LVar0, EVT_FLOAT(1.0)) - EVT_CALL(SetPartScale, ACTOR_SELF, 4, LVar2, LVar0, EVT_FLOAT(1.0)) - EVT_CALL(SetPartScale, ACTOR_SELF, 5, LVar2, LVar0, EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, PT_3, LVar2, LVar0, EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, PT_4, LVar2, LVar0, EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, PT_5, LVar2, LVar0, EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_IF_EQ(LVar1, 1) EVT_GOTO(1) EVT_END_IF - EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_CALL(SetPartScale, ACTOR_SELF, 4, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_CALL(SetPartScale, ACTOR_SELF, 5, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, PT_3, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, PT_4, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, PT_5, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_RETURN EVT_END }; @@ -343,47 +347,47 @@ EvtScript N(80229F08) = { EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E1) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_SkyGuy_Anim2E) - EVT_CALL(SetAnimation, ACTOR_SELF, 4, ANIM_SkyGuy_Anim2D) - EVT_CALL(SetAnimation, ACTOR_SELF, 5, ANIM_SkyGuy_Anim2F) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_3, ANIM_SkyGuy_Anim2E) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_4, ANIM_SkyGuy_Anim2D) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_5, ANIM_SkyGuy_Anim2F) EVT_WAIT(30) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_3, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_4, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_5, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 2) EVT_WAIT(15) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SkyGuy_Anim00) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_2, ANIM_SkyGuy_Anim00) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263) - EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 24, 0, 25, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 24, 0, 25, 0, 0) EVT_WAIT(25) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SkyGuy_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_2, ANIM_SkyGuy_Anim06) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SkyGuy_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_2, ANIM_SkyGuy_Anim06) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 769, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 120, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) - EVT_CALL(SetPartFlags, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_NO_TARGET) - EVT_CALL(SetPartFlags, ACTOR_SELF, 1, ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_MULTI_TARGET) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim12) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) + EVT_CALL(SetPartFlags, ACTOR_SELF, PT_2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_NO_TARGET) + EVT_CALL(SetPartFlags, ACTOR_SELF, PT_MAIN, ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_MULTI_TARGET) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim12) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 0, 0) EVT_WAIT(40) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8022CA9C))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8022B19C))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8022B310))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_SHY_GUY) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, TRUE) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_ELSE @@ -464,11 +468,11 @@ EvtScript N(handleEvent_8022A398) = { EVT_CALL(HPBarToCurrent, ACTOR_SELF) EVT_CASE_EQ(EVENT_END_FIRST_STRIKE) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SkyGuy_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_2, ANIM_SkyGuy_Anim03) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SkyGuy_Anim01) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_2, ANIM_SkyGuy_Anim01) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CASE_EQ(EVENT_RECOVER_STATUS) @@ -476,12 +480,12 @@ EvtScript N(handleEvent_8022A398) = { EVT_SET_CONST(LVar1, ANIM_SkyGuy_Anim01) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_SkyGuy_Anim1F) - EVT_CALL(SetAnimation, ACTOR_SELF, 4, ANIM_SkyGuy_Anim1E) - EVT_CALL(SetAnimation, ACTOR_SELF, 5, ANIM_SkyGuy_Anim20) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_4, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_5, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, FALSE) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_3, ANIM_SkyGuy_Anim1F) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_4, ANIM_SkyGuy_Anim1E) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_5, ANIM_SkyGuy_Anim20) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_SkyGuy_Anim03) EVT_SET_CONST(LVar2, ANIM_SkyGuy_Anim06) @@ -515,17 +519,17 @@ EvtScript N(takeTurn_8022A9D0) = { EVT_CALL(MoveBattleCamOver, 1) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E7) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SkyGuy_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_2, ANIM_SkyGuy_Anim08) EVT_WAIT(12) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_ADD(LVar2, 2) - EVT_CALL(SetPartPos, ACTOR_SELF, 6, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, 6, ANIM_SkyGuy_Anim0B) + EVT_CALL(SetPartPos, ACTOR_SELF, PT_6, LVar0, LVar1, LVar2) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_6, ANIM_SkyGuy_Anim0B) EVT_WAIT(12) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_6, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E8) - EVT_CALL(SetPartSounds, ACTOR_SELF, 6, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, PT_6, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) EVT_CASE_EQ(HIT_RESULT_MISS) @@ -534,10 +538,10 @@ EvtScript N(takeTurn_8022A9D0) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 120) EVT_SET(LVar1, 0) - EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(12.0)) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.1)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PT_6, EVT_FLOAT(12.0)) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PT_6, EVT_FLOAT(0.1)) + EVT_CALL(JumpPartTo, ACTOR_SELF, PT_6, LVar0, LVar1, LVar2, 0, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_EXEC_WAIT(N(80229C40)) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -548,18 +552,18 @@ EvtScript N(takeTurn_8022A9D0) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 50) EVT_SET(LVar1, -5) - EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(14.0)) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.1)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 30, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SkyGuy_Anim07) + EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PT_6, EVT_FLOAT(14.0)) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PT_6, EVT_FLOAT(0.1)) + EVT_CALL(FlyPartTo, ACTOR_SELF, PT_6, LVar0, LVar1, LVar2, 0, 30, EASING_LINEAR) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_2, ANIM_SkyGuy_Anim07) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 65) EVT_SET(LVar1, -5) - EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(6.0)) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.1)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 15, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PT_6, EVT_FLOAT(6.0)) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PT_6, EVT_FLOAT(0.1)) + EVT_CALL(FlyPartTo, ACTOR_SELF, PT_6, LVar0, LVar1, LVar2, 0, 15, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_EXEC_WAIT(N(80229C40)) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -568,9 +572,9 @@ EvtScript N(takeTurn_8022A9D0) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(14.0)) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.1)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 15, 0) + EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PT_6, EVT_FLOAT(14.0)) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PT_6, EVT_FLOAT(0.1)) + EVT_CALL(FlyPartTo, ACTOR_SELF, PT_6, LVar0, LVar1, LVar2, 0, 15, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVarF) @@ -579,13 +583,13 @@ EvtScript N(takeTurn_8022A9D0) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 55) EVT_SET(LVar1, 0) - EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(6.0)) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.1)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 25, 0) - EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(4.0)) + EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PT_6, EVT_FLOAT(6.0)) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PT_6, EVT_FLOAT(0.1)) + EVT_CALL(FlyPartTo, ACTOR_SELF, PT_6, LVar0, LVar1, LVar2, 0, 25, EASING_LINEAR) + EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PT_6, EVT_FLOAT(4.0)) EVT_SUB(LVar0, 20) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 21, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(FlyPartTo, ACTOR_SELF, PT_6, LVar0, LVar1, LVar2, 0, 21, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_EXEC_WAIT(N(80229C40)) @@ -622,12 +626,12 @@ EvtScript N(idle_8022B19C) = { EVT_LABEL(0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP) - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 14) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, -4, 14) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 13, 10, 13) EVT_ELSE - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -10) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, 0, 24) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, -1, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_IF EVT_WAIT(1) @@ -641,7 +645,7 @@ EvtScript N(8022B2AC) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Red_Anim03) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim01) EVT_RETURN EVT_END }; @@ -749,7 +753,7 @@ EvtScript N(8022B7EC) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, -1, 1, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -762,14 +766,14 @@ EvtScript N(8022B7EC) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 751, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim05) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -786,14 +790,14 @@ EvtScript N(8022B7EC) = { EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Red_Anim04) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim01) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -803,17 +807,17 @@ EvtScript N(8022B7EC) = { EVT_WAIT(3) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 10) EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim05) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) @@ -826,7 +830,7 @@ EvtScript N(8022B7EC) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim01) EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(8022B2AC)) @@ -845,9 +849,9 @@ EvtScript N(8022BF14) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_234) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -855,9 +859,9 @@ EvtScript N(8022BF14) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim04) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_SUB(LVar0, 40) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -868,10 +872,10 @@ EvtScript N(8022BF14) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim09) EVT_THREAD EVT_WAIT(12) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim0A) EVT_END_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -883,7 +887,7 @@ EvtScript N(8022BF14) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim05) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -897,24 +901,24 @@ EvtScript N(8022BF14) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Red_Anim04) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim01) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim09) EVT_THREAD EVT_WAIT(9) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim0A) EVT_END_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -956,9 +960,9 @@ EvtScript N(8022BF14) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim09) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim07) EVT_WAIT(15) EVT_GOTO(2) EVT_LABEL(1) @@ -969,18 +973,18 @@ EvtScript N(8022BF14) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim10) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim10) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C3) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim11) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim11) EVT_ELSE - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim13) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim13) EVT_END_IF EVT_WAIT(25) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_LABEL(2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -988,7 +992,7 @@ EvtScript N(8022BF14) = { EVT_SET_CONST(LVar1, ANIM_ShyGuy_Red_Anim04) EVT_EXEC_WAIT(DoReturnHome) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Red_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/area_omo/actor/spy_guy.c b/src/battle/area/omo/actor/spy_guy.c similarity index 79% rename from src/battle/area_omo/actor/spy_guy.c rename to src/battle/area/omo/actor/spy_guy.c index bcf5115730..3e7ffcfb4a 100644 --- a/src/battle/area_omo/actor/spy_guy.c +++ b/src/battle/area/omo/actor/spy_guy.c @@ -43,40 +43,45 @@ s32 N(idleAnimations_80227498)[] = { }; s32 N(defenseTable_802274A4)[] = { - ELEMENT_NORMAL, 0, - ELEMENT_SHOCK, 0, + ELEMENT_NORMAL, 0, + ELEMENT_SHOCK, 0, ELEMENT_END, }; s32 N(statusTable_802274B8)[] = { - STATUS_NORMAL, 0, - STATUS_DEFAULT, 0, - STATUS_SLEEP, 70, - STATUS_POISON, 50, - STATUS_FROZEN, 0, - STATUS_DIZZY, 80, - STATUS_FEAR, 100, - STATUS_STATIC, 0, - STATUS_PARALYZE, 90, - STATUS_SHRINK, 75, - STATUS_STOP, 90, - STATUS_DEFAULT_TURN_MOD, 0, - STATUS_SLEEP_TURN_MOD, 0, - STATUS_POISON_TURN_MOD, 0, - STATUS_FROZEN_TURN_MOD, 0, - STATUS_DIZZY_TURN_MOD, 0, - STATUS_FEAR_TURN_MOD, 0, - STATUS_STATIC_TURN_MOD, 0, - STATUS_PARALYZE_TURN_MOD, 1, - STATUS_SHRINK_TURN_MOD, 0, - STATUS_STOP_TURN_MOD, 0, + STATUS_NORMAL, 0, + STATUS_DEFAULT, 0, + STATUS_SLEEP, 70, + STATUS_POISON, 50, + STATUS_FROZEN, 0, + STATUS_DIZZY, 80, + STATUS_FEAR, 100, + STATUS_STATIC, 0, + STATUS_PARALYZE, 90, + STATUS_SHRINK, 75, + STATUS_STOP, 90, + STATUS_DEFAULT_TURN_MOD, 0, + STATUS_SLEEP_TURN_MOD, 0, + STATUS_POISON_TURN_MOD, 0, + STATUS_FROZEN_TURN_MOD, 0, + STATUS_DIZZY_TURN_MOD, 0, + STATUS_FEAR_TURN_MOD, 0, + STATUS_STATIC_TURN_MOD, 0, + STATUS_PARALYZE_TURN_MOD, 1, + STATUS_SHRINK_TURN_MOD, 0, + STATUS_STOP_TURN_MOD, 0, STATUS_END, }; +enum PartIDs { + PT_MAIN = 1, + PT_2 = 2, +}; + ActorPartBlueprint N(partsTable_80227564)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, - .index = 1, + .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 30 }, .opacity = 255, @@ -84,12 +89,11 @@ ActorPartBlueprint N(partsTable_80227564)[] = { .defenseTable = N(defenseTable_802274A4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF3, + .projectileTargetOffset = { -1, -13 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, - .index = 2, + .index = PT_2, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, @@ -97,8 +101,7 @@ ActorPartBlueprint N(partsTable_80227564)[] = { .defenseTable = N(defenseTable_802274A4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, }; @@ -134,8 +137,8 @@ EvtScript N(init_802275D4) = { EVT_CALL(GetInstigatorValue, ACTOR_SELF, LVar0) EVT_IF_NE(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022744C))) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim02) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(idleAnimations_8022744C))) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim02) EVT_END_IF EVT_RETURN EVT_END @@ -164,9 +167,9 @@ EvtScript N(802276D4) = { EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim02) EVT_CASE_EQ(1) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim03) EVT_END_SWITCH EVT_LABEL(0) EVT_CALL(GetBattleFlags, LVar0) @@ -178,26 +181,26 @@ EvtScript N(802276D4) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80227400))) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim17) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(idleAnimations_80227400))) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim17) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim19) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim19) EVT_WAIT(5) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim03) EVT_CASE_EQ(1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022744C))) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim18) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(idleAnimations_8022744C))) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim18) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim1A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim1A) EVT_WAIT(5) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim02) EVT_END_SWITCH EVT_WAIT(10) EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0) @@ -336,21 +339,21 @@ EvtScript N(slingshotAttack) = { EVT_CALL(MoveBattleCamOver, 1) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E7) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim15) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim15) EVT_WAIT(12) EVT_WAIT(12) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim16) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim16) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 10) EVT_ADD(LVar1, 10) - EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartPos, ACTOR_SELF, PT_2, LVar0, LVar1, LVar2) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(SetPartScale, ACTOR_SELF, 2, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) + EVT_CALL(SetPartScale, ACTOR_SELF, PT_2, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E8) - EVT_CALL(SetPartSounds, ACTOR_SELF, 2, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, PT_2, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -359,7 +362,7 @@ EvtScript N(slingshotAttack) = { EVT_THREAD EVT_LOOP(0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(GetPartOffset, ACTOR_SELF, 2, LVar3, LVar4, LVar5) + EVT_CALL(GetPartOffset, ACTOR_SELF, PT_2, LVar3, LVar4, LVar5) EVT_IF_GT(LVar0, LVar3) EVT_BREAK_LOOP EVT_END_IF @@ -372,14 +375,14 @@ EvtScript N(slingshotAttack) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -100, 0, 0) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(14.0)) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.002)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PT_2, EVT_FLOAT(14.0)) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PT_2, EVT_FLOAT(0.002)) + EVT_CALL(JumpPartTo, ACTOR_SELF, PT_2, LVar0, LVar1, LVar2, 0, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(15) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -388,19 +391,19 @@ EvtScript N(slingshotAttack) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(14.0)) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.002)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 1) + EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PT_2, EVT_FLOAT(14.0)) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PT_2, EVT_FLOAT(0.002)) + EVT_CALL(JumpPartTo, ACTOR_SELF, PT_2, LVar0, LVar1, LVar2, 0, TRUE) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_CALL(GetPartOffset, ACTOR_SELF, 2, LVar0, LVar1, LVar2) + EVT_CALL(GetPartOffset, ACTOR_SELF, PT_2, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 100) - EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.7)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 30, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PT_2, EVT_FLOAT(0.7)) + EVT_CALL(JumpPartTo, ACTOR_SELF, PT_2, LVar0, 0, LVar2, 30, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, PT_2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(YieldTurn) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -430,7 +433,7 @@ EvtScript N(80228778) = { EVT_SET(LVar2, 0) EVT_SUB(LVar3, 1) EVT_CALL(N(DisableRandomAbility), LVar4, LVar5) - EVT_CALL(MakeItemEntity, LVar4, LVar1, LVar2, LVar3, 1, 0) + EVT_CALL(MakeItemEntity, LVar4, LVar1, LVar2, LVar3, ITEM_SPAWN_MODE_DECORATION, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 1, LVar0) EVT_ADD(LVar1, 30) EVT_CALL(N(ItemEntityJumpToPos), LVar0, LVar1, LVar2, LVar3, 20, EVT_FLOAT(1.0)) @@ -460,14 +463,14 @@ EvtScript N(hammerAttack) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim07) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 70, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim07) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim07) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -475,7 +478,7 @@ EvtScript N(hammerAttack) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 20, 0, 0) EVT_END_IF EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim03) EVT_WAIT(10) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_THREAD @@ -487,7 +490,7 @@ EvtScript N(hammerAttack) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim0A) EVT_WAIT(6) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -495,18 +498,18 @@ EvtScript N(hammerAttack) = { EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpyGuy_Anim07) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim0A) EVT_WAIT(5) EVT_WAIT(2) EVT_WAIT(2) @@ -541,20 +544,20 @@ EvtScript N(hammerAttack) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_EXEC(N(80228778)) EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim07) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 70) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim03) EVT_LABEL(0) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_NE(LVar0, 0) EVT_WAIT(1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim07) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_CALL(N(GetItemEntityPosition), LVar0, LVar1, LVar2, LVar3) EVT_ADD(LVar1, 20) @@ -567,25 +570,25 @@ EvtScript N(hammerAttack) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DC) EVT_CALL(N(StartRumbleWithParams), 200, 10) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim09) EVT_WAIT(5) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 2) EVT_SUB(LVar1, 7) - EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LVar1, LVar2, LVar3, EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, LVar2, LVar3, EVT_FLOAT(1.0), 0, 0) EVT_WAIT(40) EVT_ELSE EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim07) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 70) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim03) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 25, -45, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 25, -45, 20, 0, 0) EVT_WAIT(20) EVT_END_IF EVT_LABEL(100) @@ -605,8 +608,8 @@ EvtScript N(takeTurn_802293DC) = { EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022744C))) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpyGuy_Anim02) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(idleAnimations_8022744C))) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim02) EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_SWITCH(LVar0) diff --git a/src/battle/area_omo/actor/yellow_shy_guy.c b/src/battle/area/omo/actor/yellow_shy_guy.c similarity index 83% rename from src/battle/area_omo/actor/yellow_shy_guy.c rename to src/battle/area/omo/actor/yellow_shy_guy.c index abb41e2bb2..08e95d7fd7 100644 --- a/src/battle/area_omo/actor/yellow_shy_guy.c +++ b/src/battle/area/omo/actor/yellow_shy_guy.c @@ -42,10 +42,14 @@ s32 N(statusTable_8021C824)[] = { STATUS_END, }; +enum PartIDs { + PT_MAIN = 1, +}; + ActorPartBlueprint N(partsTable_8021C8D0)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, - .index = 1, + .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, @@ -53,8 +57,7 @@ ActorPartBlueprint N(partsTable_8021C8D0)[] = { .defenseTable = N(defenseTable_8021C810), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, }; @@ -108,12 +111,12 @@ EvtScript N(idle_8021C9B4) = { EVT_LABEL(0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP) - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 14) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, -4, 14) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 13, 10, 13) EVT_ELSE - EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -10) + EVT_CALL(SetTargetOffset, ACTOR_SELF, PT_MAIN, 0, 24) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, PT_MAIN, -1, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_IF EVT_WAIT(1) @@ -127,7 +130,7 @@ EvtScript N(8021CAC4) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Yellow_Anim03) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim01) EVT_RETURN EVT_END }; @@ -235,7 +238,7 @@ EvtScript N(8021D004) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, -1, 1, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -248,14 +251,14 @@ EvtScript N(8021D004) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 751, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim05) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -272,14 +275,14 @@ EvtScript N(8021D004) = { EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Yellow_Anim04) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim01) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -289,17 +292,17 @@ EvtScript N(8021D004) = { EVT_WAIT(3) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 10) EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim05) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) @@ -312,7 +315,7 @@ EvtScript N(8021D004) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim01) EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(8021CAC4)) @@ -331,9 +334,9 @@ EvtScript N(8021D72C) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_234) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim09) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -341,9 +344,9 @@ EvtScript N(8021D72C) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 8378, 948) - EVT_CALL(SetActorSounds, ACTOR_SELF, 4, 10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim04) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_SUB(LVar0, 40) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -354,10 +357,10 @@ EvtScript N(8021D72C) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim09) EVT_THREAD EVT_WAIT(12) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim0A) EVT_END_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -369,7 +372,7 @@ EvtScript N(8021D72C) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim05) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -383,24 +386,24 @@ EvtScript N(8021D72C) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ShyGuy_Yellow_Anim04) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim01) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim09) EVT_THREAD EVT_WAIT(9) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim0A) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim0A) EVT_END_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -442,9 +445,9 @@ EvtScript N(8021D72C) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim09) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim09) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim07) EVT_WAIT(15) EVT_GOTO(2) EVT_LABEL(1) @@ -455,18 +458,18 @@ EvtScript N(8021D72C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim10) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim10) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C3) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, PT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim11) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim11) EVT_ELSE - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim13) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim13) EVT_END_IF EVT_WAIT(25) - EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) + EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PT_MAIN, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_LABEL(2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -474,7 +477,7 @@ EvtScript N(8021D72C) = { EVT_SET_CONST(LVar1, ANIM_ShyGuy_Yellow_Anim04) EVT_EXEC_WAIT(DoReturnHome) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Yellow_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_ShyGuy_Yellow_Anim01) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/area_omo/area.c b/src/battle/area/omo/area.c similarity index 69% rename from src/battle/area_omo/area.c rename to src/battle/area/omo/area.c index 7c7e1eada5..2fc774d094 100644 --- a/src/battle/area_omo/area.c +++ b/src/battle/area/omo/area.c @@ -26,319 +26,319 @@ extern Stage N(omo_05b); extern Stage N(omo_06); extern Stage N(omo_07); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(red_shy_guy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(red_shy_guy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(blue_shy_guy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(blue_shy_guy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(yellow_shy_guy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(yellow_shy_guy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(yellow_shy_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(yellow_shy_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(yellow_shy_guy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(pink_shy_guy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(pink_shy_guy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(green_shy_guy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(green_shy_guy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(red_shy_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(medi_guy), .home = { .index = 5 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(blue_shy_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(groove_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(yellow_shy_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spy_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(yellow_shy_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(green_shy_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(red_shy_guy), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(blue_shy_guy), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(pink_shy_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pyro_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(pink_shy_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(groove_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, { .actor = &N(medi_guy), .home = { .index = 7 }, .priority = 7 }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(green_shy_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(sky_guy), .home = { .index = 5 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(sky_guy), .home = { .index = 5 }, .priority = 10 }, { .actor = &N(sky_guy), .home = { .index = 6 }, .priority = 9 }, }; -Formation N(formation_0E) = { +Formation N(Formation_0E) = { { .actor = &N(sky_guy), .home = { .index = 5 }, .priority = 10 }, { .actor = &N(yellow_shy_guy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0F) = { +Formation N(Formation_0F) = { { .actor = &N(sky_guy), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(sky_guy), .home = { .index = 5 }, .priority = 9 }, { .actor = &N(yellow_shy_guy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_10) = { +Formation N(Formation_10) = { { .actor = &N(sky_guy), .home = { .index = 5 }, .priority = 10 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 9 }, }; -Formation N(formation_11) = { +Formation N(Formation_11) = { { .actor = &N(sky_guy), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(sky_guy), .home = { .index = 5 }, .priority = 9 }, { .actor = &N(spy_guy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_12) = { +Formation N(Formation_12) = { { .actor = &N(sky_guy), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(green_shy_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_13) = { +Formation N(Formation_13) = { { .actor = &N(sky_guy), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(green_shy_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, { .actor = &N(medi_guy), .home = { .index = 7 }, .priority = 7 }, }; -Formation N(formation_14) = { +Formation N(Formation_14) = { { .actor = &N(sky_guy), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(groove_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_15) = { +Formation N(Formation_15) = { { .actor = &N(spy_guy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(spy_guy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_16) = { +Formation N(Formation_16) = { { .actor = &N(spy_guy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(pyro_guy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_17) = { +Formation N(Formation_17) = { { .actor = &N(spy_guy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 9 }, }; -Formation N(formation_18) = { +Formation N(Formation_18) = { { .actor = &N(spy_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spy_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_19) = { +Formation N(Formation_19) = { { .actor = &N(spy_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spy_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spy_guy), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(medi_guy), .home = { .index = 7 }, .priority = 7 }, }; -Formation N(formation_1A) = { +Formation N(Formation_1A) = { { .actor = &N(spy_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spy_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spy_guy), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(spy_guy), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_1B) = { +Formation N(Formation_1B) = { { .actor = &N(spy_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pyro_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(groove_guy), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(medi_guy), .home = { .index = 7 }, .priority = 7 }, }; -Formation N(formation_1C) = { +Formation N(Formation_1C) = { { .actor = &N(pyro_guy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(pyro_guy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_1D) = { +Formation N(Formation_1D) = { { .actor = &N(pyro_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pyro_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(pyro_guy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_1E) = { +Formation N(Formation_1E) = { { .actor = &N(pyro_guy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 9 }, }; -Formation N(formation_1F) = { +Formation N(Formation_1F) = { { .actor = &N(pyro_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pyro_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_20) = { +Formation N(Formation_20) = { { .actor = &N(pyro_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pyro_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, { .actor = &N(medi_guy), .home = { .index = 7 }, .priority = 7 }, }; -Formation N(formation_21) = { +Formation N(Formation_21) = { { .actor = &N(pyro_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(groove_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(pyro_guy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_22) = { +Formation N(Formation_22) = { { .actor = &N(pyro_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(spy_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(groove_guy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_23) = { +Formation N(Formation_23) = { { .actor = &N(pyro_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(groove_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, { .actor = &N(medi_guy), .home = { .index = 7 }, .priority = 7 }, }; -Formation N(formation_24) = { +Formation N(Formation_24) = { { .actor = &N(pyro_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pyro_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(spy_guy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_25) = { +Formation N(Formation_25) = { { .actor = &N(groove_guy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(groove_guy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_26) = { +Formation N(Formation_26) = { { .actor = &N(groove_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(groove_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(groove_guy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_27) = { +Formation N(Formation_27) = { { .actor = &N(groove_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(medi_guy), .home = { .index = 5 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_28) = { +Formation N(Formation_28) = { { .actor = &N(groove_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(groove_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_29) = { +Formation N(Formation_29) = { { .actor = &N(groove_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(groove_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(medi_guy), .home = { .index = 6 }, .priority = 8 }, { .actor = &N(medi_guy), .home = { .index = 7 }, .priority = 7 }, }; -Formation N(formation_2A) = { +Formation N(Formation_2A) = { { .actor = &N(groove_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(groove_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(pyro_guy), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_2B) = { +Formation N(Formation_2B) = { { .actor = &N(groove_guy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(blue_shy_guy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(sky_guy), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_2C) = { +Formation N(Formation_2C) = { { .actor = &N(anti_guy), .home = { .index = 1 }, .priority = 10 }, }; -BattleList N(formationTable) = { - BATTLE("あかx２", N(formation_00), &N(omo_04)), - BATTLE("あおx２", N(formation_01), &N(omo_04)), - BATTLE("きいろx２", N(formation_02), &N(omo_04)), - BATTLE("きいろx３", N(formation_03), &N(omo_04)), - BATTLE("ももx２", N(formation_04), &N(omo_04)), - BATTLE("みどりx２", N(formation_05), &N(omo_04)), - BATTLE("あか,かいふくx２", N(formation_06), &N(omo_04)), - BATTLE("あお,ダンシング,かいふく", N(formation_07), &N(omo_04)), - BATTLE("きいろ,コマンド,かいふく", N(formation_08), &N(omo_04)), - BATTLE("きいろ,みどり,あか,あお", N(formation_09), &N(omo_04)), - BATTLE("もも,ファイア,かいふく", N(formation_0A), &N(omo_04)), - BATTLE("もも,ダンシング,かいふくx２", N(formation_0B), &N(omo_04)), - BATTLE("みどり,バルーン,かいふく", N(formation_0C), &N(omo_04)), - BATTLE("バルーンx２", N(formation_0D), &N(omo_04)), - BATTLE("バルーン,きいろ", N(formation_0E), &N(omo_04)), - BATTLE("バルーンx２,きいろ", N(formation_0F), &N(omo_04)), - BATTLE("バルーン,かいふく", N(formation_10), &N(omo_04)), - BATTLE("バルーンx２,コマンド", N(formation_11), &N(omo_04)), - BATTLE("バルーン,みどり,かいふく", N(formation_12), &N(omo_04)), - BATTLE("バルーン,みどり,かいふくx２", N(formation_13), &N(omo_04)), - BATTLE("バルーン,ダンシング,かいふく", N(formation_14), &N(omo_04)), - BATTLE("コマンドx２", N(formation_15), &N(omo_04)), - BATTLE("コマンド,ファイア", N(formation_16), &N(omo_04)), - BATTLE("コマンド,かいふく", N(formation_17), &N(omo_04)), - BATTLE("コマンドx２,かいふく", N(formation_18), &N(omo_04)), - BATTLE("コマンドx３,かいふく", N(formation_19), &N(omo_04)), - BATTLE("コマンドx４", N(formation_1A), &N(omo_04)), - BATTLE("コマンド,ファイア,ダンシング,かいふく", N(formation_1B), &N(omo_04)), - BATTLE("ファイアx２", N(formation_1C), &N(omo_04)), - BATTLE("ファイアx３", N(formation_1D), &N(omo_04)), - BATTLE("ファイア,かいふく", N(formation_1E), &N(omo_04)), - BATTLE("ファイアx２,かいふく", N(formation_1F), &N(omo_04)), - BATTLE("ファイアx２,かいふくx２", N(formation_20), &N(omo_04)), - BATTLE("ファイア,ダンシング,ファイア", N(formation_21), &N(omo_04)), - BATTLE("ファイア,コマンド,ダンシング", N(formation_22), &N(omo_04)), - BATTLE("ファイア,ダンシング,かいふくx2", N(formation_23), &N(omo_04)), - BATTLE("ファイアx2,コマンド", N(formation_24), &N(omo_04)), - BATTLE("ダンシングx２", N(formation_25), &N(omo_04)), - BATTLE("ダンシングx３", N(formation_26), &N(omo_04)), - BATTLE("ダンシング,かいふくx２", N(formation_27), &N(omo_04)), - BATTLE("ダンシングx２,かいふく", N(formation_28), &N(omo_04)), - BATTLE("ダンシングx２,かいふくx２", N(formation_29), &N(omo_04)), - BATTLE("ダンシングx２,ファイアー", N(formation_2A), &N(omo_04)), - BATTLE("ダンシング,あお,バルーン", N(formation_2B), &N(omo_04)), - BATTLE("ブラック", N(formation_2C), &N(omo_04)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(omo_04), "あかx２"), + BATTLE(N(Formation_01), &N(omo_04), "あおx２"), + BATTLE(N(Formation_02), &N(omo_04), "きいろx２"), + BATTLE(N(Formation_03), &N(omo_04), "きいろx３"), + BATTLE(N(Formation_04), &N(omo_04), "ももx２"), + BATTLE(N(Formation_05), &N(omo_04), "みどりx２"), + BATTLE(N(Formation_06), &N(omo_04), "あか,かいふくx２"), + BATTLE(N(Formation_07), &N(omo_04), "あお,ダンシング,かいふく"), + BATTLE(N(Formation_08), &N(omo_04), "きいろ,コマンド,かいふく"), + BATTLE(N(Formation_09), &N(omo_04), "きいろ,みどり,あか,あお"), + BATTLE(N(Formation_0A), &N(omo_04), "もも,ファイア,かいふく"), + BATTLE(N(Formation_0B), &N(omo_04), "もも,ダンシング,かいふくx２"), + BATTLE(N(Formation_0C), &N(omo_04), "みどり,バルーン,かいふく"), + BATTLE(N(Formation_0D), &N(omo_04), "バルーンx２"), + BATTLE(N(Formation_0E), &N(omo_04), "バルーン,きいろ"), + BATTLE(N(Formation_0F), &N(omo_04), "バルーンx２,きいろ"), + BATTLE(N(Formation_10), &N(omo_04), "バルーン,かいふく"), + BATTLE(N(Formation_11), &N(omo_04), "バルーンx２,コマンド"), + BATTLE(N(Formation_12), &N(omo_04), "バルーン,みどり,かいふく"), + BATTLE(N(Formation_13), &N(omo_04), "バルーン,みどり,かいふくx２"), + BATTLE(N(Formation_14), &N(omo_04), "バルーン,ダンシング,かいふく"), + BATTLE(N(Formation_15), &N(omo_04), "コマンドx２"), + BATTLE(N(Formation_16), &N(omo_04), "コマンド,ファイア"), + BATTLE(N(Formation_17), &N(omo_04), "コマンド,かいふく"), + BATTLE(N(Formation_18), &N(omo_04), "コマンドx２,かいふく"), + BATTLE(N(Formation_19), &N(omo_04), "コマンドx３,かいふく"), + BATTLE(N(Formation_1A), &N(omo_04), "コマンドx４"), + BATTLE(N(Formation_1B), &N(omo_04), "コマンド,ファイア,ダンシング,かいふく"), + BATTLE(N(Formation_1C), &N(omo_04), "ファイアx２"), + BATTLE(N(Formation_1D), &N(omo_04), "ファイアx３"), + BATTLE(N(Formation_1E), &N(omo_04), "ファイア,かいふく"), + BATTLE(N(Formation_1F), &N(omo_04), "ファイアx２,かいふく"), + BATTLE(N(Formation_20), &N(omo_04), "ファイアx２,かいふくx２"), + BATTLE(N(Formation_21), &N(omo_04), "ファイア,ダンシング,ファイア"), + BATTLE(N(Formation_22), &N(omo_04), "ファイア,コマンド,ダンシング"), + BATTLE(N(Formation_23), &N(omo_04), "ファイア,ダンシング,かいふくx2"), + BATTLE(N(Formation_24), &N(omo_04), "ファイアx2,コマンド"), + BATTLE(N(Formation_25), &N(omo_04), "ダンシングx２"), + BATTLE(N(Formation_26), &N(omo_04), "ダンシングx３"), + BATTLE(N(Formation_27), &N(omo_04), "ダンシング,かいふくx２"), + BATTLE(N(Formation_28), &N(omo_04), "ダンシングx２,かいふく"), + BATTLE(N(Formation_29), &N(omo_04), "ダンシングx２,かいふくx２"), + BATTLE(N(Formation_2A), &N(omo_04), "ダンシングx２,ファイアー"), + BATTLE(N(Formation_2B), &N(omo_04), "ダンシング,あお,バルーン"), + BATTLE(N(Formation_2C), &N(omo_04), "ブラック"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "omo_01", &N(omo_01) }, { "omo_02", &N(omo_02) }, { "omo_03", &N(omo_03) }, diff --git a/src/battle/area_omo/stage/omo_01.c b/src/battle/area/omo/stage/omo_01.c similarity index 97% rename from src/battle/area_omo/stage/omo_01.c rename to src/battle/area/omo/stage/omo_01.c index 0ee517ef0c..f7604cd5e3 100644 --- a/src/battle/area_omo/stage/omo_01.c +++ b/src/battle/area/omo/stage/omo_01.c @@ -18,7 +18,7 @@ typedef struct Omo01Struct { /* 0x14 */ s32 unk_14; } Omo01Struct; // size = 0x18 -ApiStatus N(update_model_uma)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(update_model_uma)) { Omo01Struct* ptr; Model* model; f32 rotZ; diff --git a/src/battle/area_omo/stage/omo_02.c b/src/battle/area/omo/stage/omo_02.c similarity index 100% rename from src/battle/area_omo/stage/omo_02.c rename to src/battle/area/omo/stage/omo_02.c diff --git a/src/battle/area_omo/stage/omo_03.c b/src/battle/area/omo/stage/omo_03.c similarity index 100% rename from src/battle/area_omo/stage/omo_03.c rename to src/battle/area/omo/stage/omo_03.c diff --git a/src/battle/area_omo/stage/omo_03b.c b/src/battle/area/omo/stage/omo_03b.c similarity index 100% rename from src/battle/area_omo/stage/omo_03b.c rename to src/battle/area/omo/stage/omo_03b.c diff --git a/src/battle/area_omo/stage/omo_04.c b/src/battle/area/omo/stage/omo_04.c similarity index 100% rename from src/battle/area_omo/stage/omo_04.c rename to src/battle/area/omo/stage/omo_04.c diff --git a/src/battle/area_omo/stage/omo_05.c b/src/battle/area/omo/stage/omo_05.c similarity index 100% rename from src/battle/area_omo/stage/omo_05.c rename to src/battle/area/omo/stage/omo_05.c diff --git a/src/battle/area_omo/stage/omo_05b.c b/src/battle/area/omo/stage/omo_05b.c similarity index 100% rename from src/battle/area_omo/stage/omo_05b.c rename to src/battle/area/omo/stage/omo_05b.c diff --git a/src/battle/area_omo/stage/omo_06.c b/src/battle/area/omo/stage/omo_06.c similarity index 100% rename from src/battle/area_omo/stage/omo_06.c rename to src/battle/area/omo/stage/omo_06.c diff --git a/src/battle/area_omo/stage/omo_07.c b/src/battle/area/omo/stage/omo_07.c similarity index 100% rename from src/battle/area_omo/stage/omo_07.c rename to src/battle/area/omo/stage/omo_07.c diff --git a/src/battle/area_omo2/actor/animation.inc.c b/src/battle/area/omo2/actor/animation.inc.c similarity index 100% rename from src/battle/area_omo2/actor/animation.inc.c rename to src/battle/area/omo2/actor/animation.inc.c diff --git a/src/battle/area_omo2/actor/general_guy.c b/src/battle/area/omo2/actor/general_guy.c similarity index 99% rename from src/battle/area_omo2/actor/general_guy.c rename to src/battle/area/omo2/actor/general_guy.c index 75e9f3c6dd..b61029ca00 100644 --- a/src/battle/area_omo2/actor/general_guy.c +++ b/src/battle/area/omo2/actor/general_guy.c @@ -67,8 +67,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -1, - .unk_1D = -10, + .projectileTargetOffset = { -1, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION | ACTOR_PART_FLAG_20000000, @@ -80,8 +79,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -1, - .unk_1D = -10, + .projectileTargetOffset = { -1, -10 }, }, }; diff --git a/src/battle/area_omo2/actor/light_bulb.c b/src/battle/area/omo2/actor/light_bulb.c similarity index 98% rename from src/battle/area_omo2/actor/light_bulb.c rename to src/battle/area/omo2/actor/light_bulb.c index 448fa6ad47..ba86ee9ecd 100644 --- a/src/battle/area_omo2/actor/light_bulb.c +++ b/src/battle/area/omo2/actor/light_bulb.c @@ -71,8 +71,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -14, + .projectileTargetOffset = { 0, -14 }, }, }; @@ -182,7 +181,7 @@ EvtScript N(shake_tank) = { EVT_END }; -ApiStatus func_80218250_52B8F0(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218250_52B8F0) { s32 i; IceShardBlueprint bpArray[] = { { diff --git a/src/battle/area_omo2/actor/toy_tank.c b/src/battle/area/omo2/actor/toy_tank.c similarity index 98% rename from src/battle/area_omo2/actor/toy_tank.c rename to src/battle/area/omo2/actor/toy_tank.c index b81684c7b9..966feb7c57 100644 --- a/src/battle/area_omo2/actor/toy_tank.c +++ b/src/battle/area/omo2/actor/toy_tank.c @@ -39,7 +39,7 @@ extern Formation N(formation_shy_stack_1); extern Formation N(formation_shy_stack_2); extern Formation N(formation_shy_squad_dup); -ApiStatus N(UpdateBulbGlow)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UpdateBulbGlow)) { Bytecode *args = script->ptrReadPos; s32 x = evt_get_variable(script, *args++); @@ -55,7 +55,7 @@ ApiStatus N(UpdateBulbGlow)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802181F4_52B894(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802181F4_52B894) { Bytecode* args = script->ptrReadPos; get_actor(script->owner1.actorID); set_screen_overlay_params_back(13, evt_get_variable(script, *args)); @@ -105,8 +105,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION | ACTOR_PART_FLAG_MULTI_TARGET, @@ -118,9 +117,8 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, - .unk_20 = MSG_EnemyName_GeneralGuyDup, + .projectileTargetOffset = { 0, 0 }, + .overrideNameMsg = MSG_EnemyName_GeneralGuyDup, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -132,9 +130,8 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, - .unk_20 = MSG_EnemyName_GeneralGuyDup, + .projectileTargetOffset = { 0, 0 }, + .overrideNameMsg = MSG_EnemyName_GeneralGuyDup, }, }; diff --git a/src/battle/area_omo2/area.c b/src/battle/area/omo2/area.c similarity index 75% rename from src/battle/area_omo2/area.c rename to src/battle/area/omo2/area.c index 3c3b5fc06d..87f09d94ba 100644 --- a/src/battle/area_omo2/area.c +++ b/src/battle/area/omo2/area.c @@ -9,18 +9,18 @@ extern ActorBlueprint N(light_bulb); extern Stage N(omo_07); -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(general_guy), .home = { .index = 2 }, .priority = 70, }, { .actor = &N(toy_tank), .home = { .index = 1 }, .priority = 80, }, { .actor = &N(light_bulb), .home = { .index = 7 }, .priority = 90, }, }; -BattleList N(formationTable) = { - BATTLE("しょうぐんヘイホー", N(formation_01), &N(omo_07)), +BattleList N(Formations) = { + BATTLE(N(Formation_01), &N(omo_07), "しょうぐんヘイホー"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "omo_07", &N(omo_07) }, {}, }; diff --git a/src/battle/area_omo2/stage/omo_07.c b/src/battle/area/omo2/stage/omo_07.c similarity index 100% rename from src/battle/area_omo2/stage/omo_07.c rename to src/battle/area/omo2/stage/omo_07.c diff --git a/src/battle/area_omo2_1/actor/shy_squad.c b/src/battle/area/omo2_1/actor/shy_squad.c similarity index 98% rename from src/battle/area_omo2_1/actor/shy_squad.c rename to src/battle/area/omo2_1/actor/shy_squad.c index 31a755897c..a9a89a0b47 100644 --- a/src/battle/area_omo2_1/actor/shy_squad.c +++ b/src/battle/area/omo2_1/actor/shy_squad.c @@ -14,16 +14,16 @@ enum N(ActorVars) { N(ACTOR_VAR_TOTAL_DAMAGE) = 4, }; -ApiStatus N(GetActorPartSize)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetActorPartSize)) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); ActorPart* actorPart; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - actorPart = get_actor_part(get_actor(actorID), partIndex); + actorPart = get_actor_part(get_actor(actorID), partID); evt_set_variable(script, *args++, actorPart->size.y); evt_set_variable(script, *args++, actorPart->size.x); @@ -88,8 +88,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -101,8 +100,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -114,8 +112,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -127,8 +124,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -140,8 +136,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -153,8 +148,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -166,8 +160,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -179,8 +172,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -192,8 +184,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -205,8 +196,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -218,8 +208,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -231,8 +220,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -244,8 +232,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -257,8 +244,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -270,8 +256,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -283,8 +268,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c similarity index 98% rename from src/battle/area_omo2_2/actor/stilt_guy.c rename to src/battle/area/omo2_2/actor/stilt_guy.c index 2c65bc89ce..c35717c82d 100644 --- a/src/battle/area_omo2_2/actor/stilt_guy.c +++ b/src/battle/area/omo2_2/actor/stilt_guy.c @@ -10,7 +10,7 @@ #include "common/GetSelectedMoveID.inc.c" -ApiStatus N(SetActorLevelToZero)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetActorLevelToZero)) { get_actor(script->owner1.actorID)->actorBlueprint->level = 0; return ApiStatus_DONE2; } @@ -124,8 +124,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -1, - .unk_1D = -10, + .projectileTargetOffset = { -1, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -137,8 +136,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable2), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -1, - .unk_1D = -5, + .projectileTargetOffset = { -1, -5 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -150,8 +148,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable2), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -1, - .unk_1D = -3, + .projectileTargetOffset = { -1, -3 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_NO_TARGET, @@ -163,8 +160,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable2), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -1, - .unk_1D = 5, + .projectileTargetOffset = { -1, 5 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION | ACTOR_PART_FLAG_20000000, @@ -176,8 +172,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable2), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION | ACTOR_PART_FLAG_20000000, @@ -189,8 +184,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable2), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION | ACTOR_PART_FLAG_20000000, @@ -202,8 +196,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable2), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION | ACTOR_PART_FLAG_20000000, @@ -215,8 +208,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable2), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -940,11 +932,11 @@ EvtScript N(shy_guy_idle) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 14) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 13, 10, 13) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/area_omo2_3/actor/shy_stack.c b/src/battle/area/omo2_3/actor/shy_stack.c similarity index 98% rename from src/battle/area_omo2_3/actor/shy_stack.c rename to src/battle/area/omo2_3/actor/shy_stack.c index 5888bae34f..15b04dc0f2 100644 --- a/src/battle/area_omo2_3/actor/shy_stack.c +++ b/src/battle/area/omo2_3/actor/shy_stack.c @@ -10,7 +10,7 @@ #define NAMESPACE b_area_omo2_3_shy_stack -ApiStatus func_80231000_54CC70(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80231000_54CC70) { Bytecode* args = script->ptrReadPos; evt_get_variable(script, args[1]); @@ -75,8 +75,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -88,8 +87,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -101,8 +99,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -114,8 +111,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -127,8 +123,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -140,8 +135,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -153,8 +147,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -166,8 +159,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -179,8 +171,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -192,8 +183,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -205,8 +195,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -218,8 +207,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -231,8 +219,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -244,8 +231,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_omo2_4/actor/signal_guy.c b/src/battle/area/omo2_4/actor/signal_guy.c similarity index 99% rename from src/battle/area_omo2_4/actor/signal_guy.c rename to src/battle/area/omo2_4/actor/signal_guy.c index 3a34275595..d35d2b60d0 100644 --- a/src/battle/area_omo2_4/actor/signal_guy.c +++ b/src/battle/area/omo2_4/actor/signal_guy.c @@ -54,8 +54,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -1, - .unk_1D = -10, + .projectileTargetOffset = { -1, -10 }, }, }; diff --git a/src/battle/area_omo2_5/actor/shy_squad_dup.c b/src/battle/area/omo2_5/actor/shy_squad_dup.c similarity index 98% rename from src/battle/area_omo2_5/actor/shy_squad_dup.c rename to src/battle/area/omo2_5/actor/shy_squad_dup.c index a4f43a9b8f..f3f5839cc2 100644 --- a/src/battle/area_omo2_5/actor/shy_squad_dup.c +++ b/src/battle/area/omo2_5/actor/shy_squad_dup.c @@ -64,8 +64,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -77,8 +76,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -90,8 +88,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -103,8 +100,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -116,8 +112,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -129,8 +124,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -142,8 +136,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -155,8 +148,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -168,8 +160,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -181,8 +172,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -194,8 +184,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -207,8 +196,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -220,8 +208,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -233,8 +220,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -246,8 +232,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_2 | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -259,8 +244,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_omo2_6/actor/shy_guy_dup.c b/src/battle/area/omo2_6/actor/shy_guy_dup.c similarity index 95% rename from src/battle/area_omo2_6/actor/shy_guy_dup.c rename to src/battle/area/omo2_6/actor/shy_guy_dup.c index b91c87254a..475cf61367 100644 --- a/src/battle/area_omo2_6/actor/shy_guy_dup.c +++ b/src/battle/area/omo2_6/actor/shy_guy_dup.c @@ -53,8 +53,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -66,8 +65,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -79,8 +77,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -92,8 +89,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -105,8 +101,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -118,8 +113,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -131,8 +125,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -144,8 +137,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -157,8 +149,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_omo3/actor/big_lantern_ghost.c b/src/battle/area/omo3/actor/big_lantern_ghost.c similarity index 99% rename from src/battle/area_omo3/actor/big_lantern_ghost.c rename to src/battle/area/omo3/actor/big_lantern_ghost.c index a8f4b029c0..91ea573d19 100644 --- a/src/battle/area_omo3/actor/big_lantern_ghost.c +++ b/src/battle/area/omo3/actor/big_lantern_ghost.c @@ -88,8 +88,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -5, - .unk_1D = -10, + .projectileTargetOffset = { -5, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_2000, @@ -101,9 +100,8 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable2), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -9, - .unk_20 = 2687103, + .projectileTargetOffset = { 0, -9 }, + .overrideNameMsg = MSG_EnemyName_Lantern, }, }; @@ -144,7 +142,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -ApiStatus N(init_overlay)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(init_overlay)) { get_actor(script->owner1.actorID); set_screen_overlay_params_back(13, 220.0f); @@ -166,7 +164,7 @@ s32 N(get_darkening)(ActorState* actorState, s32 targetDarkening) { return actorState->varTable[N(VAR_DARKENING)]; } -ApiStatus N(update_effect)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(update_effect)) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++); Actor* actor = get_actor(script->owner1.actorID); diff --git a/src/battle/area_omo3/actor/clubba.c b/src/battle/area/omo3/actor/clubba.c similarity index 100% rename from src/battle/area_omo3/actor/clubba.c rename to src/battle/area/omo3/actor/clubba.c diff --git a/src/battle/area_omo3/actor/fuzzy.c b/src/battle/area/omo3/actor/fuzzy.c similarity index 100% rename from src/battle/area_omo3/actor/fuzzy.c rename to src/battle/area/omo3/actor/fuzzy.c diff --git a/src/battle/area_omo3/actor/goomba.c b/src/battle/area/omo3/actor/goomba.c similarity index 100% rename from src/battle/area_omo3/actor/goomba.c rename to src/battle/area/omo3/actor/goomba.c diff --git a/src/battle/area_omo3/actor/hammer_bro.c b/src/battle/area/omo3/actor/hammer_bro.c similarity index 100% rename from src/battle/area_omo3/actor/hammer_bro.c rename to src/battle/area/omo3/actor/hammer_bro.c diff --git a/src/battle/area_omo3/actor/koopatrol.c b/src/battle/area/omo3/actor/koopatrol.c similarity index 100% rename from src/battle/area_omo3/actor/koopatrol.c rename to src/battle/area/omo3/actor/koopatrol.c diff --git a/src/battle/area_omo3/actor/pokey.c b/src/battle/area/omo3/actor/pokey.c similarity index 100% rename from src/battle/area_omo3/actor/pokey.c rename to src/battle/area/omo3/actor/pokey.c diff --git a/src/battle/area_omo3/actor/red_shy_guy.c b/src/battle/area/omo3/actor/red_shy_guy.c similarity index 100% rename from src/battle/area_omo3/actor/red_shy_guy.c rename to src/battle/area/omo3/actor/red_shy_guy.c diff --git a/src/battle/area_omo3/area.c b/src/battle/area/omo3/area.c similarity index 65% rename from src/battle/area_omo3/area.c rename to src/battle/area/omo3/area.c index 140e6c8972..12f3931ae1 100644 --- a/src/battle/area_omo3/area.c +++ b/src/battle/area/omo3/area.c @@ -25,75 +25,75 @@ extern ActorBlueprint N(red_shy_guy); Vec3i N(big_lantern_ghost_pos) = { 30, 0, 10 }; -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(big_lantern_ghost), .home = { .vec = &N(big_lantern_ghost_pos) }, .priority = 10, }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(goomba), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(goomba), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(goomba), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(clubba), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(clubba), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(fuzzy), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(fuzzy), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(fuzzy), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(fuzzy), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(fuzzy), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(fuzzy), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(hammer_bro), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(hammer_bro), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(hammer_bro), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(pokey), .home = { .index = 1 }, .priority = 10, .var1 = 1 }, { .actor = &N(pokey), .home = { .index = 2 }, .priority = 9, .var1 = 1 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(koopatrol), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(koopatrol), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(red_shy_guy), .home = { .index = 1 }, .priority = 10 }, }; -BattleList N(formationTable) = { - BATTLE("ビッグカンテラくん", N(formation_00), &N(omo_03)), - BATTLE("クリボー（ピーチへん）", N(formation_01), &N(omo_04)), - BATTLE("クリボーx２（ピーチへん）", N(formation_02), &N(omo_04)), - BATTLE("ガボンへいx２（ピーチへん）", N(formation_03), &N(omo_04)), - BATTLE("チョロボンx２（ピーチへん）", N(formation_04), &N(omo_04)), - BATTLE("チョロボンx４（ピーチへん）", N(formation_05), &N(omo_04)), - BATTLE("ハンマーブロスx２（ピーチへん）", N(formation_06), &N(omo_04)), - BATTLE("ハンマーブロス（ピーチへん）", N(formation_07), &N(omo_04)), - BATTLE("サンボx２（ピーチへん）", N(formation_08), &N(omo_04)), - BATTLE("トゲノコx２（ピーチへん）", N(formation_09), &N(omo_04)), - BATTLE("ヘイホー", N(formation_0A), &N(omo_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(omo_03), "ビッグカンテラくん"), + BATTLE(N(Formation_01), &N(omo_04), "クリボー（ピーチへん）"), + BATTLE(N(Formation_02), &N(omo_04), "クリボーx２（ピーチへん）"), + BATTLE(N(Formation_03), &N(omo_04), "ガボンへいx２（ピーチへん）"), + BATTLE(N(Formation_04), &N(omo_04), "チョロボンx２（ピーチへん）"), + BATTLE(N(Formation_05), &N(omo_04), "チョロボンx４（ピーチへん）"), + BATTLE(N(Formation_06), &N(omo_04), "ハンマーブロスx２（ピーチへん）"), + BATTLE(N(Formation_07), &N(omo_04), "ハンマーブロス（ピーチへん）"), + BATTLE(N(Formation_08), &N(omo_04), "サンボx２（ピーチへん）"), + BATTLE(N(Formation_09), &N(omo_04), "トゲノコx２（ピーチへん）"), + BATTLE(N(Formation_0A), &N(omo_01), "ヘイホー"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "omo_01", &N(omo_01) }, { "omo_02", &N(omo_02) }, { "omo_03", &N(omo_03) }, diff --git a/src/battle/area_omo3/stage/omo_01.c b/src/battle/area/omo3/stage/omo_01.c similarity index 97% rename from src/battle/area_omo3/stage/omo_01.c rename to src/battle/area/omo3/stage/omo_01.c index 019cc151ba..a921689a76 100644 --- a/src/battle/area_omo3/stage/omo_01.c +++ b/src/battle/area/omo3/stage/omo_01.c @@ -18,7 +18,7 @@ typedef struct Omo01Struct { /* 0x14 */ s32 unk_14; } Omo01Struct; // size = 0x18 -ApiStatus N(update_model_uma)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(update_model_uma)) { Omo01Struct* ptr; Model* model; f32 rotZ; diff --git a/src/battle/area_omo3/stage/omo_02.c b/src/battle/area/omo3/stage/omo_02.c similarity index 100% rename from src/battle/area_omo3/stage/omo_02.c rename to src/battle/area/omo3/stage/omo_02.c diff --git a/src/battle/area_omo3/stage/omo_03.c b/src/battle/area/omo3/stage/omo_03.c similarity index 100% rename from src/battle/area_omo3/stage/omo_03.c rename to src/battle/area/omo3/stage/omo_03.c diff --git a/src/battle/area_omo3/stage/omo_03b.c b/src/battle/area/omo3/stage/omo_03b.c similarity index 100% rename from src/battle/area_omo3/stage/omo_03b.c rename to src/battle/area/omo3/stage/omo_03b.c diff --git a/src/battle/area_omo3/stage/omo_04.c b/src/battle/area/omo3/stage/omo_04.c similarity index 100% rename from src/battle/area_omo3/stage/omo_04.c rename to src/battle/area/omo3/stage/omo_04.c diff --git a/src/battle/area_omo3/stage/omo_05.c b/src/battle/area/omo3/stage/omo_05.c similarity index 100% rename from src/battle/area_omo3/stage/omo_05.c rename to src/battle/area/omo3/stage/omo_05.c diff --git a/src/battle/area_omo3/stage/omo_05b.c b/src/battle/area/omo3/stage/omo_05b.c similarity index 100% rename from src/battle/area_omo3/stage/omo_05b.c rename to src/battle/area/omo3/stage/omo_05b.c diff --git a/src/battle/area_omo3/stage/omo_06.c b/src/battle/area/omo3/stage/omo_06.c similarity index 100% rename from src/battle/area_omo3/stage/omo_06.c rename to src/battle/area/omo3/stage/omo_06.c diff --git a/src/battle/area_omo3/stage/omo_07.c b/src/battle/area/omo3/stage/omo_07.c similarity index 100% rename from src/battle/area_omo3/stage/omo_07.c rename to src/battle/area/omo3/stage/omo_07.c diff --git a/src/battle/area_pra/actor/albino_dino.c b/src/battle/area/pra/actor/albino_dino.c similarity index 99% rename from src/battle/area_pra/actor/albino_dino.c rename to src/battle/area/pra/actor/albino_dino.c index 28a243e714..50678d0840 100644 --- a/src/battle/area_pra/actor/albino_dino.c +++ b/src/battle/area/pra/actor/albino_dino.c @@ -66,8 +66,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -6, - .unk_1D = -17, + .projectileTargetOffset = { -6, -17 }, }, }; diff --git a/src/battle/area_pra/actor/gray_magikoopa.c b/src/battle/area/pra/actor/gray_magikoopa.c similarity index 100% rename from src/battle/area_pra/actor/gray_magikoopa.c rename to src/battle/area/pra/actor/gray_magikoopa.c diff --git a/src/battle/area_pra/actor/green_magikoopa.c b/src/battle/area/pra/actor/green_magikoopa.c similarity index 100% rename from src/battle/area_pra/actor/green_magikoopa.c rename to src/battle/area/pra/actor/green_magikoopa.c diff --git a/src/battle/area_pra/actor/red_magikoopa.c b/src/battle/area/pra/actor/red_magikoopa.c similarity index 90% rename from src/battle/area_pra/actor/red_magikoopa.c rename to src/battle/area/pra/actor/red_magikoopa.c index 2760acdc69..cea9c6c5ef 100644 --- a/src/battle/area_pra/actor/red_magikoopa.c +++ b/src/battle/area/pra/actor/red_magikoopa.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_pra_red_magikoopa -ApiStatus func_80218240_649050(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218240_649050) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++); f32 var1 = evt_get_variable(script, *args++); diff --git a/src/battle/area_pra/actor/swoopula.c b/src/battle/area/pra/actor/swoopula.c similarity index 100% rename from src/battle/area_pra/actor/swoopula.c rename to src/battle/area/pra/actor/swoopula.c diff --git a/src/battle/area_pra/actor/white_clubba.c b/src/battle/area/pra/actor/white_clubba.c similarity index 100% rename from src/battle/area_pra/actor/white_clubba.c rename to src/battle/area/pra/actor/white_clubba.c diff --git a/src/battle/area_pra/actor/white_magikoopa.c b/src/battle/area/pra/actor/white_magikoopa.c similarity index 100% rename from src/battle/area_pra/actor/white_magikoopa.c rename to src/battle/area/pra/actor/white_magikoopa.c diff --git a/src/battle/area_pra/actor/yellow_magikoopa.c b/src/battle/area/pra/actor/yellow_magikoopa.c similarity index 100% rename from src/battle/area_pra/actor/yellow_magikoopa.c rename to src/battle/area/pra/actor/yellow_magikoopa.c diff --git a/src/battle/area_pra/area.c b/src/battle/area/pra/area.c similarity index 72% rename from src/battle/area_pra/area.c rename to src/battle/area/pra/area.c index 1bebc98a4d..e8b281b7f1 100644 --- a/src/battle/area_pra/area.c +++ b/src/battle/area/pra/area.c @@ -29,12 +29,12 @@ Vec3i N(pos_swoopula)[] = { { 135, 133, -25 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula)[1] }, .priority = 10 }, { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula)[2] }, .priority = 9 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula)[0] }, .priority = 10 }, { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula)[1] }, .priority = 9 }, { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula)[2] }, .priority = 8 }, @@ -47,7 +47,7 @@ Vec3i N(pos_swoopula_2)[] = { { 120, 133, -25 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula_2)[0] }, .priority = 10 }, { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula_2)[1] }, .priority = 9 }, { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula_2)[2] }, .priority = 8 }, @@ -62,96 +62,96 @@ Vec3i N(pos_swoopula_3)[] = { Vec3i N(pos_magikoopa) = { 120, 55, 25 }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula_3)[0] }, .priority = 10, .var0 = 0xFFFFFFFF }, { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula_3)[1] }, .priority = 9, .var0 = 0xFFFFFFFF }, { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula_3)[2] }, .priority = 8, .var0 = 0xFFFFFFFF }, { .actor = &N(yellow_magikoopa_flying), .home = { .vec = &N(pos_magikoopa) }, .priority = 7 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(white_clubba), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(white_clubba), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(white_clubba), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(white_clubba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(white_clubba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(white_clubba), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(white_clubba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(white_clubba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula)[2] }, .priority = 8 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(white_clubba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(white_clubba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(yellow_magikoopa), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(white_clubba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(white_clubba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(white_magikoopa), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(white_clubba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(white_clubba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(white_magikoopa), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(red_magikoopa), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(white_clubba), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(gray_magikoopa), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(white_clubba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(white_clubba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(white_clubba), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(green_magikoopa), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_0E) = { +Formation N(Formation_0E) = { { .actor = &N(white_clubba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(white_clubba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(green_magikoopa), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(white_magikoopa_flying), .home = { .index = 7 }, .priority = 7 }, }; -Formation N(formation_0F) = { +Formation N(Formation_0F) = { { .actor = &N(albino_dino), .home = { .index = 1 }, .priority = 10, } }; -BattleList N(formationTable) = { - BATTLE("バサバサチュルルx2", N(formation_01), &N(pra_01)), - BATTLE("バサバサチュルルx3", N(formation_02), &N(pra_01)), - BATTLE("バサバサチュルルx4", N(formation_03), &N(pra_01)), - BATTLE("バサバサチュルルx3,イエローカメック（そら）", N(formation_04), &N(pra_01)), - BATTLE("ホワイトガボン", N(formation_05), &N(pra_01)), - BATTLE("ホワイトガボンx２", N(formation_06), &N(pra_01)), - BATTLE("ホワイトガボンx３", N(formation_07), &N(pra_01)), - BATTLE("ホワイトガボンx２,バサバサチュルル", N(formation_08), &N(pra_01)), - BATTLE("ホワイトガボンx２,イエローカメック", N(formation_09), &N(pra_01)), - BATTLE("ホワイトガボンx２,ホワイトカメック", N(formation_0A), &N(pra_01)), - BATTLE("ホワイトガボンx２,ホワイトカメック,レッドカメック", N(formation_0B), &N(pra_01)), - BATTLE("ホワイトガボン,グレイカメック", N(formation_0C), &N(pra_01)), - BATTLE("ホワイトガボンx３,グリーンカメック", N(formation_0D), &N(pra_01)), - BATTLE("ホワイトガボンx２,グリーンカメック,ホワイトカメック（そら）", N(formation_0E), &N(pra_01)), - BATTLE("セキゾー", N(formation_0F), &N(pra_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_01), &N(pra_01), "バサバサチュルルx2"), + BATTLE(N(Formation_02), &N(pra_01), "バサバサチュルルx3"), + BATTLE(N(Formation_03), &N(pra_01), "バサバサチュルルx4"), + BATTLE(N(Formation_04), &N(pra_01), "バサバサチュルルx3,イエローカメック（そら）"), + BATTLE(N(Formation_05), &N(pra_01), "ホワイトガボン"), + BATTLE(N(Formation_06), &N(pra_01), "ホワイトガボンx２"), + BATTLE(N(Formation_07), &N(pra_01), "ホワイトガボンx３"), + BATTLE(N(Formation_08), &N(pra_01), "ホワイトガボンx２,バサバサチュルル"), + BATTLE(N(Formation_09), &N(pra_01), "ホワイトガボンx２,イエローカメック"), + BATTLE(N(Formation_0A), &N(pra_01), "ホワイトガボンx２,ホワイトカメック"), + BATTLE(N(Formation_0B), &N(pra_01), "ホワイトガボンx２,ホワイトカメック,レッドカメック"), + BATTLE(N(Formation_0C), &N(pra_01), "ホワイトガボン,グレイカメック"), + BATTLE(N(Formation_0D), &N(pra_01), "ホワイトガボンx３,グリーンカメック"), + BATTLE(N(Formation_0E), &N(pra_01), "ホワイトガボンx２,グリーンカメック,ホワイトカメック（そら）"), + BATTLE(N(Formation_0F), &N(pra_01), "セキゾー"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "pra_01", &N(pra_01) }, { "pra_02", &N(pra_02) }, { "pra_03", &N(pra_03) }, diff --git a/src/battle/area_pra/stage/pra_01.c b/src/battle/area/pra/stage/pra_01.c similarity index 100% rename from src/battle/area_pra/stage/pra_01.c rename to src/battle/area/pra/stage/pra_01.c diff --git a/src/battle/area_pra/stage/pra_02.c b/src/battle/area/pra/stage/pra_02.c similarity index 100% rename from src/battle/area_pra/stage/pra_02.c rename to src/battle/area/pra/stage/pra_02.c diff --git a/src/battle/area_pra/stage/pra_03.c b/src/battle/area/pra/stage/pra_03.c similarity index 100% rename from src/battle/area_pra/stage/pra_03.c rename to src/battle/area/pra/stage/pra_03.c diff --git a/src/battle/area_pra/stage/pra_03b.c b/src/battle/area/pra/stage/pra_03b.c similarity index 100% rename from src/battle/area_pra/stage/pra_03b.c rename to src/battle/area/pra/stage/pra_03b.c diff --git a/src/battle/area_pra/stage/pra_03c.c b/src/battle/area/pra/stage/pra_03c.c similarity index 100% rename from src/battle/area_pra/stage/pra_03c.c rename to src/battle/area/pra/stage/pra_03c.c diff --git a/src/battle/area_pra/stage/pra_04.c b/src/battle/area/pra/stage/pra_04.c similarity index 100% rename from src/battle/area_pra/stage/pra_04.c rename to src/battle/area/pra/stage/pra_04.c diff --git a/src/battle/area_pra2/actor/crystal_bit.c b/src/battle/area/pra2/actor/crystal_bit.c similarity index 97% rename from src/battle/area_pra2/actor/crystal_bit.c rename to src/battle/area/pra2/actor/crystal_bit.c index 6be1d892cb..c63b68835e 100644 --- a/src/battle/area_pra2/actor/crystal_bit.c +++ b/src/battle/area/pra2/actor/crystal_bit.c @@ -70,8 +70,7 @@ ActorPartBlueprint N(parts_1)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_20 | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -83,8 +82,7 @@ ActorPartBlueprint N(parts_1)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, }; @@ -99,8 +97,7 @@ ActorPartBlueprint N(parts_2)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_20 | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -112,8 +109,7 @@ ActorPartBlueprint N(parts_2)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, }; @@ -128,8 +124,7 @@ ActorPartBlueprint N(parts_3)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_20 | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -141,8 +136,7 @@ ActorPartBlueprint N(parts_3)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, }; @@ -224,7 +218,7 @@ EvtScript N(init) = { EVT_END }; -ApiStatus UpdateCrystalBitEffect(Evt* script, s32 isInitialCall) { +API_CALLABLE(UpdateCrystalBitEffect) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(script->owner1.actorID); ActorPart* actorPart = get_actor_part(actor, 1); diff --git a/src/battle/area_pra2/actor/crystal_king.c b/src/battle/area/pra2/actor/crystal_king.c similarity index 99% rename from src/battle/area_pra2/actor/crystal_king.c rename to src/battle/area/pra2/actor/crystal_king.c index fc416484c5..1e1866f546 100644 --- a/src/battle/area_pra2/actor/crystal_king.c +++ b/src/battle/area/pra2/actor/crystal_king.c @@ -107,8 +107,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -22, + .projectileTargetOffset = { 0, -22 }, }, }; @@ -154,20 +153,20 @@ EvtScript N(init) = { #include "common/StartRumbleWithParams.inc.c" #include "common/CosInterpMinMax.inc.c" -ApiStatus GetActorPartOpacity(Evt* script, s32 isInitialCall) { +API_CALLABLE(GetActorPartOpacity) { Bytecode* args = script->ptrReadPos; s32 actorID = evt_get_variable(script, *args++); - s32 partIndex = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - evt_set_variable(script, *args++, get_actor_part(get_actor(actorID), partIndex)->opacity); + evt_set_variable(script, *args++, get_actor_part(get_actor(actorID), partID)->opacity); return ApiStatus_DONE2; } -ApiStatus func_80218280_6609D0(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218280_6609D0) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args); @@ -180,7 +179,7 @@ ApiStatus func_80218280_6609D0(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802182E4_660A34(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802182E4_660A34) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args); @@ -193,7 +192,7 @@ ApiStatus func_802182E4_660A34(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80218344_660A94(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218344_660A94) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); @@ -206,7 +205,7 @@ ApiStatus func_80218344_660A94(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802183A4_660AF4(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802183A4_660AF4) { Bytecode* args = script->ptrReadPos; Bytecode arg0 = *args++; f32 startX = evt_get_variable(script, *args++); @@ -218,7 +217,7 @@ ApiStatus func_802183A4_660AF4(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_8021848C_660BDC(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_8021848C_660BDC) { Bytecode* args = script->ptrReadPos; Vec3f* path = (Vec3f*)evt_get_variable(script, *args++); diff --git a/src/battle/area_pra2/area.c b/src/battle/area/pra2/area.c similarity index 85% rename from src/battle/area_pra2/area.c rename to src/battle/area/pra2/area.c index 8a7bed7977..6f43db2c22 100644 --- a/src/battle/area_pra2/area.c +++ b/src/battle/area/pra2/area.c @@ -18,19 +18,19 @@ Vec3i N(pos_crystal_bit_2) = { 112, 52, -5 }; Vec3i N(pos_crystal_bit_3) = { 42, 85, -10 }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(crystal_king), .home = { .vec = &N(pos_crystal_king) }, .priority = 10 }, { .actor = &N(crystal_bit_1), .home = { .vec = &N(pos_crystal_bit_1) }, .priority = 9 }, { .actor = &N(crystal_bit_2), .home = { .vec = &N(pos_crystal_bit_2) }, .priority = 8 }, { .actor = &N(crystal_bit_3), .home = { .vec = &N(pos_crystal_bit_3) }, .priority = 7 }, }; -BattleList N(formationTable) = { - BATTLE("パラレラー", N(formation_01), &N(sam_04)), +BattleList N(Formations) = { + BATTLE(N(Formation_01), &N(sam_04), "パラレラー"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "sam_04", &N(sam_04) }, {}, }; diff --git a/src/battle/area_pra2/stage/sam_04.c b/src/battle/area/pra2/stage/sam_04.c similarity index 100% rename from src/battle/area_pra2/stage/sam_04.c rename to src/battle/area/pra2/stage/sam_04.c diff --git a/src/battle/area_pra3/actor/duplighost.c b/src/battle/area/pra3/actor/duplighost.c similarity index 100% rename from src/battle/area_pra3/actor/duplighost.c rename to src/battle/area/pra3/actor/duplighost.c diff --git a/src/battle/area_pra3/actor/gray_magikoopa.c b/src/battle/area/pra3/actor/gray_magikoopa.c similarity index 100% rename from src/battle/area_pra3/actor/gray_magikoopa.c rename to src/battle/area/pra3/actor/gray_magikoopa.c diff --git a/src/battle/area_pra3/actor/red_magikoopa.c b/src/battle/area/pra3/actor/red_magikoopa.c similarity index 100% rename from src/battle/area_pra3/actor/red_magikoopa.c rename to src/battle/area/pra3/actor/red_magikoopa.c diff --git a/src/battle/area_pra3/actor/swoopula.c b/src/battle/area/pra3/actor/swoopula.c similarity index 100% rename from src/battle/area_pra3/actor/swoopula.c rename to src/battle/area/pra3/actor/swoopula.c diff --git a/src/battle/area_pra3/actor/white_clubba.c b/src/battle/area/pra3/actor/white_clubba.c similarity index 100% rename from src/battle/area_pra3/actor/white_clubba.c rename to src/battle/area/pra3/actor/white_clubba.c diff --git a/src/battle/area_pra3/area.c b/src/battle/area/pra3/area.c similarity index 70% rename from src/battle/area_pra3/area.c rename to src/battle/area/pra3/area.c index 5e40ff8fcf..9ee42b7774 100644 --- a/src/battle/area_pra3/area.c +++ b/src/battle/area/pra3/area.c @@ -23,93 +23,93 @@ Vec3i N(pos_swoopula)[] = { { 135, 133, -25 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula)[0] }, .priority = 10 }, { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula)[1] }, .priority = 9 }, { .actor = &N(duplighost), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(duplighost), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(duplighost), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(duplighost), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(duplighost), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(duplighost), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(duplighost), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(duplighost), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(duplighost), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(duplighost), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(duplighost), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(duplighost), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(duplighost), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula)[2] }, .priority = 8 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(duplighost), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(swoopula), .home = { .vec = &N(pos_swoopula)[1] }, .priority = 9 }, { .actor = &N(duplighost), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(duplighost), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(red_magikoopa), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(duplighost), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(duplighost), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(red_magikoopa), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(duplighost), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(white_clubba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(duplighost), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(duplighost), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(duplighost), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(gray_magikoopa), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(red_magikoopa), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(white_clubba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(white_clubba), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(duplighost), .home = { .index = 2 }, .priority = 8 }, }; -BattleList N(formationTable) = { - BATTLE("バサバサチュルルx２,バケバケ", N(formation_01), &N(pra_01)), - BATTLE("バケバケ", N(formation_02), &N(pra_01)), - BATTLE("バケバケx2", N(formation_03), &N(pra_01)), - BATTLE("バケバケx3", N(formation_04), &N(pra_01)), - BATTLE("バケバケx4", N(formation_05), &N(pra_01)), - BATTLE("バケバケx２,バサバサチュルル", N(formation_06), &N(pra_01)), - BATTLE("バケバケ,バサバサチュルル,バケバケ", N(formation_07), &N(pra_01)), - BATTLE("バケバケ,レッドカメック", N(formation_08), &N(pra_01)), - BATTLE("バケバケx２,レッドカメック", N(formation_09), &N(pra_01)), - BATTLE("バケバケ,ホワイトガボン,バケバケ", N(formation_0A), &N(pra_01)), - BATTLE("バケバケx２,グレイカメック,レッドカメック", N(formation_0B), &N(pra_01)), - BATTLE("ホワイトガボンx２,バケバケ", N(formation_0C), &N(pra_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_01), &N(pra_01), "バサバサチュルルx２,バケバケ"), + BATTLE(N(Formation_02), &N(pra_01), "バケバケ"), + BATTLE(N(Formation_03), &N(pra_01), "バケバケx2"), + BATTLE(N(Formation_04), &N(pra_01), "バケバケx3"), + BATTLE(N(Formation_05), &N(pra_01), "バケバケx4"), + BATTLE(N(Formation_06), &N(pra_01), "バケバケx２,バサバサチュルル"), + BATTLE(N(Formation_07), &N(pra_01), "バケバケ,バサバサチュルル,バケバケ"), + BATTLE(N(Formation_08), &N(pra_01), "バケバケ,レッドカメック"), + BATTLE(N(Formation_09), &N(pra_01), "バケバケx２,レッドカメック"), + BATTLE(N(Formation_0A), &N(pra_01), "バケバケ,ホワイトガボン,バケバケ"), + BATTLE(N(Formation_0B), &N(pra_01), "バケバケx２,グレイカメック,レッドカメック"), + BATTLE(N(Formation_0C), &N(pra_01), "ホワイトガボンx２,バケバケ"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "pra_01", &N(pra_01) }, { "pra_02", &N(pra_02) }, { "pra_03", &N(pra_03) }, diff --git a/src/battle/area_pra3/stage/pra_01.c b/src/battle/area/pra3/stage/pra_01.c similarity index 100% rename from src/battle/area_pra3/stage/pra_01.c rename to src/battle/area/pra3/stage/pra_01.c diff --git a/src/battle/area_pra3/stage/pra_02.c b/src/battle/area/pra3/stage/pra_02.c similarity index 100% rename from src/battle/area_pra3/stage/pra_02.c rename to src/battle/area/pra3/stage/pra_02.c diff --git a/src/battle/area_pra3/stage/pra_03.c b/src/battle/area/pra3/stage/pra_03.c similarity index 100% rename from src/battle/area_pra3/stage/pra_03.c rename to src/battle/area/pra3/stage/pra_03.c diff --git a/src/battle/area_pra3/stage/pra_03b.c b/src/battle/area/pra3/stage/pra_03b.c similarity index 100% rename from src/battle/area_pra3/stage/pra_03b.c rename to src/battle/area/pra3/stage/pra_03b.c diff --git a/src/battle/area_pra3/stage/pra_03c.c b/src/battle/area/pra3/stage/pra_03c.c similarity index 100% rename from src/battle/area_pra3/stage/pra_03c.c rename to src/battle/area/pra3/stage/pra_03c.c diff --git a/src/battle/area_pra3/stage/pra_04.c b/src/battle/area/pra3/stage/pra_04.c similarity index 100% rename from src/battle/area_pra3/stage/pra_04.c rename to src/battle/area/pra3/stage/pra_04.c diff --git a/src/battle/area_sam/actor/duplighost.c b/src/battle/area/sam/actor/duplighost.c similarity index 100% rename from src/battle/area_sam/actor/duplighost.c rename to src/battle/area/sam/actor/duplighost.c diff --git a/src/battle/area_sam/actor/frost_piranha.c b/src/battle/area/sam/actor/frost_piranha.c similarity index 99% rename from src/battle/area_sam/actor/frost_piranha.c rename to src/battle/area/sam/actor/frost_piranha.c index 6575ec5434..6e06d659ed 100644 --- a/src/battle/area_sam/actor/frost_piranha.c +++ b/src/battle/area/sam/actor/frost_piranha.c @@ -69,8 +69,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, - .unk_1C = 3, - .unk_1D = -14, + .projectileTargetOffset = { 3, -14 }, }, }; @@ -112,11 +111,11 @@ EvtScript N(idle) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, STATUS_FLAG_DIZZY) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -27, 33) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 5, -11) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 5, -11) EVT_CALL(N(UnkBattleFunc1), -37, 9, -7, 31) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -15, 50) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 3, -14) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 3, -14) EVT_CALL(N(UnkBattleFunc1), -22, 32, 1, 44) EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/area_sam/actor/gray_magikoopa.c b/src/battle/area/sam/actor/gray_magikoopa.c similarity index 100% rename from src/battle/area_sam/actor/gray_magikoopa.c rename to src/battle/area/sam/actor/gray_magikoopa.c diff --git a/src/battle/area_sam/actor/gulpit.c b/src/battle/area/sam/actor/gulpit.c similarity index 99% rename from src/battle/area_sam/actor/gulpit.c rename to src/battle/area/sam/actor/gulpit.c index e269736290..fe81304d9e 100644 --- a/src/battle/area_sam/actor/gulpit.c +++ b/src/battle/area/sam/actor/gulpit.c @@ -75,8 +75,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -3, - .unk_1D = -23, + .projectileTargetOffset = { -3, -23 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -88,8 +87,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -101,8 +99,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_sam/actor/gulpit_rocks.c b/src/battle/area/sam/actor/gulpit_rocks.c similarity index 99% rename from src/battle/area_sam/actor/gulpit_rocks.c rename to src/battle/area/sam/actor/gulpit_rocks.c index 2d3fcad12d..b14a059a83 100644 --- a/src/battle/area_sam/actor/gulpit_rocks.c +++ b/src/battle/area/sam/actor/gulpit_rocks.c @@ -62,8 +62,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -6, + .projectileTargetOffset = { 0, -6 }, }, }; diff --git a/src/battle/area_sam/actor/white_clubba.c b/src/battle/area/sam/actor/white_clubba.c similarity index 100% rename from src/battle/area_sam/actor/white_clubba.c rename to src/battle/area/sam/actor/white_clubba.c diff --git a/src/battle/area_sam/area.c b/src/battle/area/sam/area.c similarity index 83% rename from src/battle/area_sam/area.c rename to src/battle/area/sam/area.c index c2cfb4c287..348fcd14d4 100644 --- a/src/battle/area_sam/area.c +++ b/src/battle/area/sam/area.c @@ -82,12 +82,12 @@ Vec3i N(pos_rocks_8)[] = { { -28, 0, -46 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(duplighost), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(duplighost), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(gulpit), .home = { .index = 1 }, .priority = 20 }, { .actor = &N(gulpit), .home = { .index = 2 }, .priority = 19 }, { .actor = &N(gulpit_rocks), .home = { .vec = &N(pos_rocks_1)[0] }, .priority = 9 }, @@ -97,7 +97,7 @@ Formation N(formation_02) = { { .actor = &N(gulpit_rocks), .home = { .vec = &N(pos_rocks_1)[4] }, .priority = 5, .var0 = 1 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(gulpit), .home = { .index = 0 }, .priority = 20 }, { .actor = &N(gulpit), .home = { .index = 1 }, .priority = 19 }, { .actor = &N(gulpit), .home = { .index = 2 }, .priority = 18 }, @@ -108,7 +108,7 @@ Formation N(formation_03) = { { .actor = &N(gulpit_rocks), .home = { .vec = &N(pos_rocks_2)[4] }, .priority = 5, .var0 = 1 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(gulpit), .home = { .index = 0 }, .priority = 20 }, { .actor = &N(gulpit), .home = { .index = 1 }, .priority = 19 }, { .actor = &N(frost_piranha), .home = { .index = 2 }, .priority = 18 }, @@ -119,7 +119,7 @@ Formation N(formation_04) = { { .actor = &N(gulpit_rocks), .home = { .vec = &N(pos_rocks_3)[4] }, .priority = 5, .var0 = 1 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(gulpit), .home = { .index = 0 }, .priority = 20 }, { .actor = &N(frost_piranha), .home = { .index = 1 }, .priority = 19 }, { .actor = &N(gulpit), .home = { .index = 2 }, .priority = 18 }, @@ -130,7 +130,7 @@ Formation N(formation_05) = { { .actor = &N(gulpit_rocks), .home = { .vec = &N(pos_rocks_4)[4] }, .priority = 5, .var0 = 1 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(gulpit), .home = { .index = 0 }, .priority = 20 }, { .actor = &N(frost_piranha), .home = { .index = 1 }, .priority = 19 }, { .actor = &N(gulpit), .home = { .index = 2 }, .priority = 18 }, @@ -142,19 +142,19 @@ Formation N(formation_06) = { { .actor = &N(gulpit_rocks), .home = { .vec = &N(pos_rocks_5)[4] }, .priority = 5, .var0 = 1 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(frost_piranha), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(frost_piranha), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(frost_piranha), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(frost_piranha), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(frost_piranha), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(frost_piranha), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(frost_piranha), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(frost_piranha), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(gulpit), .home = { .index = 2 }, .priority = 9 }, @@ -165,7 +165,7 @@ Formation N(formation_09) = { { .actor = &N(gulpit_rocks), .home = { .vec = &N(pos_rocks_6)[4] }, .priority = 5, .var0 = 1 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(frost_piranha), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(gulpit), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(frost_piranha), .home = { .index = 2 }, .priority = 8 }, @@ -176,7 +176,7 @@ Formation N(formation_0A) = { { .actor = &N(gulpit_rocks), .home = { .vec = &N(pos_rocks_7)[4] }, .priority = 5, .var0 = 1 }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(frost_piranha), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(gulpit), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(frost_piranha), .home = { .index = 2 }, .priority = 8 }, @@ -188,44 +188,44 @@ Formation N(formation_0B) = { { .actor = &N(gulpit_rocks), .home = { .vec = &N(pos_rocks_8)[4] }, .priority = 5, .var0 = 1 }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(white_clubba), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(white_clubba), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(white_clubba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(frost_piranha), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(white_clubba), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(frost_piranha), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_0E) = { +Formation N(Formation_0E) = { { .actor = &N(white_clubba), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(frost_piranha), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(white_clubba), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(gray_magikoopa), .home = { .index = 3 }, .priority = 7 }, }; -BattleList N(formationTable) = { - BATTLE("バケバケx2", N(formation_01), &N(sam_01)), - BATTLE("ゴックンx2", N(formation_02), &N(sam_01)), - BATTLE("ゴックンx3", N(formation_03), &N(sam_01)), - BATTLE("ゴックンx2,アイスパックン", N(formation_04), &N(sam_01)), - BATTLE("ゴックン,アイスパックン,ゴックン", N(formation_05), &N(sam_01)), - BATTLE("ゴックン,アイスパックン,ゴックン,アイスパックン", N(formation_06), &N(sam_01)), - BATTLE("アイスパックンx２", N(formation_07), &N(sam_01)), - BATTLE("アイスパックンx４", N(formation_08), &N(sam_01)), - BATTLE("アイスパックンx２,ゴックン", N(formation_09), &N(sam_01)), - BATTLE("アイスパックン,ゴックン,アイスパックン", N(formation_0A), &N(sam_01)), - BATTLE("アイスパックン,ゴックン,アイスパックン,ゴックン", N(formation_0B), &N(sam_01)), - BATTLE("ホワイトガボンx２", N(formation_0C), &N(sam_01)), - BATTLE("ホワイトガボン,パックン,ガボン,パックン", N(formation_0D), &N(sam_01)), - BATTLE("ホワイトガボン,パックン,ガボン,グレイカメック", N(formation_0E), &N(sam_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_01), &N(sam_01), "バケバケx2"), + BATTLE(N(Formation_02), &N(sam_01), "ゴックンx2"), + BATTLE(N(Formation_03), &N(sam_01), "ゴックンx3"), + BATTLE(N(Formation_04), &N(sam_01), "ゴックンx2,アイスパックン"), + BATTLE(N(Formation_05), &N(sam_01), "ゴックン,アイスパックン,ゴックン"), + BATTLE(N(Formation_06), &N(sam_01), "ゴックン,アイスパックン,ゴックン,アイスパックン"), + BATTLE(N(Formation_07), &N(sam_01), "アイスパックンx２"), + BATTLE(N(Formation_08), &N(sam_01), "アイスパックンx４"), + BATTLE(N(Formation_09), &N(sam_01), "アイスパックンx２,ゴックン"), + BATTLE(N(Formation_0A), &N(sam_01), "アイスパックン,ゴックン,アイスパックン"), + BATTLE(N(Formation_0B), &N(sam_01), "アイスパックン,ゴックン,アイスパックン,ゴックン"), + BATTLE(N(Formation_0C), &N(sam_01), "ホワイトガボンx２"), + BATTLE(N(Formation_0D), &N(sam_01), "ホワイトガボン,パックン,ガボン,パックン"), + BATTLE(N(Formation_0E), &N(sam_01), "ホワイトガボン,パックン,ガボン,グレイカメック"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "sam_01", &N(sam_01) }, { "sam_02", &N(sam_02) }, { "sam_02b", &N(sam_02b) }, diff --git a/src/battle/area_sam/stage/sam_01.c b/src/battle/area/sam/stage/sam_01.c similarity index 100% rename from src/battle/area_sam/stage/sam_01.c rename to src/battle/area/sam/stage/sam_01.c diff --git a/src/battle/area_sam/stage/sam_02.c b/src/battle/area/sam/stage/sam_02.c similarity index 100% rename from src/battle/area_sam/stage/sam_02.c rename to src/battle/area/sam/stage/sam_02.c diff --git a/src/battle/area_sam/stage/sam_02b.c b/src/battle/area/sam/stage/sam_02b.c similarity index 100% rename from src/battle/area_sam/stage/sam_02b.c rename to src/battle/area/sam/stage/sam_02b.c diff --git a/src/battle/area_sam/stage/sam_02c.c b/src/battle/area/sam/stage/sam_02c.c similarity index 100% rename from src/battle/area_sam/stage/sam_02c.c rename to src/battle/area/sam/stage/sam_02c.c diff --git a/src/battle/area_sam/stage/sam_02d.c b/src/battle/area/sam/stage/sam_02d.c similarity index 100% rename from src/battle/area_sam/stage/sam_02d.c rename to src/battle/area/sam/stage/sam_02d.c diff --git a/src/battle/area_sam/stage/sam_03.c b/src/battle/area/sam/stage/sam_03.c similarity index 100% rename from src/battle/area_sam/stage/sam_03.c rename to src/battle/area/sam/stage/sam_03.c diff --git a/src/battle/area_sam2/actor/gray_magikoopa.c b/src/battle/area/sam2/actor/gray_magikoopa.c similarity index 100% rename from src/battle/area_sam2/actor/gray_magikoopa.c rename to src/battle/area/sam2/actor/gray_magikoopa.c diff --git a/src/battle/area_sam2/actor/monstar.c b/src/battle/area/sam2/actor/monstar.c similarity index 97% rename from src/battle/area_sam2/actor/monstar.c rename to src/battle/area/sam2/actor/monstar.c index d9a4ede890..d1d16b79c3 100644 --- a/src/battle/area_sam2/actor/monstar.c +++ b/src/battle/area/sam2/actor/monstar.c @@ -4,7 +4,7 @@ #include "effects.h" #include "sprite.h" #include "sprite/npc/Monstar.h" -#include "battle/area_sam2/actor/img.png.h" +#include "battle/area/sam2/actor/img.png.h" #define NAMESPACE b_area_sam2_monstar @@ -62,8 +62,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_100, .elementImmunityFlags = 0, - .unk_1C = 1, - .unk_1D = -15, + .projectileTargetOffset = { 1, -15 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -75,8 +74,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_100, .elementImmunityFlags = 0, - .unk_1C = 1, - .unk_1D = -15, + .projectileTargetOffset = { 1, -15 }, }, }; @@ -134,8 +132,8 @@ EvtScript N(init) = { EVT_END }; -#include "battle/area_sam2/actor/img.png.inc.c" -#include "battle/area_sam2/actor/img.pal.inc.c" +#include "battle/area/sam2/actor/img.png.inc.c" +#include "battle/area/sam2/actor/img.pal.inc.c" FoldImageRecPart D_8021A2B8_63F498 = { .raster = battle_area_sam2_actor_img_png, @@ -148,7 +146,7 @@ FoldImageRecPart D_8021A2B8_63F498 = { .dlist = N(dlist), }; -ApiStatus func_80218000_63D1E0(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218000_63D1E0) { ActorPart* part = get_actor_part(get_actor(script->owner1.actorID), 1); s32 i; u8 sp20[20]; @@ -160,10 +158,10 @@ ApiStatus func_80218000_63D1E0(Evt* script, s32 isInitialCall) { script->functionTemp[1] = 0; script->functionTemp[2] = 0; script->functionTemp[0] = 0; - func_802DE780(part->spriteInstanceID, 0, 17, 20, 0, 0, 255, 0); + func_802DE780(part->spriteInstanceID, 0, FOLD_TYPE_11, 20, 0, 0, 255, 0); } - func_802DE780(part->spriteInstanceID, 1, 15, (s32)&D_8021A2B8_63F498, 255, 0, 255, 0); + func_802DE780(part->spriteInstanceID, 1, FOLD_TYPE_F, (s32)&D_8021A2B8_63F498, 255, 0, 255, 0); script->functionTemp[1] += 10; if (script->functionTemp[1] >= 360) { script->functionTemp[1] %= 360; @@ -176,7 +174,7 @@ ApiStatus func_80218000_63D1E0(Evt* script, s32 isInitialCall) { } for (i = 0; i < 20; i++) { - func_802DE780(part->spriteInstanceID, 0, 12, i, sp20[i] << 0x18 | sp38[i] << 0x10 | sp50[i] << 8 | 0xFF, 0, 255, 0); + func_802DE780(part->spriteInstanceID, 0, FOLD_TYPE_C, i, sp20[i] << 0x18 | sp38[i] << 0x10 | sp50[i] << 8 | 0xFF, 0, 255, 0); } return ApiStatus_BLOCK; diff --git a/src/battle/area_sam2/actor/paragoomba.c b/src/battle/area/sam2/actor/paragoomba.c similarity index 100% rename from src/battle/area_sam2/actor/paragoomba.c rename to src/battle/area/sam2/actor/paragoomba.c diff --git a/src/battle/area_sam2/area.c b/src/battle/area/sam2/area.c similarity index 74% rename from src/battle/area_sam2/area.c rename to src/battle/area/sam2/area.c index 5fa4e583b2..1d0075423a 100644 --- a/src/battle/area_sam2/area.c +++ b/src/battle/area/sam2/area.c @@ -16,22 +16,22 @@ extern Stage N(sam_03); Vec3i N(80223490) = { 75, 16, 5 }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(monstar), .home = { .vec = &N(80223490) }, .priority = 10 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(paragoomba), .home = { .index = 5 }, .priority = 10 }, { .actor = &N(gray_magikoopa), .home = { .index = 2 }, .priority = 9 }, }; -BattleList N(formationTable) = { - BATTLE("かいぶつ", N(formation_01), &N(sam_03)), - BATTLE("パタクリ,グレイカメック（チェックよう）", N(formation_02), &N(sam_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_01), &N(sam_03), "かいぶつ"), + BATTLE(N(Formation_02), &N(sam_01), "パタクリ,グレイカメック（チェックよう）"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "sam_01", &N(sam_01) }, { "sam_02", &N(sam_02) }, { "sam_02b", &N(sam_02b) }, diff --git a/src/battle/area_sam2/dlist.c b/src/battle/area/sam2/dlist.c similarity index 100% rename from src/battle/area_sam2/dlist.c rename to src/battle/area/sam2/dlist.c diff --git a/src/battle/area_sam2/stage/sam_01.c b/src/battle/area/sam2/stage/sam_01.c similarity index 100% rename from src/battle/area_sam2/stage/sam_01.c rename to src/battle/area/sam2/stage/sam_01.c diff --git a/src/battle/area_sam2/stage/sam_02.c b/src/battle/area/sam2/stage/sam_02.c similarity index 100% rename from src/battle/area_sam2/stage/sam_02.c rename to src/battle/area/sam2/stage/sam_02.c diff --git a/src/battle/area_sam2/stage/sam_02b.c b/src/battle/area/sam2/stage/sam_02b.c similarity index 100% rename from src/battle/area_sam2/stage/sam_02b.c rename to src/battle/area/sam2/stage/sam_02b.c diff --git a/src/battle/area_sam2/stage/sam_02c.c b/src/battle/area/sam2/stage/sam_02c.c similarity index 100% rename from src/battle/area_sam2/stage/sam_02c.c rename to src/battle/area/sam2/stage/sam_02c.c diff --git a/src/battle/area_sam2/stage/sam_02d.c b/src/battle/area/sam2/stage/sam_02d.c similarity index 100% rename from src/battle/area_sam2/stage/sam_02d.c rename to src/battle/area/sam2/stage/sam_02d.c diff --git a/src/battle/area_sam2/stage/sam_03.c b/src/battle/area/sam2/stage/sam_03.c similarity index 100% rename from src/battle/area_sam2/stage/sam_03.c rename to src/battle/area/sam2/stage/sam_03.c diff --git a/src/battle/area/sam2/vtx.c b/src/battle/area/sam2/vtx.c new file mode 100644 index 0000000000..25755dbfa9 --- /dev/null +++ b/src/battle/area/sam2/vtx.c @@ -0,0 +1,5 @@ +#include "common.h" + +#define NAMESPACE b_area_sam2 + +#include "battle/area/sam2/monstar_bubbles.vtx.inc.c" diff --git a/src/battle/area_sbk/actor/bandit.c b/src/battle/area/sbk/actor/bandit.c similarity index 100% rename from src/battle/area_sbk/actor/bandit.c rename to src/battle/area/sbk/actor/bandit.c diff --git a/src/battle/area_sbk/actor/pokey.c b/src/battle/area/sbk/actor/pokey.c similarity index 100% rename from src/battle/area_sbk/actor/pokey.c rename to src/battle/area/sbk/actor/pokey.c diff --git a/src/battle/area_sbk/area.c b/src/battle/area/sbk/area.c similarity index 68% rename from src/battle/area_sbk/area.c rename to src/battle/area/sbk/area.c index 4d6610ba21..e5a7ebd53e 100644 --- a/src/battle/area_sbk/area.c +++ b/src/battle/area/sbk/area.c @@ -8,127 +8,127 @@ extern ActorBlueprint N(bandit); extern Stage N(sbk_02); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(pokey), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(pokey), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(pokey), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(pokey), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pokey), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(pokey), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(pokey), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pokey), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(pokey), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(pokey), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(pokey), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(bandit), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(pokey), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pokey), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(bandit), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(pokey), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pokey), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(bandit), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(bandit), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(pokey), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(bandit), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(pokey), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(pokey), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pokey), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(bandit), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(pokey), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(bandit), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(bandit), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(bandit), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(bandit), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(bandit), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(bandit), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(bandit), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(bandit), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(bandit), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(bandit), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(bandit), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(pokey), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0E) = { +Formation N(Formation_0E) = { { .actor = &N(bandit), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(bandit), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(pokey), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_0F) = { +Formation N(Formation_0F) = { { .actor = &N(bandit), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(bandit), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(pokey), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(pokey), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_10) = { +Formation N(Formation_10) = { { .actor = &N(bandit), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(pokey), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(bandit), .home = { .index = 2 }, .priority = 8 }, }; -BattleList N(formationTable) = { - BATTLE("サンボ", N(formation_00), &N(sbk_02)), - BATTLE("サンボx2", N(formation_01), &N(sbk_02)), - BATTLE("サンボx3", N(formation_02), &N(sbk_02)), - BATTLE("きいろサンボx4", N(formation_03), &N(sbk_02)), - BATTLE("サンボ,ボロドー", N(formation_04), &N(sbk_02)), - BATTLE("サンボx2,ボロドー", N(formation_05), &N(sbk_02)), - BATTLE("サンボx2,ボロドーx2", N(formation_06), &N(sbk_02)), - BATTLE("サンボ,ボロドー,サンボ", N(formation_07), &N(sbk_02)), - BATTLE("サンボx2,ボロドー,サンボ", N(formation_08), &N(sbk_02)), - BATTLE("ボロドー", N(formation_09), &N(sbk_02)), - BATTLE("ボロドーx2", N(formation_0A), &N(sbk_02)), - BATTLE("ボロドーx3", N(formation_0B), &N(sbk_02)), - BATTLE("ボロドーx4", N(formation_0C), &N(sbk_02)), - BATTLE("ボロドー,サンボ", N(formation_0D), &N(sbk_02)), - BATTLE("ボロドーx2,サンボ", N(formation_0E), &N(sbk_02)), - BATTLE("ボロドーx2,サンボx2", N(formation_0F), &N(sbk_02)), - BATTLE("ボロドー,サンボ,ボロドー", N(formation_10), &N(sbk_02)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(sbk_02), "サンボ"), + BATTLE(N(Formation_01), &N(sbk_02), "サンボx2"), + BATTLE(N(Formation_02), &N(sbk_02), "サンボx3"), + BATTLE(N(Formation_03), &N(sbk_02), "きいろサンボx4"), + BATTLE(N(Formation_04), &N(sbk_02), "サンボ,ボロドー"), + BATTLE(N(Formation_05), &N(sbk_02), "サンボx2,ボロドー"), + BATTLE(N(Formation_06), &N(sbk_02), "サンボx2,ボロドーx2"), + BATTLE(N(Formation_07), &N(sbk_02), "サンボ,ボロドー,サンボ"), + BATTLE(N(Formation_08), &N(sbk_02), "サンボx2,ボロドー,サンボ"), + BATTLE(N(Formation_09), &N(sbk_02), "ボロドー"), + BATTLE(N(Formation_0A), &N(sbk_02), "ボロドーx2"), + BATTLE(N(Formation_0B), &N(sbk_02), "ボロドーx3"), + BATTLE(N(Formation_0C), &N(sbk_02), "ボロドーx4"), + BATTLE(N(Formation_0D), &N(sbk_02), "ボロドー,サンボ"), + BATTLE(N(Formation_0E), &N(sbk_02), "ボロドーx2,サンボ"), + BATTLE(N(Formation_0F), &N(sbk_02), "ボロドーx2,サンボx2"), + BATTLE(N(Formation_10), &N(sbk_02), "ボロドー,サンボ,ボロドー"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "sbk_01", &N(sbk_02) }, {}, }; diff --git a/src/battle/area_sbk/stage/sbk_02.c b/src/battle/area/sbk/stage/sbk_02.c similarity index 100% rename from src/battle/area_sbk/stage/sbk_02.c rename to src/battle/area/sbk/stage/sbk_02.c diff --git a/src/battle/area_tik/actor/buzzy_beetle.c b/src/battle/area/tik/actor/buzzy_beetle.c similarity index 100% rename from src/battle/area_tik/actor/buzzy_beetle.c rename to src/battle/area/tik/actor/buzzy_beetle.c diff --git a/src/battle/area_tik/actor/dark_koopa.c b/src/battle/area/tik/actor/dark_koopa.c similarity index 98% rename from src/battle/area_tik/actor/dark_koopa.c rename to src/battle/area/tik/actor/dark_koopa.c index a6a838bad9..3b15838655 100644 --- a/src/battle/area_tik/actor/dark_koopa.c +++ b/src/battle/area/tik/actor/dark_koopa.c @@ -63,8 +63,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -7, + .projectileTargetOffset = { 0, -7 }, }, }; @@ -181,18 +180,18 @@ EvtScript N(updateOffsets) = { EVT_CASE_OR_EQ(1) EVT_IF_FLAG(LVar1, STATUS_FLAG_SLEEP | STATUS_FLAG_DIZZY) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -4) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(N(UnkBattleFunc1), -15, 32, 5, 32) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -399,7 +398,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Hurt) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) @@ -831,7 +830,7 @@ EvtScript N(standUp) = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -4) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 0) EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) diff --git a/src/battle/area_tik/actor/dark_paratroopa.c b/src/battle/area/tik/actor/dark_paratroopa.c similarity index 98% rename from src/battle/area_tik/actor/dark_paratroopa.c rename to src/battle/area/tik/actor/dark_paratroopa.c index 821db92492..3ac90ac7b7 100644 --- a/src/battle/area_tik/actor/dark_paratroopa.c +++ b/src/battle/area/tik/actor/dark_paratroopa.c @@ -102,8 +102,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -7, + .projectileTargetOffset = { 0, -7 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -115,8 +114,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable2), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, - .unk_1C = 2, - .unk_1D = -14, + .projectileTargetOffset = { 2, -14 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -128,8 +126,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, }; @@ -217,11 +214,11 @@ EvtScript N(init) = { EvtScript N(updateOffsets) = { EVT_IF_FLAG(LVar1, STATUS_FLAG_SLEEP | STATUS_FLAG_DIZZY) EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, 0, 25) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 2, 3, -6) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, 3, -6) EVT_CALL(N(UnkBattleFunc1), -19, 25, 4, 28) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, -2, 36) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 2, 0, -7) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, 0, -7) EVT_CALL(N(UnkBattleFunc1), -10, 29, 8, 30) EVT_END_IF EVT_RETURN @@ -733,18 +730,18 @@ EvtScript N(updateOffsets_koopa) = { EVT_CASE_OR_EQ(1) EVT_IF_FLAG(LVar1, STATUS_FLAG_SLEEP | STATUS_FLAG_DIZZY) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -4) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(N(UnkBattleFunc1), -15, 32, 5, 32) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -951,7 +948,7 @@ EvtScript N(handleEvent_koopa) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_koopa_flipped))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_flipped))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Hurt) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) @@ -1383,7 +1380,7 @@ EvtScript N(koopa_standUp) = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -4) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 0) EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) diff --git a/src/battle/area_tik/actor/gloomba.c b/src/battle/area/tik/actor/gloomba.c similarity index 99% rename from src/battle/area_tik/actor/gloomba.c rename to src/battle/area/tik/actor/gloomba.c index 58a40cb210..b95022129a 100644 --- a/src/battle/area_tik/actor/gloomba.c +++ b/src/battle/area/tik/actor/gloomba.c @@ -53,8 +53,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/area_tik/actor/paragloomba.c b/src/battle/area/tik/actor/paragloomba.c similarity index 99% rename from src/battle/area_tik/actor/paragloomba.c rename to src/battle/area/tik/actor/paragloomba.c index b9a400a369..7c88e0f333 100644 --- a/src/battle/area_tik/actor/paragloomba.c +++ b/src/battle/area/tik/actor/paragloomba.c @@ -93,8 +93,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -106,8 +105,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable2), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -119,8 +117,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -132,8 +129,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/area_tik/actor/spike_top.c b/src/battle/area/tik/actor/spike_top.c similarity index 100% rename from src/battle/area_tik/actor/spike_top.c rename to src/battle/area/tik/actor/spike_top.c diff --git a/src/battle/area_tik/actor/spiked_gloomba.c b/src/battle/area/tik/actor/spiked_gloomba.c similarity index 99% rename from src/battle/area_tik/actor/spiked_gloomba.c rename to src/battle/area/tik/actor/spiked_gloomba.c index b0337285dc..4532d93ea0 100644 --- a/src/battle/area_tik/actor/spiked_gloomba.c +++ b/src/battle/area/tik/actor/spiked_gloomba.c @@ -54,8 +54,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -12, + .projectileTargetOffset = { 0, -12 }, }, }; diff --git a/src/battle/area_tik/actor/spiny.c b/src/battle/area/tik/actor/spiny.c similarity index 100% rename from src/battle/area_tik/actor/spiny.c rename to src/battle/area/tik/actor/spiny.c diff --git a/src/battle/area_tik/area.c b/src/battle/area/tik/area.c similarity index 70% rename from src/battle/area_tik/area.c rename to src/battle/area/tik/area.c index 39a497580c..4db20a3e99 100644 --- a/src/battle/area_tik/area.c +++ b/src/battle/area/tik/area.c @@ -18,186 +18,186 @@ extern Stage N(tik_03); extern Stage N(tik_04); extern Stage N(tik_05); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(dark_koopa), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(dark_koopa), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(dark_koopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(dark_koopa), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(dark_koopa), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(dark_koopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(dark_koopa), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(dark_koopa), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(dark_koopa), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(dark_koopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(dark_paratroopa), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(dark_paratroopa), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(dark_koopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(spike_top), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(spike_top), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(dark_koopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(spike_top), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(dark_koopa), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(dark_koopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(spiny), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(spiny), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(dark_koopa), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(spiny), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(dark_koopa), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(spiny), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(dark_paratroopa), .home = { .index = 5 }, .priority = 10, }, { .actor = &N(dark_paratroopa), .home = { .index = 6 }, .priority = 9, }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(dark_paratroopa), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(dark_paratroopa), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(dark_paratroopa), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(gloomba), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(gloomba), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(gloomba), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(gloomba), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(gloomba), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(gloomba), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(paragloomba), .home = { .index = 4 }, .priority = 10, }, { .actor = &N(paragloomba), .home = { .index = 5 }, .priority = 9, }, { .actor = &N(paragloomba), .home = { .index = 6 }, .priority = 8, }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(paragloomba), .home = { .index = 5 }, .priority = 10, }, { .actor = &N(spiked_gloomba), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_0E) = { +Formation N(Formation_0E) = { { .actor = &N(spiked_gloomba), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(spiked_gloomba), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_0F) = { +Formation N(Formation_0F) = { { .actor = &N(spiked_gloomba), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(gloomba), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(gloomba), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_10) = { +Formation N(Formation_10) = { { .actor = &N(spiked_gloomba), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(buzzy_beetle), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(buzzy_beetle), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_11) = { +Formation N(Formation_11) = { { .actor = &N(spiked_gloomba), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(buzzy_beetle), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(spiked_gloomba), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(buzzy_beetle), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_12) = { +Formation N(Formation_12) = { { .actor = &N(spiked_gloomba), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(buzzy_beetle), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(paragloomba), .home = { .index = 6 }, .priority = 8, }, { .actor = &N(buzzy_beetle), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_13) = { +Formation N(Formation_13) = { { .actor = &N(spike_top), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(spike_top), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(spike_top), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(spike_top), .home = { .index = 3 }, .priority = 7, }, }; -Formation N(formation_14) = { +Formation N(Formation_14) = { { .actor = &N(spike_top), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(spike_top), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_15) = { +Formation N(Formation_15) = { { .actor = &N(buzzy_beetle), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(spiked_gloomba), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(buzzy_beetle), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_16) = { +Formation N(Formation_16) = { { .actor = &N(spiny), .home = { .index = 1 }, .priority = 10, }, { .actor = &N(spiny), .home = { .index = 2 }, .priority = 9, }, }; -Formation N(formation_17) = { +Formation N(Formation_17) = { { .actor = &N(spiny), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(spiny), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(spiny), .home = { .index = 2 }, .priority = 8, }, }; -Formation N(formation_18) = { +Formation N(Formation_18) = { { .actor = &N(spiny), .home = { .index = 0 }, .priority = 10, }, { .actor = &N(spiny), .home = { .index = 1 }, .priority = 9, }, { .actor = &N(spiny), .home = { .index = 2 }, .priority = 8, }, { .actor = &N(spiny), .home = { .index = 3 }, .priority = 7, }, }; -BattleList N(formationTable) = { - BATTLE("ヤミノコノコx２", N(formation_00), &N(tik_01)), - BATTLE("ヤミノコノコx３", N(formation_01), &N(tik_01)), - BATTLE("ヤミノコノコx４", N(formation_02), &N(tik_01)), - BATTLE("ヤミノコノコ,ヤミパタパタx２", N(formation_03), &N(tik_01)), - BATTLE("ヤミノコノコ,トゲメットx２", N(formation_04), &N(tik_01)), - BATTLE("ヤミノコノコ,トゲメット,ヤミノコノコ", N(formation_05), &N(tik_01)), - BATTLE("ヤミノコノコ,トゲゾーx２", N(formation_06), &N(tik_01)), - BATTLE("ヤミノコノコ,トゲゾー,ヤミノコノコ,トゲゾー", N(formation_07), &N(tik_01)), - BATTLE("ヤミパタパタx２", N(formation_08), &N(tik_01)), - BATTLE("ヤミパタパタx３", N(formation_09), &N(tik_01)), - BATTLE("ヤミクリボーx２", N(formation_0A), &N(tik_01)), - BATTLE("ヤミクリボーx４", N(formation_0B), &N(tik_01)), - BATTLE("ヤミパタクリx３", N(formation_0C), &N(tik_01)), - BATTLE("ヤミパタクリ,ヤミトゲクリ", N(formation_0D), &N(tik_01)), - BATTLE("ヤミトゲクリx２", N(formation_0E), &N(tik_01)), - BATTLE("ヤミトゲクリ,ヤミクリボーx２", N(formation_0F), &N(tik_01)), - BATTLE("ヤミトゲクリ,メットx２", N(formation_10), &N(tik_01)), - BATTLE("ヤミトゲクリ,メット,ヤミトゲクリ,メット", N(formation_11), &N(tik_01)), - BATTLE("ヤミトゲクリ,メット,ヤミパタクリ,メット", N(formation_12), &N(tik_01)), - BATTLE("トゲメットx４", N(formation_13), &N(tik_01)), - BATTLE("トゲメットx２", N(formation_14), &N(tik_01)), - BATTLE("メット,ヤミトゲクリ,メット", N(formation_15), &N(tik_01)), - BATTLE("トゲゾーx２", N(formation_16), &N(tik_01)), - BATTLE("トゲゾーx３", N(formation_17), &N(tik_01)), - BATTLE("トゲゾーx４", N(formation_18), &N(tik_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(tik_01), "ヤミノコノコx２"), + BATTLE(N(Formation_01), &N(tik_01), "ヤミノコノコx３"), + BATTLE(N(Formation_02), &N(tik_01), "ヤミノコノコx４"), + BATTLE(N(Formation_03), &N(tik_01), "ヤミノコノコ,ヤミパタパタx２"), + BATTLE(N(Formation_04), &N(tik_01), "ヤミノコノコ,トゲメットx２"), + BATTLE(N(Formation_05), &N(tik_01), "ヤミノコノコ,トゲメット,ヤミノコノコ"), + BATTLE(N(Formation_06), &N(tik_01), "ヤミノコノコ,トゲゾーx２"), + BATTLE(N(Formation_07), &N(tik_01), "ヤミノコノコ,トゲゾー,ヤミノコノコ,トゲゾー"), + BATTLE(N(Formation_08), &N(tik_01), "ヤミパタパタx２"), + BATTLE(N(Formation_09), &N(tik_01), "ヤミパタパタx３"), + BATTLE(N(Formation_0A), &N(tik_01), "ヤミクリボーx２"), + BATTLE(N(Formation_0B), &N(tik_01), "ヤミクリボーx４"), + BATTLE(N(Formation_0C), &N(tik_01), "ヤミパタクリx３"), + BATTLE(N(Formation_0D), &N(tik_01), "ヤミパタクリ,ヤミトゲクリ"), + BATTLE(N(Formation_0E), &N(tik_01), "ヤミトゲクリx２"), + BATTLE(N(Formation_0F), &N(tik_01), "ヤミトゲクリ,ヤミクリボーx２"), + BATTLE(N(Formation_10), &N(tik_01), "ヤミトゲクリ,メットx２"), + BATTLE(N(Formation_11), &N(tik_01), "ヤミトゲクリ,メット,ヤミトゲクリ,メット"), + BATTLE(N(Formation_12), &N(tik_01), "ヤミトゲクリ,メット,ヤミパタクリ,メット"), + BATTLE(N(Formation_13), &N(tik_01), "トゲメットx４"), + BATTLE(N(Formation_14), &N(tik_01), "トゲメットx２"), + BATTLE(N(Formation_15), &N(tik_01), "メット,ヤミトゲクリ,メット"), + BATTLE(N(Formation_16), &N(tik_01), "トゲゾーx２"), + BATTLE(N(Formation_17), &N(tik_01), "トゲゾーx３"), + BATTLE(N(Formation_18), &N(tik_01), "トゲゾーx４"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "tik_01", &N(tik_01) }, { "tik_02", &N(tik_02) }, { "tik_03", &N(tik_03) }, diff --git a/src/battle/area_tik/stage/tik_01.c b/src/battle/area/tik/stage/tik_01.c similarity index 100% rename from src/battle/area_tik/stage/tik_01.c rename to src/battle/area/tik/stage/tik_01.c diff --git a/src/battle/area_tik/stage/tik_02.c b/src/battle/area/tik/stage/tik_02.c similarity index 100% rename from src/battle/area_tik/stage/tik_02.c rename to src/battle/area/tik/stage/tik_02.c diff --git a/src/battle/area_tik/stage/tik_03.c b/src/battle/area/tik/stage/tik_03.c similarity index 100% rename from src/battle/area_tik/stage/tik_03.c rename to src/battle/area/tik/stage/tik_03.c diff --git a/src/battle/area_tik/stage/tik_04.c b/src/battle/area/tik/stage/tik_04.c similarity index 100% rename from src/battle/area_tik/stage/tik_04.c rename to src/battle/area/tik/stage/tik_04.c diff --git a/src/battle/area_tik/stage/tik_05.c b/src/battle/area/tik/stage/tik_05.c similarity index 100% rename from src/battle/area_tik/stage/tik_05.c rename to src/battle/area/tik/stage/tik_05.c diff --git a/src/battle/area_tik2/actor/blooper.c b/src/battle/area/tik2/actor/blooper.c similarity index 99% rename from src/battle/area_tik2/actor/blooper.c rename to src/battle/area/tik2/actor/blooper.c index 3b8b80887b..d4ba4c511c 100644 --- a/src/battle/area_tik2/actor/blooper.c +++ b/src/battle/area/tik2/actor/blooper.c @@ -163,8 +163,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -176,8 +175,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -37, + .projectileTargetOffset = { 0, -37 }, }, }; diff --git a/src/battle/area_tik2/actor/blooper_baby.c b/src/battle/area/tik2/actor/blooper_baby.c similarity index 99% rename from src/battle/area_tik2/actor/blooper_baby.c rename to src/battle/area/tik2/actor/blooper_baby.c index 19e5857e08..387f3b576d 100644 --- a/src/battle/area_tik2/actor/blooper_baby.c +++ b/src/battle/area/tik2/actor/blooper_baby.c @@ -163,8 +163,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -176,8 +175,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 1, - .unk_1D = -13, + .projectileTargetOffset = { 1, -13 }, }, }; diff --git a/src/battle/area_tik2/actor/electro_blooper.c b/src/battle/area/tik2/actor/electro_blooper.c similarity index 99% rename from src/battle/area_tik2/actor/electro_blooper.c rename to src/battle/area/tik2/actor/electro_blooper.c index d7d568c260..1b2af93f96 100644 --- a/src/battle/area_tik2/actor/electro_blooper.c +++ b/src/battle/area/tik2/actor/electro_blooper.c @@ -194,8 +194,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -207,8 +206,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -37, + .projectileTargetOffset = { 0, -37 }, }, }; @@ -237,7 +235,7 @@ ActorBlueprint NAMESPACE = { #include "common/StartRumbleWithParams.inc.c" -ApiStatus N(unused_func)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(unused_func)) { Bytecode* args = script->ptrReadPos; Bytecode arg0 = *args++; f32 var0, var1; @@ -254,7 +252,7 @@ ApiStatus N(unused_func)(Evt* script, s32 isInitialCall) { #include "common/FadeBackgroundToBlack.inc.c" #include "common/UnfadeBackgroundToBlack.inc.c" -ApiStatus N(UpdateSnakingStatic)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UpdateSnakingStatic)) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); f32 x = evt_get_variable(script, *args++); diff --git a/src/battle/area_tik2/actor/super_blooper.c b/src/battle/area/tik2/actor/super_blooper.c similarity index 99% rename from src/battle/area_tik2/actor/super_blooper.c rename to src/battle/area/tik2/actor/super_blooper.c index 5180b23a69..ee14b8cdef 100644 --- a/src/battle/area_tik2/actor/super_blooper.c +++ b/src/battle/area/tik2/actor/super_blooper.c @@ -198,8 +198,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -211,8 +210,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -30, + .projectileTargetOffset = { 0, -30 }, }, }; @@ -241,7 +239,7 @@ ActorBlueprint NAMESPACE = { #include "common/StartRumbleWithParams.inc.c" -ApiStatus N(unused_func)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(unused_func)) { Bytecode* args = script->ptrReadPos; Bytecode arg0 = *args++; f32 var0, var1; diff --git a/src/battle/area_tik2/area.c b/src/battle/area/tik2/area.c similarity index 72% rename from src/battle/area_tik2/area.c rename to src/battle/area/tik2/area.c index ded42d9a35..7606351343 100644 --- a/src/battle/area_tik2/area.c +++ b/src/battle/area/tik2/area.c @@ -15,28 +15,28 @@ extern Stage N(tik_05); Vec3i N(blooper_pos) = { 80, 45, -10 }; -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(blooper), .home = { .vec = &N(blooper_pos) }, .priority = 10, }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(electro_blooper), .home = { .vec = &N(blooper_pos) }, .priority = 10, }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(super_blooper), .home = { .vec = &N(blooper_pos) }, .priority = 10, }, }; // ソ is encoded as 0x83 0x5C, so it needs another backslash to be interpreted as valid escape sequence // TODO modify iconv instead of strings in this file -BattleList N(formationTable) = { - BATTLE("ゲッソ\ー", N(formation_00), &N(tik_01)), - BATTLE("ビリビリゲッソ\ー", N(formation_01), &N(tik_01)), - BATTLE("ビッグゲッソ\ー　チビゲッソ\ー", N(formation_02), &N(tik_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(tik_01), "ゲッソ\ー"), + BATTLE(N(Formation_01), &N(tik_01), "ビリビリゲッソ\ー"), + BATTLE(N(Formation_02), &N(tik_01), "ビッグゲッソ\ー　チビゲッソ\ー"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "tik_01", &N(tik_01) }, { "tik_02", &N(tik_02) }, { "tik_03", &N(tik_03) }, diff --git a/src/battle/area_tik2/stage/tik_01.c b/src/battle/area/tik2/stage/tik_01.c similarity index 100% rename from src/battle/area_tik2/stage/tik_01.c rename to src/battle/area/tik2/stage/tik_01.c diff --git a/src/battle/area_tik2/stage/tik_02.c b/src/battle/area/tik2/stage/tik_02.c similarity index 100% rename from src/battle/area_tik2/stage/tik_02.c rename to src/battle/area/tik2/stage/tik_02.c diff --git a/src/battle/area_tik2/stage/tik_03.c b/src/battle/area/tik2/stage/tik_03.c similarity index 100% rename from src/battle/area_tik2/stage/tik_03.c rename to src/battle/area/tik2/stage/tik_03.c diff --git a/src/battle/area_tik2/stage/tik_04.c b/src/battle/area/tik2/stage/tik_04.c similarity index 100% rename from src/battle/area_tik2/stage/tik_04.c rename to src/battle/area/tik2/stage/tik_04.c diff --git a/src/battle/area_tik2/stage/tik_05.c b/src/battle/area/tik2/stage/tik_05.c similarity index 100% rename from src/battle/area_tik2/stage/tik_05.c rename to src/battle/area/tik2/stage/tik_05.c diff --git a/src/battle/area_tik3/actor/swooper.c b/src/battle/area/tik3/actor/swooper.c similarity index 100% rename from src/battle/area_tik3/actor/swooper.c rename to src/battle/area/tik3/actor/swooper.c diff --git a/src/battle/area_tik3/actor/swoopula.c b/src/battle/area/tik3/actor/swoopula.c similarity index 100% rename from src/battle/area_tik3/actor/swoopula.c rename to src/battle/area/tik3/actor/swoopula.c diff --git a/src/battle/area_tik3/area.c b/src/battle/area/tik3/area.c similarity index 72% rename from src/battle/area_tik3/area.c rename to src/battle/area/tik3/area.c index f802d31b79..c33baa626e 100644 --- a/src/battle/area_tik3/area.c +++ b/src/battle/area/tik3/area.c @@ -12,37 +12,37 @@ extern Stage N(tik_03); extern Stage N(tik_04); extern Stage N(tik_05); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(swooper), .home = { .index = 13 }, .priority = 10, }, { .actor = &N(swooper), .home = { .index = 14 }, .priority = 9, }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(swooper), .home = { .index = 12 }, .priority = 10, }, { .actor = &N(swooper), .home = { .index = 13 }, .priority = 9, }, { .actor = &N(swooper), .home = { .index = 14 }, .priority = 8, }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(swoopula), .home = { .index = 13 }, .priority = 10, }, { .actor = &N(swoopula), .home = { .index = 14 }, .priority = 9, }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(swoopula), .home = { .index = 12 }, .priority = 10, }, { .actor = &N(swoopula), .home = { .index = 13 }, .priority = 9, }, { .actor = &N(swoopula), .home = { .index = 14 }, .priority = 8, }, }; -BattleList N(formationTable) = { - BATTLE("バサバサx２", N(formation_00), &N(tik_01)), - BATTLE("バサバサx３", N(formation_01), &N(tik_01)), - BATTLE("バサバサチュルルx２", N(formation_02), &N(tik_01)), - BATTLE("バサバサチュルルx３", N(formation_03), &N(tik_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(tik_01), "バサバサx２"), + BATTLE(N(Formation_01), &N(tik_01), "バサバサx３"), + BATTLE(N(Formation_02), &N(tik_01), "バサバサチュルルx２"), + BATTLE(N(Formation_03), &N(tik_01), "バサバサチュルルx３"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "tik_01", &N(tik_01) }, { "tik_02", &N(tik_02) }, { "tik_03", &N(tik_03) }, diff --git a/src/battle/area_tik3/stage/tik_01.c b/src/battle/area/tik3/stage/tik_01.c similarity index 100% rename from src/battle/area_tik3/stage/tik_01.c rename to src/battle/area/tik3/stage/tik_01.c diff --git a/src/battle/area_tik3/stage/tik_02.c b/src/battle/area/tik3/stage/tik_02.c similarity index 100% rename from src/battle/area_tik3/stage/tik_02.c rename to src/battle/area/tik3/stage/tik_02.c diff --git a/src/battle/area_tik3/stage/tik_03.c b/src/battle/area/tik3/stage/tik_03.c similarity index 100% rename from src/battle/area_tik3/stage/tik_03.c rename to src/battle/area/tik3/stage/tik_03.c diff --git a/src/battle/area_tik3/stage/tik_04.c b/src/battle/area/tik3/stage/tik_04.c similarity index 100% rename from src/battle/area_tik3/stage/tik_04.c rename to src/battle/area/tik3/stage/tik_04.c diff --git a/src/battle/area_tik3/stage/tik_05.c b/src/battle/area/tik3/stage/tik_05.c similarity index 100% rename from src/battle/area_tik3/stage/tik_05.c rename to src/battle/area/tik3/stage/tik_05.c diff --git a/src/battle/area_trd_part_1/actor/bill_blaster.c b/src/battle/area/trd_part_1/actor/bill_blaster.c similarity index 98% rename from src/battle/area_trd_part_1/actor/bill_blaster.c rename to src/battle/area/trd_part_1/actor/bill_blaster.c index ed90d3b4a2..030cb4053e 100644 --- a/src/battle/area_trd_part_1/actor/bill_blaster.c +++ b/src/battle/area/trd_part_1/actor/bill_blaster.c @@ -52,7 +52,7 @@ ActorPartBlueprint N(partsTable_80219DD8)[] = { .defenseTable = N(defenseTable_80219D20), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 247, + .projectileTargetOffset = { 0, -9 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -64,7 +64,7 @@ ActorPartBlueprint N(partsTable_80219DD8)[] = { .defenseTable = N(defenseTable_80219D20), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 247, + .projectileTargetOffset = { 0, -9 }, }, }; @@ -200,7 +200,7 @@ EvtScript N(takeTurn_8021A200) = { extern Formation N(specialFormation_8021A4E8); -ApiStatus func_80218000_4A10A0(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218000_4A10A0) { N(specialFormation_8021A4E8)[0].var0 = 1; N(specialFormation_8021A4E8)[0].var1 = script->owner1.actorID; diff --git a/src/battle/area_trd_part_1/actor/bob_omb.c b/src/battle/area/trd_part_1/actor/bob_omb.c similarity index 99% rename from src/battle/area_trd_part_1/actor/bob_omb.c rename to src/battle/area/trd_part_1/actor/bob_omb.c index ef51d096e6..84a2e46b5b 100644 --- a/src/battle/area_trd_part_1/actor/bob_omb.c +++ b/src/battle/area/trd_part_1/actor/bob_omb.c @@ -98,7 +98,7 @@ ActorPartBlueprint N(partsTable_8021A70C)[] = { .defenseTable = N(defenseTable_8021A5A8), .eventFlags = ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, .elementImmunityFlags = 0, - .unk_1D = 247, + .projectileTargetOffset = { 0, -9 }, }, }; diff --git a/src/battle/area_trd_part_1/actor/bullet_bill.c b/src/battle/area/trd_part_1/actor/bullet_bill.c similarity index 99% rename from src/battle/area_trd_part_1/actor/bullet_bill.c rename to src/battle/area/trd_part_1/actor/bullet_bill.c index fc85bb3c21..1db2bde317 100644 --- a/src/battle/area_trd_part_1/actor/bullet_bill.c +++ b/src/battle/area/trd_part_1/actor/bullet_bill.c @@ -50,7 +50,7 @@ ActorPartBlueprint N(partsTable_80219018)[] = { .defenseTable = N(defenseTable_80218F60), .eventFlags = ACTOR_EVENT_FLAG_400, .elementImmunityFlags = 0, - .unk_1D = 250, + .projectileTargetOffset = { 0, -6 }, }, }; diff --git a/src/battle/area_trd_part_1/actor/koopa_troopa.c b/src/battle/area/trd_part_1/actor/koopa_troopa.c similarity index 100% rename from src/battle/area_trd_part_1/actor/koopa_troopa.c rename to src/battle/area/trd_part_1/actor/koopa_troopa.c diff --git a/src/battle/area_trd_part_1/actor/paratroopa.c b/src/battle/area/trd_part_1/actor/paratroopa.c similarity index 100% rename from src/battle/area_trd_part_1/actor/paratroopa.c rename to src/battle/area/trd_part_1/actor/paratroopa.c diff --git a/src/battle/area_trd_part_1/area.c b/src/battle/area/trd_part_1/area.c similarity index 71% rename from src/battle/area_trd_part_1/area.c rename to src/battle/area/trd_part_1/area.c index ec87ca7a2b..0858b3347f 100644 --- a/src/battle/area_trd_part_1/area.c +++ b/src/battle/area/trd_part_1/area.c @@ -25,134 +25,134 @@ extern Stage N(trd_05d); extern Stage N(trd_05e); extern Stage N(trd_05f); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_01) = { +Formation N(Formation_01) = { { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_02) = { +Formation N(Formation_02) = { { .actor = &N(koopa_troopa), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(koopa_troopa), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_03) = { +Formation N(Formation_03) = { { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(bob_omb), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_04) = { +Formation N(Formation_04) = { { .actor = &N(koopa_troopa), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(bob_omb), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(bob_omb), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_05) = { +Formation N(Formation_05) = { { .actor = &N(koopa_troopa), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(bob_omb), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(bob_omb), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(bob_omb), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_06) = { +Formation N(Formation_06) = { { .actor = &N(koopa_troopa), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(bob_omb), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_07) = { +Formation N(Formation_07) = { { .actor = &N(koopa_troopa), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(bob_omb), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(bob_omb), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_08) = { +Formation N(Formation_08) = { { .actor = &N(paratroopa), .home = { .index = 5 }, .priority = 10 }, { .actor = &N(paratroopa), .home = { .index = 6 }, .priority = 9 }, }; -Formation N(formation_09) = { +Formation N(Formation_09) = { { .actor = &N(paratroopa), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(paratroopa), .home = { .index = 5 }, .priority = 9 }, { .actor = &N(paratroopa), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_0A) = { +Formation N(Formation_0A) = { { .actor = &N(paratroopa), .home = { .index = 5 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0B) = { +Formation N(Formation_0B) = { { .actor = &N(paratroopa), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(paratroopa), .home = { .index = 6 }, .priority = 8 }, }; -Formation N(formation_0C) = { +Formation N(Formation_0C) = { { .actor = &N(paratroopa), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(paratroopa), .home = { .index = 6 }, .priority = 8 }, { .actor = &N(koopa_troopa), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_0D) = { +Formation N(Formation_0D) = { { .actor = &N(paratroopa), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(bob_omb), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(bob_omb), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_0E) = { +Formation N(Formation_0E) = { { .actor = &N(paratroopa), .home = { .index = 4 }, .priority = 10 }, { .actor = &N(bob_omb), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(bob_omb), .home = { .index = 2 }, .priority = 9 }, { .actor = &N(bob_omb), .home = { .index = 3 }, .priority = 8 }, }; -Formation N(formation_0F) = { +Formation N(Formation_0F) = { { .actor = &N(bob_omb), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_10) = { +Formation N(Formation_10) = { { .actor = &N(bob_omb), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(bob_omb), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_11) = { +Formation N(Formation_11) = { { .actor = &N(bob_omb), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(bob_omb), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(bob_omb), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_12) = { +Formation N(Formation_12) = { { .actor = &N(bob_omb), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(bob_omb), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(bob_omb), .home = { .index = 2 }, .priority = 8 }, { .actor = &N(bob_omb), .home = { .index = 3 }, .priority = 7 }, }; -Formation N(formation_13) = { +Formation N(Formation_13) = { { .actor = &N(bob_omb), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_14) = { +Formation N(Formation_14) = { { .actor = &N(bob_omb), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(bob_omb), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(koopa_troopa), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_15) = { +Formation N(Formation_15) = { { .actor = &N(bob_omb), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(koopa_troopa), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(koopa_troopa), .home = { .index = 2 }, .priority = 8 }, }; -Formation N(formation_16) = { +Formation N(Formation_16) = { { .actor = &N(koopa_troopa), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(bob_omb), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(bob_omb), .home = { .index = 2 }, .priority = 8 }, @@ -164,59 +164,59 @@ Vec3i N(vector3D_80218B9C) = { 80, 0, 0, }; Vec3i N(vector3D_80218BA8) = { 110, 0, 20, }; -Formation N(formation_17) = { +Formation N(Formation_17) = { { .actor = &N(bill_blaster), .home = { .vec = &N(vector3D_80218B90) }, .priority = 10 }, { .actor = &N(bill_blaster), .home = { .vec = &N(vector3D_80218B9C) }, .priority = 9 }, { .actor = &N(bill_blaster), .home = { .vec = &N(vector3D_80218BA8) }, .priority = 9 }, }; -Formation N(formation_18) = { +Formation N(Formation_18) = { { .actor = &N(bullet_bill), .home = { .index = 1 }, .priority = 10 }, { .actor = &N(bullet_bill), .home = { .index = 2 }, .priority = 9 }, }; -Formation N(formation_19) = { +Formation N(Formation_19) = { { .actor = &N(bullet_bill), .home = { .index = 1 }, .priority = 10 }, }; -Formation N(formation_1A) = { +Formation N(Formation_1A) = { { .actor = &N(bullet_bill), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(bullet_bill), .home = { .index = 1 }, .priority = 9 }, { .actor = &N(bullet_bill), .home = { .index = 2 }, .priority = 8 }, }; -BattleList N(formationTable) = { - BATTLE("ノコノコ", N(formation_00), &N(trd_01)), - BATTLE("ノコノコx2", N(formation_01), &N(trd_01)), - BATTLE("ノコノコx3", N(formation_02), &N(trd_01)), - BATTLE("ノコノコ,ボムへい", N(formation_03), &N(trd_01)), - BATTLE("ノコノコ,ボムへいx2", N(formation_04), &N(trd_01)), - BATTLE("ノコノコ,ボムへいx3", N(formation_05), &N(trd_01)), - BATTLE("ノコノコx2,ボムへい", N(formation_06), &N(trd_01)), - BATTLE("ノコノコx2,ボムへいx2", N(formation_07), &N(trd_01)), - BATTLE("パタパタx２", N(formation_08), &N(trd_01)), - BATTLE("パタパタx３", N(formation_09), &N(trd_01)), - BATTLE("パタパタ,ノコノコ", N(formation_0A), &N(trd_01)), - BATTLE("パタパタ,ノコノコ,パタパタ", N(formation_0B), &N(trd_01)), - BATTLE("パタパタ,ノコノコ,パタパタ,ノコノコ", N(formation_0C), &N(trd_01)), - BATTLE("パタパタ,ボムヘイx２", N(formation_0D), &N(trd_01)), - BATTLE("パタパタ,ボムヘイx３", N(formation_0E), &N(trd_01)), - BATTLE("ボムへい", N(formation_0F), &N(trd_01)), - BATTLE("ボムへいx2", N(formation_10), &N(trd_01)), - BATTLE("ボムへいx3", N(formation_11), &N(trd_01)), - BATTLE("ボムへいx4", N(formation_12), &N(trd_01)), - BATTLE("ボムへい,ノコノコ", N(formation_13), &N(trd_01)), - BATTLE("ボムへいx2,ノコノコ", N(formation_14), &N(trd_01)), - BATTLE("ボムへい,ノコノコx2", N(formation_15), &N(trd_01)), - BATTLE("ノコノコ,ボムへいx2", N(formation_16), &N(trd_01)), - BATTLE("キラーたいほうx３", N(formation_17), &N(trd_01)), - BATTLE("キラーx２", N(formation_18), &N(trd_01)), - BATTLE("キラー", N(formation_19), &N(trd_01)), - BATTLE("キラーx３", N(formation_1A), &N(trd_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(trd_01), "ノコノコ"), + BATTLE(N(Formation_01), &N(trd_01), "ノコノコx2"), + BATTLE(N(Formation_02), &N(trd_01), "ノコノコx3"), + BATTLE(N(Formation_03), &N(trd_01), "ノコノコ,ボムへい"), + BATTLE(N(Formation_04), &N(trd_01), "ノコノコ,ボムへいx2"), + BATTLE(N(Formation_05), &N(trd_01), "ノコノコ,ボムへいx3"), + BATTLE(N(Formation_06), &N(trd_01), "ノコノコx2,ボムへい"), + BATTLE(N(Formation_07), &N(trd_01), "ノコノコx2,ボムへいx2"), + BATTLE(N(Formation_08), &N(trd_01), "パタパタx２"), + BATTLE(N(Formation_09), &N(trd_01), "パタパタx３"), + BATTLE(N(Formation_0A), &N(trd_01), "パタパタ,ノコノコ"), + BATTLE(N(Formation_0B), &N(trd_01), "パタパタ,ノコノコ,パタパタ"), + BATTLE(N(Formation_0C), &N(trd_01), "パタパタ,ノコノコ,パタパタ,ノコノコ"), + BATTLE(N(Formation_0D), &N(trd_01), "パタパタ,ボムヘイx２"), + BATTLE(N(Formation_0E), &N(trd_01), "パタパタ,ボムヘイx３"), + BATTLE(N(Formation_0F), &N(trd_01), "ボムへい"), + BATTLE(N(Formation_10), &N(trd_01), "ボムへいx2"), + BATTLE(N(Formation_11), &N(trd_01), "ボムへいx3"), + BATTLE(N(Formation_12), &N(trd_01), "ボムへいx4"), + BATTLE(N(Formation_13), &N(trd_01), "ボムへい,ノコノコ"), + BATTLE(N(Formation_14), &N(trd_01), "ボムへいx2,ノコノコ"), + BATTLE(N(Formation_15), &N(trd_01), "ボムへい,ノコノコx2"), + BATTLE(N(Formation_16), &N(trd_01), "ノコノコ,ボムへいx2"), + BATTLE(N(Formation_17), &N(trd_01), "キラーたいほうx３"), + BATTLE(N(Formation_18), &N(trd_01), "キラーx２"), + BATTLE(N(Formation_19), &N(trd_01), "キラー"), + BATTLE(N(Formation_1A), &N(trd_01), "キラーx３"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "trd_00", &N(trd_00) }, { "trd_01", &N(trd_01) }, { "trd_02", &N(trd_02) }, diff --git a/src/battle/area_trd_part_1/stage/trd_00.c b/src/battle/area/trd_part_1/stage/trd_00.c similarity index 100% rename from src/battle/area_trd_part_1/stage/trd_00.c rename to src/battle/area/trd_part_1/stage/trd_00.c diff --git a/src/battle/area_trd_part_1/stage/trd_01.c b/src/battle/area/trd_part_1/stage/trd_01.c similarity index 100% rename from src/battle/area_trd_part_1/stage/trd_01.c rename to src/battle/area/trd_part_1/stage/trd_01.c diff --git a/src/battle/area_trd_part_1/stage/trd_02.c b/src/battle/area/trd_part_1/stage/trd_02.c similarity index 100% rename from src/battle/area_trd_part_1/stage/trd_02.c rename to src/battle/area/trd_part_1/stage/trd_02.c diff --git a/src/battle/area_trd_part_1/stage/trd_02b.c b/src/battle/area/trd_part_1/stage/trd_02b.c similarity index 100% rename from src/battle/area_trd_part_1/stage/trd_02b.c rename to src/battle/area/trd_part_1/stage/trd_02b.c diff --git a/src/battle/area_trd_part_1/stage/trd_02c.c b/src/battle/area/trd_part_1/stage/trd_02c.c similarity index 100% rename from src/battle/area_trd_part_1/stage/trd_02c.c rename to src/battle/area/trd_part_1/stage/trd_02c.c diff --git a/src/battle/area_trd_part_1/stage/trd_02d.c b/src/battle/area/trd_part_1/stage/trd_02d.c similarity index 100% rename from src/battle/area_trd_part_1/stage/trd_02d.c rename to src/battle/area/trd_part_1/stage/trd_02d.c diff --git a/src/battle/area_trd_part_1/stage/trd_03.c b/src/battle/area/trd_part_1/stage/trd_03.c similarity index 100% rename from src/battle/area_trd_part_1/stage/trd_03.c rename to src/battle/area/trd_part_1/stage/trd_03.c diff --git a/src/battle/area_trd_part_1/stage/trd_04.c b/src/battle/area/trd_part_1/stage/trd_04.c similarity index 100% rename from src/battle/area_trd_part_1/stage/trd_04.c rename to src/battle/area/trd_part_1/stage/trd_04.c diff --git a/src/battle/area_trd_part_1/stage/trd_05.c b/src/battle/area/trd_part_1/stage/trd_05.c similarity index 100% rename from src/battle/area_trd_part_1/stage/trd_05.c rename to src/battle/area/trd_part_1/stage/trd_05.c diff --git a/src/battle/area_trd_part_1/stage/trd_05b.c b/src/battle/area/trd_part_1/stage/trd_05b.c similarity index 100% rename from src/battle/area_trd_part_1/stage/trd_05b.c rename to src/battle/area/trd_part_1/stage/trd_05b.c diff --git a/src/battle/area_trd_part_1/stage/trd_05c.c b/src/battle/area/trd_part_1/stage/trd_05c.c similarity index 100% rename from src/battle/area_trd_part_1/stage/trd_05c.c rename to src/battle/area/trd_part_1/stage/trd_05c.c diff --git a/src/battle/area_trd_part_1/stage/trd_05d.c b/src/battle/area/trd_part_1/stage/trd_05d.c similarity index 100% rename from src/battle/area_trd_part_1/stage/trd_05d.c rename to src/battle/area/trd_part_1/stage/trd_05d.c diff --git a/src/battle/area_trd_part_1/stage/trd_05e.c b/src/battle/area/trd_part_1/stage/trd_05e.c similarity index 100% rename from src/battle/area_trd_part_1/stage/trd_05e.c rename to src/battle/area/trd_part_1/stage/trd_05e.c diff --git a/src/battle/area_trd_part_1/stage/trd_05f.c b/src/battle/area/trd_part_1/stage/trd_05f.c similarity index 100% rename from src/battle/area_trd_part_1/stage/trd_05f.c rename to src/battle/area/trd_part_1/stage/trd_05f.c diff --git a/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c b/src/battle/area/trd_part_2/actor/blue_ninja_koopa.c similarity index 99% rename from src/battle/area_trd_part_2/actor/blue_ninja_koopa.c rename to src/battle/area/trd_part_2/actor/blue_ninja_koopa.c index 4f036653bc..8ae2b7e2b2 100644 --- a/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c +++ b/src/battle/area/trd_part_2/actor/blue_ninja_koopa.c @@ -59,7 +59,7 @@ ActorPartBlueprint N(partsTable_8022B564)[] = { .defenseTable = N(defenseTable_8022B4A0), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_trd_part_2/actor/fake_bowser.c b/src/battle/area/trd_part_2/actor/fake_bowser.c similarity index 99% rename from src/battle/area_trd_part_2/actor/fake_bowser.c rename to src/battle/area/trd_part_2/actor/fake_bowser.c index 93ec4711fd..1fdcda5923 100644 --- a/src/battle/area_trd_part_2/actor/fake_bowser.c +++ b/src/battle/area/trd_part_2/actor/fake_bowser.c @@ -83,7 +83,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -95,7 +95,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A684), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -107,7 +107,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -119,7 +119,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -131,7 +131,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -143,7 +143,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -155,7 +155,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -167,7 +167,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -179,7 +179,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -191,7 +191,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_NO_TARGET, @@ -203,7 +203,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .defenseTable = N(defenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -1565,7 +1565,7 @@ EvtScript N(nextTurn_8021F410) = { EVT_END }; -ApiStatus func_80218350_4B1540(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80218350_4B1540) { bgm_set_battle_song(8, 0); bgm_push_battle_song(); return ApiStatus_DONE2; @@ -1759,7 +1759,7 @@ EvtScript N(8021F630) = { EVT_END }; -ApiStatus func_8021837C_4B156C(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_8021837C_4B156C) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(evt_get_variable(script, *args++)); diff --git a/src/battle/area_trd_part_2/actor/green_ninja_koopa.c b/src/battle/area/trd_part_2/actor/green_ninja_koopa.c similarity index 99% rename from src/battle/area_trd_part_2/actor/green_ninja_koopa.c rename to src/battle/area/trd_part_2/actor/green_ninja_koopa.c index b68e58e451..644fa1b878 100644 --- a/src/battle/area_trd_part_2/actor/green_ninja_koopa.c +++ b/src/battle/area/trd_part_2/actor/green_ninja_koopa.c @@ -59,7 +59,7 @@ ActorPartBlueprint N(partsTable_80225624)[] = { .defenseTable = N(defenseTable_80225560), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_trd_part_2/actor/red_ninja_koopa.c b/src/battle/area/trd_part_2/actor/red_ninja_koopa.c similarity index 99% rename from src/battle/area_trd_part_2/actor/red_ninja_koopa.c rename to src/battle/area/trd_part_2/actor/red_ninja_koopa.c index dcb70056ce..ede1f33c74 100644 --- a/src/battle/area_trd_part_2/actor/red_ninja_koopa.c +++ b/src/battle/area/trd_part_2/actor/red_ninja_koopa.c @@ -59,7 +59,7 @@ ActorPartBlueprint N(partsTable_802285C4)[] = { .defenseTable = N(defenseTable_80228500), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c b/src/battle/area/trd_part_2/actor/yellow_ninja_koopa.c similarity index 99% rename from src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c rename to src/battle/area/trd_part_2/actor/yellow_ninja_koopa.c index fe1b92b382..b91b09bb8f 100644 --- a/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c +++ b/src/battle/area/trd_part_2/actor/yellow_ninja_koopa.c @@ -59,7 +59,7 @@ ActorPartBlueprint N(partsTable_8022E504)[] = { .defenseTable = N(defenseTable_8022E440), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_trd_part_2/area.c b/src/battle/area/trd_part_2/area.c similarity index 90% rename from src/battle/area_trd_part_2/area.c rename to src/battle/area/trd_part_2/area.c index 9fcadf3f14..d95cd5398d 100644 --- a/src/battle/area_trd_part_2/area.c +++ b/src/battle/area/trd_part_2/area.c @@ -23,7 +23,7 @@ extern Stage N(trd_05d); extern Stage N(trd_05e); extern Stage N(trd_05f); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(green_ninja_koopa), .home = { .index = 0 }, .priority = 10 }, { .actor = &N(yellow_ninja_koopa), .home = { .index = 0 }, .priority = 9 }, { .actor = &N(blue_ninja_koopa), .home = { .index = 0 }, .priority = 8 }, @@ -31,12 +31,12 @@ Formation N(formation_00) = { { .actor = &N(fake_bowser), .home = { .index = 3 }, .priority = 6 }, }; -BattleList N(formationTable) = { - BATTLE("ノコブロス", N(formation_00), &N(trd_00)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(trd_00), "ノコブロス"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "trd_00", &N(trd_00) }, { "trd_01", &N(trd_01) }, { "trd_02", &N(trd_02) }, diff --git a/src/battle/area_trd_part_2/stage/trd_00.c b/src/battle/area/trd_part_2/stage/trd_00.c similarity index 100% rename from src/battle/area_trd_part_2/stage/trd_00.c rename to src/battle/area/trd_part_2/stage/trd_00.c diff --git a/src/battle/area_trd_part_2/stage/trd_01.c b/src/battle/area/trd_part_2/stage/trd_01.c similarity index 100% rename from src/battle/area_trd_part_2/stage/trd_01.c rename to src/battle/area/trd_part_2/stage/trd_01.c diff --git a/src/battle/area_trd_part_2/stage/trd_02.c b/src/battle/area/trd_part_2/stage/trd_02.c similarity index 100% rename from src/battle/area_trd_part_2/stage/trd_02.c rename to src/battle/area/trd_part_2/stage/trd_02.c diff --git a/src/battle/area_trd_part_2/stage/trd_02b.c b/src/battle/area/trd_part_2/stage/trd_02b.c similarity index 100% rename from src/battle/area_trd_part_2/stage/trd_02b.c rename to src/battle/area/trd_part_2/stage/trd_02b.c diff --git a/src/battle/area_trd_part_2/stage/trd_03.c b/src/battle/area/trd_part_2/stage/trd_03.c similarity index 100% rename from src/battle/area_trd_part_2/stage/trd_03.c rename to src/battle/area/trd_part_2/stage/trd_03.c diff --git a/src/battle/area_trd_part_2/stage/trd_04.c b/src/battle/area/trd_part_2/stage/trd_04.c similarity index 100% rename from src/battle/area_trd_part_2/stage/trd_04.c rename to src/battle/area/trd_part_2/stage/trd_04.c diff --git a/src/battle/area_trd_part_2/stage/trd_05.c b/src/battle/area/trd_part_2/stage/trd_05.c similarity index 100% rename from src/battle/area_trd_part_2/stage/trd_05.c rename to src/battle/area/trd_part_2/stage/trd_05.c diff --git a/src/battle/area_trd_part_2/stage/trd_05b.c b/src/battle/area/trd_part_2/stage/trd_05b.c similarity index 100% rename from src/battle/area_trd_part_2/stage/trd_05b.c rename to src/battle/area/trd_part_2/stage/trd_05b.c diff --git a/src/battle/area_trd_part_2/stage/trd_05c.c b/src/battle/area/trd_part_2/stage/trd_05c.c similarity index 100% rename from src/battle/area_trd_part_2/stage/trd_05c.c rename to src/battle/area/trd_part_2/stage/trd_05c.c diff --git a/src/battle/area_trd_part_2/stage/trd_05d.c b/src/battle/area/trd_part_2/stage/trd_05d.c similarity index 100% rename from src/battle/area_trd_part_2/stage/trd_05d.c rename to src/battle/area/trd_part_2/stage/trd_05d.c diff --git a/src/battle/area_trd_part_2/stage/trd_05e.c b/src/battle/area/trd_part_2/stage/trd_05e.c similarity index 100% rename from src/battle/area_trd_part_2/stage/trd_05e.c rename to src/battle/area/trd_part_2/stage/trd_05e.c diff --git a/src/battle/area_trd_part_2/stage/trd_05f.c b/src/battle/area/trd_part_2/stage/trd_05f.c similarity index 100% rename from src/battle/area_trd_part_2/stage/trd_05f.c rename to src/battle/area/trd_part_2/stage/trd_05f.c diff --git a/src/battle/area_trd_part_3/actor/eldstar.c b/src/battle/area/trd_part_3/actor/eldstar.c similarity index 99% rename from src/battle/area_trd_part_3/actor/eldstar.c rename to src/battle/area/trd_part_3/actor/eldstar.c index 7fd38e3fdb..64d94f4bde 100644 --- a/src/battle/area_trd_part_3/actor/eldstar.c +++ b/src/battle/area/trd_part_3/actor/eldstar.c @@ -60,7 +60,7 @@ ActorPartBlueprint N(ActorParts)[] = { .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/area_trd_part_3/area.c b/src/battle/area/trd_part_3/area.c similarity index 64% rename from src/battle/area_trd_part_3/area.c rename to src/battle/area/trd_part_3/area.c index 9223404dd1..ac05de69d1 100644 --- a/src/battle/area_trd_part_3/area.c +++ b/src/battle/area/trd_part_3/area.c @@ -8,16 +8,16 @@ extern ActorBlueprint N(eldstar); extern Stage N(nok_01); -Formation N(formation_00) = { +Formation N(Formation_00) = { { .actor = &N(eldstar), .home = { .index = 6 }, .priority = 10 }, }; -BattleList N(formationTable) = { - BATTLE("ほしのせい レクチャー", N(formation_00), &N(nok_01)), +BattleList N(Formations) = { + BATTLE(N(Formation_00), &N(nok_01), "ほしのせい レクチャー"), {}, }; -StageList N(stageTable) = { +StageList N(Stages) = { { "nok_01", &N(nok_01) }, {}, }; diff --git a/src/battle/area_trd_part_3/stage/nok_01.c b/src/battle/area/trd_part_3/stage/nok_01.c similarity index 100% rename from src/battle/area_trd_part_3/stage/nok_01.c rename to src/battle/area/trd_part_3/stage/nok_01.c diff --git a/src/battle/area_kzn2/anim/unused_gfx.c b/src/battle/area_kzn2/anim/unused_gfx.c deleted file mode 100644 index a39c4cd37a..0000000000 --- a/src/battle/area_kzn2/anim/unused_gfx.c +++ /dev/null @@ -1,32 +0,0 @@ -#include "common.h" - -#include "battle/area_kzn2/vtx1.vtx.inc.c" -#include "battle/area_kzn2/vtx2.vtx.inc.c" -#include "battle/area_kzn2/vtx3.vtx.inc.c" -#include "battle/area_kzn2/vtx4.vtx.inc.c" -#include "battle/area_kzn2/vtx5.vtx.inc.c" -#include "battle/area_kzn2/vtx6.vtx.inc.c" -#include "battle/area_kzn2/vtx7.vtx.inc.c" -#include "battle/area_kzn2/vtx8.vtx.inc.c" -#include "battle/area_kzn2/vtx9.vtx.inc.c" -#include "battle/area_kzn2/vtx10.vtx.inc.c" -#include "battle/area_kzn2/vtx11.vtx.inc.c" -#include "battle/area_kzn2/vtx12.vtx.inc.c" -#include "battle/area_kzn2/vtx13.vtx.inc.c" -#include "battle/area_kzn2/vtx14.vtx.inc.c" -#include "battle/area_kzn2/vtx15.vtx.inc.c" -#include "battle/area_kzn2/vtx16.vtx.inc.c" -#include "battle/area_kzn2/vtx17.vtx.inc.c" -#include "battle/area_kzn2/vtx18.vtx.inc.c" - -#include "battle/area_kzn2/gfx1.gfx.inc.c" -#include "battle/area_kzn2/gfx2.gfx.inc.c" -#include "battle/area_kzn2/gfx3.gfx.inc.c" -#include "battle/area_kzn2/gfx4.gfx.inc.c" -#include "battle/area_kzn2/gfx5.gfx.inc.c" -#include "battle/area_kzn2/gfx6.gfx.inc.c" -#include "battle/area_kzn2/gfx7.gfx.inc.c" -#include "battle/area_kzn2/gfx8.gfx.inc.c" -#include "battle/area_kzn2/gfx9.gfx.inc.c" -#include "battle/area_kzn2/gfx10.gfx.inc.c" -#include "battle/area_kzn2/gfx11.gfx.inc.c" diff --git a/src/battle/area_sam2/vtx.c b/src/battle/area_sam2/vtx.c deleted file mode 100644 index 72839af022..0000000000 --- a/src/battle/area_sam2/vtx.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -#define NAMESPACE b_area_sam2 - -#include "battle/area_sam2/monstar_bubbles.vtx.inc.c" diff --git a/src/battle/battle.c b/src/battle/battle.c index 38bdb5b010..67875a00dc 100644 --- a/src/battle/battle.c +++ b/src/battle/battle.c @@ -8,272 +8,82 @@ extern s32 D_800DC060; extern StageListRow* gCurrentStagePtr; +// standard battle area table entry +#define BTL_AREA(id, jpName) { \ + .dmaStart = battle_area_##id##_ROM_START, \ + .dmaEnd = battle_area_##id##_ROM_END, \ + .dmaDest = battle_area_##id##_VRAM, \ + .battles = &b_area_##id##_Formations, \ + .stages = &b_area_##id##_Stages, \ + .name = jpName, \ +} \ + +// extended battle area with a dmaTable, used by kzn2 for lava piranha animations +#define BTL_AREA_DMA(id, jpName) { \ + .dmaStart = battle_area_##id##_ROM_START, \ + .dmaEnd = battle_area_##id##_ROM_END, \ + .dmaDest = battle_area_##id##_VRAM, \ + .battles = &b_area_##id##_Formations, \ + .stages = &b_area_##id##_Stages, \ + .dmaTable = b_area_##id##_dmaTable, \ + .name = jpName, \ +} \ + +// auxiliary battle area for omo which contains only additional enemy data +#define BTL_AREA_AUX(id, jpName) { \ + .dmaStart = battle_area_##id##_ROM_START, \ + .dmaEnd = battle_area_##id##_ROM_END, \ + .dmaDest = battle_area_##id##_VRAM, \ + .name = jpName, \ +} \ + BattleArea gBattleAreas[] = { - [BTL_AREA_KMR_PART_1] = { - BTL_AREA(area_kmr_part_1), - .name = "エリア ＫＭＲ その１", - .battles = &b_area_kmr_part_1_formationTable, - .stages = &b_area_kmr_part_1_stageTable, - }, - [BTL_AREA_KMR_PART_2] = { - BTL_AREA(area_kmr_part_2), - .name = "エリア ＫＭＲ その２", - .battles = &b_area_kmr_part_2_formationTable, - .stages = &b_area_kmr_part_2_stageTable, - }, - [BTL_AREA_KMR_PART_3] = { - BTL_AREA(area_kmr_part_3), - .name = "エリア ＫＭＲ その３", - .battles = &b_area_kmr_part_3_formationTable, - .stages = &b_area_kmr_part_3_stageTable, - }, - [BTL_AREA_MAC] = { - BTL_AREA(area_mac), - .name = "エリア ＭＡＣ", - .battles = &b_area_mac_formationTable, - .stages = &b_area_mac_stageTable, - }, - [BTL_AREA_HOS] = { - BTL_AREA(area_hos), - .name = "エリア ＨＯＳ", - .battles = &b_area_hos_formationTable, - .stages = &b_area_hos_stageTable, - }, - [BTL_AREA_NOK] = { - BTL_AREA(area_nok), - .name = "エリア ＮＯＫ", - .battles = &b_area_nok_formationTable, - .stages = &b_area_nok_stageTable, - }, - [BTL_AREA_TRD_PART_1] = { - BTL_AREA(area_trd_part_1), - .name = "エリア ＴＲＤ その１", - .battles = &b_area_trd_part_1_formationTable, - .stages = &b_area_trd_part_1_stageTable, - }, - [BTL_AREA_TRD_PART_2] = { - BTL_AREA(area_trd_part_2), - .name = "エリア ＴＲＤ その２", - .battles = &b_area_trd_part_2_formationTable, - .stages = &b_area_trd_part_2_stageTable, - }, - [BTL_AREA_TRD_PART_3] = { - BTL_AREA(area_trd_part_3), - .name = "エリア ＴＲＤ その３", - .battles = &b_area_trd_part_3_formationTable, - .stages = &b_area_trd_part_3_stageTable, - }, - [BTL_AREA_IWA] = { - BTL_AREA(area_iwa), - .name = "エリア ＩＷＡ", - .battles = &b_area_iwa_formationTable, - .stages = &b_area_iwa_stageTable, - }, - [BTL_AREA_SBK] = { - BTL_AREA(area_sbk), - .name = "エリア ＳＢＫ", - .battles = &b_area_sbk_formationTable, - .stages = &b_area_sbk_stageTable, - }, - [BTL_AREA_ISK_PART_1] = { - BTL_AREA(area_isk_part_1), - .name = "エリア ＩＳＫ その１", - .battles = &b_area_isk_part_1_formationTable, - .stages = &b_area_isk_part_1_stageTable, - }, - [BTL_AREA_ISK_PART_2] = { - BTL_AREA(area_isk_part_2), - .name = "エリア ＩＳＫ その２", - .battles = &b_area_isk_part_2_formationTable, - .stages = &b_area_isk_part_2_stageTable, - }, - [BTL_AREA_MIM] = { - BTL_AREA(area_mim), - .name = "エリア ＭＩＭ", - .battles = &b_area_mim_formationTable, - .stages = &b_area_mim_stageTable, - }, - [BTL_AREA_ARN] = { - BTL_AREA(area_arn), - .name = "エリア ＡＲＮ", - .battles = &b_area_arn_formationTable, - .stages = &b_area_arn_stageTable, - }, - [BTL_AREA_DGB] = { - BTL_AREA(area_dgb), - .name = "エリア ＤＧＢ", - .battles = &b_area_dgb_formationTable, - .stages = &b_area_dgb_stageTable, - }, - [BTL_AREA_OMO] = { - BTL_AREA(area_omo), - .name = "エリア ＯＭＯ", - .battles = &b_area_omo_formationTable, - .stages = &b_area_omo_stageTable, - }, - [BTL_AREA_OMO2] = { - BTL_AREA(area_omo2), - .name = "エリア ＯＭＯ２", - .battles = &b_area_omo2_formationTable, - .stages = &b_area_omo2_stageTable, - }, - [BTL_AREA_OMO3] = { - BTL_AREA(area_omo3), - .name = "エリア ＯＭＯ３", - .battles = &b_area_omo3_formationTable, - .stages = &b_area_omo3_stageTable, - }, - [BTL_AREA_KGR] = { - BTL_AREA(area_kgr), - .name = "エリア ＫＧＲ", - .battles = &b_area_kgr_formationTable, - .stages = &b_area_kgr_stageTable, - }, - [BTL_AREA_JAN] = { - BTL_AREA(area_jan), - .name = "エリア ＪＡＮ", - .battles = &b_area_jan_formationTable, - .stages = &b_area_jan_stageTable, - }, - [BTL_AREA_JAN2] = { - BTL_AREA(area_jan2), - .name = "エリア ＪＡＮ２", - .battles = &b_area_jan2_formationTable, - .stages = &b_area_jan2_stageTable, - }, - [BTL_AREA_KZN] = { - BTL_AREA(area_kzn), - .name = "エリア ＫＺＮ", - .battles = &b_area_kzn_formationTable, - .stages = &b_area_kzn_stageTable, - }, - [BTL_AREA_KZN2] = { - BTL_AREA(area_kzn2), - .name = "エリア ＫＺＮ２", - .battles = &b_area_kzn2_formationTable, - .stages = &b_area_kzn2_stageTable, - .dmaTable = b_area_kzn2_dmaTable, - }, - [BTL_AREA_FLO] = { - BTL_AREA(area_flo), - .name = "エリア ＦＬＯ", - .battles = &b_area_flo_formationTable, - .stages = &b_area_flo_stageTable, - }, - [BTL_AREA_FLO2] = { - BTL_AREA(area_flo2), - .name = "エリア ＦＬＯ２", - .battles = &b_area_flo2_formationTable, - .stages = &b_area_flo2_stageTable, - }, - [BTL_AREA_TIK] = { - BTL_AREA(area_tik), - .name = "エリア ＴＩＫ", - .battles = &b_area_tik_formationTable, - .stages = &b_area_tik_stageTable, - }, - [BTL_AREA_TIK2] = { - BTL_AREA(area_tik2), - .name = "エリア ＴＩＫ２", - .battles = &b_area_tik2_formationTable, - .stages = &b_area_tik2_stageTable, - }, - [BTL_AREA_TIK3] = { - BTL_AREA(area_tik3), - .name = "エリア ＴＩＫ３", - .battles = &b_area_tik3_formationTable, - .stages = &b_area_tik3_stageTable, - }, - [BTL_AREA_SAM] = { - BTL_AREA(area_sam), - .name = "エリア ＳＡＭ", - .battles = &b_area_sam_formationTable, - .stages = &b_area_sam_stageTable, - }, - [BTL_AREA_SAM2] = { - BTL_AREA(area_sam2), - .name = "エリア ＳＡＭ２", - .battles = &b_area_sam2_formationTable, - .stages = &b_area_sam2_stageTable, - }, - [BTL_AREA_PRA] = { - BTL_AREA(area_pra), - .name = "エリア ＰＲＡ", - .battles = &b_area_pra_formationTable, - .stages = &b_area_pra_stageTable, - }, - [BTL_AREA_PRA2] = { - BTL_AREA(area_pra2), - .name = "エリア ＰＲＡ２", - .battles = &b_area_pra2_formationTable, - .stages = &b_area_pra2_stageTable, - }, - [BTL_AREA_PRA3] = { - BTL_AREA(area_pra3), - .name = "エリア ＰＲＡ３", - .battles = &b_area_pra3_formationTable, - .stages = &b_area_pra3_stageTable, - }, - [BTL_AREA_KPA] = { - BTL_AREA(area_kpa), - .name = "エリア ＫＰＡ", - .battles = &b_area_kpa_formationTable, - .stages = &b_area_kpa_stageTable, - }, - [BTL_AREA_KPA2] = { - BTL_AREA(area_kpa2), - .name = "エリア ＫＰＡ２", - .battles = &b_area_kpa2_formationTable, - .stages = &b_area_kpa2_stageTable, - }, - [BTL_AREA_KPA3] = { - BTL_AREA(area_kpa3), - .name = "エリア ＫＰＡ３", - .battles = &b_area_kpa3_formationTable, - .stages = &b_area_kpa3_stageTable, - }, - [BTL_AREA_KPA4] = { - BTL_AREA(area_kpa4), - .name = "エリア ＫＰＡ４", - .battles = &b_area_kpa4_formationTable, - .stages = &b_area_kpa4_stageTable, - }, - [BTL_AREA_KKJ] = { - BTL_AREA(area_kkj), - .name = "エリア ＫＫＪ", - .battles = &b_area_kkj_formationTable, - .stages = &b_area_kkj_stageTable, - }, - [BTL_AREA_DIG] = { - BTL_AREA(area_dig), - .name = "エリア ＤＩＧ", - .battles = &b_area_dig_formationTable, - .stages = &b_area_dig_stageTable, - }, - [BTL_AREA_OMO2_1] = { - BTL_AREA(area_omo2_1), - .name = "エリア ＯＭＯ２＿１", - }, - [BTL_AREA_OMO2_2] = { - BTL_AREA(area_omo2_2), - .name = "エリア ＯＭＯ２＿２", - }, - [BTL_AREA_OMO2_3] = { - BTL_AREA(area_omo2_3), - .name = "エリア ＯＭＯ２＿３", - }, - [BTL_AREA_OMO2_4] = { - BTL_AREA(area_omo2_4), - .name = "エリア ＯＭＯ２＿４", - }, - [BTL_AREA_OMO2_5] = { - BTL_AREA(area_omo2_5), - .name = "エリア ＯＭＯ２＿５", - }, - [BTL_AREA_OMO2_6] = { - BTL_AREA(area_omo2_6), - .name = "エリア ＯＭＯ２＿６", - }, + [BTL_AREA_KMR_1] BTL_AREA(kmr_part_1, "エリア ＫＭＲ その１"), + [BTL_AREA_KMR_2] BTL_AREA(kmr_part_2, "エリア ＫＭＲ その２"), + [BTL_AREA_KMR_3] BTL_AREA(kmr_part_3, "エリア ＫＭＲ その３"), + [BTL_AREA_MAC] BTL_AREA(mac, "エリア ＭＡＣ"), + [BTL_AREA_HOS] BTL_AREA(hos, "エリア ＨＯＳ"), + [BTL_AREA_NOK] BTL_AREA(nok, "エリア ＮＯＫ"), + [BTL_AREA_TRD_1] BTL_AREA(trd_part_1, "エリア ＴＲＤ その１"), + [BTL_AREA_TRD_2] BTL_AREA(trd_part_2, "エリア ＴＲＤ その２"), + [BTL_AREA_TRD_3] BTL_AREA(trd_part_3, "エリア ＴＲＤ その３"), + [BTL_AREA_IWA] BTL_AREA(iwa, "エリア ＩＷＡ"), + [BTL_AREA_SBK] BTL_AREA(sbk, "エリア ＳＢＫ"), + [BTL_AREA_ISK_1] BTL_AREA(isk_part_1, "エリア ＩＳＫ その１"), + [BTL_AREA_ISK_2] BTL_AREA(isk_part_2, "エリア ＩＳＫ その２"), + [BTL_AREA_MIM] BTL_AREA(mim, "エリア ＭＩＭ"), + [BTL_AREA_ARN] BTL_AREA(arn, "エリア ＡＲＮ"), + [BTL_AREA_DGB] BTL_AREA(dgb, "エリア ＤＧＢ"), + [BTL_AREA_OMO] BTL_AREA(omo, "エリア ＯＭＯ"), + [BTL_AREA_OMO2] BTL_AREA(omo2, "エリア ＯＭＯ２"), + [BTL_AREA_OMO3] BTL_AREA(omo3, "エリア ＯＭＯ３"), + [BTL_AREA_KGR] BTL_AREA(kgr, "エリア ＫＧＲ"), + [BTL_AREA_JAN] BTL_AREA(jan, "エリア ＪＡＮ"), + [BTL_AREA_JAN2] BTL_AREA(jan2, "エリア ＪＡＮ２"), + [BTL_AREA_KZN] BTL_AREA(kzn, "エリア ＫＺＮ"), + [BTL_AREA_KZN2] BTL_AREA_DMA(kzn2, "エリア ＫＺＮ２"), + [BTL_AREA_FLO] BTL_AREA(flo, "エリア ＦＬＯ"), + [BTL_AREA_FLO2] BTL_AREA(flo2, "エリア ＦＬＯ２"), + [BTL_AREA_TIK] BTL_AREA(tik, "エリア ＴＩＫ"), + [BTL_AREA_TIK2] BTL_AREA(tik2, "エリア ＴＩＫ２"), + [BTL_AREA_TIK3] BTL_AREA(tik3, "エリア ＴＩＫ３"), + [BTL_AREA_SAM] BTL_AREA(sam, "エリア ＳＡＭ"), + [BTL_AREA_SAM2] BTL_AREA(sam2, "エリア ＳＡＭ２"), + [BTL_AREA_PRA] BTL_AREA(pra, "エリア ＰＲＡ"), + [BTL_AREA_PRA2] BTL_AREA(pra2, "エリア ＰＲＡ２"), + [BTL_AREA_PRA3] BTL_AREA(pra3, "エリア ＰＲＡ３"), + [BTL_AREA_KPA] BTL_AREA(kpa, "エリア ＫＰＡ"), + [BTL_AREA_KPA2] BTL_AREA(kpa2, "エリア ＫＰＡ２"), + [BTL_AREA_KPA3] BTL_AREA(kpa3, "エリア ＫＰＡ３"), + [BTL_AREA_KPA4] BTL_AREA(kpa4, "エリア ＫＰＡ４"), + [BTL_AREA_KKJ] BTL_AREA(kkj, "エリア ＫＫＪ"), + [BTL_AREA_DIG] BTL_AREA(dig, "エリア ＤＩＧ"), + [BTL_AREA_OMO2_1] BTL_AREA_AUX(omo2_1, "エリア ＯＭＯ２＿１"), + [BTL_AREA_OMO2_2] BTL_AREA_AUX(omo2_2, "エリア ＯＭＯ２＿２"), + [BTL_AREA_OMO2_3] BTL_AREA_AUX(omo2_3, "エリア ＯＭＯ２＿３"), + [BTL_AREA_OMO2_4] BTL_AREA_AUX(omo2_4, "エリア ＯＭＯ２＿４"), + [BTL_AREA_OMO2_5] BTL_AREA_AUX(omo2_5, "エリア ＯＭＯ２＿５"), + [BTL_AREA_OMO2_6] BTL_AREA_AUX(omo2_6, "エリア ＯＭＯ２＿６"), }; void reset_battle_status(void) { diff --git a/src/battle/battle.h b/src/battle/battle.h index 6e22d6525c..a02d7ecd1a 100644 --- a/src/battle/battle.h +++ b/src/battle/battle.h @@ -5,53 +5,53 @@ #include "message_ids.h" enum BattleAreaIDs { - BTL_AREA_KMR_PART_1 = 0x00, - BTL_AREA_KMR_PART_2 = 0x01, - BTL_AREA_KMR_PART_3 = 0x02, - BTL_AREA_MAC = 0x03, - BTL_AREA_HOS = 0x04, - BTL_AREA_NOK = 0x05, - BTL_AREA_TRD_PART_1 = 0x06, - BTL_AREA_TRD_PART_2 = 0x07, - BTL_AREA_TRD_PART_3 = 0x08, - BTL_AREA_IWA = 0x09, - BTL_AREA_SBK = 0x0A, - BTL_AREA_ISK_PART_1 = 0x0B, - BTL_AREA_ISK_PART_2 = 0x0C, - BTL_AREA_MIM = 0x0D, - BTL_AREA_ARN = 0x0E, - BTL_AREA_DGB = 0x0F, - BTL_AREA_OMO = 0x10, - BTL_AREA_OMO2 = 0x11, - BTL_AREA_OMO3 = 0x12, - BTL_AREA_KGR = 0x13, - BTL_AREA_JAN = 0x14, - BTL_AREA_JAN2 = 0x15, - BTL_AREA_KZN = 0x16, - BTL_AREA_KZN2 = 0x17, - BTL_AREA_FLO = 0x18, - BTL_AREA_FLO2 = 0x19, - BTL_AREA_TIK = 0x1A, - BTL_AREA_TIK2 = 0x1B, - BTL_AREA_TIK3 = 0x1C, - BTL_AREA_SAM = 0x1D, - BTL_AREA_SAM2 = 0x1E, - BTL_AREA_PRA = 0x1F, - BTL_AREA_PRA2 = 0x20, - BTL_AREA_PRA3 = 0x21, - BTL_AREA_KPA = 0x22, - BTL_AREA_KPA2 = 0x23, - BTL_AREA_KPA3 = 0x24, - BTL_AREA_KPA4 = 0x25, - BTL_AREA_KKJ = 0x26, - BTL_AREA_DIG = 0x27, - BTL_AREA_UNUSED_28 = 0x28, - BTL_AREA_OMO2_1 = 0x29, - BTL_AREA_OMO2_2 = 0x2A, - BTL_AREA_OMO2_3 = 0x2B, - BTL_AREA_OMO2_4 = 0x2C, - BTL_AREA_OMO2_5 = 0x2D, - BTL_AREA_OMO2_6 = 0x2E, + BTL_AREA_KMR_1 = 0x00, + BTL_AREA_KMR_2 = 0x01, + BTL_AREA_KMR_3 = 0x02, + BTL_AREA_MAC = 0x03, + BTL_AREA_HOS = 0x04, + BTL_AREA_NOK = 0x05, + BTL_AREA_TRD_1 = 0x06, + BTL_AREA_TRD_2 = 0x07, + BTL_AREA_TRD_3 = 0x08, + BTL_AREA_IWA = 0x09, + BTL_AREA_SBK = 0x0A, + BTL_AREA_ISK_1 = 0x0B, + BTL_AREA_ISK_2 = 0x0C, + BTL_AREA_MIM = 0x0D, + BTL_AREA_ARN = 0x0E, + BTL_AREA_DGB = 0x0F, + BTL_AREA_OMO = 0x10, + BTL_AREA_OMO2 = 0x11, + BTL_AREA_OMO3 = 0x12, + BTL_AREA_KGR = 0x13, + BTL_AREA_JAN = 0x14, + BTL_AREA_JAN2 = 0x15, + BTL_AREA_KZN = 0x16, + BTL_AREA_KZN2 = 0x17, + BTL_AREA_FLO = 0x18, + BTL_AREA_FLO2 = 0x19, + BTL_AREA_TIK = 0x1A, + BTL_AREA_TIK2 = 0x1B, + BTL_AREA_TIK3 = 0x1C, + BTL_AREA_SAM = 0x1D, + BTL_AREA_SAM2 = 0x1E, + BTL_AREA_PRA = 0x1F, + BTL_AREA_PRA2 = 0x20, + BTL_AREA_PRA3 = 0x21, + BTL_AREA_KPA = 0x22, + BTL_AREA_KPA2 = 0x23, + BTL_AREA_KPA3 = 0x24, + BTL_AREA_KPA4 = 0x25, + BTL_AREA_KKJ = 0x26, + BTL_AREA_DIG = 0x27, + BTL_AREA_UNUSED_28 = 0x28, + BTL_AREA_OMO2_1 = 0x29, + BTL_AREA_OMO2_2 = 0x2A, + BTL_AREA_OMO2_3 = 0x2B, + BTL_AREA_OMO2_4 = 0x2C, + BTL_AREA_OMO2_5 = 0x2D, + BTL_AREA_OMO2_6 = 0x2E, }; typedef enum ActorType { @@ -278,10 +278,28 @@ typedef enum ActorType { extern s32 bActorNames[]; -#define BTL_AREA(id) \ - .dmaStart = battle_##id##_ROM_START, \ - .dmaEnd = battle_##id##_ROM_END, \ - .dmaDest = battle_##id##_VRAM +typedef struct BattleMoveEntry { + /* 0x00 */ u8* romStart; + /* 0x04 */ u8* romEnd; + /* 0x08 */ u8* vramStart; + /* 0x0C */ EvtScript* mainScript; +} BattleMoveEntry; // size = 0x10 + +#define BTL_MOVE(name, script) \ +{ \ + .romStart = battle_move_##name##_ROM_START, \ + .romEnd = battle_move_##name##_ROM_END, \ + .vramStart = battle_move_##name##_VRAM, \ + .mainScript = &battle_move_##name##_##script \ +} + +#define BTL_ITEM(name) \ +{ \ + .romStart = name##_ROM_START, \ + .romEnd = name##_ROM_END, \ + .vramStart = name##_VRAM, \ + .mainScript = &battle_item_##name##_##main \ +} typedef struct ActorBlueprint { /* 0x00 */ s32 flags; @@ -380,8 +398,8 @@ typedef struct BattleArea { extern BattleArea gBattleAreas[0x30]; -#define BATTLE(name, formation, stage) { name, ARRAY_COUNT(formation), (Formation*) formation, stage } -#define BATTLE_WITH_SCRIPT(name, formation, stage, script) { name, ARRAY_COUNT(formation), (Formation*) formation, stage, script } +#define BATTLE(formation, stage, name) { name, ARRAY_COUNT(formation), (Formation*) formation, stage } +#define BATTLE_WITH_SCRIPT(formation, stage, script, name) { name, ARRAY_COUNT(formation), (Formation*) formation, stage, script } // TODO: enum for home position (0..3 are floor, 4..7 are air, etc.) diff --git a/src/battle/battle_formation_names.h b/src/battle/battle_formation_names.h deleted file mode 100644 index 42f062f829..0000000000 --- a/src/battle/battle_formation_names.h +++ /dev/null @@ -1,565 +0,0 @@ -enum BattleNames { - BTL_KMR_PART_1_FORMATION_00 = 0x0000, - BTL_KMR_PART_1_FORMATION_01 = 0x0001, - BTL_KMR_PART_1_FORMATION_02 = 0x0002, - BTL_KMR_PART_1_FORMATION_03 = 0x0003, - BTL_KMR_PART_1_FORMATION_04 = 0x0004, - BTL_KMR_PART_1_FORMATION_05 = 0x0005, - BTL_KMR_PART_1_FORMATION_06 = 0x0006, - BTL_KMR_PART_1_FORMATION_07 = 0x0007, - BTL_KMR_PART_1_FORMATION_08 = 0x0008, - BTL_KMR_PART_1_FORMATION_09 = 0x0009, - BTL_KMR_PART_1_FORMATION_0A = 0x000A, - BTL_KMR_PART_1_FORMATION_0B = 0x000B, - BTL_KMR_PART_2_FORMATION_00 = 0x0100, - BTL_KMR_PART_2_FORMATION_01 = 0x0101, - BTL_KMR_PART_3_FORMATION_00 = 0x0200, - BTL_KMR_PART_3_FORMATION_01 = 0x0201, - BTL_KMR_PART_3_FORMATION_02 = 0x0202, - BTL_KMR_PART_3_FORMATION_03 = 0x0203, - BTL_KMR_PART_3_FORMATION_04 = 0x0204, - BTL_KMR_PART_3_FORMATION_05 = 0x0205, - BTL_KMR_PART_3_FORMATION_06 = 0x0206, - BTL_KMR_PART_3_FORMATION_07 = 0x0207, - BTL_MAC_FORMATION_00 = 0x0300, - BTL_MAC_FORMATION_01 = 0x0301, - BTL_MAC_FORMATION_02 = 0x0302, - BTL_MAC_FORMATION_03 = 0x0303, - BTL_MAC_FORMATION_04 = 0x0304, - BTL_MAC_FORMATION_05 = 0x0305, - BTL_MAC_FORMATION_06 = 0x0306, - BTL_MAC_FORMATION_07 = 0x0307, - BTL_MAC_FORMATION_08 = 0x0308, - BTL_MAC_FORMATION_09 = 0x0309, - BTL_MAC_FORMATION_0A = 0x030A, - BTL_MAC_FORMATION_0B = 0x030B, - BTL_MAC_FORMATION_0C = 0x030C, - BTL_HOS_FORMATION_00 = 0x0400, - BTL_HOS_FORMATION_01 = 0x0401, - BTL_HOS_FORMATION_02 = 0x0402, - BTL_HOS_FORMATION_03 = 0x0403, - BTL_HOS_FORMATION_04 = 0x0404, - BTL_HOS_FORMATION_05 = 0x0405, - BTL_HOS_FORMATION_06 = 0x0406, - BTL_NOK_FORMATION_00 = 0x0500, - BTL_NOK_FORMATION_01 = 0x0501, - BTL_NOK_FORMATION_02 = 0x0502, - BTL_NOK_FORMATION_03 = 0x0503, - BTL_NOK_FORMATION_04 = 0x0504, - BTL_NOK_FORMATION_05 = 0x0505, - BTL_NOK_FORMATION_06 = 0x0506, - BTL_NOK_FORMATION_07 = 0x0507, - BTL_NOK_FORMATION_08 = 0x0508, - BTL_NOK_FORMATION_09 = 0x0509, - BTL_NOK_FORMATION_0A = 0x050A, - BTL_NOK_FORMATION_0B = 0x050B, - BTL_NOK_FORMATION_0C = 0x050C, - BTL_NOK_FORMATION_0D = 0x050D, - BTL_NOK_FORMATION_0E = 0x050E, - BTL_NOK_FORMATION_0F = 0x050F, - BTL_NOK_FORMATION_10 = 0x0510, - BTL_NOK_FORMATION_11 = 0x0511, - BTL_NOK_FORMATION_12 = 0x0512, - BTL_NOK_FORMATION_13 = 0x0513, - BTL_NOK_FORMATION_14 = 0x0514, - BTL_NOK_FORMATION_15 = 0x0515, - BTL_NOK_FORMATION_16 = 0x0516, - BTL_NOK_FORMATION_17 = 0x0517, - BTL_NOK_FORMATION_18 = 0x0518, - BTL_TRD_PART_1_FORMATION_00 = 0x0600, - BTL_TRD_PART_1_FORMATION_01 = 0x0601, - BTL_TRD_PART_1_FORMATION_02 = 0x0602, - BTL_TRD_PART_1_FORMATION_03 = 0x0603, - BTL_TRD_PART_1_FORMATION_04 = 0x0604, - BTL_TRD_PART_1_FORMATION_05 = 0x0605, - BTL_TRD_PART_1_FORMATION_06 = 0x0606, - BTL_TRD_PART_1_FORMATION_07 = 0x0607, - BTL_TRD_PART_1_FORMATION_08 = 0x0608, - BTL_TRD_PART_1_FORMATION_09 = 0x0609, - BTL_TRD_PART_1_FORMATION_0A = 0x060A, - BTL_TRD_PART_1_FORMATION_0B = 0x060B, - BTL_TRD_PART_1_FORMATION_0C = 0x060C, - BTL_TRD_PART_1_FORMATION_0D = 0x060D, - BTL_TRD_PART_1_FORMATION_0E = 0x060E, - BTL_TRD_PART_1_FORMATION_0F = 0x060F, - BTL_TRD_PART_1_FORMATION_10 = 0x0610, - BTL_TRD_PART_1_FORMATION_11 = 0x0611, - BTL_TRD_PART_1_FORMATION_12 = 0x0612, - BTL_TRD_PART_1_FORMATION_13 = 0x0613, - BTL_TRD_PART_1_FORMATION_14 = 0x0614, - BTL_TRD_PART_1_FORMATION_15 = 0x0615, - BTL_TRD_PART_1_FORMATION_16 = 0x0616, - BTL_TRD_PART_1_FORMATION_17 = 0x0617, - BTL_TRD_PART_1_FORMATION_18 = 0x0618, - BTL_TRD_PART_1_FORMATION_19 = 0x0619, - BTL_TRD_PART_1_FORMATION_1A = 0x061A, - BTL_TRD_PART_1_FORMATION_1B = 0x061B, - BTL_TRD_PART_2_FORMATION_00 = 0x0700, - BTL_TRD_PART_3_FORMATION_00 = 0x0800, - BTL_IWA_FORMATION_00 = 0x0900, - BTL_IWA_FORMATION_01 = 0x0901, - BTL_IWA_FORMATION_02 = 0x0902, - BTL_IWA_FORMATION_03 = 0x0903, - BTL_IWA_FORMATION_04 = 0x0904, - BTL_IWA_FORMATION_05 = 0x0905, - BTL_IWA_FORMATION_06 = 0x0906, - BTL_IWA_FORMATION_07 = 0x0907, - BTL_IWA_FORMATION_08 = 0x0908, - BTL_IWA_FORMATION_09 = 0x0909, - BTL_IWA_FORMATION_0A = 0x090A, - BTL_IWA_FORMATION_0B = 0x090B, - BTL_IWA_FORMATION_0C = 0x090C, - BTL_IWA_FORMATION_0D = 0x090D, - BTL_IWA_FORMATION_0E = 0x090E, - BTL_IWA_FORMATION_0F = 0x090F, - BTL_IWA_FORMATION_10 = 0x0910, - BTL_SBK_FORMATION_00 = 0x0A00, - BTL_SBK_FORMATION_01 = 0x0A01, - BTL_SBK_FORMATION_02 = 0x0A02, - BTL_SBK_FORMATION_03 = 0x0A03, - BTL_SBK_FORMATION_04 = 0x0A04, - BTL_SBK_FORMATION_05 = 0x0A05, - BTL_SBK_FORMATION_06 = 0x0A06, - BTL_SBK_FORMATION_07 = 0x0A07, - BTL_SBK_FORMATION_08 = 0x0A08, - BTL_SBK_FORMATION_09 = 0x0A09, - BTL_SBK_FORMATION_0A = 0x0A0A, - BTL_SBK_FORMATION_0B = 0x0A0B, - BTL_SBK_FORMATION_0C = 0x0A0C, - BTL_SBK_FORMATION_0D = 0x0A0D, - BTL_SBK_FORMATION_0E = 0x0A0E, - BTL_SBK_FORMATION_0F = 0x0A0F, - BTL_SBK_FORMATION_10 = 0x0A10, - BTL_SBK_FORMATION_11 = 0x0A11, - BTL_SBK_FORMATION_12 = 0x0A12, - BTL_ISK_PART_1_FORMATION_00 = 0x0B00, - BTL_ISK_PART_1_FORMATION_01 = 0x0B01, - BTL_ISK_PART_1_FORMATION_02 = 0x0B02, - BTL_ISK_PART_1_FORMATION_03 = 0x0B03, - BTL_ISK_PART_1_FORMATION_04 = 0x0B04, - BTL_ISK_PART_1_FORMATION_05 = 0x0B05, - BTL_ISK_PART_1_FORMATION_06 = 0x0B06, - BTL_ISK_PART_1_FORMATION_07 = 0x0B07, - BTL_ISK_PART_1_FORMATION_08 = 0x0B08, - BTL_ISK_PART_1_FORMATION_09 = 0x0B09, - BTL_ISK_PART_1_FORMATION_0A = 0x0B0A, - BTL_ISK_PART_1_FORMATION_0B = 0x0B0B, - BTL_ISK_PART_1_FORMATION_0C = 0x0B0C, - BTL_ISK_PART_1_FORMATION_0D = 0x0B0D, - BTL_ISK_PART_1_FORMATION_0E = 0x0B0E, - BTL_ISK_PART_1_FORMATION_0F = 0x0B0F, - BTL_ISK_PART_1_FORMATION_10 = 0x0B10, - BTL_ISK_PART_1_FORMATION_11 = 0x0B11, - BTL_ISK_PART_1_FORMATION_12 = 0x0B12, - BTL_ISK_PART_1_FORMATION_13 = 0x0B13, - BTL_ISK_PART_2_FORMATION_00 = 0x0C00, - BTL_ISK_PART_2_FORMATION_01 = 0x0C01, - BTL_MIM_FORMATION_00 = 0x0D00, - BTL_MIM_FORMATION_01 = 0x0D01, - BTL_MIM_FORMATION_02 = 0x0D02, - BTL_MIM_FORMATION_03 = 0x0D03, - BTL_MIM_FORMATION_04 = 0x0D04, - BTL_MIM_FORMATION_05 = 0x0D05, - BTL_MIM_FORMATION_06 = 0x0D06, - BTL_MIM_FORMATION_07 = 0x0D07, - BTL_MIM_FORMATION_08 = 0x0D08, - BTL_MIM_FORMATION_09 = 0x0D09, - BTL_MIM_FORMATION_0A = 0x0D0A, - BTL_MIM_FORMATION_0B = 0x0D0B, - BTL_MIM_FORMATION_0C = 0x0D0C, - BTL_MIM_FORMATION_0D = 0x0D0D, - BTL_MIM_FORMATION_0E = 0x0D0E, - BTL_MIM_FORMATION_0F = 0x0D0F, - BTL_MIM_FORMATION_10 = 0x0D10, - BTL_MIM_FORMATION_11 = 0x0D11, - BTL_MIM_FORMATION_12 = 0x0D12, - BTL_ARN_FORMATION_00 = 0x0E00, - BTL_ARN_FORMATION_01 = 0x0E01, - BTL_ARN_FORMATION_02 = 0x0E02, - BTL_ARN_FORMATION_03 = 0x0E03, - BTL_ARN_FORMATION_04 = 0x0E04, - BTL_ARN_FORMATION_05 = 0x0E05, - BTL_ARN_FORMATION_06 = 0x0E06, - BTL_ARN_FORMATION_07 = 0x0E07, - BTL_ARN_FORMATION_08 = 0x0E08, - BTL_ARN_FORMATION_09 = 0x0E09, - BTL_ARN_FORMATION_0A = 0x0E0A, - BTL_ARN_FORMATION_0B = 0x0E0B, - BTL_ARN_FORMATION_0C = 0x0E0C, - BTL_ARN_FORMATION_0D = 0x0E0D, - BTL_ARN_FORMATION_0E = 0x0E0E, - BTL_ARN_FORMATION_0F = 0x0E0F, - BTL_ARN_FORMATION_10 = 0x0E10, - BTL_DGB_FORMATION_00 = 0x0F00, - BTL_DGB_FORMATION_01 = 0x0F01, - BTL_DGB_FORMATION_02 = 0x0F02, - BTL_DGB_FORMATION_03 = 0x0F03, - BTL_DGB_FORMATION_04 = 0x0F04, - BTL_DGB_FORMATION_05 = 0x0F05, - BTL_OMO_FORMATION_00 = 0x1000, - BTL_OMO_FORMATION_01 = 0x1001, - BTL_OMO_FORMATION_02 = 0x1002, - BTL_OMO_FORMATION_03 = 0x1003, - BTL_OMO_FORMATION_04 = 0x1004, - BTL_OMO_FORMATION_05 = 0x1005, - BTL_OMO_FORMATION_06 = 0x1006, - BTL_OMO_FORMATION_07 = 0x1007, - BTL_OMO_FORMATION_08 = 0x1008, - BTL_OMO_FORMATION_09 = 0x1009, - BTL_OMO_FORMATION_0A = 0x100A, - BTL_OMO_FORMATION_0B = 0x100B, - BTL_OMO_FORMATION_0C = 0x100C, - BTL_OMO_FORMATION_0D = 0x100D, - BTL_OMO_FORMATION_0E = 0x100E, - BTL_OMO_FORMATION_0F = 0x100F, - BTL_OMO_FORMATION_10 = 0x1010, - BTL_OMO_FORMATION_11 = 0x1011, - BTL_OMO_FORMATION_12 = 0x1012, - BTL_OMO_FORMATION_13 = 0x1013, - BTL_OMO_FORMATION_14 = 0x1014, - BTL_OMO_FORMATION_15 = 0x1015, - BTL_OMO_FORMATION_16 = 0x1016, - BTL_OMO_FORMATION_17 = 0x1017, - BTL_OMO_FORMATION_18 = 0x1018, - BTL_OMO_FORMATION_19 = 0x1019, - BTL_OMO_FORMATION_1A = 0x101A, - BTL_OMO_FORMATION_1B = 0x101B, - BTL_OMO_FORMATION_1C = 0x101C, - BTL_OMO_FORMATION_1D = 0x101D, - BTL_OMO_FORMATION_1E = 0x101E, - BTL_OMO_FORMATION_1F = 0x101F, - BTL_OMO_FORMATION_20 = 0x1020, - BTL_OMO_FORMATION_21 = 0x1021, - BTL_OMO_FORMATION_22 = 0x1022, - BTL_OMO_FORMATION_23 = 0x1023, - BTL_OMO_FORMATION_24 = 0x1024, - BTL_OMO_FORMATION_25 = 0x1025, - BTL_OMO_FORMATION_26 = 0x1026, - BTL_OMO_FORMATION_27 = 0x1027, - BTL_OMO_FORMATION_28 = 0x1028, - BTL_OMO_FORMATION_29 = 0x1029, - BTL_OMO_FORMATION_2A = 0x102A, - BTL_OMO_FORMATION_2B = 0x102B, - BTL_OMO_FORMATION_2C = 0x102C, - BTL_OMO_FORMATION_2D = 0x102D, - BTL_OMO_FORMATION_2E = 0x102E, - BTL_OMO_FORMATION_2F = 0x102F, - BTL_OMO_FORMATION_30 = 0x1030, - BTL_OMO2_FORMATION_00 = 0x1100, - BTL_OMO2_FORMATION_01 = 0x1101, - BTL_OMO2_FORMATION_02 = 0x1102, - BTL_OMO2_FORMATION_03 = 0x1103, - BTL_OMO2_FORMATION_04 = 0x1104, - BTL_OMO2_FORMATION_05 = 0x1105, - BTL_OMO2_FORMATION_06 = 0x1106, - BTL_OMO2_FORMATION_07 = 0x1107, - BTL_OMO3_FORMATION_00 = 0x1200, - BTL_OMO3_FORMATION_01 = 0x1201, - BTL_OMO3_FORMATION_02 = 0x1202, - BTL_OMO3_FORMATION_03 = 0x1203, - BTL_OMO3_FORMATION_04 = 0x1204, - BTL_OMO3_FORMATION_05 = 0x1205, - BTL_OMO3_FORMATION_06 = 0x1206, - BTL_OMO3_FORMATION_07 = 0x1207, - BTL_OMO3_FORMATION_08 = 0x1208, - BTL_OMO3_FORMATION_09 = 0x1209, - BTL_OMO3_FORMATION_0A = 0x120A, - BTL_OMO3_FORMATION_0B = 0x120B, - BTL_OMO3_FORMATION_0C = 0x120C, - BTL_OMO3_FORMATION_0D = 0x120D, - BTL_KGR_FORMATION_00 = 0x1300, - BTL_JAN_FORMATION_00 = 0x1400, - BTL_JAN_FORMATION_01 = 0x1401, - BTL_JAN_FORMATION_02 = 0x1402, - BTL_JAN_FORMATION_03 = 0x1403, - BTL_JAN_FORMATION_04 = 0x1404, - BTL_JAN_FORMATION_05 = 0x1405, - BTL_JAN_FORMATION_06 = 0x1406, - BTL_JAN_FORMATION_07 = 0x1407, - BTL_JAN_FORMATION_08 = 0x1408, - BTL_JAN_FORMATION_09 = 0x1409, - BTL_JAN_FORMATION_0A = 0x140A, - BTL_JAN_FORMATION_0B = 0x140B, - BTL_JAN_FORMATION_0C = 0x140C, - BTL_JAN_FORMATION_0D = 0x140D, - BTL_JAN_FORMATION_0E = 0x140E, - BTL_JAN_FORMATION_0F = 0x140F, - BTL_JAN_FORMATION_10 = 0x1410, - BTL_JAN_FORMATION_11 = 0x1411, - BTL_JAN_FORMATION_12 = 0x1412, - BTL_JAN_FORMATION_13 = 0x1413, - BTL_JAN2_FORMATION_00 = 0x1500, - BTL_JAN2_FORMATION_01 = 0x1501, - BTL_JAN2_FORMATION_02 = 0x1502, - BTL_JAN2_FORMATION_03 = 0x1503, - BTL_KZN_FORMATION_00 = 0x1600, - BTL_KZN_FORMATION_01 = 0x1601, - BTL_KZN_FORMATION_02 = 0x1602, - BTL_KZN_FORMATION_03 = 0x1603, - BTL_KZN_FORMATION_04 = 0x1604, - BTL_KZN_FORMATION_05 = 0x1605, - BTL_KZN_FORMATION_06 = 0x1606, - BTL_KZN_FORMATION_07 = 0x1607, - BTL_KZN_FORMATION_08 = 0x1608, - BTL_KZN_FORMATION_09 = 0x1609, - BTL_KZN_FORMATION_0A = 0x160A, - BTL_KZN_FORMATION_0B = 0x160B, - BTL_KZN_FORMATION_0C = 0x160C, - BTL_KZN_FORMATION_0D = 0x160D, - BTL_KZN_FORMATION_0E = 0x160E, - BTL_KZN_FORMATION_0F = 0x160F, - BTL_KZN_FORMATION_10 = 0x1610, - BTL_KZN_FORMATION_11 = 0x1611, - BTL_KZN_FORMATION_12 = 0x1612, - BTL_KZN_FORMATION_13 = 0x1613, - BTL_KZN_FORMATION_14 = 0x1614, - BTL_KZN2_FORMATION_00 = 0x1700, - BTL_KZN2_FORMATION_01 = 0x1701, - BTL_KZN2_FORMATION_02 = 0x1702, - BTL_KZN2_FORMATION_03 = 0x1703, - BTL_KZN2_FORMATION_04 = 0x1704, - BTL_KZN2_FORMATION_05 = 0x1705, - BTL_KZN2_FORMATION_06 = 0x1706, - BTL_FLO_FORMATION_00 = 0x1800, - BTL_FLO_FORMATION_01 = 0x1801, - BTL_FLO_FORMATION_02 = 0x1802, - BTL_FLO_FORMATION_03 = 0x1803, - BTL_FLO_FORMATION_04 = 0x1804, - BTL_FLO_FORMATION_05 = 0x1805, - BTL_FLO_FORMATION_06 = 0x1806, - BTL_FLO_FORMATION_07 = 0x1807, - BTL_FLO_FORMATION_08 = 0x1808, - BTL_FLO_FORMATION_09 = 0x1809, - BTL_FLO_FORMATION_0A = 0x180A, - BTL_FLO_FORMATION_0B = 0x180B, - BTL_FLO_FORMATION_0C = 0x180C, - BTL_FLO_FORMATION_0D = 0x180D, - BTL_FLO_FORMATION_0E = 0x180E, - BTL_FLO_FORMATION_0F = 0x180F, - BTL_FLO_FORMATION_10 = 0x1810, - BTL_FLO_FORMATION_11 = 0x1811, - BTL_FLO_FORMATION_12 = 0x1812, - BTL_FLO_FORMATION_13 = 0x1813, - BTL_FLO_FORMATION_14 = 0x1814, - BTL_FLO_FORMATION_15 = 0x1815, - BTL_FLO_FORMATION_16 = 0x1816, - BTL_FLO_FORMATION_17 = 0x1817, - BTL_FLO_FORMATION_18 = 0x1818, - BTL_FLO_FORMATION_19 = 0x1819, - BTL_FLO_FORMATION_1A = 0x181A, - BTL_FLO_FORMATION_1B = 0x181B, - BTL_FLO_FORMATION_1C = 0x181C, - BTL_FLO_FORMATION_1D = 0x181D, - BTL_FLO_FORMATION_1E = 0x181E, - BTL_FLO_FORMATION_1F = 0x181F, - BTL_FLO_FORMATION_20 = 0x1820, - BTL_FLO_FORMATION_21 = 0x1821, - BTL_FLO_FORMATION_22 = 0x1822, - BTL_FLO_FORMATION_23 = 0x1823, - BTL_FLO_FORMATION_24 = 0x1824, - BTL_FLO_FORMATION_25 = 0x1825, - BTL_FLO2_FORMATION_00 = 0x1900, - BTL_FLO2_FORMATION_01 = 0x1901, - BTL_FLO2_FORMATION_02 = 0x1902, - BTL_FLO2_FORMATION_03 = 0x1903, - BTL_FLO2_FORMATION_04 = 0x1904, - BTL_FLO2_FORMATION_05 = 0x1905, - BTL_FLO2_FORMATION_06 = 0x1906, - BTL_FLO2_FORMATION_07 = 0x1907, - BTL_FLO2_FORMATION_08 = 0x1908, - BTL_FLO2_FORMATION_09 = 0x1909, - BTL_TIK_FORMATION_00 = 0x1A00, - BTL_TIK_FORMATION_01 = 0x1A01, - BTL_TIK_FORMATION_02 = 0x1A02, - BTL_TIK_FORMATION_03 = 0x1A03, - BTL_TIK_FORMATION_04 = 0x1A04, - BTL_TIK_FORMATION_05 = 0x1A05, - BTL_TIK_FORMATION_06 = 0x1A06, - BTL_TIK_FORMATION_07 = 0x1A07, - BTL_TIK_FORMATION_08 = 0x1A08, - BTL_TIK_FORMATION_09 = 0x1A09, - BTL_TIK_FORMATION_0A = 0x1A0A, - BTL_TIK_FORMATION_0B = 0x1A0B, - BTL_TIK_FORMATION_0C = 0x1A0C, - BTL_TIK_FORMATION_0D = 0x1A0D, - BTL_TIK_FORMATION_0E = 0x1A0E, - BTL_TIK_FORMATION_0F = 0x1A0F, - BTL_TIK_FORMATION_10 = 0x1A10, - BTL_TIK_FORMATION_11 = 0x1A11, - BTL_TIK_FORMATION_12 = 0x1A12, - BTL_TIK_FORMATION_13 = 0x1A13, - BTL_TIK_FORMATION_14 = 0x1A14, - BTL_TIK_FORMATION_15 = 0x1A15, - BTL_TIK_FORMATION_16 = 0x1A16, - BTL_TIK_FORMATION_17 = 0x1A17, - BTL_TIK_FORMATION_18 = 0x1A18, - BTL_TIK2_FORMATION_00 = 0x1B00, - BTL_TIK2_FORMATION_01 = 0x1B01, - BTL_TIK2_FORMATION_02 = 0x1B02, - BTL_TIK2_FORMATION_03 = 0x1B03, - BTL_TIK2_FORMATION_04 = 0x1B04, - BTL_TIK3_FORMATION_00 = 0x1C00, - BTL_TIK3_FORMATION_01 = 0x1C01, - BTL_TIK3_FORMATION_02 = 0x1C02, - BTL_TIK3_FORMATION_03 = 0x1C03, - BTL_SAM_FORMATION_00 = 0x1D00, - BTL_SAM_FORMATION_01 = 0x1D01, - BTL_SAM_FORMATION_02 = 0x1D02, - BTL_SAM_FORMATION_03 = 0x1D03, - BTL_SAM_FORMATION_04 = 0x1D04, - BTL_SAM_FORMATION_05 = 0x1D05, - BTL_SAM_FORMATION_06 = 0x1D06, - BTL_SAM_FORMATION_07 = 0x1D07, - BTL_SAM_FORMATION_08 = 0x1D08, - BTL_SAM_FORMATION_09 = 0x1D09, - BTL_SAM_FORMATION_0A = 0x1D0A, - BTL_SAM_FORMATION_0B = 0x1D0B, - BTL_SAM_FORMATION_0C = 0x1D0C, - BTL_SAM_FORMATION_0D = 0x1D0D, - BTL_SAM_FORMATION_0E = 0x1D0E, - BTL_SAM_FORMATION_0F = 0x1D0F, - BTL_SAM_FORMATION_10 = 0x1D10, - BTL_SAM_FORMATION_11 = 0x1D11, - BTL_SAM_FORMATION_12 = 0x1D12, - BTL_SAM_FORMATION_13 = 0x1D13, - BTL_SAM_FORMATION_14 = 0x1D14, - BTL_SAM_FORMATION_15 = 0x1D15, - BTL_SAM2_FORMATION_00 = 0x1E00, - BTL_SAM2_FORMATION_01 = 0x1E01, - BTL_PRA_FORMATION_00 = 0x1F00, - BTL_PRA_FORMATION_01 = 0x1F01, - BTL_PRA_FORMATION_02 = 0x1F02, - BTL_PRA_FORMATION_03 = 0x1F03, - BTL_PRA_FORMATION_04 = 0x1F04, - BTL_PRA_FORMATION_05 = 0x1F05, - BTL_PRA_FORMATION_06 = 0x1F06, - BTL_PRA_FORMATION_07 = 0x1F07, - BTL_PRA_FORMATION_08 = 0x1F08, - BTL_PRA_FORMATION_09 = 0x1F09, - BTL_PRA_FORMATION_0A = 0x1F0A, - BTL_PRA_FORMATION_0B = 0x1F0B, - BTL_PRA_FORMATION_0C = 0x1F0C, - BTL_PRA_FORMATION_0D = 0x1F0D, - BTL_PRA_FORMATION_0E = 0x1F0E, - BTL_PRA2_FORMATION_00 = 0x2000, - BTL_PRA2_FORMATION_01 = 0x2001, - BTL_PRA2_FORMATION_02 = 0x2002, - BTL_PRA2_FORMATION_03 = 0x2003, - BTL_PRA2_FORMATION_04 = 0x2004, - BTL_PRA3_FORMATION_00 = 0x2100, - BTL_PRA3_FORMATION_01 = 0x2101, - BTL_PRA3_FORMATION_02 = 0x2102, - BTL_PRA3_FORMATION_03 = 0x2103, - BTL_PRA3_FORMATION_04 = 0x2104, - BTL_PRA3_FORMATION_05 = 0x2105, - BTL_PRA3_FORMATION_06 = 0x2106, - BTL_PRA3_FORMATION_07 = 0x2107, - BTL_PRA3_FORMATION_08 = 0x2108, - BTL_PRA3_FORMATION_09 = 0x2109, - BTL_PRA3_FORMATION_0A = 0x210A, - BTL_PRA3_FORMATION_0B = 0x210B, - BTL_PRA3_FORMATION_0C = 0x210C, - BTL_PRA3_FORMATION_0D = 0x210D, - BTL_PRA3_FORMATION_0E = 0x210E, - BTL_PRA3_FORMATION_0F = 0x210F, - BTL_PRA3_FORMATION_10 = 0x2110, - BTL_PRA3_FORMATION_11 = 0x2111, - BTL_PRA3_FORMATION_12 = 0x2112, - BTL_PRA3_FORMATION_13 = 0x2113, - BTL_KPA_FORMATION_00 = 0x2200, - BTL_KPA_FORMATION_01 = 0x2201, - BTL_KPA_FORMATION_02 = 0x2202, - BTL_KPA_FORMATION_03 = 0x2203, - BTL_KPA_FORMATION_04 = 0x2204, - BTL_KPA_FORMATION_05 = 0x2205, - BTL_KPA_FORMATION_06 = 0x2206, - BTL_KPA_FORMATION_07 = 0x2207, - BTL_KPA_FORMATION_08 = 0x2208, - BTL_KPA_FORMATION_09 = 0x2209, - BTL_KPA_FORMATION_0A = 0x220A, - BTL_KPA_FORMATION_0B = 0x220B, - BTL_KPA_FORMATION_0C = 0x220C, - BTL_KPA_FORMATION_0D = 0x220D, - BTL_KPA_FORMATION_0E = 0x220E, - BTL_KPA_FORMATION_0F = 0x220F, - BTL_KPA_FORMATION_10 = 0x2210, - BTL_KPA_FORMATION_11 = 0x2211, - BTL_KPA_FORMATION_12 = 0x2212, - BTL_KPA_FORMATION_13 = 0x2213, - BTL_KPA_FORMATION_14 = 0x2214, - BTL_KPA_FORMATION_15 = 0x2215, - BTL_KPA_FORMATION_16 = 0x2216, - BTL_KPA_FORMATION_17 = 0x2217, - BTL_KPA_FORMATION_18 = 0x2218, - BTL_KPA_FORMATION_19 = 0x2219, - BTL_KPA_FORMATION_1A = 0x221A, - BTL_KPA_FORMATION_1B = 0x221B, - BTL_KPA_FORMATION_1C = 0x221C, - BTL_KPA_FORMATION_1D = 0x221D, - BTL_KPA_FORMATION_1E = 0x221E, - BTL_KPA_FORMATION_1F = 0x221F, - BTL_KPA_FORMATION_20 = 0x2220, - BTL_KPA_FORMATION_21 = 0x2221, - BTL_KPA_FORMATION_22 = 0x2222, - BTL_KPA_FORMATION_23 = 0x2223, - BTL_KPA_FORMATION_24 = 0x2224, - BTL_KPA_FORMATION_25 = 0x2225, - BTL_KPA_FORMATION_26 = 0x2226, - BTL_KPA_FORMATION_27 = 0x2227, - BTL_KPA_FORMATION_28 = 0x2228, - BTL_KPA_FORMATION_29 = 0x2229, - BTL_KPA_FORMATION_2A = 0x222A, - BTL_KPA_FORMATION_2B = 0x222B, - BTL_KPA_FORMATION_2C = 0x222C, - BTL_KPA_FORMATION_2D = 0x222D, - BTL_KPA_FORMATION_2E = 0x222E, - BTL_KPA_FORMATION_2F = 0x222F, - BTL_KPA_FORMATION_30 = 0x2230, - BTL_KPA_FORMATION_31 = 0x2231, - BTL_KPA_FORMATION_32 = 0x2232, - BTL_KPA_FORMATION_33 = 0x2233, - BTL_KPA_FORMATION_34 = 0x2234, - BTL_KPA_FORMATION_35 = 0x2235, - BTL_KPA_FORMATION_36 = 0x2236, - BTL_KPA_FORMATION_37 = 0x2237, - BTL_KPA_FORMATION_38 = 0x2238, - BTL_KPA_FORMATION_39 = 0x2239, - BTL_KPA_FORMATION_3A = 0x223A, - BTL_KPA_FORMATION_3B = 0x223B, - BTL_KPA2_FORMATION_00 = 0x2300, - BTL_KPA2_FORMATION_01 = 0x2301, - BTL_KPA2_FORMATION_02 = 0x2302, - BTL_KPA2_FORMATION_03 = 0x2303, - BTL_KPA2_FORMATION_04 = 0x2304, - BTL_KPA3_FORMATION_00 = 0x2400, - BTL_KPA3_FORMATION_01 = 0x2401, - BTL_KPA3_FORMATION_02 = 0x2402, - BTL_KPA3_FORMATION_03 = 0x2403, - BTL_KPA3_FORMATION_04 = 0x2404, - BTL_KPA3_FORMATION_05 = 0x2405, - BTL_KPA3_FORMATION_06 = 0x2406, - BTL_KPA3_FORMATION_07 = 0x2407, - BTL_KPA3_FORMATION_08 = 0x2408, - BTL_KPA3_FORMATION_09 = 0x2409, - BTL_KPA3_FORMATION_0A = 0x240A, - BTL_KPA4_FORMATION_00 = 0x2500, - BTL_KPA4_FORMATION_01 = 0x2501, - BTL_KPA4_FORMATION_02 = 0x2502, - BTL_KPA4_FORMATION_03 = 0x2503, - BTL_KPA4_FORMATION_04 = 0x2504, - BTL_KPA4_FORMATION_05 = 0x2505, - BTL_KPA4_FORMATION_06 = 0x2506, - BTL_KPA4_FORMATION_07 = 0x2507, - BTL_KPA4_FORMATION_08 = 0x2508, - BTL_KKJ_FORMATION_00 = 0x2600, - BTL_DIG_FORMATION_00 = 0x2700, - BTL_DIG_FORMATION_01 = 0x2701, - BTL_DIG_FORMATION_02 = 0x2702, - BTL_DIG_FORMATION_03 = 0x2703, - BTL_DIG_FORMATION_04 = 0x2704, - BTL_DIG_FORMATION_05 = 0x2705, - BTL_DIG_FORMATION_06 = 0x2706, - BTL_DIG_FORMATION_07 = 0x2707, - BTL_DIG_FORMATION_08 = 0x2708, - BTL_DIG_FORMATION_09 = 0x2709, -}; diff --git a/src/battle/battle_stage_names.h b/src/battle/battle_stage_names.h deleted file mode 100644 index 8ed1c9fed9..0000000000 --- a/src/battle/battle_stage_names.h +++ /dev/null @@ -1,248 +0,0 @@ -#define BTL_STAGE_DEFAULT -1 - -enum StageNames { - BTL_KMR_PART_1_STAGE_00 = 0x00, - BTL_KMR_PART_1_STAGE_01 = 0x01, - BTL_KMR_PART_1_STAGE_02 = 0x02, - BTL_KMR_PART_1_STAGE_03 = 0x03, - BTL_KMR_PART_1_STAGE_04 = 0x04, - BTL_KMR_PART_2_STAGE_00 = 0x00, - BTL_KMR_PART_2_STAGE_01 = 0x01, - BTL_KMR_PART_2_STAGE_02 = 0x02, - BTL_KMR_PART_2_STAGE_03 = 0x03, - BTL_KMR_PART_2_STAGE_04 = 0x04, - BTL_KMR_PART_3_STAGE_00 = 0x00, - BTL_KMR_PART_3_STAGE_01 = 0x01, - BTL_KMR_PART_3_STAGE_02 = 0x02, - BTL_KMR_PART_3_STAGE_03 = 0x03, - BTL_KMR_PART_3_STAGE_04 = 0x04, - BTL_KMR_PART_3_STAGE_05 = 0x05, - BTL_KMR_PART_3_STAGE_06 = 0x06, - BTL_KMR_PART_3_STAGE_07 = 0x07, - BTL_KMR_PART_3_STAGE_08 = 0x08, - BTL_KMR_PART_3_STAGE_09 = 0x09, - BTL_MAC_STAGE_00 = 0x00, - BTL_MAC_STAGE_01 = 0x01, - BTL_HOS_STAGE_00 = 0x00, - BTL_HOS_STAGE_01 = 0x01, - BTL_HOS_STAGE_02 = 0x02, - BTL_NOK_STAGE_00 = 0x00, - BTL_NOK_STAGE_01 = 0x01, - BTL_NOK_STAGE_02 = 0x02, - BTL_NOK_STAGE_03 = 0x03, - BTL_TRD_PART_1_STAGE_00 = 0x00, - BTL_TRD_PART_1_STAGE_01 = 0x01, - BTL_TRD_PART_1_STAGE_02 = 0x02, - BTL_TRD_PART_1_STAGE_03 = 0x03, - BTL_TRD_PART_1_STAGE_04 = 0x04, - BTL_TRD_PART_1_STAGE_05 = 0x05, - BTL_TRD_PART_1_STAGE_06 = 0x06, - BTL_TRD_PART_1_STAGE_07 = 0x07, - BTL_TRD_PART_1_STAGE_08 = 0x08, - BTL_TRD_PART_1_STAGE_09 = 0x09, - BTL_TRD_PART_1_STAGE_0A = 0x0A, - BTL_TRD_PART_1_STAGE_0B = 0x0B, - BTL_TRD_PART_1_STAGE_0C = 0x0C, - BTL_TRD_PART_1_STAGE_0D = 0x0D, - BTL_TRD_PART_2_STAGE_00 = 0x00, - BTL_TRD_PART_2_STAGE_01 = 0x01, - BTL_TRD_PART_2_STAGE_02 = 0x02, - BTL_TRD_PART_2_STAGE_03 = 0x03, - BTL_TRD_PART_2_STAGE_04 = 0x04, - BTL_TRD_PART_2_STAGE_05 = 0x05, - BTL_TRD_PART_2_STAGE_06 = 0x06, - BTL_TRD_PART_2_STAGE_07 = 0x07, - BTL_TRD_PART_2_STAGE_08 = 0x08, - BTL_TRD_PART_2_STAGE_09 = 0x09, - BTL_TRD_PART_2_STAGE_0A = 0x0A, - BTL_TRD_PART_2_STAGE_0B = 0x0B, - BTL_TRD_PART_3_STAGE_00 = 0x00, - BTL_IWA_STAGE_00 = 0x00, - BTL_IWA_STAGE_01 = 0x01, - BTL_IWA_STAGE_02 = 0x02, - BTL_SBK_STAGE_00 = 0x00, - BTL_ISK_PART_1_STAGE_00 = 0x00, - BTL_ISK_PART_1_STAGE_01 = 0x01, - BTL_ISK_PART_1_STAGE_02 = 0x02, - BTL_ISK_PART_1_STAGE_03 = 0x03, - BTL_ISK_PART_1_STAGE_04 = 0x04, - BTL_ISK_PART_1_STAGE_05 = 0x05, - BTL_ISK_PART_1_STAGE_06 = 0x06, - BTL_ISK_PART_1_STAGE_07 = 0x07, - BTL_ISK_PART_1_STAGE_08 = 0x08, - BTL_ISK_PART_1_STAGE_09 = 0x09, - BTL_ISK_PART_1_STAGE_0A = 0x0A, - BTL_ISK_PART_1_STAGE_0B = 0x0B, - BTL_ISK_PART_1_STAGE_0C = 0x0C, - BTL_ISK_PART_2_STAGE_00 = 0x00, - BTL_ISK_PART_2_STAGE_01 = 0x01, - BTL_ISK_PART_2_STAGE_02 = 0x02, - BTL_ISK_PART_2_STAGE_03 = 0x03, - BTL_ISK_PART_2_STAGE_04 = 0x04, - BTL_ISK_PART_2_STAGE_05 = 0x05, - BTL_ISK_PART_2_STAGE_06 = 0x06, - BTL_ISK_PART_2_STAGE_07 = 0x07, - BTL_ISK_PART_2_STAGE_08 = 0x08, - BTL_ISK_PART_2_STAGE_09 = 0x09, - BTL_ISK_PART_2_STAGE_0A = 0x0A, - BTL_ISK_PART_2_STAGE_0B = 0x0B, - BTL_MIM_STAGE_00 = 0x00, - BTL_ARN_STAGE_00 = 0x00, - BTL_ARN_STAGE_01 = 0x01, - BTL_ARN_STAGE_02 = 0x02, - BTL_ARN_STAGE_03 = 0x03, - BTL_ARN_STAGE_04 = 0x04, - BTL_ARN_STAGE_05 = 0x05, - BTL_DGB_STAGE_00 = 0x00, - BTL_DGB_STAGE_01 = 0x01, - BTL_DGB_STAGE_02 = 0x02, - BTL_DGB_STAGE_03 = 0x03, - BTL_DGB_STAGE_04 = 0x04, - BTL_OMO_STAGE_00 = 0x00, - BTL_OMO_STAGE_01 = 0x01, - BTL_OMO_STAGE_02 = 0x02, - BTL_OMO_STAGE_03 = 0x03, - BTL_OMO_STAGE_04 = 0x04, - BTL_OMO_STAGE_05 = 0x05, - BTL_OMO_STAGE_06 = 0x06, - BTL_OMO_STAGE_07 = 0x07, - BTL_OMO_STAGE_08 = 0x08, - BTL_OMO2_STAGE_00 = 0x00, - BTL_OMO3_STAGE_00 = 0x00, - BTL_OMO3_STAGE_01 = 0x01, - BTL_OMO3_STAGE_02 = 0x02, - BTL_OMO3_STAGE_03 = 0x03, - BTL_OMO3_STAGE_04 = 0x04, - BTL_OMO3_STAGE_05 = 0x05, - BTL_OMO3_STAGE_06 = 0x06, - BTL_OMO3_STAGE_07 = 0x07, - BTL_OMO3_STAGE_08 = 0x08, - BTL_KGR_STAGE_00 = 0x00, - BTL_JAN_STAGE_00 = 0x00, - BTL_JAN_STAGE_01 = 0x01, - BTL_JAN_STAGE_02 = 0x02, - BTL_JAN_STAGE_03 = 0x03, - BTL_JAN_STAGE_04 = 0x04, - BTL_JAN_STAGE_05 = 0x05, - BTL_JAN_STAGE_06 = 0x06, - BTL_JAN_STAGE_07 = 0x07, - BTL_JAN2_STAGE_00 = 0x00, - BTL_JAN2_STAGE_01 = 0x01, - BTL_JAN2_STAGE_02 = 0x02, - BTL_JAN2_STAGE_03 = 0x03, - BTL_JAN2_STAGE_04 = 0x04, - BTL_JAN2_STAGE_05 = 0x05, - BTL_JAN2_STAGE_06 = 0x06, - BTL_JAN2_STAGE_07 = 0x07, - BTL_KZN_STAGE_00 = 0x00, - BTL_KZN_STAGE_01 = 0x01, - BTL_KZN_STAGE_02 = 0x02, - BTL_KZN_STAGE_03 = 0x03, - BTL_KZN_STAGE_04 = 0x04, - BTL_KZN_STAGE_05 = 0x05, - BTL_KZN_STAGE_06 = 0x06, - BTL_KZN2_STAGE_00 = 0x00, - BTL_KZN2_STAGE_01 = 0x01, - BTL_KZN2_STAGE_02 = 0x02, - BTL_KZN2_STAGE_03 = 0x03, - BTL_KZN2_STAGE_04 = 0x04, - BTL_KZN2_STAGE_05 = 0x05, - BTL_KZN2_STAGE_06 = 0x06, - BTL_FLO_STAGE_00 = 0x00, - BTL_FLO_STAGE_01 = 0x01, - BTL_FLO_STAGE_02 = 0x02, - BTL_FLO_STAGE_03 = 0x03, - BTL_FLO_STAGE_04 = 0x04, - BTL_FLO_STAGE_05 = 0x05, - BTL_FLO_STAGE_06 = 0x06, - BTL_FLO_STAGE_07 = 0x07, - BTL_FLO_STAGE_08 = 0x08, - BTL_FLO_STAGE_09 = 0x09, - BTL_FLO2_STAGE_00 = 0x00, - BTL_FLO2_STAGE_01 = 0x01, - BTL_FLO2_STAGE_02 = 0x02, - BTL_FLO2_STAGE_03 = 0x03, - BTL_FLO2_STAGE_04 = 0x04, - BTL_FLO2_STAGE_05 = 0x05, - BTL_FLO2_STAGE_06 = 0x06, - BTL_FLO2_STAGE_07 = 0x07, - BTL_FLO2_STAGE_08 = 0x08, - BTL_FLO2_STAGE_09 = 0x09, - BTL_TIK_STAGE_00 = 0x00, - BTL_TIK_STAGE_01 = 0x01, - BTL_TIK_STAGE_02 = 0x02, - BTL_TIK_STAGE_03 = 0x03, - BTL_TIK_STAGE_04 = 0x04, - BTL_TIK2_STAGE_00 = 0x00, - BTL_TIK2_STAGE_01 = 0x01, - BTL_TIK2_STAGE_02 = 0x02, - BTL_TIK2_STAGE_03 = 0x03, - BTL_TIK2_STAGE_04 = 0x04, - BTL_TIK3_STAGE_00 = 0x00, - BTL_TIK3_STAGE_01 = 0x01, - BTL_TIK3_STAGE_02 = 0x02, - BTL_TIK3_STAGE_03 = 0x03, - BTL_TIK3_STAGE_04 = 0x04, - BTL_SAM_STAGE_00 = 0x00, - BTL_SAM_STAGE_01 = 0x01, - BTL_SAM_STAGE_02 = 0x02, - BTL_SAM_STAGE_03 = 0x03, - BTL_SAM_STAGE_04 = 0x04, - BTL_SAM_STAGE_05 = 0x05, - BTL_SAM2_STAGE_00 = 0x00, - BTL_SAM2_STAGE_01 = 0x01, - BTL_SAM2_STAGE_02 = 0x02, - BTL_SAM2_STAGE_03 = 0x03, - BTL_SAM2_STAGE_04 = 0x04, - BTL_SAM2_STAGE_05 = 0x05, - BTL_PRA_STAGE_00 = 0x00, - BTL_PRA_STAGE_01 = 0x01, - BTL_PRA_STAGE_02 = 0x02, - BTL_PRA_STAGE_03 = 0x03, - BTL_PRA_STAGE_04 = 0x04, - BTL_PRA_STAGE_05 = 0x05, - BTL_PRA2_STAGE_00 = 0x00, - BTL_PRA3_STAGE_00 = 0x00, - BTL_PRA3_STAGE_01 = 0x01, - BTL_PRA3_STAGE_02 = 0x02, - BTL_PRA3_STAGE_03 = 0x03, - BTL_PRA3_STAGE_04 = 0x04, - BTL_PRA3_STAGE_05 = 0x05, - BTL_KPA_STAGE_00 = 0x00, - BTL_KPA_STAGE_01 = 0x01, - BTL_KPA_STAGE_02 = 0x02, - BTL_KPA_STAGE_03 = 0x03, - BTL_KPA_STAGE_04 = 0x04, - BTL_KPA_STAGE_05 = 0x05, - BTL_KPA_STAGE_06 = 0x06, - BTL_KPA_STAGE_07 = 0x07, - BTL_KPA_STAGE_08 = 0x08, - BTL_KPA_STAGE_09 = 0x09, - BTL_KPA_STAGE_0A = 0x0A, - BTL_KPA_STAGE_0B = 0x0B, - BTL_KPA_STAGE_0C = 0x0C, - BTL_KPA_STAGE_0D = 0x0D, - BTL_KPA2_STAGE_00 = 0x00, - BTL_KPA2_STAGE_01 = 0x01, - BTL_KPA2_STAGE_02 = 0x02, - BTL_KPA3_STAGE_00 = 0x00, - BTL_KPA4_STAGE_00 = 0x00, - BTL_KPA4_STAGE_01 = 0x01, - BTL_KPA4_STAGE_02 = 0x02, - BTL_KPA4_STAGE_03 = 0x03, - BTL_KPA4_STAGE_04 = 0x04, - BTL_KPA4_STAGE_05 = 0x05, - BTL_KPA4_STAGE_06 = 0x06, - BTL_KPA4_STAGE_07 = 0x07, - BTL_KPA4_STAGE_08 = 0x08, - BTL_KPA4_STAGE_09 = 0x09, - BTL_KPA4_STAGE_0A = 0x0A, - BTL_KPA4_STAGE_0B = 0x0B, - BTL_KPA4_STAGE_0C = 0x0C, - BTL_KKJ_STAGE_00 = 0x00, - BTL_DIG_STAGE_00 = 0x00, - BTL_DIG_STAGE_01 = 0x01, - BTL_DIG_STAGE_02 = 0x02, - BTL_DIG_STAGE_03 = 0x03, - BTL_DIG_STAGE_04 = 0x04, -}; diff --git a/src/battle/battle_tables.h b/src/battle/battle_tables.h index de78975022..5c1f14d8fe 100644 --- a/src/battle/battle_tables.h +++ b/src/battle/battle_tables.h @@ -4,125 +4,125 @@ #include "common.h" #include "battle/battle.h" -extern BattleList b_area_kmr_part_1_formationTable; -extern StageList b_area_kmr_part_1_stageTable; +extern BattleList b_area_kmr_part_1_Formations; +extern StageList b_area_kmr_part_1_Stages; -extern BattleList b_area_kmr_part_2_formationTable; -extern StageList b_area_kmr_part_2_stageTable; +extern BattleList b_area_kmr_part_2_Formations; +extern StageList b_area_kmr_part_2_Stages; -extern BattleList b_area_kmr_part_3_formationTable; -extern StageList b_area_kmr_part_3_stageTable; +extern BattleList b_area_kmr_part_3_Formations; +extern StageList b_area_kmr_part_3_Stages; -extern BattleList b_area_mac_formationTable; -extern StageList b_area_mac_stageTable; +extern BattleList b_area_mac_Formations; +extern StageList b_area_mac_Stages; -extern BattleList b_area_hos_formationTable; -extern StageList b_area_hos_stageTable; +extern BattleList b_area_hos_Formations; +extern StageList b_area_hos_Stages; -extern BattleList b_area_nok_formationTable; -extern StageList b_area_nok_stageTable; +extern BattleList b_area_nok_Formations; +extern StageList b_area_nok_Stages; -extern BattleList b_area_trd_part_1_formationTable; -extern StageList b_area_trd_part_1_stageTable; +extern BattleList b_area_trd_part_1_Formations; +extern StageList b_area_trd_part_1_Stages; -extern BattleList b_area_trd_part_2_formationTable; -extern StageList b_area_trd_part_2_stageTable; +extern BattleList b_area_trd_part_2_Formations; +extern StageList b_area_trd_part_2_Stages; -extern BattleList b_area_trd_part_3_formationTable; -extern StageList b_area_trd_part_3_stageTable; +extern BattleList b_area_trd_part_3_Formations; +extern StageList b_area_trd_part_3_Stages; -extern BattleList b_area_iwa_formationTable; -extern StageList b_area_iwa_stageTable; +extern BattleList b_area_iwa_Formations; +extern StageList b_area_iwa_Stages; -extern BattleList b_area_sbk_formationTable; -extern StageList b_area_sbk_stageTable; +extern BattleList b_area_sbk_Formations; +extern StageList b_area_sbk_Stages; -extern BattleList b_area_isk_part_1_formationTable; -extern StageList b_area_isk_part_1_stageTable; +extern BattleList b_area_isk_part_1_Formations; +extern StageList b_area_isk_part_1_Stages; -extern BattleList b_area_isk_part_2_formationTable; -extern StageList b_area_isk_part_2_stageTable; +extern BattleList b_area_isk_part_2_Formations; +extern StageList b_area_isk_part_2_Stages; -extern BattleList b_area_mim_formationTable; -extern StageList b_area_mim_stageTable; +extern BattleList b_area_mim_Formations; +extern StageList b_area_mim_Stages; -extern BattleList b_area_arn_formationTable; -extern StageList b_area_arn_stageTable; +extern BattleList b_area_arn_Formations; +extern StageList b_area_arn_Stages; -extern BattleList b_area_dgb_formationTable; -extern StageList b_area_dgb_stageTable; +extern BattleList b_area_dgb_Formations; +extern StageList b_area_dgb_Stages; -extern BattleList b_area_omo_formationTable; -extern StageList b_area_omo_stageTable; +extern BattleList b_area_omo_Formations; +extern StageList b_area_omo_Stages; -extern BattleList b_area_omo2_formationTable; -extern StageList b_area_omo2_stageTable; +extern BattleList b_area_omo2_Formations; +extern StageList b_area_omo2_Stages; -extern BattleList b_area_omo3_formationTable; -extern StageList b_area_omo3_stageTable; +extern BattleList b_area_omo3_Formations; +extern StageList b_area_omo3_Stages; -extern BattleList b_area_kgr_formationTable; -extern StageList b_area_kgr_stageTable; +extern BattleList b_area_kgr_Formations; +extern StageList b_area_kgr_Stages; -extern BattleList b_area_jan_formationTable; -extern StageList b_area_jan_stageTable; +extern BattleList b_area_jan_Formations; +extern StageList b_area_jan_Stages; -extern BattleList b_area_jan2_formationTable; -extern StageList b_area_jan2_stageTable; +extern BattleList b_area_jan2_Formations; +extern StageList b_area_jan2_Stages; -extern BattleList b_area_kzn_formationTable; -extern StageList b_area_kzn_stageTable; +extern BattleList b_area_kzn_Formations; +extern StageList b_area_kzn_Stages; -extern BattleList b_area_kzn2_formationTable; -extern StageList b_area_kzn2_stageTable; +extern BattleList b_area_kzn2_Formations; +extern StageList b_area_kzn2_Stages; extern DmaTable b_area_kzn2_dmaTable[]; -extern BattleList b_area_flo_formationTable; -extern StageList b_area_flo_stageTable; +extern BattleList b_area_flo_Formations; +extern StageList b_area_flo_Stages; -extern BattleList b_area_flo2_formationTable; -extern StageList b_area_flo2_stageTable; +extern BattleList b_area_flo2_Formations; +extern StageList b_area_flo2_Stages; -extern BattleList b_area_tik_formationTable; -extern StageList b_area_tik_stageTable; +extern BattleList b_area_tik_Formations; +extern StageList b_area_tik_Stages; -extern BattleList b_area_tik2_formationTable; -extern StageList b_area_tik2_stageTable; +extern BattleList b_area_tik2_Formations; +extern StageList b_area_tik2_Stages; -extern BattleList b_area_tik3_formationTable; -extern StageList b_area_tik3_stageTable; +extern BattleList b_area_tik3_Formations; +extern StageList b_area_tik3_Stages; -extern BattleList b_area_sam_formationTable; -extern StageList b_area_sam_stageTable; +extern BattleList b_area_sam_Formations; +extern StageList b_area_sam_Stages; -extern BattleList b_area_sam2_formationTable; -extern StageList b_area_sam2_stageTable; +extern BattleList b_area_sam2_Formations; +extern StageList b_area_sam2_Stages; -extern BattleList b_area_pra_formationTable; -extern StageList b_area_pra_stageTable; +extern BattleList b_area_pra_Formations; +extern StageList b_area_pra_Stages; -extern BattleList b_area_pra2_formationTable; -extern StageList b_area_pra2_stageTable; +extern BattleList b_area_pra2_Formations; +extern StageList b_area_pra2_Stages; -extern BattleList b_area_pra3_formationTable; -extern StageList b_area_pra3_stageTable; +extern BattleList b_area_pra3_Formations; +extern StageList b_area_pra3_Stages; -extern BattleList b_area_kpa_formationTable; -extern StageList b_area_kpa_stageTable; +extern BattleList b_area_kpa_Formations; +extern StageList b_area_kpa_Stages; -extern BattleList b_area_kpa2_formationTable; -extern StageList b_area_kpa2_stageTable; +extern BattleList b_area_kpa2_Formations; +extern StageList b_area_kpa2_Stages; -extern BattleList b_area_kpa3_formationTable; -extern StageList b_area_kpa3_stageTable; +extern BattleList b_area_kpa3_Formations; +extern StageList b_area_kpa3_Stages; -extern BattleList b_area_kpa4_formationTable; -extern StageList b_area_kpa4_stageTable; +extern BattleList b_area_kpa4_Formations; +extern StageList b_area_kpa4_Stages; -extern BattleList b_area_kkj_formationTable; -extern StageList b_area_kkj_stageTable; +extern BattleList b_area_kkj_Formations; +extern StageList b_area_kkj_Stages; -extern BattleList b_area_dig_formationTable; -extern StageList b_area_dig_stageTable; +extern BattleList b_area_dig_Formations; +extern StageList b_area_dig_Stages; #endif diff --git a/src/battle/common/actor/bandit.inc.c b/src/battle/common/actor/bandit.inc.c index 45640c78fb..d1900608f7 100644 --- a/src/battle/common/actor/bandit.inc.c +++ b/src/battle/common/actor/bandit.inc.c @@ -85,7 +85,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 244, + .projectileTargetOffset = { 0, -12 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -97,7 +97,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -112,7 +112,7 @@ ActorPartBlueprint N(parts_coin)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/common/actor/buzzy_beetle.inc.c b/src/battle/common/actor/buzzy_beetle.inc.c index ffcde410ef..0ca55b16c2 100644 --- a/src/battle/common/actor/buzzy_beetle.inc.c +++ b/src/battle/common/actor/buzzy_beetle.inc.c @@ -60,8 +60,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 1, - .unk_1D = 7, + .projectileTargetOffset = { 1, 7 }, }, }; @@ -140,7 +139,7 @@ EvtScript N(init) = { EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -9) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal))) @@ -163,7 +162,7 @@ EvtScript N(fallOff) = { EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -9) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) @@ -371,7 +370,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -9) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) EVT_CALL(SetActorVar, ACTOR_SELF, 9, 1) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) @@ -549,7 +548,7 @@ EvtScript N(takeTurn_ceiling) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -9) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) @@ -708,7 +707,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -9) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) diff --git a/src/battle/common/actor/bzzap.inc.c b/src/battle/common/actor/bzzap.inc.c index d2885f6df3..c0bb404d9a 100644 --- a/src/battle/common/actor/bzzap.inc.c +++ b/src/battle/common/actor/bzzap.inc.c @@ -62,8 +62,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 2, - .unk_1D = 0xF6, + .projectileTargetOffset = { 2, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -75,8 +74,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 255, - .unk_1D = -5, + .projectileTargetOffset = { -1, -5 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -88,8 +86,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 255, - .unk_1D = -5, + .projectileTargetOffset = { -1, -5 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -101,8 +98,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 255, - .unk_1D = -5, + .projectileTargetOffset = { -1, -5 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -114,8 +110,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 255, - .unk_1D = -5, + .projectileTargetOffset = { -1, -5 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -127,8 +122,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 255, - .unk_1D = -5, + .projectileTargetOffset = { -1, -5 }, }, }; @@ -157,7 +151,7 @@ ActorBlueprint NAMESPACE = { #include "common/UnkBattleFunc1.inc.c" -ApiStatus N(AddVecXZ)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(AddVecXZ)) { Bytecode* args = script->ptrReadPos; s32 prevX = evt_get_variable(script, *args++); s32 prevZ = evt_get_variable(script, *args++); @@ -190,11 +184,11 @@ EvtScript N(idle) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, STATUS_FLAG_SLEEP | STATUS_FLAG_DIZZY) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -7, 19) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 2, -6) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 2, -6) EVT_CALL(N(UnkBattleFunc1), -20, 20, 10, 27) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -7, 33) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 2, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 2, -10) EVT_CALL(N(UnkBattleFunc1), -16, 22, 4, 22) EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/common/actor/clubba.inc.c b/src/battle/common/actor/clubba.inc.c index cec004d83c..135063c303 100644 --- a/src/battle/common/actor/clubba.inc.c +++ b/src/battle/common/actor/clubba.inc.c @@ -62,8 +62,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 8, - .unk_1D = 0xFD, + .projectileTargetOffset = { 8, -3 }, }, }; diff --git a/src/battle/common/actor/duplighost.inc.c b/src/battle/common/actor/duplighost.inc.c index 02a4bdbed2..29f2f95bb0 100644 --- a/src/battle/common/actor/duplighost.inc.c +++ b/src/battle/common/actor/duplighost.inc.c @@ -74,8 +74,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -2, - .unk_1D = -10, + .projectileTargetOffset = { -2, -10 }, }, }; @@ -559,7 +558,7 @@ Formation N(formation_lakilester) = { { .actor = &N(lakilester), .home = { .vec = &N(pos_summon) }, .priority = 0 }, }; -ApiStatus N(GetPartnerAndLevel)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetPartnerAndLevel)) { Bytecode* args = script->ptrReadPos; evt_set_variable(script, *args++, gPlayerData.currentPartner); @@ -567,7 +566,7 @@ ApiStatus N(GetPartnerAndLevel)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(CopyPriority)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CopyPriority)) { s32 partnerID = evt_get_variable(script, *script->ptrReadPos); Actor* actor = get_actor(script->owner1.actorID); FormationRow* formation = NULL; diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index 8f1053004e..b3aa9f24f9 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -50,8 +50,7 @@ ActorPartBlueprint N(partsTable_8021AD80)[] = { .defenseTable = N(defenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_FIREY, .elementImmunityFlags = 0, - .unk_1C = 0xFD, - .unk_1D = 0xF6, + .projectileTargetOffset = { -3, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -63,8 +62,7 @@ ActorPartBlueprint N(partsTable_8021AD80)[] = { .defenseTable = N(defenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -76,8 +74,7 @@ ActorPartBlueprint N(partsTable_8021AD80)[] = { .defenseTable = N(defenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -89,8 +86,7 @@ ActorPartBlueprint N(partsTable_8021AD80)[] = { .defenseTable = N(defenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -102,8 +98,7 @@ ActorPartBlueprint N(partsTable_8021AD80)[] = { .defenseTable = N(defenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, }; diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c index d4d9447e58..99e4f46dca 100644 --- a/src/battle/common/actor/fuzzy.inc.c +++ b/src/battle/common/actor/fuzzy.inc.c @@ -47,7 +47,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/common/actor/ghost_bombette.inc.c b/src/battle/common/actor/ghost_bombette.inc.c index 03a0bb3750..7abab07eeb 100644 --- a/src/battle/common/actor/ghost_bombette.inc.c +++ b/src/battle/common/actor/ghost_bombette.inc.c @@ -59,8 +59,7 @@ ActorPartBlueprint N(bombette_parts)[] = { .defenseTable = N(bombette_defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -2, - .unk_1D = -7, + .projectileTargetOffset = { -2, -7 }, }, }; diff --git a/src/battle/common/actor/ghost_bow.inc.c b/src/battle/common/actor/ghost_bow.inc.c index f4200a0769..46c4cad689 100644 --- a/src/battle/common/actor/ghost_bow.inc.c +++ b/src/battle/common/actor/ghost_bow.inc.c @@ -59,8 +59,7 @@ ActorPartBlueprint N(bow_parts)[] = { .defenseTable = N(bow_defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -72,8 +71,7 @@ ActorPartBlueprint N(bow_parts)[] = { .defenseTable = N(bow_defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -10, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/common/actor/ghost_goombario.inc.c b/src/battle/common/actor/ghost_goombario.inc.c index 1515d9fa4c..5adf923486 100644 --- a/src/battle/common/actor/ghost_goombario.inc.c +++ b/src/battle/common/actor/ghost_goombario.inc.c @@ -10,7 +10,7 @@ extern EvtScript N(goombario_handleEvent); #include "common/UnkActorSizeFunc.inc.c" #include "common/UnkEffect6CFunc.inc.c" -ApiStatus N(UnkTattleEffectFunc1)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkTattleEffectFunc1)) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++); @@ -18,7 +18,7 @@ ApiStatus N(UnkTattleEffectFunc1)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(UnkTattleEffectFunc2)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkTattleEffectFunc2)) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++); @@ -81,8 +81,7 @@ ActorPartBlueprint N(goombario_parts)[] = { .defenseTable = N(goombario_defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -1, - .unk_1D = -9, + .projectileTargetOffset = { -1, -9 }, }, }; diff --git a/src/battle/common/actor/ghost_kooper.inc.c b/src/battle/common/actor/ghost_kooper.inc.c index 18f8433c63..11e2cddce6 100644 --- a/src/battle/common/actor/ghost_kooper.inc.c +++ b/src/battle/common/actor/ghost_kooper.inc.c @@ -77,8 +77,7 @@ ActorPartBlueprint N(kooper_parts)[] = { .defenseTable = N(kooper_defenseTable), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -16, + .projectileTargetOffset = { 0, -16 }, }, }; @@ -118,7 +117,7 @@ EvtScript N(kooper_init) = { #include "common/UnkBattleFunc1.inc.c" //TODO find the way to include it -ApiStatus N(kooper_UnkActorPosFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(kooper_UnkActorPosFunc)) { Actor* actor = get_actor(script->owner1.actorID); ActorState* actorState = &actor->state; @@ -152,11 +151,11 @@ EvtScript N(kooper_idle) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -2, 38) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -3, -9) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -3, -9) EVT_CALL(N(UnkBattleFunc1), -10, 25, 10, 25) EVT_CASE_EQ(1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -6) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -6) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_SWITCH EVT_WAIT(1) @@ -222,7 +221,7 @@ EvtScript N(kooper_handleEvent) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(kooper_defenseTable2))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(kooper_idleAnimations2))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -6) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -6) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_Hurt) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD @@ -373,7 +372,7 @@ EvtScript N(kooper_takeTurn) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(kooper_defenseTable))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(kooper_idleAnimations))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -2, 38) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -3, -9) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -3, -9) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) diff --git a/src/battle/common/actor/ghost_lakilester.inc.c b/src/battle/common/actor/ghost_lakilester.inc.c index cfe79875e7..fbb1d467a3 100644 --- a/src/battle/common/actor/ghost_lakilester.inc.c +++ b/src/battle/common/actor/ghost_lakilester.inc.c @@ -64,8 +64,7 @@ ActorPartBlueprint N(lakilester_parts)[] = { .defenseTable = N(lakilester_defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -2, - .unk_1D = -10, + .projectileTargetOffset = { -2, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -77,8 +76,7 @@ ActorPartBlueprint N(lakilester_parts)[] = { .defenseTable = N(lakilester_defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/common/actor/ghost_parakarry.inc.c b/src/battle/common/actor/ghost_parakarry.inc.c index 5ccfda6012..e93d807b9e 100644 --- a/src/battle/common/actor/ghost_parakarry.inc.c +++ b/src/battle/common/actor/ghost_parakarry.inc.c @@ -59,8 +59,7 @@ ActorPartBlueprint N(parakarry_parts)[] = { .defenseTable = N(parakarry_defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -16, + .projectileTargetOffset = { 0, -16 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -72,8 +71,7 @@ ActorPartBlueprint N(parakarry_parts)[] = { .defenseTable = N(parakarry_defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -16, + .projectileTargetOffset = { 0, -16 }, }, }; diff --git a/src/battle/common/actor/ghost_sushie.inc.c b/src/battle/common/actor/ghost_sushie.inc.c index 91cdb87529..42f132f020 100644 --- a/src/battle/common/actor/ghost_sushie.inc.c +++ b/src/battle/common/actor/ghost_sushie.inc.c @@ -59,8 +59,7 @@ ActorPartBlueprint N(sushie_parts)[] = { .defenseTable = N(sushie_defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -12, + .projectileTargetOffset = { 0, -12 }, }, }; diff --git a/src/battle/common/actor/ghost_watt.inc.c b/src/battle/common/actor/ghost_watt.inc.c index b3889b9b5c..36d977c7c1 100644 --- a/src/battle/common/actor/ghost_watt.inc.c +++ b/src/battle/common/actor/ghost_watt.inc.c @@ -4,7 +4,7 @@ #include "sprite/npc/BattleWatt.h" #include "effects.h" -ApiStatus N(UnkWattEffectFunc1)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkWattEffectFunc1)) { WattEffectData* wattEffectData; f32 x, y, z; Actor* actor = get_actor(script->owner1.enemyID); @@ -91,7 +91,7 @@ ApiStatus N(UnkWattEffectFunc1)(Evt* script, s32 isInitialCall) { -ApiStatus N(UnkWattEffectFunc2)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkWattEffectFunc2)) { WattEffectData* wattEffectData = get_actor(script->owner1.enemyID)->state.varTablePtr[2]; wattEffectData->flags = FALSE; @@ -107,7 +107,7 @@ ApiStatus N(UnkWattEffectFunc2)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(UnkWattEffectFunc3)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkWattEffectFunc3)) { Bytecode* args = script->ptrReadPos; WattEffectData* wattEffectData = get_actor(script->owner1.enemyID)->state.varTablePtr[2]; @@ -115,7 +115,7 @@ ApiStatus N(UnkWattEffectFunc3)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(UnkWattEffectFunc4)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkWattEffectFunc4)) { Bytecode* args = script->ptrReadPos; WattEffectData* wattEffectData = get_actor(script->owner1.enemyID)->state.varTablePtr[2]; @@ -123,7 +123,7 @@ ApiStatus N(UnkWattEffectFunc4)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(UnkWattEffectFunc5)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UnkWattEffectFunc5)) { Bytecode* args = script->ptrReadPos; WattEffectData* wattEffectData = get_actor(script->owner1.enemyID)->state.varTablePtr[2]; @@ -195,8 +195,7 @@ ActorPartBlueprint N(watt_parts)[] = { .defenseTable = N(watt_defenseTable), .eventFlags = ACTOR_EVENT_FLAG_ELECTRIFIED, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -208,8 +207,7 @@ ActorPartBlueprint N(watt_parts)[] = { .defenseTable = N(watt_defenseTable), .eventFlags = ACTOR_EVENT_FLAG_ELECTRIFIED, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, }; diff --git a/src/battle/common/actor/goomba.inc.c b/src/battle/common/actor/goomba.inc.c index aa2636783c..450ac8c7f5 100644 --- a/src/battle/common/actor/goomba.inc.c +++ b/src/battle/common/actor/goomba.inc.c @@ -47,7 +47,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/common/actor/gray_magikoopa.inc.c b/src/battle/common/actor/gray_magikoopa.inc.c index 5c377d6b12..6d213f8db5 100644 --- a/src/battle/common/actor/gray_magikoopa.inc.c +++ b/src/battle/common/actor/gray_magikoopa.inc.c @@ -86,8 +86,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -5, - .unk_1D = -12, + .projectileTargetOffset = { -5, -12 }, }, }; @@ -102,8 +101,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -5, - .unk_1D = -12, + .projectileTargetOffset = { -5, -12 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -115,8 +113,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = ACTOR_EVENT_FLAG_800000, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -128,8 +125,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/common/actor/green_magikoopa.inc.c b/src/battle/common/actor/green_magikoopa.inc.c index dd350d9014..1ee4f679a2 100644 --- a/src/battle/common/actor/green_magikoopa.inc.c +++ b/src/battle/common/actor/green_magikoopa.inc.c @@ -88,8 +88,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -5, - .unk_1D = -12, + .projectileTargetOffset = { -5, -12 }, }, }; @@ -104,8 +103,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -5, - .unk_1D = -12, + .projectileTargetOffset = { -5, -12 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -117,8 +115,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = ACTOR_EVENT_FLAG_800000, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -130,8 +127,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/common/actor/hammer_bro.inc.c b/src/battle/common/actor/hammer_bro.inc.c index 3ee192e842..bc7dbd427b 100644 --- a/src/battle/common/actor/hammer_bro.inc.c +++ b/src/battle/common/actor/hammer_bro.inc.c @@ -67,8 +67,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -3, - .unk_1D = -10, + .projectileTargetOffset = { -3, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -80,8 +79,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -93,8 +91,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -106,8 +103,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -119,8 +115,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -132,8 +127,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -175,16 +169,16 @@ EvtScript N(idle) = { EVT_SWITCH(LVar0) EVT_CASE_FLAG(STATUS_FLAG_SLEEP) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CASE_DEFAULT EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 35) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -3, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -3, -10) EVT_CASE_EQ(1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_END_SWITCH EVT_END_SWITCH EVT_WAIT(1) diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index 97b154a86b..67e50e9d06 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -57,7 +57,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1D = 249, + .projectileTargetOffset = { 0, -7 }, }, }; @@ -143,16 +143,16 @@ EvtScript N(8021CBD8) = { EVT_CASE_EQ(0) EVT_IF_FLAG(LVar1, STATUS_FLAG_SLEEP | STATUS_FLAG_DIZZY) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -4) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(N(UnkBattleFunc1), -15, 32, 5, 32) EVT_END_IF EVT_CASE_EQ(1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_SWITCH EVT_RETURN @@ -285,7 +285,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Hurt) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -484,7 +484,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -4) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 0) EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) EVT_END_IF diff --git a/src/battle/common/actor/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c index f117bc699a..e2db7ac7fe 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -151,8 +151,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -12, + .projectileTargetOffset = { 0, -12 }, }, }; @@ -222,20 +221,20 @@ EvtScript N(update_unknown) = { EVT_CASE_EQ(N(STATE_NORMAL)) EVT_IF_FLAG(LVar1, STATUS_FLAG_SLEEP | STATUS_FLAG_DIZZY) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -4) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(N(UnkBattleFunc1), -15, 32, 5, 32) EVT_END_IF EVT_CASE_EQ(N(STATE_FLIPPED)) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CASE_EQ(N(STATE_CHARGED)) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 20) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -6) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -6) EVT_CALL(N(UnkBattleFunc1), -15, 22, 5, 22) EVT_END_SWITCH EVT_RETURN @@ -404,7 +403,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim0B) @@ -680,7 +679,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -4) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 1) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 0) EVT_END_IF diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index 59b95463e3..ac79bc79ae 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -114,8 +114,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -5, - .unk_1D = -12, + .projectileTargetOffset = { -5, -12 }, }, }; @@ -130,8 +129,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -5, - .unk_1D = -12, + .projectileTargetOffset = { -5, -12 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -143,8 +141,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = ACTOR_EVENT_FLAG_800000, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -156,8 +153,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -1327,8 +1323,7 @@ ActorPartBlueprint N(parts_clone)[] = { .defenseTable = N(defenseTable_clone), .eventFlags = ACTOR_EVENT_FLAG_ILLUSORY, .elementImmunityFlags = 0, - .unk_1C = -5, - .unk_1D = -12, + .projectileTargetOffset = { -5, -12 }, }, }; @@ -1343,8 +1338,7 @@ ActorPartBlueprint N(parts_clone_flying)[] = { .defenseTable = N(defenseTable_clone_flying), .eventFlags = ACTOR_EVENT_FLAG_ILLUSORY, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, }; diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index ee3cb86bc1..96029bf0bb 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -68,8 +68,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xFB, + .projectileTargetOffset = { -1, -5 }, }, }; @@ -113,11 +112,11 @@ EvtScript N(idle) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -2, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -5) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -5) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -2, 38) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -5) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -5) EVT_CALL(N(UnkBattleFunc1), -10, 20, 12, 31) EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/common/actor/monty_mole.inc.c b/src/battle/common/actor/monty_mole.inc.c index 7814f8ca04..13490d777b 100644 --- a/src/battle/common/actor/monty_mole.inc.c +++ b/src/battle/common/actor/monty_mole.inc.c @@ -51,7 +51,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 249, + .projectileTargetOffset = { 0, -7 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET | ACTOR_PART_FLAG_80000000, @@ -63,7 +63,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 249, + .projectileTargetOffset = { 0, -7 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -75,7 +75,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -142,7 +142,7 @@ ActorPartBlueprint N(parts_hole)[] = { .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index ae05a19031..6dd645fad7 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -82,7 +82,7 @@ ActorPartBlueprint N(partsTable_8021B280)[] = { .defenseTable = N(defenseTable_8021B110), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -94,7 +94,7 @@ ActorPartBlueprint N(partsTable_8021B280)[] = { .defenseTable = N(defenseTable_8021B11C), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -106,7 +106,7 @@ ActorPartBlueprint N(partsTable_8021B280)[] = { .defenseTable = N(defenseTable_8021B110), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -118,7 +118,7 @@ ActorPartBlueprint N(partsTable_8021B280)[] = { .defenseTable = N(defenseTable_8021B110), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index 5718c4b80e..1572060908 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -90,7 +90,7 @@ ActorPartBlueprint N(partsTable_8021EC6C)[] = { .defenseTable = N(defenseTable_8021EAD0), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1D = 249, + .projectileTargetOffset = { 0, -7 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -102,8 +102,7 @@ ActorPartBlueprint N(partsTable_8021EC6C)[] = { .defenseTable = N(defenseTable_8021EAFC), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, - .unk_1C = 2, - .unk_1D = 0xF2, + .projectileTargetOffset = { 2, -14 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -115,7 +114,7 @@ ActorPartBlueprint N(partsTable_8021EC6C)[] = { .defenseTable = N(defenseTable_8021EAD0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 246, + .projectileTargetOffset = { 0, -10 }, }, }; @@ -208,11 +207,11 @@ EvtScript N(init_8021EE0C) = { EvtScript N(8021EE84) = { EVT_IF_FLAG(LVar1, 0x00041000) EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, 0, 25) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 2, 3, -6) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, 3, -6) EVT_CALL(N(UnkBattleFunc1), -19, 25, 4, 28) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, -2, 36) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 2, 0, -7) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, 0, -7) EVT_CALL(N(UnkBattleFunc1), -10, 29, 8, 30) EVT_END_IF EVT_RETURN @@ -697,16 +696,16 @@ EvtScript N(80220BE8) = { EVT_CASE_EQ(0) EVT_IF_FLAG(LVar1, 0x00041000) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -4) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(N(UnkBattleFunc1), -15, 32, 5, 32) EVT_END_IF EVT_CASE_EQ(1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_SWITCH EVT_RETURN @@ -843,7 +842,7 @@ EvtScript N(handleEvent_80221228) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8021EB08))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220B38))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Hurt) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -1042,7 +1041,7 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220AA0))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8021EAD0))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -4) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 0) EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) EVT_END_IF diff --git a/src/battle/common/actor/pokey.inc.c b/src/battle/common/actor/pokey.inc.c index cb09b4db5e..8cc8a3a2b8 100644 --- a/src/battle/common/actor/pokey.inc.c +++ b/src/battle/common/actor/pokey.inc.c @@ -73,7 +73,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, @@ -85,7 +85,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1D = 248, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -97,7 +97,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1D = 248, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -109,7 +109,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1D = 248, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -121,7 +121,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1D = 248, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -133,7 +133,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/common/actor/putrid_piranha.inc.c b/src/battle/common/actor/putrid_piranha.inc.c index 9fd5414c8b..8a7164ea3b 100644 --- a/src/battle/common/actor/putrid_piranha.inc.c +++ b/src/battle/common/actor/putrid_piranha.inc.c @@ -65,8 +65,7 @@ ActorPartBlueprint N(partsTable_8021B1AC)[] = { .defenseTable = N(defenseTable_8021B0EC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 3, - .unk_1D = 0xF2, + .projectileTargetOffset = { 3, -14 }, }, }; @@ -108,11 +107,11 @@ EvtScript N(idle_8021B244) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, STATUS_FLAG_DIZZY) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -27, 33) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 5, -11) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 5, -11) EVT_CALL(N(UnkBattleFunc1), -37, 9, -7, 31) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -15, 50) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 3, -14) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 3, -14) EVT_CALL(N(UnkBattleFunc1), -22, 32, 1, 44) EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/common/actor/red_magikoopa.inc.c b/src/battle/common/actor/red_magikoopa.inc.c index 4b609bc57b..106e9b4bea 100644 --- a/src/battle/common/actor/red_magikoopa.inc.c +++ b/src/battle/common/actor/red_magikoopa.inc.c @@ -86,8 +86,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -5, - .unk_1D = -12, + .projectileTargetOffset = { -5, -12 }, }, }; @@ -102,8 +101,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = ACTOR_EVENT_FLAG_800000, .elementImmunityFlags = 0, - .unk_1C = -5, - .unk_1D = -12, + .projectileTargetOffset = { -5, -12 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -115,8 +113,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -128,8 +125,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/common/actor/red_shy_guy.inc.c b/src/battle/common/actor/red_shy_guy.inc.c index bb3cfd75f4..07a3c3e19f 100644 --- a/src/battle/common/actor/red_shy_guy.inc.c +++ b/src/battle/common/actor/red_shy_guy.inc.c @@ -51,8 +51,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFF, - .unk_1D = 0xF6, + .projectileTargetOffset = { -1, -10 }, }, }; @@ -107,11 +106,11 @@ EvtScript N(idle) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 14) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(N(UnkBattleFunc1), -10, 13, 10, 13) EVT_ELSE EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/common/actor/slot_machine.inc.c b/src/battle/common/actor/slot_machine.inc.c index d8747019a0..cc3cdbe3fe 100644 --- a/src/battle/common/actor/slot_machine.inc.c +++ b/src/battle/common/actor/slot_machine.inc.c @@ -54,7 +54,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -104,7 +104,7 @@ ActorBlueprint N(slot_machine_start) = { .statusMessageOffset = { 10, 20 }, }; -ApiStatus N(IsDemoBattle)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(IsDemoBattle)) { script->varTable[0] = 0; if (gGameStatusPtr->demoFlags & 1) { script->varTable[0] = 1; @@ -113,7 +113,7 @@ ApiStatus N(IsDemoBattle)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(Add1Coin)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(Add1Coin)) { add_coins(1); return ApiStatus_DONE2; } diff --git a/src/battle/common/actor/spike_top.inc.c b/src/battle/common/actor/spike_top.inc.c index f07eafb05e..09485693ba 100644 --- a/src/battle/common/actor/spike_top.inc.c +++ b/src/battle/common/actor/spike_top.inc.c @@ -60,7 +60,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, - .unk_1D = 14, + .projectileTargetOffset = { 0, 14 }, }, }; @@ -139,7 +139,7 @@ EvtScript N(init) = { EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -9) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(spikeTop_TakeTurn_Floor))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(spikeTop_HandleEvent_Floor))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021C9D0))) @@ -162,7 +162,7 @@ EvtScript N(spikeTop_FallDown) = { EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 1, 20) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -3, -8) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -3, -8) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(spikeTop_TakeTurn_Floor))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(spikeTop_HandleEvent_Floor))) @@ -371,7 +371,7 @@ EvtScript N(spikeTop_HandleEvent_Floor) = { EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 1, 20) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -3, -8) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -3, -8) EVT_CALL(SetActorVar, ACTOR_SELF, 9, 1) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8021C8CC))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021CA68))) @@ -551,7 +551,7 @@ EvtScript N(spikeTop_TakeTurn_Ceiling) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -9) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(spikeTop_TakeTurn_Floor))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(spikeTop_HandleEvent_Floor))) @@ -710,7 +710,7 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, -1, -9) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021C9D0))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) diff --git a/src/battle/common/actor/spiked_goomba.inc.c b/src/battle/common/actor/spiked_goomba.inc.c index 6d8d519909..00edea7ad9 100644 --- a/src/battle/common/actor/spiked_goomba.inc.c +++ b/src/battle/common/actor/spiked_goomba.inc.c @@ -48,7 +48,7 @@ ActorPartBlueprint N(partsTable_8021E468)[] = { .defenseTable = N(defenseTable_8021E3B0), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, - .unk_1D = 244, + .projectileTargetOffset = { 0, -12 }, }, }; diff --git a/src/battle/common/actor/spiny.inc.c b/src/battle/common/actor/spiny.inc.c index 8b8c6bba54..febd537f7f 100644 --- a/src/battle/common/actor/spiny.inc.c +++ b/src/battle/common/actor/spiny.inc.c @@ -87,8 +87,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -4, + .projectileTargetOffset = { 0, -4 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -100,8 +99,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/common/actor/swooper.inc.c b/src/battle/common/actor/swooper.inc.c index 10d93c8d3d..15a7fe9238 100644 --- a/src/battle/common/actor/swooper.inc.c +++ b/src/battle/common/actor/swooper.inc.c @@ -50,8 +50,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 1, - .unk_1D = 15, + .projectileTargetOffset = { 1, 15 }, }, }; @@ -267,7 +266,7 @@ EvtScript N(knockDown) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_END_IF - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -10) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 22) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flying))) diff --git a/src/battle/common/actor/swoopula.inc.c b/src/battle/common/actor/swoopula.inc.c index 0597e01e39..b83209bcd4 100644 --- a/src/battle/common/actor/swoopula.inc.c +++ b/src/battle/common/actor/swoopula.inc.c @@ -53,8 +53,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 1, - .unk_1D = 15, + .projectileTargetOffset = { 1, 15 }, }, }; @@ -270,7 +269,7 @@ EvtScript N(knockDown) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_END_IF - EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, -10) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -10) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 22) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flying))) diff --git a/src/battle/common/actor/whacka.inc.c b/src/battle/common/actor/whacka.inc.c index 0358c8bd3b..de37ad48c5 100644 --- a/src/battle/common/actor/whacka.inc.c +++ b/src/battle/common/actor/whacka.inc.c @@ -64,7 +64,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1D = 251, + .projectileTargetOffset = { 0, -5 }, }, }; @@ -91,7 +91,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 30 }, }; -ApiStatus N(IsHitEightTimes)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(IsHitEightTimes)) { script->varTable[0] = 0; if (evt_get_variable(NULL, GB_IWA00_Whacka_HitCount) >= 8) { script->varTable[0] = 1; diff --git a/src/battle/common/actor/white_clubba.inc.c b/src/battle/common/actor/white_clubba.inc.c index 06894079ae..364450cf88 100644 --- a/src/battle/common/actor/white_clubba.inc.c +++ b/src/battle/common/actor/white_clubba.inc.c @@ -64,8 +64,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, - .unk_1C = 8, - .unk_1D = -3, + .projectileTargetOffset = { 8, -3 }, }, }; diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c index 8391ef8a03..ed26889c6b 100644 --- a/src/battle/common/actor/white_magikoopa.inc.c +++ b/src/battle/common/actor/white_magikoopa.inc.c @@ -83,8 +83,7 @@ ActorPartBlueprint N(partsTable_80223C90)[] = { .defenseTable = N(defenseTable_80223B20), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFB, - .unk_1D = 0xF4, + .projectileTargetOffset = { -5, -12 }, }, }; @@ -99,8 +98,7 @@ ActorPartBlueprint N(partsTable_80223CB4)[] = { .defenseTable = N(defenseTable_80223B2C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0xFB, - .unk_1D = 0xF4, + .projectileTargetOffset = { -5, -12 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -112,7 +110,7 @@ ActorPartBlueprint N(partsTable_80223CB4)[] = { .defenseTable = N(defenseTable_80223B2C), .eventFlags = ACTOR_EVENT_FLAG_800000, .elementImmunityFlags = 0, - .unk_1D = 248, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -124,7 +122,7 @@ ActorPartBlueprint N(partsTable_80223CB4)[] = { .defenseTable = N(defenseTable_80223B2C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/common/actor/yellow_magikoopa.inc.c b/src/battle/common/actor/yellow_magikoopa.inc.c index 0eff327339..a4ef69dcb5 100644 --- a/src/battle/common/actor/yellow_magikoopa.inc.c +++ b/src/battle/common/actor/yellow_magikoopa.inc.c @@ -85,8 +85,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -5, - .unk_1D = -12, + .projectileTargetOffset = { -5, -12 }, }, }; @@ -101,8 +100,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = -5, - .unk_1D = -12, + .projectileTargetOffset = { -5, -12 }, }, { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -114,8 +112,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = ACTOR_EVENT_FLAG_800000, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = -8, + .projectileTargetOffset = { 0, -8 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, @@ -127,8 +124,7 @@ ActorPartBlueprint N(parts_flying)[] = { .defenseTable = N(defenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/move/auto_smash/auto_smash.c b/src/battle/common/move/HammerSupport.inc.c similarity index 73% rename from src/battle/move/auto_smash/auto_smash.c rename to src/battle/common/move/HammerSupport.inc.c index 25cc224540..37b0d06fb5 100644 --- a/src/battle/move/auto_smash/auto_smash.c +++ b/src/battle/common/move/HammerSupport.inc.c @@ -2,19 +2,17 @@ #include "script_api/battle.h" #include "battle/action_cmd/hammer.h" -#define NAMESPACE battle_move_auto_smash - #include "world/common/todo/IsBerserkerEquipped.inc.c" #include "world/common/todo/ShouldMovesAutoSucceed.inc.c" -EvtScript N(EVS_802A10B0) = { +EvtScript N(EVS_HammerSupport_A) = { EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 32) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(UseBattleCamPreset, 26) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) EVT_CALL(PlayerRunToGoal, 0) @@ -22,9 +20,9 @@ EvtScript N(EVS_802A10B0) = { EVT_END }; -EvtScript N(EVS_802A118C) = { +EvtScript N(EVS_HammerSupport_B) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, -33, 0, 0) - EVT_CALL(UseBattleCamPreset, 26) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) EVT_CALL(PlayerRunToGoal, 0) @@ -32,7 +30,7 @@ EvtScript N(EVS_802A118C) = { EVT_END }; -EvtScript N(EVS_802A1204) = { +EvtScript N(EVS_HammerSupport_C) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_SET(LVar1, 0) @@ -63,7 +61,7 @@ EvtScript N(EVS_802A1204) = { EVT_END }; -EvtScript N(EVS_802A1388) = { +EvtScript N(EVS_HammerSupport_D) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_SET(LVar1, 0) @@ -94,7 +92,7 @@ EvtScript N(EVS_802A1388) = { EVT_END }; -EvtScript N(EVS_802A150C) = { +EvtScript N(EVS_HammerSupport_E) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_SET(LVar1, 0) @@ -125,8 +123,8 @@ EvtScript N(EVS_802A150C) = { EVT_END }; -EvtScript N(EVS_802A1690) = { - EVT_CALL(UseBattleCamPreset, 43) +EvtScript N(EVS_HammerSupport_F) = { + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) @@ -151,22 +149,22 @@ EvtScript N(EVS_802A1690) = { EVT_END_IF EVT_END_LOOP EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_EQ(LVar0, TRUE) - EVT_GOTO(0) - EVT_END_IF + EVT_WAIT(1) + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(0) + EVT_END_IF EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30011) EVT_WAIT(3) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30012) - EVT_CALL(UseBattleCamPreset, 44) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) EVT_RETURN EVT_END }; -EvtScript N(EVS_802A18AC) = { +EvtScript N(EVS_Hammer_ReturnHome_A) = { EVT_CALL(func_80276EFC) - EVT_CALL(UseBattleCamPreset, 4) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(func_802693F0) EVT_WAIT(20) @@ -182,7 +180,7 @@ EvtScript N(EVS_802A18AC) = { EVT_END }; -EvtScript N(EVS_802A1998) = { +EvtScript N(EVS_Hammer_ReturnHome_B) = { EVT_CALL(func_80276EFC) EVT_CALL(func_802693F0) EVT_WAIT(20) @@ -198,9 +196,9 @@ EvtScript N(EVS_802A1998) = { EVT_END }; -EvtScript N(EVS_802A1A64) = { +EvtScript N(EVS_Hammer_ReturnHome_C) = { EVT_CALL(func_80276EFC) - EVT_CALL(UseBattleCamPreset, 29) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_29) EVT_CALL(func_802693F0) EVT_WAIT(20) EVT_CALL(EnablePlayerBlur, -1) @@ -215,15 +213,15 @@ EvtScript N(EVS_802A1A64) = { EVT_END }; -EvtScript N(EVS_802A1B40) = { +EvtScript N(EVS_UseBasicHammer) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(N(EVS_802A10B0)) + EVT_EXEC_WAIT(N(EVS_HammerSupport_A)) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(N(EVS_802A1204)) + EVT_EXEC_WAIT(N(EVS_HammerSupport_C)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, 16) - EVT_CALL(UseBattleCamPreset, 43) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) @@ -264,14 +262,14 @@ EvtScript N(EVS_802A1B40) = { EVT_END_IF EVT_END_LOOP EVT_LABEL(0) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_LT(LVar0, 2) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) + EVT_CALL(GetActionCommandMode, LVar0) + EVT_IF_LT(LVar0, 2) + EVT_WAIT(1) + EVT_CALL(GetActionSuccess, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(0) + EVT_END_IF EVT_END_IF - EVT_END_IF EVT_ELSE EVT_CALL(action_command_hammer_start, 0, LVar1, 3) EVT_CALL(SetActionResult, 0) @@ -301,15 +299,15 @@ EvtScript N(EVS_802A1B40) = { EVT_END }; -EvtScript N(EVS_802A2000) = { +EvtScript N(EVS_UseSuperHammer) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(N(EVS_802A10B0)) + EVT_EXEC_WAIT(N(EVS_HammerSupport_A)) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(N(EVS_802A1388)) + EVT_EXEC_WAIT(N(EVS_HammerSupport_D)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, BS_FLAGS1_10) - EVT_CALL(UseBattleCamPreset, 43) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) @@ -347,11 +345,11 @@ EvtScript N(EVS_802A2000) = { EVT_END_IF EVT_END_LOOP EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF + EVT_WAIT(1) + EVT_CALL(GetActionSuccess, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(0) + EVT_END_IF EVT_ELSE EVT_CALL(action_command_hammer_start, 0, LVar1, 3) EVT_CALL(SetActionResult, 0) @@ -370,15 +368,15 @@ EvtScript N(EVS_802A2000) = { EVT_END }; -EvtScript N(EVS_802A23E8) = { +EvtScript N(EVS_UseUltraHammer) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(N(EVS_802A10B0)) + EVT_EXEC_WAIT(N(EVS_HammerSupport_A)) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(N(EVS_802A150C)) + EVT_EXEC_WAIT(N(EVS_HammerSupport_E)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, BS_FLAGS1_10) - EVT_CALL(UseBattleCamPreset, 43) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) @@ -416,11 +414,11 @@ EvtScript N(EVS_802A23E8) = { EVT_END_IF EVT_END_LOOP EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF + EVT_WAIT(1) + EVT_CALL(GetActionSuccess, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(0) + EVT_END_IF EVT_ELSE EVT_CALL(action_command_hammer_start, 0, LVar1, 3) EVT_CALL(SetActionResult, 0) @@ -439,15 +437,15 @@ EvtScript N(EVS_802A23E8) = { EVT_END }; -EvtScript N(EVS_802A27D0) = { +EvtScript N(EVS_Hammer_UseBasicQuake) = { EVT_CALL(ChooseNextTarget, ITER_LAST, LVar0) EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(N(EVS_802A118C)) + EVT_EXEC_WAIT(N(EVS_HammerSupport_B)) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(N(EVS_802A1204)) - EVT_CALL(UseBattleCamPreset, 43) + EVT_EXEC_WAIT(N(EVS_HammerSupport_C)) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) EVT_CALL(AddBattleCamZoom, 80) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) @@ -483,11 +481,11 @@ EvtScript N(EVS_802A27D0) = { EVT_END_IF EVT_END_LOOP EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF + EVT_WAIT(1) + EVT_CALL(GetActionSuccess, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(0) + EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2115) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30011) EVT_WAIT(3) @@ -497,15 +495,15 @@ EvtScript N(EVS_802A27D0) = { EVT_END }; -EvtScript N(EVS_802A2AFC) = { +EvtScript N(EVS_Hammer_UseSuperQuake) = { EVT_CALL(ChooseNextTarget, ITER_LAST, LVar0) EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(N(EVS_802A118C)) + EVT_EXEC_WAIT(N(EVS_HammerSupport_B)) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(N(EVS_802A1388)) - EVT_CALL(UseBattleCamPreset, 43) + EVT_EXEC_WAIT(N(EVS_HammerSupport_D)) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) EVT_CALL(AddBattleCamZoom, 80) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) @@ -532,11 +530,11 @@ EvtScript N(EVS_802A2AFC) = { EVT_END_IF EVT_END_LOOP EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF + EVT_WAIT(1) + EVT_CALL(GetActionSuccess, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(0) + EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2116) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30018) EVT_WAIT(3) @@ -546,15 +544,15 @@ EvtScript N(EVS_802A2AFC) = { EVT_END }; -EvtScript N(EVS_802A2DA0) = { +EvtScript N(EVS_Hammer_UseUltraQuake) = { EVT_CALL(ChooseNextTarget, ITER_LAST, LVar0) EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(N(EVS_802A118C)) + EVT_EXEC_WAIT(N(EVS_HammerSupport_B)) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(N(EVS_802A150C)) - EVT_CALL(UseBattleCamPreset, 43) + EVT_EXEC_WAIT(N(EVS_HammerSupport_E)) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) EVT_CALL(AddBattleCamZoom, 80) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) @@ -581,11 +579,11 @@ EvtScript N(EVS_802A2DA0) = { EVT_END_IF EVT_END_LOOP EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF + EVT_WAIT(1) + EVT_CALL(GetActionSuccess, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(0) + EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2117) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001F) EVT_WAIT(3) @@ -594,128 +592,3 @@ EvtScript N(EVS_802A2DA0) = { EVT_RETURN EVT_END }; - -extern EvtScript N(UseMove_Impl); - -EvtScript N(UseMove) = { - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_AUTO_SUCCEED_ACTION, TRUE) - EVT_CALL(ShowActionHud, 1) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_SET(LVarD, 45) - EVT_SET(LVarE, 1) - EVT_SET(LVarF, 2) - EVT_EXEC_WAIT(N(UseMove_Impl)) - EVT_CASE_EQ(1) - EVT_SET(LVarD, 45) - EVT_SET(LVarE, 2) - EVT_SET(LVarF, 4) - EVT_EXEC_WAIT(N(UseMove_Impl)) - EVT_CASE_EQ(2) - EVT_SET(LVarD, 45) - EVT_SET(LVarE, 3) - EVT_SET(LVarF, 6) - EVT_EXEC_WAIT(N(UseMove_Impl)) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(UseMove_Impl) = { - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_EXEC_WAIT(N(EVS_802A1B40)) - EVT_CASE_EQ(1) - EVT_EXEC_WAIT(N(EVS_802A2000)) - EVT_CASE_EQ(2) - EVT_EXEC_WAIT(N(EVS_802A23E8)) - EVT_END_SWITCH - EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVar9, BS_FLAGS1_10) - EVT_CALL(GetActionSuccessCopy, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(StartRumble, 7) - EVT_THREAD - EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.3)) - EVT_END_THREAD - EVT_CASE_EQ(1) - EVT_CALL(StartRumble, 8) - EVT_THREAD - EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.6)) - EVT_END_THREAD - EVT_CASE_EQ(2) - EVT_CALL(StartRumble, 9) - EVT_THREAD - EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.9)) - EVT_END_THREAD - EVT_END_SWITCH - EVT_CASE_DEFAULT - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(StartRumble, 7) - EVT_THREAD - EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.3)) - EVT_END_THREAD - EVT_CASE_EQ(1) - EVT_CALL(StartRumble, 8) - EVT_THREAD - EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) - EVT_END_THREAD - EVT_CASE_EQ(2) - EVT_CALL(StartRumble, 9) - EVT_THREAD - EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.9)) - EVT_END_THREAD - EVT_END_SWITCH - EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) - EVT_WAIT(1) - EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) - EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_EXEC_WAIT(N(EVS_802A1A64)) - EVT_RETURN - EVT_END_IF - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(FALSE) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) - EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) - EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) - EVT_CASE_DEFAULT - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) - EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) - EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_EXEC_WAIT(N(EVS_802A18AC)) - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_HIT) - EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_EXEC_WAIT(N(EVS_802A1A64)) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; diff --git a/src/battle/move/auto_jump/auto_jump.c b/src/battle/common/move/JumpSupport.inc.c similarity index 60% rename from src/battle/move/auto_jump/auto_jump.c rename to src/battle/common/move/JumpSupport.inc.c index d9fd8f17c4..34ece3ef6c 100644 --- a/src/battle/move/auto_jump/auto_jump.c +++ b/src/battle/common/move/JumpSupport.inc.c @@ -2,12 +2,6 @@ #include "script_api/battle.h" #include "battle/action_cmd/jump.h" -#define NAMESPACE battle_move_auto_jump - -extern EvtScript D_802A26BC_7672DC; -extern EvtScript D_802A2A30_767650; -extern EvtScript D_802A2D5C_76797C; - s32 N(D_802A10F0)[] = { 9, 3, 9, 3, 9, 3, 8, 3, 7, 3, 6, 2, 5, 2, 4, 2, @@ -15,7 +9,7 @@ s32 N(D_802A10F0)[] = { #include "world/common/todo/UnkMoveFunc1.inc.c" -EvtScript N(CheckForAPress) = { +EvtScript N(EVS_CheckForAPress) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) EVT_LOOP(5) EVT_CALL(CheckButtonPress, BUTTON_A, LVar0) @@ -28,7 +22,7 @@ EvtScript N(CheckForAPress) = { EVT_END }; -EvtScript D_802A11AC_765DCC = { +EvtScript N(EVS_JumpSupport_A) = { EVT_CALL(SetGoalToFirstTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 40) @@ -46,13 +40,13 @@ EvtScript D_802A11AC_765DCC = { EVT_CALL(CancelablePlayerRunToGoal, 0, LVar0) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_EXEC_WAIT(N(CheckForAPress)) + EVT_EXEC_WAIT(N(EVS_CheckForAPress)) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) EVT_RETURN EVT_END }; -EvtScript D_802A1320_765F40 = { +EvtScript N(EVS_JumpSupport_B) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar6, LVar7, LVar8) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) @@ -70,7 +64,7 @@ EvtScript D_802A1320_765F40 = { EVT_END }; -EvtScript D_802A1408_766028 = { +EvtScript N(EVS_JumpSupport_C) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar6, LVar7, LVar8) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) @@ -88,7 +82,7 @@ EvtScript D_802A1408_766028 = { EVT_END }; -EvtScript D_802A14F0_766110 = { +EvtScript N(EVS_JumpSupport_D) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar6, LVar7, LVar8) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) @@ -106,7 +100,7 @@ EvtScript D_802A14F0_766110 = { EVT_END }; -EvtScript D_802A15D8_7661F8 = { +EvtScript N(EVS_JumpSupport_E) = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -135,7 +129,7 @@ EvtScript D_802A15D8_7661F8 = { EVT_END }; -EvtScript D_802A17C4 = { +EvtScript N(EVS_JumpSupport_F) = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -164,7 +158,7 @@ EvtScript D_802A17C4 = { EVT_END }; -EvtScript D_802A19B0 = { +EvtScript N(EVS_JumpSupport_G) = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_29) @@ -193,7 +187,7 @@ EvtScript D_802A19B0 = { EVT_END }; -EvtScript D_802A1B9C = { +EvtScript N(EVS_JumpSupport_H) = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -222,7 +216,7 @@ EvtScript D_802A1B9C = { EVT_END }; -EvtScript D_802A1D88 = { +EvtScript N(EVS_JumpSupport_I) = { EVT_CALL(func_80276EFC) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) EVT_CALL(EnablePlayerBlur, -1) @@ -258,10 +252,10 @@ EvtScript D_802A1D88 = { EVT_END }; -EvtScript D_802A1FEC_766C0C = { - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, 0, 0, 65548) +EvtScript N(EVS_JumpSupport_J) = { + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, 0, 0, ANIM_Mario_1000C) EVT_CALL(PlayerLandJump) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01000C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1000C) EVT_WAIT(2) EVT_CHILD_THREAD EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) @@ -285,26 +279,26 @@ EvtScript D_802A1FEC_766C0C = { EVT_END }; -EvtScript D_802A2184_766DA4 = { +EvtScript N(EVS_JumpSupport_K) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_EXEC_WAIT(D_802A11AC_765DCC) - EVT_EXEC_WAIT(D_802A1320_765F40) + EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) EVT_CALL(action_command_jump_start, LVarA, 3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, 196608) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) EVT_CALL(func_80274A18, LVarA, 0) EVT_RETURN EVT_END }; -EvtScript D_802A2230 = { +EvtScript N(EVS_JumpSupport_L) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_EXEC_WAIT(D_802A11AC_765DCC) + EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) EVT_CALL(InitTargetIterator) - EVT_EXEC_WAIT(D_802A1408_766028) + EVT_EXEC_WAIT(N(EVS_JumpSupport_C)) EVT_SET(LVarB, LVarA) EVT_ADD(LVarB, 14) EVT_ADD(LVarB, -3) @@ -325,11 +319,11 @@ EvtScript D_802A2230 = { EVT_END }; -EvtScript D_802A2384 = { +EvtScript N(EVS_JumpSupport_M) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_EXEC_WAIT(D_802A11AC_765DCC) - EVT_EXEC_WAIT(D_802A14F0_766110) + EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_D)) EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(D_802A10F0))) EVT_SET(LVarB, LVarA) EVT_SUB(LVarB, 4) @@ -337,14 +331,14 @@ EvtScript D_802A2384 = { EVT_CALL(action_command_jump_start, LVarB, 3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_38) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, 524288, 196608) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_80000, ANIM_Mario_30000) EVT_CALL(func_80275F00, LVarA, 0) EVT_CALL(CloseActionCommandInfo) EVT_SET(LVar9, 0) EVT_CALL(DidActionSucceed, LVar0) EVT_IF_GT(LVar0, 0) EVT_SET(LVar9, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030000) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30000) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) EVT_WAIT(2) @@ -366,190 +360,3 @@ EvtScript D_802A2384 = { EVT_RETURN EVT_END }; - -EvtScript N(main) = { - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_AUTO_SUCCEED_ACTION, 1) - EVT_CALL(ShowActionHud, 0) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 1) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_EXEC_WAIT(D_802A26BC_7672DC) - EVT_CASE_EQ(1) - EVT_EXEC_WAIT(D_802A2A30_767650) - EVT_CASE_EQ(2) - EVT_EXEC_WAIT(D_802A2D5C_76797C) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A26BC_7672DC = { - EVT_EXEC_WAIT(D_802A2184_766DA4) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_EQ(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL_WAIT_INPUT) - EVT_LOOP(0) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_LT(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_IF - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(D_802A1FEC_766C0C) - EVT_RETURN - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 1, BS_FLAGS1_40 | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_EXEC_WAIT(D_802A19B0) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CHILD_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) - EVT_WAIT(5) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) - EVT_END_CHILD_THREAD - EVT_CALL(func_80269524, LVarF) - EVT_CALL(CloseActionCommandInfo) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_CALL(ShowActionHud, 0) - EVT_CALL(action_command_jump_start, 24, 3) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, 65548) - EVT_CALL(func_80274A18, 24, 3) - EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 1, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(func_80269550, LVarF) - EVT_EXEC_WAIT(D_802A15D8_7661F8) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A2A30_767650 = { - EVT_EXEC_WAIT(D_802A2184_766DA4) - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(D_802A1FEC_766C0C) - EVT_RETURN - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 2, BS_FLAGS1_40 | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_EXEC_WAIT(D_802A19B0) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CALL(func_80269524, LVarF) - EVT_CHILD_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) - EVT_WAIT(5) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) - EVT_END_CHILD_THREAD - EVT_CALL(CloseActionCommandInfo) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_CALL(ShowActionHud, 0) - EVT_CALL(action_command_jump_start, 37, 3) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, 65546, 65547) - EVT_CALL(func_802752AC, 20, 4) - EVT_WAIT(7) - EVT_CALL(func_802752AC, 3, 5) - EVT_CALL(EnablePlayerBlur, 0) - EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 2, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(func_80269550, LVarF) - EVT_EXEC_WAIT(D_802A15D8_7661F8) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A2D5C_76797C = { - EVT_EXEC_WAIT(D_802A2184_766DA4) - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(D_802A1FEC_766C0C) - EVT_RETURN - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 3, BS_FLAGS1_40 | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_EXEC_WAIT(D_802A19B0) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CALL(func_80269524, LVarF) - EVT_CHILD_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) - EVT_WAIT(5) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) - EVT_END_CHILD_THREAD - EVT_CALL(CloseActionCommandInfo) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_CALL(ShowActionHud, 0) - EVT_CALL(action_command_jump_start, 25, 3) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) - EVT_CALL(func_80275F00, 25, 4) - EVT_CALL(EnablePlayerBlur, 0) - EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 3, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(func_80269550, LVarF) - EVT_EXEC_WAIT(D_802A15D8_7661F8) - EVT_RETURN - EVT_END -}; diff --git a/src/battle/star/common/peach_star_beam.inc.c b/src/battle/common/move/StarBeamSupport.inc.c similarity index 99% rename from src/battle/star/common/peach_star_beam.inc.c rename to src/battle/common/move/StarBeamSupport.inc.c index 173542945e..572acb2077 100644 --- a/src/battle/star/common/peach_star_beam.inc.c +++ b/src/battle/common/move/StarBeamSupport.inc.c @@ -3,8 +3,8 @@ #include "common/StarPower.inc.c" -ApiStatus N(GetStage)(Evt* script, s32 isInitialCall); -ApiStatus N(starBeam2)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(GetStage)); +API_CALLABLE(N(starBeam2)); EvtScript N(802A24F0) = { EVT_CALL(GetOwnerID, LVarA) @@ -296,7 +296,7 @@ static s32 N(miscParticlesTimeLeft)[8]; static s32 N(spiritsMoveTime)[8]; static s32 N(starBeamStage); -ApiStatus N(ProcessPeachStarBeam)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ProcessPeachStarBeam)) { PeachStarBeamFXData* effectData; PeachStarBeamSpirit* spirit; Bytecode* args = script->ptrReadPos; @@ -746,12 +746,12 @@ ApiStatus N(ProcessPeachStarBeam)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(GetStage)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetStage)) { script->varTable[0] = N(starBeamStage); return ApiStatus_DONE2; } -ApiStatus N(unkStarBeamBgFunc)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(unkStarBeamBgFunc)) { if (isInitialCall) { script->functionTemp[0] = 230; } diff --git a/src/battle/formation_names.h b/src/battle/formation_names.h new file mode 100644 index 0000000000..c54aec8e13 --- /dev/null +++ b/src/battle/formation_names.h @@ -0,0 +1,565 @@ +enum BattleNames { + BTL_KMR_1_FORMATION_00 = 0x0000, + BTL_KMR_1_FORMATION_01 = 0x0001, + BTL_KMR_1_FORMATION_02 = 0x0002, + BTL_KMR_1_FORMATION_03 = 0x0003, + BTL_KMR_1_FORMATION_04 = 0x0004, + BTL_KMR_1_FORMATION_05 = 0x0005, + BTL_KMR_1_FORMATION_06 = 0x0006, + BTL_KMR_1_FORMATION_07 = 0x0007, + BTL_KMR_1_FORMATION_08 = 0x0008, + BTL_KMR_1_FORMATION_09 = 0x0009, + BTL_KMR_1_FORMATION_0A = 0x000A, + BTL_KMR_1_FORMATION_0B = 0x000B, + BTL_KMR_2_FORMATION_00 = 0x0100, + BTL_KMR_2_FORMATION_01 = 0x0101, + BTL_KMR_3_FORMATION_00 = 0x0200, + BTL_KMR_3_FORMATION_01 = 0x0201, + BTL_KMR_3_FORMATION_02 = 0x0202, + BTL_KMR_3_FORMATION_03 = 0x0203, + BTL_KMR_3_FORMATION_04 = 0x0204, + BTL_KMR_3_FORMATION_05 = 0x0205, + BTL_KMR_3_FORMATION_06 = 0x0206, + BTL_KMR_3_FORMATION_07 = 0x0207, + BTL_MAC_FORMATION_00 = 0x0300, + BTL_MAC_FORMATION_01 = 0x0301, + BTL_MAC_FORMATION_02 = 0x0302, + BTL_MAC_FORMATION_03 = 0x0303, + BTL_MAC_FORMATION_04 = 0x0304, + BTL_MAC_FORMATION_05 = 0x0305, + BTL_MAC_FORMATION_06 = 0x0306, + BTL_MAC_FORMATION_07 = 0x0307, + BTL_MAC_FORMATION_08 = 0x0308, + BTL_MAC_FORMATION_09 = 0x0309, + BTL_MAC_FORMATION_0A = 0x030A, + BTL_MAC_FORMATION_0B = 0x030B, + BTL_MAC_FORMATION_0C = 0x030C, + BTL_HOS_FORMATION_00 = 0x0400, + BTL_HOS_FORMATION_01 = 0x0401, + BTL_HOS_FORMATION_02 = 0x0402, + BTL_HOS_FORMATION_03 = 0x0403, + BTL_HOS_FORMATION_04 = 0x0404, + BTL_HOS_FORMATION_05 = 0x0405, + BTL_HOS_FORMATION_06 = 0x0406, + BTL_NOK_FORMATION_00 = 0x0500, + BTL_NOK_FORMATION_01 = 0x0501, + BTL_NOK_FORMATION_02 = 0x0502, + BTL_NOK_FORMATION_03 = 0x0503, + BTL_NOK_FORMATION_04 = 0x0504, + BTL_NOK_FORMATION_05 = 0x0505, + BTL_NOK_FORMATION_06 = 0x0506, + BTL_NOK_FORMATION_07 = 0x0507, + BTL_NOK_FORMATION_08 = 0x0508, + BTL_NOK_FORMATION_09 = 0x0509, + BTL_NOK_FORMATION_0A = 0x050A, + BTL_NOK_FORMATION_0B = 0x050B, + BTL_NOK_FORMATION_0C = 0x050C, + BTL_NOK_FORMATION_0D = 0x050D, + BTL_NOK_FORMATION_0E = 0x050E, + BTL_NOK_FORMATION_0F = 0x050F, + BTL_NOK_FORMATION_10 = 0x0510, + BTL_NOK_FORMATION_11 = 0x0511, + BTL_NOK_FORMATION_12 = 0x0512, + BTL_NOK_FORMATION_13 = 0x0513, + BTL_NOK_FORMATION_14 = 0x0514, + BTL_NOK_FORMATION_15 = 0x0515, + BTL_NOK_FORMATION_16 = 0x0516, + BTL_NOK_FORMATION_17 = 0x0517, + BTL_NOK_FORMATION_18 = 0x0518, + BTL_TRD_1_FORMATION_00 = 0x0600, + BTL_TRD_1_FORMATION_01 = 0x0601, + BTL_TRD_1_FORMATION_02 = 0x0602, + BTL_TRD_1_FORMATION_03 = 0x0603, + BTL_TRD_1_FORMATION_04 = 0x0604, + BTL_TRD_1_FORMATION_05 = 0x0605, + BTL_TRD_1_FORMATION_06 = 0x0606, + BTL_TRD_1_FORMATION_07 = 0x0607, + BTL_TRD_1_FORMATION_08 = 0x0608, + BTL_TRD_1_FORMATION_09 = 0x0609, + BTL_TRD_1_FORMATION_0A = 0x060A, + BTL_TRD_1_FORMATION_0B = 0x060B, + BTL_TRD_1_FORMATION_0C = 0x060C, + BTL_TRD_1_FORMATION_0D = 0x060D, + BTL_TRD_1_FORMATION_0E = 0x060E, + BTL_TRD_1_FORMATION_0F = 0x060F, + BTL_TRD_1_FORMATION_10 = 0x0610, + BTL_TRD_1_FORMATION_11 = 0x0611, + BTL_TRD_1_FORMATION_12 = 0x0612, + BTL_TRD_1_FORMATION_13 = 0x0613, + BTL_TRD_1_FORMATION_14 = 0x0614, + BTL_TRD_1_FORMATION_15 = 0x0615, + BTL_TRD_1_FORMATION_16 = 0x0616, + BTL_TRD_1_FORMATION_17 = 0x0617, + BTL_TRD_1_FORMATION_18 = 0x0618, + BTL_TRD_1_FORMATION_19 = 0x0619, + BTL_TRD_1_FORMATION_1A = 0x061A, + BTL_TRD_1_FORMATION_1B = 0x061B, + BTL_TRD_2_FORMATION_00 = 0x0700, + BTL_TRD_3_FORMATION_00 = 0x0800, + BTL_IWA_FORMATION_00 = 0x0900, + BTL_IWA_FORMATION_01 = 0x0901, + BTL_IWA_FORMATION_02 = 0x0902, + BTL_IWA_FORMATION_03 = 0x0903, + BTL_IWA_FORMATION_04 = 0x0904, + BTL_IWA_FORMATION_05 = 0x0905, + BTL_IWA_FORMATION_06 = 0x0906, + BTL_IWA_FORMATION_07 = 0x0907, + BTL_IWA_FORMATION_08 = 0x0908, + BTL_IWA_FORMATION_09 = 0x0909, + BTL_IWA_FORMATION_0A = 0x090A, + BTL_IWA_FORMATION_0B = 0x090B, + BTL_IWA_FORMATION_0C = 0x090C, + BTL_IWA_FORMATION_0D = 0x090D, + BTL_IWA_FORMATION_0E = 0x090E, + BTL_IWA_FORMATION_0F = 0x090F, + BTL_IWA_FORMATION_10 = 0x0910, + BTL_SBK_FORMATION_00 = 0x0A00, + BTL_SBK_FORMATION_01 = 0x0A01, + BTL_SBK_FORMATION_02 = 0x0A02, + BTL_SBK_FORMATION_03 = 0x0A03, + BTL_SBK_FORMATION_04 = 0x0A04, + BTL_SBK_FORMATION_05 = 0x0A05, + BTL_SBK_FORMATION_06 = 0x0A06, + BTL_SBK_FORMATION_07 = 0x0A07, + BTL_SBK_FORMATION_08 = 0x0A08, + BTL_SBK_FORMATION_09 = 0x0A09, + BTL_SBK_FORMATION_0A = 0x0A0A, + BTL_SBK_FORMATION_0B = 0x0A0B, + BTL_SBK_FORMATION_0C = 0x0A0C, + BTL_SBK_FORMATION_0D = 0x0A0D, + BTL_SBK_FORMATION_0E = 0x0A0E, + BTL_SBK_FORMATION_0F = 0x0A0F, + BTL_SBK_FORMATION_10 = 0x0A10, + BTL_SBK_FORMATION_11 = 0x0A11, + BTL_SBK_FORMATION_12 = 0x0A12, + BTL_ISK_1_FORMATION_00 = 0x0B00, + BTL_ISK_1_FORMATION_01 = 0x0B01, + BTL_ISK_1_FORMATION_02 = 0x0B02, + BTL_ISK_1_FORMATION_03 = 0x0B03, + BTL_ISK_1_FORMATION_04 = 0x0B04, + BTL_ISK_1_FORMATION_05 = 0x0B05, + BTL_ISK_1_FORMATION_06 = 0x0B06, + BTL_ISK_1_FORMATION_07 = 0x0B07, + BTL_ISK_1_FORMATION_08 = 0x0B08, + BTL_ISK_1_FORMATION_09 = 0x0B09, + BTL_ISK_1_FORMATION_0A = 0x0B0A, + BTL_ISK_1_FORMATION_0B = 0x0B0B, + BTL_ISK_1_FORMATION_0C = 0x0B0C, + BTL_ISK_1_FORMATION_0D = 0x0B0D, + BTL_ISK_1_FORMATION_0E = 0x0B0E, + BTL_ISK_1_FORMATION_0F = 0x0B0F, + BTL_ISK_1_FORMATION_10 = 0x0B10, + BTL_ISK_1_FORMATION_11 = 0x0B11, + BTL_ISK_1_FORMATION_12 = 0x0B12, + BTL_ISK_1_FORMATION_13 = 0x0B13, + BTL_ISK_2_FORMATION_00 = 0x0C00, + BTL_ISK_2_FORMATION_01 = 0x0C01, + BTL_MIM_FORMATION_00 = 0x0D00, + BTL_MIM_FORMATION_01 = 0x0D01, + BTL_MIM_FORMATION_02 = 0x0D02, + BTL_MIM_FORMATION_03 = 0x0D03, + BTL_MIM_FORMATION_04 = 0x0D04, + BTL_MIM_FORMATION_05 = 0x0D05, + BTL_MIM_FORMATION_06 = 0x0D06, + BTL_MIM_FORMATION_07 = 0x0D07, + BTL_MIM_FORMATION_08 = 0x0D08, + BTL_MIM_FORMATION_09 = 0x0D09, + BTL_MIM_FORMATION_0A = 0x0D0A, + BTL_MIM_FORMATION_0B = 0x0D0B, + BTL_MIM_FORMATION_0C = 0x0D0C, + BTL_MIM_FORMATION_0D = 0x0D0D, + BTL_MIM_FORMATION_0E = 0x0D0E, + BTL_MIM_FORMATION_0F = 0x0D0F, + BTL_MIM_FORMATION_10 = 0x0D10, + BTL_MIM_FORMATION_11 = 0x0D11, + BTL_MIM_FORMATION_12 = 0x0D12, + BTL_ARN_FORMATION_00 = 0x0E00, + BTL_ARN_FORMATION_01 = 0x0E01, + BTL_ARN_FORMATION_02 = 0x0E02, + BTL_ARN_FORMATION_03 = 0x0E03, + BTL_ARN_FORMATION_04 = 0x0E04, + BTL_ARN_FORMATION_05 = 0x0E05, + BTL_ARN_FORMATION_06 = 0x0E06, + BTL_ARN_FORMATION_07 = 0x0E07, + BTL_ARN_FORMATION_08 = 0x0E08, + BTL_ARN_FORMATION_09 = 0x0E09, + BTL_ARN_FORMATION_0A = 0x0E0A, + BTL_ARN_FORMATION_0B = 0x0E0B, + BTL_ARN_FORMATION_0C = 0x0E0C, + BTL_ARN_FORMATION_0D = 0x0E0D, + BTL_ARN_FORMATION_0E = 0x0E0E, + BTL_ARN_FORMATION_0F = 0x0E0F, + BTL_ARN_FORMATION_10 = 0x0E10, + BTL_DGB_FORMATION_00 = 0x0F00, + BTL_DGB_FORMATION_01 = 0x0F01, + BTL_DGB_FORMATION_02 = 0x0F02, + BTL_DGB_FORMATION_03 = 0x0F03, + BTL_DGB_FORMATION_04 = 0x0F04, + BTL_DGB_FORMATION_05 = 0x0F05, + BTL_OMO_FORMATION_00 = 0x1000, + BTL_OMO_FORMATION_01 = 0x1001, + BTL_OMO_FORMATION_02 = 0x1002, + BTL_OMO_FORMATION_03 = 0x1003, + BTL_OMO_FORMATION_04 = 0x1004, + BTL_OMO_FORMATION_05 = 0x1005, + BTL_OMO_FORMATION_06 = 0x1006, + BTL_OMO_FORMATION_07 = 0x1007, + BTL_OMO_FORMATION_08 = 0x1008, + BTL_OMO_FORMATION_09 = 0x1009, + BTL_OMO_FORMATION_0A = 0x100A, + BTL_OMO_FORMATION_0B = 0x100B, + BTL_OMO_FORMATION_0C = 0x100C, + BTL_OMO_FORMATION_0D = 0x100D, + BTL_OMO_FORMATION_0E = 0x100E, + BTL_OMO_FORMATION_0F = 0x100F, + BTL_OMO_FORMATION_10 = 0x1010, + BTL_OMO_FORMATION_11 = 0x1011, + BTL_OMO_FORMATION_12 = 0x1012, + BTL_OMO_FORMATION_13 = 0x1013, + BTL_OMO_FORMATION_14 = 0x1014, + BTL_OMO_FORMATION_15 = 0x1015, + BTL_OMO_FORMATION_16 = 0x1016, + BTL_OMO_FORMATION_17 = 0x1017, + BTL_OMO_FORMATION_18 = 0x1018, + BTL_OMO_FORMATION_19 = 0x1019, + BTL_OMO_FORMATION_1A = 0x101A, + BTL_OMO_FORMATION_1B = 0x101B, + BTL_OMO_FORMATION_1C = 0x101C, + BTL_OMO_FORMATION_1D = 0x101D, + BTL_OMO_FORMATION_1E = 0x101E, + BTL_OMO_FORMATION_1F = 0x101F, + BTL_OMO_FORMATION_20 = 0x1020, + BTL_OMO_FORMATION_21 = 0x1021, + BTL_OMO_FORMATION_22 = 0x1022, + BTL_OMO_FORMATION_23 = 0x1023, + BTL_OMO_FORMATION_24 = 0x1024, + BTL_OMO_FORMATION_25 = 0x1025, + BTL_OMO_FORMATION_26 = 0x1026, + BTL_OMO_FORMATION_27 = 0x1027, + BTL_OMO_FORMATION_28 = 0x1028, + BTL_OMO_FORMATION_29 = 0x1029, + BTL_OMO_FORMATION_2A = 0x102A, + BTL_OMO_FORMATION_2B = 0x102B, + BTL_OMO_FORMATION_2C = 0x102C, + BTL_OMO_FORMATION_2D = 0x102D, + BTL_OMO_FORMATION_2E = 0x102E, + BTL_OMO_FORMATION_2F = 0x102F, + BTL_OMO_FORMATION_30 = 0x1030, + BTL_OMO2_FORMATION_00 = 0x1100, + BTL_OMO2_FORMATION_01 = 0x1101, + BTL_OMO2_FORMATION_02 = 0x1102, + BTL_OMO2_FORMATION_03 = 0x1103, + BTL_OMO2_FORMATION_04 = 0x1104, + BTL_OMO2_FORMATION_05 = 0x1105, + BTL_OMO2_FORMATION_06 = 0x1106, + BTL_OMO2_FORMATION_07 = 0x1107, + BTL_OMO3_FORMATION_00 = 0x1200, + BTL_OMO3_FORMATION_01 = 0x1201, + BTL_OMO3_FORMATION_02 = 0x1202, + BTL_OMO3_FORMATION_03 = 0x1203, + BTL_OMO3_FORMATION_04 = 0x1204, + BTL_OMO3_FORMATION_05 = 0x1205, + BTL_OMO3_FORMATION_06 = 0x1206, + BTL_OMO3_FORMATION_07 = 0x1207, + BTL_OMO3_FORMATION_08 = 0x1208, + BTL_OMO3_FORMATION_09 = 0x1209, + BTL_OMO3_FORMATION_0A = 0x120A, + BTL_OMO3_FORMATION_0B = 0x120B, + BTL_OMO3_FORMATION_0C = 0x120C, + BTL_OMO3_FORMATION_0D = 0x120D, + BTL_KGR_FORMATION_00 = 0x1300, + BTL_JAN_FORMATION_00 = 0x1400, + BTL_JAN_FORMATION_01 = 0x1401, + BTL_JAN_FORMATION_02 = 0x1402, + BTL_JAN_FORMATION_03 = 0x1403, + BTL_JAN_FORMATION_04 = 0x1404, + BTL_JAN_FORMATION_05 = 0x1405, + BTL_JAN_FORMATION_06 = 0x1406, + BTL_JAN_FORMATION_07 = 0x1407, + BTL_JAN_FORMATION_08 = 0x1408, + BTL_JAN_FORMATION_09 = 0x1409, + BTL_JAN_FORMATION_0A = 0x140A, + BTL_JAN_FORMATION_0B = 0x140B, + BTL_JAN_FORMATION_0C = 0x140C, + BTL_JAN_FORMATION_0D = 0x140D, + BTL_JAN_FORMATION_0E = 0x140E, + BTL_JAN_FORMATION_0F = 0x140F, + BTL_JAN_FORMATION_10 = 0x1410, + BTL_JAN_FORMATION_11 = 0x1411, + BTL_JAN_FORMATION_12 = 0x1412, + BTL_JAN_FORMATION_13 = 0x1413, + BTL_JAN2_FORMATION_00 = 0x1500, + BTL_JAN2_FORMATION_01 = 0x1501, + BTL_JAN2_FORMATION_02 = 0x1502, + BTL_JAN2_FORMATION_03 = 0x1503, + BTL_KZN_FORMATION_00 = 0x1600, + BTL_KZN_FORMATION_01 = 0x1601, + BTL_KZN_FORMATION_02 = 0x1602, + BTL_KZN_FORMATION_03 = 0x1603, + BTL_KZN_FORMATION_04 = 0x1604, + BTL_KZN_FORMATION_05 = 0x1605, + BTL_KZN_FORMATION_06 = 0x1606, + BTL_KZN_FORMATION_07 = 0x1607, + BTL_KZN_FORMATION_08 = 0x1608, + BTL_KZN_FORMATION_09 = 0x1609, + BTL_KZN_FORMATION_0A = 0x160A, + BTL_KZN_FORMATION_0B = 0x160B, + BTL_KZN_FORMATION_0C = 0x160C, + BTL_KZN_FORMATION_0D = 0x160D, + BTL_KZN_FORMATION_0E = 0x160E, + BTL_KZN_FORMATION_0F = 0x160F, + BTL_KZN_FORMATION_10 = 0x1610, + BTL_KZN_FORMATION_11 = 0x1611, + BTL_KZN_FORMATION_12 = 0x1612, + BTL_KZN_FORMATION_13 = 0x1613, + BTL_KZN_FORMATION_14 = 0x1614, + BTL_KZN2_FORMATION_00 = 0x1700, + BTL_KZN2_FORMATION_01 = 0x1701, + BTL_KZN2_FORMATION_02 = 0x1702, + BTL_KZN2_FORMATION_03 = 0x1703, + BTL_KZN2_FORMATION_04 = 0x1704, + BTL_KZN2_FORMATION_05 = 0x1705, + BTL_KZN2_FORMATION_06 = 0x1706, + BTL_FLO_FORMATION_00 = 0x1800, + BTL_FLO_FORMATION_01 = 0x1801, + BTL_FLO_FORMATION_02 = 0x1802, + BTL_FLO_FORMATION_03 = 0x1803, + BTL_FLO_FORMATION_04 = 0x1804, + BTL_FLO_FORMATION_05 = 0x1805, + BTL_FLO_FORMATION_06 = 0x1806, + BTL_FLO_FORMATION_07 = 0x1807, + BTL_FLO_FORMATION_08 = 0x1808, + BTL_FLO_FORMATION_09 = 0x1809, + BTL_FLO_FORMATION_0A = 0x180A, + BTL_FLO_FORMATION_0B = 0x180B, + BTL_FLO_FORMATION_0C = 0x180C, + BTL_FLO_FORMATION_0D = 0x180D, + BTL_FLO_FORMATION_0E = 0x180E, + BTL_FLO_FORMATION_0F = 0x180F, + BTL_FLO_FORMATION_10 = 0x1810, + BTL_FLO_FORMATION_11 = 0x1811, + BTL_FLO_FORMATION_12 = 0x1812, + BTL_FLO_FORMATION_13 = 0x1813, + BTL_FLO_FORMATION_14 = 0x1814, + BTL_FLO_FORMATION_15 = 0x1815, + BTL_FLO_FORMATION_16 = 0x1816, + BTL_FLO_FORMATION_17 = 0x1817, + BTL_FLO_FORMATION_18 = 0x1818, + BTL_FLO_FORMATION_19 = 0x1819, + BTL_FLO_FORMATION_1A = 0x181A, + BTL_FLO_FORMATION_1B = 0x181B, + BTL_FLO_FORMATION_1C = 0x181C, + BTL_FLO_FORMATION_1D = 0x181D, + BTL_FLO_FORMATION_1E = 0x181E, + BTL_FLO_FORMATION_1F = 0x181F, + BTL_FLO_FORMATION_20 = 0x1820, + BTL_FLO_FORMATION_21 = 0x1821, + BTL_FLO_FORMATION_22 = 0x1822, + BTL_FLO_FORMATION_23 = 0x1823, + BTL_FLO_FORMATION_24 = 0x1824, + BTL_FLO_FORMATION_25 = 0x1825, + BTL_FLO2_FORMATION_00 = 0x1900, + BTL_FLO2_FORMATION_01 = 0x1901, + BTL_FLO2_FORMATION_02 = 0x1902, + BTL_FLO2_FORMATION_03 = 0x1903, + BTL_FLO2_FORMATION_04 = 0x1904, + BTL_FLO2_FORMATION_05 = 0x1905, + BTL_FLO2_FORMATION_06 = 0x1906, + BTL_FLO2_FORMATION_07 = 0x1907, + BTL_FLO2_FORMATION_08 = 0x1908, + BTL_FLO2_FORMATION_09 = 0x1909, + BTL_TIK_FORMATION_00 = 0x1A00, + BTL_TIK_FORMATION_01 = 0x1A01, + BTL_TIK_FORMATION_02 = 0x1A02, + BTL_TIK_FORMATION_03 = 0x1A03, + BTL_TIK_FORMATION_04 = 0x1A04, + BTL_TIK_FORMATION_05 = 0x1A05, + BTL_TIK_FORMATION_06 = 0x1A06, + BTL_TIK_FORMATION_07 = 0x1A07, + BTL_TIK_FORMATION_08 = 0x1A08, + BTL_TIK_FORMATION_09 = 0x1A09, + BTL_TIK_FORMATION_0A = 0x1A0A, + BTL_TIK_FORMATION_0B = 0x1A0B, + BTL_TIK_FORMATION_0C = 0x1A0C, + BTL_TIK_FORMATION_0D = 0x1A0D, + BTL_TIK_FORMATION_0E = 0x1A0E, + BTL_TIK_FORMATION_0F = 0x1A0F, + BTL_TIK_FORMATION_10 = 0x1A10, + BTL_TIK_FORMATION_11 = 0x1A11, + BTL_TIK_FORMATION_12 = 0x1A12, + BTL_TIK_FORMATION_13 = 0x1A13, + BTL_TIK_FORMATION_14 = 0x1A14, + BTL_TIK_FORMATION_15 = 0x1A15, + BTL_TIK_FORMATION_16 = 0x1A16, + BTL_TIK_FORMATION_17 = 0x1A17, + BTL_TIK_FORMATION_18 = 0x1A18, + BTL_TIK2_FORMATION_00 = 0x1B00, + BTL_TIK2_FORMATION_01 = 0x1B01, + BTL_TIK2_FORMATION_02 = 0x1B02, + BTL_TIK2_FORMATION_03 = 0x1B03, + BTL_TIK2_FORMATION_04 = 0x1B04, + BTL_TIK3_FORMATION_00 = 0x1C00, + BTL_TIK3_FORMATION_01 = 0x1C01, + BTL_TIK3_FORMATION_02 = 0x1C02, + BTL_TIK3_FORMATION_03 = 0x1C03, + BTL_SAM_FORMATION_00 = 0x1D00, + BTL_SAM_FORMATION_01 = 0x1D01, + BTL_SAM_FORMATION_02 = 0x1D02, + BTL_SAM_FORMATION_03 = 0x1D03, + BTL_SAM_FORMATION_04 = 0x1D04, + BTL_SAM_FORMATION_05 = 0x1D05, + BTL_SAM_FORMATION_06 = 0x1D06, + BTL_SAM_FORMATION_07 = 0x1D07, + BTL_SAM_FORMATION_08 = 0x1D08, + BTL_SAM_FORMATION_09 = 0x1D09, + BTL_SAM_FORMATION_0A = 0x1D0A, + BTL_SAM_FORMATION_0B = 0x1D0B, + BTL_SAM_FORMATION_0C = 0x1D0C, + BTL_SAM_FORMATION_0D = 0x1D0D, + BTL_SAM_FORMATION_0E = 0x1D0E, + BTL_SAM_FORMATION_0F = 0x1D0F, + BTL_SAM_FORMATION_10 = 0x1D10, + BTL_SAM_FORMATION_11 = 0x1D11, + BTL_SAM_FORMATION_12 = 0x1D12, + BTL_SAM_FORMATION_13 = 0x1D13, + BTL_SAM_FORMATION_14 = 0x1D14, + BTL_SAM_FORMATION_15 = 0x1D15, + BTL_SAM2_FORMATION_00 = 0x1E00, + BTL_SAM2_FORMATION_01 = 0x1E01, + BTL_PRA_FORMATION_00 = 0x1F00, + BTL_PRA_FORMATION_01 = 0x1F01, + BTL_PRA_FORMATION_02 = 0x1F02, + BTL_PRA_FORMATION_03 = 0x1F03, + BTL_PRA_FORMATION_04 = 0x1F04, + BTL_PRA_FORMATION_05 = 0x1F05, + BTL_PRA_FORMATION_06 = 0x1F06, + BTL_PRA_FORMATION_07 = 0x1F07, + BTL_PRA_FORMATION_08 = 0x1F08, + BTL_PRA_FORMATION_09 = 0x1F09, + BTL_PRA_FORMATION_0A = 0x1F0A, + BTL_PRA_FORMATION_0B = 0x1F0B, + BTL_PRA_FORMATION_0C = 0x1F0C, + BTL_PRA_FORMATION_0D = 0x1F0D, + BTL_PRA_FORMATION_0E = 0x1F0E, + BTL_PRA2_FORMATION_00 = 0x2000, + BTL_PRA2_FORMATION_01 = 0x2001, + BTL_PRA2_FORMATION_02 = 0x2002, + BTL_PRA2_FORMATION_03 = 0x2003, + BTL_PRA2_FORMATION_04 = 0x2004, + BTL_PRA3_FORMATION_00 = 0x2100, + BTL_PRA3_FORMATION_01 = 0x2101, + BTL_PRA3_FORMATION_02 = 0x2102, + BTL_PRA3_FORMATION_03 = 0x2103, + BTL_PRA3_FORMATION_04 = 0x2104, + BTL_PRA3_FORMATION_05 = 0x2105, + BTL_PRA3_FORMATION_06 = 0x2106, + BTL_PRA3_FORMATION_07 = 0x2107, + BTL_PRA3_FORMATION_08 = 0x2108, + BTL_PRA3_FORMATION_09 = 0x2109, + BTL_PRA3_FORMATION_0A = 0x210A, + BTL_PRA3_FORMATION_0B = 0x210B, + BTL_PRA3_FORMATION_0C = 0x210C, + BTL_PRA3_FORMATION_0D = 0x210D, + BTL_PRA3_FORMATION_0E = 0x210E, + BTL_PRA3_FORMATION_0F = 0x210F, + BTL_PRA3_FORMATION_10 = 0x2110, + BTL_PRA3_FORMATION_11 = 0x2111, + BTL_PRA3_FORMATION_12 = 0x2112, + BTL_PRA3_FORMATION_13 = 0x2113, + BTL_KPA_FORMATION_00 = 0x2200, + BTL_KPA_FORMATION_01 = 0x2201, + BTL_KPA_FORMATION_02 = 0x2202, + BTL_KPA_FORMATION_03 = 0x2203, + BTL_KPA_FORMATION_04 = 0x2204, + BTL_KPA_FORMATION_05 = 0x2205, + BTL_KPA_FORMATION_06 = 0x2206, + BTL_KPA_FORMATION_07 = 0x2207, + BTL_KPA_FORMATION_08 = 0x2208, + BTL_KPA_FORMATION_09 = 0x2209, + BTL_KPA_FORMATION_0A = 0x220A, + BTL_KPA_FORMATION_0B = 0x220B, + BTL_KPA_FORMATION_0C = 0x220C, + BTL_KPA_FORMATION_0D = 0x220D, + BTL_KPA_FORMATION_0E = 0x220E, + BTL_KPA_FORMATION_0F = 0x220F, + BTL_KPA_FORMATION_10 = 0x2210, + BTL_KPA_FORMATION_11 = 0x2211, + BTL_KPA_FORMATION_12 = 0x2212, + BTL_KPA_FORMATION_13 = 0x2213, + BTL_KPA_FORMATION_14 = 0x2214, + BTL_KPA_FORMATION_15 = 0x2215, + BTL_KPA_FORMATION_16 = 0x2216, + BTL_KPA_FORMATION_17 = 0x2217, + BTL_KPA_FORMATION_18 = 0x2218, + BTL_KPA_FORMATION_19 = 0x2219, + BTL_KPA_FORMATION_1A = 0x221A, + BTL_KPA_FORMATION_1B = 0x221B, + BTL_KPA_FORMATION_1C = 0x221C, + BTL_KPA_FORMATION_1D = 0x221D, + BTL_KPA_FORMATION_1E = 0x221E, + BTL_KPA_FORMATION_1F = 0x221F, + BTL_KPA_FORMATION_20 = 0x2220, + BTL_KPA_FORMATION_21 = 0x2221, + BTL_KPA_FORMATION_22 = 0x2222, + BTL_KPA_FORMATION_23 = 0x2223, + BTL_KPA_FORMATION_24 = 0x2224, + BTL_KPA_FORMATION_25 = 0x2225, + BTL_KPA_FORMATION_26 = 0x2226, + BTL_KPA_FORMATION_27 = 0x2227, + BTL_KPA_FORMATION_28 = 0x2228, + BTL_KPA_FORMATION_29 = 0x2229, + BTL_KPA_FORMATION_2A = 0x222A, + BTL_KPA_FORMATION_2B = 0x222B, + BTL_KPA_FORMATION_2C = 0x222C, + BTL_KPA_FORMATION_2D = 0x222D, + BTL_KPA_FORMATION_2E = 0x222E, + BTL_KPA_FORMATION_2F = 0x222F, + BTL_KPA_FORMATION_30 = 0x2230, + BTL_KPA_FORMATION_31 = 0x2231, + BTL_KPA_FORMATION_32 = 0x2232, + BTL_KPA_FORMATION_33 = 0x2233, + BTL_KPA_FORMATION_34 = 0x2234, + BTL_KPA_FORMATION_35 = 0x2235, + BTL_KPA_FORMATION_36 = 0x2236, + BTL_KPA_FORMATION_37 = 0x2237, + BTL_KPA_FORMATION_38 = 0x2238, + BTL_KPA_FORMATION_39 = 0x2239, + BTL_KPA_FORMATION_3A = 0x223A, + BTL_KPA_FORMATION_3B = 0x223B, + BTL_KPA2_FORMATION_00 = 0x2300, + BTL_KPA2_FORMATION_01 = 0x2301, + BTL_KPA2_FORMATION_02 = 0x2302, + BTL_KPA2_FORMATION_03 = 0x2303, + BTL_KPA2_FORMATION_04 = 0x2304, + BTL_KPA3_FORMATION_00 = 0x2400, + BTL_KPA3_FORMATION_01 = 0x2401, + BTL_KPA3_FORMATION_02 = 0x2402, + BTL_KPA3_FORMATION_03 = 0x2403, + BTL_KPA3_FORMATION_04 = 0x2404, + BTL_KPA3_FORMATION_05 = 0x2405, + BTL_KPA3_FORMATION_06 = 0x2406, + BTL_KPA3_FORMATION_07 = 0x2407, + BTL_KPA3_FORMATION_08 = 0x2408, + BTL_KPA3_FORMATION_09 = 0x2409, + BTL_KPA3_FORMATION_0A = 0x240A, + BTL_KPA4_FORMATION_00 = 0x2500, + BTL_KPA4_FORMATION_01 = 0x2501, + BTL_KPA4_FORMATION_02 = 0x2502, + BTL_KPA4_FORMATION_03 = 0x2503, + BTL_KPA4_FORMATION_04 = 0x2504, + BTL_KPA4_FORMATION_05 = 0x2505, + BTL_KPA4_FORMATION_06 = 0x2506, + BTL_KPA4_FORMATION_07 = 0x2507, + BTL_KPA4_FORMATION_08 = 0x2508, + BTL_KKJ_FORMATION_00 = 0x2600, + BTL_DIG_FORMATION_00 = 0x2700, + BTL_DIG_FORMATION_01 = 0x2701, + BTL_DIG_FORMATION_02 = 0x2702, + BTL_DIG_FORMATION_03 = 0x2703, + BTL_DIG_FORMATION_04 = 0x2704, + BTL_DIG_FORMATION_05 = 0x2705, + BTL_DIG_FORMATION_06 = 0x2706, + BTL_DIG_FORMATION_07 = 0x2707, + BTL_DIG_FORMATION_08 = 0x2708, + BTL_DIG_FORMATION_09 = 0x2709, +}; diff --git a/src/battle/item/food.h b/src/battle/item/food.h deleted file mode 100644 index adbf679353..0000000000 --- a/src/battle/item/food.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef BATTLE_ITEM_FOOD -#define BATTLE_ITEM_FOOD - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_food - -ApiStatus N(func_802A123C_73330C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A12EC_7333BC)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A15A0_733670)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1378_733448)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1438_733508)(Evt* script, s32 isInitialCall); -ApiStatus N(AddHP)(Evt* script, s32 isInitialCall); -ApiStatus N(AddFP)(Evt* script, s32 isInitialCall); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(UseItem); -extern EvtScript N(EatItem); -extern EvtScript N(DrinkItem); - -#endif diff --git a/src/battle/item/life_shroom.h b/src/battle/item/life_shroom.h deleted file mode 100644 index 470011f6ed..0000000000 --- a/src/battle/item/life_shroom.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef BATTLE_ITEM_LIFE_SHROOM -#define BATTLE_ITEM_LIFE_SHROOM - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_life_shroom - -ApiStatus N(func_802A123C_72E76C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A12EC_72E81C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1484_72E9B4)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1438_72E968)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1378_72E8A8)(Evt* script, s32 isInitialCall); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(UseItem); -extern EvtScript N(EatItem); - -#endif diff --git a/src/battle/item/mushroom.h b/src/battle/item/mushroom.h deleted file mode 100644 index 32d02ba574..0000000000 --- a/src/battle/item/mushroom.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef BATTLE_ITEM_MUSHROOM -#define BATTLE_ITEM_MUSHROOM - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_mushroom - -ApiStatus N(func_802A123C_715A8C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A12EC_715B3C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A15A0_715DF0)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1378_715BC8)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1438_715C88)(Evt* script, s32 isInitialCall); -ApiStatus N(AddHP)(Evt* script, s32 isInitialCall); -ApiStatus N(AddFP)(Evt* script, s32 isInitialCall); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(UseItem); -extern EvtScript N(EatItem); - -#endif diff --git a/src/battle/item/shooting_star.h b/src/battle/item/shooting_star.h deleted file mode 100644 index 9adbdda871..0000000000 --- a/src/battle/item/shooting_star.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef BATTLE_ITEM_SHOOTING_STAR -#define BATTLE_ITEM_SHOOTING_STAR - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_shooting_star - -ApiStatus N(func_802A1444_71DBB4)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A123C_71D9AC)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1388_71DAF8)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A14D4_71DC44)(Evt* script, s32 isInitialCall); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif diff --git a/src/battle/item/sleepy_sheep.h b/src/battle/item/sleepy_sheep.h deleted file mode 100644 index 7b32bb3776..0000000000 --- a/src/battle/item/sleepy_sheep.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef BATTLE_ITEM_SLEEPY_SHEEP -#define BATTLE_ITEM_SLEEPY_SHEEP - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_sleepy_sheep - -ApiStatus SetVirtualEntityMoveSpeed(Evt* script, s32 isInitialCall); -ApiStatus VirtualEntityMoveTo(Evt* script, s32 isInitialCall); -ApiStatus ItemAfflictEnemy(Evt* script, s32 isInitialCall); - -ApiStatus N(func_802A123C_71E88C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1740_71ED90)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1848_71EE98)(Evt* script, s32 isInitialCall); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); - -#endif - - diff --git a/src/battle/item/strange_cake.h b/src/battle/item/strange_cake.h deleted file mode 100644 index ad659b2327..0000000000 --- a/src/battle/item/strange_cake.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef BATTLE_ITEM_STRANGE_CAKE -#define BATTLE_ITEM_STRANGE_CAKE - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_strange_cake - -ApiStatus N(func_802A1A8C_731D8C)(Evt *script, s32 isInitialCall); -ApiStatus N(func_802A18D8_731BD8)(Evt *script, s32 isInitialCall); -ApiStatus N(AddFP)(Evt *script, s32 isInitialCall); -ApiStatus N(func_802A13E4_7316E4)(Evt *script, s32 isInitialCall); -ApiStatus N(func_802A1AD8_731DD8)(Evt *script, s32 isInitialCall); -ApiStatus N(func_802A1B14_731E14)(Evt *script, s32 isInitialCall); -ApiStatus N(func_802A1B68_731E68)(Evt *script, s32 isInitialCall); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(EatItem); -extern EvtScript N(script7); -extern EvtScript N(script8); -extern EvtScript N(script9); - -#endif - - diff --git a/src/battle/item/super_soda.h b/src/battle/item/super_soda.h deleted file mode 100644 index 6aaf1efb97..0000000000 --- a/src/battle/item/super_soda.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef BATTLE_ITEM_SUPER_SODA -#define BATTLE_ITEM_SUPER_SODA - -#include "common.h" -#include "script_api/battle.h" - -#undef NAMESPACE -#define NAMESPACE battle_item_super_soda - -ApiStatus N(func_802A123C_724F1C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A12EC_724FCC)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1418_7250F8)(Evt* script, s32 isInitialCall); -ApiStatus N(AddFP)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1378_725058)(Evt* script, s32 isInitialCall); - -extern EvtScript N(UseItemWithEffect); -extern EvtScript N(PlayerGoHome); -extern EvtScript N(UseItem); - -#endif diff --git a/src/battle/move/auto_multibounce/auto_multibounce.c b/src/battle/move/auto_multibounce/auto_multibounce.c deleted file mode 100644 index 1951a8b755..0000000000 --- a/src/battle/move/auto_multibounce/auto_multibounce.c +++ /dev/null @@ -1,813 +0,0 @@ -#include "common.h" -#include "script_api/battle.h" -#include "battle/action_cmd/jump.h" - -#define NAMESPACE battle_move_auto_multibounce - -extern EvtScript N(D_802A26A8); -extern EvtScript N(D_802A2EC0); -extern EvtScript N(D_802A372C); - -s32 N(D_802A10F0)[] = { - 9, 3, 9, 3, 9, 3, 8, 3, - 7, 3, 6, 2, 5, 2, 4, 2, -}; - -#include "world/common/todo/UnkMoveFunc1.inc.c" - -EvtScript N(CheckForAPress) = { - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) - EVT_LOOP(5) - EVT_CALL(CheckButtonPress, BUTTON_A, LVar0) - EVT_IF_EQ(LVar0, TRUE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A11AC) = { - EVT_CALL(SetGoalToFirstTarget, ACTOR_SELF) - EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 40) - EVT_CALL(InitTargetIterator) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_SUB(LVar3, EVT_FLOAT(70.0)) - EVT_IF_LT(LVar0, LVar3) - EVT_SET(LVar3, LVar0) - EVT_END_IF - EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(CancelablePlayerRunToGoal, 0, LVar0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_EXEC_WAIT(N(CheckForAPress)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A1320) = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar6, LVar7, LVar8) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) - EVT_IF_GT(LVar6, LVar7) - EVT_SUB(LVar6, LVar7) - EVT_ELSE - EVT_SUB(LVar7, LVar6) - EVT_SET(LVar6, LVar7) - EVT_END_IF - EVT_SUB(LVar6, 20) - EVT_DIVF(LVar6, EVT_FLOAT(10.588)) - EVT_ADDF(LVar6, 15) - EVT_SET(LVarA, LVar6) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A1408) = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar6, LVar7, LVar8) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) - EVT_IF_GT(LVar6, LVar7) - EVT_SUB(LVar6, LVar7) - EVT_ELSE - EVT_SUB(LVar7, LVar6) - EVT_SET(LVar6, LVar7) - EVT_END_IF - EVT_SUB(LVar6, 20) - EVT_DIVF(LVar6, EVT_FLOAT(22.5)) - EVT_ADDF(LVar6, 15) - EVT_SET(LVarA, LVar6) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A14F0) = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar6, LVar7, LVar8) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) - EVT_IF_GT(LVar6, LVar7) - EVT_SUB(LVar6, LVar7) - EVT_ELSE - EVT_SUB(LVar7, LVar6) - EVT_SET(LVar6, LVar7) - EVT_END_IF - EVT_SUB(LVar6, 20) - EVT_DIVF(LVar6, EVT_FLOAT(18.0)) - EVT_ADDF(LVar6, 22) - EVT_SET(LVarA, LVar6) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A15D8) = { - EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) - EVT_CALL(func_802693F0) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 40) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) - EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.3)) - EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkMoveFunc1)) - EVT_CALL(func_80273444, LVar0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(1) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) - EVT_CALL(func_80273444, 6, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(5) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A17C4) = { - EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) - EVT_CALL(func_802693F0) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 50) - EVT_SET(LVar1, 0) - EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) - EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(0.8)) - EVT_CALL(N(UnkMoveFunc1)) - EVT_CALL(func_80273444, LVar0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(1) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) - EVT_CALL(func_80273444, 6, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(2) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A19B0) = { - EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_29) - EVT_CALL(func_802693F0) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 40) - EVT_SET(LVar1, 0) - EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) - EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) - EVT_CALL(N(UnkMoveFunc1)) - EVT_CALL(func_80273444, LVar0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(1) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) - EVT_CALL(func_80273444, 6, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(2) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A1B9C) = { - EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) - EVT_CALL(func_802693F0) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 60) - EVT_SET(LVar1, 0) - EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) - EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(0.8)) - EVT_CALL(N(UnkMoveFunc1)) - EVT_CALL(func_80273444, LVar0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(1) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) - EVT_CALL(func_80273444, 6, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(2) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A1D88) = { - EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) - EVT_CALL(func_802693F0) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 60) - EVT_SET(LVar1, 0) - EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_FallBack, ANIM_Mario_FallBack, ANIM_Mario_10009) - EVT_CALL(N(UnkMoveFunc1)) - EVT_CALL(func_80273444, LVar0, 0, 0) - EVT_CHILD_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.0)) - EVT_END_CHILD_THREAD - EVT_CALL(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) - EVT_CALL(func_80273444, 8, 0, 2) - EVT_CHILD_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.0)) - EVT_END_CHILD_THREAD - EVT_CALL(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) - EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(func_80273444, 6, 0, 2) - EVT_CHILD_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.0)) - EVT_END_CHILD_THREAD - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(func_80273444, 4, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A1FEC) = { - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, 0, 0, ANIM_Mario_1000C) - EVT_CALL(PlayerLandJump) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1000C) - EVT_WAIT(2) - EVT_CHILD_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) - EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_162) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GetUp) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_DustOff) - EVT_WAIT(20) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) - EVT_CALL(func_802693F0) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(func_80276EFC) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A2184) = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_EXEC_WAIT(N(D_802A11AC)) - EVT_EXEC_WAIT(N(D_802A1320)) - EVT_CALL(action_command_jump_start, LVarA, 3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000 ) - EVT_CALL(func_80274A18, LVarA, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A2230) = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_EXEC_WAIT(N(D_802A11AC)) - EVT_CALL(InitTargetIterator) - EVT_EXEC_WAIT(N(D_802A1408)) - EVT_SET(LVarB, LVarA) - EVT_ADD(LVarB, 14) - EVT_ADD(LVarB, -3) - EVT_CALL(action_command_jump_start, LVarB, 3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_37) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) - EVT_CALL(func_802752AC, LVarA, 0) - EVT_WAIT(7) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(func_802752AC, 3, 1) - EVT_CASE_DEFAULT - EVT_CALL(func_802752AC, 5, 1) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A2384) = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_EXEC_WAIT(N(D_802A11AC)) - EVT_EXEC_WAIT(N(D_802A14F0)) - EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(D_802A10F0))) - EVT_SET(LVarB, LVarA) - EVT_SUB(LVarB, 4) - EVT_ADD(LVarB, -3) - EVT_CALL(action_command_jump_start, LVarB, 3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_38) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, 524288, 196608) - EVT_CALL(func_80275F00, LVarA, 0) - EVT_CALL(CloseActionCommandInfo) - EVT_SET(LVar9, 0) - EVT_CALL(DidActionSucceed, LVar0) - EVT_IF_GT(LVar0, 0) - EVT_SET(LVar9, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030000) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) - EVT_WAIT(2) - EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_CALL(action_command_jump_start, 13, 3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_39) - EVT_CALL(func_80275F00, 15, 2) - EVT_GOTO(10) - EVT_ELSE - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_CALL(action_command_jump_start, 2, 3) - EVT_CALL(func_80275F00, 4, 1) - EVT_GOTO(10) - EVT_END_IF - EVT_LABEL(10) - EVT_RETURN - EVT_END -}; - -EvtScript N(main) = { - EVT_CALL(ShowActionHud, 1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_AUTO_SUCCEED_ACTION, 1) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_EXEC_WAIT(N(D_802A26A8)) - EVT_CASE_EQ(1) - EVT_EXEC_WAIT(N(D_802A2EC0)) - EVT_CASE_EQ(2) - EVT_EXEC_WAIT(N(D_802A372C)) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A26A8) = { - EVT_EXEC_WAIT(N(D_802A2184)) - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(N(D_802A1FEC)) - EVT_RETURN - EVT_END_IF - EVT_SET(LocalFlag(0), 0) - EVT_CALL(GetTargetListLength, LVar0) - EVT_IF_EQ(LVar0, 1) - EVT_SET(LocalFlag(0), 1) - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_IF_EQ(LocalFlag(0), 0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 1, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 1, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_IF - EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x235) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_EXEC_WAIT(N(D_802A15D8)) - EVT_RETURN - EVT_END_IF - EVT_EXEC_WAIT(N(D_802A19B0)) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_EXEC_WAIT(N(D_802A15D8)) - EVT_RETURN - EVT_END_IF - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CALL(func_80269524, LVarE) - EVT_ADD(LVarF, 1) - EVT_SET(LocalFlag(0), 0) - EVT_LABEL(10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) - EVT_CALL(GetTargetListLength, LVar0) - EVT_SUB(LVar0, 1) - EVT_IF_EQ(LVarF, LVar0) - EVT_SET(LocalFlag(0), 1) - EVT_END_IF - EVT_CALL(CloseActionCommandInfo) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(ShowActionHud, 0) - EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_EXEC_WAIT(N(D_802A1320)) - EVT_ADD(LVarA, 5) - EVT_CALL(action_command_jump_start, LVarA, 3) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) - EVT_IF_EQ(LVarF, 1) - EVT_CALL(func_80274A18, LVarA, 3) - EVT_ELSE - EVT_CALL(func_80274A18, LVarA, 4) - EVT_END_IF - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(N(D_802A1FEC)) - EVT_RETURN - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_IF_EQ(LocalFlag(0), 0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 1, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 1, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_IF - EVT_CASE_DEFAULT - EVT_IF_EQ(LocalFlag(0), 0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 1, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_IF - EVT_END_SWITCH - EVT_SWITCH(LVarF) - EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x235) - EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x236) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x237) - EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x238) - EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x238) - EVT_END_SWITCH - EVT_CALL(func_80269550, LVarE) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_EXEC_WAIT(N(D_802A15D8)) - EVT_RETURN - EVT_END_IF - EVT_EXEC_WAIT(N(D_802A19B0)) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_EXEC_WAIT(N(D_802A15D8)) - EVT_RETURN - EVT_END_IF - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_ADD(LVarF, 1) - EVT_CALL(GetTargetListLength, LVar0) - EVT_IF_GE(LVarF, LVar0) - EVT_EXEC_WAIT(N(D_802A17C4)) - EVT_RETURN - EVT_END_IF - EVT_GOTO(10) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A2EC0) = { - EVT_EXEC_WAIT(N(D_802A2184)) - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(N(D_802A1FEC)) - EVT_RETURN - EVT_END_IF - EVT_SET(LocalFlag(0), 0) - EVT_CALL(GetTargetListLength, LVar0) - EVT_IF_EQ(LVar0, 1) - EVT_SET(LocalFlag(0), 1) - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_IF_EQ(LocalFlag(0), 0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 2, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 2, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_IF - EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x235) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_EXEC_WAIT(N(D_802A15D8)) - EVT_RETURN - EVT_END_IF - EVT_EXEC_WAIT(N(D_802A19B0)) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_EXEC_WAIT(N(D_802A15D8)) - EVT_RETURN - EVT_END_IF - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CALL(func_80269524, LVarE) - EVT_SET(LocalFlag(0), 0) - EVT_SET(LVarF, 0) - EVT_ADD(LVarF, 1) - EVT_LABEL(10) - EVT_CALL(GetTargetListLength, LVar0) - EVT_SUB(LVar0, 1) - EVT_IF_EQ(LVarF, LVar0) - EVT_SET(LocalFlag(0), 1) - EVT_END_IF - EVT_CALL(CloseActionCommandInfo) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(ShowActionHud, 0) - EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) - EVT_CALL(action_command_jump_start, 37, 3) - EVT_CALL(ChooseNextTarget, 0, LVar0) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) - EVT_CALL(EnablePlayerBlur, 1) - EVT_IF_EQ(LVarF, 1) - EVT_CALL(func_802752AC, 20, 3) - EVT_WAIT(7) - EVT_CALL(func_802752AC, 3, 6) - EVT_ELSE - EVT_CALL(func_802752AC, 20, 4) - EVT_WAIT(7) - EVT_CALL(func_802752AC, 3, 5) - EVT_END_IF - EVT_CALL(EnablePlayerBlur, 0) - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(N(D_802A1FEC)) - EVT_RETURN - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_IF_EQ(LocalFlag(0), 0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 2, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 2, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_IF - EVT_CASE_DEFAULT - EVT_IF_EQ(LocalFlag(0), 0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 2, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_IF - EVT_END_SWITCH - EVT_SWITCH(LVarF) - EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) - EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) - EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) - EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) - EVT_END_SWITCH - EVT_CALL(func_80269550, LVarE) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_EXEC_WAIT(N(D_802A15D8)) - EVT_RETURN - EVT_END_IF - EVT_EXEC_WAIT(N(D_802A19B0)) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_EXEC_WAIT(N(D_802A15D8)) - EVT_RETURN - EVT_END_IF - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_ADD(LVarF, 1) - EVT_CALL(GetTargetListLength, LVar0) - EVT_IF_GE(LVarF, LVar0) - EVT_EXEC_WAIT(N(D_802A19B0)) - EVT_RETURN - EVT_END_IF - EVT_GOTO(10) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A372C) = { - EVT_EXEC_WAIT(N(D_802A2184)) - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(N(D_802A1FEC)) - EVT_RETURN - EVT_END_IF - EVT_SET(LocalFlag(0), 0) - EVT_CALL(GetTargetListLength, LVar0) - EVT_IF_EQ(LVar0, 1) - EVT_SET(LocalFlag(0), 1) - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_IF_EQ(LocalFlag(0), 0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 3, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 3, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_IF - EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x235) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_EXEC_WAIT(N(D_802A15D8)) - EVT_RETURN - EVT_END_IF - EVT_EXEC_WAIT(N(D_802A19B0)) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_EXEC_WAIT(N(D_802A15D8)) - EVT_RETURN - EVT_END_IF - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CALL(func_80269524, LVarE) - EVT_SET(LocalFlag(0), 0) - EVT_SET(LVarF, 0) - EVT_ADD(LVarF, 1) - EVT_LABEL(20) - EVT_CALL(GetTargetListLength, LVar0) - EVT_SUB(LVar0, 1) - EVT_IF_EQ(LVarF, LVar0) - EVT_SET(LocalFlag(0), 1) - EVT_END_IF - EVT_CALL(CloseActionCommandInfo) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(ShowActionHud, 0) - EVT_END_IF - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) - EVT_CALL(action_command_jump_start, 25, 3) - EVT_CALL(ChooseNextTarget, 0, LVar0) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) - EVT_IF_EQ(LVarF, 1) - EVT_CALL(func_80275F00, 25, 2) - EVT_ELSE - EVT_CALL(func_80275F00, 25, 4) - EVT_END_IF - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(N(D_802A1FEC)) - EVT_RETURN - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_IF_EQ(LocalFlag(0), 0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 3, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 3, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_IF - EVT_CASE_DEFAULT - EVT_IF_EQ(LocalFlag(0), 0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 553648256, 0, 0, 3, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_IF - EVT_END_SWITCH - EVT_SWITCH(LVarF) - EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x235) - EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x236) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x237) - EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x238) - EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x238) - EVT_END_SWITCH - EVT_CALL(func_80269550, LVarE) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_EXEC_WAIT(N(D_802A15D8)) - EVT_RETURN - EVT_END_IF - EVT_EXEC_WAIT(N(D_802A19B0)) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_IF_EQ(LocalFlag(0), 1) - EVT_EXEC_WAIT(N(D_802A15D8)) - EVT_RETURN - EVT_END_IF - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_ADD(LVarF, 1) - EVT_CALL(GetTargetListLength, LVar0) - EVT_IF_GE(LVarF, LVar0) - EVT_EXEC_WAIT(N(D_802A19B0)) - EVT_RETURN - EVT_END_IF - EVT_GOTO(20) - EVT_RETURN - EVT_END -}; diff --git a/src/battle/move/d_down_jump/781920.c b/src/battle/move/d_down_jump/781920.c deleted file mode 100644 index 0bb65f67d0..0000000000 --- a/src/battle/move/d_down_jump/781920.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" -#include "effects.h" - -#define NAMESPACE battle_move_d_down_jump - -#include "world/common/todo/UnkMoveFunc1.inc.c" - -ApiStatus func_802A10E4_781A04(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 var0 = evt_get_variable(script, *args++); - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - - if (script->varTable[10] == 0) { - fx_green_impact(TRUE, var0, var1, var2, 0.0f); - } else { - fx_green_impact(FALSE, var0, var1, var2, 0.0f); - } - - return ApiStatus_DONE2; -} diff --git a/src/battle/move/d_down_pound/74AD90.c b/src/battle/move/d_down_pound/74AD90.c deleted file mode 100644 index 9fdb2a5a57..0000000000 --- a/src/battle/move/d_down_pound/74AD90.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "common.h" -#include "effects.h" - -#define NAMESPACE battle_move_d_down_pound - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" - -ApiStatus func_802A10A4_74AE34(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 var0 = evt_get_variable(script, *args++); - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - - if (script->varTable[10] == 0) { - fx_green_impact(TRUE, var0 + 30, var1 + 25, var2, 45.0f); - } else { - fx_green_impact(FALSE, var0 + 30, var1 + 25, var2, 45.0f); - } - - return ApiStatus_DONE2; -} diff --git a/src/battle/move/dizzy_stomp/748DD0.c b/src/battle/move/dizzy_stomp/748DD0.c deleted file mode 100644 index 9734b0f2c2..0000000000 --- a/src/battle/move/dizzy_stomp/748DD0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_dizzy_stomp - -#include "world/common/todo/UnkMoveFunc1.inc.c" diff --git a/src/battle/move/earthquake_jump/785B20.c b/src/battle/move/earthquake_jump/785B20.c deleted file mode 100644 index b6c7cbb9f1..0000000000 --- a/src/battle/move/earthquake_jump/785B20.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_earthquake_jump - -#include "world/common/todo/UnkMoveFunc1.inc.c" - -ApiStatus func_802A10E4_785C04(Evt* script, s32 isInitialCall) { - script->varTable[0] = 3; - return ApiStatus_DONE2; -} - -MATCHING_BSS(0x3CC0); diff --git a/src/battle/move/hammer/attack.c b/src/battle/move/hammer/attack.c new file mode 100644 index 0000000000..5a76f0d9f5 --- /dev/null +++ b/src/battle/move/hammer/attack.c @@ -0,0 +1,353 @@ +#include "common.h" +#include "script_api/battle.h" +#include "sprite/npc/WorldBombette.h" +#include "battle/action_cmd/hammer.h" + +#define NAMESPACE battle_move_hammer_attack + +#include "battle/common/move/HammerSupport.inc.c" + +extern EvtScript N(EVS_UseMove0_Impl); + +EvtScript N(EVS_UseMove0) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 2) + EVT_EXEC_WAIT(N(EVS_UseMove0_Impl)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 2) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(EVS_UseMove0_Impl)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 3) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(EVS_UseMove0_Impl)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove0_Impl) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseSuperHammer)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseUltraHammer)) + EVT_END_SWITCH + EVT_CALL(GetActionSuccessCopy, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(0) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_END_SWITCH + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_WAIT(1) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove1) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVar9, 1) + EVT_SET_CONST(LVarA, ANIM_Mario_3000F) + EVT_SET_CONST(LVarB, ANIM_Mario_30011) + EVT_SET_CONST(LVarC, ANIM_Mario_30012) + EVT_CASE_EQ(1) + EVT_SET(LVar9, 2) + EVT_SET_CONST(LVarA, ANIM_Mario_30016) + EVT_SET_CONST(LVarB, ANIM_Mario_30017) + EVT_SET_CONST(LVarC, ANIM_Mario_30019) + EVT_CASE_EQ(2) + EVT_SET(LVar9, 3) + EVT_SET_CONST(LVarA, ANIM_Mario_3001D) + EVT_SET_CONST(LVarB, ANIM_Mario_3001E) + EVT_SET_CONST(LVarC, ANIM_Mario_30020) + EVT_END_SWITCH + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) + EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 32) + EVT_SET(LVar1, 0) + EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) + EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_43) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LVarA) + EVT_WAIT(8) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LVarB) + EVT_WAIT(3) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LVarC) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2115) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2116) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2117) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_WAIT(1) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVar9, 48) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) + EVT_RETURN + EVT_END +}; + +extern EvtScript N(EVS_UseMove2_Impl); + +EvtScript N(EVS_UseMove2) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 75) + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 2) + EVT_EXEC_WAIT(N(EVS_UseMove2_Impl)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 66) + EVT_SET(LVarE, 2) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(EVS_UseMove2_Impl)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 57) + EVT_SET(LVarE, 3) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(EVS_UseMove2_Impl)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove2_Impl) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseSuperHammer)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseUltraHammer)) + EVT_END_SWITCH + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVar9, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 10) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetActionSuccessCopy, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(0) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 10) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 10) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_END_SWITCH + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_WAIT(1) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/hammer/auto_smash.c b/src/battle/move/hammer/auto_smash.c new file mode 100644 index 0000000000..02f91d0550 --- /dev/null +++ b/src/battle/move/hammer/auto_smash.c @@ -0,0 +1,131 @@ +#include "common.h" +#include "script_api/battle.h" + +#define NAMESPACE battle_move_auto_smash + +#include "battle/common/move/HammerSupport.inc.c" + +extern EvtScript N(EVS_UseMove_Impl); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_AUTO_SUCCEED_ACTION, TRUE) + EVT_CALL(ShowActionHud, 1) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 2) + EVT_EXEC_WAIT(N(EVS_UseMove_Impl)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 2) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(EVS_UseMove_Impl)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 3) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(EVS_UseMove_Impl)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_Impl) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseSuperHammer)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseUltraHammer)) + EVT_END_SWITCH + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVar9, BS_FLAGS1_10) + EVT_CALL(GetActionSuccessCopy, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(0) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_END_SWITCH + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_WAIT(1) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/hammer/d_down_pound.c b/src/battle/move/hammer/d_down_pound.c new file mode 100644 index 0000000000..14bff17153 --- /dev/null +++ b/src/battle/move/hammer/d_down_pound.c @@ -0,0 +1,147 @@ +#include "common.h" +#include "script_api/battle.h" +#include "effects.h" + +#define NAMESPACE battle_move_d_down_pound + +#include "battle/common/move/HammerSupport.inc.c" + +API_CALLABLE(func_802A10A4_74AE34) { + Bytecode* args = script->ptrReadPos; + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + + if (script->varTable[10] == 0) { + fx_green_impact(TRUE, var0 + 30, var1 + 25, var2, 45.0f); + } else { + fx_green_impact(FALSE, var0 + 30, var1 + 25, var2, 45.0f); + } + + return ApiStatus_DONE2; +} + +extern EvtScript N(UseMove_Impl); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(func_80269EAC, 3) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 50) + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 2) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 50) + EVT_SET(LVarE, 2) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 50) + EVT_SET(LVarE, 3) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(UseMove_Impl) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseSuperHammer)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseUltraHammer)) + EVT_END_SWITCH + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_IGNORE_DEFENSE, 25, 0, LVar9, 16) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 10) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 10) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_END_SWITCH + EVT_CALL(DidActionSucceed, LVar0) + EVT_IF_GT(LVar0, FALSE) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(MoveBattleCamOver, 5) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(MoveBattleCamOver, 50) + EVT_END_IF + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210A) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210B) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210C) + EVT_END_SWITCH + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_CALL(DidActionSucceed, LVarA) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_802A10A4_74AE34, LVar0, LVar1, LVar2) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_IGNORE_DEFENSE, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_IGNORE_DEFENSE, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/hammer/hammer.c b/src/battle/move/hammer/hammer.c deleted file mode 100644 index ac7e451c34..0000000000 --- a/src/battle/move/hammer/hammer.c +++ /dev/null @@ -1,942 +0,0 @@ -#include "common.h" -#include "script_api/battle.h" -#include "sprite/npc/WorldBombette.h" -#include "battle/action_cmd/hammer.h" - -#define NAMESPACE battle_move_hammer - -extern EvtScript D_802A3168_00736708; -extern EvtScript D_802A3C4C_007371EC; - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" - -EvtScript D_802A10B0_734650 = { - EVT_CALL(InitTargetIterator) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 32) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A118C_0073472C = { - EVT_CALL(SetGoalPos, ACTOR_PLAYER, -33, 0, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1204_007347A4 = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(10) - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_EQ(LVar0, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000D) - EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000D) - EVT_SWITCH(LVar1) - EVT_CASE_LT(3) - EVT_WAIT(4) - EVT_CASE_LT(5) - EVT_WAIT(3) - EVT_CASE_LT(7) - EVT_WAIT(2) - EVT_CASE_LT(9) - EVT_WAIT(1) - EVT_CASE_LT(11) - EVT_WAIT(0) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1388_00734928 = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(10) - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_EQ(LVar0, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30014) - EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30014) - EVT_SWITCH(LVar1) - EVT_CASE_LT(3) - EVT_WAIT(4) - EVT_CASE_LT(5) - EVT_WAIT(3) - EVT_CASE_LT(7) - EVT_WAIT(2) - EVT_CASE_LT(9) - EVT_WAIT(1) - EVT_CASE_LT(11) - EVT_WAIT(0) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A150C_00734AAC = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(10) - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_EQ(LVar0, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001B) - EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001B) - EVT_SWITCH(LVar1) - EVT_CASE_LT(3) - EVT_WAIT(4) - EVT_CASE_LT(5) - EVT_WAIT(3) - EVT_CASE_LT(7) - EVT_WAIT(2) - EVT_CASE_LT(9) - EVT_WAIT(1) - EVT_CASE_LT(11) - EVT_WAIT(0) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1690_00734C30 = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(SetBattleCamOffsetZ, 8) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000E) - EVT_WAIT(4) - EVT_CALL(action_command_hammer_start, 0, 36, 3) - EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000F) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30010) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_EQ(LVar0, 1) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30011) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30012) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A18AC_00734E4C = { - EVT_CALL(func_80276EFC) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) - EVT_CALL(MoveBattleCamOver, 5) - EVT_CALL(func_802693F0) - EVT_WAIT(20) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_WAIT(5) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1998_00734F38 = { - EVT_CALL(func_80276EFC) - EVT_CALL(func_802693F0) - EVT_WAIT(20) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_WAIT(5) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1A64_00735004 = { - EVT_CALL(func_80276EFC) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_29) - EVT_CALL(func_802693F0) - EVT_WAIT(20) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_WAIT(5) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A1B40) = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A10B0_734650) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A1204_007347A4) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 0, 0, 0, BS_FLAGS1_10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(SetBattleCamOffsetZ, 8) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000E) - EVT_WAIT(4) - EVT_CALL(N(IsBerserkerEquipped)) - EVT_IF_NE(LVar0, ACTION_COMMAND_MODE_NOT_LEARNED) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000F) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_LT(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_CALL(N(ShouldMovesAutoSucceed)) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30010) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_LT(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_END_IF - EVT_ELSE - EVT_CALL(action_command_hammer_start, 0, LVar1, 3) - EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000F) - EVT_SUB(LVar1, 10) - EVT_WAIT(LVar1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30010) - EVT_WAIT(5) - EVT_END_IF - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_EQ(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL_WAIT_INPUT) - EVT_LOOP(0) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_LT(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30011) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2115) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30012) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2118) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A2000_007355A0 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A10B0_734650) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A1388_00734928) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 0, 0, 0, BS_FLAGS1_10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(SetBattleCamOffsetZ, 8) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30015) - EVT_WAIT(4) - EVT_CALL(N(IsBerserkerEquipped)) - EVT_IF_EQ(LVar0, ACTION_COMMAND_MODE_LEARNED) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30016) - EVT_CALL(N(ShouldMovesAutoSucceed)) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30017) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_ELSE - EVT_CALL(action_command_hammer_start, 0, LVar1, 3) - EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30016) - EVT_SUB(LVar1, 10) - EVT_WAIT(LVar1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30017) - EVT_WAIT(5) - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30018) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2116) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30019) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2119) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A23E8_735988 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A10B0_734650) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A150C_00734AAC) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 0, 0, 0, BS_FLAGS1_10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(SetBattleCamOffsetZ, 8) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001C) - EVT_WAIT(4) - EVT_CALL(N(IsBerserkerEquipped)) - EVT_IF_EQ(LVar0, ACTION_COMMAND_MODE_LEARNED) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001D) - EVT_CALL(N(ShouldMovesAutoSucceed)) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001E) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_ELSE - EVT_CALL(action_command_hammer_start, 0, LVar1, 3) - EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001D) - EVT_SUB(LVar1, 10) - EVT_WAIT(LVar1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001E) - EVT_WAIT(5) - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001F) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2117) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30020) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211A) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_802A27D0) = { - EVT_CALL(ChooseNextTarget, 10, LVar0) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A118C_0073472C) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A1204_007347A4) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(AddBattleCamZoom, 80) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000E) - EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000F) - EVT_CALL(N(ShouldMovesAutoSucceed)) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30010) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2115) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30011) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30012) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2118) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A2AFC_0073609C = { - EVT_CALL(ChooseNextTarget, 10, LVar0) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A118C_0073472C) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A1388_00734928) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(AddBattleCamZoom, 80) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30015) - EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30016) - EVT_CALL(N(ShouldMovesAutoSucceed)) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_LOOP(60) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2116) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30018) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30019) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2119) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A2DA0_00736340 = { - EVT_CALL(ChooseNextTarget, 10, LVar0) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A118C_0073472C) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A150C_00734AAC) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(AddBattleCamZoom, 80) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001C) - EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001D) - EVT_CALL(N(ShouldMovesAutoSucceed)) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_LOOP(60) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2117) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001F) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30020) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211A) - EVT_RETURN - EVT_END -}; - -EvtScript battle_move_hammer_802A3044 = { - EVT_CALL(ShowActionHud, 1) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_SET(LVarD, 45) - EVT_SET(LVarE, 1) - EVT_SET(LVarF, 2) - EVT_EXEC_WAIT(D_802A3168_00736708) - EVT_CASE_EQ(1) - EVT_SET(LVarD, 45) - EVT_SET(LVarE, 2) - EVT_SET(LVarF, 4) - EVT_EXEC_WAIT(D_802A3168_00736708) - EVT_CASE_EQ(2) - EVT_SET(LVarD, 45) - EVT_SET(LVarE, 3) - EVT_SET(LVarF, 6) - EVT_EXEC_WAIT(D_802A3168_00736708) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A3168_00736708 = { - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_EXEC_WAIT(N(D_802A1B40)) - EVT_CASE_EQ(1) - EVT_EXEC_WAIT(D_802A2000_007355A0) - EVT_CASE_EQ(2) - EVT_EXEC_WAIT(D_802A23E8_735988) - EVT_END_SWITCH - EVT_CALL(GetActionSuccessCopy, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(StartRumble, 7) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.3)) - EVT_END_THREAD - EVT_CASE_EQ(1) - EVT_CALL(StartRumble, 8) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.6)) - EVT_END_THREAD - EVT_CASE_EQ(2) - EVT_CALL(StartRumble, 9) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.9)) - EVT_END_THREAD - EVT_END_SWITCH - EVT_CASE_DEFAULT - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(StartRumble, 7) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.3)) - EVT_END_THREAD - EVT_CASE_EQ(1) - EVT_CALL(StartRumble, 8) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.6)) - EVT_END_THREAD - EVT_CASE_EQ(2) - EVT_CALL(StartRumble, 9) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.9)) - EVT_END_THREAD - EVT_END_SWITCH - EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) - EVT_WAIT(1) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 25, 0, 0, BS_FLAGS1_10) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(D_802A1A64_00735004) - EVT_RETURN - EVT_END_IF - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) - EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) - EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, 64, 25, 0, LVarF, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) - EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) - EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, 64, 25, 0, LVarE, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_EXEC_WAIT(D_802A18AC_00734E4C) - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_EXEC_WAIT(D_802A1A64_00735004) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript battle_move_hammer_802A369C = { - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_SET(LVar9, 1) - EVT_SET_CONST(LVarA, ANIM_WorldBombette_Celebrate) - EVT_SET_CONST(LVarB, ANIM_WorldBombette_Aftermath) - EVT_SET_CONST(LVarC, ANIM_Mario_30012) - EVT_CASE_EQ(1) - EVT_SET(LVar9, 2) - EVT_SET_CONST(LVarA, ANIM_Mario_30016) - EVT_SET_CONST(LVarB, ANIM_Mario_30017) - EVT_SET_CONST(LVarC, ANIM_Mario_30019) - EVT_CASE_EQ(2) - EVT_SET(LVar9, 3) - EVT_SET_CONST(LVarA, ANIM_Mario_3001D) - EVT_SET_CONST(LVarB, ANIM_Mario_3001E) - EVT_SET_CONST(LVarC, ANIM_Mario_30020) - EVT_END_SWITCH - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 32) - EVT_SET(LVar1, 0) - EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_43) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LVarA) - EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LVarB) - EVT_WAIT(3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, LVarC) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2115) - EVT_CALL(StartRumble, 7) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.3)) - EVT_END_THREAD - EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2116) - EVT_CALL(StartRumble, 8) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.6)) - EVT_END_THREAD - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2117) - EVT_CALL(StartRumble, 9) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.9)) - EVT_END_THREAD - EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) - EVT_WAIT(1) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 25, 0, 0, BS_FLAGS1_10) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(D_802A1A64_00735004) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) - EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) - EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, 64, 25, 0, LVar9, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_EXEC_WAIT(D_802A18AC_00734E4C) - EVT_RETURN - EVT_END -}; - -EvtScript battle_move_hammer_802A3B28 = { - EVT_CALL(ShowActionHud, 1) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_SET(LVarD, 75) - EVT_SET(LVarE, 1) - EVT_SET(LVarF, 2) - EVT_EXEC_WAIT(D_802A3C4C_007371EC) - EVT_CASE_EQ(1) - EVT_SET(LVarD, 66) - EVT_SET(LVarE, 2) - EVT_SET(LVarF, 4) - EVT_EXEC_WAIT(D_802A3C4C_007371EC) - EVT_CASE_EQ(2) - EVT_SET(LVarD, 57) - EVT_SET(LVarE, 3) - EVT_SET(LVarF, 6) - EVT_EXEC_WAIT(D_802A3C4C_007371EC) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A3C4C_007371EC = { - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_EXEC_WAIT(N(D_802A1B40)) - EVT_CASE_EQ(1) - EVT_EXEC_WAIT(D_802A2000_007355A0) - EVT_CASE_EQ(2) - EVT_EXEC_WAIT(D_802A23E8_735988) - EVT_END_SWITCH - EVT_CALL(PlayerTestEnemy, LVar0, 64, 25, 0, LVar9, BS_FLAGS1_10) - EVT_IF_EQ(LVar0, 6) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(StartRumble, 8) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.3)) - EVT_END_THREAD - EVT_CASE_EQ(1) - EVT_CALL(StartRumble, 9) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.6)) - EVT_END_THREAD - EVT_CASE_EQ(2) - EVT_CALL(StartRumble, 10) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.9)) - EVT_END_THREAD - EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) - EVT_EXEC_WAIT(D_802A1A64_00735004) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetActionSuccessCopy, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(StartRumble, 8) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.3)) - EVT_END_THREAD - EVT_CASE_EQ(1) - EVT_CALL(StartRumble, 9) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.6)) - EVT_END_THREAD - EVT_CASE_EQ(2) - EVT_CALL(StartRumble, 10) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.9)) - EVT_END_THREAD - EVT_END_SWITCH - EVT_CASE_DEFAULT - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(StartRumble, 8) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.3)) - EVT_END_THREAD - EVT_CASE_EQ(1) - EVT_CALL(StartRumble, 9) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.6)) - EVT_END_THREAD - EVT_CASE_EQ(2) - EVT_CALL(StartRumble, 10) - EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.9)) - EVT_END_THREAD - EVT_END_SWITCH - EVT_END_SWITCH - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) - EVT_WAIT(1) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 25, 0, 0, BS_FLAGS1_10) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(D_802A1A64_00735004) - EVT_RETURN - EVT_END_IF - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) - EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) - EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, 64, 25, 0, LVarF, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) - EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) - EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, 64, 25, 0, LVarE, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_EXEC_WAIT(D_802A18AC_00734E4C) - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_EXEC_WAIT(D_802A1A64_00735004) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; diff --git a/src/battle/move/hammer/hammer_charge_0.c b/src/battle/move/hammer/hammer_charge_0.c new file mode 100644 index 0000000000..bad6d86fe9 --- /dev/null +++ b/src/battle/move/hammer/hammer_charge_0.c @@ -0,0 +1,339 @@ +#include "common.h" +#include "effects.h" + +#define NAMESPACE battle_move_hammer_charge_0 + +#include "battle/common/move/HammerSupport.inc.c" + +#include "world/common/todo/IsHammerMaxCharged.inc.c" + +API_CALLABLE(func_802A10C8_74F1F8) { + Bytecode* args = script->ptrReadPos; + BattleStatus* battleStatus = &gBattleStatus; + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + + fx_stat_change(0, var1, var2, var3, 1.0f, 60); + + battleStatus->hammerCharge++; + if (battleStatus->hammerCharge > 99) { + battleStatus->hammerCharge = 99; + } + + battleStatus->jumpCharge = 0; + battleStatus->flags1 |= BS_FLAGS1_HAMMER_CHARGED; + battleStatus->flags1 &= ~BS_FLAGS1_JUMP_CHARGED; + + return ApiStatus_DONE2; +} + +API_CALLABLE(func_802A11CC_74F2FC) { + Bytecode* args = script->ptrReadPos; + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + f32 var3 = evt_get_float_variable(script, *args++); + + fx_energy_in_out(6, var0 + 10, var1 + 18, var2, var3, 45); + + return ApiStatus_DONE2; +} + +extern EvtScript N(EVS_802A3348); + +EvtScript N(EVS_UseMove1) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 65) + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 2) + EVT_EXEC_WAIT(N(EVS_802A3348)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 65) + EVT_SET(LVarE, 2) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(EVS_802A3348)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 65) + EVT_SET(LVarE, 4) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(EVS_802A3348)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3348) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseSuperHammer)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_END_SWITCH + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVar9, 16) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(ITEM_NONE) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(ITEM_BOOTS) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(ITEM_SUPER_BOOTS) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(ITEM_NONE) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(ITEM_BOOTS) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(ITEM_SUPER_BOOTS) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_END_SWITCH + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_SET(LocalFlag(0), FALSE) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(ITEM_NONE) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(ITEM_BOOTS) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(ITEM_SUPER_BOOTS) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 48) + EVT_SET(LocalFlag(0), TRUE) + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(ITEM_NONE) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(ITEM_BOOTS) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(ITEM_SUPER_BOOTS) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 32) + EVT_SET(LocalFlag(0), FALSE) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +extern EvtScript N(EVS_802A3948); +extern EvtScript N(EVS_802A3C90); +extern EvtScript N(EVS_802A3FD8); + +EvtScript N(EVS_UseMove0) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(ITEM_NONE) + EVT_EXEC_WAIT(N(EVS_802A3948)) + EVT_CASE_EQ(ITEM_BOOTS) + EVT_EXEC_WAIT(N(EVS_802A3C90)) + EVT_CASE_EQ(ITEM_SUPER_BOOTS) + EVT_EXEC_WAIT(N(EVS_802A3FD8)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3948) = { + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_END_THREAD + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50004) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_802A11CC_74F2FC, LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) + EVT_WAIT(3) + EVT_CALL(func_802A11CC_74F2FC, LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) + EVT_WAIT(30) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(MoveBattleCamOver, 5) + EVT_CALL(N(IsHammerMaxCharged)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 15) + EVT_ADD(LVar1, 35) + EVT_CALL(func_802A10C8_74F1F8, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_WAIT(4) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50005, ANIM_Mario_50005, ANIM_Mario_50005) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_80273444, 20, 0, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) + EVT_CALL(ShowVariableMessageBox, 4, 60, 1) + EVT_ELSE + EVT_CALL(ShowMessageBox, 8, 60) + EVT_END_IF + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(IsMessageBoxDisplayed, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3C90) = { + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_END_THREAD + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50006) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_802A11CC_74F2FC, LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) + EVT_WAIT(3) + EVT_CALL(func_802A11CC_74F2FC, LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) + EVT_WAIT(30) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(MoveBattleCamOver, 5) + EVT_CALL(N(IsHammerMaxCharged)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 15) + EVT_ADD(LVar1, 35) + EVT_CALL(func_802A10C8_74F1F8, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_WAIT(4) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50007, ANIM_Mario_50007, ANIM_Mario_50007) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_80273444, 20, 0, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) + EVT_CALL(ShowVariableMessageBox, 4, 60, 1) + EVT_ELSE + EVT_CALL(ShowMessageBox, 8, 60) + EVT_END_IF + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(IsMessageBoxDisplayed, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3FD8) = { + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_END_THREAD + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50008) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_802A11CC_74F2FC, LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) + EVT_WAIT(3) + EVT_CALL(func_802A11CC_74F2FC, LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) + EVT_WAIT(30) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(MoveBattleCamOver, 5) + EVT_CALL(N(IsHammerMaxCharged)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 15) + EVT_ADD(LVar1, 35) + EVT_CALL(func_802A10C8_74F1F8, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_WAIT(4) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50009, ANIM_Mario_50009, ANIM_Mario_50009) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_80273444, 20, 0, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) + EVT_CALL(ShowVariableMessageBox, 4, 60, 1) + EVT_ELSE + EVT_CALL(ShowMessageBox, 8, 60) + EVT_END_IF + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(IsMessageBoxDisplayed, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) + EVT_RETURN + EVT_END +}; + + diff --git a/src/battle/move/hammer/hammer_charge_1.c b/src/battle/move/hammer/hammer_charge_1.c new file mode 100644 index 0000000000..e94fc29e74 --- /dev/null +++ b/src/battle/move/hammer/hammer_charge_1.c @@ -0,0 +1,349 @@ +#include "common.h" +#include "effects.h" + +#define NAMESPACE battle_move_hammer_charge_1 + +#include "battle/common/move/HammerSupport.inc.c" + +#include "world/common/todo/IsHammerMaxCharged.inc.c" + +BSS s32 D_802A43D0; + +API_CALLABLE(func_802A10C8_759678) { + Bytecode* args = script->ptrReadPos; + BattleStatus* battleStatus = &gBattleStatus; + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32* var4; + + fx_stat_change(1, var1, var2, var3, 1.0f, 60); + var4 = &D_802A43D0; + *var4 = 0; + if (battleStatus->hammerCharge > 0) { + *var4 = 1; + } + + battleStatus->hammerCharge += 2; + + if (battleStatus->hammerCharge > 99) { + battleStatus->hammerCharge = 99; + } + + battleStatus->jumpCharge = 0; + battleStatus->flags1 |= BS_FLAGS1_HAMMER_CHARGED; + battleStatus->flags1 &= ~BS_FLAGS1_JUMP_CHARGED; + + return ApiStatus_DONE2; +} + +#include "world/common/todo/UnkMoveFunc2.inc.c" + +API_CALLABLE(func_802A12FC_7598AC) { + if (D_802A43D0 == 0) { + script->varTable[0] = 4; + } else { + script->varTable[0] = 5; + } + + return ApiStatus_DONE2; +} + +extern EvtScript N(EVS_UseMove1_Impl); + +EvtScript N(EVS_UseMove1) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 65) + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 2) + EVT_EXEC_WAIT(N(EVS_UseMove1_Impl)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 65) + EVT_SET(LVarE, 2) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(EVS_UseMove1_Impl)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 65) + EVT_SET(LVarE, 4) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(EVS_UseMove1_Impl)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove1_Impl) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseSuperHammer)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_END_SWITCH + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVar9, 16) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_END_SWITCH + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_SET(LocalFlag(0), FALSE) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 48) + EVT_SET(LocalFlag(0), TRUE) + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 32) + EVT_SET(LocalFlag(0), FALSE) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +extern EvtScript N(EVS_802A39C8); +extern EvtScript N(EVS_802A3D1C); +extern EvtScript N(EVS_802A4070); + +EvtScript N(EVS_UseMove0) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_802A39C8)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_802A3D1C)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_802A4070)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A39C8) = { + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_END_THREAD + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50004) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) + EVT_WAIT(3) + EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) + EVT_WAIT(30) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(MoveBattleCamOver, 5) + EVT_CALL(N(IsHammerMaxCharged)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 15) + EVT_ADD(LVar1, 35) + EVT_CALL(func_802A10C8_759678, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_WAIT(4) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50005, ANIM_Mario_50005, ANIM_Mario_50005) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_80273444, 20, 0, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) + EVT_CALL(func_802A12FC_7598AC) + EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) + EVT_ELSE + EVT_CALL(ShowMessageBox, 8, 60) + EVT_END_IF + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(IsMessageBoxDisplayed, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3D1C) = { + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_END_THREAD + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50006) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) + EVT_WAIT(3) + EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) + EVT_WAIT(30) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(MoveBattleCamOver, 5) + EVT_CALL(N(IsHammerMaxCharged)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 15) + EVT_ADD(LVar1, 35) + EVT_CALL(func_802A10C8_759678, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_WAIT(4) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50007, ANIM_Mario_50007, ANIM_Mario_50007) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_80273444, 20, 0, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) + EVT_CALL(func_802A12FC_7598AC) + EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) + EVT_ELSE + EVT_CALL(ShowMessageBox, 8, 60) + EVT_END_IF + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(IsMessageBoxDisplayed, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A4070) = { + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_END_THREAD + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50008) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) + EVT_WAIT(3) + EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) + EVT_WAIT(30) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(MoveBattleCamOver, 5) + EVT_CALL(N(IsHammerMaxCharged)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 15) + EVT_ADD(LVar1, 35) + EVT_CALL(func_802A10C8_759678, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_WAIT(4) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50009, ANIM_Mario_50009, ANIM_Mario_50009) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_80273444, 20, 0, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) + EVT_CALL(func_802A12FC_7598AC) + EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) + EVT_ELSE + EVT_CALL(ShowMessageBox, 8, 60) + EVT_END_IF + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(IsMessageBoxDisplayed, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/hammer/hammer_charge_2.c b/src/battle/move/hammer/hammer_charge_2.c new file mode 100644 index 0000000000..dde517b3b8 --- /dev/null +++ b/src/battle/move/hammer/hammer_charge_2.c @@ -0,0 +1,343 @@ +#include "common.h" +#include "effects.h" + +#define NAMESPACE battle_move_hammer_charge_2 + +#include "battle/common/move/HammerSupport.inc.c" + +#include "world/common/todo/IsHammerMaxCharged.inc.c" + +BSS s32 D_802A4350; + +API_CALLABLE(func_802A10C8_75E698) { + Bytecode* args = script->ptrReadPos; + BattleStatus* battleStatus = &gBattleStatus; + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32* var4; + + fx_stat_change(2, var1, var2, var3, 1.0f, 60); + var4 = &D_802A4350; + *var4 = 0; + if (battleStatus->hammerCharge > 0) { + *var4 = 1; + } + + battleStatus->hammerCharge += 3; + + if (battleStatus->hammerCharge > 99) { + battleStatus->hammerCharge = 99; + } + + battleStatus->jumpCharge = 0; + battleStatus->flags1 |= BS_FLAGS1_HAMMER_CHARGED; + battleStatus->flags1 &= ~BS_FLAGS1_JUMP_CHARGED; + + return ApiStatus_DONE2; +} + +#include "world/common/todo/UnkMoveFunc3.inc.c" + +API_CALLABLE(func_802A12FC_75E8CC) { + if (D_802A4350 == 0) { + script->varTable[0] = 4; + } else { + script->varTable[0] = 5; + } + + return ApiStatus_DONE2; +} + +extern EvtScript N(EVS_UseMove1_Impl); + +EvtScript N(EVS_UseMove1) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 65) + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 2) + EVT_EXEC_WAIT(N(EVS_UseMove1_Impl)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 65) + EVT_SET(LVarE, 2) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(EVS_UseMove1_Impl)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 65) + EVT_SET(LVarE, 4) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(EVS_UseMove1_Impl)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove1_Impl) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseSuperHammer)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_END_SWITCH + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVar9, 16) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_END_SWITCH + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_SET(LocalFlag(0), FALSE) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 48) + EVT_SET(LocalFlag(0), TRUE) + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 32) + EVT_SET(LocalFlag(0), FALSE) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +extern EvtScript N(EVS_802A39C8); +extern EvtScript N(EVS_802A3CF4); +extern EvtScript N(EVS_802A4020); + +EvtScript N(EVS_UseMove0) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_802A39C8)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_802A3CF4)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_802A4020)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A39C8) = { + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_END_THREAD + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50004) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) + EVT_WAIT(3) + EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) + EVT_WAIT(30) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(MoveBattleCamOver, 5) + EVT_CALL(N(IsHammerMaxCharged)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 15) + EVT_ADD(LVar1, 35) + EVT_CALL(func_802A10C8_75E698, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_WAIT(4) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50005, ANIM_Mario_50005, ANIM_Mario_50005) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_80273444, 20, 0, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(func_802A12FC_75E8CC) + EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) + EVT_ELSE + EVT_CALL(ShowMessageBox, 8, 60) + EVT_END_IF + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(IsMessageBoxDisplayed, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3CF4) = { + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_END_THREAD + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50006) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) + EVT_WAIT(3) + EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) + EVT_WAIT(30) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(MoveBattleCamOver, 5) + EVT_CALL(N(IsHammerMaxCharged)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 15) + EVT_ADD(LVar1, 35) + EVT_CALL(func_802A10C8_75E698, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_WAIT(4) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50007, ANIM_Mario_50007, ANIM_Mario_50007) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_80273444, 20, 0, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(func_802A12FC_75E8CC) + EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) + EVT_ELSE + EVT_CALL(ShowMessageBox, 8, 60) + EVT_END_IF + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(IsMessageBoxDisplayed, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A4020) = { + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_END_THREAD + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50008) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) + EVT_WAIT(3) + EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) + EVT_WAIT(30) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(MoveBattleCamOver, 5) + EVT_CALL(N(IsHammerMaxCharged)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 15) + EVT_ADD(LVar1, 35) + EVT_CALL(func_802A10C8_75E698, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_WAIT(4) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50009, ANIM_Mario_50009, ANIM_Mario_50009) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_80273444, 20, 0, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(func_802A12FC_75E8CC) + EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) + EVT_ELSE + EVT_CALL(ShowMessageBox, 8, 60) + EVT_END_IF + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(IsMessageBoxDisplayed, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(0) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/hammer/hammer_throw.c b/src/battle/move/hammer/hammer_throw.c new file mode 100644 index 0000000000..c0b7952731 --- /dev/null +++ b/src/battle/move/hammer/hammer_throw.c @@ -0,0 +1,427 @@ +#include "common.h" +#include "effects.h" +#include "entity.h" + +#define NAMESPACE battle_move_hammer_throw + +#include "battle/common/move/HammerSupport.inc.c" + +static s32 pad_images = 0; + +#include "battle/move/hammer/dusty_hammer.png.inc.c" +#include "battle/move/hammer/dusty_hammer.pal.inc.c" + +#include "battle/move/hammer/basic_hammer.png.inc.c" +#include "battle/move/hammer/basic_hammer.pal.inc.c" + +#include "battle/move/hammer/super_hammer.png.inc.c" +#include "battle/move/hammer/super_hammer.pal.inc.c" + +#include "battle/move/hammer/ultra_hammer.png.inc.c" +#include "battle/move/hammer/ultra_hammer.pal.inc.c" + +#include "battle/move/hammer/hammer_throw.vtx.inc.c" + +#include "battle/move/hammer/dusty_hammer.gfx.inc.c" +#include "battle/move/hammer/basic_hammer.gfx.inc.c" +#include "battle/move/hammer/super_hammer.gfx.inc.c" +#include "battle/move/hammer/ultra_hammer.gfx.inc.c" + +EntityModelScript N(EMS_DustyHammer) = STANDARD_ENTITY_MODEL_SCRIPT(N(dusty_hammer_gfx), RENDER_MODE_ALPHATEST); +EntityModelScript N(EMS_BasicHammer) = STANDARD_ENTITY_MODEL_SCRIPT(N(basic_hammer_gfx), RENDER_MODE_ALPHATEST); +EntityModelScript N(EMS_SuperHammer) = STANDARD_ENTITY_MODEL_SCRIPT(N(super_hammer_gfx), RENDER_MODE_ALPHATEST); +EntityModelScript N(EMS_UltraHammer) = STANDARD_ENTITY_MODEL_SCRIPT(N(ultra_hammer_gfx), RENDER_MODE_ALPHATEST); + +extern EvtScript N(EVS_UseMove_Impl); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 50) + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 2) + EVT_EXEC_WAIT(N(EVS_UseMove_Impl)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 50) + EVT_SET(LVarE, 2) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(EVS_UseMove_Impl)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 50) + EVT_SET(LVarE, 3) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(EVS_UseMove_Impl)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3E5C) = { + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) + EVT_SET(LVar1, 0) + EVT_LOOP(10) + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_ADD(LVar1, 1) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40016) + EVT_END_LOOP + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40016) + EVT_SWITCH(LVar1) + EVT_CASE_LT(3) + EVT_WAIT(4) + EVT_CASE_LT(5) + EVT_WAIT(3) + EVT_CASE_LT(7) + EVT_WAIT(2) + EVT_CASE_LT(9) + EVT_WAIT(1) + EVT_CASE_LT(11) + EVT_WAIT(0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3FE0) = { + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) + EVT_SET(LVar1, 0) + EVT_LOOP(10) + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_ADD(LVar1, 1) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4001C) + EVT_END_LOOP + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4001C) + EVT_SWITCH(LVar1) + EVT_CASE_LT(3) + EVT_WAIT(4) + EVT_CASE_LT(5) + EVT_WAIT(3) + EVT_CASE_LT(7) + EVT_WAIT(2) + EVT_CASE_LT(9) + EVT_WAIT(1) + EVT_CASE_LT(11) + EVT_WAIT(0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A4164) = { + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) + EVT_SET(LVar1, 0) + EVT_LOOP(10) + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_ADD(LVar1, 1) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40022) + EVT_END_LOOP + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40022) + EVT_SWITCH(LVar1) + EVT_CASE_LT(3) + EVT_WAIT(4) + EVT_CASE_LT(5) + EVT_WAIT(3) + EVT_CASE_LT(7) + EVT_WAIT(2) + EVT_CASE_LT(9) + EVT_WAIT(1) + EVT_CASE_LT(11) + EVT_WAIT(0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_Impl) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) + EVT_CALL(action_command_hammer_init) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 16) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_802A3E5C)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_802A3FE0)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_802A4164)) + EVT_END_SWITCH + EVT_CALL(InitTargetIterator) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) + EVT_CALL(AddBattleCamZoom, 50) + EVT_CALL(MoveBattleCamOver, 20) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40017) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40018) + EVT_CASE_EQ(1) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4001D) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4001E) + EVT_CASE_EQ(2) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40023) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40024) + EVT_END_SWITCH + EVT_CALL(GetActionCommandMode, LVar0) + EVT_IF_GT(LVar0, 0) + EVT_CALL(N(ShouldMovesAutoSucceed)) + EVT_IF_EQ(LVar0, 0) + EVT_LOOP(45) + EVT_WAIT(1) + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_IF + EVT_ADD(LVarD, 6) + EVT_CALL(action_command_hammer_start, 0, LVarD, 3) + EVT_CALL(SetActionResult, 0) + EVT_SET(LVar1, 0) + EVT_LOOP(30) + EVT_WAIT(1) + EVT_CALL(GetActionResult, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_IF_NE(LVar1, 1) + EVT_CALL(GetMenuSelection, LVar3, LVar4, LVar5) + EVT_SWITCH(LVar4) + EVT_CASE_EQ(0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40019) + EVT_CASE_EQ(1) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4001F) + EVT_CASE_EQ(2) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40025) + EVT_END_SWITCH + EVT_SET(LVar1, 1) + EVT_END_IF + EVT_END_IF + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_ELSE + EVT_WAIT(10) + EVT_CALL(GetMenuSelection, LVar3, LVar4, LVar5) + EVT_SWITCH(LVar4) + EVT_CASE_EQ(0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40019) + EVT_CASE_EQ(1) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4001F) + EVT_CASE_EQ(2) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40025) + EVT_END_SWITCH + EVT_WAIT(30) + EVT_END_IF + EVT_CALL(GetActionCommandMode, LVar0) + EVT_IF_GT(LVar0, 0) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetActionSuccess, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_IF + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4001B) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2115) + EVT_CASE_EQ(1) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40021) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2116) + EVT_CASE_EQ(2) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40027) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2117) + EVT_END_SWITCH + EVT_WAIT(3) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(N(EMS_BasicHammer))) + EVT_CASE_EQ(1) + EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(N(EMS_SuperHammer))) + EVT_CASE_EQ(2) + EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(N(EMS_UltraHammer))) + EVT_END_SWITCH + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 20) + EVT_ADD(LVar1, 42) + EVT_ADD(LVar2, 5) + EVT_CALL(SetVirtualEntityPosition, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(SetVirtualEntityScale, LVarA, EVT_FLOAT(0.6), EVT_FLOAT(0.6), EVT_FLOAT(0.6)) + EVT_CALL(InitTargetIterator) + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) + EVT_CALL(DidActionSucceed, LVar3) + EVT_SWITCH(LVar3) + EVT_CASE_GT(FALSE) + EVT_THREAD + EVT_SET(LVar0, 0) + EVT_LOOP(9) + EVT_ADD(LVar0, 60) + EVT_CALL(SetVirtualEntityRotation, LVarA, 0, 0, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetVirtualEntityJumpGravity, LVarA, EVT_FLOAT(1.3)) + EVT_ADD(LVar2, 5) + EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 11) + EVT_CASE_DEFAULT + EVT_THREAD + EVT_SET(LVar0, 0) + EVT_LOOP(18) + EVT_ADD(LVar0, 60) + EVT_CALL(SetVirtualEntityRotation, LVarA, 0, 0, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetVirtualEntityJumpGravity, LVarA, EVT_FLOAT(0.7)) + EVT_ADD(LVar2, 5) + EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 20) + EVT_END_SWITCH + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(PlayerTestEnemy, LVar3, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_NO_CONTACT, 25, 0, 0, 16) + EVT_IF_EQ(LVar3, HIT_RESULT_MISS) + EVT_CALL(VirtualEntityLandJump, LVarA) + EVT_CALL(DeleteVirtualEntity, LVarA) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_THREAD + EVT_CALL(DidActionSucceed, LVar3) + EVT_SWITCH(LVar3) + EVT_CASE_GT(FALSE) + EVT_CALL(SetVirtualEntityJumpGravity, LVarA, EVT_FLOAT(1.4)) + EVT_ADD(LVar0, 60) + EVT_ADD(LVar1, 0) + EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 10) + EVT_CALL(DeleteVirtualEntity, LVarA) + EVT_CASE_DEFAULT + EVT_CALL(SetVirtualEntityJumpGravity, LVarA, EVT_FLOAT(0.8)) + EVT_ADD(LVar0, 40) + EVT_ADD(LVar1, 0) + EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 15) + EVT_CALL(DeleteVirtualEntity, LVarA) + EVT_END_SWITCH + EVT_END_THREAD + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_END_SWITCH + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_CALL(MoveBattleCamOver, 10) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210A) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210B) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210C) + EVT_END_SWITCH + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_THROW | DAMAGE_TYPE_NO_CONTACT, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_THROW | DAMAGE_TYPE_NO_CONTACT, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/hammer/mega_quake.c b/src/battle/move/hammer/mega_quake.c new file mode 100644 index 0000000000..f01c23d4e0 --- /dev/null +++ b/src/battle/move/hammer/mega_quake.c @@ -0,0 +1,215 @@ +#include "common.h" +#include "effects.h" + +#define NAMESPACE battle_move_mega_quake + +#include "battle/common/move/HammerSupport.inc.c" + +API_CALLABLE(func_802A10A4_756824) { + if (isInitialCall) { + script->functionTemp[0] = 0; + } + + if (script->functionTemp[0] != 0) { + if (script->functionTemp[0] != 1) { + return ApiStatus_BLOCK; + } + } else { + script->functionTemp[1] = 30; + script->functionTemp[0] = 1; + } + + set_screen_overlay_center(1, 0, 0, 0); + set_screen_overlay_center(1, 1, SCREEN_WIDTH, SCREEN_HEIGHT); + set_screen_overlay_params_back(12, 160.0f); + + if (script->functionTemp[1] != 0) { + script->functionTemp[1]--; + return ApiStatus_BLOCK; + } else { + set_screen_overlay_center(1, 0, 0, 0); + set_screen_overlay_center(1, 1, SCREEN_WIDTH, SCREEN_HEIGHT); + set_screen_overlay_params_back(12, 0.0f); + return ApiStatus_DONE2; + } +} + +extern EvtScript N(EVS_802A3238); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 80) + EVT_SET(LVarE, 3) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(EVS_802A3238)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 80) + EVT_SET(LVarE, 3) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(EVS_802A3238)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 80) + EVT_SET(LVarE, 3) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(EVS_802A3238)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3238) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_Hammer_UseBasicQuake)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_Hammer_UseSuperQuake)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_Hammer_UseUltraQuake)) + EVT_END_SWITCH + EVT_THREAD + EVT_WAIT(8) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 24) + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 60, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_WAIT(2) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 60, 8, 33, 30, 0, 0, 0, 0, 0) + EVT_WAIT(2) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 60, 8, 66, 30, 0, 0, 0, 0, 0) + EVT_END_THREAD + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(StartRumble, 11) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(1.05)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.6)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.15)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.07519531)) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 24) + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_WAIT(5) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 24, 30, 0, 0, 0, 0, 0) + EVT_WAIT(5) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 48, 30, 0, 0, 0, 0, 0) + EVT_WAIT(5) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 72, 30, 0, 0, 0, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_END_THREAD + EVT_CASE_DEFAULT + EVT_CALL(StartRumble, 11) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.24)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(2.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(0.84)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.48)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.12)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.06)) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 24) + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_WAIT(5) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 24, 30, 0, 0, 0, 0, 0) + EVT_WAIT(5) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 48, 30, 0, 0, 0, 0, 0) + EVT_WAIT(5) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 72, 30, 0, 0, 0, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_END_THREAD + EVT_END_SWITCH + EVT_CALL(DidActionSucceed, LVar0) + EVT_IF_GT(LVar0, FALSE) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) + EVT_CALL(MoveBattleCamOver, 5) + EVT_WAIT(15) + EVT_SETF(LVar6, EVT_FLOAT(0.0)) + EVT_LOOP(10) + EVT_SET(LVar4, LVar3) + EVT_SET(LVar5, LVar2) + EVT_ADDF(LVar6, EVT_FLOAT(36.0)) + EVT_CALL(AddVectorPolar, LVar4, LVar5, EVT_FLOAT(300.0), LVar6) + EVT_SET(LVarA, LVarF) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar3, 1, LVar2, LVar4, 1, LVar5, EVT_FLOAT(4.0), 30, 0, 0, 0, 0) + EVT_SET(LVarF, LVarA) + EVT_END_LOOP + EVT_WAIT(10) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) + EVT_CALL(MoveBattleCamOver, 50) + EVT_END_IF + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211B) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211C) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211D) + EVT_END_SWITCH + EVT_WAIT(10) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2118) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2119) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211A) + EVT_END_SWITCH + EVT_SET(LVar9, 0) + EVT_CALL(InitTargetIterator) + EVT_LABEL(10) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_QUAKE_HAMMER, 29, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(11) + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_LABEL(11) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar1) + EVT_ADD(LVar9, 1) + EVT_CALL(GetTargetListLength, LVar1) + EVT_IF_LT(LVar9, LVar1) + EVT_GOTO(10) + EVT_END_IF + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_END_THREAD + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_RETURN + EVT_END +}; + + diff --git a/src/battle/move/hammer/mega_smash.c b/src/battle/move/hammer/mega_smash.c new file mode 100644 index 0000000000..24789e5cae --- /dev/null +++ b/src/battle/move/hammer/mega_smash.c @@ -0,0 +1,110 @@ +#include "common.h" +#include "script_api/battle.h" + +#define NAMESPACE battle_move_mega_smash + +#include "battle/common/move/HammerSupport.inc.c" + +extern EvtScript N(UseMove_Impl); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 5) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 6) + EVT_SET(LVarF, 8) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 7) + EVT_SET(LVarF, 10) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_END_SWITCH + EVT_CALL(EnablePlayerBlur, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3188) = { + EVT_CALL(StartRumble, 11) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(6.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(5.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(UseMove_Impl) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseSuperHammer)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseUltraHammer)) + EVT_END_SWITCH + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_WAIT(1) + EVT_EXEC_WAIT(N(EVS_802A3188)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/hammer/power_quake.c b/src/battle/move/hammer/power_quake.c new file mode 100644 index 0000000000..7d56a2a8a5 --- /dev/null +++ b/src/battle/move/hammer/power_quake.c @@ -0,0 +1,162 @@ +#include "common.h" +#include "effects.h" + +#define NAMESPACE battle_move_power_quake + +#include "battle/common/move/HammerSupport.inc.c" + +extern EvtScript N(EVS_802A3168); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 80) + EVT_SET(LVarE, 2) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(EVS_802A3168)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 80) + EVT_SET(LVarE, 2) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(EVS_802A3168)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 80) + EVT_SET(LVarE, 2) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(EVS_802A3168)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3168) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_Hammer_UseBasicQuake)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_Hammer_UseSuperQuake)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_Hammer_UseUltraQuake)) + EVT_END_SWITCH + EVT_THREAD + EVT_WAIT(8) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 24) + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 60, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_WAIT(2) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 60, 8, 33, 30, 0, 0, 0, 0, 0) + EVT_WAIT(2) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 60, 8, 66, 30, 0, 0, 0, 0, 0) + EVT_END_THREAD + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(StartRumble, 10) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.24)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(2.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(0.84)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.48)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.12)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.06)) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 24) + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_WAIT(5) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 24, 30, 0, 0, 0, 0, 0) + EVT_WAIT(5) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 48, 30, 0, 0, 0, 0, 0) + EVT_WAIT(5) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 72, 30, 0, 0, 0, 0, 0) + EVT_END_THREAD + EVT_CASE_DEFAULT + EVT_CALL(StartRumble, 10) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.1)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.05)) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 24) + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 24, 30, 0, 0, 0, 0, 0) + EVT_WAIT(6) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 96, 8, 48, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 96, 8, 72, 30, 0, 0, 0, 0, 0) + EVT_END_THREAD + EVT_END_SWITCH + EVT_CALL(DidActionSucceed, LVar0) + EVT_IF_GT(LVar0, FALSE) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) + EVT_CALL(MoveBattleCamOver, 5) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) + EVT_CALL(MoveBattleCamOver, 50) + EVT_END_IF + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211B) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211C) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211D) + EVT_END_SWITCH + EVT_WAIT(10) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2118) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2119) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211A) + EVT_END_SWITCH + EVT_SET(LVar9, 0) + EVT_CALL(InitTargetIterator) + EVT_LABEL(10) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_QUAKE_HAMMER, 29, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(11) + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_LABEL(11) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar1) + EVT_ADD(LVar9, 1) + EVT_CALL(GetTargetListLength, LVar1) + EVT_IF_LT(LVar9, LVar1) + EVT_GOTO(10) + EVT_END_IF + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_END_THREAD + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/hammer/power_smash.c b/src/battle/move/hammer/power_smash.c new file mode 100644 index 0000000000..ac4a2c66fa --- /dev/null +++ b/src/battle/move/hammer/power_smash.c @@ -0,0 +1,105 @@ +#include "common.h" +#include "script_api/battle.h" + +#define NAMESPACE battle_move_power_smash + +#include "battle/common/move/HammerSupport.inc.c" + +extern EvtScript N(UseMove_Impl); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 3) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 4) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 5) + EVT_SET(LVarF, 8) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_END_SWITCH + EVT_CALL(EnablePlayerBlur, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3188) = { + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(UseMove_Impl) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseSuperHammer)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseUltraHammer)) + EVT_END_SWITCH + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_WAIT(1) + EVT_EXEC_WAIT(N(EVS_802A3188)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_CALL(EnablePlayerBlur, 0) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/hammer/quake_hammer.c b/src/battle/move/hammer/quake_hammer.c new file mode 100644 index 0000000000..d22d75b3d5 --- /dev/null +++ b/src/battle/move/hammer/quake_hammer.c @@ -0,0 +1,147 @@ +#include "common.h" +#include "effects.h" + +#define NAMESPACE battle_move_quake_hammer + +#include "battle/common/move/HammerSupport.inc.c" + +extern EvtScript N(EVS_802A3168); + +EvtScript N(EVS_UseMove0) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 80) + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 2) + EVT_EXEC_WAIT(N(EVS_802A3168)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 80) + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 2) + EVT_EXEC_WAIT(N(EVS_802A3168)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 80) + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 2) + EVT_EXEC_WAIT(N(EVS_802A3168)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3168) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_Hammer_UseBasicQuake)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_Hammer_UseSuperQuake)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_Hammer_UseUltraQuake)) + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_WAIT(8) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 24) + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 60, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_WAIT(2) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 60, 8, 33, 30, 0, 0, 0, 0, 0) + EVT_WAIT(2) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 60, 8, 66, 30, 0, 0, 0, 0, 0) + EVT_END_CHILD_THREAD + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(StartRumble, 9) + EVT_CHILD_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.1)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.05)) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 24) + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 24, 30, 0, 0, 0, 0, 0) + EVT_END_CHILD_THREAD + EVT_CASE_DEFAULT + EVT_CALL(StartRumble, 9) + EVT_CHILD_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.1)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(0.35)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.05)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.025390625)) + EVT_END_CHILD_THREAD + EVT_END_SWITCH + EVT_CALL(DidActionSucceed, LVar0) + EVT_IF_GT(LVar0, FALSE) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) + EVT_CALL(MoveBattleCamOver, 5) + EVT_ELSE + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) + EVT_CALL(MoveBattleCamOver, 50) + EVT_END_IF + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(ITEM_NONE) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211B) + EVT_CASE_EQ(ITEM_BOOTS) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211C) + EVT_CASE_EQ(ITEM_SUPER_BOOTS) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211D) + EVT_END_SWITCH + EVT_WAIT(10) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(ITEM_NONE) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2118) + EVT_CASE_EQ(ITEM_BOOTS) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2119) + EVT_CASE_EQ(ITEM_SUPER_BOOTS) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211A) + EVT_END_SWITCH + EVT_SET(LVar9, 0) + EVT_CALL(InitTargetIterator) + EVT_LABEL(10) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_QUAKE_HAMMER, 29, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(11) + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_LABEL(11) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar1) + EVT_ADD(LVar9, 1) + EVT_CALL(GetTargetListLength, LVar1) + EVT_IF_LT(LVar9, LVar1) + EVT_GOTO(10) + EVT_END_IF + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_END_THREAD + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/hammer/shell_crack.c b/src/battle/move/hammer/shell_crack.c new file mode 100644 index 0000000000..dfd9d6a358 --- /dev/null +++ b/src/battle/move/hammer/shell_crack.c @@ -0,0 +1,126 @@ +#include "common.h" +#include "script_api/battle.h" +#include "effects.h" + +#define NAMESPACE battle_move_shell_crack + +#include "battle/common/move/HammerSupport.inc.c" + +API_CALLABLE(func_802A10A4_77F2E4) { + ActorState* playerActorState = &gBattleStatus.playerActor->state; + s32 i; + + for (i = 0; i < 20; i++) { + fx_floating_cloud_puff(0, + (playerActorState->goalPos.x + (f32) rand_int(30)) - 15.0f, + (playerActorState->goalPos.y + (f32) rand_int(20)) - 15.0f, + playerActorState->goalPos.z + 5.0f, 1.0f, 25); + } + + return ApiStatus_DONE2; +} + +extern EvtScript N(UseMove_Impl); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 60) + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 2) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 60) + EVT_SET(LVarE, 2) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 60) + EVT_SET(LVarE, 3) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3248) = { + EVT_CALL(StartRumble, 10) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(6.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(5.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(UseMove_Impl) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseSuperHammer)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseUltraHammer)) + EVT_END_SWITCH + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_EXEC_WAIT(N(EVS_802A3248)) + EVT_CALL(InitTargetIterator) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(func_802A10A4_77F2E4) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_WAIT(1) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SHELL_CRACK, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SHELL_CRACK, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/hammer/shrink_smash.c b/src/battle/move/hammer/shrink_smash.c new file mode 100644 index 0000000000..9668e85761 --- /dev/null +++ b/src/battle/move/hammer/shrink_smash.c @@ -0,0 +1,131 @@ +#include "common.h" + +#define NAMESPACE battle_move_shrink_smash + +#include "battle/common/move/HammerSupport.inc.c" + +extern EvtScript N(EVS_UseMove_Impl); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 2) + EVT_EXEC_WAIT(N(EVS_UseMove_Impl)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 2) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(EVS_UseMove_Impl)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 3) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(EVS_UseMove_Impl)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_Impl) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseSuperHammer)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseUltraHammer)) + EVT_END_SWITCH + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_CALL(GetActionSuccessCopy, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(0) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(StartRumble, 7) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.3)) + EVT_END_THREAD + EVT_CASE_EQ(1) + EVT_CALL(StartRumble, 8) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_END_THREAD + EVT_CASE_EQ(2) + EVT_CALL(StartRumble, 9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.9)) + EVT_END_THREAD + EVT_END_SWITCH + EVT_END_SWITCH + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_WAIT(1) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, DMG_STATUS_CHANCE(STATUS_FLAG_SHRINK, 3, 100), LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, DMG_STATUS_CHANCE(STATUS_FLAG_SHRINK, 3, 75), LVarE, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + + diff --git a/src/battle/move/hammer/spin_smash.c b/src/battle/move/hammer/spin_smash.c new file mode 100644 index 0000000000..b04869653b --- /dev/null +++ b/src/battle/move/hammer/spin_smash.c @@ -0,0 +1,424 @@ +#include "common.h" +#include "effects.h" + +#define NAMESPACE battle_move_spin_smash + +API_CALLABLE(func_802A1000_737890) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* playerActor = battleStatus->playerActor; + f32 xPos = playerActor->currentPos.x + 20.0f; + f32 yPos = playerActor->currentPos.y + 15.0f; + f32 zPos = playerActor->currentPos.z + 5.0f; + + fx_stars_spread(0, xPos, yPos, zPos, 6, 20); + + return ApiStatus_DONE2; +} + +API_CALLABLE(func_802A1074_737904) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* playerActor = battleStatus->playerActor; + f32 xPos = playerActor->currentPos.x + 20.0f; + f32 yPos = playerActor->currentPos.y + 15.0f; + f32 zPos = playerActor->currentPos.z + 5.0f; + + fx_steam_burst(0, xPos, yPos, zPos, 1.0f, 20); + + return ApiStatus_DONE2; +} + +#include "battle/common/move/HammerSupport.inc.c" + +extern EvtScript N(EVS_UseMove1_Impl); +extern EvtScript N(EVS_UseMove2_Impl); +extern EvtScript N(EVS_UseMove3_Impl); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(func_80269EAC, 2) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 60) + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 2) + EVT_EXEC_WAIT(N(EVS_UseMove1_Impl)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 60) + EVT_SET(LVarE, 2) + EVT_SET(LVarF, 4) + EVT_EXEC_WAIT(N(EVS_UseMove2_Impl)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 60) + EVT_SET(LVarE, 3) + EVT_SET(LVarF, 6) + EVT_EXEC_WAIT(N(EVS_UseMove3_Impl)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove1_Impl) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) + EVT_CALL(action_command_hammer_init) + EVT_CALL(InitTargetIterator) + EVT_EXEC_WAIT(N(EVS_HammerSupport_A)) + EVT_SET(LVar1, 0) + EVT_LOOP(10) + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_ADD(LVar1, 1) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40000) + EVT_END_LOOP + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40000) + EVT_SWITCH(LVar1) + EVT_CASE_LT(3) + EVT_WAIT(4) + EVT_CASE_LT(5) + EVT_WAIT(3) + EVT_CASE_LT(7) + EVT_WAIT(2) + EVT_CASE_LT(9) + EVT_WAIT(1) + EVT_CASE_LT(11) + EVT_WAIT(0) + EVT_END_SWITCH + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVar9, 16) + EVT_CALL(InitTargetIterator) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40001) + EVT_WAIT(8) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40002) + EVT_CALL(N(ShouldMovesAutoSucceed)) + EVT_IF_EQ(LVar0, HIT_RESULT_HIT) + EVT_LOOP(45) + EVT_WAIT(1) + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_IF + EVT_CALL(action_command_hammer_start, 0, LVarD, 3) + EVT_CALL(SetActionResult, 0) + EVT_SET(LVar1, 0) + EVT_LOOP(30) + EVT_WAIT(1) + EVT_CALL(GetActionResult, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_IF_NE(LVar1, 1) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40003) + EVT_SET(LVar1, 1) + EVT_END_IF + EVT_END_IF + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(GetActionSuccess, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40004) + EVT_WAIT(3) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40005) + EVT_WAIT(3) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) + EVT_CALL(StartRumble, 7) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211E) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_WAIT(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_WAIT(25) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(func_802A1000_737890) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(func_802A1074_737904) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_WAIT(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_THREAD + EVT_SET(LVar0, 0) + EVT_LOOP(10) + EVT_ADD(LVar0, 18) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove2_Impl) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) + EVT_CALL(action_command_hammer_init) + EVT_CALL(InitTargetIterator) + EVT_EXEC_WAIT(N(EVS_HammerSupport_A)) + EVT_SET(LVar1, 0) + EVT_LOOP(10) + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_ADD(LVar1, 1) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40006) + EVT_END_LOOP + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40006) + EVT_SWITCH(LVar1) + EVT_CASE_LT(3) + EVT_WAIT(4) + EVT_CASE_LT(5) + EVT_WAIT(3) + EVT_CASE_LT(7) + EVT_WAIT(2) + EVT_CASE_LT(9) + EVT_WAIT(1) + EVT_CASE_LT(11) + EVT_WAIT(0) + EVT_END_SWITCH + EVT_CALL(InitTargetIterator) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40007) + EVT_WAIT(8) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40008) + EVT_CALL(N(ShouldMovesAutoSucceed)) + EVT_IF_EQ(LVar0, FALSE) + EVT_LOOP(45) + EVT_WAIT(1) + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_IF + EVT_CALL(action_command_hammer_start, 0, LVarD, 3) + EVT_CALL(SetActionResult, 0) + EVT_SET(LVar1, 0) + EVT_LOOP(30) + EVT_WAIT(1) + EVT_CALL(GetActionResult, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_IF_NE(LVar1, 1) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40009) + EVT_SET(LVar1, 1) + EVT_END_IF + EVT_END_IF + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(GetActionSuccess, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4000A) + EVT_WAIT(3) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4000B) + EVT_WAIT(3) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) + EVT_CALL(StartRumble, 8) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211F) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_WAIT(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_WAIT(25) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(func_802A1000_737890) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(func_802A1074_737904) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_WAIT(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_THREAD + EVT_SET(LVar0, 0) + EVT_LOOP(10) + EVT_ADD(LVar0, 18) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(10) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove3_Impl) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) + EVT_CALL(action_command_hammer_init) + EVT_CALL(InitTargetIterator) + EVT_EXEC_WAIT(N(EVS_HammerSupport_A)) + EVT_SET(LVar1, 0) + EVT_LOOP(10) + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_ADD(LVar1, 1) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4000C) + EVT_END_LOOP + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4000C) + EVT_SWITCH(LVar1) + EVT_CASE_LT(3) + EVT_WAIT(4) + EVT_CASE_LT(5) + EVT_WAIT(3) + EVT_CASE_LT(7) + EVT_WAIT(2) + EVT_CASE_LT(9) + EVT_WAIT(1) + EVT_CASE_LT(11) + EVT_WAIT(0) + EVT_END_SWITCH + EVT_CALL(InitTargetIterator) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4000D) + EVT_WAIT(8) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4000E) + EVT_CALL(N(ShouldMovesAutoSucceed)) + EVT_IF_EQ(LVar0, FALSE) + EVT_LOOP(45) + EVT_WAIT(1) + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_NE(LVar0, FALSE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_IF + EVT_CALL(action_command_hammer_start, 0, LVarD, 3) + EVT_CALL(SetActionResult, 0) + EVT_SET(LVar1, 0) + EVT_LOOP(30) + EVT_WAIT(1) + EVT_CALL(GetActionResult, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_IF_NE(LVar1, 1) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4000F) + EVT_SET(LVar1, 1) + EVT_END_IF + EVT_END_IF + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(GetActionSuccess, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40010) + EVT_WAIT(3) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40011) + EVT_WAIT(3) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) + EVT_CALL(StartRumble, 9) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2120) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_WAIT(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_WAIT(25) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(func_802A1000_737890) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(func_802A1074_737904) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_WAIT(10) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_THREAD + EVT_SET(LVar0, 0) + EVT_LOOP(10) + EVT_ADD(LVar0, 18) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(10) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/hammer/super_smash.c b/src/battle/move/hammer/super_smash.c new file mode 100644 index 0000000000..86cda7c9cd --- /dev/null +++ b/src/battle/move/hammer/super_smash.c @@ -0,0 +1,106 @@ +#include "common.h" +#include "script_api/battle.h" + +#define NAMESPACE battle_move_super_smash + +#include "battle/common/move/HammerSupport.inc.c" + +extern EvtScript N(UseMove_Impl); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 4) + EVT_SET(LVarF, 5) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_CASE_EQ(1) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 5) + EVT_SET(LVarF, 7) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_CASE_EQ(2) + EVT_SET(LVarD, 45) + EVT_SET(LVarE, 6) + EVT_SET(LVarF, 9) + EVT_EXEC_WAIT(N(UseMove_Impl)) + EVT_END_SWITCH + EVT_CALL(EnablePlayerBlur, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A3188) = { + EVT_CALL(StartRumble, 10) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(UseMove_Impl) = { + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseBasicHammer)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseSuperHammer)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseUltraHammer)) + EVT_END_SWITCH + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) + EVT_WAIT(1) + EVT_EXEC_WAIT(N(EVS_802A3188)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_RETURN + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) + EVT_CASE_DEFAULT + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_NORMAL) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10E) + EVT_END_SWITCH + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/hammer_charge_0/74F130.c b/src/battle/move/hammer_charge_0/74F130.c deleted file mode 100644 index 39a4e1ba46..0000000000 --- a/src/battle/move/hammer_charge_0/74F130.c +++ /dev/null @@ -1,43 +0,0 @@ -#include "common.h" -#include "effects.h" - -#define NAMESPACE battle_move_hammer_charge_0 - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" - -#include "world/common/todo/IsHammerMaxCharged.inc.c" - -ApiStatus func_802A10C8_74F1F8(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - BattleStatus* battleStatus = &gBattleStatus; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); - - fx_stat_change(0, var1, var2, var3, 1.0f, 60); - - battleStatus->hammerCharge++; - if (battleStatus->hammerCharge > 99) { - battleStatus->hammerCharge = 99; - } - - battleStatus->jumpCharge = 0; - battleStatus->flags1 |= BS_FLAGS1_HAMMER_CHARGED; - battleStatus->flags1 &= ~BS_FLAGS1_JUMP_CHARGED; - - return ApiStatus_DONE2; -} - -ApiStatus func_802A11CC_74F2FC(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 var0 = evt_get_variable(script, *args++); - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - f32 var3 = evt_get_float_variable(script, *args++); - - fx_energy_in_out(6, var0 + 10, var1 + 18, var2, var3, 45); - - return ApiStatus_DONE2; -} diff --git a/src/battle/move/hammer_charge_1/7595B0.c b/src/battle/move/hammer_charge_1/7595B0.c deleted file mode 100644 index 39d1c8b7da..0000000000 --- a/src/battle/move/hammer_charge_1/7595B0.c +++ /dev/null @@ -1,53 +0,0 @@ -#include "common.h" -#include "effects.h" - -BSS s32 D_802A43D0; - -#define NAMESPACE battle_move_hammer_charge_1 - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" - -#include "world/common/todo/IsHammerMaxCharged.inc.c" - -ApiStatus func_802A10C8_759678(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - BattleStatus* battleStatus = &gBattleStatus; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); - s32* var4; - - fx_stat_change(1, var1, var2, var3, 1.0f, 60); - var4 = &D_802A43D0; - *var4 = 0; - if (battleStatus->hammerCharge > 0) { - *var4 = 1; - } - - battleStatus->hammerCharge += 2; - - if (battleStatus->hammerCharge > 99) { - battleStatus->hammerCharge = 99; - } - - battleStatus->jumpCharge = 0; - battleStatus->flags1 |= BS_FLAGS1_HAMMER_CHARGED; - battleStatus->flags1 &= ~BS_FLAGS1_JUMP_CHARGED; - - return ApiStatus_DONE2; -} - -#include "world/common/todo/UnkMoveFunc2.inc.c" - -ApiStatus func_802A12FC_7598AC(Evt* script, s32 isInitialCall) { - if (D_802A43D0 == 0) { - script->varTable[0] = 4; - } else { - script->varTable[0] = 5; - } - - return ApiStatus_DONE2; -} - diff --git a/src/battle/move/hammer_charge_2/75E5D0.c b/src/battle/move/hammer_charge_2/75E5D0.c deleted file mode 100644 index bacb69ff87..0000000000 --- a/src/battle/move/hammer_charge_2/75E5D0.c +++ /dev/null @@ -1,52 +0,0 @@ -#include "common.h" -#include "effects.h" - -BSS s32 D_802A4350; - -#define NAMESPACE battle_move_hammer_charge_2 - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" - -#include "world/common/todo/IsHammerMaxCharged.inc.c" - -ApiStatus func_802A10C8_75E698(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - BattleStatus* battleStatus = &gBattleStatus; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); - s32* var4; - - fx_stat_change(2, var1, var2, var3, 1.0f, 60); - var4 = &D_802A4350; - *var4 = 0; - if (battleStatus->hammerCharge > 0) { - *var4 = 1; - } - - battleStatus->hammerCharge += 3; - - if (battleStatus->hammerCharge > 99) { - battleStatus->hammerCharge = 99; - } - - battleStatus->jumpCharge = 0; - battleStatus->flags1 |= BS_FLAGS1_HAMMER_CHARGED; - battleStatus->flags1 &= ~BS_FLAGS1_JUMP_CHARGED; - - return ApiStatus_DONE2; -} - -#include "world/common/todo/UnkMoveFunc3.inc.c" - -ApiStatus func_802A12FC_75E8CC(Evt* script, s32 isInitialCall) { - if (D_802A4350 == 0) { - script->varTable[0] = 4; - } else { - script->varTable[0] = 5; - } - - return ApiStatus_DONE2; -} diff --git a/src/battle/move/hammer_throw/752450.c b/src/battle/move/hammer_throw/752450.c deleted file mode 100644 index 08c2727336..0000000000 --- a/src/battle/move/hammer_throw/752450.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_hammer_throw - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" diff --git a/src/battle/item/ItemRefund.inc.c b/src/battle/move/item/ItemRefund.inc.c similarity index 93% rename from src/battle/item/ItemRefund.inc.c rename to src/battle/move/item/ItemRefund.inc.c index 8758191615..9aa2727aec 100644 --- a/src/battle/item/ItemRefund.inc.c +++ b/src/battle/move/item/ItemRefund.inc.c @@ -4,7 +4,7 @@ static s32 itemIcon; // Returns time to sleep for on $x. -ApiStatus N(GiveRefund)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GiveRefund)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = gBattleStatus.playerActor; s32 sellValue = gItemTable[battleStatus->moveArgument].sellValue; @@ -49,7 +49,7 @@ ApiStatus N(GiveRefund)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(GiveRefundCleanup)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GiveRefundCleanup)) { BattleStatus* battleStatus = &gBattleStatus; s32 sellValue = gItemTable[battleStatus->moveArgument].sellValue; diff --git a/src/battle/item/UseItem.inc.c b/src/battle/move/item/UseItem.inc.c similarity index 100% rename from src/battle/item/UseItem.inc.c rename to src/battle/move/item/UseItem.inc.c diff --git a/src/battle/item/coconut.c b/src/battle/move/item/coconut.c similarity index 96% rename from src/battle/item/coconut.c rename to src/battle/move/item/coconut.c index 7a2ed19e72..b59194e0b7 100644 --- a/src/battle/item/coconut.c +++ b/src/battle/move/item/coconut.c @@ -1,7 +1,7 @@ #include "coconut.h" #include "entity.h" #include "ld_addrs.h" -#include "battle/item/coconut.png.h" +#include "battle/move/item/coconut.png.h" #include "ItemRefund.inc.c" @@ -9,8 +9,8 @@ static s32 _pad = 0; -#include "battle/item/coconut.png.inc.c" -#include "battle/item/coconut.pal.inc.c" +#include "battle/move/item/coconut.png.inc.c" +#include "battle/move/item/coconut.pal.inc.c" /// 32x32 square. Vtx N(model)[] = { diff --git a/src/battle/item/coconut.h b/src/battle/move/item/coconut.h similarity index 65% rename from src/battle/item/coconut.h rename to src/battle/move/item/coconut.h index f8ab305024..413fe5a1fb 100644 --- a/src/battle/item/coconut.h +++ b/src/battle/move/item/coconut.h @@ -10,7 +10,7 @@ extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); -ApiStatus func_802A1000_72F720(Evt* script, s32 isInitialCall); -ApiStatus func_802A11D4_72F8F4(Evt* script, s32 isInitialCall); +API_CALLABLE(func_802A1000_72F720); +API_CALLABLE(func_802A11D4_72F8F4); #endif diff --git a/src/battle/item/dizzy_dial.c b/src/battle/move/item/dizzy_dial.c similarity index 97% rename from src/battle/item/dizzy_dial.c rename to src/battle/move/item/dizzy_dial.c index bc0a10b609..91e95cc82c 100644 --- a/src/battle/item/dizzy_dial.c +++ b/src/battle/move/item/dizzy_dial.c @@ -9,7 +9,7 @@ void func_802A123C_727B4C(void) { func_80138D88(0, 0, 0x140, 0xF0, 160.0f); } -ApiStatus N(func_802A1270_727B80)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1270_727B80)) { Camera* camera = &gCameras[CAM_BATTLE]; f32 a; diff --git a/src/battle/item/dizzy_dial.h b/src/battle/move/item/dizzy_dial.h similarity index 66% rename from src/battle/item/dizzy_dial.h rename to src/battle/move/item/dizzy_dial.h index 664221b285..897a082df9 100644 --- a/src/battle/item/dizzy_dial.h +++ b/src/battle/move/item/dizzy_dial.h @@ -7,8 +7,8 @@ #undef NAMESPACE #define NAMESPACE battle_item_dizzy_dial -ApiStatus ItemAfflictEnemy(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1270_727B80)(Evt* script, s32 isInitialCall); +API_CALLABLE(ItemAfflictEnemy); +API_CALLABLE(N(func_802A1270_727B80)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/dried_shroom.c b/src/battle/move/item/dried_shroom.c similarity index 91% rename from src/battle/item/dried_shroom.c rename to src/battle/move/item/dried_shroom.c index 46b37b97aa..5fd1ff0c28 100644 --- a/src/battle/item/dried_shroom.c +++ b/src/battle/move/item/dried_shroom.c @@ -3,7 +3,7 @@ #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_71CF1C)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -15,7 +15,7 @@ ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A12FC_71CFDC)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A12FC_71CFDC)) { PlayerData* playerData = &gPlayerData; playerData->curHP++; diff --git a/src/battle/item/dried_shroom.h b/src/battle/move/item/dried_shroom.h similarity index 68% rename from src/battle/item/dried_shroom.h rename to src/battle/move/item/dried_shroom.h index 089338ea47..3312b87931 100644 --- a/src/battle/item/dried_shroom.h +++ b/src/battle/move/item/dried_shroom.h @@ -7,8 +7,8 @@ #undef NAMESPACE #define NAMESPACE battle_item_dried_shroom -ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A12FC_71CFDC)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(func_802A123C_71CF1C)); +API_CALLABLE(N(func_802A12FC_71CFDC)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/dusty_hammer.c b/src/battle/move/item/dusty_hammer.c similarity index 95% rename from src/battle/item/dusty_hammer.c rename to src/battle/move/item/dusty_hammer.c index a86c4e7199..7130bac318 100644 --- a/src/battle/item/dusty_hammer.c +++ b/src/battle/move/item/dusty_hammer.c @@ -1,7 +1,7 @@ #include "dusty_hammer.h" #include "entity.h" #include "ld_addrs.h" -#include "battle/item/dusty_hammer.png.h" +#include "battle/move/item/dusty_hammer.png.h" #include "ItemRefund.inc.c" @@ -9,8 +9,8 @@ static s32 _pad = 0; // XXX -#include "battle/item/dusty_hammer.png.inc.c" -#include "battle/item/dusty_hammer.pal.inc.c" +#include "battle/move/item/dusty_hammer.png.inc.c" +#include "battle/move/item/dusty_hammer.pal.inc.c" Vtx N(model)[] = { { .v = {{ -16, -16, 0 }, FALSE, { 0, 0 }, { 0, 0, 0, 255 }}}, diff --git a/src/battle/item/dusty_hammer.h b/src/battle/move/item/dusty_hammer.h similarity index 100% rename from src/battle/item/dusty_hammer.h rename to src/battle/move/item/dusty_hammer.h diff --git a/src/battle/item/egg_missile.c b/src/battle/move/item/egg_missile.c similarity index 91% rename from src/battle/item/egg_missile.c rename to src/battle/move/item/egg_missile.c index d677f8ab44..5fb98c2b9f 100644 --- a/src/battle/item/egg_missile.c +++ b/src/battle/move/item/egg_missile.c @@ -2,14 +2,14 @@ #include "effects.h" #include "entity.h" #include "ld_addrs.h" -#include "battle/item/egg_missile1.png.h" -#include "battle/item/egg_missile2.png.h" -#include "battle/item/egg_missile3.png.h" -#include "battle/item/egg_missile4.png.h" +#include "battle/move/item/egg_missile1.png.h" +#include "battle/move/item/egg_missile2.png.h" +#include "battle/move/item/egg_missile3.png.h" +#include "battle/move/item/egg_missile4.png.h" #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_71CF1C)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -25,14 +25,14 @@ ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall) { static s32 _pad = 0; -#include "battle/item/egg_missile1.png.inc.c" -#include "battle/item/egg_missile1.pal.inc.c" -#include "battle/item/egg_missile2.png.inc.c" -#include "battle/item/egg_missile2.pal.inc.c" -#include "battle/item/egg_missile3.png.inc.c" -#include "battle/item/egg_missile3.pal.inc.c" -#include "battle/item/egg_missile4.png.inc.c" -#include "battle/item/egg_missile4.pal.inc.c" +#include "battle/move/item/egg_missile1.png.inc.c" +#include "battle/move/item/egg_missile1.pal.inc.c" +#include "battle/move/item/egg_missile2.png.inc.c" +#include "battle/move/item/egg_missile2.pal.inc.c" +#include "battle/move/item/egg_missile3.png.inc.c" +#include "battle/move/item/egg_missile3.pal.inc.c" +#include "battle/move/item/egg_missile4.png.inc.c" +#include "battle/move/item/egg_missile4.pal.inc.c" Vtx N(model)[] = { { .v = {{ -16, -16, 0 }, FALSE, { 0, 0 }, { 0, 0, 0, 255 }}}, diff --git a/src/battle/item/egg_missile.h b/src/battle/move/item/egg_missile.h similarity index 79% rename from src/battle/item/egg_missile.h rename to src/battle/move/item/egg_missile.h index d048cb38e0..9d3cbd8a38 100644 --- a/src/battle/item/egg_missile.h +++ b/src/battle/move/item/egg_missile.h @@ -10,6 +10,6 @@ extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); -ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(func_802A123C_71CF1C)); #endif diff --git a/src/battle/item/electro_pop.c b/src/battle/move/item/electro_pop.c similarity index 89% rename from src/battle/item/electro_pop.c rename to src/battle/move/item/electro_pop.c index 2b8009e8e4..802118d579 100644 --- a/src/battle/item/electro_pop.c +++ b/src/battle/move/item/electro_pop.c @@ -3,7 +3,7 @@ #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_7307DC)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_7307DC)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; @@ -12,7 +12,7 @@ ApiStatus N(func_802A123C_7307DC)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A127C_73081C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A127C_73081C)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -24,7 +24,7 @@ ApiStatus N(func_802A127C_73081C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A133C_7308DC)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A133C_7308DC)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -38,7 +38,7 @@ ApiStatus N(func_802A133C_7308DC)(Evt* script, s32 isInitialCall) { #include "common/AddHP.inc.c" -ApiStatus N(func_802A1450_7309F0)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1450_7309F0)) { ItemData* item = &gItemTable[ITEM_ELECTRO_POP]; PlayerData* playerData = &gPlayerData; @@ -52,7 +52,7 @@ ApiStatus N(func_802A1450_7309F0)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(AddFP)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(AddFP)) { PlayerData* playerData = &gPlayerData; s32 amt = evt_get_variable(script, *script->ptrReadPos); @@ -68,7 +68,7 @@ ApiStatus N(AddFP)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A14F0_730A90)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A14F0_730A90)) { ItemData* item = &gItemTable[ITEM_ELECTRO_POP]; PlayerData* playerData = &gPlayerData; diff --git a/src/battle/item/electro_pop.h b/src/battle/move/item/electro_pop.h similarity index 53% rename from src/battle/item/electro_pop.h rename to src/battle/move/item/electro_pop.h index 0898d71646..65bfaadb24 100644 --- a/src/battle/item/electro_pop.h +++ b/src/battle/move/item/electro_pop.h @@ -7,10 +7,10 @@ #undef NAMESPACE #define NAMESPACE battle_item_electro_pop -ApiStatus N(func_802A123C_7307DC)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A14F0_730A90)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A133C_7308DC)(Evt* script, s32 isInitialCall); -ApiStatus N(AddFP)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(func_802A123C_7307DC)); +API_CALLABLE(N(func_802A14F0_730A90)); +API_CALLABLE(N(func_802A133C_7308DC)); +API_CALLABLE(N(AddFP)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/fire_flower.c b/src/battle/move/item/fire_flower.c similarity index 95% rename from src/battle/item/fire_flower.c rename to src/battle/move/item/fire_flower.c index 78dc38a423..563c5555bb 100644 --- a/src/battle/item/fire_flower.c +++ b/src/battle/move/item/fire_flower.c @@ -4,7 +4,7 @@ #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_716E9C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_716E9C)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -17,7 +17,7 @@ ApiStatus N(func_802A123C_716E9C)(Evt* script, s32 isInitialCall) { #include "common/FadeBackgroundToBlack.inc.c" -ApiStatus N(func_802A1378_716FD8)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1378_716FD8)) { if (isInitialCall) { script->functionTemp[0] = 20; } diff --git a/src/battle/item/fire_flower.h b/src/battle/move/item/fire_flower.h similarity index 56% rename from src/battle/item/fire_flower.h rename to src/battle/move/item/fire_flower.h index b0742e9d4b..e3ad2dbb39 100644 --- a/src/battle/item/fire_flower.h +++ b/src/battle/move/item/fire_flower.h @@ -7,9 +7,9 @@ #undef NAMESPACE #define NAMESPACE battle_item_fire_flower -ApiStatus N(FadeBackgroundToBlack)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A123C_716E9C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1378_716FD8)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(FadeBackgroundToBlack)); +API_CALLABLE(N(func_802A123C_716E9C)); +API_CALLABLE(N(func_802A1378_716FD8)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/food.c b/src/battle/move/item/food.c similarity index 95% rename from src/battle/item/food.c rename to src/battle/move/item/food.c index f214da1c2b..e43f581811 100644 --- a/src/battle/item/food.c +++ b/src/battle/move/item/food.c @@ -6,7 +6,7 @@ extern EntityModelScript D_80283EE8; #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_73330C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_73330C)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -20,7 +20,7 @@ ApiStatus N(func_802A123C_73330C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A12EC_7333BC)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A12EC_7333BC)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; Bytecode* args = script->ptrReadPos; @@ -44,7 +44,7 @@ ApiStatus N(func_802A12EC_7333BC)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1378_733448)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1378_733448)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -56,7 +56,7 @@ ApiStatus N(func_802A1378_733448)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1438_733508)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1438_733508)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -72,7 +72,7 @@ ApiStatus N(func_802A1438_733508)(Evt* script, s32 isInitialCall) { #include "common/AddFP.inc.c" -ApiStatus N(func_802A15A0_733670)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A15A0_733670)) { Bytecode* args = script->ptrReadPos; s32 itemIdx = evt_get_variable(script, *args++); ItemData* item = &gItemTable[itemIdx]; diff --git a/src/battle/move/item/food.h b/src/battle/move/item/food.h new file mode 100644 index 0000000000..b94854d519 --- /dev/null +++ b/src/battle/move/item/food.h @@ -0,0 +1,24 @@ +#ifndef BATTLE_ITEM_FOOD +#define BATTLE_ITEM_FOOD + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_food + +API_CALLABLE(N(func_802A123C_73330C)); +API_CALLABLE(N(func_802A12EC_7333BC)); +API_CALLABLE(N(func_802A15A0_733670)); +API_CALLABLE(N(func_802A1378_733448)); +API_CALLABLE(N(func_802A1438_733508)); +API_CALLABLE(N(AddHP)); +API_CALLABLE(N(AddFP)); + +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(UseItem); +extern EvtScript N(EatItem); +extern EvtScript N(DrinkItem); + +#endif diff --git a/src/battle/item/fright_jar.c b/src/battle/move/item/fright_jar.c similarity index 97% rename from src/battle/item/fright_jar.c rename to src/battle/move/item/fright_jar.c index b04ca49efd..e463834205 100644 --- a/src/battle/item/fright_jar.c +++ b/src/battle/move/item/fright_jar.c @@ -5,7 +5,7 @@ #include "common/FadeBackgroundToBlack.inc.c" -ApiStatus N(func_802A12D4_72BBE4)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A12D4_72BBE4)) { if (isInitialCall) { script->functionTemp[0] = 20; } diff --git a/src/battle/item/fright_jar.h b/src/battle/move/item/fright_jar.h similarity index 65% rename from src/battle/item/fright_jar.h rename to src/battle/move/item/fright_jar.h index 7fae0c089b..429eee223a 100644 --- a/src/battle/item/fright_jar.h +++ b/src/battle/move/item/fright_jar.h @@ -7,8 +7,8 @@ #undef NAMESPACE #define NAMESPACE battle_item_fright_jar -ApiStatus N(FadeBackgroundToBlack)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A12D4_72BBE4)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(FadeBackgroundToBlack)); +API_CALLABLE(N(func_802A12D4_72BBE4)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/hustle_drink.c b/src/battle/move/item/hustle_drink.c similarity index 97% rename from src/battle/item/hustle_drink.c rename to src/battle/move/item/hustle_drink.c index 7cd537011f..6b8a713b72 100644 --- a/src/battle/item/hustle_drink.c +++ b/src/battle/move/item/hustle_drink.c @@ -2,7 +2,7 @@ #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_72619C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_72619C)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; @@ -28,7 +28,7 @@ ApiStatus N(func_802A123C_72619C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A12C4_726224)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A12C4_726224)) { gBattleStatus.hustleTurns = 2; return ApiStatus_DONE2; diff --git a/src/battle/item/hustle_drink.h b/src/battle/move/item/hustle_drink.h similarity index 68% rename from src/battle/item/hustle_drink.h rename to src/battle/move/item/hustle_drink.h index 74da316c77..eb32576f1b 100644 --- a/src/battle/item/hustle_drink.h +++ b/src/battle/move/item/hustle_drink.h @@ -7,8 +7,8 @@ #undef NAMESPACE #define NAMESPACE battle_item_hustle_drink -ApiStatus N(func_802A12C4_726224)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A123C_72619C)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(func_802A12C4_726224)); +API_CALLABLE(N(func_802A123C_72619C)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/insecticide_herb.c b/src/battle/move/item/insecticide_herb.c similarity index 93% rename from src/battle/item/insecticide_herb.c rename to src/battle/move/item/insecticide_herb.c index d2d8108ceb..25c4a45601 100644 --- a/src/battle/item/insecticide_herb.c +++ b/src/battle/move/item/insecticide_herb.c @@ -2,11 +2,11 @@ #include "effects.h" #include "entity.h" #include "ld_addrs.h" -#include "battle/item/insecticide_herb.png.h" +#include "battle/move/item/insecticide_herb.png.h" #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_72A98C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_72A98C)) { BattleStatus* battleStatus = &gBattleStatus; Actor* enemy = get_actor(script->owner1.enemyID); Actor* target = get_actor(enemy->targetActorID); @@ -16,7 +16,7 @@ ApiStatus N(func_802A123C_72A98C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1280_72A9D0)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1280_72A9D0)) { Actor* enemy = get_actor(script->owner1.enemyID); Actor* target; @@ -27,7 +27,7 @@ ApiStatus N(func_802A1280_72A9D0)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A12E0_72AA30)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A12E0_72AA30)) { Bytecode* args = script->ptrReadPos; f32 a = evt_get_variable(script, *args++); f32 b = evt_get_variable(script, *args++); @@ -53,8 +53,8 @@ ApiStatus N(func_802A12E0_72AA30)(Evt* script, s32 isInitialCall) { static s32 _pad = 0; // XXX -#include "battle/item/insecticide_herb.png.inc.c" -#include "battle/item/insecticide_herb.pal.inc.c" +#include "battle/move/item/insecticide_herb.png.inc.c" +#include "battle/move/item/insecticide_herb.pal.inc.c" Vtx N(model)[] = { { .v = { .ob = {-16, -16, 0}, FALSE, .tc = {0, 0}, .cn = {0, 0, 0, 255} } }, diff --git a/src/battle/item/insecticide_herb.h b/src/battle/move/item/insecticide_herb.h similarity index 57% rename from src/battle/item/insecticide_herb.h rename to src/battle/move/item/insecticide_herb.h index bddf710add..fd807d3ba4 100644 --- a/src/battle/item/insecticide_herb.h +++ b/src/battle/move/item/insecticide_herb.h @@ -9,8 +9,8 @@ extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); -ApiStatus N(func_802A12E0_72AA30)(Evt *script, s32 isInitialCall); -ApiStatus N(func_802A123C_72A98C)(Evt *script, s32 isInitialCall); -ApiStatus N(func_802A1280_72A9D0)(Evt *script, s32 isInitialCall); +API_CALLABLE(N(func_802A12E0_72AA30)); +API_CALLABLE(N(func_802A123C_72A98C)); +API_CALLABLE(N(func_802A1280_72A9D0)); #endif diff --git a/src/battle/item/life_shroom.c b/src/battle/move/item/life_shroom.c similarity index 94% rename from src/battle/item/life_shroom.c rename to src/battle/move/item/life_shroom.c index 0d2f073641..05d0d66390 100644 --- a/src/battle/item/life_shroom.c +++ b/src/battle/move/item/life_shroom.c @@ -6,7 +6,7 @@ extern EntityModelScript D_80283EE8; #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_72E76C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_72E76C)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -20,7 +20,7 @@ ApiStatus N(func_802A123C_72E76C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A12EC_72E81C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A12EC_72E81C)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; Bytecode* args = script->ptrReadPos; @@ -44,7 +44,7 @@ ApiStatus N(func_802A12EC_72E81C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1378_72E8A8)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1378_72E8A8)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -56,7 +56,7 @@ ApiStatus N(func_802A1378_72E8A8)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1438_72E968)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1438_72E968)) { ItemData* item = &gItemTable[ITEM_LIFE_SHROOM]; PlayerData* playerData = &gPlayerData; @@ -70,7 +70,7 @@ ApiStatus N(func_802A1438_72E968)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1484_72E9B4)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1484_72E9B4)) { Bytecode* args = script->ptrReadPos; s32 itemIdx = evt_get_variable(script, *args++); ItemData* itemTable = gItemTable; diff --git a/src/battle/move/item/life_shroom.h b/src/battle/move/item/life_shroom.h new file mode 100644 index 0000000000..237634cfa3 --- /dev/null +++ b/src/battle/move/item/life_shroom.h @@ -0,0 +1,21 @@ +#ifndef BATTLE_ITEM_LIFE_SHROOM +#define BATTLE_ITEM_LIFE_SHROOM + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_life_shroom + +API_CALLABLE(N(func_802A123C_72E76C)); +API_CALLABLE(N(func_802A12EC_72E81C)); +API_CALLABLE(N(func_802A1484_72E9B4)); +API_CALLABLE(N(func_802A1438_72E968)); +API_CALLABLE(N(func_802A1378_72E8A8)); + +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(UseItem); +extern EvtScript N(EatItem); + +#endif diff --git a/src/battle/item/mushroom.c b/src/battle/move/item/mushroom.c similarity index 95% rename from src/battle/item/mushroom.c rename to src/battle/move/item/mushroom.c index 46d9d43eed..f01bab8b46 100644 --- a/src/battle/item/mushroom.c +++ b/src/battle/move/item/mushroom.c @@ -6,7 +6,7 @@ extern EntityModelScript D_80283EE8; #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_715A8C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_715A8C)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -20,7 +20,7 @@ ApiStatus N(func_802A123C_715A8C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A12EC_715B3C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A12EC_715B3C)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; Bytecode* args = script->ptrReadPos; @@ -44,7 +44,7 @@ ApiStatus N(func_802A12EC_715B3C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1378_715BC8)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1378_715BC8)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -56,7 +56,7 @@ ApiStatus N(func_802A1378_715BC8)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1438_715C88)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1438_715C88)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -72,7 +72,7 @@ ApiStatus N(func_802A1438_715C88)(Evt* script, s32 isInitialCall) { #include "common/AddFP.inc.c" -ApiStatus N(func_802A15A0_715DF0)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A15A0_715DF0)) { Bytecode* args = script->ptrReadPos; ItemData* itemTable = gItemTable; ItemData* item = &itemTable[evt_get_variable(script, *args++)]; diff --git a/src/battle/move/item/mushroom.h b/src/battle/move/item/mushroom.h new file mode 100644 index 0000000000..fef2eb4ed8 --- /dev/null +++ b/src/battle/move/item/mushroom.h @@ -0,0 +1,23 @@ +#ifndef BATTLE_ITEM_MUSHROOM +#define BATTLE_ITEM_MUSHROOM + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_mushroom + +API_CALLABLE(N(func_802A123C_715A8C)); +API_CALLABLE(N(func_802A12EC_715B3C)); +API_CALLABLE(N(func_802A15A0_715DF0)); +API_CALLABLE(N(func_802A1378_715BC8)); +API_CALLABLE(N(func_802A1438_715C88)); +API_CALLABLE(N(AddHP)); +API_CALLABLE(N(AddFP)); + +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(UseItem); +extern EvtScript N(EatItem); + +#endif diff --git a/src/battle/item/mystery.c b/src/battle/move/item/mystery.c similarity index 97% rename from src/battle/item/mystery.c rename to src/battle/move/item/mystery.c index fd26f02b0b..579daed608 100644 --- a/src/battle/item/mystery.c +++ b/src/battle/move/item/mystery.c @@ -2,7 +2,7 @@ #include "effects.h" #include "entity.h" #include "ld_addrs.h" -#include "battle/item/mystery.png.h" +#include "battle/move/item/mystery.png.h" #include "ItemRefund.inc.c" @@ -160,7 +160,7 @@ s32 N(func_802A13E4_72C994)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(func_802A188C_72CE3C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A188C_72CE3C)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -175,8 +175,8 @@ ApiStatus N(func_802A188C_72CE3C)(Evt* script, s32 isInitialCall) { static s32 _pad = 0; -#include "battle/item/mystery.png.inc.c" -#include "battle/item/mystery.pal.inc.c" +#include "battle/move/item/mystery.png.inc.c" +#include "battle/move/item/mystery.pal.inc.c" Vtx N(model)[] = { { .v = {{ -16, -16, 0 }, FALSE, { 0, 0 }, { 0, 0, 0, 255 }}}, diff --git a/src/battle/item/mystery.h b/src/battle/move/item/mystery.h similarity index 72% rename from src/battle/item/mystery.h rename to src/battle/move/item/mystery.h index 987894f437..81fac9190b 100644 --- a/src/battle/item/mystery.h +++ b/src/battle/move/item/mystery.h @@ -7,8 +7,8 @@ #undef NAMESPACE #define NAMESPACE battle_item_mystery -ApiStatus N(func_802A13E4_72C994)(Evt *script, s32 isInitialCall); -ApiStatus N(func_802A188C_72CE3C)(Evt *script, s32 isInitialCall); +API_CALLABLE(N(func_802A13E4_72C994)); +API_CALLABLE(N(func_802A188C_72CE3C)); typedef struct N(tempStc) { s32 iconId; diff --git a/src/battle/item/pebble.c b/src/battle/move/item/pebble.c similarity index 96% rename from src/battle/item/pebble.c rename to src/battle/move/item/pebble.c index 749ed88e18..31ede09600 100644 --- a/src/battle/item/pebble.c +++ b/src/battle/move/item/pebble.c @@ -1,6 +1,6 @@ #include "pebble.h" #include "ld_addrs.h" -#include "battle/item/pebble.png.h" +#include "battle/move/item/pebble.png.h" #include "ItemRefund.inc.c" @@ -8,8 +8,8 @@ static s32 _pad = 0; -#include "battle/item/pebble.png.inc.c" -#include "battle/item/pebble.pal.inc.c" +#include "battle/move/item/pebble.png.inc.c" +#include "battle/move/item/pebble.pal.inc.c" Vtx N(model)[] = { { .v = { { -16, -16, 0 }, FALSE, { 0, 0 }, { 0, 0, 0, 255 }, } }, diff --git a/src/battle/item/pebble.h b/src/battle/move/item/pebble.h similarity index 100% rename from src/battle/item/pebble.h rename to src/battle/move/item/pebble.h diff --git a/src/battle/item/please_come_back.c b/src/battle/move/item/please_come_back.c similarity index 88% rename from src/battle/item/please_come_back.c rename to src/battle/move/item/please_come_back.c index 6b4bb59719..ef0f8e8700 100644 --- a/src/battle/item/please_come_back.c +++ b/src/battle/move/item/please_come_back.c @@ -5,7 +5,7 @@ #include "UseItem.inc.c" EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x0000009A) + EVT_SET_CONST(LVarA, ITEM_DIZZY_DIAL) //@bug should be ITEM_PLEASE_COME_BACK EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) diff --git a/src/battle/item/please_come_back.h b/src/battle/move/item/please_come_back.h similarity index 100% rename from src/battle/item/please_come_back.h rename to src/battle/move/item/please_come_back.h diff --git a/src/battle/item/pow_block.c b/src/battle/move/item/pow_block.c similarity index 95% rename from src/battle/item/pow_block.c rename to src/battle/move/item/pow_block.c index 01544a8e1a..57647e0804 100644 --- a/src/battle/item/pow_block.c +++ b/src/battle/move/item/pow_block.c @@ -2,7 +2,7 @@ #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_718A8C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_718A8C)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; CollisionStatus* collisionStatus = &gCollisionStatus; @@ -22,7 +22,7 @@ ApiStatus N(func_802A123C_718A8C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A12E4_718B34)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A12E4_718B34)) { Entity* entity = get_entity_by_index(script->varTable[10]); entity->flags |= ENTITY_FLAG_PENDING_INSTANCE_DELETE; @@ -30,7 +30,7 @@ ApiStatus N(func_802A12E4_718B34)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1318_718B68)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1318_718B68)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; Entity* entity = get_entity_by_index(script->varTable[10]); @@ -48,7 +48,7 @@ ApiStatus N(func_802A1318_718B68)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x00000090) + EVT_SET_CONST(LVarA, ITEM_POW_BLOCK) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_WAIT(10) EVT_CALL(MakeEntity, EVT_PTR(Entity_PowBlock), -40, 60, 0, 0, MAKE_ENTITY_END) diff --git a/src/battle/item/pow_block.h b/src/battle/move/item/pow_block.h similarity index 57% rename from src/battle/item/pow_block.h rename to src/battle/move/item/pow_block.h index 84c3eaeeaf..24cccc06b6 100644 --- a/src/battle/item/pow_block.h +++ b/src/battle/move/item/pow_block.h @@ -8,9 +8,9 @@ #undef NAMESPACE #define NAMESPACE battle_item_pow_block -ApiStatus N(func_802A1318_718B68)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A123C_718A8C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A12E4_718B34)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(func_802A1318_718B68)); +API_CALLABLE(N(func_802A123C_718A8C)); +API_CALLABLE(N(func_802A12E4_718B34)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/repel_gel.c b/src/battle/move/item/repel_gel.c similarity index 91% rename from src/battle/item/repel_gel.c rename to src/battle/move/item/repel_gel.c index 805ac44c59..c60c302a3e 100644 --- a/src/battle/item/repel_gel.c +++ b/src/battle/move/item/repel_gel.c @@ -2,7 +2,7 @@ #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_72DDAC)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_72DDAC)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; ActorPart* part = player->partsTable; @@ -17,7 +17,7 @@ ApiStatus N(func_802A123C_72DDAC)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x00000097) + EVT_SET_CONST(LVarA, ITEM_REPEL_GEL) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_375) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30008) diff --git a/src/battle/item/repel_gel.h b/src/battle/move/item/repel_gel.h similarity index 79% rename from src/battle/item/repel_gel.h rename to src/battle/move/item/repel_gel.h index 536e66b7ff..8c7b427a42 100644 --- a/src/battle/item/repel_gel.h +++ b/src/battle/move/item/repel_gel.h @@ -7,7 +7,7 @@ #undef NAMESPACE #define NAMESPACE battle_item_repel_gel -ApiStatus N(func_802A123C_72DDAC)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(func_802A123C_72DDAC)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/shooting_star.c b/src/battle/move/item/shooting_star.c similarity index 92% rename from src/battle/item/shooting_star.c rename to src/battle/move/item/shooting_star.c index 2e5ffcd846..f268d12d6f 100644 --- a/src/battle/item/shooting_star.c +++ b/src/battle/move/item/shooting_star.c @@ -4,7 +4,7 @@ #include "ItemRefund.inc.c" -ApiStatus battle_item_shooting_star_func_802A123C_71D9AC(Evt* script, s32 isInitialCall) { +API_CALLABLE(battle_item_shooting_star_func_802A123C_71D9AC) { s32 t1 = 200; s32 r1 = rand_int(t1) + 100; // 100-299 s32 r2 = rand_int(40); // 0-39 @@ -20,7 +20,7 @@ ApiStatus battle_item_shooting_star_func_802A123C_71D9AC(Evt* script, s32 isInit return ApiStatus_DONE2; } -ApiStatus N(func_802A1388_71DAF8)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1388_71DAF8)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -31,7 +31,7 @@ ApiStatus N(func_802A1388_71DAF8)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1444_71DBB4)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1444_71DBB4)) { s32 ret; if (isInitialCall) { @@ -47,7 +47,7 @@ ApiStatus N(func_802A1444_71DBB4)(Evt* script, s32 isInitialCall) { return (script->functionTemp[0] == 0) * ApiStatus_DONE2; } -ApiStatus N(func_802A14D4_71DC44)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A14D4_71DC44)) { if (isInitialCall) { script->functionTemp[0] = 10; } @@ -65,7 +65,7 @@ ApiStatus N(func_802A14D4_71DC44)(Evt* script, s32 isInitialCall) { #include "UseItem.inc.c" EvtScript N(main) = { - EVT_SET_CONST(LVarA, 0x00000083) + EVT_SET_CONST(LVarA, ITEM_SHOOTING_STAR) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_THREAD EVT_WAIT(5) diff --git a/src/battle/move/item/shooting_star.h b/src/battle/move/item/shooting_star.h new file mode 100644 index 0000000000..843e27f503 --- /dev/null +++ b/src/battle/move/item/shooting_star.h @@ -0,0 +1,18 @@ +#ifndef BATTLE_ITEM_SHOOTING_STAR +#define BATTLE_ITEM_SHOOTING_STAR + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_shooting_star + +API_CALLABLE(N(func_802A1444_71DBB4)); +API_CALLABLE(N(func_802A123C_71D9AC)); +API_CALLABLE(N(func_802A1388_71DAF8)); +API_CALLABLE(N(func_802A14D4_71DC44)); + +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); + +#endif diff --git a/src/battle/item/sleepy_sheep.c b/src/battle/move/item/sleepy_sheep.c similarity index 96% rename from src/battle/item/sleepy_sheep.c rename to src/battle/move/item/sleepy_sheep.c index a50fe4f1fa..2c88104e34 100644 --- a/src/battle/item/sleepy_sheep.c +++ b/src/battle/move/item/sleepy_sheep.c @@ -2,9 +2,9 @@ #include "entity.h" #include "ld_addrs.h" #include "effects.h" -#include "battle/item/sleepy_sheep1.png.h" -#include "battle/item/sleepy_sheep2.png.h" -#include "battle/item/sleepy_sheep3.png.h" +#include "battle/move/item/sleepy_sheep1.png.h" +#include "battle/move/item/sleepy_sheep2.png.h" +#include "battle/move/item/sleepy_sheep3.png.h" #include "ItemRefund.inc.c" @@ -22,7 +22,7 @@ BSS s32 D_802A3F58[10]; BSS s32 D_802A3F80[2]; // unused? BSS Vec3f D_802A3F88; -ApiStatus N(func_802A123C_71E88C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_71E88C)) { Vec3f* posPtr = &D_802A3F88; s32 entityID; f32 x, y, z; @@ -99,7 +99,7 @@ ApiStatus N(func_802A123C_71E88C)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(func_802A1740_71ED90)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1740_71ED90)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; s32 i; @@ -129,7 +129,7 @@ ApiStatus N(func_802A1740_71ED90)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1848_71EE98)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1848_71EE98)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; s32 i; @@ -170,12 +170,12 @@ ApiStatus N(func_802A1848_71EE98)(Evt* script, s32 isInitialCall) { static s32 _pad = 0; -#include "battle/item/sleepy_sheep1.png.inc.c" -#include "battle/item/sleepy_sheep1.pal.inc.c" -#include "battle/item/sleepy_sheep2.png.inc.c" -#include "battle/item/sleepy_sheep2.pal.inc.c" -#include "battle/item/sleepy_sheep3.png.inc.c" -#include "battle/item/sleepy_sheep3.pal.inc.c" +#include "battle/move/item/sleepy_sheep1.png.inc.c" +#include "battle/move/item/sleepy_sheep1.pal.inc.c" +#include "battle/move/item/sleepy_sheep2.png.inc.c" +#include "battle/move/item/sleepy_sheep2.pal.inc.c" +#include "battle/move/item/sleepy_sheep3.png.inc.c" +#include "battle/move/item/sleepy_sheep3.pal.inc.c" Vtx N(model)[] = { { .v = {{ -28, 0, 0 }, FALSE, { 0, 1536 }, { 0, 0, 0, 255 }}}, diff --git a/src/battle/move/item/sleepy_sheep.h b/src/battle/move/item/sleepy_sheep.h new file mode 100644 index 0000000000..d65df1607c --- /dev/null +++ b/src/battle/move/item/sleepy_sheep.h @@ -0,0 +1,23 @@ +#ifndef BATTLE_ITEM_SLEEPY_SHEEP +#define BATTLE_ITEM_SLEEPY_SHEEP + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_sleepy_sheep + +API_CALLABLE(SetVirtualEntityMoveSpeed); +API_CALLABLE(VirtualEntityMoveTo); +API_CALLABLE(ItemAfflictEnemy); + +API_CALLABLE(N(func_802A123C_71E88C)); +API_CALLABLE(N(func_802A1740_71ED90)); +API_CALLABLE(N(func_802A1848_71EE98)); + +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); + +#endif + + diff --git a/src/battle/item/snowman_doll.c b/src/battle/move/item/snowman_doll.c similarity index 96% rename from src/battle/item/snowman_doll.c rename to src/battle/move/item/snowman_doll.c index b13d2c6d26..7fd5f74781 100644 --- a/src/battle/item/snowman_doll.c +++ b/src/battle/move/item/snowman_doll.c @@ -4,7 +4,7 @@ #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_71C06C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_71C06C)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -18,7 +18,7 @@ ApiStatus N(func_802A123C_71C06C)(Evt* script, s32 isInitialCall) { #include "common/FadeBackgroundToBlack.inc.c" -ApiStatus N(func_802A13B8_71C1E8)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A13B8_71C1E8)) { if (isInitialCall) { script->functionTemp[0] = 20; } diff --git a/src/battle/item/snowman_doll.h b/src/battle/move/item/snowman_doll.h similarity index 56% rename from src/battle/item/snowman_doll.h rename to src/battle/move/item/snowman_doll.h index e221eeaad5..ed4d8359b2 100644 --- a/src/battle/item/snowman_doll.h +++ b/src/battle/move/item/snowman_doll.h @@ -7,9 +7,9 @@ #undef NAMESPACE #define NAMESPACE battle_item_snowman_doll -ApiStatus N(FadeBackgroundToBlack)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A123C_71C06C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A13B8_71C1E8)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(FadeBackgroundToBlack)); +API_CALLABLE(N(func_802A123C_71C06C)); +API_CALLABLE(N(func_802A13B8_71C1E8)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/stone_cap.c b/src/battle/move/item/stone_cap.c similarity index 96% rename from src/battle/item/stone_cap.c rename to src/battle/move/item/stone_cap.c index ed28af8ad5..0c2f3f6fd7 100644 --- a/src/battle/item/stone_cap.c +++ b/src/battle/move/item/stone_cap.c @@ -3,7 +3,7 @@ #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_7217DC)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_7217DC)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; s32 i; diff --git a/src/battle/item/stone_cap.h b/src/battle/move/item/stone_cap.h similarity index 79% rename from src/battle/item/stone_cap.h rename to src/battle/move/item/stone_cap.h index 0d3b4fa37c..6028945d17 100644 --- a/src/battle/item/stone_cap.h +++ b/src/battle/move/item/stone_cap.h @@ -7,7 +7,7 @@ #undef NAMESPACE #define NAMESPACE battle_item_stone_cap -ApiStatus N(func_802A123C_7217DC)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(func_802A123C_7217DC)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/stop_watch.c b/src/battle/move/item/stop_watch.c similarity index 96% rename from src/battle/item/stop_watch.c rename to src/battle/move/item/stop_watch.c index f5c9b1a142..762368f50f 100644 --- a/src/battle/item/stop_watch.c +++ b/src/battle/move/item/stop_watch.c @@ -5,7 +5,7 @@ #include "common/FadeBackgroundToBlack.inc.c" -ApiStatus N(func_802A12D4_7270A4)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A12D4_7270A4)) { if (isInitialCall) { script->functionTemp[0] = 20; } diff --git a/src/battle/item/stop_watch.h b/src/battle/move/item/stop_watch.h similarity index 57% rename from src/battle/item/stop_watch.h rename to src/battle/move/item/stop_watch.h index f1adeb2811..7ad4a56b1d 100644 --- a/src/battle/item/stop_watch.h +++ b/src/battle/move/item/stop_watch.h @@ -7,10 +7,10 @@ #undef NAMESPACE #define NAMESPACE battle_item_stop_watch -ApiStatus ItemAfflictEnemy(Evt* script, s32 isInitialCall); +API_CALLABLE(ItemAfflictEnemy); -ApiStatus N(FadeBackgroundToBlack)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A12D4_7270A4)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(FadeBackgroundToBlack)); +API_CALLABLE(N(func_802A12D4_7270A4)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/strange_cake.c b/src/battle/move/item/strange_cake.c similarity index 91% rename from src/battle/item/strange_cake.c rename to src/battle/move/item/strange_cake.c index 7593e612b4..353f324833 100644 --- a/src/battle/item/strange_cake.c +++ b/src/battle/move/item/strange_cake.c @@ -1,9 +1,9 @@ #include "strange_cake.h" #include "effects.h" #include "hud_element.h" -#include "battle/item/strange_cake1.png.h" -#include "battle/item/strange_cake2.png.h" -#include "battle/item/strange_cake3.png.h" +#include "battle/move/item/strange_cake1.png.h" +#include "battle/move/item/strange_cake2.png.h" +#include "battle/move/item/strange_cake3.png.h" #include "ItemRefund.inc.c" @@ -151,7 +151,7 @@ s32 N(func_802A13E4_7316E4)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(func_802A1818_731B18)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1818_731B18)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -162,7 +162,7 @@ ApiStatus N(func_802A1818_731B18)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A18D8_731BD8)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A18D8_731BD8)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -177,7 +177,7 @@ ApiStatus N(func_802A18D8_731BD8)(Evt* script, s32 isInitialCall) { #include "common/AddFP.inc.c" -ApiStatus N(func_802A1A40_731D40)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1A40_731D40)) { ItemData* item = &gItemTable[ITEM_KOOKY_COOKIE]; PlayerData* playerData = &gPlayerData; @@ -191,7 +191,7 @@ ApiStatus N(func_802A1A40_731D40)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1A8C_731D8C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1A8C_731D8C)) { ItemData* item = &gItemTable[ITEM_KOOKY_COOKIE]; PlayerData* playerData = &gPlayerData; @@ -205,7 +205,7 @@ ApiStatus N(func_802A1A8C_731D8C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1AD8_731DD8)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1AD8_731DD8)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; @@ -215,7 +215,7 @@ ApiStatus N(func_802A1AD8_731DD8)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1B14_731E14)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1B14_731E14)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; ActorPart* part = player->partsTable; @@ -227,7 +227,7 @@ ApiStatus N(func_802A1B14_731E14)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1B68_731E68)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1B68_731E68)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; @@ -241,12 +241,12 @@ ApiStatus N(func_802A1B68_731E68)(Evt* script, s32 isInitialCall) { static s32 _pad = 0; // XXX -#include "battle/item/strange_cake1.png.inc.c" -#include "battle/item/strange_cake1.pal.inc.c" -#include "battle/item/strange_cake2.png.inc.c" -#include "battle/item/strange_cake2.pal.inc.c" -#include "battle/item/strange_cake3.png.inc.c" -#include "battle/item/strange_cake3.pal.inc.c" +#include "battle/move/item/strange_cake1.png.inc.c" +#include "battle/move/item/strange_cake1.pal.inc.c" +#include "battle/move/item/strange_cake2.png.inc.c" +#include "battle/move/item/strange_cake2.pal.inc.c" +#include "battle/move/item/strange_cake3.png.inc.c" +#include "battle/move/item/strange_cake3.pal.inc.c" HudScript N(D_802A27D0) = HES_TEMPLATE_CI_ENUM_SIZE(battle_item_strange_cake1, 32, 32); HudScript N(D_802A27F8) = HES_TEMPLATE_CI_ENUM_SIZE(battle_item_strange_cake2, 32, 32); diff --git a/src/battle/move/item/strange_cake.h b/src/battle/move/item/strange_cake.h new file mode 100644 index 0000000000..9d67592d78 --- /dev/null +++ b/src/battle/move/item/strange_cake.h @@ -0,0 +1,27 @@ +#ifndef BATTLE_ITEM_STRANGE_CAKE +#define BATTLE_ITEM_STRANGE_CAKE + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_strange_cake + +API_CALLABLE(N(func_802A1A8C_731D8C)); +API_CALLABLE(N(func_802A18D8_731BD8)); +API_CALLABLE(N(AddFP)); +API_CALLABLE(N(func_802A13E4_7316E4)); +API_CALLABLE(N(func_802A1AD8_731DD8)); +API_CALLABLE(N(func_802A1B14_731E14)); +API_CALLABLE(N(func_802A1B68_731E68)); + +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(EatItem); +extern EvtScript N(script7); +extern EvtScript N(script8); +extern EvtScript N(script9); + +#endif + + diff --git a/src/battle/item/super_soda.c b/src/battle/move/item/super_soda.c similarity index 95% rename from src/battle/item/super_soda.c rename to src/battle/move/item/super_soda.c index e2ba51339b..a322d88703 100644 --- a/src/battle/item/super_soda.c +++ b/src/battle/move/item/super_soda.c @@ -6,7 +6,7 @@ extern EntityModelScript D_80283EE8; #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_724F1C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_724F1C)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -20,7 +20,7 @@ ApiStatus N(func_802A123C_724F1C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A12EC_724FCC)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A12EC_724FCC)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; Bytecode* args = script->ptrReadPos; @@ -44,7 +44,7 @@ ApiStatus N(func_802A12EC_724FCC)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1378_725058)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1378_725058)) { s32 actorId = evt_get_variable(script, *script->ptrReadPos); Actor* actor = get_actor(actorId); s32 actorClass = actor->actorID & ACTOR_CLASS_MASK; @@ -75,7 +75,7 @@ ApiStatus N(func_802A1378_725058)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A1418_7250F8)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1418_7250F8)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); diff --git a/src/battle/move/item/super_soda.h b/src/battle/move/item/super_soda.h new file mode 100644 index 0000000000..702ed4c6cc --- /dev/null +++ b/src/battle/move/item/super_soda.h @@ -0,0 +1,20 @@ +#ifndef BATTLE_ITEM_SUPER_SODA +#define BATTLE_ITEM_SUPER_SODA + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_super_soda + +API_CALLABLE(N(func_802A123C_724F1C)); +API_CALLABLE(N(func_802A12EC_724FCC)); +API_CALLABLE(N(func_802A1418_7250F8)); +API_CALLABLE(N(AddFP)); +API_CALLABLE(N(func_802A1378_725058)); + +extern EvtScript N(UseItemWithEffect); +extern EvtScript N(PlayerGoHome); +extern EvtScript N(UseItem); + +#endif diff --git a/src/battle/item/tasty_tonic.c b/src/battle/move/item/tasty_tonic.c similarity index 97% rename from src/battle/item/tasty_tonic.c rename to src/battle/move/item/tasty_tonic.c index 779c889082..488395b262 100644 --- a/src/battle/item/tasty_tonic.c +++ b/src/battle/move/item/tasty_tonic.c @@ -3,7 +3,7 @@ #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_72223C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_72223C)) { s32 actorId = evt_get_variable(script, *script->ptrReadPos); Actor* actor = get_actor(actorId); s32 id = actor->actorID & ACTOR_CLASS_MASK; diff --git a/src/battle/item/tasty_tonic.h b/src/battle/move/item/tasty_tonic.h similarity index 81% rename from src/battle/item/tasty_tonic.h rename to src/battle/move/item/tasty_tonic.h index 0721acc61d..7265afaca0 100644 --- a/src/battle/item/tasty_tonic.h +++ b/src/battle/move/item/tasty_tonic.h @@ -7,7 +7,7 @@ #undef NAMESPACE #define NAMESPACE battle_item_tasty_tonic -ApiStatus N(func_802A123C_72223C)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(func_802A123C_72223C)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/thunder_bolt.c b/src/battle/move/item/thunder_bolt.c similarity index 94% rename from src/battle/item/thunder_bolt.c rename to src/battle/move/item/thunder_bolt.c index ff20ee7749..203f3a3646 100644 --- a/src/battle/item/thunder_bolt.c +++ b/src/battle/move/item/thunder_bolt.c @@ -4,7 +4,7 @@ #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_722D7C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_722D7C)) { Actor* enemyTarget = get_actor(script->owner1.enemyID); Actor* actor = get_actor(enemyTarget->targetActorID); f32 posY, posX, posZ; @@ -34,7 +34,7 @@ ApiStatus N(func_802A123C_722D7C)(Evt* script, s32 isInitialCall) { #include "common/FadeBackgroundToBlack.inc.c" -ApiStatus N(func_802A1420_722F60)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1420_722F60)) { if (isInitialCall) { script->functionTemp[0] = 20; } diff --git a/src/battle/item/thunder_bolt.h b/src/battle/move/item/thunder_bolt.h similarity index 56% rename from src/battle/item/thunder_bolt.h rename to src/battle/move/item/thunder_bolt.h index 9cd7938f72..b413ddd168 100644 --- a/src/battle/item/thunder_bolt.h +++ b/src/battle/move/item/thunder_bolt.h @@ -7,9 +7,9 @@ #undef NAMESPACE #define NAMESPACE battle_item_thunder_bolt -ApiStatus N(FadeBackgroundToBlack)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A123C_722D7C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1420_722F60)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(FadeBackgroundToBlack)); +API_CALLABLE(N(func_802A123C_722D7C)); +API_CALLABLE(N(func_802A1420_722F60)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/thunder_rage.c b/src/battle/move/item/thunder_rage.c similarity index 95% rename from src/battle/item/thunder_rage.c rename to src/battle/move/item/thunder_rage.c index 9c5d694baf..5dd5ff9f57 100644 --- a/src/battle/item/thunder_rage.c +++ b/src/battle/move/item/thunder_rage.c @@ -6,7 +6,7 @@ #include "common/FadeBackgroundToBlack.inc.c" -ApiStatus N(func_802A12D4_71B474)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A12D4_71B474)) { if (isInitialCall) { script->functionTemp[0] = 20; } @@ -22,7 +22,7 @@ ApiStatus N(func_802A12D4_71B474)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(func_802A1354_71B4F4)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A1354_71B4F4)) { Actor* enemyTarget = get_actor(script->owner1.enemyID); Actor* actor = get_actor(enemyTarget->targetActorID); f32 posY, posX, posZ; diff --git a/src/battle/item/thunder_rage.h b/src/battle/move/item/thunder_rage.h similarity index 56% rename from src/battle/item/thunder_rage.h rename to src/battle/move/item/thunder_rage.h index 60224d249b..ac54dbbf6b 100644 --- a/src/battle/item/thunder_rage.h +++ b/src/battle/move/item/thunder_rage.h @@ -7,9 +7,9 @@ #undef NAMESPACE #define NAMESPACE battle_item_thunder_rage -ApiStatus N(FadeBackgroundToBlack)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A1354_71B4F4)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A12D4_71B474)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(FadeBackgroundToBlack)); +API_CALLABLE(N(func_802A1354_71B4F4)); +API_CALLABLE(N(func_802A12D4_71B474)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/ultra_shroom.c b/src/battle/move/item/ultra_shroom.c similarity index 92% rename from src/battle/item/ultra_shroom.c rename to src/battle/move/item/ultra_shroom.c index 94aaa050d9..d8e03f4425 100644 --- a/src/battle/item/ultra_shroom.c +++ b/src/battle/move/item/ultra_shroom.c @@ -3,7 +3,7 @@ #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_7239BC)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_7239BC)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -14,7 +14,7 @@ ApiStatus N(func_802A123C_7239BC)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A12FC_723A7C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A12FC_723A7C)) { PlayerData* playerData = &gPlayerData; playerData->curHP += 10; diff --git a/src/battle/item/ultra_shroom.h b/src/battle/move/item/ultra_shroom.h similarity index 68% rename from src/battle/item/ultra_shroom.h rename to src/battle/move/item/ultra_shroom.h index d1ead7c7f8..3f3b7adad4 100644 --- a/src/battle/item/ultra_shroom.h +++ b/src/battle/move/item/ultra_shroom.h @@ -7,8 +7,8 @@ #undef NAMESPACE #define NAMESPACE battle_item_ultra_shroom -ApiStatus N(func_802A123C_7239BC)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A12FC_723A7C)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(func_802A123C_7239BC)); +API_CALLABLE(N(func_802A12FC_723A7C)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/unknown_item.c b/src/battle/move/item/unknown_item.c similarity index 91% rename from src/battle/item/unknown_item.c rename to src/battle/move/item/unknown_item.c index 30fd548518..28fad66215 100644 --- a/src/battle/item/unknown_item.c +++ b/src/battle/move/item/unknown_item.c @@ -3,7 +3,7 @@ #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_72447C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_72447C)) { Bytecode* args = script->ptrReadPos; s32 a = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++); @@ -14,7 +14,7 @@ ApiStatus N(func_802A123C_72447C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(func_802A12FC_72453C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A12FC_72453C)) { PlayerData* playerData = &gPlayerData; playerData->curHP += 20; diff --git a/src/battle/item/unknown_item.h b/src/battle/move/item/unknown_item.h similarity index 68% rename from src/battle/item/unknown_item.h rename to src/battle/move/item/unknown_item.h index 8aa0903e76..086f99d723 100644 --- a/src/battle/item/unknown_item.h +++ b/src/battle/move/item/unknown_item.h @@ -7,8 +7,8 @@ #undef NAMESPACE #define NAMESPACE battle_item_unknown_item -ApiStatus N(func_802A123C_72447C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802A12FC_72453C)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(func_802A123C_72447C)); +API_CALLABLE(N(func_802A12FC_72453C)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/item/volt_shroom.c b/src/battle/move/item/volt_shroom.c similarity index 94% rename from src/battle/item/volt_shroom.c rename to src/battle/move/item/volt_shroom.c index ff0ab757f9..fa22b733fb 100644 --- a/src/battle/item/volt_shroom.c +++ b/src/battle/move/item/volt_shroom.c @@ -2,7 +2,7 @@ #include "ItemRefund.inc.c" -ApiStatus N(func_802A123C_71AA2C)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_802A123C_71AA2C)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; diff --git a/src/battle/item/volt_shroom.h b/src/battle/move/item/volt_shroom.h similarity index 81% rename from src/battle/item/volt_shroom.h rename to src/battle/move/item/volt_shroom.h index 9d0e5e39d2..25fec5481c 100644 --- a/src/battle/item/volt_shroom.h +++ b/src/battle/move/item/volt_shroom.h @@ -7,7 +7,7 @@ #undef NAMESPACE #define NAMESPACE battle_item_volt_shroom -ApiStatus N(func_802A123C_71AA2C)(Evt* script, s32 isInitialCall); +API_CALLABLE(N(func_802A123C_71AA2C)); extern EvtScript N(UseItemWithEffect); extern EvtScript N(PlayerGoHome); diff --git a/src/battle/move/jump/attack.c b/src/battle/move/jump/attack.c new file mode 100644 index 0000000000..8aeb9f8b2f --- /dev/null +++ b/src/battle/move/jump/attack.c @@ -0,0 +1,569 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" + +#define NAMESPACE battle_move_jump_attack + +#include "battle/common/move/JumpSupport.inc.c" + +API_CALLABLE(N(GetJumpDamage)) { + script->varTable[15] = 1; + + switch (gPlayerData.bootsLevel) { + case 0: + script->varTable[15] = 1; + break; + case 1: + script->varTable[15] = 2; + break; + case 2: + script->varTable[15] = 3; + break; + } + + return ApiStatus_DONE2; +} + +extern EvtScript N(EVS_UseMove0_ImplA); +extern EvtScript N(EVS_UseMove0_ImplB); +extern EvtScript N(EVS_UseMove0_ImplC); +extern EvtScript N(EVS_802A4018); + +EvtScript N(EVS_UseMove0) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetBattleFlags2, LVar0) + EVT_IF_FLAG(LVar0, BS_FLAGS1_200) + EVT_EXEC_WAIT(N(EVS_802A4018)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseMove0_ImplA)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseMove0_ImplB)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseMove0_ImplC)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove0_ImplA) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(GetActionCommandMode, LVar0) + EVT_IF_EQ(LVar0, 2) + EVT_CALL(SetActionCommandMode, 3) + EVT_LOOP(0) + EVT_CALL(GetActionCommandMode, LVar0) + EVT_IF_LT(LVar0, 2) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_IF + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetActionCommandMode, LVar0) + EVT_IF_GT(LVar0, 0) + EVT_WAIT(1) + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(func_80269524, LVarF) + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 24, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(func_80274A18, 24, 3) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove0_ImplB) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarF) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 37, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(func_802752AC, 20, 4) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 5) + EVT_CALL(EnablePlayerBlur, -1) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove0_ImplC) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarF) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 25, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(func_80275F00, 25, 4) + EVT_CALL(EnablePlayerBlur, -1) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +extern EvtScript N(EVS_UseMove1_ImplA); +extern EvtScript N(EVS_UseMove1_ImplB); +extern EvtScript N(EVS_UseMove1_ImplC); + +EvtScript N(EVS_UseMove1) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseMove1_ImplA)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseMove1_ImplB)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseMove1_ImplC)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove1_ImplA) = { + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) + EVT_SUB(LVar3, 40) + EVT_SET(LVar4, 40) + EVT_CALL(SetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_34) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) + EVT_SUB(LVar0, LVar3) + EVT_SUB(LVar0, 20) + EVT_DIVF(LVar0, EVT_FLOAT(10.588)) + EVT_ADDF(LVar0, 15) + EVT_SET(LVarA, LVar0) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(func_80274A18, LVarA, 0) + EVT_CALL(N(GetJumpDamage)) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVarF, 48) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove1_ImplB) = { + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) + EVT_SUB(LVar3, 40) + EVT_SET(LVar4, 40) + EVT_CALL(SetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_EXEC_WAIT(N(EVS_JumpSupport_C)) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_37) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(func_802752AC, LVarA, 0) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 1) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_34) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 48) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove1_ImplC) = { + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) + EVT_SUB(LVar3, 40) + EVT_SET(LVar4, 40) + EVT_CALL(SetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_EXEC_WAIT(N(EVS_JumpSupport_D)) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_38) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_30000) + EVT_CALL(func_80275F00, LVarA, 0) + EVT_SET(LVarA, 4) + EVT_CALL(func_80275F00, LVarA, 1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 48) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +extern EvtScript N(EVS_UseMove2_ImplA); +extern EvtScript N(EVS_UseMove2_ImplB); +extern EvtScript N(EVS_UseMove2_ImplC); + +EvtScript N(EVS_UseMove2) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseMove2_ImplA)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseMove2_ImplB)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseMove2_ImplC)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove2_ImplA) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(func_80269524, LVarF) + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 24, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(func_80274A18, 24, 3) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove2_ImplB) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarF) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 37, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(func_802752AC, 20, 4) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 5) + EVT_CALL(EnablePlayerBlur, -1) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove2_ImplC) = { + EVT_CALL(InitTargetIterator) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarF) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 25, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(func_80275F00, 25, 4) + EVT_CALL(EnablePlayerBlur, -1) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A4018) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(AddGoalPos, ACTOR_PLAYER, -5, 10, 0) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(func_80274A18, LVarA, 0) + EVT_CALL(GetActionCommandMode, LVar0) + EVT_IF_EQ(LVar0, 2) + EVT_CALL(SetActionCommandMode, 3) + EVT_LOOP(0) + EVT_CALL(GetActionCommandMode, LVar0) + EVT_IF_LT(LVar0, 2) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_IF + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetActionCommandMode, LVar0) + EVT_IF_GT(LVar0, 0) + EVT_WAIT(1) + EVT_END_IF + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(func_80269524, LVarF) + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 24, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(func_80274A18, 24, 3) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/auto_jump.c b/src/battle/move/jump/auto_jump.c new file mode 100644 index 0000000000..d3681def25 --- /dev/null +++ b/src/battle/move/jump/auto_jump.c @@ -0,0 +1,198 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" + +#define NAMESPACE battle_move_auto_jump + +#include "battle/common/move/JumpSupport.inc.c" + +extern EvtScript N(EVS_UseMove_ImplA); +extern EvtScript N(EVS_UseMove_ImplB); +extern EvtScript N(EVS_UseMove_ImplC); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_AUTO_SUCCEED_ACTION, TRUE) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplA)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplB)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplA) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(GetActionCommandMode, LVar0) + EVT_IF_EQ(LVar0, 2) + EVT_CALL(SetActionCommandMode, 3) + EVT_LOOP(0) + EVT_CALL(GetActionCommandMode, LVar0) + EVT_IF_LT(LVar0, 2) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_IF + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(func_80269524, LVarF) + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 24, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(func_80274A18, 24, 3) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplB) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarF) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 37, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(func_802752AC, 20, 4) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 5) + EVT_CALL(EnablePlayerBlur, 0) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplC) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarF) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 25, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(func_80275F00, 25, 4) + EVT_CALL(EnablePlayerBlur, 0) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/auto_multibounce.c b/src/battle/move/jump/auto_multibounce.c new file mode 100644 index 0000000000..0c201d9b43 --- /dev/null +++ b/src/battle/move/jump/auto_multibounce.c @@ -0,0 +1,456 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" + +#define NAMESPACE battle_move_auto_multibounce + +#include "battle/common/move/JumpSupport.inc.c" + +extern EvtScript N(EVS_UseMove_ImplA); +extern EvtScript N(EVS_UseMove_ImplB); +extern EvtScript N(EVS_UseMove_ImplC); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_AUTO_SUCCEED_ACTION, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplA)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplB)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplA) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_SET(LocalFlag(0), FALSE) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 112) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 112) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 48) + EVT_END_SWITCH + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarE) + EVT_ADD(LVarF, 1) + EVT_SET(LocalFlag(0), FALSE) + EVT_LABEL(10) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) + EVT_CALL(GetTargetListLength, LVar0) + EVT_SUB(LVar0, 1) + EVT_IF_EQ(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_CALL(ShowActionHud, FALSE) + EVT_END_IF + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_ADD(LVarA, 5) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_IF_EQ(LVarF, 1) + EVT_CALL(func_80274A18, LVarA, 3) + EVT_ELSE + EVT_CALL(func_80274A18, LVarA, 4) + EVT_END_IF + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 112) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 240) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 48) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 240) + EVT_END_IF + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(FALSE) + EVT_CASE_OR_EQ(2) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(TRUE) + EVT_CASE_OR_EQ(3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_GE(LVarF, LVar0) + EVT_EXEC_WAIT(N(EVS_JumpSupport_F)) + EVT_RETURN + EVT_END_IF + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplB) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_SET(LocalFlag(0), FALSE) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 2, 112) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 2, 112) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 2, 48) + EVT_END_SWITCH + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarE) + EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LVarF, 0) + EVT_ADD(LVarF, 1) + EVT_LABEL(10) + EVT_CALL(GetTargetListLength, LVar0) + EVT_SUB(LVar0, 1) + EVT_IF_EQ(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_CALL(ShowActionHud, FALSE) + EVT_END_IF + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) + EVT_CALL(action_command_jump_start, 37, 3) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(EnablePlayerBlur, 1) + EVT_IF_EQ(LVarF, 1) + EVT_CALL(func_802752AC, 20, 3) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 6) + EVT_ELSE + EVT_CALL(func_802752AC, 20, 4) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 5) + EVT_END_IF + EVT_CALL(EnablePlayerBlur, 0) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 2, 112) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 2, 240) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 2, 48) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 2, 240) + EVT_END_IF + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(FALSE) + EVT_CASE_OR_EQ(2) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(TRUE) + EVT_CASE_OR_EQ(3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_GE(LVarF, LVar0) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_IF + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplC) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_SET(LocalFlag(0), FALSE) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 3, 112) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 3, 112) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 3, 48) + EVT_END_SWITCH + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarE) + EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LVarF, 0) + EVT_ADD(LVarF, 1) + EVT_LABEL(20) + EVT_CALL(GetTargetListLength, LVar0) + EVT_SUB(LVar0, 1) + EVT_IF_EQ(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_CALL(ShowActionHud, FALSE) + EVT_END_IF + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) + EVT_CALL(action_command_jump_start, 25, 3) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_IF_EQ(LVarF, 1) + EVT_CALL(func_80275F00, 25, 2) + EVT_ELSE + EVT_CALL(func_80275F00, 25, 4) + EVT_END_IF + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 3, 112) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 3, 240) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 3, 48) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 3, 240) + EVT_END_IF + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(FALSE) + EVT_CASE_OR_EQ(2) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(TRUE) + EVT_CASE_OR_EQ(3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_GE(LVarF, LVar0) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_IF + EVT_GOTO(20) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/d_down_jump.c b/src/battle/move/jump/d_down_jump.c new file mode 100644 index 0000000000..f14a6e08ff --- /dev/null +++ b/src/battle/move/jump/d_down_jump.c @@ -0,0 +1,222 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" +#include "effects.h" + +#define NAMESPACE battle_move_d_down_jump + +#include "battle/common/move/JumpSupport.inc.c" + +API_CALLABLE(N(func_802A10E4_781A04)) { + Bytecode* args = script->ptrReadPos; + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + + if (script->varTable[10] == 0) { + fx_green_impact(TRUE, var0, var1, var2, 0.0f); + } else { + fx_green_impact(FALSE, var0, var1, var2, 0.0f); + } + + return ApiStatus_DONE2; +} + +extern EvtScript N(EVS_UseMove_ImplA); +extern EvtScript N(EVS_UseMove_ImplB); +extern EvtScript N(EVS_UseMove_ImplC); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(func_80269EAC, 4) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplA)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplB)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplA) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_CALL(DidActionSucceed, LVarA) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210A) + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15A) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(func_80269524, LVarF) + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 24, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(func_80274A18, 24, 3) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210A) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplB) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210B) + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarF) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 37, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(func_802752AC, 20, 4) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 5) + EVT_CALL(EnablePlayerBlur, 0) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210B) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplC) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210C) + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarF) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 25, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(func_80275F00, 25, 4) + EVT_CALL(EnablePlayerBlur, 0) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210C) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/demo_power_bounce.c b/src/battle/move/jump/demo_power_bounce.c new file mode 100644 index 0000000000..955a499216 --- /dev/null +++ b/src/battle/move/jump/demo_power_bounce.c @@ -0,0 +1,470 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" +#include "battle/battle.h" + +#define NAMESPACE battle_move_demo_power_bounce + +#include "battle/common/move/JumpSupport.inc.c" + +s32 N(DifficultyTable)[] = { + 7, 6, 5, 4, 3, 2, 1, 0 +}; + +s32 N(BaseHitChance) = 200; + +/* +s32 N(D_802A26D0)[] = { + 36, 2, 0xFBD3E28A, 0 +}; +*/ + +API_CALLABLE(N(GetHitChance)) { + Actor* enemyTargetActor = get_actor(get_actor(script->owner1.enemyID)->targetActorID); + u32 enemyTargetPowerBounceChance; + + script->varTable[0] = 99; + + enemyTargetPowerBounceChance = enemyTargetActor->actorBlueprint->powerBounceChance; + + if (is_ability_active(ABILITY_DODGE_MASTER)) { + enemyTargetPowerBounceChance += 7; + } + + N(BaseHitChance) *= enemyTargetPowerBounceChance; + N(BaseHitChance) /= 100; + + if (N(BaseHitChance) < rand_int(100)) { + script->varTable[0] = 0; + } + + return ApiStatus_DONE2; +} + +extern EvtScript N(EVS_UseMove_ImplA); +extern EvtScript N(EVS_UseMove_ImplB); +extern EvtScript N(EVS_UseMove_ImplC); + +EvtScript N(EVS_UseMove) = { + EVT_SET(LocalFlag(10), FALSE) + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_AUTO_SUCCEED_ACTION, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarC, 1) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplA)) + EVT_CASE_EQ(1) + EVT_SET(LVarC, 2) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplB)) + EVT_CASE_EQ(2) + EVT_SET(LVarC, 3) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplA) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(func_80274A18, LVarA, 0) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(func_80269524, LVarE) + EVT_SET(LVarD, 0) + EVT_SET(LVarF, 0) + EVT_SET(LocalFlag(0), FALSE) + EVT_LABEL(10) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_SET(LVarA, 24) + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CASE_EQ(1) + EVT_CALL(action_command_jump_start, LVarA, 2) + EVT_CASE_EQ(2) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CASE_EQ(3) + EVT_CALL(action_command_jump_start, LVarA, 4) + EVT_CASE_DEFAULT + EVT_CALL(action_command_jump_start, LVarA, 5) + EVT_END_SWITCH + EVT_SUB(LVarD, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_IF_EQ(LVarF, 0) + EVT_CALL(func_80274A18, 24, 3) + EVT_ELSE + EVT_CALL(func_80274A18, 24, 4) + EVT_END_IF + EVT_CALL(GetCommandAutoSuccess, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_IF_GE(LVarF, 3) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_END_IF + EVT_CALL(N(GetHitChance)) + EVT_IF_GE(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplB) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(func_80274A18, LVarA, 0) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarE) + EVT_SET(LVarD, 0) + EVT_SET(LVarF, 0) + EVT_SET(LocalFlag(0), FALSE) + EVT_LABEL(10) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_SET(LVarA, 37) + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CASE_EQ(1) + EVT_CALL(action_command_jump_start, LVarA, 2) + EVT_CASE_EQ(2) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CASE_EQ(3) + EVT_CALL(action_command_jump_start, LVarA, 4) + EVT_CASE_DEFAULT + EVT_CALL(action_command_jump_start, LVarA, 5) + EVT_END_SWITCH + EVT_SUB(LVarD, 1) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(EnablePlayerBlur, 1) + EVT_IF_EQ(LVarF, 0) + EVT_CALL(func_802752AC, 20, 3) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 6) + EVT_ELSE + EVT_CALL(func_802752AC, 20, 4) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 5) + EVT_END_IF + EVT_CALL(EnablePlayerBlur, 0) + EVT_CALL(GetCommandAutoSuccess, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_IF_GT(LVarF, 3) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_END_IF + EVT_CALL(N(GetHitChance)) + EVT_IF_GT(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplC) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(func_80274A18, LVarA, 0) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarE) + EVT_SET(LVarD, 0) + EVT_SET(LVarF, 0) + EVT_SET(LocalFlag(0), FALSE) + EVT_LABEL(10) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_SET(LVarA, 25) + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CASE_EQ(1) + EVT_CALL(action_command_jump_start, LVarA, 2) + EVT_CASE_EQ(2) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CASE_EQ(3) + EVT_CALL(action_command_jump_start, LVarA, 4) + EVT_CASE_DEFAULT + EVT_CALL(action_command_jump_start, LVarA, 5) + EVT_END_SWITCH + EVT_SUB(LVarD, 1) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_IF_EQ(LVarF, 0) + EVT_CALL(func_80275F00, 25, 2) + EVT_ELSE + EVT_CALL(func_80275F00, 25, 4) + EVT_END_IF + EVT_CALL(EnablePlayerBlur, 0) + EVT_CALL(GetCommandAutoSuccess, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_IF_GT(LVarF, 3) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_END_IF + EVT_CALL(N(GetHitChance)) + EVT_IF_GT(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/dizzy_stomp.c b/src/battle/move/jump/dizzy_stomp.c new file mode 100644 index 0000000000..378fc16855 --- /dev/null +++ b/src/battle/move/jump/dizzy_stomp.c @@ -0,0 +1,185 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" + +#define NAMESPACE battle_move_dizzy_stomp + +#include "battle/common/move/JumpSupport.inc.c" + +extern EvtScript N(EVS_UseMove_ImplA); +extern EvtScript N(EVS_UseMove_ImplB); +extern EvtScript N(EVS_UseMove_ImplC); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplA)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplB)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplA) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_DIZZY, 3, 75), 1, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_DIZZY, 3, 75), 1, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(func_80269524, LVarF) + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 24, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(func_80274A18, 24, 3) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_DIZZY, 3, 100), 1, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplB) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_DIZZY, 3, 75), 2, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_DIZZY, 3, 75), 2, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarF) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 37, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(func_802752AC, 20, 4) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 5) + EVT_CALL(EnablePlayerBlur, 0) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_DIZZY, 3, 100), 2, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplC) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_DIZZY, 3, 75), 3, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_DIZZY, 3, 75), 3, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarF) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 25, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(func_80275F00, 25, 4) + EVT_CALL(EnablePlayerBlur, 0) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_DIZZY, 3, 100), 3, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/earthquake_jump.c b/src/battle/move/jump/earthquake_jump.c new file mode 100644 index 0000000000..aec5bb39a2 --- /dev/null +++ b/src/battle/move/jump/earthquake_jump.c @@ -0,0 +1,705 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" +#include "effects.h" + +#define NAMESPACE battle_move_earthquake_jump + +#include "battle/common/move/JumpSupport.inc.c" + +API_CALLABLE(N(func_802A10E4_785C04)) { + script->varTable[0] = 3; + return ApiStatus_DONE2; +} + +MATCHING_BSS(0x3CC0); + +s32 N(DifficultyTable)[] = { + 11, 10, 9, 8, 7, 6, 5, 4 +}; + +extern EvtScript N(EVS_UseMove_ImplA); +extern EvtScript N(EVS_UseMove_ImplB); +extern EvtScript N(EVS_UseMove_ImplC); + +EvtScript N(EVS_UseMove) = { + EVT_SET(LocalFlag(10), FALSE) + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplA)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplB)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplA) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(SetGoalToFirstTarget, ACTOR_SELF) + EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 20) + EVT_CALL(InitTargetIterator) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) + EVT_SUB(LVar3, EVT_FLOAT(70.0)) + EVT_IF_LT(LVar0, LVar3) + EVT_SUB(LVar0, 20) + EVT_SET(LVar3, LVar0) + EVT_END_IF + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) + EVT_CALL(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(CancelablePlayerRunToGoal, 0, LVar0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(AddGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_SET(LVarB, LVarA) + EVT_ADD(LVarB, 2) + EVT_CALL(action_command_jump_start, LVarB, 3) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_30000, ANIM_Mario_30000) + EVT_CALL(func_80274A18, LVarA, 0) + EVT_CHILD_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.1)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.05)) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 24) + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 24, 30, 0, 0, 0, 0, 0) + EVT_END_CHILD_THREAD + EVT_WAIT(10) + EVT_CALL(InitTargetIterator) + EVT_CALL(DidActionSucceed, LVarB) + EVT_SET(LVar9, 0) + EVT_LABEL(1) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(2) + EVT_END_IF + EVT_SWITCH(LVarB) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 48) + EVT_END_SWITCH + EVT_LABEL(2) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_ADD(LVar9, 1) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_LT(LVar9, LVar0) + EVT_GOTO(1) + EVT_END_IF + EVT_SWITCH(LVarC) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(func_80269524, LVarE) + EVT_SET(LVarF, 0) + EVT_SET(LocalFlag(0), FALSE) + EVT_LABEL(10) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_SET(LVarA, 26) + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CASE_EQ(1) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CASE_EQ(2) + EVT_CALL(action_command_jump_start, LVarA, 4) + EVT_CASE_EQ(3) + EVT_CALL(action_command_jump_start, LVarA, 4) + EVT_CASE_DEFAULT + EVT_CALL(action_command_jump_start, LVarA, 5) + EVT_END_SWITCH + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_IF_EQ(LVarF, 0) + EVT_CALL(func_80274A18, 24, 3) + EVT_ELSE + EVT_CALL(func_80274A18, 24, 4) + EVT_END_IF + EVT_CHILD_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.1)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.05)) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 24) + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 24, 30, 0, 0, 0, 0, 0) + EVT_END_CHILD_THREAD + EVT_WAIT(10) + EVT_CALL(GetCommandAutoSuccess, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_IF_GT(LVarF, 3) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_END_IF + EVT_SET(LVar0, 3) + EVT_CALL(N(func_802A10E4_785C04)) + EVT_IF_GT(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_CALL(InitTargetIterator) + EVT_CALL(DidActionSucceed, LVarB) + EVT_SET(LVar9, 0) + EVT_LABEL(11) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(12) + EVT_END_IF + EVT_SWITCH(LVarB) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 64) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 224) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 32) + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_LABEL(12) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_ADD(LVar9, 1) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_LT(LVar9, LVar0) + EVT_GOTO(11) + EVT_END_IF + EVT_SWITCH(LVarC) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplB) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(SetGoalToFirstTarget, ACTOR_SELF) + EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 20) + EVT_CALL(InitTargetIterator) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) + EVT_SUB(LVar3, EVT_FLOAT(70.0)) + EVT_IF_LT(LVar0, LVar3) + EVT_SUB(LVar0, 20) + EVT_SET(LVar3, LVar0) + EVT_END_IF + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) + EVT_CALL(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(CancelablePlayerRunToGoal, 0, LVar0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(AddGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_EXEC_WAIT(N(EVS_CheckForAPress)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_SET(LVarB, LVarA) + EVT_ADD(LVarB, 2) + EVT_CALL(action_command_jump_start, LVarB, 3) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_30000, ANIM_Mario_30000) + EVT_CALL(func_80274A18, LVarA, 0) + EVT_CHILD_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.1)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.05)) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 24) + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 24, 30, 0, 0, 0, 0, 0) + EVT_END_CHILD_THREAD + EVT_WAIT(10) + EVT_CALL(InitTargetIterator) + EVT_CALL(DidActionSucceed, LVarB) + EVT_SET(LVar9, 0) + EVT_LABEL(1) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(2) + EVT_END_IF + EVT_SWITCH(LVarB) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 48) + EVT_END_SWITCH + EVT_LABEL(2) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_ADD(LVar9, 1) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_LT(LVar9, LVar0) + EVT_GOTO(1) + EVT_END_IF + EVT_SWITCH(LVarC) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(func_80269524, LVarE) + EVT_SET(LVarF, 0) + EVT_SET(LocalFlag(0), FALSE) + EVT_LABEL(10) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_SET(LVarA, 39) + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CASE_EQ(1) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CASE_EQ(2) + EVT_CALL(action_command_jump_start, LVarA, 4) + EVT_CASE_EQ(3) + EVT_CALL(action_command_jump_start, LVarA, 4) + EVT_CASE_DEFAULT + EVT_CALL(action_command_jump_start, LVarA, 5) + EVT_END_SWITCH + EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(EnablePlayerBlur, 1) + EVT_IF_EQ(LVarF, 0) + EVT_CALL(func_802752AC, 20, 3) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 6) + EVT_ELSE + EVT_CALL(func_802752AC, 20, 4) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 5) + EVT_END_IF + EVT_CALL(EnablePlayerBlur, 0) + EVT_CHILD_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.1)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.05)) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 24) + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 24, 30, 0, 0, 0, 0, 0) + EVT_END_CHILD_THREAD + EVT_WAIT(10) + EVT_CALL(GetCommandAutoSuccess, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_IF_GT(LVarF, 4) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_END_IF + EVT_SET(LVar0, 4) + EVT_CALL(N(func_802A10E4_785C04)) + EVT_IF_GT(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_CALL(InitTargetIterator) + EVT_CALL(DidActionSucceed, LVarB) + EVT_SET(LVar9, 0) + EVT_LABEL(11) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(12) + EVT_END_IF + EVT_SWITCH(LVarB) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 64) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 224) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 32) + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_LABEL(12) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_ADD(LVar9, 1) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_LT(LVar9, LVar0) + EVT_GOTO(1) + EVT_END_IF + EVT_SWITCH(LVarC) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplC) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(SetGoalToFirstTarget, ACTOR_SELF) + EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 20) + EVT_CALL(InitTargetIterator) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) + EVT_SUB(LVar3, EVT_FLOAT(70.0)) + EVT_IF_LT(LVar0, LVar3) + EVT_SUB(LVar0, 20) + EVT_SET(LVar3, LVar0) + EVT_END_IF + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) + EVT_CALL(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(CancelablePlayerRunToGoal, 0, LVar0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(AddGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_EXEC_WAIT(N(EVS_CheckForAPress)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_SET(LVarB, LVarA) + EVT_ADD(LVarB, 2) + EVT_CALL(action_command_jump_start, LVarB, 3) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_30000, ANIM_Mario_30000) + EVT_CALL(func_80274A18, LVarA, 0) + EVT_CHILD_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.1)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.05)) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 24) + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 24, 30, 0, 0, 0, 0, 0) + EVT_END_CHILD_THREAD + EVT_WAIT(10) + EVT_CALL(InitTargetIterator) + EVT_CALL(DidActionSucceed, LVarB) + EVT_SET(LVar9, 0) + EVT_LABEL(1) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(2) + EVT_END_IF + EVT_SWITCH(LVarB) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 48) + EVT_END_SWITCH + EVT_LABEL(2) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_ADD(LVar9, 1) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_LT(LVar9, LVar0) + EVT_GOTO(1) + EVT_END_IF + EVT_SWITCH(LVarC) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(func_80269524, LVarE) + EVT_SET(LVarF, 0) + EVT_SET(LocalFlag(0), FALSE) + EVT_LABEL(10) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) + EVT_WAIT(5) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_SET(LVarA, 27) + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CASE_EQ(1) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CASE_EQ(2) + EVT_CALL(action_command_jump_start, LVarA, 4) + EVT_CASE_EQ(3) + EVT_CALL(action_command_jump_start, LVarA, 4) + EVT_CASE_DEFAULT + EVT_CALL(action_command_jump_start, LVarA, 5) + EVT_END_SWITCH + EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_IF_EQ(LVarF, 0) + EVT_CALL(func_80275F00, 25, 2) + EVT_ELSE + EVT_CALL(func_80275F00, 25, 4) + EVT_END_IF + EVT_CALL(EnablePlayerBlur, 0) + EVT_CHILD_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.1)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.05)) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 24) + EVT_ADD(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 24, 30, 0, 0, 0, 0, 0) + EVT_END_CHILD_THREAD + EVT_WAIT(10) + EVT_CALL(GetCommandAutoSuccess, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_IF_GT(LVarF, 5) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_END_IF + EVT_SET(LVar0, 5) + EVT_CALL(N(func_802A10E4_785C04)) + EVT_IF_GT(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_CALL(InitTargetIterator) + EVT_CALL(DidActionSucceed, LVarB) + EVT_SET(LVar9, 0) + EVT_LABEL(11) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, 0, 16) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_GOTO(12) + EVT_END_IF + EVT_SWITCH(LVarB) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 64) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 224) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 32) + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_LABEL(12) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_ADD(LVar9, 1) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_LT(LVar9, LVar0) + EVT_GOTO(1) + EVT_END_IF + EVT_SWITCH(LVarC) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/jump.c b/src/battle/move/jump/jump.c deleted file mode 100644 index 686aaca8eb..0000000000 --- a/src/battle/move/jump/jump.c +++ /dev/null @@ -1,926 +0,0 @@ -#include "common.h" -#include "script_api/battle.h" -#include "battle/action_cmd/jump.h" - -#define NAMESPACE battle_move_jump - -extern EvtScript D_802A4018_740878; -extern EvtScript D_802A2720_73EF80; -extern EvtScript D_802A2ABC_73F31C; -extern EvtScript D_802A2DE8_73F648; -extern EvtScript D_802A3188_73F9E8; -extern EvtScript D_802A3378_73FBD8; -extern EvtScript D_802A34EC_73FD4C; -extern EvtScript D_802A36D8_73FF38; -extern EvtScript D_802A39C4_740224; -extern EvtScript D_802A3CF0_740550; - -s32 D_802A1140_73D9A0[] = { - 9, 3, 9, 3, - 9, 3, 8, 3, - 7, 3, 6, 2, - 5, 2, 4, 2, -}; - -#include "world/common/todo/UnkMoveFunc1.inc.c" - -EvtScript N(CheckForAPress) = { - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) - EVT_LOOP(5) - EVT_CALL(CheckButtonPress, BUTTON_A, LVar0) - EVT_IF_EQ(LVar0, TRUE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(MoveToJump) = { - EVT_CALL(SetGoalToFirstTarget, ACTOR_SELF) - EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 40) - EVT_CALL(InitTargetIterator) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_SUB(LVar3, EVT_FLOAT(70.0)) - EVT_IF_LT(LVar0, LVar3) - EVT_SET(LVar3, LVar0) - EVT_END_IF - EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(CancelablePlayerRunToGoal, 0, LVar0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_EXEC_WAIT(N(CheckForAPress)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1370_73DBD0 = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar6, LVar7, LVar8) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) - EVT_IF_GT(LVar6, LVar7) - EVT_SUB(LVar6, LVar7) - EVT_ELSE - EVT_SUB(LVar7, LVar6) - EVT_SET(LVar6, LVar7) - EVT_END_IF - EVT_SUB(LVar6, 20) - EVT_DIVF(LVar6, EVT_FLOAT(10.588)) - EVT_ADDF(LVar6, 15) - EVT_SET(LVarA, LVar6) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1458_73DCB8 = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar6, LVar7, LVar8) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) - EVT_IF_GT(LVar6, LVar7) - EVT_SUB(LVar6, LVar7) - EVT_ELSE - EVT_SUB(LVar7, LVar6) - EVT_SET(LVar6, LVar7) - EVT_END_IF - EVT_SUB(LVar6, 20) - EVT_DIVF(LVar6, EVT_FLOAT(22.5)) - EVT_ADDF(LVar6, 15) - EVT_SET(LVarA, LVar6) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1540_73DDA0 = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar6, LVar7, LVar8) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) - EVT_IF_GT(LVar6, LVar7) - EVT_SUB(LVar6, LVar7) - EVT_ELSE - EVT_SUB(LVar7, LVar6) - EVT_SET(LVar6, LVar7) - EVT_END_IF - EVT_SUB(LVar6, 20) - EVT_DIVF(LVar6, EVT_FLOAT(18.0)) - EVT_ADDF(LVar6, 22) - EVT_SET(LVarA, LVar6) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1628_73DE88 = { - EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) - EVT_CALL(func_802693F0) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 40) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) - EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.3)) - EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(N(UnkMoveFunc1)) - EVT_CALL(func_80273444, LVar0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(1) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) - EVT_CALL(func_80273444, 6, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(5) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1814_73E074 = { - EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) - EVT_CALL(func_802693F0) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 50) - EVT_SET(LVar1, 0) - EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) - EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(0.8)) - EVT_CALL(N(UnkMoveFunc1)) - EVT_CALL(func_80273444, LVar0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(1) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) - EVT_CALL(func_80273444, 6, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(2) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1A00_73E260 = { - EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_29) - EVT_CALL(func_802693F0) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 40) - EVT_SET(LVar1, 0) - EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) - EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) - EVT_CALL(N(UnkMoveFunc1)) - EVT_CALL(func_80273444, LVar0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(1) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) - EVT_CALL(func_80273444, 6, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(2) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1BEC_73E44C = { - EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) - EVT_CALL(func_802693F0) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 60) - EVT_SET(LVar1, 0) - EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) - EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(0.8)) - EVT_CALL(N(UnkMoveFunc1)) - EVT_CALL(func_80273444, LVar0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(1) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) - EVT_CALL(func_80273444, 6, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) - EVT_WAIT(2) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1DD8_73E638 = { - EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) - EVT_CALL(func_802693F0) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 60) - EVT_SET(LVar1, 0) - EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_FallBack, ANIM_Mario_FallBack, ANIM_Mario_10009) - EVT_CALL(N(UnkMoveFunc1)) - EVT_CALL(func_80273444, LVar0, 0, 0) - EVT_CHILD_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.0)) - EVT_END_CHILD_THREAD - EVT_CALL(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) - EVT_CALL(func_80273444, 8, 0, 2) - EVT_CHILD_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.0)) - EVT_END_CHILD_THREAD - EVT_CALL(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) - EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(func_80273444, 6, 0, 2) - EVT_CHILD_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.0)) - EVT_END_CHILD_THREAD - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(func_80273444, 4, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A203C_73E89C = { - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, 0, 0, ANIM_Mario_1000C) - EVT_CALL(PlayerLandJump) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1000C) - EVT_WAIT(2) - EVT_CHILD_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) - EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_162) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GetUp) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_DustOff) - EVT_WAIT(20) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) - EVT_CALL(func_802693F0) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(func_80276EFC) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A21D4_73EA34 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_EXEC_WAIT(N(MoveToJump)) - EVT_EXEC_WAIT(D_802A1370_73DBD0) - EVT_CALL(action_command_jump_start, LVarA, 3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) - EVT_CALL(func_80274A18, LVarA, 0) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A2280 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_EXEC_WAIT(N(MoveToJump)) - EVT_CALL(InitTargetIterator) - EVT_EXEC_WAIT(D_802A1458_73DCB8) - EVT_SET(LVarB, LVarA) - EVT_ADD(LVarB, 14) - EVT_ADD(LVarB, -3) - EVT_CALL(action_command_jump_start, LVarB, 3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_37) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) - EVT_CALL(func_802752AC, LVarA, 0) - EVT_WAIT(7) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(func_802752AC, 3, 1) - EVT_CASE_DEFAULT - EVT_CALL(func_802752AC, 5, 1) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A23D4_73EC34 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_EXEC_WAIT(N(MoveToJump)) - EVT_EXEC_WAIT(D_802A1540_73DDA0) - EVT_CALL(SetActionDifficultyTable, EVT_PTR(D_802A1140_73D9A0)) - EVT_SET(LVarB, LVarA) - EVT_SUB(LVarB, 4) - EVT_ADD(LVarB, -3) - EVT_CALL(action_command_jump_start, LVarB, 3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_38) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, 524288, ANIM_Mario_30000) - EVT_CALL(func_80275F00, LVarA, 0) - EVT_CALL(CloseActionCommandInfo) - EVT_SET(LVar9, 0) - EVT_CALL(DidActionSucceed, LVar0) - EVT_IF_GT(LVar0, 0) - EVT_SET(LVar9, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30000) - EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) - EVT_WAIT(2) - EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_CALL(action_command_jump_start, 13, 3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_39) - EVT_CALL(func_80275F00, 15, 2) - EVT_GOTO(10) - EVT_ELSE - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_CALL(action_command_jump_start, 2, 3) - EVT_CALL(func_80275F00, 4, 1) - EVT_GOTO(10) - EVT_END_IF - EVT_LABEL(10) - EVT_RETURN - EVT_END -}; - -EvtScript N(802A2650) = { - EVT_CALL(ShowActionHud, 1) - EVT_CALL(GetBattleFlags2, LVar0) - EVT_IF_FLAG(LVar0, BS_FLAGS2_200) - EVT_EXEC_WAIT(D_802A4018_740878) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_EXEC_WAIT(D_802A2720_73EF80) - EVT_CASE_EQ(1) - EVT_EXEC_WAIT(D_802A2ABC_73F31C) - EVT_CASE_EQ(2) - EVT_EXEC_WAIT(D_802A2DE8_73F648) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A2720_73EF80 = { - EVT_EXEC_WAIT(D_802A21D4_73EA34) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_EQ(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL_WAIT_INPUT) - EVT_LOOP(0) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_LT(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_IF - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(D_802A203C_73E89C) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_GT(LVar0, ACTION_COMMAND_MODE_NOT_LEARNED) - EVT_WAIT(1) - EVT_END_IF - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 1, BS_FLAGS1_40 | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_EXEC_WAIT(D_802A1A00_73E260) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CHILD_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) - EVT_WAIT(5) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) - EVT_END_CHILD_THREAD - EVT_CALL(func_80269524, LVarF) - EVT_CALL(CloseActionCommandInfo) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_CALL(ShowActionHud, 0) - EVT_CALL(action_command_jump_start, 24, 3) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) - EVT_CALL(func_80274A18, 24, 3) - EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 1, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(func_80269550, LVarF) - EVT_EXEC_WAIT(D_802A1628_73DE88) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A2ABC_73F31C = { - EVT_EXEC_WAIT(D_802A21D4_73EA34) - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(D_802A203C_73E89C) - EVT_RETURN - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 2, BS_FLAGS1_40 | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_EXEC_WAIT(D_802A1A00_73E260) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CALL(func_80269524, LVarF) - EVT_CHILD_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) - EVT_WAIT(5) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) - EVT_END_CHILD_THREAD - EVT_CALL(CloseActionCommandInfo) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_CALL(ShowActionHud, 0) - EVT_CALL(action_command_jump_start, 37, 3) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) - EVT_CALL(func_802752AC, 20, 4) - EVT_WAIT(7) - EVT_CALL(func_802752AC, 3, 5) - EVT_CALL(EnablePlayerBlur, -1) - EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 2, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(func_80269550, LVarF) - EVT_EXEC_WAIT(D_802A1628_73DE88) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A2DE8_73F648 = { - EVT_EXEC_WAIT(D_802A21D4_73EA34) - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(D_802A203C_73E89C) - EVT_RETURN - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 3, BS_FLAGS1_40 | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_EXEC_WAIT(D_802A1A00_73E260) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CALL(func_80269524, LVarF) - EVT_CHILD_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) - EVT_WAIT(5) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) - EVT_END_CHILD_THREAD - EVT_CALL(CloseActionCommandInfo) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_CALL(ShowActionHud, 0) - EVT_CALL(action_command_jump_start, 25, 3) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) - EVT_CALL(func_80275F00, 25, 4) - EVT_CALL(EnablePlayerBlur, -1) - EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 3, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(func_80269550, LVarF) - EVT_EXEC_WAIT(D_802A1628_73DE88) - EVT_RETURN - EVT_END -}; - -EvtScript N(802A30F4) = { - EVT_CALL(ShowActionHud, 1) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_EXEC_WAIT(D_802A3188_73F9E8) - EVT_CASE_EQ(1) - EVT_EXEC_WAIT(D_802A3378_73FBD8) - EVT_CASE_EQ(2) - EVT_EXEC_WAIT(D_802A34EC_73FD4C) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -ApiStatus N(GetJumpDamage)(Evt* script, s32 isInitialCall) { - script->varTable[15] = 1; - - switch (gPlayerData.bootsLevel) { - case 0: - script->varTable[15] = 1; - break; - case 1: - script->varTable[15] = 2; - break; - case 2: - script->varTable[15] = 3; - break; - } - - return ApiStatus_DONE2; -} - -EvtScript D_802A3188_73F9E8 = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_SUB(LVar3, 40) - EVT_SET(LVar4, 40) - EVT_CALL(SetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_34) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_SUB(LVar0, LVar3) - EVT_SUB(LVar0, 20) - EVT_DIVF(LVar0, EVT_FLOAT(10.588)) - EVT_ADDF(LVar0, 15) - EVT_SET(LVarA, LVar0) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) - EVT_CALL(func_80274A18, LVarA, 0) - EVT_CALL(N(GetJumpDamage)) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, LVarF, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_EXEC_WAIT(D_802A1628_73DE88) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A3378_73FBD8 = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_SUB(LVar3, 40) - EVT_SET(LVar4, 40) - EVT_CALL(SetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_EXEC_WAIT(D_802A1458_73DCB8) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_37) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) - EVT_CALL(func_802752AC, LVarA, 0) - EVT_WAIT(7) - EVT_CALL(func_802752AC, 3, 1) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_34) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_EXEC_WAIT(D_802A1628_73DE88) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A34EC_73FD4C = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_SUB(LVar3, 40) - EVT_SET(LVar4, 40) - EVT_CALL(SetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_EXEC_WAIT(D_802A1540_73DDA0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_38) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_30000) - EVT_CALL(func_80275F00, LVarA, 0) - EVT_SET(LVarA, 4) - EVT_CALL(func_80275F00, LVarA, 1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_EXEC_WAIT(D_802A1628_73DE88) - EVT_RETURN - EVT_END -}; - -EvtScript N(802A3644) = { - EVT_CALL(ShowActionHud, 1) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_EXEC_WAIT(D_802A36D8_73FF38) - EVT_CASE_EQ(1) - EVT_EXEC_WAIT(D_802A39C4_740224) - EVT_CASE_EQ(2) - EVT_EXEC_WAIT(D_802A3CF0_740550) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A36D8_73FF38 = { - EVT_EXEC_WAIT(D_802A21D4_73EA34) - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(D_802A203C_73E89C) - EVT_RETURN - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 1, BS_FLAGS1_40 | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_EXEC_WAIT(D_802A1A00_73E260) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CHILD_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) - EVT_WAIT(5) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) - EVT_END_CHILD_THREAD - EVT_CALL(func_80269524, LVarF) - EVT_CALL(CloseActionCommandInfo) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_CALL(ShowActionHud, 0) - EVT_CALL(action_command_jump_start, 24, 3) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) - EVT_CALL(func_80274A18, 24, 3) - EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 1, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(func_80269550, LVarF) - EVT_EXEC_WAIT(D_802A1628_73DE88) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A39C4_740224 = { - EVT_EXEC_WAIT(D_802A21D4_73EA34) - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(D_802A203C_73E89C) - EVT_RETURN - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 2, BS_FLAGS1_40 | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_EXEC_WAIT(D_802A1A00_73E260) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CALL(func_80269524, LVarF) - EVT_CHILD_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) - EVT_WAIT(5) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) - EVT_END_CHILD_THREAD - EVT_CALL(CloseActionCommandInfo) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_CALL(ShowActionHud, 0) - EVT_CALL(action_command_jump_start, 37, 3) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) - EVT_CALL(func_802752AC, 20, 4) - EVT_WAIT(7) - EVT_CALL(func_802752AC, 3, 5) - EVT_CALL(EnablePlayerBlur, -1) - EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 347, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 2, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(func_80269550, LVarF) - EVT_EXEC_WAIT(D_802A1628_73DE88) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A3CF0_740550 = { - EVT_CALL(InitTargetIterator) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_EXEC_WAIT(D_802A21D4_73EA34) - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(D_802A203C_73E89C) - EVT_RETURN - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 3, BS_FLAGS1_40 | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_EXEC_WAIT(D_802A1A00_73E260) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CALL(func_80269524, LVarF) - EVT_CHILD_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) - EVT_WAIT(5) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) - EVT_END_CHILD_THREAD - EVT_CALL(CloseActionCommandInfo) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_CALL(ShowActionHud, 0) - EVT_CALL(action_command_jump_start, 25, 3) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) - EVT_CALL(func_80275F00, 25, 4) - EVT_CALL(EnablePlayerBlur, -1) - EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 348, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 3, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(func_80269550, LVarF) - EVT_EXEC_WAIT(D_802A1628_73DE88) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A4018_740878 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_EXEC_WAIT(N(MoveToJump)) - EVT_EXEC_WAIT(D_802A1370_73DBD0) - EVT_CALL(action_command_jump_start, LVarA, 3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, -5, 10, 0) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) - EVT_CALL(func_80274A18, LVarA, 0) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_EQ(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL_WAIT_INPUT) - EVT_LOOP(0) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_LT(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_IF - EVT_CALL(PlayerTestEnemy, LVar0, 128, 0, 0, 1, 0) - EVT_IF_EQ(LVar0, 6) - EVT_EXEC_WAIT(D_802A203C_73E89C) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_GT(LVar0, ACTION_COMMAND_MODE_NOT_LEARNED) - EVT_WAIT(1) - EVT_END_IF - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 1, BS_FLAGS1_40 | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_EXEC_WAIT(D_802A1A00_73E260) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_CHILD_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) - EVT_WAIT(5) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) - EVT_END_CHILD_THREAD - EVT_CALL(func_80269524, LVarF) - EVT_CALL(CloseActionCommandInfo) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_CALL(ShowActionHud, 0) - EVT_CALL(action_command_jump_start, 24, 3) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) - EVT_CALL(func_80274A18, 24, 3) - EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, 3, 346, 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 128, 0, 0, 1, BS_FLAGS1_80 | BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(func_80269550, LVarF) - EVT_EXEC_WAIT(D_802A1628_73DE88) - EVT_RETURN - EVT_END -}; diff --git a/src/battle/move/jump/jump_charge_0.c b/src/battle/move/jump/jump_charge_0.c new file mode 100644 index 0000000000..03de98ec27 --- /dev/null +++ b/src/battle/move/jump/jump_charge_0.c @@ -0,0 +1,105 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" +#include "effects.h" + +#define NAMESPACE battle_move_jump_charge_0 + +#include "battle/common/move/JumpSupport.inc.c" + +#include "world/common/todo/IsJumpMaxCharged.inc.c" + +API_CALLABLE(N(func_802A1108_74D678)) { + Bytecode* args = script->ptrReadPos; + BattleStatus* battleStatus = &gBattleStatus; + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + + fx_stat_change(0, var1, var2, var3, 1.0f, 60); + + battleStatus->jumpCharge++; + if (battleStatus->jumpCharge > 99) { + battleStatus->jumpCharge = 99; + } + + battleStatus->hammerCharge = 0; + battleStatus->flags1 |= BS_FLAGS1_JUMP_CHARGED; + battleStatus->flags1 &= ~BS_FLAGS1_HAMMER_CHARGED; + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_802A120C_74D77C)) { + Bytecode* args = script->ptrReadPos; + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + f32 var3 = evt_get_float_variable(script, *args++); + + fx_energy_in_out(6, var0 + 10, var1 + 18, var2, var3, 45); + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_UseMove1) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove0) = { + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_WAIT(10) + EVT_CHILD_THREAD + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_END_CHILD_THREAD + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ReadyJump) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(func_802A120C_74D77C), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) + EVT_WAIT(3) + EVT_CALL(N(func_802A120C_74D77C), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) + EVT_WAIT(30) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(MoveBattleCamOver, 5) + EVT_CALL(N(IsJumpMaxCharged)) + EVT_IF_EQ(LVar0, FALSE) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 10) + EVT_ADD(LVar1, 25) + EVT_ADD(LVar2, 5) + EVT_CALL(N(func_802A1108_74D678), LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_WAIT(4) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_80273444, 20, 0, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) + EVT_CALL(ShowVariableMessageBox, 6, 60, 1) + EVT_ELSE + EVT_CALL(ShowMessageBox, 8, 60) + EVT_END_IF + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(IsMessageBoxDisplayed, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/jump_charge_1.c b/src/battle/move/jump/jump_charge_1.c new file mode 100644 index 0000000000..dd9112a8d8 --- /dev/null +++ b/src/battle/move/jump/jump_charge_1.c @@ -0,0 +1,115 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" +#include "effects.h" + +#define NAMESPACE battle_move_jump_charge_1 + +#include "battle/common/move/JumpSupport.inc.c" + +#include "world/common/todo/IsJumpMaxCharged.inc.c" + +BSS s32 D_802A2C50; + +API_CALLABLE(N(func_802A1108_74D678)) { + Bytecode* args = script->ptrReadPos; + BattleStatus* battleStatus = &gBattleStatus; + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32* var4; + + fx_stat_change(1, var1, var2, var3, 1.0f, 60); + var4 = &D_802A2C50; + *var4 = 0; + if (battleStatus->jumpCharge > 0) { + *var4 = 1; + } + + battleStatus->jumpCharge += 2; + + if (battleStatus->jumpCharge > 99) { + battleStatus->jumpCharge = 99; + } + + battleStatus->hammerCharge = 0; + battleStatus->flags1 |= BS_FLAGS1_JUMP_CHARGED; + battleStatus->flags1 &= ~BS_FLAGS1_HAMMER_CHARGED; + + return ApiStatus_DONE2; +} + +#include "world/common/todo/UnkMoveFunc2.inc.c" + +API_CALLABLE(N(func_802A133C_75CCBC)) { + if (D_802A2C50 == 0) { + script->varTable[0] = 6; + } else { + script->varTable[0] = 7; + } + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_UseMove1) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove0) = { + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_WAIT(10) + EVT_CHILD_THREAD + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_END_CHILD_THREAD + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ReadyJump) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) + EVT_WAIT(3) + EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) + EVT_WAIT(30) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(MoveBattleCamOver, 5) + EVT_CALL(N(IsJumpMaxCharged)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 10) + EVT_ADD(LVar1, 25) + EVT_ADD(LVar2, 5) + EVT_CALL(N(func_802A1108_74D678), LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_WAIT(4) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_80273444, 20, 0, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) + EVT_CALL(N(func_802A133C_75CCBC)) + EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) + EVT_ELSE + EVT_CALL(ShowMessageBox, 8, 60) + EVT_END_IF + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(IsMessageBoxDisplayed, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/jump_charge_2.c b/src/battle/move/jump/jump_charge_2.c new file mode 100644 index 0000000000..144f21a0d9 --- /dev/null +++ b/src/battle/move/jump/jump_charge_2.c @@ -0,0 +1,114 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" +#include "effects.h" + +#define NAMESPACE battle_move_jump_charge_2 + +#include "battle/common/move/JumpSupport.inc.c" + +#include "world/common/todo/IsJumpMaxCharged.inc.c" + +BSS s32 D_802A2C20; + +API_CALLABLE(N(func_802A1108_74D678)) { + Bytecode* args = script->ptrReadPos; + BattleStatus* battleStatus = &gBattleStatus; + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32* var4; + + fx_stat_change(2, var1, var2, var3, 1.0f, 60); + var4 = &D_802A2C20; + *var4 = 0; + if (battleStatus->jumpCharge > 0) { + *var4 = 1; + } + + battleStatus->jumpCharge += 3; + + if (battleStatus->jumpCharge > 99) { + battleStatus->jumpCharge = 99; + } + + battleStatus->hammerCharge = 0; + battleStatus->flags1 |= BS_FLAGS1_JUMP_CHARGED; + battleStatus->flags1 &= ~BS_FLAGS1_HAMMER_CHARGED; + + return ApiStatus_DONE2; +} + +#include "world/common/todo/UnkMoveFunc3.inc.c" + +API_CALLABLE(N(func_802A133C_761C5C)) { + if (D_802A2C20 == 0) { + script->varTable[0] = 6; + } else { + script->varTable[0] = 7; + } + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_UseMove1) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove0) = { + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_32) + EVT_WAIT(10) + EVT_CHILD_THREAD + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) + EVT_WAIT(8) + EVT_END_CHILD_THREAD + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ReadyJump) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) + EVT_WAIT(3) + EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) + EVT_WAIT(30) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) + EVT_CALL(MoveBattleCamOver, 5) + EVT_CALL(N(IsJumpMaxCharged)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 10) + EVT_ADD(LVar1, 25) + EVT_ADD(LVar2, 5) + EVT_CALL(N(func_802A1108_74D678), LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208F) + EVT_WAIT(4) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160) + EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) + EVT_CALL(func_80273444, 20, 0, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_WAIT(4) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(N(func_802A133C_761C5C)) + EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) + EVT_ELSE + EVT_CALL(ShowMessageBox, 8, 60) + EVT_END_IF + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(IsMessageBoxDisplayed, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetGoalToHome, ACTOR_PLAYER) + EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(PlayerRunToGoal, 0) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_RETURN + EVT_END +}; + diff --git a/src/battle/move/jump/mega_jump.c b/src/battle/move/jump/mega_jump.c new file mode 100644 index 0000000000..c8a65da834 --- /dev/null +++ b/src/battle/move/jump/mega_jump.c @@ -0,0 +1,130 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" + +#define NAMESPACE battle_move_mega_jump + +#include "battle/common/move/JumpSupport.inc.c" + +extern EvtScript N(EVS_UseMove_ImplA); +extern EvtScript N(EVS_UseMove_ImplB); +extern EvtScript N(EVS_UseMove_ImplC); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplA)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplB)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) + EVT_END_SWITCH + EVT_CALL(EnablePlayerBlur, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A26B4) = { + EVT_CALL(StartRumble, 11) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(6.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(5.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplA) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_802A26B4)) + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 112) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_GT(HIT_RESULT_HIT) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_CASE_DEFAULT + EVT_EXEC_WAIT(N(EVS_JumpSupport_F)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplB) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_802A26B4)) + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 8, 112) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_GT(HIT_RESULT_HIT) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_CASE_DEFAULT + EVT_EXEC_WAIT(N(EVS_JumpSupport_F)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplC) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_802A26B4)) + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 10, 112) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 7, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_GT(HIT_RESULT_HIT) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_CASE_DEFAULT + EVT_EXEC_WAIT(N(EVS_JumpSupport_F)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/multibounce.c b/src/battle/move/jump/multibounce.c new file mode 100644 index 0000000000..5f24708308 --- /dev/null +++ b/src/battle/move/jump/multibounce.c @@ -0,0 +1,487 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" + +#define NAMESPACE battle_move_multibounce + +#include "battle/common/move/JumpSupport.inc.c" + +s32 N(DifficultyTable)[] = { + 7, 6, 5, 4, 3, 2, 1, 0 +}; + +extern EvtScript N(EVS_UseMove_ImplA); +extern EvtScript N(EVS_UseMove_ImplB); +extern EvtScript N(EVS_UseMove_ImplC); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplA)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplB)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplA) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(func_80274A18, LVarA, 0) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_SET(LocalFlag(0), FALSE) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 112) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 112) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 48) + EVT_END_SWITCH + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarE) + EVT_ADD(LVarF, 1) + EVT_SET(LocalFlag(0), FALSE) + EVT_LABEL(10) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) + EVT_CALL(GetTargetListLength, LVar0) + EVT_SUB(LVar0, 1) + EVT_IF_EQ(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_CALL(ShowActionHud, FALSE) + EVT_END_IF + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_ADD(LVarA, 5) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_IF_EQ(LVarF, 1) + EVT_CALL(func_80274A18, LVarA, 3) + EVT_ELSE + EVT_CALL(func_80274A18, LVarA, 4) + EVT_END_IF + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 112) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 240) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 48) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 1, 240) + EVT_END_IF + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(FALSE) + EVT_CASE_OR_EQ(2) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(TRUE) + EVT_CASE_OR_EQ(3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_GE(LVarF, LVar0) + EVT_EXEC_WAIT(N(EVS_JumpSupport_F)) + EVT_RETURN + EVT_END_IF + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplB) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(func_80274A18, LVarA, 0) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_SET(LocalFlag(0), FALSE) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 2, 112) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 2, 112) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 2, 48) + EVT_END_SWITCH + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarE) + EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LVarF, 0) + EVT_ADD(LVarF, 1) + EVT_LABEL(10) + EVT_CALL(GetTargetListLength, LVar0) + EVT_SUB(LVar0, 1) + EVT_IF_EQ(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_CALL(ShowActionHud, FALSE) + EVT_END_IF + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) + EVT_CALL(action_command_jump_start, 37, 3) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(EnablePlayerBlur, 1) + EVT_IF_EQ(LVarF, 1) + EVT_CALL(func_802752AC, 20, 3) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 6) + EVT_ELSE + EVT_CALL(func_802752AC, 20, 4) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 5) + EVT_END_IF + EVT_CALL(EnablePlayerBlur, 0) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 2, 112) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 2, 240) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 2, 48) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 2, 240) + EVT_END_IF + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(FALSE) + EVT_CASE_OR_EQ(2) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(TRUE) + EVT_CASE_OR_EQ(3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_GE(LVarF, LVar0) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_IF + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplC) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(func_80274A18, LVarA, 0) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_SET(LocalFlag(0), FALSE) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 3, 112) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 3, 112) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 3, 48) + EVT_END_SWITCH + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarE) + EVT_SET(LocalFlag(0), FALSE) + EVT_SET(LVarF, 0) + EVT_ADD(LVarF, 1) + EVT_LABEL(20) + EVT_CALL(GetTargetListLength, LVar0) + EVT_SUB(LVar0, 1) + EVT_IF_EQ(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_CALL(ShowActionHud, FALSE) + EVT_END_IF + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_40) + EVT_CALL(action_command_jump_start, 25, 3) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_IF_EQ(LVarF, 1) + EVT_CALL(func_80275F00, 25, 2) + EVT_ELSE + EVT_CALL(func_80275F00, 25, 4) + EVT_END_IF + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 3, 112) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 3, 240) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 3, 48) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, 3, 240) + EVT_END_IF + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(FALSE) + EVT_CASE_OR_EQ(2) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(TRUE) + EVT_CASE_OR_EQ(3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_CALL(GetTargetListLength, LVar0) + EVT_IF_GE(LVarF, LVar0) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_IF + EVT_GOTO(20) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/power_bounce.c b/src/battle/move/jump/power_bounce.c new file mode 100644 index 0000000000..e9f40cc6f8 --- /dev/null +++ b/src/battle/move/jump/power_bounce.c @@ -0,0 +1,501 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" +#include "battle/battle.h" + +#define NAMESPACE battle_move_power_bounce + +#include "battle/common/move/JumpSupport.inc.c" + +s32 N(DifficultyTable)[] = { + 7, 6, 5, 4, 3, 2, 1, 0 +}; + +s32 N(BaseHitChance) = 200; + +API_CALLABLE(N(GetHitChance)) { + Actor* targetActor = get_actor(get_actor(script->owner1.actorID)->targetActorID); + s32 powerBounceChance; + + script->varTable[0] = 99; + powerBounceChance = targetActor->actorBlueprint->powerBounceChance; + if (is_ability_active(ABILITY_DODGE_MASTER)) { + powerBounceChance += 7; + } + N(BaseHitChance) = N(BaseHitChance) * powerBounceChance / 100; + + if (N(BaseHitChance) < rand_int(100)) { + script->varTable[0] = 0; + } + + return ApiStatus_DONE2; +} + +BSS s32 N(HitCounter); + +API_CALLABLE(N(InitializeHitCounter)) { + N(HitCounter) = 0; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(IncrementHitCounter)) { + N(HitCounter) += 1; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(StoreHitCountRecord)) { + PlayerData* playerData = &gPlayerData; + + if (playerData->powerBounces < N(HitCounter)) { + playerData->powerBounces = N(HitCounter); + } + + return ApiStatus_DONE2; +} + +extern EvtScript N(EVS_UseMove_ImplA); +extern EvtScript N(EVS_UseMove_ImplB); +extern EvtScript N(EVS_UseMove_ImplC); + +EvtScript N(EVS_UseMove) = { + EVT_SET(LocalFlag(10), FALSE) + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(N(InitializeHitCounter)) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarC, 1) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplA)) + EVT_CASE_EQ(1) + EVT_SET(LVarC, 2) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplB)) + EVT_CASE_EQ(2) + EVT_SET(LVarC, 3) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) + EVT_END_SWITCH + EVT_CALL(N(StoreHitCountRecord)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplA) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(func_80274A18, LVarA, 0) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(func_80269524, LVarE) + EVT_CALL(N(IncrementHitCounter)) + EVT_SET(LVarD, 0) + EVT_SET(LVarF, 0) + EVT_SET(LocalFlag(0), FALSE) + EVT_LABEL(10) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_SET(LVarA, 24) + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CASE_EQ(1) + EVT_CALL(action_command_jump_start, LVarA, 2) + EVT_CASE_EQ(2) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CASE_EQ(3) + EVT_CALL(action_command_jump_start, LVarA, 4) + EVT_CASE_DEFAULT + EVT_CALL(action_command_jump_start, LVarA, 5) + EVT_END_SWITCH + EVT_SUB(LVarD, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_IF_EQ(LVarF, 0) + EVT_CALL(func_80274A18, 24, 3) + EVT_ELSE + EVT_CALL(func_80274A18, 24, 4) + EVT_END_IF + EVT_CALL(GetCommandAutoSuccess, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_IF_GE(LVarF, 3) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_END_IF + EVT_CALL(N(GetHitChance)) + EVT_IF_GE(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_CALL(N(IncrementHitCounter)) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplB) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(func_80274A18, LVarA, 0) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarE) + EVT_CALL(N(IncrementHitCounter)) + EVT_SET(LVarD, 0) + EVT_SET(LVarF, 0) + EVT_SET(LocalFlag(0), FALSE) + EVT_LABEL(10) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_SET(LVarA, 37) + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CASE_EQ(1) + EVT_CALL(action_command_jump_start, LVarA, 2) + EVT_CASE_EQ(2) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CASE_EQ(3) + EVT_CALL(action_command_jump_start, LVarA, 4) + EVT_CASE_DEFAULT + EVT_CALL(action_command_jump_start, LVarA, 5) + EVT_END_SWITCH + EVT_SUB(LVarD, 1) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(EnablePlayerBlur, 1) + EVT_IF_EQ(LVarF, 0) + EVT_CALL(func_802752AC, 20, 3) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 6) + EVT_ELSE + EVT_CALL(func_802752AC, 20, 4) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 5) + EVT_END_IF + EVT_CALL(EnablePlayerBlur, 0) + EVT_CALL(GetCommandAutoSuccess, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_IF_GT(LVarF, 3) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_END_IF + EVT_CALL(N(GetHitChance)) + EVT_IF_GT(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_CALL(N(IncrementHitCounter)) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplC) = { + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(func_80274A18, LVarA, 0) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarE) + EVT_CALL(N(IncrementHitCounter)) + EVT_SET(LVarD, 0) + EVT_SET(LVarF, 0) + EVT_SET(LocalFlag(0), FALSE) + EVT_LABEL(10) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_SET(LVarA, 25) + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CASE_EQ(1) + EVT_CALL(action_command_jump_start, LVarA, 2) + EVT_CASE_EQ(2) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CASE_EQ(3) + EVT_CALL(action_command_jump_start, LVarA, 4) + EVT_CASE_DEFAULT + EVT_CALL(action_command_jump_start, LVarA, 5) + EVT_END_SWITCH + EVT_SUB(LVarD, 1) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_IF_EQ(LVarF, 0) + EVT_CALL(func_80275F00, 25, 2) + EVT_ELSE + EVT_CALL(func_80275F00, 25, 4) + EVT_END_IF + EVT_CALL(EnablePlayerBlur, 0) + EVT_CALL(GetCommandAutoSuccess, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_IF_GT(LVarF, 3) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_END_IF + EVT_CALL(N(GetHitChance)) + EVT_IF_GT(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_236) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_237) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_238) + EVT_END_SWITCH + EVT_CALL(func_80269550, LVarE) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_CALL(N(IncrementHitCounter)) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/power_jump.c b/src/battle/move/jump/power_jump.c new file mode 100644 index 0000000000..d10a751d6d --- /dev/null +++ b/src/battle/move/jump/power_jump.c @@ -0,0 +1,124 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" + +#define NAMESPACE battle_move_power_jump + +#include "battle/common/move/JumpSupport.inc.c" + +extern EvtScript N(EVS_UseMove_ImplA); +extern EvtScript N(EVS_UseMove_ImplB); +extern EvtScript N(EVS_UseMove_ImplC); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplA)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplB)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) + EVT_END_SWITCH + EVT_CALL(EnablePlayerBlur, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A26B4) = { + EVT_CALL(StartRumble, 9) + EVT_CHILD_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) + EVT_END_CHILD_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplA) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_802A26B4)) + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 112) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_GT(HIT_RESULT_HIT) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_CASE_DEFAULT + EVT_EXEC_WAIT(N(EVS_JumpSupport_F)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplB) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_802A26B4)) + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 112) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_GT(HIT_RESULT_HIT) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_CASE_DEFAULT + EVT_EXEC_WAIT(N(EVS_JumpSupport_F)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplC) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_802A26B4)) + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 8, 112) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_GT(HIT_RESULT_HIT) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_CASE_DEFAULT + EVT_EXEC_WAIT(N(EVS_JumpSupport_F)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/shrink_stomp.c b/src/battle/move/jump/shrink_stomp.c new file mode 100644 index 0000000000..fa8a60bb36 --- /dev/null +++ b/src/battle/move/jump/shrink_stomp.c @@ -0,0 +1,185 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" + +#define NAMESPACE battle_move_shrink_stomp + +#include "battle/common/move/JumpSupport.inc.c" + +extern EvtScript N(EVS_UseMove_ImplA); +extern EvtScript N(EVS_UseMove_ImplB); +extern EvtScript N(EVS_UseMove_ImplC); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplA)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplB)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplA) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SHRINK, 3, 75), 1, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SHRINK, 3, 75), 1, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(func_80269524, LVarF) + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 24, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(func_80274A18, 24, 3) + EVT_WAIT(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15A) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SHRINK, 3, 100), 1, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplB) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15B) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SHRINK, 3, 75), 2, 80) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15B) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SHRINK, 3, 75), 2, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarF) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 37, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(func_802752AC, 20, 4) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 5) + EVT_CALL(EnablePlayerBlur, 0) + EVT_WAIT(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15B) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SHRINK, 3, 100), 2, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplC) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15C) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SHRINK, 3, 75), 3, 80) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15C) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SHRINK, 3, 75), 3, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarF) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 25, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(func_80275F00, 25, 4) + EVT_CALL(EnablePlayerBlur, 0) + EVT_WAIT(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15C) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SHRINK, 3, 100), 3, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/sleep_stomp.c b/src/battle/move/jump/sleep_stomp.c new file mode 100644 index 0000000000..c1b754919a --- /dev/null +++ b/src/battle/move/jump/sleep_stomp.c @@ -0,0 +1,185 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" + +#define NAMESPACE battle_move_sleep_stomp + +#include "battle/common/move/JumpSupport.inc.c" + +extern EvtScript N(EVS_UseMove_ImplA); +extern EvtScript N(EVS_UseMove_ImplB); +extern EvtScript N(EVS_UseMove_ImplC); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplA)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplB)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplA) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SLEEP, 3, 75), 1, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SLEEP, 3, 75), 1, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(func_80269524, LVarF) + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 24, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(func_80274A18, 24, 3) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SLEEP, 3, 100), 1, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplB) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SLEEP, 3, 75), 2, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SLEEP, 3, 75), 2, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarF) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 37, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(func_802752AC, 20, 4) + EVT_WAIT(7) + EVT_CALL(func_802752AC, 3, 5) + EVT_CALL(EnablePlayerBlur, 0) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SLEEP, 3, 100), 2, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplC) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SLEEP, 3, 75), 3, 80) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SLEEP, 3, 75), 3, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) + EVT_RETURN + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(func_80269524, LVarF) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_28) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_CALL(ShowActionHud, FALSE) + EVT_CALL(action_command_jump_start, 25, 3) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(func_80275F00, 25, 4) + EVT_CALL(EnablePlayerBlur, 0) + EVT_WAIT(1) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SLEEP, 3, 100), 3, 224) + EVT_CALL(func_80269550, LVarF) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump/super_jump.c b/src/battle/move/jump/super_jump.c new file mode 100644 index 0000000000..0586b8df75 --- /dev/null +++ b/src/battle/move/jump/super_jump.c @@ -0,0 +1,125 @@ +#include "common.h" +#include "script_api/battle.h" +#include "battle/action_cmd/jump.h" + +#define NAMESPACE battle_move_super_jump + +#include "battle/common/move/JumpSupport.inc.c" + +extern EvtScript N(EVS_UseMove_ImplA); +extern EvtScript N(EVS_UseMove_ImplB); +extern EvtScript N(EVS_UseMove_ImplC); + +EvtScript N(EVS_UseMove) = { + EVT_CALL(EnablePlayerBlur, 1) + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplA)) + EVT_CASE_EQ(1) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplB)) + EVT_CASE_EQ(2) + EVT_EXEC_WAIT(N(EVS_UseMove_ImplC)) + EVT_END_SWITCH + EVT_CALL(EnablePlayerBlur, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802A26B4) = { + EVT_CALL(StartRumble, 10) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplA) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_802A26B4)) + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 112) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_GT(HIT_RESULT_HIT) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_CASE_DEFAULT + EVT_EXEC_WAIT(N(EVS_JumpSupport_F)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplB) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_802A26B4)) + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 7, 112) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_GT(HIT_RESULT_HIT) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_CASE_DEFAULT + EVT_EXEC_WAIT(N(EVS_JumpSupport_F)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMove_ImplC) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) + EVT_IF_EQ(LVar0, HIT_RESULT_MISS) + EVT_EXEC_WAIT(N(EVS_JumpSupport_J)) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(DidActionSucceed, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 9, 112) + EVT_CASE_DEFAULT + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 48) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_GT(HIT_RESULT_HIT) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_CASE_DEFAULT + EVT_EXEC_WAIT(N(EVS_JumpSupport_F)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/jump_charge_0/74D570.c b/src/battle/move/jump_charge_0/74D570.c deleted file mode 100644 index 348bbe585a..0000000000 --- a/src/battle/move/jump_charge_0/74D570.c +++ /dev/null @@ -1,42 +0,0 @@ -#include "common.h" -#include "effects.h" -#include "battle/action_cmd.h" - -#define NAMESPACE battle_move_jump_charge_0 - -#include "world/common/todo/UnkMoveFunc1.inc.c" - -#include "world/common/todo/IsJumpMaxCharged.inc.c" - -ApiStatus func_802A1108_74D678(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - BattleStatus* battleStatus = &gBattleStatus; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); - - fx_stat_change(0, var1, var2, var3, 1.0f, 60); - - battleStatus->jumpCharge++; - if (battleStatus->jumpCharge > 99) { - battleStatus->jumpCharge = 99; - } - - battleStatus->hammerCharge = 0; - battleStatus->flags1 |= BS_FLAGS1_JUMP_CHARGED; - battleStatus->flags1 &= ~BS_FLAGS1_HAMMER_CHARGED; - - return ApiStatus_DONE2; -} - -ApiStatus func_802A120C_74D77C(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 var0 = evt_get_variable(script, *args++); - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - f32 var3 = evt_get_float_variable(script, *args++); - - fx_energy_in_out(6, var0 + 10, var1 + 18, var2, var3, 45); - - return ApiStatus_DONE2; -} diff --git a/src/battle/move/jump_charge_1/75C980.c b/src/battle/move/jump_charge_1/75C980.c deleted file mode 100644 index 69d0d0a400..0000000000 --- a/src/battle/move/jump_charge_1/75C980.c +++ /dev/null @@ -1,50 +0,0 @@ -#include "common.h" -#include "effects.h" - -BSS s32 D_802A2C50; - -#define NAMESPACE battle_move_jump_charge_1 - -#include "world/common/todo/UnkMoveFunc1.inc.c" - -#include "world/common/todo/IsJumpMaxCharged.inc.c" - -ApiStatus func_802A1108_75CA88(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - BattleStatus* battleStatus = &gBattleStatus; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); - s32* var4; - - fx_stat_change(1, var1, var2, var3, 1.0f, 60); - var4 = &D_802A2C50; - *var4 = 0; - if (battleStatus->jumpCharge > 0) { - *var4 = 1; - } - - battleStatus->jumpCharge += 2; - - if (battleStatus->jumpCharge > 99) { - battleStatus->jumpCharge = 99; - } - - battleStatus->hammerCharge = 0; - battleStatus->flags1 |= BS_FLAGS1_JUMP_CHARGED; - battleStatus->flags1 &= ~BS_FLAGS1_HAMMER_CHARGED; - - return ApiStatus_DONE2; -} - -#include "world/common/todo/UnkMoveFunc2.inc.c" - -ApiStatus func_802A133C_75CCBC(Evt* script, s32 isInitialCall) { - if (D_802A2C50 == 0) { - script->varTable[0] = 6; - } else { - script->varTable[0] = 7; - } - - return ApiStatus_DONE2; -} diff --git a/src/battle/move/jump_charge_2/761920.c b/src/battle/move/jump_charge_2/761920.c deleted file mode 100644 index c281597c7c..0000000000 --- a/src/battle/move/jump_charge_2/761920.c +++ /dev/null @@ -1,50 +0,0 @@ -#include "common.h" -#include "effects.h" - -BSS s32 D_802A2C20; - -#define NAMESPACE battle_move_jump_charge_2 - -#include "world/common/todo/UnkMoveFunc1.inc.c" - -#include "world/common/todo/IsJumpMaxCharged.inc.c" - -ApiStatus func_802A1108_761A28(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - BattleStatus* battleStatus = &gBattleStatus; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args++); - s32 var3 = evt_get_variable(script, *args++); - s32* var4; - - fx_stat_change(2, var1, var2, var3, 1.0f, 60); - var4 = &D_802A2C20; - *var4 = 0; - if (battleStatus->jumpCharge > 0) { - *var4 = 1; - } - - battleStatus->jumpCharge += 3; - - if (battleStatus->jumpCharge > 99) { - battleStatus->jumpCharge = 99; - } - - battleStatus->hammerCharge = 0; - battleStatus->flags1 |= BS_FLAGS1_JUMP_CHARGED; - battleStatus->flags1 &= ~BS_FLAGS1_HAMMER_CHARGED; - - return ApiStatus_DONE2; -} - -#include "world/common/todo/UnkMoveFunc3.inc.c" - -ApiStatus func_802A133C_761C5C(Evt* script, s32 isInitialCall) { - if (D_802A2C20 == 0) { - script->varTable[0] = 6; - } else { - script->varTable[0] = 7; - } - - return ApiStatus_DONE2; -} diff --git a/src/battle/move/mega_jump/770F30.c b/src/battle/move/mega_jump/770F30.c deleted file mode 100644 index 9400d2e2ba..0000000000 --- a/src/battle/move/mega_jump/770F30.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_mega_jump - -#include "world/common/todo/UnkMoveFunc1.inc.c" diff --git a/src/battle/move/mega_quake/756780.c b/src/battle/move/mega_quake/756780.c deleted file mode 100644 index 8a1fa01484..0000000000 --- a/src/battle/move/mega_quake/756780.c +++ /dev/null @@ -1,36 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_mega_quake - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" - -ApiStatus func_802A10A4_756824(Evt* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[0] = 0; - } - - if (script->functionTemp[0] != 0) { - if (script->functionTemp[0] != 1) { - return ApiStatus_BLOCK; - } - } else { - script->functionTemp[1] = 30; - script->functionTemp[0] = 1; - } - - set_screen_overlay_center(1, 0, 0, 0); - set_screen_overlay_center(1, 1, SCREEN_WIDTH, SCREEN_HEIGHT); - set_screen_overlay_params_back(12, 160.0f); - - if (script->functionTemp[1] != 0) { - script->functionTemp[1]--; - return ApiStatus_BLOCK; - } else { - set_screen_overlay_center(1, 0, 0, 0); - set_screen_overlay_center(1, 1, SCREEN_WIDTH, SCREEN_HEIGHT); - set_screen_overlay_params_back(12, 0.0f); - return ApiStatus_DONE2; - } -} diff --git a/src/battle/move/mega_smash/777690.c b/src/battle/move/mega_smash/777690.c deleted file mode 100644 index e0bee11c52..0000000000 --- a/src/battle/move/mega_smash/777690.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_mega_smash - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" diff --git a/src/battle/move/multibounce/740CC0.c b/src/battle/move/multibounce/740CC0.c deleted file mode 100644 index 4e944a6434..0000000000 --- a/src/battle/move/multibounce/740CC0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_multibounce - -#include "world/common/todo/UnkMoveFunc1.inc.c" diff --git a/src/battle/move/power_bounce/743DF0.c b/src/battle/move/power_bounce/743DF0.c deleted file mode 100644 index d7cd3e98c3..0000000000 --- a/src/battle/move/power_bounce/743DF0.c +++ /dev/null @@ -1,48 +0,0 @@ -#include "common.h" -#include "battle/battle.h" - -#define NAMESPACE battle_move_power_bounce - -extern s32 D_802A2730_745520; - -BSS s32 D_802A4020; - -#include "world/common/todo/UnkMoveFunc1.inc.c" - -ApiStatus func_802A10E4_743ED4(Evt* script, s32 isInitialCall) { - Actor* targetActor = get_actor(get_actor(script->owner1.actorID)->targetActorID); - s32 powerBounceChance; - - script->varTable[0] = 99; - powerBounceChance = targetActor->actorBlueprint->powerBounceChance; - if (is_ability_active(ABILITY_DODGE_MASTER)) { - powerBounceChance += 7; - } - D_802A2730_745520 = D_802A2730_745520 * powerBounceChance / 100; - - if (D_802A2730_745520 < rand_int(100)) { - script->varTable[0] = 0; - } - - return ApiStatus_DONE2; -} - -ApiStatus func_802A1194_743F84(Evt* script, s32 isInitialCall) { - D_802A4020 = 0; - return ApiStatus_DONE2; -} - -ApiStatus func_802A11A4_743F94(Evt* script, s32 isInitialCall) { - D_802A4020 += 1; - return ApiStatus_DONE2; -} - -ApiStatus func_802A11C0_743FB0(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - - if (playerData->powerBounces < D_802A4020) { - playerData->powerBounces = D_802A4020; - } - - return ApiStatus_DONE2; -} diff --git a/src/battle/move/power_jump/76D760.c b/src/battle/move/power_jump/76D760.c deleted file mode 100644 index 976f233239..0000000000 --- a/src/battle/move/power_jump/76D760.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_power_jump - -#include "world/common/todo/UnkMoveFunc1.inc.c" diff --git a/src/battle/move/power_quake/767C90.c b/src/battle/move/power_quake/767C90.c deleted file mode 100644 index aab412b1e1..0000000000 --- a/src/battle/move/power_quake/767C90.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_power_quake - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" diff --git a/src/battle/move/power_smash/772BA0.c b/src/battle/move/power_smash/772BA0.c deleted file mode 100644 index c31037cd04..0000000000 --- a/src/battle/move/power_smash/772BA0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_power_smash - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" diff --git a/src/battle/move/quake_hammer/quake_hammer.c b/src/battle/move/quake_hammer/quake_hammer.c deleted file mode 100644 index fb2a3d948d..0000000000 --- a/src/battle/move/quake_hammer/quake_hammer.c +++ /dev/null @@ -1,739 +0,0 @@ -#include "common.h" -#include "effects.h" -#include "script_api/battle.h" -#include "battle/action_cmd/hammer.h" - -#define NAMESPACE battle_move_quake_hammer - -extern EvtScript D_802A3168_0073D038; - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" - -EvtScript D_802A10B0_73AF80 = { - EVT_CALL(InitTargetIterator) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 32) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A118C_0073B05C = { - EVT_CALL(SetGoalPos, ACTOR_PLAYER, -33, 0, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1204_0073B0D4 = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(10) - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_EQ(LVar0, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03000D) - EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03000D) - EVT_SWITCH(LVar1) - EVT_CASE_LT(3) - EVT_WAIT(4) - EVT_CASE_LT(5) - EVT_WAIT(3) - EVT_CASE_LT(7) - EVT_WAIT(2) - EVT_CASE_LT(9) - EVT_WAIT(1) - EVT_CASE_LT(11) - EVT_WAIT(0) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1388_0073B258 = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(10) - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_EQ(LVar0, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030014) - EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030014) - EVT_SWITCH(LVar1) - EVT_CASE_LT(3) - EVT_WAIT(4) - EVT_CASE_LT(5) - EVT_WAIT(3) - EVT_CASE_LT(7) - EVT_WAIT(2) - EVT_CASE_LT(9) - EVT_WAIT(1) - EVT_CASE_LT(11) - EVT_WAIT(0) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A150C_0073B3DC = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(10) - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_EQ(LVar0, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03001B) - EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03001B) - EVT_SWITCH(LVar1) - EVT_CASE_LT(3) - EVT_WAIT(4) - EVT_CASE_LT(5) - EVT_WAIT(3) - EVT_CASE_LT(7) - EVT_WAIT(2) - EVT_CASE_LT(9) - EVT_WAIT(1) - EVT_CASE_LT(11) - EVT_WAIT(0) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1690_0073B560 = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(SetBattleCamOffsetZ, 8) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03000E) - EVT_WAIT(4) - EVT_CALL(action_command_hammer_start, 0, 36, 3) - EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03000F) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030010) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_EQ(LVar0, 1) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030011) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030012) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A18AC_0073B77C = { - EVT_CALL(func_80276EFC) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) - EVT_CALL(MoveBattleCamOver, 5) - EVT_CALL(func_802693F0) - EVT_WAIT(20) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_WAIT(5) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1998_0073B868 = { - EVT_CALL(func_80276EFC) - EVT_CALL(func_802693F0) - EVT_WAIT(20) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_WAIT(5) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1A64_0073B934 = { - EVT_CALL(func_80276EFC) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_29) - EVT_CALL(func_802693F0) - EVT_WAIT(20) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_WAIT(5) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1B40 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A10B0_73AF80) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A1204_0073B0D4) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 0, 0, 0, BS_FLAGS1_10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(SetBattleCamOffsetZ, 8) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03000E) - EVT_WAIT(4) - EVT_CALL(N(IsBerserkerEquipped)) - EVT_IF_NE(LVar0, ACTION_COMMAND_MODE_NOT_LEARNED) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03000F) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_LT(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_CALL(N(ShouldMovesAutoSucceed)) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030010) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_LT(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_END_IF - EVT_ELSE - EVT_CALL(action_command_hammer_start, 0, LVar1, 3) - EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03000F) - EVT_SUB(LVar1, 10) - EVT_WAIT(LVar1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030010) - EVT_WAIT(5) - EVT_END_IF - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_EQ(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL_WAIT_INPUT) - EVT_LOOP(0) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_LT(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030011) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2115) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030012) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2118) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A2000_0073BED0 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A10B0_73AF80) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A1388_0073B258) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 0, 0, 0, BS_FLAGS1_10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(SetBattleCamOffsetZ, 8) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030015) - EVT_WAIT(4) - EVT_CALL(N(IsBerserkerEquipped)) - EVT_IF_EQ(LVar0, ACTION_COMMAND_MODE_LEARNED) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030016) - EVT_CALL(N(ShouldMovesAutoSucceed)) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030017) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_ELSE - EVT_CALL(action_command_hammer_start, 0, LVar1, 3) - EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030016) - EVT_SUB(LVar1, 10) - EVT_WAIT(LVar1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030017) - EVT_WAIT(5) - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030018) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2116) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030019) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2119) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A23E8 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A10B0_73AF80) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A150C_0073B3DC) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 0, 0, 0, BS_FLAGS1_10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(SetBattleCamOffsetZ, 8) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03001C) - EVT_WAIT(4) - EVT_CALL(N(IsBerserkerEquipped)) - EVT_IF_EQ(LVar0, ACTION_COMMAND_MODE_LEARNED) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03001D) - EVT_CALL(N(ShouldMovesAutoSucceed)) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03001E) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_ELSE - EVT_CALL(action_command_hammer_start, 0, LVar1, 3) - EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03001D) - EVT_SUB(LVar1, 10) - EVT_WAIT(LVar1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03001E) - EVT_WAIT(5) - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03001F) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2117) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030020) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x211A) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A27D0 = { - EVT_CALL(ChooseNextTarget, 10, LVar0) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A118C_0073B05C) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A1204_0073B0D4) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(AddBattleCamZoom, 80) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03000E) - EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03000F) - EVT_CALL(N(ShouldMovesAutoSucceed)) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030010) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2115) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030011) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030012) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2118) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A2AFC_0073C9CC = { - EVT_CALL(ChooseNextTarget, 10, LVar0) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A118C_0073B05C) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A1388_0073B258) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(AddBattleCamZoom, 80) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030015) - EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030016) - EVT_CALL(N(ShouldMovesAutoSucceed)) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_LOOP(60) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2116) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030018) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030019) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2119) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A2DA0_0073CC70 = { - EVT_CALL(ChooseNextTarget, 10, LVar0) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A118C_0073B05C) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A150C_0073B3DC) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(AddBattleCamZoom, 80) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03001C) - EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03001D) - EVT_CALL(N(ShouldMovesAutoSucceed)) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_LOOP(60) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 262144, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2117) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03001F) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x030020) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x211A) - EVT_RETURN - EVT_END -}; - -EvtScript battle_move_quake_hammer_main = { - EVT_CALL(ShowActionHud, 1) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_SET(LVarD, 80) - EVT_SET(LVarE, 1) - EVT_SET(LVarF, 2) - EVT_EXEC_WAIT(D_802A3168_0073D038) - EVT_CASE_EQ(1) - EVT_SET(LVarD, 80) - EVT_SET(LVarE, 1) - EVT_SET(LVarF, 2) - EVT_EXEC_WAIT(D_802A3168_0073D038) - EVT_CASE_EQ(2) - EVT_SET(LVarD, 80) - EVT_SET(LVarE, 1) - EVT_SET(LVarF, 2) - EVT_EXEC_WAIT(D_802A3168_0073D038) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A3168_0073D038 = { - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_EXEC_WAIT(D_802A27D0) - EVT_CASE_EQ(1) - EVT_EXEC_WAIT(D_802A2AFC_0073C9CC) - EVT_CASE_EQ(2) - EVT_EXEC_WAIT(D_802A2DA0_0073CC70) - EVT_END_SWITCH - EVT_CHILD_THREAD - EVT_WAIT(8) - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 24) - EVT_ADD(LVar1, 10) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 60, 8, 0, 30, 0, 0, 0, 0, 0) - EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 60, 8, 33, 30, 0, 0, 0, 0, 0) - EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 60, 8, 66, 30, 0, 0, 0, 0, 0) - EVT_END_CHILD_THREAD - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(StartRumble, 9) - EVT_CHILD_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.2)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(0.7)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.4)) - EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(0.1)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.05)) - EVT_END_CHILD_THREAD - EVT_CHILD_THREAD - EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_ADD(LVar0, 24) - EVT_ADD(LVar1, 10) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 0, 30, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 72, 8, 24, 30, 0, 0, 0, 0, 0) - EVT_END_CHILD_THREAD - EVT_CASE_DEFAULT - EVT_CALL(StartRumble, 9) - EVT_CHILD_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.1)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(0.35)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.2)) - EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(0.05)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.025)) - EVT_END_CHILD_THREAD - EVT_END_SWITCH - EVT_CALL(DidActionSucceed, LVar0) - EVT_IF_GT(LVar0, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) - EVT_CALL(MoveBattleCamOver, 5) - EVT_ELSE - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) - EVT_CALL(MoveBattleCamOver, 50) - EVT_END_IF - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x211B) - EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x211C) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x211D) - EVT_END_SWITCH - EVT_WAIT(10) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2118) - EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2119) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x211A) - EVT_END_SWITCH - EVT_SET(LVar9, 0) - EVT_CALL(InitTargetIterator) - EVT_LABEL(10) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(PlayerTestEnemy, LVar0, 2097152, 29, 0, 0, BS_FLAGS1_10) - EVT_IF_EQ(LVar0, 6) - EVT_GOTO(11) - EVT_END_IF - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(PlayerDamageEnemy, LVar0, 941623296, 25, 0, LVarF, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(PlayerDamageEnemy, LVar0, 941623296, 25, 0, LVarE, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_LABEL(11) - EVT_CALL(ChooseNextTarget, 0, LVar1) - EVT_ADD(LVar9, 1) - EVT_CALL(GetTargetListLength, LVar1) - EVT_IF_LT(LVar9, LVar1) - EVT_GOTO(10) - EVT_END_IF - EVT_THREAD - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_END_THREAD - EVT_WAIT(10) - EVT_EXEC_WAIT(D_802A1998_0073B868) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_RETURN - EVT_END -}; diff --git a/src/battle/move/shell_crack/77F240.c b/src/battle/move/shell_crack/77F240.c deleted file mode 100644 index b6b4d2a1cf..0000000000 --- a/src/battle/move/shell_crack/77F240.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "common.h" -#include "effects.h" - -#include "effects.h" - -#define NAMESPACE battle_move_shell_crack - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" - -ApiStatus func_802A10A4_77F2E4(Evt* script, s32 isInitialCall) { - ActorState* playerActorState = &gBattleStatus.playerActor->state; - s32 i; - - for (i = 0; i < 20; i++) { - fx_floating_cloud_puff(0, - (playerActorState->goalPos.x + (f32) rand_int(30)) - 15.0f, - (playerActorState->goalPos.y + (f32) rand_int(20)) - 15.0f, - playerActorState->goalPos.z + 5.0f, 1.0f, 25); - } - - return ApiStatus_DONE2; -} diff --git a/src/battle/move/shrink_smash/77CB80.c b/src/battle/move/shrink_smash/77CB80.c deleted file mode 100644 index 140cf2e505..0000000000 --- a/src/battle/move/shrink_smash/77CB80.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_shrink_smash - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" diff --git a/src/battle/move/shrink_stomp/783BA0.c b/src/battle/move/shrink_stomp/783BA0.c deleted file mode 100644 index eb6a251c58..0000000000 --- a/src/battle/move/shrink_stomp/783BA0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_shrink_stomp - -#include "world/common/todo/UnkMoveFunc1.inc.c" diff --git a/src/battle/move/sleep_stomp/746E10.c b/src/battle/move/sleep_stomp/746E10.c deleted file mode 100644 index 208d77deb1..0000000000 --- a/src/battle/move/sleep_stomp/746E10.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_sleep_stomp - -#include "world/common/todo/UnkMoveFunc1.inc.c" diff --git a/src/battle/move/spin_smash/spin_smash.c b/src/battle/move/spin_smash/spin_smash.c deleted file mode 100644 index 4586f533e6..0000000000 --- a/src/battle/move/spin_smash/spin_smash.c +++ /dev/null @@ -1,1017 +0,0 @@ -#include "common.h" -#include "effects.h" -#include "script_api/battle.h" -#include "battle/action_cmd.h" -#include "battle/action_cmd/hammer.h" - -#define NAMESPACE battle_move_spin_smash - -extern EvtScript D_802A3258_739AE8; -extern EvtScript D_802A3920_73A1B0; -extern EvtScript D_802A3FC4_73A854; - -ApiStatus func_802A1000_737890(Evt* script, s32 isInitialCall) { - BattleStatus* battleStatus = &gBattleStatus; - Actor* playerActor = battleStatus->playerActor; - f32 xPos = playerActor->currentPos.x + 20.0f; - f32 yPos = playerActor->currentPos.y + 15.0f; - f32 zPos = playerActor->currentPos.z + 5.0f; - - fx_stars_spread(0, xPos, yPos, zPos, 6, 20); - - return ApiStatus_DONE2; -} - -ApiStatus func_802A1074_737904(Evt* script, s32 isInitialCall) { - BattleStatus* battleStatus = &gBattleStatus; - Actor* playerActor = battleStatus->playerActor; - f32 xPos = playerActor->currentPos.x + 20.0f; - f32 yPos = playerActor->currentPos.y + 15.0f; - f32 zPos = playerActor->currentPos.z + 5.0f; - - fx_steam_burst(0, xPos, yPos, zPos, 1.0f, 20); - - return ApiStatus_DONE2; -} - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" - -EvtScript D_802A1190_737A20 = { - EVT_CALL(InitTargetIterator) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_SUB(LVar0, 32) - EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A126C_737AFC = { - EVT_CALL(SetGoalPos, ACTOR_PLAYER, -33, 0, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A12E4_737B74 = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(10) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000D) - EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000D) - EVT_SWITCH(LVar1) - EVT_CASE_LT(3) - EVT_WAIT(4) - EVT_CASE_LT(5) - EVT_WAIT(3) - EVT_CASE_LT(7) - EVT_WAIT(2) - EVT_CASE_LT(9) - EVT_WAIT(1) - EVT_CASE_LT(11) - EVT_WAIT(0) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1468_737CF8 = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(10) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30014) - EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30014) - EVT_SWITCH(LVar1) - EVT_CASE_LT(3) - EVT_WAIT(4) - EVT_CASE_LT(5) - EVT_WAIT(3) - EVT_CASE_LT(7) - EVT_WAIT(2) - EVT_CASE_LT(9) - EVT_WAIT(1) - EVT_CASE_LT(11) - EVT_WAIT(0) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A15EC_737E7C = { - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(10) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001B) - EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001B) - EVT_SWITCH(LVar1) - EVT_CASE_LT(3) - EVT_WAIT(4) - EVT_CASE_LT(5) - EVT_WAIT(3) - EVT_CASE_LT(7) - EVT_WAIT(2) - EVT_CASE_LT(9) - EVT_WAIT(1) - EVT_CASE_LT(11) - EVT_WAIT(0) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1770_738000 = { - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(SetBattleCamOffsetZ, 8) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000E) - EVT_WAIT(4) - EVT_CALL(action_command_hammer_start, 0, 36, 3) - EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000F) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30010) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, TRUE) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30011) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30012) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A198C_73821C = { - EVT_CALL(func_80276EFC) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) - EVT_CALL(MoveBattleCamOver, 5) - EVT_CALL(func_802693F0) - EVT_WAIT(20) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_WAIT(5) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1A78_738308 = { - EVT_CALL(func_80276EFC) - EVT_CALL(func_802693F0) - EVT_WAIT(20) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_WAIT(5) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1B44_7383D4 = { - EVT_CALL(func_80276EFC) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_29) - EVT_CALL(func_802693F0) - EVT_WAIT(20) - EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_WAIT(5) - EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) - EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A1C20_7384B0 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A1190_737A20) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A12E4_737B74) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 0, 0, 0, BS_FLAGS1_10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(SetBattleCamOffsetZ, 8) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000E) - EVT_WAIT(4) - EVT_CALL(battle_move_spin_smash_IsBerserkerEquipped) - EVT_IF_NE(LVar0, ACTION_COMMAND_MODE_NOT_LEARNED) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000F) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_LT(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_CALL(battle_move_spin_smash_ShouldMovesAutoSucceed) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30010) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_LT(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_END_IF - EVT_ELSE - EVT_CALL(action_command_hammer_start, 0, LVar1, 3) - EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000F) - EVT_SUB(LVar1, 10) - EVT_WAIT(LVar1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30010) - EVT_WAIT(5) - EVT_END_IF - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_EQ(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL_WAIT_INPUT) - EVT_LOOP(0) - EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_LT(LVar0, ACTION_COMMAND_MODE_TUTORIAL) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30011) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2115) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30012) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2118) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A20E0_738970 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A1190_737A20) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A1468_737CF8) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 0, 0, 0, BS_FLAGS1_10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(SetBattleCamOffsetZ, 8) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30015) - EVT_WAIT(4) - EVT_CALL(battle_move_spin_smash_IsBerserkerEquipped) - EVT_IF_EQ(LVar0, ACTION_COMMAND_MODE_LEARNED) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30016) - EVT_CALL(battle_move_spin_smash_ShouldMovesAutoSucceed) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30017) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_ELSE - EVT_CALL(action_command_hammer_start, 0, LVar1, 3) - EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30016) - EVT_SUB(LVar1, 10) - EVT_WAIT(LVar1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30017) - EVT_WAIT(5) - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30018) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2116) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30019) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2119) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A24C8_738D58 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A1190_737A20) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A15EC_737E7C) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 0, 0, 0, BS_FLAGS1_10) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(SetBattleCamOffsetZ, 8) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001C) - EVT_WAIT(4) - EVT_CALL(battle_move_spin_smash_IsBerserkerEquipped) - EVT_IF_EQ(LVar0, ACTION_COMMAND_MODE_LEARNED) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001D) - EVT_CALL(battle_move_spin_smash_ShouldMovesAutoSucceed) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001E) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_ELSE - EVT_CALL(action_command_hammer_start, 0, LVar1, 3) - EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001D) - EVT_SUB(LVar1, 10) - EVT_WAIT(LVar1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001E) - EVT_WAIT(5) - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001F) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2117) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30020) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x211A) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A28B0_739140 = { - EVT_CALL(ChooseNextTarget, 10, LVar0) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A126C_737AFC) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A12E4_737B74) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(AddBattleCamZoom, 80) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000E) - EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000F) - EVT_CALL(battle_move_spin_smash_ShouldMovesAutoSucceed) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30010) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2115) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30011) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30012) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2118) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A2BDC_73946C = { - EVT_CALL(ChooseNextTarget, 10, LVar0) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A126C_737AFC) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A1468_737CF8) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(AddBattleCamZoom, 80) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30015) - EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30016) - EVT_CALL(battle_move_spin_smash_ShouldMovesAutoSucceed) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_LOOP(60) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2116) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30018) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30019) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2119) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A2E80_739710 = { - EVT_CALL(ChooseNextTarget, 10, LVar0) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_EXEC_WAIT(D_802A126C_737AFC) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_EXEC_WAIT(D_802A15EC_737E7C) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(AddBattleCamZoom, 80) - EVT_CALL(InitTargetIterator) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001C) - EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001D) - EVT_CALL(battle_move_spin_smash_ShouldMovesAutoSucceed) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_ADD(LVarD, 6) - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_LOOP(60) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2117) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001F) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30020) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x211A) - EVT_RETURN - EVT_END -}; - -EvtScript battle_move_spin_smash_main = { - EVT_CALL(ShowActionHud, 1) - EVT_CALL(func_80269EAC, 2) - EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_SWITCH(LVar1) - EVT_CASE_EQ(0) - EVT_SET(LVarD, 60) - EVT_SET(LVarE, 1) - EVT_SET(LVarF, 2) - EVT_EXEC_WAIT(D_802A3258_739AE8) - EVT_CASE_EQ(1) - EVT_SET(LVarD, 60) - EVT_SET(LVarE, 2) - EVT_SET(LVarF, 4) - EVT_EXEC_WAIT(D_802A3920_73A1B0) - EVT_CASE_EQ(2) - EVT_SET(LVarD, 60) - EVT_SET(LVarE, 3) - EVT_SET(LVarF, 6) - EVT_EXEC_WAIT(D_802A3FC4_73A854) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -EvtScript D_802A3258_739AE8 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_CALL(InitTargetIterator) - EVT_EXEC_WAIT(D_802A1190_737A20) - EVT_SET(LVar1, 0) - EVT_LOOP(10) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x040000) - EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x040000) - EVT_SWITCH(LVar1) - EVT_CASE_LT(3) - EVT_WAIT(4) - EVT_CASE_LT(5) - EVT_WAIT(3) - EVT_CASE_LT(7) - EVT_WAIT(2) - EVT_CASE_LT(9) - EVT_WAIT(1) - EVT_CASE_LT(11) - EVT_WAIT(0) - EVT_END_SWITCH - EVT_CALL(PlayerTestEnemy, LVar0, 64, 25, 0, LVar9, BS_FLAGS1_10) - EVT_CALL(InitTargetIterator) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x040001) - EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x040002) - EVT_CALL(battle_move_spin_smash_ShouldMovesAutoSucceed) - EVT_IF_EQ(LVar0, 0) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x040003) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x040004) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x040005) - EVT_WAIT(3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) - EVT_CALL(StartRumble, 7) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x211E) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 25, 0, 0, BS_FLAGS1_10) - EVT_IF_EQ(LVar0, 6) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_WAIT(25) - EVT_EXEC_WAIT(D_802A1B44_7383D4) - EVT_RETURN - EVT_END_IF - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(func_802A1000_737890) - EVT_CALL(PlayerDamageEnemy, LVar0, 603979840, 25, 0, LVarF, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(func_802A1074_737904) - EVT_CALL(PlayerDamageEnemy, LVar0, 603979840, 25, 0, LVarE, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_EXEC_WAIT(D_802A1A78_738308) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_THREAD - EVT_SET(LVar0, 0) - EVT_LOOP(10) - EVT_ADD(LVar0, 18) - EVT_CALL(SetActorYaw, ACTOR_PLAYER, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) - EVT_EXEC_WAIT(D_802A1A78_738308) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A3920_73A1B0 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_CALL(InitTargetIterator) - EVT_EXEC_WAIT(D_802A1190_737A20) - EVT_SET(LVar1, 0) - EVT_LOOP(10) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x040006) - EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x040006) - EVT_SWITCH(LVar1) - EVT_CASE_LT(3) - EVT_WAIT(4) - EVT_CASE_LT(5) - EVT_WAIT(3) - EVT_CASE_LT(7) - EVT_WAIT(2) - EVT_CASE_LT(9) - EVT_WAIT(1) - EVT_CASE_LT(11) - EVT_WAIT(0) - EVT_END_SWITCH - EVT_CALL(InitTargetIterator) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x040007) - EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x040008) - EVT_CALL(battle_move_spin_smash_ShouldMovesAutoSucceed) - EVT_IF_EQ(LVar0, FALSE) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x040009) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x04000A) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x04000B) - EVT_WAIT(3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) - EVT_CALL(StartRumble, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x211F) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 25, 0, 0, BS_FLAGS1_10) - EVT_IF_EQ(LVar0, 6) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_WAIT(25) - EVT_EXEC_WAIT(D_802A1B44_7383D4) - EVT_RETURN - EVT_END_IF - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(func_802A1000_737890) - EVT_CALL(PlayerDamageEnemy, LVar0, 603979840, 25, 0, LVarF, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(func_802A1074_737904) - EVT_CALL(PlayerDamageEnemy, LVar0, 603979840, 25, 0, LVarE, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_EXEC_WAIT(D_802A1A78_738308) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_THREAD - EVT_SET(LVar0, 0) - EVT_LOOP(10) - EVT_ADD(LVar0, 18) - EVT_CALL(SetActorYaw, ACTOR_PLAYER, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_WAIT(10) - EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_EXEC_WAIT(D_802A1A78_738308) - EVT_RETURN - EVT_END -}; - -EvtScript D_802A3FC4_73A854 = { - EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) - EVT_CALL(action_command_hammer_init) - EVT_CALL(InitTargetIterator) - EVT_EXEC_WAIT(D_802A1190_737A20) - EVT_SET(LVar1, 0) - EVT_LOOP(10) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_BREAK_LOOP - EVT_END_IF - EVT_WAIT(1) - EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x04000C) - EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x04000C) - EVT_SWITCH(LVar1) - EVT_CASE_LT(3) - EVT_WAIT(4) - EVT_CASE_LT(5) - EVT_WAIT(3) - EVT_CASE_LT(7) - EVT_WAIT(2) - EVT_CASE_LT(9) - EVT_WAIT(1) - EVT_CASE_LT(11) - EVT_WAIT(0) - EVT_END_SWITCH - EVT_CALL(InitTargetIterator) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x04000D) - EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x04000E) - EVT_CALL(battle_move_spin_smash_ShouldMovesAutoSucceed) - EVT_IF_EQ(LVar0, FALSE) - EVT_LOOP(45) - EVT_WAIT(1) - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_NE(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_END_IF - EVT_CALL(action_command_hammer_start, 0, LVarD, 3) - EVT_CALL(SetActionResult, 0) - EVT_SET(LVar1, 0) - EVT_LOOP(30) - EVT_WAIT(1) - EVT_CALL(GetActionResult, LVar0) - EVT_IF_NE(LVar0, 0) - EVT_IF_NE(LVar1, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x04000F) - EVT_SET(LVar1, 1) - EVT_END_IF - EVT_END_IF - EVT_CALL(CheckButtonDown, 0x00040000, LVar0) - EVT_IF_EQ(LVar0, FALSE) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x040010) - EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x040011) - EVT_WAIT(3) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) - EVT_CALL(StartRumble, 9) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x2120) - EVT_CALL(PlayerTestEnemy, LVar0, 64, 25, 0, 0, BS_FLAGS1_10) - EVT_IF_EQ(LVar0, 6) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_WAIT(25) - EVT_EXEC_WAIT(D_802A1B44_7383D4) - EVT_RETURN - EVT_END_IF - EVT_CALL(DidActionSucceed, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(0) - EVT_CALL(func_802A1000_737890) - EVT_CALL(PlayerDamageEnemy, LVar0, 603979840, 25, 0, LVarF, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_CASE_DEFAULT - EVT_CALL(func_802A1074_737904) - EVT_CALL(PlayerDamageEnemy, LVar0, 603979840, 25, 0, LVarE, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) - EVT_END_SWITCH - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(0) - EVT_CASE_OR_EQ(2) - EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_EXEC_WAIT(D_802A1A78_738308) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(1) - EVT_CASE_OR_EQ(3) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_THREAD - EVT_SET(LVar0, 0) - EVT_LOOP(10) - EVT_ADD(LVar0, 18) - EVT_CALL(SetActorYaw, ACTOR_PLAYER, LVar0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_WAIT(10) - EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_EXEC_WAIT(D_802A1A78_738308) - EVT_RETURN - EVT_END -}; diff --git a/src/battle/star/chill_out/7900D0.c b/src/battle/move/star_power/chill_out.c similarity index 97% rename from src/battle/star/chill_out/7900D0.c rename to src/battle/move/star_power/chill_out.c index 60604abcb4..792a4be301 100644 --- a/src/battle/star/chill_out/7900D0.c +++ b/src/battle/move/star_power/chill_out.c @@ -2,23 +2,23 @@ #include "script_api/battle.h" #include "sprite/npc/BattleMuskular.h" -#define NAMESPACE battle_star_chill_out +#define NAMESPACE battle_move_chill_out BSS s32 D_802A2CC0; #include "common/StarPower.inc.c" -ApiStatus func_802A1518_7905E8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A1518_7905E8) { D_802A2CC0 = 0; return ApiStatus_DONE2; } -ApiStatus func_802A1528_7905F8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A1528_7905F8) { script->varTable[0] = D_802A2CC0; return ApiStatus_DONE2; } -ApiStatus func_802A153C_79060C(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A153C_79060C) { f32 a = rand_int(200) - 25; f32 b = rand_int(120) + 7; f32 c = rand_int(50) - 25; @@ -33,7 +33,7 @@ ApiStatus func_802A153C_79060C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802A163C_79070C(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A163C_79070C) { Actor* actor = get_actor(script->owner1.actorID); Actor* target = get_actor(actor->targetActorID); ActorPart* part = get_actor_part(target, actor->targetPartIndex); @@ -51,7 +51,7 @@ ApiStatus func_802A163C_79070C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802A16F4_7907C4(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A16F4_7907C4) { Actor* enemy = get_actor(script->owner1.enemyID); Actor* target = get_actor(enemy->targetActorID); ActorPart* targetPart = get_actor_part(target, enemy->targetPartIndex); @@ -337,7 +337,7 @@ EvtScript N(802A267C) = { EVT_END }; -EvtScript N(usePower) = { +EvtScript N(EVS_UsePower) = { EVT_CALL(func_802A1518_7905E8) EVT_EXEC_WAIT(N(802A18F0)) EVT_SET_CONST(LVar0, ANIM_BattleMuskular_Idle) diff --git a/src/battle/star/focus/789E60.c b/src/battle/move/star_power/focus.c similarity index 98% rename from src/battle/star/focus/789E60.c rename to src/battle/move/star_power/focus.c index 1ef55f240f..d31131cc19 100644 --- a/src/battle/star/focus/789E60.c +++ b/src/battle/move/star_power/focus.c @@ -1,11 +1,11 @@ #include "common.h" #include "script_api/battle.h" -#define NAMESPACE battle_star_focus +#define NAMESPACE battle_move_focus #include "common/StarPower.inc.c" -ApiStatus func_802A1518_78A378(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A1518_78A378) { PlayerData* playerData = &gPlayerData; s32 deepFocusSP; s32 superFocusSP; @@ -29,7 +29,7 @@ ApiStatus func_802A1518_78A378(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802A15B0_78A410(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A15B0_78A410) { PlayerData* playerData = &gPlayerData; script->varTable[0] = 0; @@ -286,7 +286,7 @@ EvtScript N(802A23BC) = { EVT_END }; -EvtScript N(usePower) = { +EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A1630)) EVT_CALL(func_802535B4, 1) EVT_CALL(GetOwnerID, LVarA) diff --git a/src/battle/star/lullaby/78D150.c b/src/battle/move/star_power/lullaby.c similarity index 98% rename from src/battle/star/lullaby/78D150.c rename to src/battle/move/star_power/lullaby.c index 41b6e9fc17..cdff4b0d23 100644 --- a/src/battle/star/lullaby/78D150.c +++ b/src/battle/move/star_power/lullaby.c @@ -2,11 +2,11 @@ #include "script_api/battle.h" #include "sprite/npc/BattleMamar.h" -#define NAMESPACE battle_star_lullaby +#define NAMESPACE battle_move_lullaby #include "common/StarPower.inc.c" -ApiStatus func_802A1518_78D668(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A1518_78D668) { if (isInitialCall) { script->functionTemp[0] = 0; } @@ -272,7 +272,7 @@ EvtScript N(802A23AC) = { EVT_END }; -EvtScript N(usePower) = { +EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A1620)) EVT_SET_CONST(LVar0, ANIM_BattleMamar_Idle) EVT_EXEC_WAIT(N(802A1D50)) diff --git a/src/battle/star/peach_beam/7997B0.c b/src/battle/move/star_power/peach_beam.c similarity index 90% rename from src/battle/star/peach_beam/7997B0.c rename to src/battle/move/star_power/peach_beam.c index 331d0ef4e0..39954782a6 100644 --- a/src/battle/star/peach_beam/7997B0.c +++ b/src/battle/move/star_power/peach_beam.c @@ -2,11 +2,11 @@ #include "script_api/battle.h" #include "model.h" -#define NAMESPACE battle_star_peach_beam +#define NAMESPACE battle_move_peach_beam -#include "../common/peach_star_beam.inc.c" +#include "battle/common/move/StarBeamSupport.inc.c" -EvtScript N(usePower) = { +EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(beforeUsePower)) EVT_CALL(AddBattleCamZoom, 100) EVT_CALL(MoveBattleCamOver, 20) diff --git a/src/battle/star/peach_focus/79BFA0.c b/src/battle/move/star_power/peach_focus.c similarity index 98% rename from src/battle/star/peach_focus/79BFA0.c rename to src/battle/move/star_power/peach_focus.c index 2ef0e07f7f..e43202e8e8 100644 --- a/src/battle/star/peach_focus/79BFA0.c +++ b/src/battle/move/star_power/peach_focus.c @@ -1,11 +1,11 @@ #include "common.h" #include "script_api/battle.h" -#define NAMESPACE battle_star_peach_focus +#define NAMESPACE battle_move_peach_focus #include "common/StarPower.inc.c" -ApiStatus func_802A1518_79C4B8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A1518_79C4B8) { // TODO: replace with actual struct when we know what it is // varTable[0] is Twink's actorVar[0] ((s32*)script->varTable[0])[1]++; @@ -250,7 +250,7 @@ EvtScript N(802A22BC) = { EVT_END }; -EvtScript N(usePower) = { +EvtScript N(EVS_UsePower) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0A0003) diff --git a/src/battle/star/refresh/78B600.c b/src/battle/move/star_power/refresh.c similarity index 97% rename from src/battle/star/refresh/78B600.c rename to src/battle/move/star_power/refresh.c index d9f55e7242..2808d2bd3a 100644 --- a/src/battle/star/refresh/78B600.c +++ b/src/battle/move/star_power/refresh.c @@ -3,11 +3,11 @@ #include "script_api/battle.h" #include "sprite/npc/BattleEldstar.h" -#define NAMESPACE battle_star_refresh +#define NAMESPACE battle_move_refresh #include "common/StarPower.inc.c" -ApiStatus func_802A1518_78BB18(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A1518_78BB18) { Bytecode* args = script->ptrReadPos; Npc* npc; @@ -74,7 +74,7 @@ ApiStatus func_802A1518_78BB18(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus func_802A17D4_78BDD4(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A17D4_78BDD4) { Actor* actor = gBattleStatus.playerActor; if (actor->debuff != STATUS_END) { @@ -97,7 +97,7 @@ ApiStatus func_802A17D4_78BDD4(Evt* script, s32 isInitialCall) { #include "common/AddFP.inc.c" -ApiStatus func_802A18E8_78BEE8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A18E8_78BEE8) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); @@ -109,7 +109,7 @@ ApiStatus func_802A18E8_78BEE8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802A19A8_78BFA8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A19A8_78BFA8) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); @@ -359,7 +359,7 @@ EvtScript N(802A27FC) = { EVT_END }; -EvtScript N(usePower) = { +EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A1A70)) EVT_SET_CONST(LVar0, ANIM_BattleEldstar_Idle) EVT_EXEC_WAIT(N(802A21A0)) diff --git a/src/battle/star/smooch/791D90.c b/src/battle/move/star_power/smooch.c similarity index 99% rename from src/battle/star/smooch/791D90.c rename to src/battle/move/star_power/smooch.c index c71e85029b..bdd6fde397 100644 --- a/src/battle/star/smooch/791D90.c +++ b/src/battle/move/star_power/smooch.c @@ -2,13 +2,13 @@ #include "script_api/battle.h" #include "sprite/npc/BattleMisstar.h" -#define NAMESPACE battle_star_smooch +#define NAMESPACE battle_move_smooch #include "common/StarPower.inc.c" #include "common/AddHP.inc.c" -ApiStatus func_802A156C_7922FC(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A156C_7922FC) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); @@ -263,7 +263,7 @@ s32 N(intTable_802A24E8)[] = { 0x00000023, 0x00000000, }; -EvtScript N(usePower) = { +EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A1630)) EVT_SET_CONST(LVar0, ANIM_BattleMisstar_Still) EVT_EXEC_WAIT(N(802A1D60)) diff --git a/src/battle/star/star_beam/796FC0.c b/src/battle/move/star_power/star_beam.c similarity index 90% rename from src/battle/star/star_beam/796FC0.c rename to src/battle/move/star_power/star_beam.c index 3101ac5a45..b4e991b28a 100644 --- a/src/battle/star/star_beam/796FC0.c +++ b/src/battle/move/star_power/star_beam.c @@ -3,11 +3,11 @@ #include "effects.h" #include "model.h" -#define NAMESPACE battle_star_star_beam +#define NAMESPACE battle_move_star_beam -#include "../common/peach_star_beam.inc.c" +#include "battle/common/move/StarBeamSupport.inc.c" -EvtScript N(usePower) = { +EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(beforeUsePower)) EVT_CALL(AddBattleCamZoom, 100) EVT_CALL(MoveBattleCamOver, 20) diff --git a/src/battle/star/star_storm/78E7D0.c b/src/battle/move/star_power/star_storm.c similarity index 98% rename from src/battle/star/star_storm/78E7D0.c rename to src/battle/move/star_power/star_storm.c index 3c9bc7c823..5b4ccddd74 100644 --- a/src/battle/star/star_storm/78E7D0.c +++ b/src/battle/move/star_power/star_storm.c @@ -2,11 +2,11 @@ #include "script_api/battle.h" #include "sprite/npc/BattleSkolar.h" -#define NAMESPACE battle_star_star_storm +#define NAMESPACE battle_move_star_storm #include "common/StarPower.inc.c" -ApiStatus func_802A1518_78ECE8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A1518_78ECE8) { s32 var1 = -50 - rand_int(200); s32 var2 = 200; s32 var3 = rand_int(40); @@ -23,7 +23,7 @@ ApiStatus func_802A1518_78ECE8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802A1628_78EDF8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A1628_78EDF8) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); @@ -272,7 +272,7 @@ EvtScript N(802A247C) = { EVT_END }; -EvtScript N(usePower) = { +EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A16F0)) EVT_SET_CONST(LVar0, ANIM_BattleSkolar_Idle) EVT_EXEC_WAIT(N(802A1E20)) diff --git a/src/battle/star/time_out/793D20.c b/src/battle/move/star_power/time_out.c similarity index 99% rename from src/battle/star/time_out/793D20.c rename to src/battle/move/star_power/time_out.c index 4c2bd59a37..2a14bc2306 100644 --- a/src/battle/star/time_out/793D20.c +++ b/src/battle/move/star_power/time_out.c @@ -2,7 +2,7 @@ #include "script_api/battle.h" #include "sprite/npc/BattleKlevar.h" -#define NAMESPACE battle_star_time_out +#define NAMESPACE battle_move_time_out #include "common/StarPower.inc.c" @@ -244,7 +244,7 @@ EvtScript N(802A22AC) = { EVT_END }; -EvtScript N(usePower) = { +EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A1520)) EVT_SET_CONST(LVar0, ANIM_BattleKlevar_Idle) EVT_EXEC_WAIT(N(802A1C50)) diff --git a/src/battle/star/peach_dash/79D8A0.c b/src/battle/move/star_power/twink_dash.c similarity index 98% rename from src/battle/star/peach_dash/79D8A0.c rename to src/battle/move/star_power/twink_dash.c index 9c8cd5a990..a8d6fb3e55 100644 --- a/src/battle/star/peach_dash/79D8A0.c +++ b/src/battle/move/star_power/twink_dash.c @@ -1,11 +1,11 @@ #include "common.h" #include "script_api/battle.h" -#define NAMESPACE battle_star_peach_dash +#define NAMESPACE battle_move_twink_dash #include "common/StarPower.inc.c" -ApiStatus func_802A1518_79DDB8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A1518_79DDB8) { PlayerData* playerData = &gPlayerData; PlayerData* playerData2 = &gPlayerData; @@ -263,7 +263,7 @@ EvtScript N(802A233C) = { EVT_END }; -EvtScript N(usePower) = { +EvtScript N(EVS_UsePower) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0C0010) diff --git a/src/battle/star/up_and_away/7952E0.c b/src/battle/move/star_power/up_and_away.c similarity index 98% rename from src/battle/star/up_and_away/7952E0.c rename to src/battle/move/star_power/up_and_away.c index a7c16b9834..d922d6caf3 100644 --- a/src/battle/star/up_and_away/7952E0.c +++ b/src/battle/move/star_power/up_and_away.c @@ -7,11 +7,11 @@ extern EntityModelScript D_80283EE8; -#define NAMESPACE battle_star_up_and_away +#define NAMESPACE battle_move_up_and_away #include "common/StarPower.inc.c" -ApiStatus func_802A1518_7957F8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A1518_7957F8) { if (isInitialCall) { mdl_set_all_fog_mode(FOG_MODE_1); *gBackgroundFogModePtr = FOG_MODE_1; @@ -30,7 +30,7 @@ ApiStatus func_802A1518_7957F8(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus func_802A15B4_795894(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A15B4_795894) { if (isInitialCall) { script->functionTemp[0] = 254; } @@ -47,7 +47,7 @@ ApiStatus func_802A15B4_795894(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus func_802A1628_795908(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802A1628_795908) { Actor* targetActor = get_actor(get_actor(script->owner1.actorID)->targetActorID); u32 flags; @@ -305,7 +305,7 @@ EvtScript N(802A245C) = { EVT_END }; -EvtScript N(usePower) = { +EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A16D0)) EVT_SET_CONST(LVar0, ANIM_BattleKalmar_Idle) EVT_EXEC_WAIT(N(802A1E00)) diff --git a/src/battle/move/super_jump/76F330.c b/src/battle/move/super_jump/76F330.c deleted file mode 100644 index b6f0484c8b..0000000000 --- a/src/battle/move/super_jump/76F330.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_super_jump - -#include "world/common/todo/UnkMoveFunc1.inc.c" diff --git a/src/battle/move/super_smash/775100.c b/src/battle/move/super_smash/775100.c deleted file mode 100644 index a233dfa22a..0000000000 --- a/src/battle/move/super_smash/775100.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_move_super_smash - -#include "world/common/todo/IsBerserkerEquipped.inc.c" - -#include "world/common/todo/ShouldMovesAutoSucceed.inc.c" diff --git a/src/battle/move/unknown_move/779C90.c b/src/battle/move/unknown_move/779C90.c deleted file mode 100644 index b47b1b6876..0000000000 --- a/src/battle/move/unknown_move/779C90.c +++ /dev/null @@ -1,32 +0,0 @@ -#include "common.h" - -#include "battle/battle.h" - -#define NAMESPACE battle_move_unknown_move - -#include "world/common/todo/UnkMoveFunc1.inc.c" - -extern s32 D_802A26D0_77B360; - -ApiStatus func_802A10E4_779D74(Evt* script, s32 isInitialCall) { - Actor* enemyTargetActor = get_actor(get_actor(script->owner1.enemyID)->targetActorID); - u32 enemyTargetPowerBounceChance; - - script->varTable[0] = 99; - - enemyTargetPowerBounceChance = enemyTargetActor->actorBlueprint->powerBounceChance; - - if (is_ability_active(ABILITY_DODGE_MASTER)) { - enemyTargetPowerBounceChance += 7; - } - - D_802A26D0_77B360 *= enemyTargetPowerBounceChance; - D_802A26D0_77B360 /= 100; - - if (D_802A26D0_77B360 < rand_int(100)) { - script->varTable[0] = 0; - } - - return ApiStatus_DONE2; -} - diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index ff7a5338ef..4d5e94aaf2 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -27,7 +27,7 @@ enum { LF_MashStarted = LocalFlag(2), }; -ApiStatus N(PlayExplosionFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(PlayExplosionFX)) { BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; s32 x = evt_get_variable(script, *args++); @@ -73,7 +73,7 @@ ApiStatus N(PlayExplosionFX)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(SlowDown)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SlowDown)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; ActorState* partnerActorMovement = &partnerActor->state; @@ -107,7 +107,7 @@ ApiStatus N(SlowDown)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(GetBombDamage)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetBombDamage)) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; @@ -168,7 +168,7 @@ ApiStatus N(GetBombDamage)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(GetPowerBombDamage)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetPowerBombDamage)) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; @@ -215,7 +215,7 @@ ApiStatus N(GetPowerBombDamage)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(GetMegaBombDamage)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetMegaBombDamage)) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; @@ -302,7 +302,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index 61d92cd402..ba89a0e66e 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -25,14 +25,14 @@ extern EvtScript N(hidePlayer); extern s32 bMarioHideAnims[]; -ApiStatus N(IsOuttaSightActive)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(IsOuttaSightActive)) { BattleStatus* battleStatus = &gBattleStatus; script->varTable[0] = battleStatus->outtaSightActive; return ApiStatus_DONE2; } -ApiStatus N(GetBowSize)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetBowSize)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; Actor* partnerTargetActor = get_actor(partnerActor->targetActorID); @@ -44,7 +44,7 @@ ApiStatus N(GetBowSize)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(ApplyOuttaSight)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ApplyOuttaSight)) { ActorPart* playerActorPartTable = gBattleStatus.playerActor->partsTable; gBattleStatus.outtaSightActive = 1; @@ -59,7 +59,7 @@ ApiStatus N(ApplyOuttaSight)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(ModifyBowPos)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ModifyBowPos)) { BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; Actor* playerActor = battleStatus->playerActor; @@ -77,7 +77,7 @@ ApiStatus N(ModifyBowPos)(Evt* script, s32 isInitialCall) { } /// Duplicate of IsPartnerImmobile -ApiStatus N(IsPartnerImmobile)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(IsPartnerImmobile)) { BattleStatus* battleStatus = &gBattleStatus; Actor* playerActor = battleStatus->playerActor; s32 isImmobile = playerActor->debuff == STATUS_FEAR @@ -95,7 +95,7 @@ ApiStatus N(IsPartnerImmobile)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(RestorePlayerIdleAnimations)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(RestorePlayerIdleAnimations)) { BattleStatus* battleStatus = &gBattleStatus; Actor* playerActor = battleStatus->playerActor; ActorPart* playerActorPartTable = battleStatus->playerActor->partsTable; @@ -104,7 +104,7 @@ ApiStatus N(RestorePlayerIdleAnimations)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(AverageSpookChance)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(AverageSpookChance)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; Actor* targetActor; @@ -196,8 +196,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 714ef7f5e1..0d0ab6110e 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -30,7 +30,7 @@ extern EvtScript N(idle); extern EvtScript N(nextTurn); extern EvtScript N(takeTurn); -ApiStatus N(GetReturnMoveTime)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetReturnMoveTime)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; f32 posX = partner->currentPos.x; @@ -57,7 +57,7 @@ ApiStatus N(GetReturnMoveTime)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(AdjustPowerBounceChance)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(AdjustPowerBounceChance)) { Actor* targetActor = get_actor(get_actor(script->owner1.actorID)->targetActorID); script->varTable[0] = 99; @@ -70,7 +70,7 @@ ApiStatus N(AdjustPowerBounceChance)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(JumpOnTarget)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(JumpOnTarget)) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; Actor* actor = battleStatus->partnerActor; @@ -245,7 +245,7 @@ ApiStatus N(JumpOnTarget)(Evt* script, s32 isInitialCall) { } -ApiStatus N(OnMissHeadbonk)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(OnMissHeadbonk)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = gBattleStatus.partnerActor; Vec3f* pos = &partner->state.currentPos; @@ -289,7 +289,7 @@ ApiStatus N(OnMissHeadbonk)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(GetTattleMessage)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetTattleMessage)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; Actor* target = get_actor(partner->targetActorID); @@ -306,8 +306,7 @@ ApiStatus N(GetTattleMessage)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - -ApiStatus N(GetTattleCamPos)(Evt* script, s32 isInitalCall) { +API_CALLABLE(N(GetTattleCamPos)) { Actor* target = get_actor(gBattleStatus.partnerActor->targetActorID); s32 xSize; @@ -337,13 +336,13 @@ ApiStatus N(GetTattleCamPos)(Evt* script, s32 isInitalCall) { } -ApiStatus N(OpenTattleWindow)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(OpenTattleWindow)) { N(tattleEffect) = fx_tattle_window(0, 206, 144, 0, 1.0f, 0); return ApiStatus_DONE2; } -ApiStatus N(CloseTattleWindow)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CloseTattleWindow)) { EffectInstance* effect = N(tattleEffect); effect->data.tattleWindow->pos.y = 144.0f; @@ -352,7 +351,7 @@ ApiStatus N(CloseTattleWindow)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(CanChargeMore)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CanChargeMore)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; @@ -379,7 +378,7 @@ ApiStatus N(CanChargeMore)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(ChargeAtPos)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ChargeAtPos)) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; @@ -425,7 +424,7 @@ ApiStatus N(ChargeAtPos)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(StopCharge)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StopCharge)) { BattleStatus* battleStatus = &gBattleStatus; battleStatus->partnerActor->isGlowing = 0; @@ -434,7 +433,7 @@ ApiStatus N(StopCharge)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(StopChargeAndGet)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StopChargeAndGet)) { Actor* partner = gBattleStatus.partnerActor; if (!(gBattleStatus.flags1 & BS_FLAGS1_40000000)) { @@ -448,7 +447,7 @@ ApiStatus N(StopChargeAndGet)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(GetChargeAmount)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetChargeAmount)) { BattleStatus* battleStatus = &gBattleStatus; script->varTable[0] = battleStatus->partnerActor->isGlowing; @@ -456,7 +455,7 @@ ApiStatus N(GetChargeAmount)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(PlayChargeFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(PlayChargeFX)) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); @@ -468,7 +467,7 @@ ApiStatus N(PlayChargeFX)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(GetChargeMessage)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetChargeMessage)) { if (N(isCharged) == 0) { script->varTable[0] = 36; } else { diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index 206b0ac8e6..7e6cdb87f4 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -25,7 +25,7 @@ extern EvtScript N(dizzyShell); extern EvtScript N(fireShell); extern EvtScript N(shellTossOnFirstStrike); -ApiStatus N(SlowDown)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SlowDown)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; ActorState* partnerActorMovement = &partnerActor->state; @@ -59,7 +59,7 @@ ApiStatus N(SlowDown)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(SetTargetsYaw)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetTargetsYaw)) { SelectableTarget* target; Actor* actor = gBattleStatus.partnerActor; Actor* targetActor; @@ -111,7 +111,7 @@ ApiStatus N(SetTargetsYaw)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(AverageTargetDizzyChance)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(AverageTargetDizzyChance)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; Actor* targetActor; @@ -149,7 +149,7 @@ ApiStatus N(AverageTargetDizzyChance)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(GetFireShellSpeedAndDamage)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetFireShellSpeedAndDamage)) { s32 mashResult = script->varTable[0]; s32 damage; s32 speedRating; @@ -229,7 +229,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, - .unk_1C = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index 2edbd7ddf5..082f62429c 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -71,7 +71,7 @@ extern HudScript HES_AimReticle; extern HudScript HES_AimTarget; extern HudScript HES_StickTapRight; -ApiStatus N(SpinyFlipUpdatePopup)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SpinyFlipUpdatePopup)) { if (isInitialCall) { sSpinyFlipStarted = 0; } @@ -138,8 +138,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, @@ -151,8 +150,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -368,7 +366,7 @@ EvtScript N(returnHome) = { HudScript* N(aimHudScripts)[] = { &HES_AimBlinkA }; -ApiStatus N(SpinyFlipActionCommand)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SpinyFlipActionCommand)) { BattleStatus* battleStatus = &gBattleStatus; s32 screenX, screenY, screenZ; Actor* partner = battleStatus->partnerActor; @@ -429,8 +427,8 @@ ApiStatus N(SpinyFlipActionCommand)(Evt* script, s32 isInitialCall) { set_goal_pos_to_part(partnerState, partner->targetActorID, partner->targetPartIndex); target = get_actor(partner->targetActorID); part = get_actor_part(target, partner->targetPartIndex); - partnerState->goalPos.x += part->unk_75; - partnerState->goalPos.y += part->unk_76; + partnerState->goalPos.x += part->projectileTargetOffset.x; + partnerState->goalPos.y += part->projectileTargetOffset.y; partnerState->goalPos.z = partnerState->goalPos.z; // required to match partnerState->distance = dist2D(partnerState->currentPos.x, partnerState->currentPos.y, @@ -601,7 +599,7 @@ ApiStatus N(SpinyFlipActionCommand)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(ThrowSpinyFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ThrowSpinyFX)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; f32 xPos = partnerActor->currentPos.x + 5; @@ -615,7 +613,7 @@ ApiStatus N(ThrowSpinyFX)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(GetSpinySurgeDamage)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetSpinySurgeDamage)) { s32 partnerLevel = gBattleStatus.partnerActor->actorBlueprint->level; s32 actionCommandResult = script->varTable[10]; s32 damage = 0; @@ -660,7 +658,7 @@ ApiStatus N(GetSpinySurgeDamage)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(RemoveCloudNineFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(RemoveCloudNineFX)) { EffectInstance* effect = gBattleStatus.cloudNineEffect; if (effect != NULL) { @@ -673,7 +671,7 @@ ApiStatus N(RemoveCloudNineFX)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(CloudNineFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CloudNineFX)) { BattleStatus* battleStatus = &gBattleStatus; Actor* actor = battleStatus->playerActor; @@ -700,7 +698,7 @@ ApiStatus N(CloudNineFX)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(ApplyCloudNine)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ApplyCloudNine)) { if (gBattleStatus.cloudNineTurnsLeft < script->varTable[10]) { gBattleStatus.cloudNineTurnsLeft = script->varTable[10]; gBattleStatus.cloudNineDodgeChance = 50; @@ -710,7 +708,7 @@ ApiStatus N(ApplyCloudNine)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(InitHurricane)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(InitHurricane)) { Actor* partner = gBattleStatus.partnerActor; s32 totalChance; s32 affectedTargets; @@ -784,7 +782,7 @@ ApiStatus N(InitHurricane)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(CanTargetBeBlown)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CanTargetBeBlown)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; s32 targetIdx = partner->targetIndexList[partner->selectedTargetIndex]; @@ -1338,7 +1336,7 @@ enum { STATE_EXHALE = 1, }; -ApiStatus N(ProcessHurricane)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ProcessHurricane)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; ActorState* partnerState = &partner->state; @@ -1625,7 +1623,7 @@ RESTART: return ApiStatus_BLOCK; } -ApiStatus N(BlowTargetAway)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(BlowTargetAway)) { BattleStatus* battleStatus = &gBattleStatus; Actor* target; ActorState* state; @@ -1671,14 +1669,14 @@ ApiStatus N(BlowTargetAway)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(AllEnemiesBlownAway)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(AllEnemiesBlownAway)) { if (sNumEnemiesBeingBlown == 0) { return ApiStatus_DONE2; } return ApiStatus_BLOCK; } -ApiStatus N(IsHurricaneActive)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(IsHurricaneActive)) { script->varTable[0] = sIsHurricaneActive; return ApiStatus_DONE2; } diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index 0f8c0e3920..b1413515c5 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -53,7 +53,7 @@ extern EvtScript N(shellShot); extern EvtScript N(airLift); extern EvtScript N(airRaid); -ApiStatus N(ShellShotActionCommand)(Evt* evt, s32 isInitialCall) { +API_CALLABLE(N(ShellShotActionCommand)) { BattleStatus* battleStatus = &gBattleStatus; ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; Actor* parakarry = battleStatus->partnerActor; @@ -67,10 +67,10 @@ ApiStatus N(ShellShotActionCommand)(Evt* evt, s32 isInitialCall) { s32 hudID, i; if (isInitialCall) { - evt->functionTemp[0] = 0; + script->functionTemp[0] = 0; } - switch (evt->functionTemp[0]) { + switch (script->functionTemp[0]) { case 0: hudMarkers[0] = hudID = hud_element_create(&HES_AimMarkerF); hud_element_set_render_depth(hudID, 10); @@ -139,8 +139,8 @@ ApiStatus N(ShellShotActionCommand)(Evt* evt, s32 isInitialCall) { targetActor = get_actor(parakarry->targetActorID); targetActorPart = get_actor_part(targetActor, parakarry->targetPartIndex); - state->goalPos.x += targetActorPart->unk_75 * targetActor->scalingFactor; - state->goalPos.y += targetActorPart->unk_76 * targetActor->scalingFactor; + state->goalPos.x += targetActorPart->projectileTargetOffset.x * targetActor->scalingFactor; + state->goalPos.y += targetActorPart->projectileTargetOffset.y * targetActor->scalingFactor; state->goalPos.z = state->goalPos.z; state->unk_24 = (targetActorPart->size.y + targetActorPart->size.x) / 2 / 24.0; hud_element_set_scale(hudTarget, state->unk_24 * targetActor->scalingFactor); @@ -191,7 +191,7 @@ ApiStatus N(ShellShotActionCommand)(Evt* evt, s32 isInitialCall) { battleStatus->unk_86 = 0; action_command_init_status(); func_80269118(); - evt->functionTemp[0] = 1; + script->functionTemp[0] = 1; break; case 1: if (gActionCommandStatus.autoSucceed || battleStatus->currentButtonsDown & BUTTON_STICK_LEFT) { @@ -213,12 +213,12 @@ ApiStatus N(ShellShotActionCommand)(Evt* evt, s32 isInitialCall) { sfx_play_sound(SOUND_311); shellShotTimer = 60; - evt->functionTemp[0] = 2; + script->functionTemp[0] = 2; break; case 2: if (!(gActionCommandStatus.autoSucceed)) { if (!(battleStatus->currentButtonsDown & BUTTON_STICK_LEFT)) { - evt->functionTemp[0] = 3; + script->functionTemp[0] = 3; break; } } else { @@ -227,7 +227,7 @@ ApiStatus N(ShellShotActionCommand)(Evt* evt, s32 isInitialCall) { aimAngle = fabsf(get_clamped_angle_diff(state->angle, state->bounceDivisor)) / state->unk_24 * targetActor->scalingFactor; if (aimAngle < 3.0f) { - evt->functionTemp[0] = 3; + script->functionTemp[0] = 3; break; } } else { @@ -287,8 +287,8 @@ ApiStatus N(ShellShotActionCommand)(Evt* evt, s32 isInitialCall) { return ApiStatus_DONE2; } - if (evt->functionTemp[0] < 3) { - if (evt->functionTemp[0] > 0) { + if (script->functionTemp[0] < 3) { + if (script->functionTemp[0] > 0) { hudID = hudStick; targetActor = get_actor(parakarry->targetActorID); clampedAngleDiff = get_clamped_angle_diff(state->angle, state->bounceDivisor); @@ -315,8 +315,8 @@ ApiStatus N(ShellShotActionCommand)(Evt* evt, s32 isInitialCall) { hudTargetRotation -= 10; hudTargetRotation = clamp_angle(hudTargetRotation); - if (evt->functionTemp[0] >= 2) { - if (evt->functionTemp[0] < 3) { + if (script->functionTemp[0] >= 2) { + if (script->functionTemp[0] < 3) { aimAngle = clamp_angle(state->angle); aimX = state->currentPos.x; aimY = state->currentPos.y; @@ -344,7 +344,7 @@ ApiStatus N(ShellShotActionCommand)(Evt* evt, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(GetShellShotDamage)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetShellShotDamage)) { BattleStatus* battleStatus = &gBattleStatus; s32 damage = 0; @@ -364,7 +364,7 @@ ApiStatus N(GetShellShotDamage)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(AirLiftChance)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(AirLiftChance)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; Actor* targetActor = get_actor(partnerActor->targetActorID); @@ -401,7 +401,7 @@ ApiStatus N(AirLiftChance)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(CarryAway)(Evt* evt, s32 isInitialCall) { +API_CALLABLE(N(CarryAway)) { BattleStatus* battleStatus = &gBattleStatus; Actor* parakarry = battleStatus->partnerActor; ActorState* actorState = ¶karry->state; @@ -411,21 +411,21 @@ ApiStatus N(CarryAway)(Evt* evt, s32 isInitialCall) { u32 temp_s4; if (isInitialCall) { - evt->functionTempPtr[1] = get_actor(parakarry->targetActorID); - evt->functionTemp[0] = 0; + script->functionTempPtr[1] = get_actor(parakarry->targetActorID); + script->functionTemp[0] = 0; } - temp_s4 = evt->functionTemp[0]; - targetActor = evt->functionTempPtr[1]; + temp_s4 = script->functionTemp[0]; + targetActor = script->functionTempPtr[1]; - switch (evt->functionTemp[0]) { + switch (script->functionTemp[0]) { case 0: parakarry->state.goalPos.x = targetActor->currentPos.x - parakarry->currentPos.x; parakarry->state.goalPos.y = targetActor->currentPos.y - parakarry->currentPos.y; parakarry->state.goalPos.z = targetActor->currentPos.z - parakarry->currentPos.z; parakarry->state.speed = 2.0f; parakarry->state.moveTime = 0; - evt->functionTemp[0] = 1; + script->functionTemp[0] = 1; break; case 1: parakarry->state.currentPos.x += parakarry->state.speed; @@ -456,7 +456,7 @@ ApiStatus N(CarryAway)(Evt* evt, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(FlyAround)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(FlyAround)) { Actor* partner = gBattleStatus.partnerActor; ActorState* state = &partner->state; @@ -603,7 +603,7 @@ ApiStatus N(FlyAround)(Evt* script, s32 isInitialCall) { } } -ApiStatus N(GetAirRaidDamage)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetAirRaidDamage)) { script->varTable[15] = ((script->varTable[0] * 100) / 2499) + 2; return ApiStatus_DONE2; @@ -661,8 +661,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index 8d153c418c..4998699c6b 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -26,15 +26,15 @@ extern EvtScript N(tidalWave); static EffectInstance* sEffect; -ApiStatus N(SetSquirtAngle)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetSquirtAngle)) { ActorPart* targetPart; Actor* partner = gBattleStatus.partnerActor; set_goal_pos_to_part(&partner->state, partner->targetActorID, partner->targetPartIndex); targetPart = get_actor_part(get_actor(partner->targetActorID), partner->targetPartIndex); - partner->state.goalPos.x += targetPart->unk_75; - partner->state.goalPos.y += targetPart->unk_76; + partner->state.goalPos.x += targetPart->projectileTargetOffset.x; + partner->state.goalPos.y += targetPart->projectileTargetOffset.y; partner->state.goalPos.z = partner->state.goalPos.z; // required to match partner->state.currentPos.x = partner->currentPos.x + 8.0f; @@ -55,7 +55,7 @@ ApiStatus N(SetSquirtAngle)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(GetSquirtDamage)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetSquirtDamage)) { Actor* partner = gBattleStatus.partnerActor; s32 actionCmdResult = script->varTable[0]; s32 damage = 0; @@ -105,7 +105,7 @@ ApiStatus N(GetSquirtDamage)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(InflateSushie)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(InflateSushie)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; f32 xScale; @@ -135,7 +135,7 @@ ApiStatus N(InflateSushie)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(GetSquirtTargetPos)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetSquirtTargetPos)) { f32 posX = script->varTable[0]; f32 posY = script->varTable[1]; @@ -147,7 +147,7 @@ ApiStatus N(GetSquirtTargetPos)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(ApplyWaterBlock)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ApplyWaterBlock)) { BattleStatus* battleStatus = &gBattleStatus; s32 var = script->varTable[0]; @@ -168,7 +168,7 @@ ApiStatus N(ApplyWaterBlock)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(PlaySquirtFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(PlaySquirtFX)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; Actor* playerActor = battleStatus->playerActor; @@ -178,7 +178,7 @@ ApiStatus N(PlaySquirtFX)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(PlayWaterBlockFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(PlayWaterBlockFX)) { BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; f32 posX = evt_get_float_variable(script, *args++); @@ -195,7 +195,7 @@ ApiStatus N(PlayWaterBlockFX)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(ProcessTidalWave)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ProcessTidalWave)) { Actor* partner = gBattleStatus.partnerActor; ActorState* state = &partner->state; f32 x, y; @@ -368,7 +368,7 @@ ApiStatus N(ProcessTidalWave)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(SetScaleTidalWaveCharge)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetScaleTidalWaveCharge)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; f32 var = script->varTable[0] * 3.0 / 100.0 + 1.0; @@ -435,8 +435,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/partner/twink.c b/src/battle/partner/twink.c index eb247554d1..d60dc5c73c 100644 --- a/src/battle/partner/twink.c +++ b/src/battle/partner/twink.c @@ -15,7 +15,7 @@ extern EvtScript N(celebrate); extern EvtScript N(runAway); extern EvtScript N(runAwayFail); -ApiStatus func_80238000_714CF0(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80238000_714CF0) { BattleStatus* battleStatus = &gBattleStatus; if (battleStatus->flags2 & BS_FLAGS2_PEACH_BATTLE) { @@ -74,8 +74,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = 0, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; @@ -121,7 +120,7 @@ EvtScript N(init) = { s32 D_802382F8_714FE8 = 0; -ApiStatus func_80238028_714D18(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80238028_714D18) { Actor* actor = get_actor(script->owner1.actorID); D_802382F8_714FE8 += 18; diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index 8e9faa0f9c..edcffe6572 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -39,7 +39,7 @@ static s32 sWattEffectData_currentEffectIndex; static EffectInstance* sWattEffectData_effect1; static EffectInstance* sWattEffectData_effect2; -ApiStatus N(WattFXUpdate)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(WattFXUpdate)) { Actor* partner = gBattleStatus.partnerActor; f32 x, y, z; @@ -111,7 +111,7 @@ ApiStatus N(WattFXUpdate)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(WattFXRemove)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(WattFXRemove)) { sWattEffectData_initialized = 0; if (sWattEffectData_effect1 != NULL) { remove_effect(sWattEffectData_effect1); @@ -123,27 +123,27 @@ ApiStatus N(WattFXRemove)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(WattFXBounce)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(WattFXBounce)) { sWattEffectData_isBouncing = 1; return ApiStatus_DONE2; } -ApiStatus N(WattFXDisableBounce)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(WattFXDisableBounce)) { sWattEffectData_isBouncing = 0; return ApiStatus_DONE2; } -ApiStatus N(WattFXEnable)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(WattFXEnable)) { sWattEffectData_isActive = 1; return ApiStatus_DONE2; } -ApiStatus N(WattFXDisable)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(WattFXDisable)) { sWattEffectData_isActive = 0; return ApiStatus_DONE2; } -ApiStatus N(WattFXSetEffect)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(WattFXSetEffect)) { sWattEffectData_currentEffectIndex = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } @@ -152,7 +152,7 @@ ApiStatus N(WattFXSetEffect)(Evt* script, s32 isInitialCall) { #include "common/SetBackgroundAlpha.inc.c" -ApiStatus N(ElectroDashFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ElectroDashFX)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_variable(script, *args++); s32 y = evt_get_variable(script, *args++); @@ -163,7 +163,7 @@ ApiStatus N(ElectroDashFX)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(ElectroDashFXDisable)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ElectroDashFXDisable)) { EffectInstance* effect = N(radialShimmer); if (effect != NULL) { @@ -174,7 +174,7 @@ ApiStatus N(ElectroDashFXDisable)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(PowerShockFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(PowerShockFX)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_variable(script, *args++); s32 y = evt_get_variable(script, *args++); @@ -188,7 +188,7 @@ ApiStatus N(PowerShockFX)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(PowerShockDischargeFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(PowerShockDischargeFX)) { Bytecode* args = script->ptrReadPos; Actor* partner = gBattleStatus.partnerActor; f32 x = partner->currentPos.x + partner->headOffset.x; @@ -209,7 +209,7 @@ ApiStatus N(PowerShockDischargeFX)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(TargetParalyzeChance)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(TargetParalyzeChance)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; Actor* targetActor = get_actor(partnerActor->targetActorID); @@ -228,7 +228,7 @@ ApiStatus N(TargetParalyzeChance)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(TurboChargeUnwindWatt)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(TurboChargeUnwindWatt)) { Bytecode* args = script->ptrReadPos; Actor* partner = gBattleStatus.partnerActor; Actor* player = gBattleStatus.playerActor; @@ -323,7 +323,7 @@ ApiStatus N(TurboChargeUnwindWatt)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(TurboChargeFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(TurboChargeFX)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_variable(script, *args++); s32 y = evt_get_variable(script, *args++); @@ -337,7 +337,7 @@ ApiStatus N(TurboChargeFX)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(ApplyTurboCharge)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ApplyTurboCharge)) { BattleStatus* battleStatus = &gBattleStatus; s32 actionCommandResult = script->varTable[0]; @@ -362,7 +362,7 @@ ApiStatus N(ApplyTurboCharge)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(MegaShockFX)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(MegaShockFX)) { Bytecode* args = script->ptrReadPos; s32 x; s32 y; @@ -401,7 +401,7 @@ ApiStatus N(MegaShockFX)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(AverageTargetParalyzeChance)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(AverageTargetParalyzeChance)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; Actor* targetActor; @@ -492,8 +492,7 @@ ActorPartBlueprint N(parts)[] = { .defenseTable = N(defenseTable), .eventFlags = ACTOR_EVENT_FLAG_ELECTRIFIED, .elementImmunityFlags = 0, - .unk_1C = 0, - .unk_1D = 0, + .projectileTargetOffset = { 0, 0 }, }, }; diff --git a/src/battle/stage_names.h b/src/battle/stage_names.h new file mode 100644 index 0000000000..cab4fca326 --- /dev/null +++ b/src/battle/stage_names.h @@ -0,0 +1,248 @@ +#define BTL_STAGE_DEFAULT -1 + +enum StageNames { + BTL_KMR_1_STAGE_00 = 0x00, + BTL_KMR_1_STAGE_01 = 0x01, + BTL_KMR_1_STAGE_02 = 0x02, + BTL_KMR_1_STAGE_03 = 0x03, + BTL_KMR_1_STAGE_04 = 0x04, + BTL_KMR_2_STAGE_00 = 0x00, + BTL_KMR_2_STAGE_01 = 0x01, + BTL_KMR_2_STAGE_02 = 0x02, + BTL_KMR_2_STAGE_03 = 0x03, + BTL_KMR_2_STAGE_04 = 0x04, + BTL_KMR_3_STAGE_00 = 0x00, + BTL_KMR_3_STAGE_01 = 0x01, + BTL_KMR_3_STAGE_02 = 0x02, + BTL_KMR_3_STAGE_03 = 0x03, + BTL_KMR_3_STAGE_04 = 0x04, + BTL_KMR_3_STAGE_05 = 0x05, + BTL_KMR_3_STAGE_06 = 0x06, + BTL_KMR_3_STAGE_07 = 0x07, + BTL_KMR_3_STAGE_08 = 0x08, + BTL_KMR_3_STAGE_09 = 0x09, + BTL_MAC_STAGE_00 = 0x00, + BTL_MAC_STAGE_01 = 0x01, + BTL_HOS_STAGE_00 = 0x00, + BTL_HOS_STAGE_01 = 0x01, + BTL_HOS_STAGE_02 = 0x02, + BTL_NOK_STAGE_00 = 0x00, + BTL_NOK_STAGE_01 = 0x01, + BTL_NOK_STAGE_02 = 0x02, + BTL_NOK_STAGE_03 = 0x03, + BTL_TRD_1_STAGE_00 = 0x00, + BTL_TRD_1_STAGE_01 = 0x01, + BTL_TRD_1_STAGE_02 = 0x02, + BTL_TRD_1_STAGE_03 = 0x03, + BTL_TRD_1_STAGE_04 = 0x04, + BTL_TRD_1_STAGE_05 = 0x05, + BTL_TRD_1_STAGE_06 = 0x06, + BTL_TRD_1_STAGE_07 = 0x07, + BTL_TRD_1_STAGE_08 = 0x08, + BTL_TRD_1_STAGE_09 = 0x09, + BTL_TRD_1_STAGE_0A = 0x0A, + BTL_TRD_1_STAGE_0B = 0x0B, + BTL_TRD_1_STAGE_0C = 0x0C, + BTL_TRD_1_STAGE_0D = 0x0D, + BTL_TRD_2_STAGE_00 = 0x00, + BTL_TRD_2_STAGE_01 = 0x01, + BTL_TRD_2_STAGE_02 = 0x02, + BTL_TRD_2_STAGE_03 = 0x03, + BTL_TRD_2_STAGE_04 = 0x04, + BTL_TRD_2_STAGE_05 = 0x05, + BTL_TRD_2_STAGE_06 = 0x06, + BTL_TRD_2_STAGE_07 = 0x07, + BTL_TRD_2_STAGE_08 = 0x08, + BTL_TRD_2_STAGE_09 = 0x09, + BTL_TRD_2_STAGE_0A = 0x0A, + BTL_TRD_2_STAGE_0B = 0x0B, + BTL_TRD_3_STAGE_00 = 0x00, + BTL_IWA_STAGE_00 = 0x00, + BTL_IWA_STAGE_01 = 0x01, + BTL_IWA_STAGE_02 = 0x02, + BTL_SBK_STAGE_00 = 0x00, + BTL_ISK_1_STAGE_00 = 0x00, + BTL_ISK_1_STAGE_01 = 0x01, + BTL_ISK_1_STAGE_02 = 0x02, + BTL_ISK_1_STAGE_03 = 0x03, + BTL_ISK_1_STAGE_04 = 0x04, + BTL_ISK_1_STAGE_05 = 0x05, + BTL_ISK_1_STAGE_06 = 0x06, + BTL_ISK_1_STAGE_07 = 0x07, + BTL_ISK_1_STAGE_08 = 0x08, + BTL_ISK_1_STAGE_09 = 0x09, + BTL_ISK_1_STAGE_0A = 0x0A, + BTL_ISK_1_STAGE_0B = 0x0B, + BTL_ISK_1_STAGE_0C = 0x0C, + BTL_ISK_2_STAGE_00 = 0x00, + BTL_ISK_2_STAGE_01 = 0x01, + BTL_ISK_2_STAGE_02 = 0x02, + BTL_ISK_2_STAGE_03 = 0x03, + BTL_ISK_2_STAGE_04 = 0x04, + BTL_ISK_2_STAGE_05 = 0x05, + BTL_ISK_2_STAGE_06 = 0x06, + BTL_ISK_2_STAGE_07 = 0x07, + BTL_ISK_2_STAGE_08 = 0x08, + BTL_ISK_2_STAGE_09 = 0x09, + BTL_ISK_2_STAGE_0A = 0x0A, + BTL_ISK_2_STAGE_0B = 0x0B, + BTL_MIM_STAGE_00 = 0x00, + BTL_ARN_STAGE_00 = 0x00, + BTL_ARN_STAGE_01 = 0x01, + BTL_ARN_STAGE_02 = 0x02, + BTL_ARN_STAGE_03 = 0x03, + BTL_ARN_STAGE_04 = 0x04, + BTL_ARN_STAGE_05 = 0x05, + BTL_DGB_STAGE_00 = 0x00, + BTL_DGB_STAGE_01 = 0x01, + BTL_DGB_STAGE_02 = 0x02, + BTL_DGB_STAGE_03 = 0x03, + BTL_DGB_STAGE_04 = 0x04, + BTL_OMO_STAGE_00 = 0x00, + BTL_OMO_STAGE_01 = 0x01, + BTL_OMO_STAGE_02 = 0x02, + BTL_OMO_STAGE_03 = 0x03, + BTL_OMO_STAGE_04 = 0x04, + BTL_OMO_STAGE_05 = 0x05, + BTL_OMO_STAGE_06 = 0x06, + BTL_OMO_STAGE_07 = 0x07, + BTL_OMO_STAGE_08 = 0x08, + BTL_OMO2_STAGE_00 = 0x00, + BTL_OMO3_STAGE_00 = 0x00, + BTL_OMO3_STAGE_01 = 0x01, + BTL_OMO3_STAGE_02 = 0x02, + BTL_OMO3_STAGE_03 = 0x03, + BTL_OMO3_STAGE_04 = 0x04, + BTL_OMO3_STAGE_05 = 0x05, + BTL_OMO3_STAGE_06 = 0x06, + BTL_OMO3_STAGE_07 = 0x07, + BTL_OMO3_STAGE_08 = 0x08, + BTL_KGR_STAGE_00 = 0x00, + BTL_JAN_STAGE_00 = 0x00, + BTL_JAN_STAGE_01 = 0x01, + BTL_JAN_STAGE_02 = 0x02, + BTL_JAN_STAGE_03 = 0x03, + BTL_JAN_STAGE_04 = 0x04, + BTL_JAN_STAGE_05 = 0x05, + BTL_JAN_STAGE_06 = 0x06, + BTL_JAN_STAGE_07 = 0x07, + BTL_JAN2_STAGE_00 = 0x00, + BTL_JAN2_STAGE_01 = 0x01, + BTL_JAN2_STAGE_02 = 0x02, + BTL_JAN2_STAGE_03 = 0x03, + BTL_JAN2_STAGE_04 = 0x04, + BTL_JAN2_STAGE_05 = 0x05, + BTL_JAN2_STAGE_06 = 0x06, + BTL_JAN2_STAGE_07 = 0x07, + BTL_KZN_STAGE_00 = 0x00, + BTL_KZN_STAGE_01 = 0x01, + BTL_KZN_STAGE_02 = 0x02, + BTL_KZN_STAGE_03 = 0x03, + BTL_KZN_STAGE_04 = 0x04, + BTL_KZN_STAGE_05 = 0x05, + BTL_KZN_STAGE_06 = 0x06, + BTL_KZN2_STAGE_00 = 0x00, + BTL_KZN2_STAGE_01 = 0x01, + BTL_KZN2_STAGE_02 = 0x02, + BTL_KZN2_STAGE_03 = 0x03, + BTL_KZN2_STAGE_04 = 0x04, + BTL_KZN2_STAGE_05 = 0x05, + BTL_KZN2_STAGE_06 = 0x06, + BTL_FLO_STAGE_00 = 0x00, + BTL_FLO_STAGE_01 = 0x01, + BTL_FLO_STAGE_02 = 0x02, + BTL_FLO_STAGE_03 = 0x03, + BTL_FLO_STAGE_04 = 0x04, + BTL_FLO_STAGE_05 = 0x05, + BTL_FLO_STAGE_06 = 0x06, + BTL_FLO_STAGE_07 = 0x07, + BTL_FLO_STAGE_08 = 0x08, + BTL_FLO_STAGE_09 = 0x09, + BTL_FLO2_STAGE_00 = 0x00, + BTL_FLO2_STAGE_01 = 0x01, + BTL_FLO2_STAGE_02 = 0x02, + BTL_FLO2_STAGE_03 = 0x03, + BTL_FLO2_STAGE_04 = 0x04, + BTL_FLO2_STAGE_05 = 0x05, + BTL_FLO2_STAGE_06 = 0x06, + BTL_FLO2_STAGE_07 = 0x07, + BTL_FLO2_STAGE_08 = 0x08, + BTL_FLO2_STAGE_09 = 0x09, + BTL_TIK_STAGE_00 = 0x00, + BTL_TIK_STAGE_01 = 0x01, + BTL_TIK_STAGE_02 = 0x02, + BTL_TIK_STAGE_03 = 0x03, + BTL_TIK_STAGE_04 = 0x04, + BTL_TIK2_STAGE_00 = 0x00, + BTL_TIK2_STAGE_01 = 0x01, + BTL_TIK2_STAGE_02 = 0x02, + BTL_TIK2_STAGE_03 = 0x03, + BTL_TIK2_STAGE_04 = 0x04, + BTL_TIK3_STAGE_00 = 0x00, + BTL_TIK3_STAGE_01 = 0x01, + BTL_TIK3_STAGE_02 = 0x02, + BTL_TIK3_STAGE_03 = 0x03, + BTL_TIK3_STAGE_04 = 0x04, + BTL_SAM_STAGE_00 = 0x00, + BTL_SAM_STAGE_01 = 0x01, + BTL_SAM_STAGE_02 = 0x02, + BTL_SAM_STAGE_03 = 0x03, + BTL_SAM_STAGE_04 = 0x04, + BTL_SAM_STAGE_05 = 0x05, + BTL_SAM2_STAGE_00 = 0x00, + BTL_SAM2_STAGE_01 = 0x01, + BTL_SAM2_STAGE_02 = 0x02, + BTL_SAM2_STAGE_03 = 0x03, + BTL_SAM2_STAGE_04 = 0x04, + BTL_SAM2_STAGE_05 = 0x05, + BTL_PRA_STAGE_00 = 0x00, + BTL_PRA_STAGE_01 = 0x01, + BTL_PRA_STAGE_02 = 0x02, + BTL_PRA_STAGE_03 = 0x03, + BTL_PRA_STAGE_04 = 0x04, + BTL_PRA_STAGE_05 = 0x05, + BTL_PRA2_STAGE_00 = 0x00, + BTL_PRA3_STAGE_00 = 0x00, + BTL_PRA3_STAGE_01 = 0x01, + BTL_PRA3_STAGE_02 = 0x02, + BTL_PRA3_STAGE_03 = 0x03, + BTL_PRA3_STAGE_04 = 0x04, + BTL_PRA3_STAGE_05 = 0x05, + BTL_KPA_STAGE_00 = 0x00, + BTL_KPA_STAGE_01 = 0x01, + BTL_KPA_STAGE_02 = 0x02, + BTL_KPA_STAGE_03 = 0x03, + BTL_KPA_STAGE_04 = 0x04, + BTL_KPA_STAGE_05 = 0x05, + BTL_KPA_STAGE_06 = 0x06, + BTL_KPA_STAGE_07 = 0x07, + BTL_KPA_STAGE_08 = 0x08, + BTL_KPA_STAGE_09 = 0x09, + BTL_KPA_STAGE_0A = 0x0A, + BTL_KPA_STAGE_0B = 0x0B, + BTL_KPA_STAGE_0C = 0x0C, + BTL_KPA_STAGE_0D = 0x0D, + BTL_KPA2_STAGE_00 = 0x00, + BTL_KPA2_STAGE_01 = 0x01, + BTL_KPA2_STAGE_02 = 0x02, + BTL_KPA3_STAGE_00 = 0x00, + BTL_KPA4_STAGE_00 = 0x00, + BTL_KPA4_STAGE_01 = 0x01, + BTL_KPA4_STAGE_02 = 0x02, + BTL_KPA4_STAGE_03 = 0x03, + BTL_KPA4_STAGE_04 = 0x04, + BTL_KPA4_STAGE_05 = 0x05, + BTL_KPA4_STAGE_06 = 0x06, + BTL_KPA4_STAGE_07 = 0x07, + BTL_KPA4_STAGE_08 = 0x08, + BTL_KPA4_STAGE_09 = 0x09, + BTL_KPA4_STAGE_0A = 0x0A, + BTL_KPA4_STAGE_0B = 0x0B, + BTL_KPA4_STAGE_0C = 0x0C, + BTL_KKJ_STAGE_00 = 0x00, + BTL_DIG_STAGE_00 = 0x00, + BTL_DIG_STAGE_01 = 0x01, + BTL_DIG_STAGE_02 = 0x02, + BTL_DIG_STAGE_03 = 0x03, + BTL_DIG_STAGE_04 = 0x04, +}; diff --git a/src/load_script.c b/src/battle/use_items.c similarity index 75% rename from src/load_script.c rename to src/battle/use_items.c index 8b700fd53f..a6372355f2 100644 --- a/src/load_script.c +++ b/src/battle/use_items.c @@ -1,5 +1,6 @@ #include "common.h" #include "ld_addrs.h" +#include "battle.h" s32 D_80293B80[] = { -1, @@ -66,48 +67,39 @@ extern EvtScript battle_item_coconut_main; extern EvtScript battle_item_electro_pop_main; extern EvtScript battle_item_strange_cake_main; -#define BTL_ITEM_TABLE_ENTRY(name) { name##_ROM_START, name##_ROM_END, name##_VRAM, &battle_item_##name##_main } - -typedef struct BattleTableEntry { - /* 0x00 */ u8* romStart; - /* 0x04 */ u8* romEnd; - /* 0x08 */ u8* vramStart; - /* 0x0C */ EvtScript* mainScript; -} BattleTableEntry; // size = 0x10 - -BattleTableEntry gBattleItemTable[] = { - BTL_ITEM_TABLE_ENTRY(food), - BTL_ITEM_TABLE_ENTRY(mushroom), - BTL_ITEM_TABLE_ENTRY(fire_flower), - BTL_ITEM_TABLE_ENTRY(dusty_hammer), - BTL_ITEM_TABLE_ENTRY(pow_block), - BTL_ITEM_TABLE_ENTRY(pebble), - BTL_ITEM_TABLE_ENTRY(volt_shroom), - BTL_ITEM_TABLE_ENTRY(thunder_rage), - BTL_ITEM_TABLE_ENTRY(snowman_doll), - BTL_ITEM_TABLE_ENTRY(mushroom), - BTL_ITEM_TABLE_ENTRY(shooting_star), - BTL_ITEM_TABLE_ENTRY(sleepy_sheep), - BTL_ITEM_TABLE_ENTRY(stone_cap), - BTL_ITEM_TABLE_ENTRY(tasty_tonic), - BTL_ITEM_TABLE_ENTRY(thunder_bolt), - BTL_ITEM_TABLE_ENTRY(mushroom), - BTL_ITEM_TABLE_ENTRY(mushroom), - BTL_ITEM_TABLE_ENTRY(super_soda), - BTL_ITEM_TABLE_ENTRY(hustle_drink), - BTL_ITEM_TABLE_ENTRY(stop_watch), - BTL_ITEM_TABLE_ENTRY(dizzy_dial), - BTL_ITEM_TABLE_ENTRY(please_come_back), - BTL_ITEM_TABLE_ENTRY(egg_missile), - BTL_ITEM_TABLE_ENTRY(insecticide_herb), - BTL_ITEM_TABLE_ENTRY(fright_jar), - BTL_ITEM_TABLE_ENTRY(mystery), - BTL_ITEM_TABLE_ENTRY(repel_gel), - BTL_ITEM_TABLE_ENTRY(life_shroom), - BTL_ITEM_TABLE_ENTRY(coconut), - BTL_ITEM_TABLE_ENTRY(electro_pop), - BTL_ITEM_TABLE_ENTRY(strange_cake), - BTL_ITEM_TABLE_ENTRY(strange_cake), +BattleMoveEntry gBattleItemTable[] = { + BTL_ITEM(food), + BTL_ITEM(mushroom), + BTL_ITEM(fire_flower), + BTL_ITEM(dusty_hammer), + BTL_ITEM(pow_block), + BTL_ITEM(pebble), + BTL_ITEM(volt_shroom), + BTL_ITEM(thunder_rage), + BTL_ITEM(snowman_doll), + BTL_ITEM(mushroom), + BTL_ITEM(shooting_star), + BTL_ITEM(sleepy_sheep), + BTL_ITEM(stone_cap), + BTL_ITEM(tasty_tonic), + BTL_ITEM(thunder_bolt), + BTL_ITEM(mushroom), + BTL_ITEM(mushroom), + BTL_ITEM(super_soda), + BTL_ITEM(hustle_drink), + BTL_ITEM(stop_watch), + BTL_ITEM(dizzy_dial), + BTL_ITEM(please_come_back), + BTL_ITEM(egg_missile), + BTL_ITEM(insecticide_herb), + BTL_ITEM(fright_jar), + BTL_ITEM(mystery), + BTL_ITEM(repel_gel), + BTL_ITEM(life_shroom), + BTL_ITEM(coconut), + BTL_ITEM(electro_pop), + BTL_ITEM(strange_cake), + BTL_ITEM(strange_cake), }; // Offsets into gBattleItemTable? diff --git a/src/battle/use_moves.c b/src/battle/use_moves.c new file mode 100644 index 0000000000..07b751fa65 --- /dev/null +++ b/src/battle/use_moves.c @@ -0,0 +1,115 @@ +#include "common.h" +#include "ld_addrs.h" +#include "battle.h" + +extern EvtScript battle_move_hammer_attack_EVS_UseMove0; +extern EvtScript battle_move_hammer_attack_EVS_UseMove1; +extern EvtScript battle_move_hammer_attack_EVS_UseMove2; +extern EvtScript battle_move_hammer_charge_0_EVS_UseMove0; +extern EvtScript battle_move_hammer_charge_0_EVS_UseMove1; +extern EvtScript battle_move_hammer_charge_1_EVS_UseMove0; +extern EvtScript battle_move_hammer_charge_1_EVS_UseMove1; +extern EvtScript battle_move_hammer_charge_2_EVS_UseMove0; +extern EvtScript battle_move_hammer_charge_2_EVS_UseMove1; +extern EvtScript battle_move_auto_smash_EVS_UseMove; +extern EvtScript battle_move_power_smash_EVS_UseMove; +extern EvtScript battle_move_super_smash_EVS_UseMove; +extern EvtScript battle_move_mega_smash_EVS_UseMove; +extern EvtScript battle_move_quake_hammer_EVS_UseMove0; +extern EvtScript battle_move_power_quake_EVS_UseMove; +extern EvtScript battle_move_mega_quake_EVS_UseMove; +extern EvtScript battle_move_hammer_throw_EVS_UseMove; +extern EvtScript battle_move_d_down_pound_EVS_UseMove; +extern EvtScript battle_move_shrink_smash_EVS_UseMove; +extern EvtScript battle_move_spin_smash_EVS_UseMove; +extern EvtScript battle_move_shell_crack_EVS_UseMove; + +extern EvtScript battle_move_jump_attack_EVS_UseMove0; +extern EvtScript battle_move_jump_attack_EVS_UseMove1; +extern EvtScript battle_move_jump_attack_EVS_UseMove2; +extern EvtScript battle_move_jump_charge_0_EVS_UseMove0; +extern EvtScript battle_move_jump_charge_0_EVS_UseMove1; +extern EvtScript battle_move_jump_charge_1_EVS_UseMove0; +extern EvtScript battle_move_jump_charge_1_EVS_UseMove1; +extern EvtScript battle_move_jump_charge_2_EVS_UseMove0; +extern EvtScript battle_move_jump_charge_2_EVS_UseMove1; +extern EvtScript battle_move_auto_jump_EVS_UseMove; +extern EvtScript battle_move_power_jump_EVS_UseMove; +extern EvtScript battle_move_super_jump_EVS_UseMove; +extern EvtScript battle_move_mega_jump_EVS_UseMove; +extern EvtScript battle_move_auto_multibounce_EVS_UseMove; +extern EvtScript battle_move_multibounce_EVS_UseMove; +extern EvtScript battle_move_power_bounce_EVS_UseMove; +extern EvtScript battle_move_d_down_jump_EVS_UseMove; +extern EvtScript battle_move_sleep_stomp_EVS_UseMove; +extern EvtScript battle_move_dizzy_stomp_EVS_UseMove; +extern EvtScript battle_move_shrink_stomp_EVS_UseMove; +extern EvtScript battle_move_earthquake_jump_EVS_UseMove; + +BattleMoveEntry gMoveScriptTable[] = { + [MOVE_NONE] {}, + [MOVE_UNUSED_01] {}, + [MOVE_UNUSED_02] {}, + [MOVE_HAMMER1] BTL_MOVE(hammer_attack, EVS_UseMove0), + [MOVE_HAMMER2] BTL_MOVE(hammer_attack, EVS_UseMove0), + [MOVE_HAMMER3] BTL_MOVE(hammer_attack, EVS_UseMove0), + [MOVE_UNUSED_HAMMER4] BTL_MOVE(hammer_attack, EVS_UseMove1), + [MOVE_UNUSED_HAMMER5] BTL_MOVE(hammer_attack, EVS_UseMove2), + [MOVE_SPIN_SMASH] BTL_MOVE(spin_smash, EVS_UseMove), + [MOVE_QUAKE_HAMMER] BTL_MOVE(quake_hammer, EVS_UseMove0), + [MOVE_D_DOWN_POUND] BTL_MOVE(d_down_pound, EVS_UseMove), + [MOVE_SMASH_CHARGE0] BTL_MOVE(hammer_charge_0, EVS_UseMove0), + [MOVE_UNUSED_HAMMER_0C] BTL_MOVE(hammer_charge_0, EVS_UseMove1), + [MOVE_HAMMER_THROW] BTL_MOVE(hammer_throw, EVS_UseMove), + [MOVE_MEGA_QUAKE] BTL_MOVE(mega_quake, EVS_UseMove), + [MOVE_SMASH_CHARGE] BTL_MOVE(hammer_charge_1, EVS_UseMove0), + [MOVE_UNUSED_HAMMER_10] BTL_MOVE(hammer_charge_1, EVS_UseMove1), + [MOVE_SUPER_SMASH_CHARGE] BTL_MOVE(hammer_charge_2, EVS_UseMove0), + [MOVE_UNUSED_HAMMER_12] BTL_MOVE(hammer_charge_2, EVS_UseMove1), + [MOVE_AUTO_SMASH] BTL_MOVE(auto_smash, EVS_UseMove), + [MOVE_POWER_QUAKE] BTL_MOVE(power_quake, EVS_UseMove), + [MOVE_POWER_SMASH] BTL_MOVE(power_smash, EVS_UseMove), + [MOVE_SUPER_SMASH] BTL_MOVE(super_smash, EVS_UseMove), + [MOVE_MEGA_SMASH] BTL_MOVE(mega_smash, EVS_UseMove), + [MOVE_SHRINK_SMASH] BTL_MOVE(shrink_smash, EVS_UseMove), + [MOVE_SHELL_CRACK] BTL_MOVE(shell_crack, EVS_UseMove), + [MOVE_JUMP1] BTL_MOVE(jump_attack, EVS_UseMove0), + [MOVE_JUMP2] BTL_MOVE(jump_attack, EVS_UseMove0), + [MOVE_JUMP3] BTL_MOVE(jump_attack, EVS_UseMove0), + [MOVE_UNUSED_JUMP4] BTL_MOVE(jump_attack, EVS_UseMove1), + [MOVE_UNUSED_JUMP5] BTL_MOVE(jump_attack, EVS_UseMove2), + [MOVE_MULTIBOUNCE] BTL_MOVE(multibounce, EVS_UseMove), + [MOVE_POWER_BOUNCE] BTL_MOVE(power_bounce, EVS_UseMove), + [MOVE_SLEEP_STOMP] BTL_MOVE(sleep_stomp, EVS_UseMove), + [MOVE_DIZZY_STOMP] BTL_MOVE(dizzy_stomp, EVS_UseMove), + [MOVE_JUMP_CHARGE0] BTL_MOVE(jump_charge_0, EVS_UseMove0), + [MOVE_UNUSED_24] BTL_MOVE(jump_charge_0, EVS_UseMove1), + [MOVE_JUMP_CHARGE] BTL_MOVE(jump_charge_1, EVS_UseMove0), + [MOVE_UNUSED_26] BTL_MOVE(jump_charge_1, EVS_UseMove1), + [MOVE_SUPER_JUMP_CHARGE] BTL_MOVE(jump_charge_2, EVS_UseMove0), + [MOVE_UNUSED_28] BTL_MOVE(jump_charge_2, EVS_UseMove1), + [MOVE_AUTO_JUMP] BTL_MOVE(auto_jump, EVS_UseMove), + [MOVE_AUTO_MULTIBOUNCE] BTL_MOVE(auto_multibounce, EVS_UseMove), + [MOVE_POWER_JUMP] BTL_MOVE(power_jump, EVS_UseMove), + [MOVE_SUPER_JUMP] BTL_MOVE(super_jump, EVS_UseMove), + [MOVE_MEGA_JUMP] BTL_MOVE(mega_jump, EVS_UseMove), + [MOVE_D_DOWN_JUMP] BTL_MOVE(d_down_jump, EVS_UseMove), + [MOVE_SHRINK_STOMP] BTL_MOVE(shrink_stomp, EVS_UseMove), + [MOVE_EARTHQUAKE_JUMP] BTL_MOVE(earthquake_jump, EVS_UseMove), +}; + +ApiStatus LoadMoveScript(Evt* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleMoveEntry* moveTableEntry = &gMoveScriptTable[battleStatus->selectedMoveID]; + + dma_copy(moveTableEntry->romStart, moveTableEntry->romEnd, moveTableEntry->vramStart); + script->varTablePtr[0] = moveTableEntry->mainScript; + + deduct_current_move_fp(); + + if (gBattleStatus.flags2 & BS_FLAGS2_HAS_RUSH) { + enable_player_blur(); + } + + return ApiStatus_DONE2; +} diff --git a/src/battle/use_star_powers.c b/src/battle/use_star_powers.c new file mode 100644 index 0000000000..0cd450ba63 --- /dev/null +++ b/src/battle/use_star_powers.c @@ -0,0 +1,126 @@ +#include "common.h" +#include "ld_addrs.h" +#include "battle.h" + +#include "sprite/npc/WorldGoombario.h" +#include "sprite/npc/BattleGoombario.h" +#include "sprite/npc/BattleKooper.h" +#include "sprite/npc/BattleBombette.h" +#include "sprite/npc/BattleParakarry.h" +#include "sprite/npc/BattleWatt.h" +#include "sprite/npc/BattleSushie.h" +#include "sprite/npc/BattleLakilester.h" +#include "sprite/npc/BattleBow.h" + +extern EvtScript battle_move_focus_EVS_UsePower; +extern EvtScript battle_move_refresh_EVS_UsePower; +extern EvtScript battle_move_lullaby_EVS_UsePower; +extern EvtScript battle_move_star_storm_EVS_UsePower; +extern EvtScript battle_move_chill_out_EVS_UsePower; +extern EvtScript battle_move_smooch_EVS_UsePower; +extern EvtScript battle_move_time_out_EVS_UsePower; +extern EvtScript battle_move_up_and_away_EVS_UsePower; +extern EvtScript battle_move_star_beam_EVS_UsePower; +extern EvtScript battle_move_peach_beam_EVS_UsePower; +extern EvtScript battle_move_peach_focus_EVS_UsePower; +extern EvtScript battle_move_twink_dash_EVS_UsePower; + +BattleMoveEntry StarPowersTable[] = { + BTL_MOVE(focus, EVS_UsePower), + BTL_MOVE(refresh, EVS_UsePower), + BTL_MOVE(lullaby, EVS_UsePower), + BTL_MOVE(star_storm, EVS_UsePower), + BTL_MOVE(chill_out, EVS_UsePower), + BTL_MOVE(smooch, EVS_UsePower), + BTL_MOVE(time_out, EVS_UsePower), + BTL_MOVE(up_and_away, EVS_UsePower), + BTL_MOVE(star_beam, EVS_UsePower), + BTL_MOVE(peach_beam, EVS_UsePower), + BTL_MOVE(peach_focus, EVS_UsePower), + BTL_MOVE(twink_dash, EVS_UsePower), +}; + +s32 D_8029C890[][5] = { + [PARTNER_NONE] { + ANIM_Mario_GotItem, + ANIM_Mario_AnimPray, + ANIM_Mario_1002A, + ANIM_Mario_Running, + 0, + }, + [PARTNER_GOOMBARIO] { + ANIM_BattleGoombario_Run, + ANIM_BattleGoombario_CloseEyes, + ANIM_BattleGoombario_CloseEyes, + ANIM_BattleGoombario_Run, + ANIM_BattleGoombario_Idle, + }, + [PARTNER_KOOPER] { + ANIM_BattleKooper_Run, + ANIM_BattleKooper_Pray, + ANIM_BattleKooper_Pray, + ANIM_BattleKooper_Run, + ANIM_BattleKooper_Idle, + }, + [PARTNER_BOMBETTE] { + ANIM_BattleBombette_Run, + ANIM_BattleBombette_Sleep, + ANIM_BattleBombette_Sleep, + ANIM_BattleBombette_Run, + ANIM_BattleBombette_Idle, + }, + [PARTNER_PARAKARRY] { + ANIM_BattleParakarry_Run, + ANIM_BattleParakarry_Pray, + ANIM_BattleParakarry_Pray, + ANIM_BattleParakarry_Run, + ANIM_BattleParakarry_Idle, + }, + [PARTNER_GOOMPA] { + // no data + }, + [PARTNER_WATT] { + ANIM_BattleWatt_Run, + ANIM_BattleWatt_Sleep, + ANIM_BattleWatt_Sleep, + ANIM_BattleWatt_Run, + ANIM_BattleParakarry_Idle, // @bug uses wrong sprite! + }, + [PARTNER_SUSHIE] { + ANIM_BattleSushie_Run, + ANIM_BattleSushie_Pray, + ANIM_BattleSushie_Pray, + ANIM_BattleSushie_Run, + ANIM_BattleSushie_Idle, + }, + [PARTNER_LAKILESTER] { + ANIM_BattleLakilester_Run, + ANIM_BattleLakilester_Pray, + ANIM_BattleLakilester_Pray, + ANIM_BattleLakilester_Run, + ANIM_BattleLakilester_Idle, + }, + [PARTNER_BOW] { + ANIM_BattleBow_Run, + ANIM_BattleBow_Pray, + ANIM_BattleBow_Pray, + ANIM_BattleBow_Run, + ANIM_BattleBow_Idle, + }, +}; + +ApiStatus LoadStarPowerScript(Evt* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + PlayerData* playerData = &gPlayerData; + s16 starPowerIdx; + + playerData->specialBarsFilled -= gMoveTable[battleStatus->selectedMoveID].costFP * 256; + starPowerIdx = battleStatus->moveArgument; + dma_copy((&StarPowersTable[starPowerIdx])->romStart, + (&StarPowersTable[starPowerIdx])->romEnd, + (&StarPowersTable[starPowerIdx])->vramStart); + script->varTable[0] = (s32) (&StarPowersTable[starPowerIdx])->mainScript; + return ApiStatus_DONE2; +} + +MATCHING_BSS(0x1390); diff --git a/src/common/UnkBowserFunc1.inc.c b/src/common/UnkBowserFunc1.inc.c index 9661e5e831..72aaadde35 100644 --- a/src/common/UnkBowserFunc1.inc.c +++ b/src/common/UnkBowserFunc1.inc.c @@ -30,7 +30,7 @@ API_CALLABLE(N(UnkBowserFunc1)) { script->functionTemp[0] = 0; for (i = 0; i < 10; i++) { - func_802DE780(part->spriteInstanceID, i, 17, 20, 0, 0, 255, 0); + func_802DE780(part->spriteInstanceID, i, FOLD_TYPE_11, 20, 0, 0, 255, 0); } } @@ -50,7 +50,7 @@ API_CALLABLE(N(UnkBowserFunc1)) { for (j = 0; j < 20; j++) { colorRGBA = sp20[j] << 0x18 | sp38[j] << 0x10 | sp50[j] << 8 | 0xFF; for (i = 0; i < 10; i++) { - func_802DE780(part->spriteInstanceID, i, 12, j, colorRGBA, 0, 255, 0); + func_802DE780(part->spriteInstanceID, i, FOLD_TYPE_C, j, colorRGBA, 0, 255, 0); } } return ApiStatus_BLOCK; @@ -60,7 +60,7 @@ API_CALLABLE(N(UnkBowserFunc1)) { colorRGBA = 255; for (i = 0; i < 10; i++) { // TODO find better match for opacity - func_802DE780(part->spriteInstanceID, i, 12, j, colorRGBA, 0, opacity & 0xFFFF, 0); + func_802DE780(part->spriteInstanceID, i, FOLD_TYPE_C, j, colorRGBA, 0, opacity & 0xFFFF, 0); } } script->functionTemp[1] = 0; diff --git a/src/d0a70_len_4fe0.c b/src/d0a70_len_4fe0.c index aa6a6bf616..e834ea95a7 100644 --- a/src/d0a70_len_4fe0.c +++ b/src/d0a70_len_4fe0.c @@ -8,8 +8,8 @@ typedef struct { /* 0x02 */ u8 renderType; /* 0x03 */ u8 subdivX; /* 0x04 */ u8 subdivY; - /* 0x05 */ s8 unk_05; - /* 0x06 */ s8 unk_06; + /* 0x05 */ s8 savedType1; + /* 0x06 */ s8 savedType2; /* 0x07 */ char unk_07[0x1]; /* 0x08 */ u16 firstVtxIdx; /* 0x0A */ u16 lastVtxIdx; @@ -106,7 +106,7 @@ Vp D_8014EE50 = { u16 D_8014EE60 = 300; -Gfx D_8014EE68[] = { +Gfx DefaultFoldSetupGfx[] = { gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING), gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), @@ -206,16 +206,16 @@ void func_8013A4D0(void) { (*D_80156954)[0].flags |= FOLD_STATE_FLAG_ENABLED; for (i = 1; i < ARRAY_COUNT(*D_80156954); i++) { - if (((*D_80156954)[i].flags & FOLD_STATE_FLAG_ENABLED) && (*D_80156954)[i].unk_05 != 5) { + if (((*D_80156954)[i].flags & FOLD_STATE_FLAG_ENABLED) && (*D_80156954)[i].savedType1 != FOLD_TYPE_5) { fold_clear_state_gfx(&(*D_80156954)[i]); } } for (i = 1; i < ARRAY_COUNT(*D_80156954); i++) { if ((*D_80156954)[i].flags & FOLD_STATE_FLAG_ENABLED && (*D_80156954)[i].buf != NULL) { - s32 temp = (*D_80156954)[i].unk_06; // TODO find a better way to match + s32 temp = (*D_80156954)[i].savedType2; // TODO find a better way to match - if (temp == 11 || (*D_80156954)[i].unk_06 == 12) { + if (temp == FOLD_TYPE_B || (*D_80156954)[i].savedType2 == FOLD_TYPE_C) { continue; } @@ -385,10 +385,10 @@ void fold_init_state(FoldState* state) { s32 j; state->unk_10 = -1; - state->unk_05 = 0; - state->unk_06 = 0; + state->savedType1 = FOLD_TYPE_NONE; + state->savedType2 = FOLD_TYPE_NONE; state->flags = 0; - state->meshType = 0; + state->meshType = FOLD_MESH_TYPE_0; state->renderType = FOLD_RENDER_TYPE_0; state->firstVtxIdx = 0; state->lastVtxIdx = 0; @@ -414,7 +414,7 @@ void fold_init_state(FoldState* state) { } } -void fold_update(u32 idx, FoldType type, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { +void fold_update(u32 idx, FoldType type, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 flags) { FoldState* state = &(*D_80156954)[idx]; s32 oldFlags; s32 t1; @@ -430,28 +430,28 @@ void fold_update(u32 idx, FoldType type, s32 arg2, s32 arg3, s32 arg4, s32 arg5, fold_clear_state_gfx(state); fold_init_state(state); state->flags = oldFlags; - state->unk_05 = 0; - state->unk_06 = 0; - state->meshType = 0; + state->savedType1 = FOLD_TYPE_NONE; + state->savedType2 = FOLD_TYPE_NONE; + state->meshType = FOLD_MESH_TYPE_0; state->renderType = FOLD_RENDER_TYPE_0; state->unk_1C[0][0] = -1; state->unk_1C[1][0] = -1; - state->flags &= FOLD_STATE_FLAG_ENABLED; - if (arg6 != 0) { - state->flags |= arg6; + state->flags &= FOLD_STATE_FLAG_ENABLED; + if (flags != 0) { + state->flags |= flags; } else { - state->flags |= arg6; // required to match + state->flags |= flags; // required to match } return; case FOLD_TYPE_1: - state->unk_05 = 0; + state->savedType1 = FOLD_TYPE_NONE; state->renderType = FOLD_RENDER_TYPE_0; state->unk_1C[0][0] = -1; return; case FOLD_TYPE_2: - state->unk_06 = 0; - state->meshType = 0; + state->savedType2 = FOLD_TYPE_NONE; + state->meshType = FOLD_MESH_TYPE_0; state->unk_1C[1][0] = -1; return; case FOLD_TYPE_11: @@ -463,38 +463,38 @@ void fold_update(u32 idx, FoldType type, s32 arg2, s32 arg3, s32 arg4, s32 arg5, return; case FOLD_TYPE_F: case FOLD_TYPE_10: - if (type == state->unk_06 && arg2 == state->unk_1C[1][0] && arg3 == state->unk_1C[1][1]) { + if (type == state->savedType2 && arg2 == state->unk_1C[1][0] && arg3 == state->unk_1C[1][1]) { return; } break; case FOLD_TYPE_5: - if (state->unk_05 == type && state->unk_1C[0][0] == arg2 && state->unk_1C[0][1] == arg3 && + if (state->savedType1 == type && state->unk_1C[0][0] == arg2 && state->unk_1C[0][1] == arg3 && state->unk_1C[0][2] == arg4) { return; } break; default: - if (type != FOLD_TYPE_D && state->unk_06 == 0xD) { - state->meshType = 0; + if (type != FOLD_TYPE_D && state->savedType2 == FOLD_TYPE_D) { + state->meshType = FOLD_MESH_TYPE_0; state->subdivX = 1; state->subdivY = 1; } break; } - if (type != FOLD_TYPE_5 && state->unk_05 == 5) { - state->unk_05 = 0; + if (type != FOLD_TYPE_5 && state->savedType1 == FOLD_TYPE_5) { + state->savedType1 = FOLD_TYPE_NONE; } if (type == FOLD_TYPE_4 || type == FOLD_TYPE_5) { - state->unk_05 = type; + state->savedType1 = type; state->unk_1C[0][0] = arg2; state->unk_1C[0][1] = arg3; state->unk_1C[0][2] = arg4; state->unk_1C[0][3] = arg5; } else if (type >= FOLD_TYPE_6 && type <= FOLD_TYPE_10) { - state->unk_06 = type; + state->savedType2 = type; state->unk_1C[1][0] = arg2; state->unk_1C[1][1] = arg3; state->unk_1C[1][2] = arg4; @@ -502,24 +502,24 @@ void fold_update(u32 idx, FoldType type, s32 arg2, s32 arg3, s32 arg4, s32 arg5, } state->flags &= FOLD_STATE_FLAG_ENABLED; - if (arg6 != 0) { - state->flags |= arg6; + if (flags != 0) { + state->flags |= flags; } - state->meshType = 0; + state->meshType = FOLD_MESH_TYPE_0; switch (type) { case FOLD_TYPE_3: - state->meshType = 0; + state->meshType = FOLD_MESH_TYPE_0; state->renderType = FOLD_RENDER_TYPE_0; break; case FOLD_TYPE_4: state->subdivX = 4; state->subdivY = 4; - state->meshType = 1; + state->meshType = FOLD_MESH_TYPE_1; func_8013EE48(state); break; case FOLD_TYPE_5: - state->meshType = 2; + state->meshType = FOLD_MESH_TYPE_2; state->renderType = FOLD_RENDER_TYPE_B; state->unk_3C[0][0] = 0.0f; state->unk_3C[0][1] = 0.0f; @@ -556,7 +556,7 @@ void fold_update(u32 idx, FoldType type, s32 arg2, s32 arg3, s32 arg4, s32 arg5, state->buf[arg2 * 4 + 3] = arg3; } while (0); // required to match - state->meshType = 0; + state->meshType = FOLD_MESH_TYPE_0; if ((arg3 & 0xFF) == 0xFF) { state->renderType = FOLD_RENDER_TYPE_6; @@ -575,7 +575,7 @@ void fold_update(u32 idx, FoldType type, s32 arg2, s32 arg3, s32 arg4, s32 arg5, state->buf[arg2 * 4 + 3] = arg3; } while (0); // required to match - state->meshType = 0; + state->meshType = FOLD_MESH_TYPE_0; if ((arg3 & 0xFF) == 0xFF) { state->renderType = FOLD_RENDER_TYPE_9; @@ -592,7 +592,7 @@ void fold_update(u32 idx, FoldType type, s32 arg2, s32 arg3, s32 arg4, s32 arg5, break; case FOLD_TYPE_F: case FOLD_TYPE_10: - state->meshType = 4; + state->meshType = FOLD_MESH_TYPE_4; if (arg3 >= 0xFF) { state->renderType = FOLD_RENDER_TYPE_E; } else { @@ -648,7 +648,7 @@ s32 fold_appendGfx_component(s32 idx, FoldImageRecPart* image, u32 flagBits, Mat if (state->flags & FOLD_STATE_FLAG_1000) { state->unk_1C[0][0] = -1; state->unk_1C[1][0] = -1; - state->unk_05 = 0; + state->savedType1 = FOLD_TYPE_NONE; state->meshType = 0; state->renderType = FOLD_RENDER_TYPE_0; state->flags &= ~(FOLD_STATE_FLAG_1000 | FOLD_STATE_FLAG_800 | FOLD_STATE_FLAG_100 | FOLD_STATE_FLAG_80); @@ -657,9 +657,9 @@ s32 fold_appendGfx_component(s32 idx, FoldImageRecPart* image, u32 flagBits, Mat } else if (state->flags & FOLD_STATE_FLAG_4000) { ret = 2; } else if (state->flags & FOLD_STATE_FLAG_20000) { - state->unk_05 = 0; - state->unk_06 = 0; - state->meshType = 0; + state->savedType1 = FOLD_TYPE_NONE; + state->savedType2 = FOLD_TYPE_NONE; + state->meshType = FOLD_MESH_TYPE_0; state->renderType = FOLD_RENDER_TYPE_0; state->unk_1C[0][0] = -1; state->unk_1C[1][0] = -1; @@ -671,7 +671,7 @@ s32 fold_appendGfx_component(s32 idx, FoldImageRecPart* image, u32 flagBits, Mat void func_8013B0EC(FoldState* state) { switch (state->meshType) { - case 3: + case FOLD_MESH_TYPE_3: if (state->unk_1C[1][2] == 0) { state->subdivX = 1; state->subdivY = 16; @@ -679,27 +679,27 @@ void func_8013B0EC(FoldState* state) { state->subdivX = 1; state->subdivY = 1; } - case 1: + case FOLD_MESH_TYPE_1: func_8013C048(state); break; - case 2: + case FOLD_MESH_TYPE_2: func_8013C3F0(state); break; - case 0: - case 4: + case FOLD_MESH_TYPE_0: + case FOLD_MESH_TYPE_4: func_8013BC88(state); break; default: return; } - if (state->unk_05 == 4) { + if (state->savedType1 == FOLD_TYPE_4) { func_8013EE68(state); } - switch (state->unk_06) { - case 11: - case 12: + switch (state->savedType2) { + case FOLD_TYPE_B: + case FOLD_TYPE_C: func_8013F1F8(state); break; } @@ -713,7 +713,7 @@ void func_8013B1B0(FoldState* state, Matrix4f mtx) { s8 angle2; f32 alphaComp; s32 blendColor; - FoldRenderMode* foldC; + FoldRenderMode* fold; s32 mode1; s32 mode2; s32 t1; @@ -722,8 +722,8 @@ void func_8013B1B0(FoldState* state, Matrix4f mtx) { gDPPipeSync(gMasterGfxPos++); if (!(state->flags & FOLD_STATE_FLAG_10)) { - gSPDisplayList(gMasterGfxPos++, D_8014EE68); - if (state->flags & FOLD_STATE_FLAG_10000) { + gSPDisplayList(gMasterGfxPos++, DefaultFoldSetupGfx); + if (state->flags & FOLD_STATE_FLAG_NO_FILTERING) { gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); } if (state->flags & FOLD_STATE_FLAG_G_CULL_BACK) { @@ -733,11 +733,11 @@ void func_8013B1B0(FoldState* state, Matrix4f mtx) { gSPSetGeometryMode(gMasterGfxPos++, G_CULL_FRONT); } - foldC = &D_8014EE98[state->renderType]; + fold = &D_8014EE98[state->renderType]; - mode1 = foldC->mode1; - mode2 = foldC->mode2; - if (foldC->flags & FOLD_STATE_FLAG_ENABLED) { + mode1 = fold->mode1; + mode2 = fold->mode2; + if (fold->flags & FOLD_STATE_FLAG_ENABLED) { cond = TRUE; } @@ -1183,7 +1183,7 @@ void func_8013C3F0(FoldState* state) { lerpAlpha = (f32) currentFrame / (f32) animationPeriod; for (i = 0; i < descriptor->vtxCount; i++) { - if (state->meshType != 2) { + if (state->meshType != FOLD_MESH_TYPE_2) { return; } @@ -1338,14 +1338,14 @@ void func_8013CFA8(FoldState* state, Matrix4f mtx) { s32 alpha2; if (!(state->flags & FOLD_STATE_FLAG_20)) { - if ((gSpriteShadingProfile->flags & 1) && - (state->arrayIdx != 0) && - (state->flags & someFlags) && - (state->renderType == FOLD_RENDER_TYPE_0 - || state->renderType == FOLD_RENDER_TYPE_2 - || state->renderType == FOLD_RENDER_TYPE_F - || state->renderType == FOLD_RENDER_TYPE_7)) - { + if ((gSpriteShadingProfile->flags & 1) + && (state->arrayIdx != 0) + && (state->flags & someFlags) + && ( state->renderType == FOLD_RENDER_TYPE_0 + || state->renderType == FOLD_RENDER_TYPE_2 + || state->renderType == FOLD_RENDER_TYPE_F + || state->renderType == FOLD_RENDER_TYPE_7) + ) { gDPScrollMultiTile2_4b(gMasterGfxPos++, fold_currentImage->raster, G_IM_FMT_CI, fold_currentImage->width, fold_currentImage->height, // img size @@ -1575,11 +1575,13 @@ void func_8013E2F0(FoldState* state, Matrix4f mtx) { if (!(state->flags & FOLD_STATE_FLAG_20)) { gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); gDPLoadTLUT_pal16(gMasterGfxPos++, 0, fold_currentImage->palette); - if ((gSpriteShadingProfile->flags & 1) && (state->flags & (FOLD_STATE_FLAG_100000 | FOLD_STATE_FLAG_80000)) && - (state->renderType == FOLD_RENDER_TYPE_0 - || state->renderType == FOLD_RENDER_TYPE_2 - || state->renderType == FOLD_RENDER_TYPE_7 - || state->renderType == FOLD_RENDER_TYPE_B)) { + if ((gSpriteShadingProfile->flags & 1) + && (state->flags & (FOLD_STATE_FLAG_100000 | FOLD_STATE_FLAG_80000)) + && (state->renderType == FOLD_RENDER_TYPE_0 + || state->renderType == FOLD_RENDER_TYPE_2 + || state->renderType == FOLD_RENDER_TYPE_7 + || state->renderType == FOLD_RENDER_TYPE_B) + ) { s32 alpha = 255; gDPScrollMultiTile2_4b(gMasterGfxPos++, fold_currentImage->raster, G_IM_FMT_CI, fold_currentImage->width, fold_currentImage->height, diff --git a/src/encounter_api.c b/src/encounter_api.c index 59948f7926..1a798ce005 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -697,8 +697,9 @@ ApiStatus SetSelfEnemyFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* owner = script->owner1.enemy; s32 bits = *args++; - - if (evt_get_variable(script, *args++)) { + s32 mode = evt_get_variable(script, *args++); + + if (mode) { owner->flags |= bits; } else { owner->flags &= ~bits; @@ -744,7 +745,7 @@ ApiStatus SetEnemyFlagBits(Evt* script, s32 isInitialCall) { Enemy* npc = script->owner1.enemy; s32 npcID = evt_get_variable(script, *args++); s32 bits = *args++; - s32 var2 = evt_get_variable(script, *args++); + s32 mode = evt_get_variable(script, *args++); if (npcID == NPC_SELF) { npcID = npc->npcID; @@ -752,7 +753,7 @@ ApiStatus SetEnemyFlagBits(Evt* script, s32 isInitialCall) { npc = get_enemy(npcID); - if (var2) { + if (mode) { npc->flags |= bits; } else { npc->flags &= ~bits; diff --git a/src/entity/Shadow.c b/src/entity/Shadow.c index b0067f84b7..9a3f9406c8 100644 --- a/src/entity/Shadow.c +++ b/src/entity/Shadow.c @@ -8,8 +8,9 @@ void entity_Shadow_init(Shadow* shadow) { } s32 entity_can_collide_with_jumping_player(Entity* entity) { - if ((entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_CEILING) && - (gPlayerStatus.flags & PS_FLAG_JUMPING)) { + if ((entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_CEILING) + && (gPlayerStatus.flags & PS_FLAG_JUMPING) + ) { return TRUE; } return FALSE; diff --git a/src/evt/npc_api.c b/src/evt/npc_api.c index 420cc9f783..02142e8b10 100644 --- a/src/evt/npc_api.c +++ b/src/evt/npc_api.c @@ -605,18 +605,18 @@ ApiStatus NpcFaceNpc(Evt* script, s32 isInitialCall) { ApiStatus SetNpcFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 npcID = evt_get_variable(script, *args++); - s32 flagBits = *args++; - s32 enable = evt_get_variable(script, *args++); + s32 bits = *args++; + s32 mode = evt_get_variable(script, *args++); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { return ApiStatus_DONE2; } - if (enable) { - npc->flags |= flagBits; + if (mode) { + npc->flags |= bits; } else { - npc->flags &= ~flagBits; + npc->flags &= ~bits; } return ApiStatus_DONE2; @@ -979,7 +979,7 @@ ApiStatus func_802CFD30(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - func_8003D624(npc, foldType, var2, var3, var4, var5, npc->unk_A2); + func_8003D624(npc, foldType, var2, var3, var4, var5, npc->foldArg5); return ApiStatus_DONE2; } @@ -993,7 +993,7 @@ ApiStatus func_802CFE2C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - npc->unk_A2 = arg1; + npc->foldArg5 = arg1; return ApiStatus_DONE2; } diff --git a/src/evt/player_api.c b/src/evt/player_api.c index 5f9294347d..71cc0876a8 100644 --- a/src/evt/player_api.c +++ b/src/evt/player_api.c @@ -440,9 +440,9 @@ ApiStatus SetPlayerFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; PlayerStatus* playerStatus = &gPlayerStatus; Bytecode bits = *args++; - Bytecode a1 = *args; + Bytecode mode = evt_get_variable(script, *args++); - if (evt_get_variable(script, a1)) { + if (mode) { playerStatus->flags |= bits; } else { playerStatus->flags &= ~bits; diff --git a/src/evt/virtual_entity.c b/src/evt/virtual_entity.c index 0577d06a3f..36640430bf 100644 --- a/src/evt/virtual_entity.c +++ b/src/evt/virtual_entity.c @@ -474,14 +474,14 @@ ApiStatus SetVirtualEntityFlags(Evt* script, s32 isInitialCall) { ApiStatus SetVirtualEntityFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 index = evt_get_variable(script, *args++); - s32 flags = *args++; + s32 bits = *args++; s32 mode = evt_get_variable(script, *args++); VirtualEntity* virtualEntity = (*gCurrentVirtualEntityListPtr)[index]; if (mode) { - set_entity_model_flags(virtualEntity->entityModelIndex, flags); + set_entity_model_flags(virtualEntity->entityModelIndex, bits); } else { - clear_entity_model_flags(virtualEntity->entityModelIndex, flags); + clear_entity_model_flags(virtualEntity->entityModelIndex, bits); } return ApiStatus_DONE2; diff --git a/src/hud_element.c b/src/hud_element.c index 772078e226..63cc0be36d 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -1512,9 +1512,9 @@ void render_hud_element(HudElement* hudElement) { } } else { if (hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT) { - fold_update(transform->foldIdx, 7, 255, 255, 255, hudElement->opacity, 0); + fold_update(transform->foldIdx, FOLD_TYPE_7, 255, 255, 255, hudElement->opacity, 0); } else { - fold_update(transform->foldIdx, 0, 0, 0, 0, 0, 0); + fold_update(transform->foldIdx, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); } } diff --git a/src/i_spy.c b/src/i_spy.c index 07f76c95c8..999d279ee8 100644 --- a/src/i_spy.c +++ b/src/i_spy.c @@ -1,16 +1,23 @@ #include "common.h" -typedef struct struct802B7C78 { +typedef struct ISoyData { /* 0x00 */ Vec3f pos; /* 0x0C */ f32 scale; /* 0x10 */ s32 unk_10; /* 0x14 */ s32 unk_14; - /* 0x18 */ s32 unk_18; + /* 0x18 */ s32 time; /* 0x1C */ s32 unk_1C; - /* 0x20 */ s32 unk_20; - /* 0x24 */ s32 unk_24; - /* 0x28 */ s32 unk_28; -} struct802B7C78; + /* 0x20 */ s32 flashCount; + /* 0x24 */ s32 state; + /* 0x28 */ s32 alpha; +} ISoyData; + +enum { + I_SPY_DELAY = 0, + I_SPY_1 = 1, + I_SPY_2 = 2, + I_SPY_FADE_OUT = 3, +}; #include "i_spy.png.h" #include "i_spy.png.inc.c" @@ -19,9 +26,9 @@ typedef struct struct802B7C78 { #include "i_spy.flash.pal.inc.c" #include "i_spy_dlist.gfx.inc.c" -BSS struct802B7C78 D_802B7CB0; +BSS ISoyData D_802B7CB0; -struct802B7C78* D_802B7C78_E23228 = &D_802B7CB0; +ISoyData* D_802B7C78_E23228 = &D_802B7CB0; extern void (*ISpyNotificationCallback)(void); @@ -44,11 +51,11 @@ void func_802B7000_E225B0(void) { gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], 3); gSPDisplayList(gMasterGfxPos++, D_802B7C00_E231B0); - if (D_802B7C78_E23228->unk_18 < 47) { - D_802B7C78_E23228->unk_20 += 1; + if (D_802B7C78_E23228->time < 47) { + D_802B7C78_E23228->flashCount++; } - temp = D_802B7C78_E23228->unk_20; + temp = D_802B7C78_E23228->flashCount; temp = temp - (temp / 12) * 12; switch (temp) { case 0: @@ -70,7 +77,7 @@ void func_802B7000_E225B0(void) { foldImage.palette = D_802B7BE0_E23190; break; } - fold_update(0, FOLD_TYPE_7, 0xFF, 0xFF, 0xFF, D_802B7C78_E23228->unk_28, 0); + fold_update(0, FOLD_TYPE_7, 255, 255, 255, D_802B7C78_E23228->alpha, 0); foldImage.raster = D_802B7580_E22B30; foldImage.width = 56; @@ -84,7 +91,6 @@ void func_802B7000_E225B0(void) { } } - void func_802B72C0_E22870(void) { mem_clear(D_802B7C78_E23228, sizeof(*D_802B7C78_E23228)); @@ -92,7 +98,7 @@ void func_802B72C0_E22870(void) { D_802B7C78_E23228->pos.y = gPlayerStatus.position.y + gPlayerStatus.colliderHeight + 8.0f; D_802B7C78_E23228->pos.z = gPlayerStatus.position.z; - D_802B7C78_E23228->unk_28 = 0xFF; + D_802B7C78_E23228->alpha = 255; gPlayerStatus.animFlags |= PA_FLAG_100; ISpyNotificationCallback = &func_802B735C_E2290C; @@ -108,8 +114,8 @@ void func_802B735C_E2290C(void) { D_802B7C78_E23228->pos.x = playerStatus->position.x; D_802B7C78_E23228->pos.z = playerStatus->position.z; - switch (D_802B7C78_E23228->unk_24) { - case 0: + switch (D_802B7C78_E23228->state) { + case I_SPY_DELAY: if (partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE && partnerActionStatus->actingPartner == PARTNER_LAKILESTER) { @@ -119,36 +125,36 @@ void func_802B735C_E2290C(void) { } if (!cond) { - D_802B7C78_E23228->unk_24++; + D_802B7C78_E23228->state++; } break; - case 1: + case I_SPY_1: if (playerStatus->flags & PS_FLAG_PAUSED) { - D_802B7C78_E23228->unk_24 = 3; + D_802B7C78_E23228->state = I_SPY_FADE_OUT; return; } - if (D_802B7C78_E23228->unk_18++ >= 16) { + if (D_802B7C78_E23228->time++ >= 16) { D_802B7C78_E23228->scale = 0.36f; - D_802B7C78_E23228->unk_24++; + D_802B7C78_E23228->state++; } break; - case 2: + case I_SPY_2: D_802B7C78_E23228->scale = 0.57f; - D_802B7C78_E23228->unk_24++; + D_802B7C78_E23228->state++; sfx_play_sound_at_player(SOUND_17B, SOUND_SPACE_MODE_0); break; - case 3: + case I_SPY_FADE_OUT: D_802B7C78_E23228->scale = 0.53f; - if (D_802B7C78_E23228->unk_18 >= 47 || playerStatus->flags & PS_FLAG_PAUSED) { - D_802B7C78_E23228->unk_28 -= 64; - if (D_802B7C78_E23228->unk_28 < 0) { - D_802B7C78_E23228->unk_28 = 0; - D_802B7C78_E23228->unk_18 = 51; + if (D_802B7C78_E23228->time >= 47 || playerStatus->flags & PS_FLAG_PAUSED) { + D_802B7C78_E23228->alpha -= 64; + if (D_802B7C78_E23228->alpha < 0) { + D_802B7C78_E23228->alpha = 0; + D_802B7C78_E23228->time = 51; } } - if (D_802B7C78_E23228->unk_18++ > 50) { + if (D_802B7C78_E23228->time++ > 50) { gCurrentHiddenPanels.activateISpy = FALSE; ISpyNotificationCallback = NULL; playerStatus->animFlags &= ~PA_FLAG_100; diff --git a/src/move_script.c b/src/move_script.c deleted file mode 100644 index 494346f9d7..0000000000 --- a/src/move_script.c +++ /dev/null @@ -1,125 +0,0 @@ -#include "common.h" -#include "ld_addrs.h" - -typedef struct BattleTableEntry { - /* 0x00 */ u8* romStart; - /* 0x04 */ u8* romEnd; - /* 0x08 */ u8* vramStart; - /* 0x0C */ EvtScript* mainScript; -} BattleTableEntry; // size = 0x10 - -extern EvtScript battle_move_hammer_802A3044; -extern EvtScript battle_move_hammer_802A369C; -extern EvtScript battle_move_hammer_802A3B28; -extern EvtScript battle_move_spin_smash_main; -extern EvtScript battle_move_quake_hammer_main; -extern EvtScript battle_move_d_down_pound_main; -extern EvtScript battle_move_hammer_charge_0_802A38C4; -extern EvtScript battle_move_hammer_charge_0_802A3234; -extern EvtScript battle_move_hammer_throw_main; -extern EvtScript battle_move_mega_quake_main; -extern EvtScript battle_move_hammer_charge_1_802A3944; -extern EvtScript battle_move_hammer_charge_1_802A32B4; -extern EvtScript battle_move_hammer_charge_2_802A3944; -extern EvtScript battle_move_hammer_charge_2_802A32B4; -extern EvtScript battle_move_auto_smash_main; -extern EvtScript battle_move_power_quake_main; -extern EvtScript battle_move_power_smash_main; -extern EvtScript battle_move_super_smash_main; -extern EvtScript battle_move_mega_smash_main; -extern EvtScript battle_move_shrink_smash_main; -extern EvtScript battle_move_shell_crack_main; -extern EvtScript battle_move_jump_802A2650; -extern EvtScript battle_move_jump_802A30F4; -extern EvtScript battle_move_jump_802A3644; -extern EvtScript battle_move_multibounce_main; -extern EvtScript battle_move_power_bounce_main; -extern EvtScript battle_move_sleep_stomp_main; -extern EvtScript battle_move_dizzy_stomp_main; -extern EvtScript battle_move_jump_charge_0_802A2800; -extern EvtScript battle_move_jump_charge_0_802A27F0; -extern EvtScript battle_move_jump_charge_1_802A2880; -extern EvtScript battle_move_jump_charge_1_802A2870; -extern EvtScript battle_move_jump_charge_2_802A2880; -extern EvtScript battle_move_jump_charge_2_802A2870; -extern EvtScript battle_move_auto_jump_main; -extern EvtScript battle_move_auto_multibounce_main; -extern EvtScript battle_move_power_jump_main; -extern EvtScript battle_move_super_jump_main; -extern EvtScript battle_move_mega_jump_main; -extern EvtScript battle_move_d_down_jump_main; -extern EvtScript battle_move_shrink_stomp_main; -extern EvtScript battle_move_earthquake_jump_main; -extern EvtScript battle_move_auto_smash_UseMove; - -// Some moves seem to have multiple entry point methods, in which case the _SCR macro is used -#define BTL_MOVE_TABLE_ENTRY(name) { battle_move_##name##_ROM_START, battle_move_##name##_ROM_END, battle_move_##name##_VRAM, &battle_move_##name##_main } -#define BTL_MOVE_TABLE_ENTRY_SCR(name, script) { battle_move_##name##_ROM_START, battle_move_##name##_ROM_END, battle_move_##name##_VRAM, &script } - -BattleTableEntry gMoveScriptTable[] = { - { NULL, NULL, NULL, NULL }, - { NULL, NULL, NULL, NULL }, - { NULL, NULL, NULL, NULL }, - BTL_MOVE_TABLE_ENTRY_SCR(hammer, battle_move_hammer_802A3044), - BTL_MOVE_TABLE_ENTRY_SCR(hammer, battle_move_hammer_802A3044), - BTL_MOVE_TABLE_ENTRY_SCR(hammer, battle_move_hammer_802A3044), - BTL_MOVE_TABLE_ENTRY_SCR(hammer, battle_move_hammer_802A369C), - BTL_MOVE_TABLE_ENTRY_SCR(hammer, battle_move_hammer_802A3B28), - BTL_MOVE_TABLE_ENTRY(spin_smash), - BTL_MOVE_TABLE_ENTRY(quake_hammer), - BTL_MOVE_TABLE_ENTRY(d_down_pound), - BTL_MOVE_TABLE_ENTRY_SCR(hammer_charge_0, battle_move_hammer_charge_0_802A38C4), - BTL_MOVE_TABLE_ENTRY_SCR(hammer_charge_0, battle_move_hammer_charge_0_802A3234), - BTL_MOVE_TABLE_ENTRY(hammer_throw), - BTL_MOVE_TABLE_ENTRY(mega_quake), - BTL_MOVE_TABLE_ENTRY_SCR(hammer_charge_1, battle_move_hammer_charge_1_802A3944), - BTL_MOVE_TABLE_ENTRY_SCR(hammer_charge_1, battle_move_hammer_charge_1_802A32B4), - BTL_MOVE_TABLE_ENTRY_SCR(hammer_charge_2, battle_move_hammer_charge_2_802A3944), - BTL_MOVE_TABLE_ENTRY_SCR(hammer_charge_2, battle_move_hammer_charge_2_802A32B4), - BTL_MOVE_TABLE_ENTRY_SCR(auto_smash, battle_move_auto_smash_UseMove), - BTL_MOVE_TABLE_ENTRY(power_quake), - BTL_MOVE_TABLE_ENTRY(power_smash), - BTL_MOVE_TABLE_ENTRY(super_smash), - BTL_MOVE_TABLE_ENTRY(mega_smash), - BTL_MOVE_TABLE_ENTRY(shrink_smash), - BTL_MOVE_TABLE_ENTRY(shell_crack), - BTL_MOVE_TABLE_ENTRY_SCR(jump, battle_move_jump_802A2650), - BTL_MOVE_TABLE_ENTRY_SCR(jump, battle_move_jump_802A2650), - BTL_MOVE_TABLE_ENTRY_SCR(jump, battle_move_jump_802A2650), - BTL_MOVE_TABLE_ENTRY_SCR(jump, battle_move_jump_802A30F4), - BTL_MOVE_TABLE_ENTRY_SCR(jump, battle_move_jump_802A3644), - BTL_MOVE_TABLE_ENTRY(multibounce), - BTL_MOVE_TABLE_ENTRY(power_bounce), - BTL_MOVE_TABLE_ENTRY(sleep_stomp), - BTL_MOVE_TABLE_ENTRY(dizzy_stomp), - BTL_MOVE_TABLE_ENTRY_SCR(jump_charge_0, battle_move_jump_charge_0_802A2800), - BTL_MOVE_TABLE_ENTRY_SCR(jump_charge_0, battle_move_jump_charge_0_802A27F0), - BTL_MOVE_TABLE_ENTRY_SCR(jump_charge_1, battle_move_jump_charge_1_802A2880), - BTL_MOVE_TABLE_ENTRY_SCR(jump_charge_1, battle_move_jump_charge_1_802A2870), - BTL_MOVE_TABLE_ENTRY_SCR(jump_charge_2, battle_move_jump_charge_2_802A2880), - BTL_MOVE_TABLE_ENTRY_SCR(jump_charge_2, battle_move_jump_charge_2_802A2870), - BTL_MOVE_TABLE_ENTRY(auto_jump), - BTL_MOVE_TABLE_ENTRY(auto_multibounce), - BTL_MOVE_TABLE_ENTRY(power_jump), - BTL_MOVE_TABLE_ENTRY(super_jump), - BTL_MOVE_TABLE_ENTRY(mega_jump), - BTL_MOVE_TABLE_ENTRY(d_down_jump), - BTL_MOVE_TABLE_ENTRY(shrink_stomp), - BTL_MOVE_TABLE_ENTRY(earthquake_jump), -}; - -ApiStatus LoadMoveScript(Evt* script, s32 isInitialCall) { - BattleStatus* battleStatus = &gBattleStatus; - BattleTableEntry* moveTableEntry = &gMoveScriptTable[battleStatus->selectedMoveID]; - - dma_copy(moveTableEntry->romStart, moveTableEntry->romEnd, moveTableEntry->vramStart); - script->varTablePtr[0] = moveTableEntry->mainScript; - - deduct_current_move_fp(); - - if (gBattleStatus.flags2 & BS_FLAGS2_HAS_RUSH) { - enable_player_blur(); - } - - return ApiStatus_DONE2; -} diff --git a/src/msg.c b/src/msg.c index 5ea61d50af..b0d1a88b05 100644 --- a/src/msg.c +++ b/src/msg.c @@ -1488,12 +1488,12 @@ void set_message_msg(s32 msgID, s32 index) { msgVars = gMessageMsgVars[index]; while (TRUE) { msgVars[i] = ((u8*)msgID)[i]; - if (((u8*)msgID)[i] == 0xFD) { + if (((u8*)msgID)[i] == MSG_CHAR_READ_END) { break; } if (++i >= 32) { - msgVars[i - 1] = 0xFD; + msgVars[i - 1] = MSG_CHAR_READ_END; break; } } @@ -1516,7 +1516,7 @@ void set_message_value(s32 value, s32 index) { if (thisChar == 0) { break; } - gMessageMsgVars[index][i] = thisChar - 0x20; + gMessageMsgVars[index][i] = thisChar - '0' + MSG_CHAR_DIGIT_0; } gMessageMsgVars[index][i] = MSG_CHAR_READ_END; } diff --git a/src/npc.c b/src/npc.c index d66c706056..633b15b797 100644 --- a/src/npc.c +++ b/src/npc.c @@ -142,8 +142,8 @@ s32 create_npc_impl(NpcBlueprint* blueprint, AnimID* animList, s32 isPeachNpc) { npc->currentAnim = blueprint->initialAnim; npc->animationSpeed = 1.0f; npc->renderYaw = 0.0f; - npc->unk_98 = 0; - npc->unk_A2 = 0; + npc->foldType = 0; + npc->foldArg5 = 0; npc->collisionChannel = COLLISION_CHANNEL_20000; npc->isFacingAway = 0; npc->yawCamOffset = 0; @@ -1060,7 +1060,7 @@ void appendGfx_npc_blur(void* data) { x = blur->x[index]; y = blur->y[index]; z = blur->z[index]; - func_802DE894(npc->spriteInstanceID, 7, 255, 255, 255, 120 - (var_s5 * 20), 0); + func_802DE894(npc->spriteInstanceID, FOLD_TYPE_7, 255, 255, 255, 120 - (var_s5 * 20), 0); yaw = npc->renderYaw; guTranslateF(sp20, x, y, z); @@ -1840,7 +1840,7 @@ void npc_update_decoration_charged(Npc* npc, s32 idx) { s32 temp3; if (!npc->decorationInitialised[idx]) { - func_802DE894(npc->spriteInstanceID, 17, 20, 0, 0, 255, 0); + func_802DE894(npc->spriteInstanceID, FOLD_TYPE_11, 20, 0, 0, 255, 0); npc->decorationInitialised[idx] = TRUE; } if (npc->decorationInitialised[idx] == TRUE) { @@ -1856,7 +1856,7 @@ void npc_update_decoration_charged(Npc* npc, s32 idx) { } for (temp3 = 255, i = 0; i < 20; i++) { - func_802DE894(npc->spriteInstanceID, 12, i, (sp50[i] << 24) | (sp38[i] << 16) | (sp20[i] << 8) | temp3, 0, 255, 0); + func_802DE894(npc->spriteInstanceID, FOLD_TYPE_C, i, (sp50[i] << 24) | (sp38[i] << 16) | (sp20[i] << 8) | temp3, 0, 255, 0); } } } @@ -1984,7 +1984,7 @@ s32 npc_get_collider_below(Npc* npc) { x = npc->pos.x; z = npc->pos.z; - if (npc_raycast_down_sides(0x38000, &x, &y, &z, &yaw)) { + if (npc_raycast_down_sides(COLLISION_CHANNEL_8000 | COLLISION_CHANNEL_10000 | COLLISION_CHANNEL_20000, &x, &y, &z, &yaw)) { if (yaw <= 16.0f) { return D_8010C978; } @@ -1993,12 +1993,12 @@ s32 npc_get_collider_below(Npc* npc) { } void func_8003D3BC(Npc* npc) { - s32 foldType = npc->unk_98; - s32 foldArg1 = npc->unk_9A; - s32 foldArg2 = npc->unk_9C; - s32 foldArg3 = npc->unk_9E; - s32 foldArg4 = npc->unk_A0; - s32 foldArg5 = npc->unk_A2; + s32 foldType = npc->foldType; + s32 foldArg1 = npc->foldArg1; + s32 foldArg2 = npc->foldArg2; + s32 foldArg3 = npc->foldArg3; + s32 foldArg4 = npc->foldArg4; + s32 foldArg5 = npc->foldArg5; func_802DE894(npc->spriteInstanceID, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); @@ -2062,12 +2062,12 @@ void func_8003D3BC(Npc* npc) { } void func_8003D624(Npc* npc, s32 foldType, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { - npc->unk_98 = foldType; - npc->unk_9A = arg2; - npc->unk_9C = arg3; - npc->unk_9E = arg4; - npc->unk_A0 = arg5; - npc->unk_A2 = arg6; + npc->foldType = foldType; + npc->foldArg1 = arg2; + npc->foldArg2 = arg3; + npc->foldArg3 = arg4; + npc->foldArg4 = arg5; + npc->foldArg5 = arg6; func_8003D3BC(npc); } diff --git a/src/pause/pause_main.c b/src/pause/pause_main.c index cf23072bae..68b3db1ada 100644 --- a/src/pause/pause_main.c +++ b/src/pause/pause_main.c @@ -546,7 +546,7 @@ void pause_tutorial_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid guMtxCatF(matrix2ptr, matrix1, matrix1); guMtxF2L(matrix1, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - func_802DE894(gPauseTutorialSprites[i], 6, 255, 255, 255, 255, 64); + func_802DE894(gPauseTutorialSprites[i], FOLD_TYPE_6, 255, 255, 255, 255, 64); spr_draw_npc_sprite(gPauseTutorialSprites[i], 0, 0, 0, matrix1); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/pause/pause_partners.c b/src/pause/pause_partners.c index 05ad370518..8252a97232 100644 --- a/src/pause/pause_partners.c +++ b/src/pause/pause_partners.c @@ -245,7 +245,7 @@ void pause_partners_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid s32 x1, y1, x2, y2; f32 currentPos, angle, scale; f32 offsetX, offsetY, offsetZ; - s32 a2; + s32 color; s8 currentTab; s32 portraitScrollPos; s32 portraitScrollIndex; @@ -296,11 +296,11 @@ void pause_partners_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid guMtxCatF(matrix2, matrix, matrix); if (offsetZ > 8.0f) { - a2 = 160; + color = 160; } else { - a2 = 255.0f - offsetZ * 95.0f * 0.125f; + color = 255.0f - offsetZ * 95.0f * 0.125f; } - func_802DE894(gPausePartnersSpriteIDs[gPausePartnersPartnerIdx[index]], 6, a2, a2, a2, 0xFF, 0x40); + func_802DE894(gPausePartnersSpriteIDs[gPausePartnersPartnerIdx[index]], FOLD_TYPE_6, color, color, color, 255, 0x40); spr_draw_npc_sprite(gPausePartnersSpriteIDs[gPausePartnersPartnerIdx[index]], 0, 0, NULL, matrix); } diff --git a/src/pause/pause_spirits.c b/src/pause/pause_spirits.c index eb160e025a..58de2d123f 100644 --- a/src/pause/pause_spirits.c +++ b/src/pause/pause_spirits.c @@ -147,8 +147,8 @@ void pause_spirits_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 widt Matrix4f matrix1; Matrix4f matrix2; s32 i, j; - s32 s0; - s32 s1; + s32 color; + s32 alpha; s32 index; f32 x, y; f32 offsetY; @@ -184,19 +184,19 @@ void pause_spirits_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 widt y = gPauseSpiritsPositions[index].y; if (playerData->maxStarPower < index + 1) { - s0 = 0; - s1 = 0x80; + color = 0; + alpha = 128; offsetY = 0.0f; } else { - s0 = 0xFF; - s1 = 0xFF; + color = 255; + alpha = 255; offsetY = sin_deg(index * index * index + frameCounter * 0.4321 + frameCounter * (index * 0.02 + 0.1324)) * 5.0f * sin_deg(index * 0.25 + frameCounter + frameCounter * (0.0432 - index * 0.01)); } - func_802DE894(gPauseSpiritsSpriteIDs[gPauseSpiritsIndexes[index]], 8, s0, s0, s0, s1, 0x40); + func_802DE894(gPauseSpiritsSpriteIDs[gPauseSpiritsIndexes[index]], FOLD_TYPE_8, color, color, color, alpha, 0x40); guTranslateF(matrix1, baseX + 22 + x, baseY + 77 + y + offsetY, 0.0f); guRotateF(matrix2, 180.0f, 0.0f, 0.0f, 1.0f); guMtxCatF(matrix2, matrix1, matrix1); diff --git a/src/trigger.c b/src/trigger.c index 90c0b05405..d338454694 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -282,10 +282,11 @@ s32 should_collider_allow_interact(s32 colliderID) { for (i = 0; i < ARRAY_COUNT(*gCurrentTriggerListPtr); i++) { Trigger* trigger = (*gCurrentTriggerListPtr)[i]; - if (trigger != NULL && - trigger->hasPlayerInteractPrompt != 0 && - trigger->location.colliderID == colliderID && - trigger->flags.flags & TRIGGER_WALL_PRESS_A) { + if (trigger != NULL + && trigger->hasPlayerInteractPrompt != 0 + && trigger->location.colliderID == colliderID + && trigger->flags.flags & TRIGGER_WALL_PRESS_A + ) { return TRUE; } } diff --git a/src/world/area_dro/dro_01/dro_01.h b/src/world/area_dro/dro_01/dro_01.h index 37dcf100c1..8eaeb36e43 100644 --- a/src/world/area_dro/dro_01/dro_01.h +++ b/src/world/area_dro/dro_01/dro_01.h @@ -27,9 +27,9 @@ enum { NPC_Dryite_04 = 4, NPC_ArtistToad = 5, NPC_Mouser_ShopOwner = 6, - NPC_ThreeSisters_01 = 7, - NPC_ThreeSisters_02 = 8, - NPC_ThreeSisters_03 = 9, + NPC_Toadette_01 = 7, + NPC_Toadette_02 = 8, + NPC_Toadette_03 = 9, NPC_ChuckQuizmo = 10, NPC_Dryite_05 = 11, NPC_Dryite_06 = 12, diff --git a/src/world/area_dro/dro_01/dro_01_3_npc.c b/src/world/area_dro/dro_01/dro_01_3_npc.c index ceebb98069..0ea8ea43c1 100644 --- a/src/world/area_dro/dro_01/dro_01_3_npc.c +++ b/src/world/area_dro/dro_01/dro_01_3_npc.c @@ -126,16 +126,16 @@ EvtScript N(EVS_NpcInit_Dryite_02) = { #include "npc_composer.c" #include "npc_shop_owner.c" -EvtScript N(EVS_NpcInteract_ThreeSisters) = { - EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_01, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_008E) - EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_02, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_008F) - EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_03, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_0090) +EvtScript N(EVS_NpcInteract_Toadette) = { + EVT_CALL(SpeakToPlayer, NPC_Toadette_01, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_008E) + EVT_CALL(SpeakToPlayer, NPC_Toadette_02, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_008F) + EVT_CALL(SpeakToPlayer, NPC_Toadette_03, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_0090) EVT_RETURN EVT_END }; -EvtScript N(EVS_NpcInit_ThreeSisters) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ThreeSisters))) +EvtScript N(EVS_NpcInit_Toadette) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toadette))) EVT_RETURN EVT_END }; @@ -377,10 +377,10 @@ NpcData N(PassiveNPCs)[] = { NpcData N(ThreeSisterNPCs)[] = { { - .id = NPC_ThreeSisters_01, + .id = NPC_Toadette_01, .pos = { -141.0f, 0.0f, -18.0f }, .yaw = 62, - .init = &N(EVS_NpcInit_ThreeSisters), + .init = &N(EVS_NpcInit_Toadette), .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = NO_DROPS, @@ -388,10 +388,10 @@ NpcData N(ThreeSisterNPCs)[] = { .tattle = MSG_NpcTattle_TravelingMaidA, }, { - .id = NPC_ThreeSisters_02, + .id = NPC_Toadette_02, .pos = { -124.0f, 0.0f, -61.0f }, .yaw = 63, - .init = &N(EVS_NpcInit_ThreeSisters), + .init = &N(EVS_NpcInit_Toadette), .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = NO_DROPS, @@ -399,10 +399,10 @@ NpcData N(ThreeSisterNPCs)[] = { .tattle = MSG_NpcTattle_TravelingMaidB, }, { - .id = NPC_ThreeSisters_03, + .id = NPC_Toadette_03, .pos = { -80.0f, 0.0f, -35.0f }, .yaw = 244, - .init = &N(EVS_NpcInit_ThreeSisters), + .init = &N(EVS_NpcInit_Toadette), .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = NO_DROPS, diff --git a/src/world/area_end/common/Credits.inc.c b/src/world/area_end/common/Credits.inc.c index 8a17698eac..436376c06d 100644 --- a/src/world/area_end/common/Credits.inc.c +++ b/src/world/area_end/common/Credits.inc.c @@ -127,7 +127,7 @@ void N(CharAnim_FadeIn_0)(CreditsLine* line, CreditsChar* chr) { foldImg.xOffset = -(glyphPtr->charWidth * 0.5); foldImg.yOffset = 0; foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); + fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } @@ -172,7 +172,7 @@ void N(CharAnim_FadeIn_1)(CreditsLine* line, CreditsChar* chr) { foldImg.xOffset = -(glyphPtr->charWidth * 0.5); foldImg.yOffset = 0; foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); + fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } @@ -259,7 +259,7 @@ void N(CharAnim_FadeIn_3)(CreditsLine* line, CreditsChar* chr) { foldImg.xOffset = -(glyphPtr->charWidth * 0.5); foldImg.yOffset = 0; foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); + fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } @@ -285,7 +285,7 @@ void N(CharAnim_FadeIn_4)(CreditsLine* line, CreditsChar* chr) { if (chr->fadeInTime == line->appearTime) { fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); - foldFlags |= FOLD_STATE_FLAG_10000; + foldFlags |= FOLD_STATE_FLAG_NO_FILTERING; } else { f32 alpha = update_lerp(EASING_LINEAR, 16.0f, 300.0f, chr->fadeInTime, line->appearTime); if (alpha > 255.0f) { @@ -355,7 +355,7 @@ void N(CharAnim_HoldClearFold)(CreditsLine* line, CreditsChar* chr) { foldImg.xOffset = -(glyphPtr->charWidth * 0.5); foldImg.yOffset = 0; foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); + fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } @@ -400,7 +400,7 @@ void N(CharAnim_FadeOut_0)(CreditsLine* line, CreditsChar* chr) { foldImg.xOffset = -(glyphPtr->charWidth * 0.5); foldImg.yOffset = 0; foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); + fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } @@ -470,7 +470,7 @@ void N(CharAnim_FadeOut_2)(CreditsLine* line, CreditsChar* chr) { foldImg.xOffset = -(glyphPtr->charWidth * 0.5); foldImg.yOffset = 0; foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); + fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_NO_FILTERING | FOLD_STATE_FLAG_40, transformMtx); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/world/area_hos/hos_05/hos_05_5_intro.c b/src/world/area_hos/hos_05/hos_05_5_intro.c index 1133874606..b39c73d5f5 100644 --- a/src/world/area_hos/hos_05/hos_05_5_intro.c +++ b/src/world/area_hos/hos_05/hos_05_5_intro.c @@ -1083,7 +1083,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_END_IF EVT_CALL(N(SetCardCaptureState1)) EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Panic) - EVT_CALL(func_802CFD30, NPC_Klevar, 0, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Klevar, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_2, TRUE) EVT_CALL(func_802D7B10, ArrayVar(13)) EVT_END_THREAD @@ -1111,7 +1111,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_END_IF EVT_CALL(N(SetCardCaptureState1)) EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_IdleSad) - EVT_CALL(func_802CFD30, NPC_Skolar, 0, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Skolar, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_2, TRUE) EVT_CALL(func_802D7B10, ArrayVar(10)) EVT_END_THREAD @@ -1139,7 +1139,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_END_IF EVT_CALL(N(SetCardCaptureState1)) EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Panic) - EVT_CALL(func_802CFD30, NPC_Muskular, 0, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Muskular, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_2, TRUE) EVT_CALL(func_802D7B10, ArrayVar(11)) EVT_END_THREAD @@ -1167,7 +1167,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_END_IF EVT_CALL(N(SetCardCaptureState1)) EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Panic) - EVT_CALL(func_802CFD30, NPC_Kalmar, 0, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Kalmar, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_2, TRUE) EVT_CALL(func_802D7B10, ArrayVar(14)) EVT_END_THREAD @@ -1195,7 +1195,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_END_IF EVT_CALL(N(SetCardCaptureState1)) EVT_CALL(SetNpcAnimation, NPC_Misstar, ANIM_WorldMisstar_Panic) - EVT_CALL(func_802CFD30, NPC_Misstar, 0, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Misstar, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_2, TRUE) EVT_CALL(func_802D7B10, ArrayVar(12)) EVT_END_THREAD @@ -1223,7 +1223,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_END_IF EVT_CALL(N(SetCardCaptureState1)) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Panic) - EVT_CALL(func_802CFD30, NPC_Mamar, 0, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Mamar, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_2, TRUE) EVT_CALL(func_802D7B10, ArrayVar(9)) EVT_END_THREAD @@ -2407,7 +2407,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_END_IF EVT_CALL(N(SetCardCaptureState1)) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Panic) - EVT_CALL(func_802CFD30, NPC_Eldstar, 0, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Eldstar, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_2, TRUE) EVT_CALL(func_802D7B10, ArrayVar(8)) EVT_END_THREAD diff --git a/src/world/area_isk/isk_02/isk_02_5_npc.c b/src/world/area_isk/isk_02/isk_02_5_npc.c index 32a945f7df..efa9405b00 100644 --- a/src/world/area_isk/isk_02/isk_02_5_npc.c +++ b/src/world/area_isk/isk_02/isk_02_5_npc.c @@ -150,8 +150,8 @@ NpcData N(NpcData_Pokey_03) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Pokey_01), BTL_ISK_PART_1_FORMATION_00, BTL_ISK_PART_1_STAGE_05), - NPC_GROUP(N(NpcData_Pokey_02), BTL_ISK_PART_1_FORMATION_00, BTL_ISK_PART_1_STAGE_05), - NPC_GROUP(N(NpcData_Pokey_03), BTL_ISK_PART_1_FORMATION_01, BTL_ISK_PART_1_STAGE_05), + NPC_GROUP(N(NpcData_Pokey_01), BTL_ISK_1_FORMATION_00, BTL_ISK_1_STAGE_05), + NPC_GROUP(N(NpcData_Pokey_02), BTL_ISK_1_FORMATION_00, BTL_ISK_1_STAGE_05), + NPC_GROUP(N(NpcData_Pokey_03), BTL_ISK_1_FORMATION_01, BTL_ISK_1_STAGE_05), {} }; diff --git a/src/world/area_isk/isk_04/isk_04_5_npc.c b/src/world/area_isk/isk_04/isk_04_5_npc.c index b5f91a7696..76359bc7bc 100644 --- a/src/world/area_isk/isk_04/isk_04_5_npc.c +++ b/src/world/area_isk/isk_04/isk_04_5_npc.c @@ -47,7 +47,7 @@ NpcData N(NpcData_BuzzyBeetle_02) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_BuzzyBeetle_01), BTL_ISK_PART_1_FORMATION_09, BTL_ISK_PART_1_STAGE_03), - NPC_GROUP(N(NpcData_BuzzyBeetle_02), BTL_ISK_PART_1_FORMATION_09, BTL_ISK_PART_1_STAGE_03), + NPC_GROUP(N(NpcData_BuzzyBeetle_01), BTL_ISK_1_FORMATION_09, BTL_ISK_1_STAGE_03), + NPC_GROUP(N(NpcData_BuzzyBeetle_02), BTL_ISK_1_FORMATION_09, BTL_ISK_1_STAGE_03), {} }; diff --git a/src/world/area_isk/isk_05/isk_05_3_npc.c b/src/world/area_isk/isk_05/isk_05_3_npc.c index 2b027e8d9b..1a2b6f031e 100644 --- a/src/world/area_isk/isk_05/isk_05_3_npc.c +++ b/src/world/area_isk/isk_05/isk_05_3_npc.c @@ -218,7 +218,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_WAIT(1) EVT_CALL(N(DestroyAmbushWorker)) - EVT_CALL(func_802CFD30, NPC_SELF, 0, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_StoneChomp))) EVT_RETURN @@ -293,6 +293,6 @@ NpcData N(NpcData_StoneChomp) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_StoneChomp), BTL_ISK_PART_1_FORMATION_07, BTL_ISK_PART_1_STAGE_09), + NPC_GROUP(N(NpcData_StoneChomp), BTL_ISK_1_FORMATION_07, BTL_ISK_1_STAGE_09), {} }; diff --git a/src/world/area_isk/isk_07/isk_07_3_npc.c b/src/world/area_isk/isk_07/isk_07_3_npc.c index 68d6caaef7..3b7160fc9d 100644 --- a/src/world/area_isk/isk_07/isk_07_3_npc.c +++ b/src/world/area_isk/isk_07/isk_07_3_npc.c @@ -242,8 +242,8 @@ NpcData N(NpcData_Pokey_03) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Pokey_01), BTL_ISK_PART_1_FORMATION_00, BTL_ISK_PART_1_STAGE_0C), - NPC_GROUP(N(NpcData_Pokey_02), BTL_ISK_PART_1_FORMATION_02, BTL_ISK_PART_1_STAGE_0C), - NPC_GROUP(N(NpcData_Pokey_03), BTL_ISK_PART_1_FORMATION_03, BTL_ISK_PART_1_STAGE_0C), + NPC_GROUP(N(NpcData_Pokey_01), BTL_ISK_1_FORMATION_00, BTL_ISK_1_STAGE_0C), + NPC_GROUP(N(NpcData_Pokey_02), BTL_ISK_1_FORMATION_02, BTL_ISK_1_STAGE_0C), + NPC_GROUP(N(NpcData_Pokey_03), BTL_ISK_1_FORMATION_03, BTL_ISK_1_STAGE_0C), {} }; diff --git a/src/world/area_isk/isk_08/isk_08_2_npc.c b/src/world/area_isk/isk_08/isk_08_2_npc.c index 732e61efb3..fa3e27d492 100644 --- a/src/world/area_isk/isk_08/isk_08_2_npc.c +++ b/src/world/area_isk/isk_08/isk_08_2_npc.c @@ -26,6 +26,6 @@ NpcData N(NpcData_BuzzyBeetle) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_BuzzyBeetle), BTL_ISK_PART_1_FORMATION_0A, BTL_ISK_PART_1_STAGE_03), + NPC_GROUP(N(NpcData_BuzzyBeetle), BTL_ISK_1_FORMATION_0A, BTL_ISK_1_STAGE_03), {} }; diff --git a/src/world/area_isk/isk_13/isk_13_3_npc.c b/src/world/area_isk/isk_13/isk_13_3_npc.c index a55c2aed26..9e96b69bae 100644 --- a/src/world/area_isk/isk_13/isk_13_3_npc.c +++ b/src/world/area_isk/isk_13/isk_13_3_npc.c @@ -268,7 +268,7 @@ EvtScript N(EVS_NpcDefeat_StoneChomp_Override) = { EVT_SET(GF_ISK13_Defeated_StoneChomp, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) - EVT_CALL(func_802CFD30, NPC_SELF, 0, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(N(DestroyAmbushWorker)) EVT_CALL(GetBattleOutcome, LVar0) EVT_SWITCH(LVar0) @@ -321,6 +321,6 @@ NpcData N(NpcData_StoneChomp) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_StoneChomp), BTL_ISK_PART_1_FORMATION_07, BTL_ISK_PART_1_STAGE_0A), + NPC_GROUP(N(NpcData_StoneChomp), BTL_ISK_1_FORMATION_07, BTL_ISK_1_STAGE_0A), {} }; diff --git a/src/world/area_isk/isk_14/isk_14_3_npc.c b/src/world/area_isk/isk_14/isk_14_3_npc.c index ef2f6d5b5e..3dd6dfeb11 100644 --- a/src/world/area_isk/isk_14/isk_14_3_npc.c +++ b/src/world/area_isk/isk_14/isk_14_3_npc.c @@ -165,7 +165,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_WAIT(1) EVT_CALL(N(DestroyAmbushWorker)) - EVT_CALL(func_802CFD30, NPC_SELF, 0, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_4 | ENEMY_FLAG_100000, 0) EVT_WAIT(3) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -241,6 +241,6 @@ NpcData N(NpcData_StoneChomp) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_StoneChomp), BTL_ISK_PART_1_FORMATION_07, BTL_ISK_PART_1_STAGE_0B), + NPC_GROUP(N(NpcData_StoneChomp), BTL_ISK_1_FORMATION_07, BTL_ISK_1_STAGE_0B), {} }; diff --git a/src/world/area_isk/isk_16/isk_16_2_npc.c b/src/world/area_isk/isk_16/isk_16_2_npc.c index 23575d15e8..787044f76d 100644 --- a/src/world/area_isk/isk_16/isk_16_2_npc.c +++ b/src/world/area_isk/isk_16/isk_16_2_npc.c @@ -150,7 +150,7 @@ NpcData N(NpcData_ChainChomp) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Tutankoopa), BTL_ISK_PART_2_FORMATION_00, BTL_ISK_PART_2_STAGE_01), + NPC_GROUP(N(NpcData_Tutankoopa), BTL_ISK_2_FORMATION_00, BTL_ISK_2_STAGE_01), NPC_GROUP(N(NpcData_ChainChomp)), {} }; diff --git a/src/world/area_isk/isk_18/isk_18_2_npc.c b/src/world/area_isk/isk_18/isk_18_2_npc.c index 9a69c090af..0e36350102 100644 --- a/src/world/area_isk/isk_18/isk_18_2_npc.c +++ b/src/world/area_isk/isk_18/isk_18_2_npc.c @@ -19,7 +19,7 @@ NpcData N(NpcData_BuzzyBeetle_01) = { } }, .initVarCount = 1, - .initVar = { .value = BTL_ISK_PART_1_FORMATION_0E }, + .initVar = { .value = BTL_ISK_1_FORMATION_0E }, .settings = &N(NpcSettings_BuzzyBeetle_Ceiling), .flags = ENEMY_FLAG_400, .drops = ISK_BUZZY_BEETLE_DROPS, @@ -43,7 +43,7 @@ NpcData N(NpcData_BuzzyBeetle_02) = { } }, .initVarCount = 1, - .initVar = { .value = BTL_ISK_PART_1_FORMATION_0B }, + .initVar = { .value = BTL_ISK_1_FORMATION_0B }, .settings = &N(NpcSettings_BuzzyBeetle_Ceiling), .flags = ENEMY_FLAG_400, .drops = ISK_BUZZY_BEETLE_DROPS, @@ -73,8 +73,8 @@ NpcData N(NpcData_BuzzyBeetle_03) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_BuzzyBeetle_01), BTL_ISK_PART_1_FORMATION_0F, BTL_ISK_PART_1_STAGE_08), - NPC_GROUP(N(NpcData_BuzzyBeetle_02), BTL_ISK_PART_1_FORMATION_13, BTL_ISK_PART_1_STAGE_08), - NPC_GROUP(N(NpcData_BuzzyBeetle_03), BTL_ISK_PART_1_FORMATION_0C, BTL_ISK_PART_1_STAGE_08), + NPC_GROUP(N(NpcData_BuzzyBeetle_01), BTL_ISK_1_FORMATION_0F, BTL_ISK_1_STAGE_08), + NPC_GROUP(N(NpcData_BuzzyBeetle_02), BTL_ISK_1_FORMATION_13, BTL_ISK_1_STAGE_08), + NPC_GROUP(N(NpcData_BuzzyBeetle_03), BTL_ISK_1_FORMATION_0C, BTL_ISK_1_STAGE_08), {} }; diff --git a/src/world/area_iwa/iwa_10/iwa_10.h b/src/world/area_iwa/iwa_10/iwa_10.h index fdd8043069..5e566c4b10 100644 --- a/src/world/area_iwa/iwa_10/iwa_10.h +++ b/src/world/area_iwa/iwa_10/iwa_10.h @@ -13,15 +13,15 @@ #include "sprite/npc/WorldParakarry.h" enum { - NPC_TrainToad_01 = 0, - NPC_TrainToad_02 = 1, - NPC_Dryite = 2, - NPC_ThreeSisters_01 = 3, - NPC_Parakarry = 4, - NPC_Toad = 5, - NPC_ThreeSisters_02 = 6, - NPC_ThreeSisters_03 = 7, - NPC_ThreeSisters_04 = 8, + NPC_TrainToad_01 = 0, + NPC_TrainToad_02 = 1, + NPC_Dryite = 2, + NPC_Toadette_01 = 3, + NPC_Parakarry = 4, + NPC_Toad = 5, + NPC_Toadette_02 = 6, + NPC_Toadette_03 = 7, + NPC_Toadette_04 = 8, }; enum { diff --git a/src/world/area_iwa/iwa_10/iwa_10_3_npc.c b/src/world/area_iwa/iwa_10/iwa_10_3_npc.c index 33ae38ffd5..5ac729688d 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_3_npc.c +++ b/src/world/area_iwa/iwa_10/iwa_10_3_npc.c @@ -58,16 +58,16 @@ EvtScript N(EVS_NpcInit_Toad) = { EVT_END }; -EvtScript N(EVS_NpcInteract_ThreeSisters_02) = { - EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_02, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_000B) - EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_03, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_000C) - EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_04, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_000D) +EvtScript N(EVS_NpcInteract_Toadette_02) = { + EVT_CALL(SpeakToPlayer, NPC_Toadette_02, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_000B) + EVT_CALL(SpeakToPlayer, NPC_Toadette_03, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_000C) + EVT_CALL(SpeakToPlayer, NPC_Toadette_04, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, MSG_CH2_000D) EVT_RETURN EVT_END }; -EvtScript N(EVS_NpcInit_ThreeSisters_02) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ThreeSisters_02))) +EvtScript N(EVS_NpcInit_Toadette_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toadette_02))) EVT_IF_LT(GB_StoryProgress, STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST) EVT_CALL(RemoveNpc, NPC_SELF) EVT_RETURN @@ -105,7 +105,7 @@ EvtScript N(EVS_NpcInit_Dryite) = { EVT_END }; -EvtScript N(EVS_NpcInteract_ThreeSisters_01) = { +EvtScript N(EVS_NpcInteract_Toadette_01) = { EVT_IF_LT(GB_IWA00_Whacka_HitCount, 8) EVT_SET(LVar0, MSG_CH2_0009) EVT_ELSE @@ -116,8 +116,8 @@ EvtScript N(EVS_NpcInteract_ThreeSisters_01) = { EVT_END }; -EvtScript N(EVS_NpcInit_ThreeSisters_01) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ThreeSisters_01))) +EvtScript N(EVS_NpcInit_Toadette_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toadette_01))) EVT_RETURN EVT_END }; @@ -158,12 +158,12 @@ NpcData N(NpcData_Toad) = { .tattle = MSG_NpcTattle_IWA_TravelAgent, }; -NpcData N(NpcData_ThreeSisters)[] = { +NpcData N(NpcData_Toadette)[] = { { - .id = NPC_ThreeSisters_02, + .id = NPC_Toadette_02, .pos = { -562.0f, 0.0f, 384.0f }, .yaw = 90, - .init = &N(EVS_NpcInit_ThreeSisters_02), + .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .drops = NO_DROPS, @@ -171,10 +171,10 @@ NpcData N(NpcData_ThreeSisters)[] = { .tattle = MSG_NpcTattle_TravelingMaidA, }, { - .id = NPC_ThreeSisters_03, + .id = NPC_Toadette_03, .pos = { -582.0f, 0.0f, 406.0f }, .yaw = 90, - .init = &N(EVS_NpcInit_ThreeSisters_02), + .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .drops = NO_DROPS, @@ -182,10 +182,10 @@ NpcData N(NpcData_ThreeSisters)[] = { .tattle = MSG_NpcTattle_TravelingMaidB, }, { - .id = NPC_ThreeSisters_04, + .id = NPC_Toadette_04, .pos = { -524.0f, 0.0f, 411.0f }, .yaw = 270, - .init = &N(EVS_NpcInit_ThreeSisters_02), + .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .drops = NO_DROPS, @@ -207,10 +207,10 @@ NpcData N(NpcData_Dryite)[] = { .tattle = MSG_NpcTattle_IWA_StationLoiterer, }, { - .id = NPC_ThreeSisters_01, + .id = NPC_Toadette_01, .pos = { -760.0f, 0.0f, 160.0f }, .yaw = 90, - .init = &N(EVS_NpcInit_ThreeSisters_01), + .init = &N(EVS_NpcInit_Toadette_01), .settings = &N(NpcSettings_Toad_Stationary), .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .drops = NO_DROPS, @@ -222,7 +222,7 @@ NpcData N(NpcData_Dryite)[] = { NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_TrainToad)), NPC_GROUP(N(NpcData_Toad)), - NPC_GROUP(N(NpcData_ThreeSisters)), + NPC_GROUP(N(NpcData_Toadette)), NPC_GROUP(N(NpcData_Dryite)), NPC_GROUP(N(NpcData_Parakarry)), {} diff --git a/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c b/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c index 0bf2fc91ff..26d4094206 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c +++ b/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c @@ -109,7 +109,7 @@ EvtScript N(EVS_NpcInit_Twink) = { }; EvtScript N(EVS_NpcInit_Eldstar) = { - EVT_CALL(func_802CFD30, 8, 7, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Eldstar, FOLD_TYPE_7, 0, 0, 0, 0) EVT_CALL(EnableNpcShadow, NPC_Eldstar, FALSE) EVT_CALL(SetNpcPos, NPC_Eldstar, 100, 45, 0) EVT_RETURN @@ -117,7 +117,7 @@ EvtScript N(EVS_NpcInit_Eldstar) = { }; EvtScript N(EVS_NpcInit_Mamar) = { - EVT_CALL(func_802CFD30, 9, 7, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Mamar, FOLD_TYPE_7, 0, 0, 0, 0) EVT_CALL(EnableNpcShadow, NPC_Mamar, FALSE) EVT_CALL(SetNpcPos, NPC_Mamar, 46, 45, -27) EVT_RETURN @@ -125,7 +125,7 @@ EvtScript N(EVS_NpcInit_Mamar) = { }; EvtScript N(EVS_NpcInit_Skolar) = { - EVT_CALL(func_802CFD30, 10, 7, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Skolar, FOLD_TYPE_7, 0, 0, 0, 0) EVT_CALL(EnableNpcShadow, NPC_Skolar, FALSE) EVT_CALL(SetNpcPos, NPC_Skolar, 33, 45, -95) EVT_RETURN @@ -133,7 +133,7 @@ EvtScript N(EVS_NpcInit_Skolar) = { }; EvtScript N(EVS_NpcInit_Muskular) = { - EVT_CALL(func_802CFD30, 11, 7, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Muskular, FOLD_TYPE_7, 0, 0, 0, 0) EVT_CALL(EnableNpcShadow, NPC_Muskular, FALSE) EVT_CALL(SetNpcPos, NPC_Muskular, 71, 45, -132) EVT_RETURN @@ -141,7 +141,7 @@ EvtScript N(EVS_NpcInit_Muskular) = { }; EvtScript N(EVS_NpcInit_Misstar) = { - EVT_CALL(func_802CFD30, 12, 7, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Misstar, FOLD_TYPE_7, 0, 0, 0, 0) EVT_CALL(EnableNpcShadow, NPC_Misstar, FALSE) EVT_CALL(SetNpcPos, NPC_Misstar, 131, 45, -132) EVT_RETURN @@ -149,7 +149,7 @@ EvtScript N(EVS_NpcInit_Misstar) = { }; EvtScript N(EVS_NpcInit_Klevar) = { - EVT_CALL(func_802CFD30, 13, 7, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Klevar, FOLD_TYPE_7, 0, 0, 0, 0) EVT_CALL(EnableNpcShadow, NPC_Klevar, FALSE) EVT_CALL(SetNpcPos, NPC_Klevar, 169, 45, -95) EVT_RETURN @@ -157,7 +157,7 @@ EvtScript N(EVS_NpcInit_Klevar) = { }; EvtScript N(EVS_NpcInit_Kalmar) = { - EVT_CALL(func_802CFD30, 14, 7, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Kalmar, FOLD_TYPE_7, 0, 0, 0, 0) EVT_CALL(EnableNpcShadow, NPC_Kalmar, FALSE) EVT_CALL(SetNpcPos, NPC_Kalmar, 156, 45, -27) EVT_RETURN diff --git a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c index cc643ac143..b40507d010 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c +++ b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c @@ -200,7 +200,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_SETF(LVar0, 0) EVT_LOOP(20) EVT_ADDF(LVar0, EVT_FLOAT(12.0)) - EVT_CALL(func_802CFD30, 8, 7, LVar0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Eldstar, FOLD_TYPE_7, LVar0, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) diff --git a/src/world/area_kmr/kmr_00/kmr_00_4_npc.c b/src/world/area_kmr/kmr_00/kmr_00_4_npc.c index 356e6b304e..a2066a604b 100644 --- a/src/world/area_kmr/kmr_00/kmr_00_4_npc.c +++ b/src/world/area_kmr/kmr_00/kmr_00_4_npc.c @@ -75,12 +75,12 @@ EvtScript N(EVS_NpcAux_StarSpirit) = { EVT_LABEL(1) EVT_LOOP(50) EVT_ADDF(LVar0, EVT_FLOAT(0.8)) - EVT_CALL(func_802CFD30, NPC_SELF, 13, 0, ArrayVar(0), MV_Unk_01, LVar0) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_D, 0, ArrayVar(0), MV_Unk_01, LVar0) EVT_WAIT(1) EVT_END_LOOP EVT_LOOP(50) EVT_ADDF(LVar0, EVT_FLOAT(-0.8)) - EVT_CALL(func_802CFD30, NPC_SELF, 13, 0, ArrayVar(0), MV_Unk_01, LVar0) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_D, 0, ArrayVar(0), MV_Unk_01, LVar0) EVT_WAIT(1) EVT_END_LOOP EVT_GOTO(1) diff --git a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c index 45c4732dc2..c02e736007 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c +++ b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c @@ -1727,11 +1727,11 @@ EvtScript N(EVS_NpcAI_Eldstar_02) = { EVT_SETF(LVar0, EVT_FLOAT(100.0)) EVT_LABEL(1) EVT_LOOP(50) - EVT_CALL(func_802CFD30, NPC_SELF, 13, 0, ArrayVar(0), 0, MV_Unk_01) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_D, 0, ArrayVar(0), 0, MV_Unk_01) EVT_WAIT(1) EVT_END_LOOP EVT_LOOP(50) - EVT_CALL(func_802CFD30, NPC_SELF, 13, 0, ArrayVar(0), 0, MV_Unk_01) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_D, 0, ArrayVar(0), 0, MV_Unk_01) EVT_WAIT(1) EVT_END_LOOP EVT_GOTO(1) diff --git a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c index f527f75a82..995a628220 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c +++ b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c @@ -240,7 +240,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(GetNpcPos, NPC_Goombaria, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Goombaria, LVar0, LVar1, LVar2, 25) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LookUp) - EVT_CALL(func_802CFD30, NPC_Goombaria, 0, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Goombaria, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_END_THREAD EVT_CALL(func_802CFE2C, NPC_Goompapa, 0x100) EVT_CALL(func_802CFD30, NPC_Goompapa, FOLD_TYPE_5, 0, 1, 1, 0) @@ -249,7 +249,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(GetNpcPos, NPC_Goompapa, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Goompapa, LVar0, LVar1, LVar2, 25) EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_LookUp) - EVT_CALL(func_802CFD30, NPC_Goompapa, 0, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Goompapa, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13) EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) diff --git a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c index c2db05d489..9e2a302436 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c +++ b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c @@ -193,6 +193,6 @@ NpcData N(NpcData_GoombaFamily) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_GoombaFamily), BTL_KMR_PART_1_FORMATION_02), + NPC_GROUP(N(NpcData_GoombaFamily), BTL_KMR_1_FORMATION_02), {} }; diff --git a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c index 2cfbbb643f..5952002cf8 100644 --- a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c +++ b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c @@ -297,7 +297,7 @@ NpcData N(NpcData_GoombaFamily) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_JrTroopa), BTL_KMR_PART_3_FORMATION_02), + NPC_GROUP(N(NpcData_JrTroopa), BTL_KMR_3_FORMATION_02), NPC_GROUP(N(NpcData_GoombaFamily)), {} }; diff --git a/src/world/area_kmr/kmr_05/kmr_05_3_npc.c b/src/world/area_kmr/kmr_05/kmr_05_3_npc.c index f54372a6cc..4f9a75cb91 100644 --- a/src/world/area_kmr/kmr_05/kmr_05_3_npc.c +++ b/src/world/area_kmr/kmr_05/kmr_05_3_npc.c @@ -170,17 +170,17 @@ NpcData N(NpcData_Paragoomba) = { }; NpcGroupList N(NpcsBefore) = { - NPC_GROUP(N(NpcData_Goomba_01), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_03), - NPC_GROUP(N(NpcData_Goomba_02), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_03), - NPC_GROUP(N(NpcData_SpikedGoomba), BTL_KMR_PART_3_FORMATION_00, BTL_KMR_PART_3_STAGE_03), - NPC_GROUP(N(NpcData_Paragoomba), BTL_KMR_PART_3_FORMATION_01, BTL_KMR_PART_3_STAGE_03), + NPC_GROUP(N(NpcData_Goomba_01), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_03), + NPC_GROUP(N(NpcData_Goomba_02), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_03), + NPC_GROUP(N(NpcData_SpikedGoomba), BTL_KMR_3_FORMATION_00, BTL_KMR_3_STAGE_03), + NPC_GROUP(N(NpcData_Paragoomba), BTL_KMR_3_FORMATION_01, BTL_KMR_3_STAGE_03), {} }; NpcGroupList N(NpcsAfter) = { - NPC_GROUP(N(NpcData_Goomba_01), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_03), - NPC_GROUP(N(NpcData_Goomba_02), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_03), - NPC_GROUP(N(NpcData_SpikedGoomba), BTL_KMR_PART_1_FORMATION_0A, BTL_KMR_PART_1_STAGE_03), - NPC_GROUP(N(NpcData_Paragoomba), BTL_KMR_PART_1_FORMATION_08, BTL_KMR_PART_1_STAGE_03), + NPC_GROUP(N(NpcData_Goomba_01), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_03), + NPC_GROUP(N(NpcData_Goomba_02), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_03), + NPC_GROUP(N(NpcData_SpikedGoomba), BTL_KMR_1_FORMATION_0A, BTL_KMR_1_STAGE_03), + NPC_GROUP(N(NpcData_Paragoomba), BTL_KMR_1_FORMATION_08, BTL_KMR_1_STAGE_03), {} }; diff --git a/src/world/area_kmr/kmr_06/kmr_06_3_npc.c b/src/world/area_kmr/kmr_06/kmr_06_3_npc.c index bdb91faed4..d66cfbfe67 100644 --- a/src/world/area_kmr/kmr_06/kmr_06_3_npc.c +++ b/src/world/area_kmr/kmr_06/kmr_06_3_npc.c @@ -48,7 +48,7 @@ NpcData N(NpcData_Paragoomba) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_SpikedGoomba), BTL_KMR_PART_1_FORMATION_0B, BTL_KMR_PART_1_STAGE_02), - NPC_GROUP(N(NpcData_Paragoomba), BTL_KMR_PART_1_FORMATION_09, BTL_KMR_PART_1_STAGE_02), + NPC_GROUP(N(NpcData_SpikedGoomba), BTL_KMR_1_FORMATION_0B, BTL_KMR_1_STAGE_02), + NPC_GROUP(N(NpcData_Paragoomba), BTL_KMR_1_FORMATION_09, BTL_KMR_1_STAGE_02), {} }; diff --git a/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c b/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c index 979c21ab11..bfb8ad3f25 100644 --- a/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c +++ b/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c @@ -52,7 +52,7 @@ void N(appendGfx_sticker)(void* renderData) { if (sticker->yaw != 0.0 || sticker->pitch != 0.0) { foldFlags |= FOLD_STATE_FLAG_2000; } - fold_update(0, 0, 0, 0, 0, 0, 0); + fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); fold_appendGfx_component(0, &foldImage, foldFlags, mtxTransform); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); diff --git a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c b/src/world/area_kmr/kmr_07/kmr_07_3_npc.c index d11b033eef..2f7c5d17c4 100644 --- a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c +++ b/src/world/area_kmr/kmr_07/kmr_07_3_npc.c @@ -254,6 +254,6 @@ NpcData N(NpcData_GoombaBros_Red)[] = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_GoombaBros_Red), BTL_KMR_PART_2_FORMATION_00, BTL_KMR_PART_2_STAGE_01), + NPC_GROUP(N(NpcData_GoombaBros_Red), BTL_KMR_2_FORMATION_00, BTL_KMR_2_STAGE_01), {} }; diff --git a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c index b0fa1edb9e..0757314ff3 100644 --- a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c +++ b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c @@ -88,10 +88,10 @@ EvtScript N(EVS_NpcIdle_Goomba_Ambush) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_F8, SOUND_SPACE_MODE_0) - EVT_CALL(func_802CFE2C, NPC_SELF, 0x00002000) + EVT_CALL(func_802CFE2C, NPC_SELF, 0x2000) EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_5, 6, 1, 1, 0) EVT_WAIT(15) - EVT_CALL(func_802CFE2C, NPC_SELF, 0x00002000) + EVT_CALL(func_802CFE2C, NPC_SELF, 0x2000) EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_3, 0, 0, 0, 0) EVT_THREAD EVT_WAIT(2) @@ -173,9 +173,9 @@ NpcData N(NpcData_Paragoomba) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Goomba_01), BTL_KMR_PART_1_FORMATION_01, BTL_KMR_PART_1_STAGE_02), - NPC_GROUP(N(NpcData_Goomba_02), BTL_KMR_PART_1_FORMATION_01, BTL_KMR_PART_1_STAGE_02), - NPC_GROUP(N(NpcData_Goomba_Ambush), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_02), - NPC_GROUP(N(NpcData_Paragoomba), BTL_KMR_PART_1_FORMATION_08, BTL_KMR_PART_1_STAGE_02), + NPC_GROUP(N(NpcData_Goomba_01), BTL_KMR_1_FORMATION_01, BTL_KMR_1_STAGE_02), + NPC_GROUP(N(NpcData_Goomba_02), BTL_KMR_1_FORMATION_01, BTL_KMR_1_STAGE_02), + NPC_GROUP(N(NpcData_Goomba_Ambush), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_02), + NPC_GROUP(N(NpcData_Paragoomba), BTL_KMR_1_FORMATION_08, BTL_KMR_1_STAGE_02), {} }; diff --git a/src/world/area_kmr/kmr_11/kmr_11_4_npc.c b/src/world/area_kmr/kmr_11/kmr_11_4_npc.c index 8f030b608b..0be0d19c43 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_4_npc.c +++ b/src/world/area_kmr/kmr_11/kmr_11_4_npc.c @@ -423,7 +423,7 @@ NpcData N(NpcData_Kammy) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Enemies), BTL_KMR_PART_2_FORMATION_01), + NPC_GROUP(N(NpcData_Enemies), BTL_KMR_2_FORMATION_01), NPC_GROUP(N(NpcData_Kammy)), {} }; diff --git a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c index c18e9e66f4..53ceebbc69 100644 --- a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c +++ b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c @@ -62,7 +62,7 @@ EvtScript N(EVS_NpcIdle_Goomba) = { EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goomba_Idle) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_F8, SOUND_SPACE_MODE_0) - EVT_CALL(func_802CFE2C, NPC_SELF, 0x00002000) + EVT_CALL(func_802CFE2C, NPC_SELF, 0x2000) EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_5, 6, 1, 1, 0) EVT_WAIT(12) EVT_WAIT(5) @@ -111,6 +111,6 @@ NpcData N(NpcData_Goomba) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Goomba), BTL_KMR_PART_1_FORMATION_01, BTL_KMR_PART_1_STAGE_02), + NPC_GROUP(N(NpcData_Goomba), BTL_KMR_1_FORMATION_01, BTL_KMR_1_STAGE_02), {} }; diff --git a/src/world/area_kmr/kmr_22/npc/chapter_1.inc.c b/src/world/area_kmr/kmr_22/npc/chapter_1.inc.c index 05f5672750..1642e5cbea 100644 --- a/src/world/area_kmr/kmr_22/npc/chapter_1.inc.c +++ b/src/world/area_kmr/kmr_22/npc/chapter_1.inc.c @@ -1,13 +1,13 @@ EvtScript N(EVS_NpcInit_Eldstar) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldEldstar_Still) - EVT_CALL(func_802CFD30, NPC_SELF, 8, 0, 0, 0, 128) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_8, 0, 0, 0, 128) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_KoopaBros) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim1B) - EVT_CALL(func_802CFD30, NPC_SELF, 14, 80, 80, 80, 0) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_22/npc/chapter_7.inc.c b/src/world/area_kmr/kmr_22/npc/chapter_7.inc.c index 453e17b84e..19a3434e41 100644 --- a/src/world/area_kmr/kmr_22/npc/chapter_7.inc.c +++ b/src/world/area_kmr/kmr_22/npc/chapter_7.inc.c @@ -1,34 +1,34 @@ EvtScript N(EVS_NpcInit_Kalmar) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldKalmar_Still) - EVT_CALL(func_802CFD30, NPC_SELF, 8, 0, 0, 0, 128) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_8, 0, 0, 0, 128) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_CrystalKing) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_CrystalKing_Anim09) - EVT_CALL(func_802CFD30, NPC_SELF, 14, 80, 80, 80, 0) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_IceCube) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_CrystalKing_Anim0A) - EVT_CALL(func_802CFD30, NPC_SELF, 14, 80, 80, 80, 0) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_IceSphere) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_CrystalKing_Anim0B) - EVT_CALL(func_802CFD30, NPC_SELF, 14, 80, 80, 80, 0) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_IceSpike) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_CrystalKing_Anim0C) - EVT_CALL(func_802CFD30, NPC_SELF, 14, 80, 80, 80, 0) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_22/npc/chapter_8.inc.c b/src/world/area_kmr/kmr_22/npc/chapter_8.inc.c index 3e910aec92..8e0ebe41ff 100644 --- a/src/world/area_kmr/kmr_22/npc/chapter_8.inc.c +++ b/src/world/area_kmr/kmr_22/npc/chapter_8.inc.c @@ -1,6 +1,6 @@ EvtScript N(EVS_NpcInit_Bowser) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldBowser_Talk) - EVT_CALL(func_802CFD30, NPC_SELF, 14, 80, 80, 80, 0) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_E, 80, 80, 80, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kpa/kpa_10/kpa_10_3_npc.c b/src/world/area_kpa/kpa_10/kpa_10_3_npc.c index 488c9efab6..2d90704d1c 100644 --- a/src/world/area_kpa/kpa_10/kpa_10_3_npc.c +++ b/src/world/area_kpa/kpa_10/kpa_10_3_npc.c @@ -36,6 +36,6 @@ NpcData N(NpcData_Prisoners)[] = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Prisoners), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_02), + NPC_GROUP(N(NpcData_Prisoners), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_02), {} }; diff --git a/src/world/area_kpa/kpa_11/kpa_11_1_music.c b/src/world/area_kpa/kpa_11/kpa_11_1_music.c index da4f6604d7..e6d6cdf44b 100644 --- a/src/world/area_kpa/kpa_11/kpa_11_1_music.c +++ b/src/world/area_kpa/kpa_11/kpa_11_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) EVT_THREAD EVT_WAIT(30) diff --git a/src/world/area_kpa/kpa_11/kpa_11_4_npc.c b/src/world/area_kpa/kpa_11/kpa_11_4_npc.c index 2f890f65d0..688e2620c0 100644 --- a/src/world/area_kpa/kpa_11/kpa_11_4_npc.c +++ b/src/world/area_kpa/kpa_11/kpa_11_4_npc.c @@ -99,6 +99,6 @@ NpcData N(NpcData_Prisoners)[] = { NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_Koopatrol), BTL_KPA_FORMATION_18, BTL_KPA_STAGE_02), - NPC_GROUP(N(NpcData_Prisoners), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_02), + NPC_GROUP(N(NpcData_Prisoners), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_02), {} }; diff --git a/src/world/area_kpa/kpa_12/kpa_12_1_music.c b/src/world/area_kpa/kpa_12/kpa_12_1_music.c index 055d9c7882..bf218ed22f 100644 --- a/src/world/area_kpa/kpa_12/kpa_12_1_music.c +++ b/src/world/area_kpa/kpa_12/kpa_12_1_music.c @@ -3,7 +3,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_END_IF EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) EVT_THREAD diff --git a/src/world/area_kpa/kpa_13/kpa_13_1_music.c b/src/world/area_kpa/kpa_13/kpa_13_1_music.c index 2df827288f..8d0f8bf2c2 100644 --- a/src/world/area_kpa/kpa_13/kpa_13_1_music.c +++ b/src/world/area_kpa/kpa_13/kpa_13_1_music.c @@ -3,7 +3,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_END_IF EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) EVT_THREAD diff --git a/src/world/area_kpa/kpa_14/kpa_14_1_music.c b/src/world/area_kpa/kpa_14/kpa_14_1_music.c index f63939fc0c..523a6adb32 100644 --- a/src/world/area_kpa/kpa_14/kpa_14_1_music.c +++ b/src/world/area_kpa/kpa_14/kpa_14_1_music.c @@ -3,7 +3,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_ELSE EVT_CALL(ClearAmbientSounds, 250) EVT_END_IF diff --git a/src/world/area_kpa/kpa_15/kpa_15_1_music.c b/src/world/area_kpa/kpa_15/kpa_15_1_music.c index 7690335766..5baf5407af 100644 --- a/src/world/area_kpa/kpa_15/kpa_15_1_music.c +++ b/src/world/area_kpa/kpa_15/kpa_15_1_music.c @@ -3,7 +3,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_END_IF EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) EVT_THREAD diff --git a/src/world/area_kpa/kpa_16/kpa_16_1_music.c b/src/world/area_kpa/kpa_16/kpa_16_1_music.c index 2ecfd8ed87..0829a84871 100644 --- a/src/world/area_kpa/kpa_16/kpa_16_1_music.c +++ b/src/world/area_kpa/kpa_16/kpa_16_1_music.c @@ -4,7 +4,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA6) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_7) EVT_END_IF EVT_THREAD EVT_WAIT(30) diff --git a/src/world/area_kpa/kpa_62/kpa_62_1_music.c b/src/world/area_kpa/kpa_62/kpa_62_1_music.c index 0d75ad30e9..d158320dee 100644 --- a/src/world/area_kpa/kpa_62/kpa_62_1_music.c +++ b/src/world/area_kpa/kpa_62/kpa_62_1_music.c @@ -3,7 +3,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA5) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_6) EVT_ELSE EVT_CALL(ClearAmbientSounds, 250) EVT_END_IF diff --git a/src/world/area_kpa/kpa_70/kpa_70_1_music.c b/src/world/area_kpa/kpa_70/kpa_70_1_music.c index e847f14749..0878b89915 100644 --- a/src/world/area_kpa/kpa_70/kpa_70_1_music.c +++ b/src/world/area_kpa/kpa_70/kpa_70_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) EVT_THREAD EVT_WAIT(30) diff --git a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c index 30ae0070c1..0579bbd454 100644 --- a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c +++ b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c @@ -225,6 +225,6 @@ NpcData N(NpcData_Door) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Door), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), + NPC_GROUP(N(NpcData_Door), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), {} }; diff --git a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c index 5f5d9a1ef6..7e8e60628a 100644 --- a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c +++ b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c @@ -595,6 +595,6 @@ NpcData N(NpcData_Enemies)[] = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Enemies), BTL_KMR_PART_3_FORMATION_07), + NPC_GROUP(N(NpcData_Enemies), BTL_KMR_3_FORMATION_07), {} }; diff --git a/src/world/area_kzn/kzn_02/kzn_02_1_main.c b/src/world/area_kzn/kzn_02/kzn_02_1_main.c index 98b659ea4f..b7460cb0c8 100644 --- a/src/world/area_kzn/kzn_02/kzn_02_1_main.c +++ b/src/world/area_kzn/kzn_02/kzn_02_1_main.c @@ -127,7 +127,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_EnterMap)) EVT_WAIT(1) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_RETURN EVT_END }; diff --git a/src/world/area_kzn/kzn_03/kzn_03_1_main.c b/src/world/area_kzn/kzn_03/kzn_03_1_main.c index c7c4256442..af1de18afd 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_1_main.c +++ b/src/world/area_kzn/kzn_03/kzn_03_1_main.c @@ -68,7 +68,7 @@ EvtScript N(EVS_Main) = { EVT_END_IF EVT_WAIT(1) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_EXEC(N(EVS_StartTexPanners_Lava)) EVT_SET(LVar0, MODEL_kem1) EVT_EXEC(N(EVS_StartTexPanner_SmokeLeft)) diff --git a/src/world/area_kzn/kzn_04/kzn_04_1_main.c b/src/world/area_kzn/kzn_04/kzn_04_1_main.c index 65a65c510d..0c6fee9217 100644 --- a/src/world/area_kzn/kzn_04/kzn_04_1_main.c +++ b/src/world/area_kzn/kzn_04/kzn_04_1_main.c @@ -20,7 +20,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC(EnterWalk) EVT_WAIT(1) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_SET(LVar0, MODEL_kem1) EVT_EXEC(N(EVS_StartTexPanner_SmokeLeft)) EVT_SET(LVar0, MODEL_kem2) diff --git a/src/world/area_kzn/kzn_05/kzn_05_1_main.c b/src/world/area_kzn/kzn_05/kzn_05_1_main.c index e4e5b40a0e..b044ef834d 100644 --- a/src/world/area_kzn/kzn_05/kzn_05_1_main.c +++ b/src/world/area_kzn/kzn_05/kzn_05_1_main.c @@ -20,7 +20,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC(EnterWalk) EVT_WAIT(1) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_SET(LVar0, MODEL_kem1) EVT_EXEC(N(EVS_StartTexPanner_SmokeLeft)) EVT_RETURN diff --git a/src/world/area_kzn/kzn_06/kzn_06_1_main.c b/src/world/area_kzn/kzn_06/kzn_06_1_main.c index c8a77d7111..50d44e5e7d 100644 --- a/src/world/area_kzn/kzn_06/kzn_06_1_main.c +++ b/src/world/area_kzn/kzn_06/kzn_06_1_main.c @@ -57,9 +57,9 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) EVT_IF_LT(GB_StoryProgress, STORY_CH5_LAVA_STREAM_BLOCKED) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA2) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_2) EVT_ELSE - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_END_IF EVT_SET(LVar0, N(EVS_BindExitTriggers)) EVT_EXEC(EnterWalk) diff --git a/src/world/area_kzn/kzn_07/kzn_07_1_music.c b/src/world/area_kzn/kzn_07/kzn_07_1_music.c index 490dbf9d29..766e77131e 100644 --- a/src/world/area_kzn/kzn_07/kzn_07_1_music.c +++ b/src/world/area_kzn/kzn_07/kzn_07_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_RETURN EVT_END }; diff --git a/src/world/area_kzn/kzn_08/kzn_08_1_main.c b/src/world/area_kzn/kzn_08/kzn_08_1_main.c index 0ff9e82ae2..fa05948634 100644 --- a/src/world/area_kzn/kzn_08/kzn_08_1_main.c +++ b/src/world/area_kzn/kzn_08/kzn_08_1_main.c @@ -144,7 +144,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_SET(LVar0, N(EVS_BindExitTriggers)) EVT_EXEC(EnterWalk) EVT_WAIT(1) diff --git a/src/world/area_kzn/kzn_09/kzn_09_1_main.c b/src/world/area_kzn/kzn_09/kzn_09_1_main.c index 7f7d279a0c..adcf9d1bcd 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_1_main.c +++ b/src/world/area_kzn/kzn_09/kzn_09_1_main.c @@ -19,7 +19,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_SET(LVar0, N(EVS_BindExitTriggers)) EVT_EXEC(EnterWalk) EVT_WAIT(1) diff --git a/src/world/area_kzn/kzn_10/kzn_10_1_main.c b/src/world/area_kzn/kzn_10/kzn_10_1_main.c index 72d9313446..40f9553dc4 100644 --- a/src/world/area_kzn/kzn_10/kzn_10_1_main.c +++ b/src/world/area_kzn/kzn_10/kzn_10_1_main.c @@ -43,7 +43,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC(EnterWalk) EVT_WAIT(1) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_EXEC(N(EVS_SetupSpinyTromp)) EVT_SET(LVar0, MODEL_kem1) EVT_EXEC(N(EVS_StartTexPanner_SmokeLeft)) diff --git a/src/world/area_kzn/kzn_11/kzn_11_1_main.c b/src/world/area_kzn/kzn_11/kzn_11_1_main.c index 7137fd432a..ca28185332 100644 --- a/src/world/area_kzn/kzn_11/kzn_11_1_main.c +++ b/src/world/area_kzn/kzn_11/kzn_11_1_main.c @@ -58,7 +58,7 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_DEFAULT() EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_WAIT(1) diff --git a/src/world/area_kzn/kzn_17/kzn_17_1_main.c b/src/world/area_kzn/kzn_17/kzn_17_1_main.c index ee732ae700..8f12446645 100644 --- a/src/world/area_kzn/kzn_17/kzn_17_1_main.c +++ b/src/world/area_kzn/kzn_17/kzn_17_1_main.c @@ -24,7 +24,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC(EnterWalk) EVT_WAIT(1) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_EXEC(N(EVS_SetupSpinyTromp)) EVT_SET(LVar0, MODEL_kem1) EVT_EXEC(N(EVS_StartTexPanner_SmokeLeft)) diff --git a/src/world/area_kzn/kzn_18/kzn_18_1_main.c b/src/world/area_kzn/kzn_18/kzn_18_1_main.c index b36f8fa5f7..620461cb11 100644 --- a/src/world/area_kzn/kzn_18/kzn_18_1_main.c +++ b/src/world/area_kzn/kzn_18/kzn_18_1_main.c @@ -77,7 +77,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_EnterMap)) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_IF_LT(GB_StoryProgress, STORY_CH5_OPENED_ESCAPE_ROUTE) EVT_CALL(EnableModel, MODEL_off1, FALSE) EVT_CALL(EnableModel, MODEL_o506, FALSE) diff --git a/src/world/area_kzn/kzn_19/kzn_19_1_music.c b/src/world/area_kzn/kzn_19/kzn_19_1_music.c index e1e44ea3e4..1e093561ec 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_1_music.c +++ b/src/world/area_kzn/kzn_19/kzn_19_1_music.c @@ -6,7 +6,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, kzn_19_ENTRY_1) EVT_CALL(FadeOutMusic, 0, 500) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_RETURN EVT_END_IF EVT_END_IF //@bug extra endif @@ -14,7 +14,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(PlaySound, SOUND_8000006B) EVT_END_SWITCH EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_RETURN EVT_END }; diff --git a/src/world/area_kzn/kzn_20/kzn_20_1_music.c b/src/world/area_kzn/kzn_20/kzn_20_1_music.c index a3d29bcd42..b492956812 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_1_music.c +++ b/src/world/area_kzn/kzn_20/kzn_20_1_music.c @@ -6,10 +6,10 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_IF EVT_IF_LT(GB_StoryProgress, STORY_CH5_OPENED_ESCAPE_ROUTE) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA3) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_3) EVT_ELSE EVT_CALL(SetMusicTrack, 0, SONG_VOLCANO_ESCAPE, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_kzn/kzn_22/kzn_22_1_music.c b/src/world/area_kzn/kzn_22/kzn_22_1_music.c index 3ba85d9554..01dbe5e059 100644 --- a/src/world/area_kzn/kzn_22/kzn_22_1_music.c +++ b/src/world/area_kzn/kzn_22/kzn_22_1_music.c @@ -5,7 +5,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(PlaySound, SOUND_8000006B) EVT_END_IF EVT_CALL(SetMusicTrack, 0, SONG_VOLCANO_ESCAPE, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA4) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_4) EVT_RETURN EVT_END }; diff --git a/src/world/area_kzn/kzn_23/kzn_23_1_music.c b/src/world/area_kzn/kzn_23/kzn_23_1_music.c index 13acc8dd42..147f1ecdb1 100644 --- a/src/world/area_kzn/kzn_23/kzn_23_1_music.c +++ b/src/world/area_kzn/kzn_23/kzn_23_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_VOLCANO_ESCAPE, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_EXIT_SEA) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_5) EVT_RETURN EVT_END }; diff --git a/src/world/area_mac/mac_00/mac_00_10_shared_npc.c b/src/world/area_mac/mac_00/mac_00_10_shared_npc.c index 4b7641f04d..4eaf29f88f 100644 --- a/src/world/area_mac/mac_00/mac_00_10_shared_npc.c +++ b/src/world/area_mac/mac_00/mac_00_10_shared_npc.c @@ -295,7 +295,7 @@ EvtScript N(EVS_NpcInteract_Lovers) = { EVT_END }; -EvtScript N(EVS_NpcInteract_ThreeSisters) = { +EvtScript N(EVS_NpcInteract_Toadette) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH0_MET_STAR_SPIRITS) EVT_SET(LVar0, MSG_MAC_Gate_00CF) @@ -378,7 +378,7 @@ EvtScript N(EVS_NpcInteract_ThreeSisters) = { }; EvtScript N(EVS_NpcInteract_MissT) = { - EVT_EXEC_WAIT(N(EVS_NpcInteract_ThreeSisters)) + EVT_EXEC_WAIT(N(EVS_NpcInteract_Toadette)) EVT_EXEC_WAIT(N(EVS_LetterPrompt_MissT)) EVT_IF_NE(LVarC, 0) EVT_RETURN @@ -537,7 +537,7 @@ EvtScript N(EVS_NpcInit_ShamelessLover) = { }; EvtScript N(EVS_NpcInit_KrisT) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ThreeSisters))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toadette))) EVT_CALL(BindNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_KrisT))) EVT_RETURN EVT_END @@ -551,7 +551,7 @@ EvtScript N(EVS_NpcInit_MissT) = { }; EvtScript N(EVS_NpcInit_FelissaT) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ThreeSisters))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toadette))) EVT_CALL(BindNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_FelissaT))) EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_03/mac_03.h b/src/world/area_mac/mac_03/mac_03.h index b4be517996..2e817a680e 100644 --- a/src/world/area_mac/mac_03/mac_03.h +++ b/src/world/area_mac/mac_03/mac_03.h @@ -14,30 +14,30 @@ #include "sprite/npc/ShyGuy.h" enum { - NPC_TrainToad_01 = 0, - NPC_TrainToad_02 = 1, - NPC_Toad_01 = 2, - NPC_ThreeSisters_01 = 3, - NPC_Toad_02 = 4, - NPC_ToadKid_01 = 5, - NPC_ToadKid_02 = 6, - NPC_ThreeSisters_02 = 7, - NPC_ThreeSisters_03 = 8, - NPC_ThreeSisters_04 = 9, - NPC_Toad_03 = 10, - NPC_ShyGuy = 11, - NPC_LilOink_01 = 12, - NPC_LilOink_02 = 13, - NPC_LilOink_03 = 14, - NPC_LilOink_04 = 15, - NPC_LilOink_05 = 16, - NPC_LilOink_06 = 17, - NPC_LilOink_07 = 18, - NPC_LilOink_08 = 19, - NPC_LilOink_09 = 20, - NPC_LilOink_10 = 21, - NPC_Capsule = 22, - NPC_ChuckQuizmo = 23, + NPC_TrainToad_01 = 0, + NPC_TrainToad_02 = 1, + NPC_Toad_01 = 2, + NPC_Toadette_01 = 3, + NPC_Toad_02 = 4, + NPC_ToadKid_01 = 5, + NPC_ToadKid_02 = 6, + NPC_Toadette_02 = 7, + NPC_Toadette_03 = 8, + NPC_Toadette_04 = 9, + NPC_Toad_03 = 10, + NPC_ShyGuy = 11, + NPC_LilOink_01 = 12, + NPC_LilOink_02 = 13, + NPC_LilOink_03 = 14, + NPC_LilOink_04 = 15, + NPC_LilOink_05 = 16, + NPC_LilOink_06 = 17, + NPC_LilOink_07 = 18, + NPC_LilOink_08 = 19, + NPC_LilOink_09 = 20, + NPC_LilOink_10 = 21, + NPC_Capsule = 22, + NPC_ChuckQuizmo = 23, }; enum { diff --git a/src/world/area_mac/mac_03/mac_03_4_npc.c b/src/world/area_mac/mac_03/mac_03_4_npc.c index 3cba712623..793ba1ac9d 100644 --- a/src/world/area_mac/mac_03/mac_03_4_npc.c +++ b/src/world/area_mac/mac_03/mac_03_4_npc.c @@ -201,7 +201,7 @@ EvtScript N(EVS_NpcInit_Toad_01) = { EVT_END }; -EvtScript N(EVS_NpcInteract_ThreeSisters_01) = { +EvtScript N(EVS_NpcInteract_Toadette_01) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) @@ -236,13 +236,13 @@ EvtScript N(EVS_NpcInteract_ThreeSisters_01) = { EVT_CASE_LT(STORY_EPILOGUE) EVT_SET(LVar0, MSG_MAC_Station_0023) EVT_END_SWITCH - EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_01, ANIM_Toadette_Purple_Talk, ANIM_Toadette_Purple_Idle, 0, LVar0) + EVT_CALL(SpeakToPlayer, NPC_Toadette_01, ANIM_Toadette_Purple_Talk, ANIM_Toadette_Purple_Idle, 0, LVar0) EVT_RETURN EVT_END }; -EvtScript N(EVS_NpcInit_ThreeSisters_01) = { - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ThreeSisters_01))) +EvtScript N(EVS_NpcInit_Toadette_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toadette_01))) EVT_RETURN EVT_END }; @@ -387,7 +387,7 @@ EvtScript N(EVS_NpcInit_ToadKid_02) = { EVT_END }; -EvtScript N(EVS_NpcInteract_ThreeSisters_02) = { +EvtScript N(EVS_NpcInteract_Toadette_02) = { EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) EVT_SET(LVar0, MSG_MAC_Station_0061) EVT_SET(LVar1, MSG_MAC_Station_0062) @@ -397,16 +397,16 @@ EvtScript N(EVS_NpcInteract_ThreeSisters_02) = { EVT_SET(LVar1, MSG_MAC_Station_0065) EVT_SET(LVar2, MSG_MAC_Station_0066) EVT_END_IF - EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_02, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, LVar0) - EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_03, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, LVar1) - EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_04, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, LVar2) + EVT_CALL(SpeakToPlayer, NPC_Toadette_02, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, LVar0) + EVT_CALL(SpeakToPlayer, NPC_Toadette_03, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, LVar1) + EVT_CALL(SpeakToPlayer, NPC_Toadette_04, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, LVar2) EVT_RETURN EVT_END }; -EvtScript N(EVS_NpcInit_ThreeSisters_02) = { +EvtScript N(EVS_NpcInit_Toadette_02) = { EVT_IF_LT(GB_StoryProgress, STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST) - EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ThreeSisters_02))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toadette_02))) EVT_ELSE EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_IF @@ -639,10 +639,10 @@ NpcData N(NpcData_Toads)[] = { .tattle = MSG_NpcTattle_MAC_TrainLover, }, { - .id = NPC_ThreeSisters_01, + .id = NPC_Toadette_01, .pos = { 85.0f, 0.0f, 235.0f }, .yaw = 270, - .init = &N(EVS_NpcInit_ThreeSisters_01), + .init = &N(EVS_NpcInit_Toadette_01), .settings = &N(NpcSettings_Toad_Stationary), .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .drops = NO_DROPS, @@ -719,12 +719,12 @@ NpcData N(NpcData_Toads)[] = { }, }; -NpcData N(NpcData_ThreeSisters)[] = { +NpcData N(NpcData_Toadette)[] = { { - .id = NPC_ThreeSisters_02, + .id = NPC_Toadette_02, .pos = { -130.0f, 0.0f, 220.0f }, .yaw = 0, - .init = &N(EVS_NpcInit_ThreeSisters_02), + .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = NO_DROPS, @@ -732,10 +732,10 @@ NpcData N(NpcData_ThreeSisters)[] = { .tattle = MSG_NpcTattle_TravelingMaidA, }, { - .id = NPC_ThreeSisters_03, + .id = NPC_Toadette_03, .pos = { -100.0f, 0.0f, 220.0f }, .yaw = 90, - .init = &N(EVS_NpcInit_ThreeSisters_02), + .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = NO_DROPS, @@ -743,10 +743,10 @@ NpcData N(NpcData_ThreeSisters)[] = { .tattle = MSG_NpcTattle_TravelingMaidB, }, { - .id = NPC_ThreeSisters_04, + .id = NPC_Toadette_04, .pos = { -70.0f, 0.0f, 220.0f }, .yaw = 180, - .init = &N(EVS_NpcInit_ThreeSisters_02), + .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = NO_DROPS, @@ -1030,7 +1030,7 @@ NpcData N(NpcData_LilOinks)[] = { NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_Toads)), - NPC_GROUP(N(NpcData_ThreeSisters)), + NPC_GROUP(N(NpcData_Toadette)), NPC_GROUP(N(NpcData_ShyGuy)), NPC_GROUP(N(NpcData_LilOinks)), {} diff --git a/src/world/area_mac/mac_05/mac_05_4_npc.c b/src/world/area_mac/mac_05/mac_05_4_npc.c index b88204cb2a..5ad72fd63b 100644 --- a/src/world/area_mac/mac_05/mac_05_4_npc.c +++ b/src/world/area_mac/mac_05/mac_05_4_npc.c @@ -2521,7 +2521,7 @@ NpcGroupList N(NpcSetB) = { }; NpcGroupList N(NpcSetC) = { - NPC_GROUP(N(NpcData_JrTroopa_01), BTL_KMR_PART_3_FORMATION_05), + NPC_GROUP(N(NpcData_JrTroopa_01), BTL_KMR_3_FORMATION_05), NPC_GROUP(N(NpcData_Kolorado)), NPC_GROUP(N(NpcData_Fishmael)), NPC_GROUP(N(NpcData_Bartender)), diff --git a/src/world/area_mac/machi/machi_5_npc.c b/src/world/area_mac/machi/machi_5_npc.c index 6291596b53..3b52c16a13 100644 --- a/src/world/area_mac/machi/machi_5_npc.c +++ b/src/world/area_mac/machi/machi_5_npc.c @@ -384,8 +384,8 @@ NpcData N(NpcData_GoombaKing) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_05), BTL_KMR_PART_1_FORMATION_08), - NPC_GROUP(N(NpcData_GoombaFamily), BTL_KMR_PART_1_FORMATION_08), + NPC_GROUP(N(NpcData_05), BTL_KMR_1_FORMATION_08), + NPC_GROUP(N(NpcData_GoombaFamily), BTL_KMR_1_FORMATION_08), NPC_GROUP(N(NpcData_Misstar)), {} }; diff --git a/src/world/area_mim/mim_07/mim_07_6_npc.c b/src/world/area_mim/mim_07/mim_07_6_npc.c index 535549b640..2857c35d36 100644 --- a/src/world/area_mim/mim_07/mim_07_6_npc.c +++ b/src/world/area_mim/mim_07/mim_07_6_npc.c @@ -261,6 +261,6 @@ NpcData N(NpcData_JrTroopa) = { NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_Fuzzy_01), BTL_MIM_FORMATION_02, BTL_MIM_STAGE_00), NPC_GROUP(N(NpcData_Fuzzy_02), BTL_MIM_FORMATION_06, BTL_MIM_STAGE_00), - NPC_GROUP(N(NpcData_JrTroopa), BTL_KMR_PART_3_FORMATION_04), + NPC_GROUP(N(NpcData_JrTroopa), BTL_KMR_3_FORMATION_04), {} }; diff --git a/src/world/area_nok/nok_11/nok_11_4_npc.c b/src/world/area_nok/nok_11/nok_11_4_npc.c index 40905d8f6f..bab70065f7 100644 --- a/src/world/area_nok/nok_11/nok_11_4_npc.c +++ b/src/world/area_nok/nok_11/nok_11_4_npc.c @@ -612,7 +612,7 @@ NpcGroupList N(DefaultNPCs) = { }; NpcGroupList N(JrTroopaNPCs) = { - NPC_GROUP(N(NpcData_JrTroopa), BTL_KMR_PART_3_FORMATION_03), + NPC_GROUP(N(NpcData_JrTroopa), BTL_KMR_3_FORMATION_03), {} }; diff --git a/src/world/area_obk/obk_04/obk_04_3_npc.c b/src/world/area_obk/obk_04/obk_04_3_npc.c index 8b8355648f..f0da826030 100644 --- a/src/world/area_obk/obk_04/obk_04_3_npc.c +++ b/src/world/area_obk/obk_04/obk_04_3_npc.c @@ -34,12 +34,12 @@ API_CALLABLE(N(InitHiddenBoo)) { void N(func_802400D0_BC7F30)(Npc* npc) { if (npc->yaw > 340.0f || npc->yaw < 20.0f) { npc->renderMode = RENDER_MODE_ALPHATEST; - npc->unk_A2 = 0; - func_8003D624(npc, FOLD_TYPE_NONE, 0, 0, 0, 0, npc->unk_A2); + npc->foldArg5 = 0; + func_8003D624(npc, FOLD_TYPE_NONE, 0, 0, 0, 0, npc->foldArg5); } else { npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; - func_8003D624(npc, FOLD_TYPE_7, gPlayerStatusPtr->alpha1, 255, 0, 0, npc->unk_A2); - npc->unk_9A = 255; + func_8003D624(npc, FOLD_TYPE_7, gPlayerStatusPtr->alpha1, 255, 0, 0, npc->foldArg5); + npc->foldArg1 = 255; } } @@ -55,14 +55,14 @@ void N(func_80240198_BC7FF8)(void) { } void N(func_8024022C_BC808C)(void) { - get_npc_unsafe(NPC_KeepAwayBoo1)->unk_A2 = 0; - get_npc_unsafe(NPC_KeepAwayBoo2)->unk_A2 = 0; - get_npc_unsafe(NPC_KeepAwayBoo3)->unk_A2 = 0; - get_npc_unsafe(NPC_KeepAwayBoo4)->unk_A2 = 0; - get_npc_unsafe(NPC_KeepAwayBoo5)->unk_A2 = 0; - get_npc_unsafe(NPC_KeepAwayBoo6)->unk_A2 = 0; - get_npc_unsafe(NPC_KeepAwayBoo7)->unk_A2 = 0; - get_npc_unsafe(NPC_KeepAwayBoo8)->unk_A2 = 0; + get_npc_unsafe(NPC_KeepAwayBoo1)->foldArg5 = 0; + get_npc_unsafe(NPC_KeepAwayBoo2)->foldArg5 = 0; + get_npc_unsafe(NPC_KeepAwayBoo3)->foldArg5 = 0; + get_npc_unsafe(NPC_KeepAwayBoo4)->foldArg5 = 0; + get_npc_unsafe(NPC_KeepAwayBoo5)->foldArg5 = 0; + get_npc_unsafe(NPC_KeepAwayBoo6)->foldArg5 = 0; + get_npc_unsafe(NPC_KeepAwayBoo7)->foldArg5 = 0; + get_npc_unsafe(NPC_KeepAwayBoo8)->foldArg5 = 0; } s32 N(SetRingMovement)(s32 arg0) { diff --git a/src/world/area_obk/obk_08/obk_08_5_npc.c b/src/world/area_obk/obk_08/obk_08_5_npc.c index f293261ddf..2189728c71 100644 --- a/src/world/area_obk/obk_08/obk_08_5_npc.c +++ b/src/world/area_obk/obk_08/obk_08_5_npc.c @@ -34,12 +34,12 @@ API_CALLABLE(N(func_802408A0_BD4110)) { void N(func_80240920_BD4190)(Npc* npc) { if (npc->yaw > 340.0f || npc->yaw < 20.0f) { npc->renderMode = RENDER_MODE_ALPHATEST; - npc->unk_A2 = 0; - func_8003D624(npc, FOLD_TYPE_NONE, 0, 0, 0, 0, npc->unk_A2); + npc->foldArg5 = 0; + func_8003D624(npc, FOLD_TYPE_NONE, 0, 0, 0, 0, npc->foldArg5); } else { npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; - func_8003D624(npc, FOLD_TYPE_7, gPlayerStatusPtr->alpha1, 0, 0, 0, npc->unk_A2); - npc->unk_9A = 255; + func_8003D624(npc, FOLD_TYPE_7, gPlayerStatusPtr->alpha1, 0, 0, 0, npc->foldArg5); + npc->foldArg1 = 255; } } @@ -55,14 +55,14 @@ void func_802409E8_BD4258(void) { } void func_80240A7C_BD42EC(void) { - get_npc_unsafe(NPC_KeepAwayBoo1)->unk_A2 = 0; - get_npc_unsafe(NPC_KeepAwayBoo2)->unk_A2 = 0; - get_npc_unsafe(NPC_KeepAwayBoo3)->unk_A2 = 0; - get_npc_unsafe(NPC_KeepAwayBoo4)->unk_A2 = 0; - get_npc_unsafe(NPC_KeepAwayBoo5)->unk_A2 = 0; - get_npc_unsafe(NPC_KeepAwayBoo6)->unk_A2 = 0; - get_npc_unsafe(NPC_KeepAwayBoo7)->unk_A2 = 0; - get_npc_unsafe(NPC_KeepAwayBoo8)->unk_A2 = 0; + get_npc_unsafe(NPC_KeepAwayBoo1)->foldArg5 = 0; + get_npc_unsafe(NPC_KeepAwayBoo2)->foldArg5 = 0; + get_npc_unsafe(NPC_KeepAwayBoo3)->foldArg5 = 0; + get_npc_unsafe(NPC_KeepAwayBoo4)->foldArg5 = 0; + get_npc_unsafe(NPC_KeepAwayBoo5)->foldArg5 = 0; + get_npc_unsafe(NPC_KeepAwayBoo6)->foldArg5 = 0; + get_npc_unsafe(NPC_KeepAwayBoo7)->foldArg5 = 0; + get_npc_unsafe(NPC_KeepAwayBoo8)->foldArg5 = 0; } API_CALLABLE(N(func_80240AF0_BD4360)) { diff --git a/src/world/area_sam/sam_01/sam_01_4_npc.c b/src/world/area_sam/sam_01/sam_01_4_npc.c index 98ca7aa3ec..4b1c5a17da 100644 --- a/src/world/area_sam/sam_01/sam_01_4_npc.c +++ b/src/world/area_sam/sam_01/sam_01_4_npc.c @@ -836,23 +836,23 @@ NpcData N(NpcData_ChuckQuizmo) = { }; NpcGroupList N(BeforeNPCs) = { - NPC_GROUP(N(NpcData_MayorPenguin), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), - NPC_GROUP(N(NpcData_Penguin_05), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), - NPC_GROUP(N(NpcData_Penguin_09), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), + NPC_GROUP(N(NpcData_MayorPenguin), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), + NPC_GROUP(N(NpcData_Penguin_05), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), + NPC_GROUP(N(NpcData_Penguin_09), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), NPC_GROUP(N(NpcData_ChuckQuizmo)), {} }; NpcGroupList N(MysteryNPCs) = { - NPC_GROUP(N(NpcData_MayorPenguin), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), - NPC_GROUP(N(NpcData_Penguin_05), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), - NPC_GROUP(N(NpcData_Penguin_09), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), + NPC_GROUP(N(NpcData_MayorPenguin), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), + NPC_GROUP(N(NpcData_Penguin_05), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), + NPC_GROUP(N(NpcData_Penguin_09), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), NPC_GROUP(N(NpcData_ChuckQuizmo)), {} }; NpcGroupList N(AfterNPCs) = { - NPC_GROUP(N(NpcData_MayorPenguin), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), + NPC_GROUP(N(NpcData_MayorPenguin), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), NPC_GROUP(N(NpcData_ChuckQuizmo)), {} }; diff --git a/src/world/area_sam/sam_02/sam_02_4_npc.c b/src/world/area_sam/sam_02/sam_02_4_npc.c index d473018210..24eebbe34d 100644 --- a/src/world/area_sam/sam_02/sam_02_4_npc.c +++ b/src/world/area_sam/sam_02/sam_02_4_npc.c @@ -525,14 +525,14 @@ NpcData N(NpcData_ChuckQuizmo) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Townsfolk), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), - NPC_GROUP(N(NpcData_MysteryOnly), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), + NPC_GROUP(N(NpcData_Townsfolk), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), + NPC_GROUP(N(NpcData_MysteryOnly), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), NPC_GROUP(N(NpcData_ChuckQuizmo)), {} }; NpcGroupList N(MysteryNPCs) = { - NPC_GROUP(N(NpcData_Townsfolk), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), + NPC_GROUP(N(NpcData_Townsfolk), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), NPC_GROUP(N(NpcData_ChuckQuizmo)), {} }; diff --git a/src/world/area_sam/sam_03/sam_03_3_npc1.c b/src/world/area_sam/sam_03/sam_03_3_npc1.c index 18ead21b62..753f7c4901 100644 --- a/src/world/area_sam/sam_03/sam_03_3_npc1.c +++ b/src/world/area_sam/sam_03/sam_03_3_npc1.c @@ -170,6 +170,6 @@ NpcData N(NpcData_JrTroopa)[] = { }; NpcGroupList N(BeforeNPCs) = { - NPC_GROUP(N(NpcData_JrTroopa), BTL_KMR_PART_3_FORMATION_06), + NPC_GROUP(N(NpcData_JrTroopa), BTL_KMR_3_FORMATION_06), {} }; diff --git a/src/world/area_sam/sam_06/sam_06_4_npc.c b/src/world/area_sam/sam_06/sam_06_4_npc.c index 315551dd68..cfa02a86eb 100644 --- a/src/world/area_sam/sam_06/sam_06_4_npc.c +++ b/src/world/area_sam/sam_06/sam_06_4_npc.c @@ -1257,6 +1257,6 @@ NpcData N(NpcData_Merle)[] = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Merle), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), + NPC_GROUP(N(NpcData_Merle), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), {} }; diff --git a/src/world/area_sam/sam_11/sam_11_5_npc.c b/src/world/area_sam/sam_11/sam_11_5_npc.c index f91b67adb3..dfe57ada33 100644 --- a/src/world/area_sam/sam_11/sam_11_5_npc.c +++ b/src/world/area_sam/sam_11/sam_11_5_npc.c @@ -1082,30 +1082,30 @@ NpcData N(NpcData_ChuckQuizmo) = { }; NpcGroupList N(BeforeNPCs) = { - NPC_GROUP(N(NpcData_Townsfolk), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), - NPC_GROUP(N(NpcData_PondPenginsBefore), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), - NPC_GROUP(N(NpcData_Tourists), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), + NPC_GROUP(N(NpcData_Townsfolk), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), + NPC_GROUP(N(NpcData_PondPenginsBefore), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), + NPC_GROUP(N(NpcData_Tourists), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), NPC_GROUP(N(NpcData_ChuckQuizmo)), {} }; NpcGroupList N(MysteryNPCs) = { //@bug loads 7 NPCs when the group only has 6 - NPC_GROUP_EXPLICIT_SIZE(N(NpcData_Townsfolk), NPC_PenguinPatrol, 7, BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), - NPC_GROUP(N(NpcData_Tourists), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), + NPC_GROUP_EXPLICIT_SIZE(N(NpcData_Townsfolk), NPC_PenguinPatrol, 7, BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), + NPC_GROUP(N(NpcData_Tourists), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), NPC_GROUP(N(NpcData_ChuckQuizmo)), {} }; NpcGroupList N(AfterNPCs) = { - NPC_GROUP(N(NpcData_Townsfolk), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), - NPC_GROUP(N(NpcData_PondPenginsAfter), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), - NPC_GROUP(N(NpcData_Tourists), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), + NPC_GROUP(N(NpcData_Townsfolk), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), + NPC_GROUP(N(NpcData_PondPenginsAfter), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), + NPC_GROUP(N(NpcData_Tourists), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), NPC_GROUP(N(NpcData_ChuckQuizmo)), {} }; NpcGroupList N(EpilogueNPCs) = { - NPC_GROUP(N(NpcData_Epilogue), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), + NPC_GROUP(N(NpcData_Epilogue), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), {} }; diff --git a/src/world/area_sam/sam_12/sam_12_3_npc.c b/src/world/area_sam/sam_12/sam_12_3_npc.c index 82379dd2d6..7e3269c3e3 100644 --- a/src/world/area_sam/sam_12/sam_12_3_npc.c +++ b/src/world/area_sam/sam_12/sam_12_3_npc.c @@ -22,6 +22,6 @@ NpcData N(NpcData_Merlar) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Merlar), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_00), + NPC_GROUP(N(NpcData_Merlar), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_00), {} }; diff --git a/src/world/area_tik/tik_15/tik_15_5_npc.c b/src/world/area_tik/tik_15/tik_15_5_npc.c index 4a99912be3..2e6916cb82 100644 --- a/src/world/area_tik/tik_15/tik_15_5_npc.c +++ b/src/world/area_tik/tik_15/tik_15_5_npc.c @@ -156,6 +156,6 @@ NpcData N(NpcData_RipCheato) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_RipCheato), BTL_KMR_PART_1_FORMATION_06), + NPC_GROUP(N(NpcData_RipCheato), BTL_KMR_1_FORMATION_06), {} }; diff --git a/src/world/area_trd/trd_00/trd_00_3_npc.c b/src/world/area_trd/trd_00/trd_00_3_npc.c index bb3cc18c1b..3b36c3ba23 100644 --- a/src/world/area_trd/trd_00/trd_00_3_npc.c +++ b/src/world/area_trd/trd_00/trd_00_3_npc.c @@ -357,6 +357,6 @@ NpcData N(NpcData_Eldstar) = { NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_KoopaBros)), - NPC_GROUP(N(NpcData_Eldstar), BTL_TRD_PART_3_FORMATION_00), + NPC_GROUP(N(NpcData_Eldstar), BTL_TRD_3_FORMATION_00), {} }; diff --git a/src/world/area_trd/trd_01/trd_01_3_npc.c b/src/world/area_trd/trd_01/trd_01_3_npc.c index 8703b4b788..d554c30f40 100644 --- a/src/world/area_trd/trd_01/trd_01_3_npc.c +++ b/src/world/area_trd/trd_01/trd_01_3_npc.c @@ -240,9 +240,9 @@ NpcData N(NpcData_Bobomb) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_KoopaTroopa_01), BTL_TRD_PART_1_FORMATION_03, BTL_TRD_PART_1_STAGE_02), - NPC_GROUP(N(NpcData_KoopaTroopa_02), BTL_TRD_PART_1_FORMATION_01, BTL_TRD_PART_1_STAGE_07), - NPC_GROUP(N(NpcData_KoopaTroopa_03), BTL_TRD_PART_1_FORMATION_00, BTL_TRD_PART_1_STAGE_07), - NPC_GROUP(N(NpcData_Bobomb), BTL_TRD_PART_1_FORMATION_10, BTL_TRD_PART_1_STAGE_07), + NPC_GROUP(N(NpcData_KoopaTroopa_01), BTL_TRD_1_FORMATION_03, BTL_TRD_1_STAGE_02), + NPC_GROUP(N(NpcData_KoopaTroopa_02), BTL_TRD_1_FORMATION_01, BTL_TRD_1_STAGE_07), + NPC_GROUP(N(NpcData_KoopaTroopa_03), BTL_TRD_1_FORMATION_00, BTL_TRD_1_STAGE_07), + NPC_GROUP(N(NpcData_Bobomb), BTL_TRD_1_FORMATION_10, BTL_TRD_1_STAGE_07), {} }; diff --git a/src/world/area_trd/trd_02/trd_02_3_npc.c b/src/world/area_trd/trd_02/trd_02_3_npc.c index 0387054d68..9fb4c219b6 100644 --- a/src/world/area_trd/trd_02/trd_02_3_npc.c +++ b/src/world/area_trd/trd_02/trd_02_3_npc.c @@ -76,8 +76,8 @@ NpcData N(NpcData_KoopaTroopa) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Bobomb_01), BTL_TRD_PART_1_FORMATION_10, BTL_TRD_PART_1_STAGE_09), - NPC_GROUP(N(NpcData_Bobomb_02), BTL_TRD_PART_1_FORMATION_10, BTL_TRD_PART_1_STAGE_09), - NPC_GROUP(N(NpcData_KoopaTroopa), BTL_TRD_PART_1_FORMATION_07, BTL_TRD_PART_1_STAGE_0C), + NPC_GROUP(N(NpcData_Bobomb_01), BTL_TRD_1_FORMATION_10, BTL_TRD_1_STAGE_09), + NPC_GROUP(N(NpcData_Bobomb_02), BTL_TRD_1_FORMATION_10, BTL_TRD_1_STAGE_09), + NPC_GROUP(N(NpcData_KoopaTroopa), BTL_TRD_1_FORMATION_07, BTL_TRD_1_STAGE_0C), {} }; diff --git a/src/world/area_trd/trd_03/trd_03_3_npc.c b/src/world/area_trd/trd_03/trd_03_3_npc.c index 8665116552..dd827ae7c3 100644 --- a/src/world/area_trd/trd_03/trd_03_3_npc.c +++ b/src/world/area_trd/trd_03/trd_03_3_npc.c @@ -280,9 +280,9 @@ NpcData N(NpcData_KoopaTroopa_03) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_KoopaBros), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_01), - NPC_GROUP(N(NpcData_KoopaTroopa_01), BTL_TRD_PART_1_FORMATION_03, BTL_TRD_PART_1_STAGE_01), - NPC_GROUP(N(NpcData_KoopaTroopa_02), BTL_TRD_PART_1_FORMATION_04, BTL_TRD_PART_1_STAGE_01), - NPC_GROUP(N(NpcData_KoopaTroopa_03), BTL_TRD_PART_1_FORMATION_03, BTL_TRD_PART_1_STAGE_01), + NPC_GROUP(N(NpcData_KoopaBros), BTL_KMR_1_FORMATION_00, BTL_KMR_1_STAGE_01), + NPC_GROUP(N(NpcData_KoopaTroopa_01), BTL_TRD_1_FORMATION_03, BTL_TRD_1_STAGE_01), + NPC_GROUP(N(NpcData_KoopaTroopa_02), BTL_TRD_1_FORMATION_04, BTL_TRD_1_STAGE_01), + NPC_GROUP(N(NpcData_KoopaTroopa_03), BTL_TRD_1_FORMATION_03, BTL_TRD_1_STAGE_01), {} }; diff --git a/src/world/area_trd/trd_04/trd_04_3_npc.c b/src/world/area_trd/trd_04/trd_04_3_npc.c index 8d3621ce2d..409db237ac 100644 --- a/src/world/area_trd/trd_04/trd_04_3_npc.c +++ b/src/world/area_trd/trd_04/trd_04_3_npc.c @@ -103,13 +103,13 @@ NpcData N(NpcData_ParaTroopa) = { }; NpcGroupList N(NpcGroupAfter) = { - NPC_GROUP(N(NpcData_KoopaTroopa_Wander), BTL_TRD_PART_1_FORMATION_05, BTL_TRD_PART_1_STAGE_0C), - NPC_GROUP(N(NpcData_ParaTroopa), BTL_TRD_PART_1_FORMATION_0D, BTL_TRD_PART_1_STAGE_05), + NPC_GROUP(N(NpcData_KoopaTroopa_Wander), BTL_TRD_1_FORMATION_05, BTL_TRD_1_STAGE_0C), + NPC_GROUP(N(NpcData_ParaTroopa), BTL_TRD_1_FORMATION_0D, BTL_TRD_1_STAGE_05), {} }; NpcGroupList N(NpcGroupBefore) = { - NPC_GROUP(N(NpcData_KoopaTroopa_Patrol), BTL_TRD_PART_1_FORMATION_05, BTL_TRD_PART_1_STAGE_0C), - NPC_GROUP(N(NpcData_ParaTroopa), BTL_TRD_PART_1_FORMATION_0D, BTL_TRD_PART_1_STAGE_05), + NPC_GROUP(N(NpcData_KoopaTroopa_Patrol), BTL_TRD_1_FORMATION_05, BTL_TRD_1_STAGE_0C), + NPC_GROUP(N(NpcData_ParaTroopa), BTL_TRD_1_FORMATION_0D, BTL_TRD_1_STAGE_05), {} }; diff --git a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c index 4b878cf884..b6b965878f 100644 --- a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c +++ b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c @@ -622,6 +622,6 @@ NpcData N(NpcData_Inmates)[] = { NpcGroupList N(NpcGroup_Prisoners) = { NPC_GROUP(N(NpcData_Bombette)), NPC_GROUP(N(NpcData_Inmates)), - NPC_GROUP(N(NpcData_Jailers), BTL_TRD_PART_1_FORMATION_04, BTL_TRD_PART_1_STAGE_0B), + NPC_GROUP(N(NpcData_Jailers), BTL_TRD_1_FORMATION_04, BTL_TRD_1_STAGE_0B), {} }; diff --git a/src/world/area_trd/trd_07/trd_07_2_npc.c b/src/world/area_trd/trd_07/trd_07_2_npc.c index 2958689b97..4c95d95016 100644 --- a/src/world/area_trd/trd_07/trd_07_2_npc.c +++ b/src/world/area_trd/trd_07/trd_07_2_npc.c @@ -107,8 +107,8 @@ NpcData N(NpcData_ParaTroopa_02) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_KoopaTroopa), BTL_TRD_PART_1_FORMATION_01, BTL_TRD_PART_1_STAGE_03), - NPC_GROUP(N(NpcData_ParaTroopa_01), BTL_TRD_PART_1_FORMATION_08, BTL_TRD_PART_1_STAGE_03), - NPC_GROUP(N(NpcData_ParaTroopa_02), BTL_TRD_PART_1_FORMATION_0A, BTL_TRD_PART_1_STAGE_03), + NPC_GROUP(N(NpcData_KoopaTroopa), BTL_TRD_1_FORMATION_01, BTL_TRD_1_STAGE_03), + NPC_GROUP(N(NpcData_ParaTroopa_01), BTL_TRD_1_FORMATION_08, BTL_TRD_1_STAGE_03), + NPC_GROUP(N(NpcData_ParaTroopa_02), BTL_TRD_1_FORMATION_0A, BTL_TRD_1_STAGE_03), {} }; diff --git a/src/world/area_trd/trd_08/trd_08_3_npc.c b/src/world/area_trd/trd_08/trd_08_3_npc.c index 36b636fc13..49803883b9 100644 --- a/src/world/area_trd/trd_08/trd_08_3_npc.c +++ b/src/world/area_trd/trd_08/trd_08_3_npc.c @@ -217,7 +217,7 @@ NpcData N(NpcData_05)[] = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_00), BTL_KMR_PART_1_FORMATION_06), - NPC_GROUP(N(NpcData_05), BTL_KMR_PART_1_FORMATION_06), + NPC_GROUP(N(NpcData_00), BTL_KMR_1_FORMATION_06), + NPC_GROUP(N(NpcData_05), BTL_KMR_1_FORMATION_06), {} }; diff --git a/src/world/area_trd/trd_09/trd_09_3_npc.c b/src/world/area_trd/trd_09/trd_09_3_npc.c index 3de26596d9..4abdc263f9 100644 --- a/src/world/area_trd/trd_09/trd_09_3_npc.c +++ b/src/world/area_trd/trd_09/trd_09_3_npc.c @@ -660,17 +660,17 @@ NpcData N(NpcData_KoopaBros)[] = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_BillBlasters), BTL_TRD_PART_1_FORMATION_17, BTL_TRD_PART_1_STAGE_06), - NPC_GROUP(N(NpcData_BulletBill_01), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), - NPC_GROUP(N(NpcData_BulletBill_02), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), - NPC_GROUP(N(NpcData_BulletBill_03), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), - NPC_GROUP(N(NpcData_BulletBill_04), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), - NPC_GROUP(N(NpcData_BulletBill_05), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), - NPC_GROUP(N(NpcData_BulletBill_06), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), - NPC_GROUP(N(NpcData_BulletBill_07), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), - NPC_GROUP(N(NpcData_BulletBill_08), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), - NPC_GROUP(N(NpcData_BulletBill_09), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), - NPC_GROUP(N(NpcData_BulletBill_10), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BillBlasters), BTL_TRD_1_FORMATION_17, BTL_TRD_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_01), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_02), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_03), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_04), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_05), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_06), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_07), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_08), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_09), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_10), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), NPC_GROUP(N(NpcData_KoopaBros)), {} }; @@ -941,10 +941,10 @@ NpcData N(NpcData_BulletBill_Demo5) = { }; NpcGroupList N(DemoNPCs) = { - NPC_GROUP(N(NpcData_BulletBill_Demo1), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), - NPC_GROUP(N(NpcData_BulletBill_Demo2), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), - NPC_GROUP(N(NpcData_BulletBill_Demo3), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), - NPC_GROUP(N(NpcData_BulletBill_Demo4), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), - NPC_GROUP(N(NpcData_BulletBill_Demo5), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_Demo1), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_Demo2), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_Demo3), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_Demo4), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_Demo5), BTL_TRD_1_FORMATION_1A, BTL_TRD_1_STAGE_06), {} }; diff --git a/src/world/area_trd/trd_10/trd_10_2_npc.c b/src/world/area_trd/trd_10/trd_10_2_npc.c index 3bc4095e0a..f1f69bc863 100644 --- a/src/world/area_trd/trd_10/trd_10_2_npc.c +++ b/src/world/area_trd/trd_10/trd_10_2_npc.c @@ -443,6 +443,6 @@ NpcData N(NpcData_KoopaBros_01)[] = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_KoopaBros_01), BTL_TRD_PART_2_FORMATION_00), + NPC_GROUP(N(NpcData_KoopaBros_01), BTL_TRD_2_FORMATION_00), {} }; diff --git a/src/world/common/enemy/ai/MagikoopaAI.inc.c b/src/world/common/enemy/ai/MagikoopaAI.inc.c index affb76b6ee..efca6a7e01 100644 --- a/src/world/common/enemy/ai/MagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/MagikoopaAI.inc.c @@ -109,8 +109,8 @@ void N(MagikoopaAI_11)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol } else { alpha = (npc->duration * 15) + 30; } - if (alpha > 0xFF) { - alpha = 0xFF; + if (alpha > 255) { + alpha = 255; } npc->alpha = alpha; @@ -128,15 +128,15 @@ void N(MagikoopaAI_11)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVol } if (enemy->varTable[0] == 0) { if (npc->duration >= 20) { - func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); - npc->alpha = 0xFF; + func_802DE894(npc->spriteInstanceID, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); + npc->alpha = 255; npc->scale.x = 1.0f; npc->scale.y = 1.0f; npc->scale.z = 1.0f; script->AI_TEMP_STATE = 20; } } else if (npc->duration >= 10) { - npc->alpha = 0xFF; + npc->alpha = 255; npc->scale.x = 1.0f; npc->scale.y = 1.0f; npc->scale.z = 1.0f; @@ -311,7 +311,7 @@ API_CALLABLE(N(MagikoopaAI_OnPlayerWon)) { Npc* npc = get_npc_unsafe(enemy->npcID); npc->alpha = 255; - func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); + func_802DE894(npc->spriteInstanceID, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } diff --git a/src/world/common/enemy/ai/SentinelAI.inc.c b/src/world/common/enemy/ai/SentinelAI.inc.c index 413355cb3b..838b3aea55 100644 --- a/src/world/common/enemy/ai/SentinelAI.inc.c +++ b/src/world/common/enemy/ai/SentinelAI.inc.c @@ -131,7 +131,7 @@ void N(SentinelAI_Descend)(Evt* script, MobileAISettings* aiSettings, EnemyDetec npc->rotation.y -= 360.0; } color = 255.0f - (cosine((s32)npc->rotation.y % 180) * 56.0f); - func_802DE894(npc->spriteInstanceID, 6, color, color, color, 255, 0); + func_802DE894(npc->spriteInstanceID, FOLD_TYPE_6, color, color, color, 255, 0); posX = gPlayerStatusPtr->position.x; posY = gPlayerStatusPtr->position.y; @@ -160,7 +160,7 @@ void N(SentinelAI_LosePlayerInit)(Evt* script, MobileAISettings* aiSettings, Ene Npc* npc = get_npc_unsafe(enemy->npcID); enemy->varTable[0] &= ~SENTINEL_AI_FLAG_CHASING; - func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); + func_802DE894(npc->spriteInstanceID, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); if (enemy->varTable[0] & SENTINEL_AI_FLAG_PLAYING_SOUND) { sfx_stop_sound(SOUND_80000011); enemy->varTable[0] &= ~SENTINEL_AI_FLAG_PLAYING_SOUND; @@ -299,7 +299,7 @@ API_CALLABLE(N(SentinelAI_Main)) { switch (script->AI_TEMP_STATE) { case AI_STATE_SENTINEL_WANDER_INIT: N(FlyingAI_WanderInit)(script, aiSettings, territoryPtr); - func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); + func_802DE894(npc->spriteInstanceID, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); // fallthrough case AI_STATE_SENTINEL_WANDER: N(FlyingAI_Wander)(script, aiSettings, territoryPtr); diff --git a/src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c b/src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c index 05429b13f2..b6dc226711 100644 --- a/src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c +++ b/src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c @@ -58,7 +58,7 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_DEFAULT() EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_WAIT(1) diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_1_main.c b/src/world/dead/area_kzn/kzn_17/kzn_17_1_main.c index ff1087e1ba..41a08381e5 100644 --- a/src/world/dead/area_kzn/kzn_17/kzn_17_1_main.c +++ b/src/world/dead/area_kzn/kzn_17/kzn_17_1_main.c @@ -24,7 +24,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC(EnterWalk) EVT_WAIT(1) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_EXEC(N(EVS_SetupSpinyTromp)) EVT_SET(LVar0, MODEL_kem1) EVT_EXEC(N(EVS_StartTexPanner_SmokeLeft)) diff --git a/src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c b/src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c index afdcaa7e6b..6468121703 100644 --- a/src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c +++ b/src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c @@ -77,7 +77,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_EnterMap)) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_IF_LT(GB_StoryProgress, STORY_CH5_OPENED_ESCAPE_ROUTE) EVT_CALL(EnableModel, MODEL_off1, FALSE) EVT_CALL(EnableModel, MODEL_o506, FALSE) diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_1_music.c b/src/world/dead/area_kzn/kzn_19/kzn_19_1_music.c index e1e44ea3e4..1e093561ec 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_1_music.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_1_music.c @@ -6,7 +6,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, kzn_19_ENTRY_1) EVT_CALL(FadeOutMusic, 0, 500) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_RETURN EVT_END_IF EVT_END_IF //@bug extra endif @@ -14,7 +14,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(PlaySound, SOUND_8000006B) EVT_END_SWITCH EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_RETURN EVT_END }; diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_1_music.c b/src/world/dead/area_kzn/kzn_20/kzn_20_1_music.c index a3d29bcd42..b492956812 100644 --- a/src/world/dead/area_kzn/kzn_20/kzn_20_1_music.c +++ b/src/world/dead/area_kzn/kzn_20/kzn_20_1_music.c @@ -6,10 +6,10 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_IF EVT_IF_LT(GB_StoryProgress, STORY_CH5_OPENED_ESCAPE_ROUTE) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA3) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_3) EVT_ELSE EVT_CALL(SetMusicTrack, 0, SONG_VOLCANO_ESCAPE, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_1_music.c b/src/world/dead/area_kzn/kzn_22/kzn_22_1_music.c index 3ba85d9554..01dbe5e059 100644 --- a/src/world/dead/area_kzn/kzn_22/kzn_22_1_music.c +++ b/src/world/dead/area_kzn/kzn_22/kzn_22_1_music.c @@ -5,7 +5,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(PlaySound, SOUND_8000006B) EVT_END_IF EVT_CALL(SetMusicTrack, 0, SONG_VOLCANO_ESCAPE, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA4) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_4) EVT_RETURN EVT_END }; diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23_1_music.c b/src/world/dead/area_kzn/kzn_23/kzn_23_1_music.c index 13acc8dd42..147f1ecdb1 100644 --- a/src/world/dead/area_kzn/kzn_23/kzn_23_1_music.c +++ b/src/world/dead/area_kzn/kzn_23/kzn_23_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_VOLCANO_ESCAPE, 0, 8) - EVT_CALL(PlayAmbientSounds, AMBIENT_EXIT_SEA) + EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_5) EVT_RETURN EVT_END }; diff --git a/tools/disasm_script.py b/tools/disasm_script.py index 4070fb7f1b..aece959b08 100755 --- a/tools/disasm_script.py +++ b/tools/disasm_script.py @@ -404,7 +404,7 @@ replace_funcs = { "func_8026ED20" :{0:"ActorIDs"}, "func_8027D32C" :{0:"ActorIDs"}, "func_8027D434" :{0:"ActorIDs"}, - "func_8027D4C8" :{0:"ActorIDs"}, + "SetProjectileTargetOffset" :{0:"ActorIDs"}, "GetInstigatorValue" :{0:"ActorIDs"}, "func_802CFD30" :{0:"NpcIDs"}, "func_802CFE2C" :{0:"NpcIDs"}, diff --git a/ver/jp/undefined_funcs_auto.txt b/ver/jp/undefined_funcs_auto.txt index 724b94f2ab..e69de29bb2 100644 --- a/ver/jp/undefined_funcs_auto.txt +++ b/ver/jp/undefined_funcs_auto.txt @@ -1,82 +0,0 @@ - -b_area_kzn2_dmaTable = 0x8022AA84; -b_area_kmr_part_1_formationTable = 0x802194D4; -b_area_kmr_part_1_stageTable = 0x802195D8; -b_area_kmr_part_2_formationTable = 0x80219840; -b_area_kmr_part_2_stageTable = 0x8021987C; -b_area_kmr_part_3_formationTable = 0x8021A2AC; -b_area_kmr_part_3_stageTable = 0x8021A360; -b_area_mac_formationTable = 0x80232A5C; -b_area_mac_stageTable = 0x80232AD4; -b_area_hos_formationTable = 0x80225F24; -b_area_hos_stageTable = 0x80225F88; -b_area_nok_formationTable = 0x80219520; -b_area_nok_stageTable = 0x80219728; -b_area_trd_part_1_formationTable = 0x80218CB0; -b_area_trd_part_1_stageTable = 0x80218EE0; -b_area_trd_part_2_formationTable = 0x8021A5DC; -b_area_trd_part_2_stageTable = 0x8021A604; -b_area_trd_part_3_formationTable = 0x8021823C; -b_area_trd_part_3_stageTable = 0x80218264; -b_area_iwa_formationTable = 0x802185B8; -b_area_iwa_stageTable = 0x802186E4; -b_area_sbk_formationTable = 0x8021FE80; -b_area_sbk_stageTable = 0x8021FFE8; -b_area_isk_part_1_formationTable = 0x80224700; -b_area_isk_part_1_stageTable = 0x802248A4; -b_area_isk_part_2_formationTable = 0x80220448; -b_area_isk_part_2_stageTable = 0x80220470; -b_area_mim_formationTable = 0x8021EA70; -b_area_mim_stageTable = 0x8021EBEC; -b_area_arn_formationTable = 0x80228110; -b_area_arn_stageTable = 0x80228278; -b_area_dgb_formationTable = 0x8021B38C; -b_area_dgb_stageTable = 0x8021B418; -b_area_omo_formationTable = 0x80230730; -b_area_omo_stageTable = 0x80230AC8; -b_area_omo2_formationTable = 0x8022FBF4; -b_area_omo2_stageTable = 0x8022FC1C; -b_area_omo3_formationTable = 0x8022EA2C; -b_area_omo3_stageTable = 0x8022EB1C; -b_area_kgr_formationTable = 0x8021D5FC; -b_area_kgr_stageTable = 0x8021D624; -b_area_jan_formationTable = 0x80228AF8; -b_area_jan_stageTable = 0x80228C60; -b_area_jan2_formationTable = 0x8021F6C8; -b_area_jan2_stageTable = 0x8021F72C; -b_area_kzn_formationTable = 0x80229E74; -b_area_kzn_stageTable = 0x8022A02C; -b_area_kzn2_formationTable = 0x8022AA08; -b_area_kzn2_stageTable = 0x8022AA44; -b_area_flo_formationTable = 0x80234574; -b_area_flo_stageTable = 0x8023486C; -b_area_flo2_formationTable = 0x802356FC; -b_area_flo2_stageTable = 0x80235788; -b_area_tik_formationTable = 0x802340B4; -b_area_tik_stageTable = 0x802342BC; -b_area_tik2_formationTable = 0x80227A90; -b_area_tik2_stageTable = 0x80227AE0; -b_area_tik3_formationTable = 0x802232E8; -b_area_tik3_stageTable = 0x8022334C; -b_area_sam_formationTable = 0x80231164; -b_area_sam_stageTable = 0x80231290; -b_area_sam2_formationTable = 0x802234F0; -b_area_sam2_stageTable = 0x8022352C; -b_area_pra_formationTable = 0x8022F4D4; -b_area_pra_stageTable = 0x8022F614; -b_area_pra2_formationTable = 0x802215A0; -b_area_pra2_stageTable = 0x802215C8; -b_area_pra3_formationTable = 0x80232888; -b_area_pra3_stageTable = 0x8023298C; -b_area_kpa_formationTable = 0x80231A64; -b_area_kpa_stageTable = 0x80231ED8; -b_area_kpa2_formationTable = 0x802346A8; -b_area_kpa2_stageTable = 0x80234720; -b_area_kpa3_formationTable = 0x8022839C; -b_area_kpa3_stageTable = 0x802283EC; -b_area_kpa4_formationTable = 0x80227910; -b_area_kpa4_stageTable = 0x80227988; -b_area_kkj_formationTable = 0x802185BC; -b_area_kkj_stageTable = 0x802185E4; -b_area_dig_formationTable = 0x8022A7C4; -b_area_dig_stageTable = 0x8022A83C; diff --git a/ver/jp/undefined_syms.txt b/ver/jp/undefined_syms.txt index e3cfd085df..1424eeaa95 100644 --- a/ver/jp/undefined_syms.txt +++ b/ver/jp/undefined_syms.txt @@ -1001,3 +1001,84 @@ pink_sparkles_main = 0xE0124000; // segment:effect_pink_sparkles star_outline_main = 0xE0126000; // segment:effect_star_outline fx_86_main = 0xE0128000; // segment:effect_effect_86 +b_area_kzn2_dmaTable = 0x8022AA84; +b_area_kmr_part_1_Formations = 0x802194D4; +b_area_kmr_part_1_Stages = 0x802195D8; +b_area_kmr_part_2_Formations = 0x80219840; +b_area_kmr_part_2_Stages = 0x8021987C; +b_area_kmr_part_3_Formations = 0x8021A2AC; +b_area_kmr_part_3_Stages = 0x8021A360; +b_area_mac_Formations = 0x80232A5C; +b_area_mac_Stages = 0x80232AD4; +b_area_hos_Formations = 0x80225F24; +b_area_hos_Stages = 0x80225F88; +b_area_nok_Formations = 0x80219520; +b_area_nok_Stages = 0x80219728; +b_area_trd_part_1_Formations = 0x80218CB0; +b_area_trd_part_1_Stages = 0x80218EE0; +b_area_trd_part_2_Formations = 0x8021A5DC; +b_area_trd_part_2_Stages = 0x8021A604; +b_area_trd_part_3_Formations = 0x8021823C; +b_area_trd_part_3_Stages = 0x80218264; +b_area_iwa_Formations = 0x802185B8; +b_area_iwa_Stages = 0x802186E4; +b_area_sbk_Formations = 0x8021FE80; +b_area_sbk_Stages = 0x8021FFE8; +b_area_isk_part_1_Formations = 0x80224700; +b_area_isk_part_1_Stages = 0x802248A4; +b_area_isk_part_2_Formations = 0x80220448; +b_area_isk_part_2_Stages = 0x80220470; +b_area_mim_Formations = 0x8021EA70; +b_area_mim_Stages = 0x8021EBEC; +b_area_arn_Formations = 0x80228110; +b_area_arn_Stages = 0x80228278; +b_area_dgb_Formations = 0x8021B38C; +b_area_dgb_Stages = 0x8021B418; +b_area_omo_Formations = 0x80230730; +b_area_omo_Stages = 0x80230AC8; +b_area_omo2_Formations = 0x8022FBF4; +b_area_omo2_Stages = 0x8022FC1C; +b_area_omo3_Formations = 0x8022EA2C; +b_area_omo3_Stages = 0x8022EB1C; +b_area_kgr_Formations = 0x8021D5FC; +b_area_kgr_Stages = 0x8021D624; +b_area_jan_Formations = 0x80228AF8; +b_area_jan_Stages = 0x80228C60; +b_area_jan2_Formations = 0x8021F6C8; +b_area_jan2_Stages = 0x8021F72C; +b_area_kzn_Formations = 0x80229E74; +b_area_kzn_Stages = 0x8022A02C; +b_area_kzn2_Formations = 0x8022AA08; +b_area_kzn2_Stages = 0x8022AA44; +b_area_flo_Formations = 0x80234574; +b_area_flo_Stages = 0x8023486C; +b_area_flo2_Formations = 0x802356FC; +b_area_flo2_Stages = 0x80235788; +b_area_tik_Formations = 0x802340B4; +b_area_tik_Stages = 0x802342BC; +b_area_tik2_Formations = 0x80227A90; +b_area_tik2_Stages = 0x80227AE0; +b_area_tik3_Formations = 0x802232E8; +b_area_tik3_Stages = 0x8022334C; +b_area_sam_Formations = 0x80231164; +b_area_sam_Stages = 0x80231290; +b_area_sam2_Formations = 0x802234F0; +b_area_sam2_Stages = 0x8022352C; +b_area_pra_Formations = 0x8022F4D4; +b_area_pra_Stages = 0x8022F614; +b_area_pra2_Formations = 0x802215A0; +b_area_pra2_Stages = 0x802215C8; +b_area_pra3_Formations = 0x80232888; +b_area_pra3_Stages = 0x8023298C; +b_area_kpa_Formations = 0x80231A64; +b_area_kpa_Stages = 0x80231ED8; +b_area_kpa2_Formations = 0x802346A8; +b_area_kpa2_Stages = 0x80234720; +b_area_kpa3_Formations = 0x8022839C; +b_area_kpa3_Stages = 0x802283EC; +b_area_kpa4_Formations = 0x80227910; +b_area_kpa4_Stages = 0x80227988; +b_area_kkj_Formations = 0x802185BC; +b_area_kkj_Stages = 0x802185E4; +b_area_dig_Formations = 0x8022A7C4; +b_area_dig_Stages = 0x8022A83C; diff --git a/ver/us/asm/data/battle/move/d_down_jump/781AF0.data.s b/ver/us/asm/data/battle/move/d_down_jump/781AF0.data.s deleted file mode 100644 index 88d8ce08e7..0000000000 --- a/ver/us/asm/data/battle/move/d_down_jump/781AF0.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A11D0_781AF0 -.word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 - -dlabel D_802A1210_781B30 -.word 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CheckButtonPress, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A128C_781BAC -.word 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A1210_781B30, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1400_781D20 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A14E8_781E08 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15D0_781EF0 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A16B8_781FD8 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_d_down_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_d_down_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1A90_7823B0 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_d_down_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_d_down_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_d_down_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A20CC_7829EC -.word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2264_782B84 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A128C_781BAC, 0x00000046, 0x00000001, D_802A1400_781D20, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A128C_781BAC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A14E8_781E08, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A128C_781BAC, 0x00000046, 0x00000001, D_802A15D0_781EF0, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A11D0_781AF0, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_d_down_jump_main -.word 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000002, func_80269EAC, 0x00000004, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2784_7830A4, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2B24_783444, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2EE0_783800, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2784_7830A4 -.word 0x00000046, 0x00000001, D_802A2264_782B84, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A20CC_7829EC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C8A, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10E4_781A04, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000015A, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000080, 0x00000000, 0x00000000, 0x00000001, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000080, 0x00000000, 0x00000000, 0x00000001, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A90_7823B0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0x00000018, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000003, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10E4_781A04, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000080, 0x00000000, 0x00000000, 0x00000001, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A16B8_781FD8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2B24_783444 -.word 0x00000046, 0x00000001, D_802A2264_782B84, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A20CC_7829EC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10E4_781A04, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000080, 0x00000000, 0x00000000, 0x00000002, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000080, 0x00000000, 0x00000000, 0x00000002, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A90_7823B0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0x00000025, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0x00000014, 0x00000004, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10E4_781A04, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000080, 0x00000000, 0x00000000, 0x00000002, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A16B8_781FD8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2EE0_783800 -.word 0x00000046, 0x00000001, D_802A2264_782B84, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A20CC_7829EC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10E4_781A04, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000080, 0x00000000, 0x00000000, 0x00000003, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000080, 0x00000000, 0x00000000, 0x00000003, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A90_7823B0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001C, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0x00000019, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010007, 0x0001000C, 0x00000043, 0x00000003, func_80275F00, 0x00000019, 0x00000004, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10E4_781A04, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000080, 0x00000000, 0x00000000, 0x00000003, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A16B8_781FD8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/d_down_pound/74AF40.data.s b/ver/us/asm/data/battle/move/d_down_pound/74AF40.data.s deleted file mode 100644 index 84e2ab143e..0000000000 --- a/ver/us/asm/data/battle/move/d_down_pound/74AF40.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A11B0_74AF40 -.word 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000020, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A128C_74B01C -.word 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFFFFFFDF, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1304_74B094 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1488_74B218 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A160C_74B39C -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0x00000024, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A19AC_74B73C -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000004, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1B64_74B8F4 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1C40_74B9D0 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11B0_74AF40, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1304_74B094, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_d_down_pound_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_d_down_pound_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2100_74BE90 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11B0_74AF40, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1488_74B218, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_d_down_pound_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_d_down_pound_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A24E8_74C278 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11B0_74AF40, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A160C_74B39C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_d_down_pound_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_d_down_pound_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A128C_74B01C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1304_74B094, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_d_down_pound_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A128C_74B01C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1488_74B218, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_d_down_pound_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A128C_74B01C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A160C_74B39C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_d_down_pound_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_d_down_pound_main -.word 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000002, func_80269EAC, 0x00000003, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A3278_74D008, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3278_74D008, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3278_74D008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3278_74D008 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1C40_74B9D0, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2100_74BE90, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A24E8_74C278, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x08000040, 0x00000019, 0x00000000, 0xFE363C89, 0x00000010, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000032, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210A, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210B, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210C, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1B64_74B8F4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C8A, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A10A4_74AE34, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x08000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A19AC_74B73C, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1B64_74B8F4, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/dizzy_stomp/748EC0.data.s b/ver/us/asm/data/battle/move/dizzy_stomp/748EC0.data.s deleted file mode 100644 index 3cc64a44c5..0000000000 --- a/ver/us/asm/data/battle/move/dizzy_stomp/748EC0.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A10F0_748EC0 -.word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 - -dlabel D_802A1130_748F00 -.word 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CheckButtonPress, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A11AC_748F7C -.word 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A1130_748F00, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1320_7490F0 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1408_7491D8 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A14F0_7492C0 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15D8_7493A8 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_dizzy_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_dizzy_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A19B0_749780 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_dizzy_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_dizzy_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_dizzy_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1FEC_749DBC -.word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2184_749F54 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_748F7C, 0x00000046, 0x00000001, D_802A1320_7490F0, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_748F7C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_7491D8, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_748F7C, 0x00000046, 0x00000001, D_802A14F0_7492C0, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A10F0_748EC0, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_dizzy_stomp_main -.word 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2694_74A464, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2980_74A750, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2CAC_74AA7C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2694_74A464 -.word 0x00000046, 0x00000001, D_802A2184_749F54, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_749DBC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8004034B, 0x00000001, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8004034B, 0x00000001, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19B0_749780, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0x00000018, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x80040364, 0x00000001, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A15D8_7493A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2980_74A750 -.word 0x00000046, 0x00000001, D_802A2184_749F54, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_749DBC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8004034B, 0x00000002, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8004034B, 0x00000002, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19B0_749780, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0x00000025, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0x00000014, 0x00000004, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x80040364, 0x00000002, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A15D8_7493A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2CAC_74AA7C -.word 0x00000046, 0x00000001, D_802A2184_749F54, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_749DBC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8004034B, 0x00000003, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8004034B, 0x00000003, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19B0_749780, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001C, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0x00000019, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010007, 0x0001000C, 0x00000043, 0x00000003, func_80275F00, 0x00000019, 0x00000004, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x80040364, 0x00000003, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A15D8_7493A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/earthquake_jump/785C20.data.s b/ver/us/asm/data/battle/move/earthquake_jump/785C20.data.s deleted file mode 100644 index a3e7c2c77a..0000000000 --- a/ver/us/asm/data/battle/move/earthquake_jump/785C20.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A1100_785C20 -.word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 - -dlabel D_802A1140_785C60 -.word 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CheckButtonPress, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A11BC_785CDC -.word 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A1140_785C60, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1330_785E50 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1418_785F38 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1500_786020 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15E8_786108 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_earthquake_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_earthquake_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A19C0_7864E0 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_earthquake_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_earthquake_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_earthquake_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11BC_785CDC, 0x00000046, 0x00000001, D_802A1330_785E50, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11BC_785CDC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1418_785F38, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11BC_785CDC, 0x00000046, 0x00000001, D_802A1500_786020, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A1100_785C20, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2610_787130 -.word 0x0000000B, 0x0000000A, 0x00000009, 0x00000008, 0x00000007, 0x00000006, 0x00000005, 0x00000004 - -dlabel battle_move_earthquake_jump_main -.word 0x00000024, 0x00000002, 0xFBD3E28A, 0x00000000, 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A26D4_7871F4, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3560_788080, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A4470_788F90, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A26D4_7871F4 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1330_785E50, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00030000, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7C1A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7AE7, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7AB4, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x18000800, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000030, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8C, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19C0_7864E0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A2610_787130, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001A, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000004, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000004, 0x00000013, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7C1A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7AE7, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7AB4, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetCommandAutoSuccess, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000003, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, func_802A10E4_785C04, 0x0000000D, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x18000800, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000040, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x000000E0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000003, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8C, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15E8_786108, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A19C0_7864E0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15E8_786108, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3560_788080 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1140_785C60, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000046, 0x00000001, D_802A1330_785E50, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00030000, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7C1A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7AE7, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7AB4, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x18000800, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000030, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8C, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19C0_7864E0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A2610_787130, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000027, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000004, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000014, 0x00000003, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000006, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000014, 0x00000004, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7C1A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7AE7, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7AB4, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetCommandAutoSuccess, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, func_802A10E4_785C04, 0x0000000D, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x18000800, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000040, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x000000E0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000003, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8C, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15E8_786108, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A19C0_7864E0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15E8_786108, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A4470_788F90 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1140_785C60, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000046, 0x00000001, D_802A1330_785E50, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00030000, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7C1A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7AE7, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7AB4, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x18000800, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000030, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8C, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19C0_7864E0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001C, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A2610_787130, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001B, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000004, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010007, 0x0001000C, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000043, 0x00000003, func_80275F00, 0x00000019, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_80275F00, 0x00000019, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7C1A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7AE7, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7AB4, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetCommandAutoSuccess, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000001, func_802A10E4_785C04, 0x0000000D, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x18000800, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000040, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x000000E0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C8C, 0x38000800, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000003, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8C, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15E8_786108, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A19C0_7864E0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15E8_786108, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/hammer_charge_0/74F3D0.data.s b/ver/us/asm/data/battle/move/hammer_charge_0/74F3D0.data.s deleted file mode 100644 index efa972bcf8..0000000000 --- a/ver/us/asm/data/battle/move/hammer_charge_0/74F3D0.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A12A0_74F3D0 -.word 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000020, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A137C_74F4AC -.word 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFFFFFFDF, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A13F4_74F524 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1578_74F6A8 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A16FC_74F82C -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0x00000024, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1A9C_74FBCC -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000004, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1C54_74FD84 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1D30_74FE60 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A12A0_74F3D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A13F4_74F524, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_hammer_charge_0_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A21F0_750320 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A12A0_74F3D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1578_74F6A8, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_0_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A12A0_74F3D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A16FC_74F82C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_0_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A137C_74F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A13F4_74F524, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_hammer_charge_0_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A137C_74F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1578_74F6A8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_0_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A137C_74F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A16FC_74F82C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_0_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_hammer_charge_0_802A3234 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A3348_751478, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3348_751478, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3348_751478, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3348_751478 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1D30_74FE60, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A21F0_750320, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1D30_74FE60, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C89, 0x00000010, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1C54_74FD84, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000030, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000020, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A1A9C_74FBCC, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1C54_74FD84, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_hammer_charge_0_802A38C4 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A3948_751A78, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3C90_751DC0, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A3FD8_752108, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3948_751A78 -.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00050004, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802A11CC_74F2FC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, func_802A11CC_74F2FC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsHammerMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000004, func_802A10C8_74F1F8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00050005, 0x00050005, 0x00050005, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000004, ShowVariableMessageBox, 0x00000004, 0x0000003C, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3C90_751DC0 -.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00050006, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802A11CC_74F2FC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, func_802A11CC_74F2FC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsHammerMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000004, func_802A10C8_74F1F8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00050007, 0x00050007, 0x00050007, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000004, ShowVariableMessageBox, 0x00000004, 0x0000003C, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3FD8_752108 -.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00050008, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802A11CC_74F2FC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, func_802A11CC_74F2FC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_hammer_charge_0_IsHammerMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000004, func_802A10C8_74F1F8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00050009, 0x00050009, 0x00050009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000004, ShowVariableMessageBox, 0x00000004, 0x0000003C, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/hammer_charge_1/7598D0.data.s b/ver/us/asm/data/battle/move/hammer_charge_1/7598D0.data.s deleted file mode 100644 index d93bcb1b16..0000000000 --- a/ver/us/asm/data/battle/move/hammer_charge_1/7598D0.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A1320_7598D0 -.word 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000020, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A13FC_7599AC -.word 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFFFFFFDF, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1474_759A24 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15F8_759BA8 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A177C_759D2C -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0x00000024, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1B1C_75A0CC -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000004, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1CD4_75A284 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1DB0_75A360 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A1320_7598D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1474_759A24, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_hammer_charge_1_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2270_75A820 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A1320_7598D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15F8_759BA8, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_1_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A1320_7598D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A177C_759D2C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_1_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A13FC_7599AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1474_759A24, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_hammer_charge_1_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A13FC_7599AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15F8_759BA8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_1_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A13FC_7599AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A177C_759D2C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_1_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_hammer_charge_1_802A32B4 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A33C8_75B978, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A33C8_75B978, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A33C8_75B978, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A33C8_75B978 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1DB0_75A360, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2270_75A820, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1DB0_75A360, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C89, 0x00000010, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1CD4_75A284, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000030, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000020, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A1B1C_75A0CC, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1CD4_75A284, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_hammer_charge_1_802A3944 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A39C8_75BF78, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3D1C_75C2CC, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A4070_75C620, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A39C8_75BF78 -.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00050004, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, battle_move_hammer_charge_1_UnkMoveFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, battle_move_hammer_charge_1_UnkMoveFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsHammerMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000004, func_802A10C8_759678, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00050005, 0x00050005, 0x00050005, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_802A12FC_7598AC, 0x00000043, 0x00000004, ShowVariableMessageBox, 0xFE363C80, 0x0000003C, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3D1C_75C2CC -.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00050006, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, battle_move_hammer_charge_1_UnkMoveFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, battle_move_hammer_charge_1_UnkMoveFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsHammerMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000004, func_802A10C8_759678, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00050007, 0x00050007, 0x00050007, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_802A12FC_7598AC, 0x00000043, 0x00000004, ShowVariableMessageBox, 0xFE363C80, 0x0000003C, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A4070_75C620 -.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00050008, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, battle_move_hammer_charge_1_UnkMoveFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, battle_move_hammer_charge_1_UnkMoveFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_hammer_charge_1_IsHammerMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000004, func_802A10C8_759678, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00050009, 0x00050009, 0x00050009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_802A12FC_7598AC, 0x00000043, 0x00000004, ShowVariableMessageBox, 0xFE363C80, 0x0000003C, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/hammer_charge_2/75E8F0.data.s b/ver/us/asm/data/battle/move/hammer_charge_2/75E8F0.data.s deleted file mode 100644 index 94d6294ff7..0000000000 --- a/ver/us/asm/data/battle/move/hammer_charge_2/75E8F0.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A1320_75E8F0 -.word 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000020, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A13FC_75E9CC -.word 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFFFFFFDF, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1474_75EA44 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15F8_75EBC8 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A177C_75ED4C -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0x00000024, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1B1C_75F0EC -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000004, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1CD4_75F2A4 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1DB0_75F380 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A1320_75E8F0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1474_75EA44, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_hammer_charge_2_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2270_75F840 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A1320_75E8F0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15F8_75EBC8, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_2_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A1320_75E8F0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A177C_75ED4C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_2_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A13FC_75E9CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1474_75EA44, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_hammer_charge_2_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A13FC_75E9CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15F8_75EBC8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_charge_2_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A13FC_75E9CC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A177C_75ED4C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_charge_2_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_hammer_charge_2_802A32B4 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A33C8_760998, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A33C8_760998, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000041, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A33C8_760998, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A33C8_760998 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1DB0_75F380, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2270_75F840, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1DB0_75F380, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C89, 0x00000010, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1CD4_75F2A4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000030, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000020, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A1B1C_75F0EC, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1CD4_75F2A4, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_hammer_charge_2_802A3944 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A39C8_760F98, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3CF4_7612C4, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A4020_7615F0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A39C8_760F98 -.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00050004, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, battle_move_hammer_charge_2_UnkMoveFunc3, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, battle_move_hammer_charge_2_UnkMoveFunc3, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsHammerMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000004, func_802A10C8_75E698, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00050005, 0x00050005, 0x00050005, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000001, func_802A12FC_75E8CC, 0x00000043, 0x00000004, ShowVariableMessageBox, 0xFE363C80, 0x0000003C, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3CF4_7612C4 -.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00050006, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, battle_move_hammer_charge_2_UnkMoveFunc3, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, battle_move_hammer_charge_2_UnkMoveFunc3, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsHammerMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000004, func_802A10C8_75E698, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00050007, 0x00050007, 0x00050007, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000001, func_802A12FC_75E8CC, 0x00000043, 0x00000004, ShowVariableMessageBox, 0xFE363C80, 0x0000003C, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A4020_7615F0 -.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00050008, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, battle_move_hammer_charge_2_UnkMoveFunc3, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, battle_move_hammer_charge_2_UnkMoveFunc3, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_hammer_charge_2_IsHammerMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000004, func_802A10C8_75E698, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00050009, 0x00050009, 0x00050009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000001, func_802A12FC_75E8CC, 0x00000043, 0x00000004, ShowVariableMessageBox, 0xFE363C80, 0x0000003C, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/hammer_throw/752500.data.s b/ver/us/asm/data/battle/move/hammer_throw/752500.data.s deleted file mode 100644 index cb94b1902d..0000000000 --- a/ver/us/asm/data/battle/move/hammer_throw/752500.data.s +++ /dev/null @@ -1,87 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A10B0_752500 -.word 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000020, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A118C_7525DC -.word 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFFFFFFDF, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1204_752654 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1388_7527D8 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A150C_75295C -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0x00000024, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A18AC_752CFC -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000004, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1A64_752EB4 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_752500, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_752654, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_throw_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_hammer_throw_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_752500, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_7527D8, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_throw_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_throw_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_752500, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_75295C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_hammer_throw_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_throw_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_7525DC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_752654, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_hammer_throw_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_7525DC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_7527D8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_hammer_throw_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_7525DC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_75295C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_hammer_throw_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_802A3048_754498 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000AAAAA, 0x00000000, 0x00000000, 0x00000000, 0x0AAAAAAA, 0xAAA00000, 0x00000000, 0x00000000, 0xAAA47477, 0xAAAA0AAA, 0xA0000000, 0x0000000B, 0xB477333B, 0xB8AAAAAA, 0xAA000000, 0x000000BB, 0xEC738DE1, 0x1B88AAA2, 0xAAA00000, 0x00000BBE, 0x11C8C111, 0x11B88A32, 0x2AAA0000, 0x0000ABE1, 0x111C1111, 0x11B84333, 0x4AAA0000, 0x0000AAC1, 0x1111E111, 0xDB222434, 0xAAA00000, 0x000AA77C, 0x11111E1B, 0x8222224A, 0xAAA00000, 0x000AA733, 0xC11111B8, 0x22223222, 0x2AAA0000, 0x000AA43C, 0x1E11111B, 0x22222332, 0x22AAA000, 0x000AA7DF, 0x11E11111, 0xC2222233, 0x232AAA00, 0x000AA7E1, 0x111B1111, 0x1C222223, 0x3333AA00, 0x000AABF1, 0x11B3B111, 0xB2222337, 0x66764440, 0x000AABF1, 0x1D333B1B, 0x22223777, 0x76766440, 0x0000AABF, 0x1B2233B2, 0x22337667, 0x55556440, 0x0000AAAB, 0xB2222333, 0x33375675, 0x55557440, 0x00000AAA, 0x83222223, 0x33376655, 0x55554440, 0x000000AA, 0xA8332222, 0x37677555, 0x55574400, 0x00000AAA, 0x3A833323, 0x75675555, 0x55544400, 0x0000AAA3, 0x33A23333, 0x76655555, 0x55744000, 0x000AAA32, 0x34AA2233, 0x76555555, 0x57440000, 0x00AAA322, 0x4AAAA237, 0x77555555, 0x74440000, 0x0AAA3224, 0xAAAAAAA7, 0x66555557, 0x44400000, 0x0AA3224A, 0xAA00AAA7, 0x66655744, 0x44000000, 0x0AA224AA, 0xA0000AAA, 0x76744444, 0x40000000, 0x0AAA4AAA, 0x000000AA, 0xA4444440, 0x00000000, 0x00AAAAA0, 0x00000000, 0xA4444000, 0x00000000, 0x000AAA00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802A3248_754698 -.word 0x210CC631, 0xB4078AC7, 0x5A09E65B, 0xCD979C13, 0xA387B4D5, 0x30C72109, 0x39CF4A53, 0x63190001 - -dlabel D_802A3268_7546B8 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00AAAAAA, 0x00000000, 0x00000000, 0x00000000, 0xAAAAAAAA, 0xAA000000, 0x00000000, 0x0000000A, 0xAAA77A7A, 0xAAAA0AAA, 0xA0000000, 0x000000AA, 0xA7773338, 0x8AAAAAAA, 0xAA000000, 0x00000AAA, 0x77888833, 0x388AAAA2, 0xAAA00000, 0x0000AAA7, 0x78888888, 0x33888A32, 0x2AAA0000, 0x0000AA77, 0x33833888, 0x88884333, 0x4AAA0000, 0x000AAA78, 0x33883332, 0x22222434, 0xAAA00000, 0x000AA778, 0x88888333, 0x2222224A, 0xAAA00000, 0x000AA783, 0x88822233, 0x32222222, 0x2AAA0000, 0x000AAA83, 0x38222223, 0x33222322, 0x22AAA000, 0x000AA783, 0x38222222, 0x33222233, 0x232AAA00, 0x000AA788, 0x33222222, 0x22322223, 0x3333AA00, 0x000AAA88, 0x83322222, 0x22222337, 0x66764440, 0x0000AA88, 0x82322232, 0x22223777, 0x66766440, 0x0000AAA8, 0x82232223, 0x22227667, 0x55576440, 0x00000AA8, 0x82222223, 0x32375675, 0x55556440, 0x00000AAA, 0x82222222, 0x33376655, 0x55554440, 0x000000AA, 0xA8222222, 0x37677555, 0x55554400, 0x00000AAA, 0x3A822222, 0x75675555, 0x55544400, 0x0000AAA3, 0x33A22323, 0x76655555, 0x55544000, 0x000AAA32, 0x34AA2233, 0x77755555, 0x55440000, 0x00AAA322, 0x4AAAA233, 0x77555555, 0x54440000, 0x0AAA3224, 0xAAAAAAA7, 0x66555555, 0x44400000, 0x00A3224A, 0xAA00AAAA, 0x67655544, 0x44000000, 0x000224AA, 0xA0000AAA, 0xA6644444, 0x40000000, 0x00004AAA, 0x0000000A, 0xA4444440, 0x00000000, 0x000000A0, 0x00000000, 0x04444000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802A3468_7548B8 -.word 0x210CC631, 0xB4078AC7, 0x5A09E65B, 0xCD979C13, 0xA387B4D5, 0x30C72109, 0x39CF4A53, 0x63190001 - -dlabel D_802A3488_7548D8 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000BBBB, 0x00000000, 0x00000000, 0x00000000, 0x00BBBBBB, 0xBB000000, 0x00000000, 0x00000000, 0xBBBB7889, 0xBBB00011, 0x00000000, 0x0000000B, 0xBA766788, 0x99BB0111, 0x10000000, 0x000000BB, 0x97666678, 0x899B1112, 0x11000000, 0x00000BB9, 0x76766667, 0x88991132, 0x21100000, 0x00000BA8, 0x76676666, 0x7889B333, 0x41100000, 0x0000BB88, 0x87667666, 0x67889B34, 0x11000000, 0x0000BB88, 0x88766766, 0x667889B1, 0xB0000000, 0x000BB998, 0x88876676, 0x66678899, 0xBB000000, 0x000BB999, 0x88887667, 0x66667889, 0x9BB00000, 0x000BBA99, 0x98888766, 0x76666788, 0x99BB0000, 0x000BBAA9, 0x99888876, 0x67666678, 0xAAABB000, 0x000BBAAA, 0x99988887, 0x667667AA, 0x999BB000, 0x000BBAAA, 0xA9998888, 0x7667AA99, 0x9999BB00, 0x0000BBAA, 0xAA999888, 0x877A9999, 0x9999BB00, 0x0000BBAA, 0xAAA99988, 0x88A99999, 0x9999BB00, 0x00000BBA, 0xAAAA9998, 0x8A999999, 0x9999BB00, 0x000000BB, 0xAAAAA999, 0x8A999999, 0x999BB000, 0x00000111, 0xBAAAAA99, 0xA9999999, 0x999BB000, 0x00001113, 0x3BAAAAA9, 0xA9999999, 0x99BB0000, 0x00011132, 0x34B9AAAA, 0x99999999, 0x9BBB0000, 0x00111322, 0x41BB9AAA, 0x99999999, 0xBBB00000, 0x01113224, 0x111BB9AA, 0x9999999B, 0xBB000000, 0x01132241, 0x1100BB9A, 0x999999BB, 0xB0000000, 0x01322411, 0x10000BBA, 0xA999BBBB, 0x00000000, 0x00224111, 0x000000BB, 0xBBBBBB00, 0x00000000, 0x00041110, 0x00000000, 0xBBBB0000, 0x00000000, 0x00001100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802A3688_754AD8 -.word 0x210C30C7, 0xB4078AC7, 0x5A09BDEF, 0xA4E983E3, 0x5ADD4217, 0x29512109, 0x39CF4A53, 0x6319A529 - -dlabel D_802A36A8_754AF8 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00011111, 0x00000000, 0x00000000, 0x00000000, 0x0111FF11, 0x11000000, 0x00000000, 0x00000001, 0x111FDDFD, 0x11100000, 0x00000000, 0x00000011, 0x1CBCFFDD, 0xDE110000, 0x00000000, 0x0000011D, 0xBBBBCDFF, 0xFF110011, 0x00000000, 0x000011CC, 0xBBBBFE89, 0x91110111, 0x10000000, 0x00011DDC, 0xCBEE6678, 0x99111121, 0x11000000, 0x00011FDD, 0xCE766667, 0x89911322, 0x11000000, 0x0011DDFD, 0xF8876666, 0x7899A341, 0x10000000, 0x0011DDFF, 0x98887666, 0x67899A11, 0x00000000, 0x011EFFDE, 0x99888766, 0x66789911, 0x11000000, 0x011DDDF9, 0x99988876, 0x6667899F, 0xF1100000, 0x011DDDE9, 0x99998887, 0x6666CDFD, 0xDF110000, 0x011DDD99, 0x99999888, 0x76BBBCFD, 0xDFD11000, 0x011FDE99, 0x99999988, 0x8BBBBBCF, 0xFDDD1100, 0x0011DF99, 0x99999998, 0xCCBBBBBC, 0xDEEE1100, 0x0011FF19, 0x9999999D, 0xDCCBBBBE, 0xFFFFF110, 0x00011111, 0x999999DD, 0xDDCCBEFF, 0xFFFFF110, 0x00001111, 0x199999FF, 0xDDDCFFFF, 0xFFFFF110, 0x00000011, 0x11999FDD, 0xFDDFFFFF, 0xFFFFF110, 0x00000111, 0x31199FDD, 0xFDEFFFFF, 0xFFFF1100, 0x00001113, 0x24419DFF, 0xDDFFFFFF, 0xFFFF1100, 0x00011132, 0x24111DDD, 0xDEFFFFFF, 0xFFF11000, 0x00111322, 0x41111DDD, 0xDFFFFFFF, 0xFFF11000, 0x01113224, 0x110011DD, 0xEFFFFFFF, 0xFF110000, 0x01132241, 0x1000011D, 0xEFFFFFFF, 0xF1100000, 0x01122411, 0x00000011, 0xEFFFFFF1, 0x11000000, 0x01111110, 0x00000001, 0x11FFF111, 0x10000000, 0x00111100, 0x00000000, 0x11111110, 0x00000000, 0x00000000, 0x00000000, 0x00111000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802A38A8_754CF8 -.word 0x210C30C7, 0xB4078AC7, 0x5A09BDEF, 0xC4A1C355, 0xCA07998B, 0x4109CE4F, 0xB583A503, 0x83C37345 - -dlabel D_802A38C8_754D18 -.word 0xFFF0FFF0, 0x00000000, 0x00000000, 0x000000FF, 0x000FFFF0, 0x00000000, 0x04000000, 0x000000FF, 0x000F000F, 0x00000000, 0x04000400, 0x000000FF, 0xFFF0000F, 0x00000000, 0x00000400, 0x000000FF - -dlabel D_802A3908_754D58 -.word 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFCFFFFFF, 0xFFFCF279, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00003000, 0xE3001402, 0x00000C00, 0xE3001001, 0x00008000, 0xFD100000, D_802A3248_754698, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xFD48000F, D_802A3048_754498, 0xF5480400, 0x07000000, 0xE6000000, 0x00000000, 0xF4000000, 0x0703E07C, 0xE7000000, 0x00000000, 0xF5400400, 0x00000000, 0xF2000000, 0x0007C07C, 0xD9FDFFFF, 0x00000000, 0xD9DFFFFF, 0x00000000, 0x01004008, D_802A38C8_754D18, 0x05000204, 0x00000000, 0x05000406, 0x00000000, 0xE7000000, 0x00000000, 0xDF000000, 0x00000000 - -dlabel D_802A39F8_754E48 -.word 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFCFFFFFF, 0xFFFCF279, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00003000, 0xE3001402, 0x00000C00, 0xE3001001, 0x00008000, 0xFD100000, D_802A3468_7548B8, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xFD48000F, D_802A3268_7546B8, 0xF5480400, 0x07000000, 0xE6000000, 0x00000000, 0xF4000000, 0x0703E07C, 0xE7000000, 0x00000000, 0xF5400400, 0x00000000, 0xF2000000, 0x0007C07C, 0xD9FDFFFF, 0x00000000, 0xD9DFFFFF, 0x00000000, 0x01004008, D_802A38C8_754D18, 0x05000204, 0x00000000, 0x05000406, 0x00000000, 0xE7000000, 0x00000000, 0xDF000000, 0x00000000 - -dlabel D_802A3AE8_754F38 -.word 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFCFFFFFF, 0xFFFCF279, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00003000, 0xE3001402, 0x00000C00, 0xE3001001, 0x00008000, 0xFD100000, D_802A3688_754AD8, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xFD48000F, D_802A3488_7548D8, 0xF5480400, 0x07000000, 0xE6000000, 0x00000000, 0xF4000000, 0x0703E07C, 0xE7000000, 0x00000000, 0xF5400400, 0x00000000, 0xF2000000, 0x0007C07C, 0xD9FDFFFF, 0x00000000, 0xD9DFFFFF, 0x00000000, 0x01004008, D_802A38C8_754D18, 0x05000204, 0x00000000, 0x05000406, 0x00000000, 0xE7000000, 0x00000000, 0xDF000000, 0x00000000 - -dlabel D_802A3BD8_755028 -.word 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFCFFFFFF, 0xFFFCF279, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00003000, 0xE3001402, 0x00000C00, 0xE3001001, 0x00008000, 0xFD100000, D_802A38A8_754CF8, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xFD48000F, D_802A36A8_754AF8, 0xF5480400, 0x07000000, 0xE6000000, 0x00000000, 0xF4000000, 0x0703E07C, 0xE7000000, 0x00000000, 0xF5400400, 0x00000000, 0xF2000000, 0x0007C07C, 0xD9FDFFFF, 0x00000000, 0xD9DFFFFF, 0x00000000, 0x01004008, D_802A38C8_754D18, 0x05000204, 0x00000000, 0x05000406, 0x00000000, 0xE7000000, 0x00000000, 0xDF000000, 0x00000000, 0x00000004, 0x0000000D, 0x00000001, 0x0000003C, D_802A3908_754D58, 0x00000002, 0x00000000 - -dlabel D_802A3CE4_755134 -.word 0x00000004, 0x0000000D, 0x00000001, 0x0000003C, D_802A39F8_754E48, 0x00000002, 0x00000000 - -dlabel D_802A3D00_755150 -.word 0x00000004, 0x0000000D, 0x00000001, 0x0000003C, D_802A3AE8_754F38, 0x00000002, 0x00000000 - -dlabel D_802A3D1C_75516C -.word 0x00000004, 0x0000000D, 0x00000001, 0x0000003C, D_802A3BD8_755028, 0x00000002, 0x00000000 - -dlabel battle_move_hammer_throw_main -.word 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A42E8_755738, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A42E8_755738, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000032, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A42E8_755738, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3E5C_7552AC -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040016, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040016, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3FE0_755430 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0004001C, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0004001C, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A4164_7555B4 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040022, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040022, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A42E8_755738 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A3E5C_7552AC, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3FE0_755430, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A4164_7555B4, 0x00000023, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000032, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040017, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040018, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0004001D, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0004001E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040023, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040024, 0x00000023, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, battle_move_hammer_throw_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000001, 0xFE363C84, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040019, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0004001F, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040025, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000001, 0xFE363C84, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040019, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0004001F, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040025, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0004001B, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040021, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00040027, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, CreateVirtualEntity, 0xFE363C8A, D_802A3CE4_755134, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CreateVirtualEntity, 0xFE363C8A, D_802A3D00_755150, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, CreateVirtualEntity, 0xFE363C8A, D_802A3D1C_75516C, 0x00000023, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000005, SetVirtualEntityPosition, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetVirtualEntityScale, 0xFE363C8A, 0xF24A7CE7, 0xF24A7CE7, 0xF24A7CE7, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C83, 0x00000014, 0x00000001, 0xFE363C83, 0x00000019, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000009, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000005, SetVirtualEntityRotation, 0xFE363C8A, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetVirtualEntityJumpGravity, 0xFE363C8A, 0xF24A7FB4, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, VirtualEntityJumpTo, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000B, 0x0000001C, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000012, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000005, SetVirtualEntityRotation, 0xFE363C8A, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetVirtualEntityJumpGravity, 0xFE363C8A, 0xF24A7D4D, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, VirtualEntityJumpTo, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000023, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C83, 0x10000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000006, 0x00000043, 0x00000002, VirtualEntityLandJump, 0xFE363C8A, 0x00000043, 0x00000002, DeleteVirtualEntity, 0xFE363C8A, 0x00000046, 0x00000001, D_802A1A64_752EB4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C83, 0x00000014, 0x00000001, 0xFE363C83, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetVirtualEntityJumpGravity, 0xFE363C8A, 0xF24A801A, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, VirtualEntityJumpTo, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000002, DeleteVirtualEntity, 0xFE363C8A, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, SetVirtualEntityJumpGravity, 0xFE363C8A, 0xF24A7DB4, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, VirtualEntityJumpTo, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000002, DeleteVirtualEntity, 0xFE363C8A, 0x00000023, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000A, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210A, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210B, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000210C, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x10040000, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x10040000, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A18AC_752CFC, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A64_752EB4, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/jump_charge_0/74D850.data.s b/ver/us/asm/data/battle/move/jump_charge_0/74D850.data.s deleted file mode 100644 index 7e5526ab2d..0000000000 --- a/ver/us/asm/data/battle/move/jump_charge_0/74D850.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A12E0_74D850 -.word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 - -dlabel D_802A1320_74D890 -.word 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CheckButtonPress, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A139C_74D90C -.word 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A1320_74D890, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1510_74DA80 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15F8_74DB68 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A16E0_74DC50 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_jump_charge_0_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A139C_74D90C, 0x00000046, 0x00000001, D_802A1510_74DA80, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A139C_74D90C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A15F8_74DB68, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A139C_74D90C, 0x00000046, 0x00000001, D_802A16E0_74DC50, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A12E0_74D850, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel battle_move_jump_charge_0_802A27F0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel battle_move_jump_charge_0_802A2800 -.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010020, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802A120C_74D77C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, func_802A120C_74D77C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_jump_charge_0_IsJumpMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000004, func_802A1108_74D678, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000004, ShowVariableMessageBox, 0x00000006, 0x0000003C, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/jump_charge_1/75CCE0.data.s b/ver/us/asm/data/battle/move/jump_charge_1/75CCE0.data.s deleted file mode 100644 index 4846e7d293..0000000000 --- a/ver/us/asm/data/battle/move/jump_charge_1/75CCE0.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A1360_75CCE0 -.word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 - -dlabel D_802A13A0_75CD20 -.word 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CheckButtonPress, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A141C_75CD9C -.word 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A13A0_75CD20, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1590_75CF10 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1678_75CFF8 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1760_75D0E0 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_jump_charge_1_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A141C_75CD9C, 0x00000046, 0x00000001, D_802A1590_75CF10, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A141C_75CD9C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1678_75CFF8, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A141C_75CD9C, 0x00000046, 0x00000001, D_802A1760_75D0E0, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A1360_75CCE0, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel battle_move_jump_charge_1_802A2870 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel battle_move_jump_charge_1_802A2880 -.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010020, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, battle_move_jump_charge_1_UnkMoveFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, battle_move_jump_charge_1_UnkMoveFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_jump_charge_1_IsJumpMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000004, func_802A1108_75CA88, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_802A133C_75CCBC, 0x00000043, 0x00000004, ShowVariableMessageBox, 0xFE363C80, 0x0000003C, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/jump_charge_2/761C80.data.s b/ver/us/asm/data/battle/move/jump_charge_2/761C80.data.s deleted file mode 100644 index 198e182eff..0000000000 --- a/ver/us/asm/data/battle/move/jump_charge_2/761C80.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A1360_761C80 -.word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 - -dlabel D_802A13A0_761CC0 -.word 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CheckButtonPress, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A141C_761D3C -.word 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A13A0_761CC0, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1590_761EB0 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1678_761F98 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1760_762080 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_jump_charge_2_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A141C_761D3C, 0x00000046, 0x00000001, D_802A1590_761EB0, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A141C_761D3C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1678_761F98, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A141C_761D3C, 0x00000046, 0x00000001, D_802A1760_762080, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A1360_761C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_jump_charge_2_802A2870 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_jump_charge_2_802A2880 -.word 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000020, 0x00000008, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000156, 0x00000008, 0x00000001, 0x00000008, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010020, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, battle_move_jump_charge_2_UnkMoveFunc3, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, battle_move_jump_charge_2_UnkMoveFunc3, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7DB4, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, battle_move_jump_charge_2_IsJumpMaxCharged, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000004, func_802A1108_761A28, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000160, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000001, func_802A133C_761C5C, 0x00000043, 0x00000004, ShowVariableMessageBox, 0xFE363C80, 0x0000003C, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, ShowMessageBox, 0x00000008, 0x0000003C, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, IsMessageBoxDisplayed, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/mega_jump/771020.data.s b/ver/us/asm/data/battle/move/mega_jump/771020.data.s deleted file mode 100644 index af0e8cf88c..0000000000 --- a/ver/us/asm/data/battle/move/mega_jump/771020.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A10F0_771020 -.word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 - -dlabel D_802A1130_771060 -.word 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CheckButtonPress, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A11AC_7710DC -.word 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A1130_771060, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1320_771250 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1408_771338 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A14F0_771420 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15D8_771508 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_mega_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A17C4_7716F4 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_mega_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_mega_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_mega_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_mega_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1FEC_771F1C -.word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2184_7720B4 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_7710DC, 0x00000046, 0x00000001, D_802A1320_771250, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_7710DC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_771338, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_7710DC, 0x00000046, 0x00000001, D_802A14F0_771420, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A10F0_771020, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_mega_jump_main -.word 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A27FC_77272C, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2978_7728A8, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2AF4_772A24, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A26B4_7725E4 -.word 0x00000043, 0x00000002, StartRumble, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A9280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A27FC_77272C -.word 0x00000046, 0x00000001, D_802A2184_7720B4, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_771F1C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A26B4_7725E4, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000006, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000005, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A15D8_771508, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, D_802A17C4_7716F4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2978_7728A8 -.word 0x00000046, 0x00000001, D_802A2184_7720B4, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_771F1C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A26B4_7725E4, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000008, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000006, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A15D8_771508, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, D_802A17C4_7716F4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2AF4_772A24 -.word 0x00000046, 0x00000001, D_802A2184_7720B4, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_771F1C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A26B4_7725E4, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x0000000A, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000007, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A15D8_771508, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, D_802A17C4_7716F4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/mega_quake/756900.data.s b/ver/us/asm/data/battle/move/mega_quake/756900.data.s deleted file mode 100644 index 43b32fea2b..0000000000 --- a/ver/us/asm/data/battle/move/mega_quake/756900.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A1180_756900 -.word 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000020, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A125C_7569DC -.word 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFFFFFFDF, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A12D4_756A54 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1458_756BD8 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15DC_756D5C -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0x00000024, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000004, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1A68_7571E8 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A1180_756900, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A12D4_756A54, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_mega_quake_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_mega_quake_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A1180_756900, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1458_756BD8, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_mega_quake_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_mega_quake_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A1180_756900, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15DC_756D5C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_mega_quake_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_mega_quake_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A28A0_758020 -.word 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A125C_7569DC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A12D4_756A54, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_mega_quake_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2BCC_75834C -.word 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A125C_7569DC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1458_756BD8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_mega_quake_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2E70_7585F0 -.word 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A125C_7569DC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15DC_756D5C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_mega_quake_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_mega_quake_main -.word 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3238_7589B8, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3238_7589B8, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3238_7589B8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3238_7589B8 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A28A0_758020, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2BCC_75834C, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2E70_7585F0, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000021, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000042, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7BB4, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A8080, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A8080, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7EB4, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7CE7, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7B1A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7ACD, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000030, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000048, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000025, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B76, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7F4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A841A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7F4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7DDD, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7C6C, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7AFB, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7ABE, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000030, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000048, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000025, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000008, 0x00000001, 0x0000000F, 0x00000026, 0x00000002, 0xFE363C86, 0xF24A7A80, 0x00000005, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C86, 0xF24B0A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C84, 0xFE363C85, 0xF24F2A80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C8F, 0x00000043, 0x0000000F, PlayEffect, 0x0000005E, 0x00000000, 0xFE363C83, 0x00000001, 0xFE363C82, 0xFE363C84, 0x00000001, 0xFE363C85, 0xF24A8A80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0xFE363C8A, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000032, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211B, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211C, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211D, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00200000, 0x0000001D, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x38200800, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x38200800, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C81, 0x0000000C, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802A1A68_7571E8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/mega_smash/777740.data.s b/ver/us/asm/data/battle/move/mega_smash/777740.data.s deleted file mode 100644 index 48f55eedf7..0000000000 --- a/ver/us/asm/data/battle/move/mega_smash/777740.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A10B0_777740 -.word 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000020, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A118C_77781C -.word 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFFFFFFDF, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1204_777894 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1388_777A18 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A150C_777B9C -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0x00000024, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A18AC_777F3C -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000004, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1A64_7780F4 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1B40_7781D0 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_777740, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_777894, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_mega_smash_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_mega_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2000_778690 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_777740, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_777A18, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_mega_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_mega_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A23E8_778A78 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_777740, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_777B9C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_mega_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_mega_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_77781C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_777894, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_mega_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_77781C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_777A18, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_mega_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_77781C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_777B9C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_mega_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_mega_smash_main -.word 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A32D0_779960, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000006, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000008, 0x00000046, 0x00000001, D_802A32D0_779960, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000007, 0x00000024, 0x00000002, 0xFE363C8F, 0x0000000A, 0x00000046, 0x00000001, D_802A32D0_779960, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3188_779818 -.word 0x00000043, 0x00000002, StartRumble, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A9280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A32D0_779960 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1B40_7781D0, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2000_778690, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A23E8_778A78, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000008, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3188_779818, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1A64_7780F4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A18AC_777F3C, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A64_7780F4, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/multibounce/740DB0.data.s b/ver/us/asm/data/battle/move/multibounce/740DB0.data.s deleted file mode 100644 index c55ab75ae3..0000000000 --- a/ver/us/asm/data/battle/move/multibounce/740DB0.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A10F0_740DB0 -.word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 - -dlabel D_802A1130_740DF0 -.word 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CheckButtonPress, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A11AC_740E6C -.word 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A1130_740DF0, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1320_740FE0 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1408_7410C8 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A14F0_7411B0 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15D8_741298 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_multibounce_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A17C4_741484 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_multibounce_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A19B0_741670 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_multibounce_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_multibounce_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_multibounce_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1FEC_741CAC -.word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_740E6C, 0x00000046, 0x00000001, D_802A1320_740FE0, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_740E6C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_7410C8, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_740E6C, 0x00000046, 0x00000001, D_802A14F0_7411B0, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A10F0_740DB0, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2600_7422C0 -.word 0x00000007, 0x00000006, 0x00000005, 0x00000004, 0x00000003, 0x00000002, 0x00000001, 0x00000000 - -dlabel battle_move_multibounce_main -.word 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A26C8_742388, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2F80_742C40, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A388C_74354C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A26C8_742388 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A2600_7422C0, 0x00000046, 0x00000001, D_802A11AC_740E6C, 0x00000046, 0x00000001, D_802A1320_740FE0, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_741CAC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000001, 0x00000070, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000001, 0x00000070, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000001, 0x00000030, 0x00000023, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A19B0_741670, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000028, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A1320_740FE0, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_741CAC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000001, 0x00000070, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000001, 0x000000F0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000001, 0x00000030, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000001, 0x000000F0, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A19B0_741670, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000046, 0x00000001, D_802A17C4_741484, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2F80_742C40 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A2600_7422C0, 0x00000046, 0x00000001, D_802A11AC_740E6C, 0x00000046, 0x00000001, D_802A1320_740FE0, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_741CAC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000002, 0x00000070, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000002, 0x00000070, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000002, 0x00000030, 0x00000023, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A19B0_741670, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000028, 0x00000043, 0x00000003, action_command_jump_start, 0x00000025, 0x00000003, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000003, func_802752AC, 0x00000014, 0x00000003, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000006, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000014, 0x00000004, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_741CAC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000002, 0x00000070, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000002, 0x000000F0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000002, 0x00000030, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000002, 0x000000F0, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A19B0_741670, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000046, 0x00000001, D_802A19B0_741670, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A388C_74354C -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A2600_7422C0, 0x00000046, 0x00000001, D_802A11AC_740E6C, 0x00000046, 0x00000001, D_802A1320_740FE0, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_741CAC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000003, 0x00000070, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000003, 0x00000070, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000003, 0x00000030, 0x00000023, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A19B0_741670, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000028, 0x00000043, 0x00000003, action_command_jump_start, 0x00000019, 0x00000003, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010007, 0x0001000C, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000003, func_80275F00, 0x00000019, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_80275F00, 0x00000019, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_741CAC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000003, 0x00000070, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000003, 0x000000F0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000003, 0x00000030, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x21000080, 0x00000000, 0x00000000, 0x00000003, 0x000000F0, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A19B0_741670, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A15D8_741298, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C80, 0x0000000F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000046, 0x00000001, D_802A19B0_741670, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/power_bounce/743FF0.data.s b/ver/us/asm/data/battle/move/power_bounce/743FF0.data.s deleted file mode 100644 index c8b9b2957e..0000000000 --- a/ver/us/asm/data/battle/move/power_bounce/743FF0.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A1200_743FF0 -.word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 - -dlabel D_802A1240_744030 -.word 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CheckButtonPress, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A12BC_7440AC -.word 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A1240_744030, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1430_744220 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1518_744308 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1600_7443F0 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A16E8_7444D8 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_power_bounce_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_power_bounce_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1AC0_7448B0 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_power_bounce_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_power_bounce_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_power_bounce_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A20FC_744EEC -.word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A12BC_7440AC, 0x00000046, 0x00000001, D_802A1430_744220, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A12BC_7440AC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1518_744308, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A12BC_7440AC, 0x00000046, 0x00000001, D_802A1600_7443F0, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A1200_743FF0, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2710_745500 -.word 0x00000007, 0x00000006, 0x00000005, 0x00000004, 0x00000003, 0x00000002, 0x00000001, 0x00000000 - -dlabel D_802A2730_745520 -.word 0x000000C8 - -dlabel battle_move_power_bounce_main -.word 0x00000024, 0x00000002, 0xFBD3E28A, 0x00000000, 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000001, func_802A1194_743F84, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000046, 0x00000001, D_802A2820_745610, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000046, 0x00000001, D_802A3024_745E14, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000046, 0x00000001, D_802A383C_74662C, 0x00000023, 0x00000000, 0x00000043, 0x00000001, func_802A11C0_743FB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2820_745610 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A2710_745500, 0x00000046, 0x00000001, D_802A12BC_7440AC, 0x00000046, 0x00000001, D_802A1430_744220, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A20FC_744EEC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1AC0_7448B0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000043, 0x00000001, func_802A11A4_743F94, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A2710_745500, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000018, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000005, 0x00000023, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCommandAutoSuccess, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x0000000F, 0x00000002, 0xFE363C8F, 0x00000003, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802A10E4_743ED4, 0x0000000F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x00000040, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x000000E0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x00000020, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A16E8_7444D8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A1AC0_7448B0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A16E8_7444D8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000001, func_802A11A4_743F94, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3024_745E14 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A2710_745500, 0x00000046, 0x00000001, D_802A12BC_7440AC, 0x00000046, 0x00000001, D_802A1430_744220, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A20FC_744EEC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1AC0_7448B0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000043, 0x00000001, func_802A11A4_743F94, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A2710_745500, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000025, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000005, 0x00000023, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000014, 0x00000003, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000006, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000014, 0x00000004, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000043, 0x00000002, GetCommandAutoSuccess, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000003, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802A10E4_743ED4, 0x0000000D, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x00000040, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x000000E0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x00000020, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A16E8_7444D8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A1AC0_7448B0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A16E8_7444D8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000001, func_802A11A4_743F94, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A383C_74662C -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A2710_745500, 0x00000046, 0x00000001, D_802A12BC_7440AC, 0x00000046, 0x00000001, D_802A1430_744220, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A20FC_744EEC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1AC0_7448B0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000043, 0x00000001, func_802A11A4_743F94, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001C, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A2710_745500, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000019, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000005, 0x00000023, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010007, 0x0001000C, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000043, 0x00000003, func_80275F00, 0x00000019, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_80275F00, 0x00000019, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000043, 0x00000002, GetCommandAutoSuccess, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000003, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802A10E4_743ED4, 0x0000000D, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x00000040, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x000000E0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x00000020, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A16E8_7444D8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A1AC0_7448B0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A16E8_7444D8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000001, func_802A11A4_743F94, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/power_jump/76D850.data.s b/ver/us/asm/data/battle/move/power_jump/76D850.data.s deleted file mode 100644 index 27306a5f67..0000000000 --- a/ver/us/asm/data/battle/move/power_jump/76D850.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A10F0_76D850 -.word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 - -dlabel D_802A1130_76D890 -.word 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CheckButtonPress, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A11AC_76D90C -.word 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A1130_76D890, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1320_76DA80 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1408_76DB68 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A14F0_76DC50 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15D8_76DD38 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_power_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A17C4_76DF24 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_power_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_power_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_power_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_power_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1FEC_76E74C -.word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2184_76E8E4 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_76D90C, 0x00000046, 0x00000001, D_802A1320_76DA80, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_76D90C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_76DB68, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_76D90C, 0x00000046, 0x00000001, D_802A14F0_76DC50, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A10F0_76D850, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel battle_move_power_jump_main -.word 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2754_76EEB4, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A28D0_76F030, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2A4C_76F1AC, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A26B4_76EE14 -.word 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8080, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000059, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2754_76EEB4 -.word 0x00000046, 0x00000001, D_802A2184_76E8E4, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_76E74C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A26B4_76EE14, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000004, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000003, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A15D8_76DD38, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, D_802A17C4_76DF24, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A28D0_76F030 -.word 0x00000046, 0x00000001, D_802A2184_76E8E4, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_76E74C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A26B4_76EE14, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000006, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000004, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A15D8_76DD38, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, D_802A17C4_76DF24, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2A4C_76F1AC -.word 0x00000046, 0x00000001, D_802A2184_76E8E4, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_76E74C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A26B4_76EE14, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000008, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000005, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A15D8_76DD38, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, D_802A17C4_76DF24, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/power_quake/767D40.data.s b/ver/us/asm/data/battle/move/power_quake/767D40.data.s deleted file mode 100644 index 7c4700d624..0000000000 --- a/ver/us/asm/data/battle/move/power_quake/767D40.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A10B0_767D40 -.word 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000020, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A118C_767E1C -.word 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFFFFFFDF, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1204_767E94 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1388_768018 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A150C_76819C -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0x00000024, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000004, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1998_768628 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_767D40, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_767E94, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_power_quake_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_power_quake_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_767D40, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_768018, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_power_quake_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_power_quake_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_767D40, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_76819C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_power_quake_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_power_quake_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A27D0_769460 -.word 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_767E1C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_767E94, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_power_quake_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2AFC_76978C -.word 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_767E1C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_768018, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_power_quake_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2DA0_769A30 -.word 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_767E1C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_76819C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_power_quake_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_power_quake_main -.word 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3168_769DF8, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3168_769DF8, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3168_769DF8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3168_769DF8 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A27D0_769460, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2AFC_76978C, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2DA0_769A30, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000021, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000042, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B76, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7F4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A841A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7F4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7DDD, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7C6C, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7AFB, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7ABE, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000030, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000048, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000003, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7C1A, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000006, 0xF24A7AE7, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7AB4, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000048, 0x00000008, 0x00000018, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000060, 0x00000008, 0x00000030, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000060, 0x00000008, 0x00000048, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000032, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211B, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211C, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211D, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00200000, 0x0000001D, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x38200800, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x38200800, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, GetTargetListLength, 0xFE363C81, 0x0000000C, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802A1998_768628, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/power_smash/772C50.data.s b/ver/us/asm/data/battle/move/power_smash/772C50.data.s deleted file mode 100644 index 7922bc7831..0000000000 --- a/ver/us/asm/data/battle/move/power_smash/772C50.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A10B0_772C50 -.word 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000020, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A118C_772D2C -.word 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFFFFFFDF, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1204_772DA4 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1388_772F28 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A150C_7730AC -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0x00000024, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A18AC_77344C -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000004, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1A64_773604 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1B40_7736E0 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_772C50, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_772DA4, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_power_smash_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_power_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2000_773BA0 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_772C50, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_772F28, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_power_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_power_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A23E8_773F88 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_772C50, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_7730AC, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_power_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_power_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_772D2C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_772DA4, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_power_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_772D2C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_772F28, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_power_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_772D2C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_7730AC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_power_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_power_smash_main -.word 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3228_774DC8, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3228_774DC8, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000008, 0x00000046, 0x00000001, D_802A3228_774DC8, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3188_774D28 -.word 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8080, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3228_774DC8 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1B40_7736E0, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2000_773BA0, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A23E8_773F88, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000008, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3188_774D28, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000046, 0x00000001, D_802A1A64_773604, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A18AC_77344C, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A64_773604, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/shell_crack/77F3D0.data.s b/ver/us/asm/data/battle/move/shell_crack/77F3D0.data.s deleted file mode 100644 index 7eadcca1da..0000000000 --- a/ver/us/asm/data/battle/move/shell_crack/77F3D0.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A1190_77F3D0 -.word 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000020, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A126C_77F4AC -.word 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFFFFFFDF, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A12E4_77F524 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1468_77F6A8 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15EC_77F82C -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0x00000024, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A198C_77FBCC -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000004, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1B44_77FD84 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1C20_77FE60 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A1190_77F3D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A12E4_77F524, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_shell_crack_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_shell_crack_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A20E0_780320 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A1190_77F3D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1468_77F6A8, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_shell_crack_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_shell_crack_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A24C8_780708 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A1190_77F3D0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15EC_77F82C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_shell_crack_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_shell_crack_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A126C_77F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A12E4_77F524, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_shell_crack_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A126C_77F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1468_77F6A8, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_shell_crack_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A126C_77F4AC, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A15EC_77F82C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_shell_crack_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_shell_crack_main -.word 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A3390_7815D0, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3390_7815D0, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3390_7815D0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3248_781488 -.word 0x00000043, 0x00000002, StartRumble, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A9280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3390_7815D0 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1C20_77FE60, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A20E0_780320, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A24C8_780708, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x00000046, 0x00000001, D_802A3248_781488, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000001, func_802A10A4_77F2E4, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1B44_77FD84, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00020040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00020040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A198C_77FBCC, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1B44_77FD84, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/shrink_smash/77CC30.data.s b/ver/us/asm/data/battle/move/shrink_smash/77CC30.data.s deleted file mode 100644 index 733aa50fd4..0000000000 --- a/ver/us/asm/data/battle/move/shrink_smash/77CC30.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A10B0_77CC30 -.word 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000020, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A118C_77CD0C -.word 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFFFFFFDF, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1204_77CD84 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1388_77CF08 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A150C_77D08C -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0x00000024, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A18AC_77D42C -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000004, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1A64_77D5E4 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1B40_77D6C0 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_77CC30, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_77CD84, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_shrink_smash_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_shrink_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2000_77DB80 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_77CC30, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_77CF08, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_shrink_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_shrink_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A23E8_77DF68 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_77CC30, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_77D08C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_shrink_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_shrink_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_77CD0C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_77CD84, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_shrink_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_77CD0C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_77CF08, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_shrink_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_77CD0C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_77D08C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_shrink_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_shrink_smash_main -.word 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_802A3168_77ECE8, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000004, 0x00000046, 0x00000001, D_802A3168_77ECE8, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000006, 0x00000046, 0x00000001, D_802A3168_77ECE8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3168_77ECE8 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1B40_77D6C0, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2000_77DB80, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A23E8_77DF68, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, GetActionSuccessCopy, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000007, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7FB4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A80E7, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, StartRumble, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A821A, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1A64_77D5E4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x80080364, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x8008034B, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A18AC_77D42C, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A64_77D5E4, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/shrink_stomp/783C90.data.s b/ver/us/asm/data/battle/move/shrink_stomp/783C90.data.s deleted file mode 100644 index 315530f753..0000000000 --- a/ver/us/asm/data/battle/move/shrink_stomp/783C90.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A10F0_783C90 -.word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 - -dlabel D_802A1130_783CD0 -.word 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CheckButtonPress, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A11AC_783D4C -.word 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A1130_783CD0, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1320_783EC0 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1408_783FA8 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A14F0_784090 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15D8_784178 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_shrink_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_shrink_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A19B0_784550 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_shrink_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_shrink_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_shrink_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1FEC_784B8C -.word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2184_784D24 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_783D4C, 0x00000046, 0x00000001, D_802A1320_783EC0, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_783D4C, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_783FA8, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_783D4C, 0x00000046, 0x00000001, D_802A14F0_784090, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A10F0_783C90, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_shrink_stomp_main -.word 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2694_785234, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2978_785518, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2C8C_78582C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2694_785234 -.word 0x00000046, 0x00000001, D_802A2184_784D24, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_784B8C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8008034B, 0x00000001, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8008034B, 0x00000001, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19B0_784550, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0x00000018, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000015A, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x80080364, 0x00000001, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A15D8_784178, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2978_785518 -.word 0x00000046, 0x00000001, D_802A2184_784D24, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_784B8C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000015B, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8008034B, 0x00000002, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000015B, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8008034B, 0x00000002, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19B0_784550, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0x00000025, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0x00000014, 0x00000004, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000015B, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x80080364, 0x00000002, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A15D8_784178, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2C8C_78582C -.word 0x00000046, 0x00000001, D_802A2184_784D24, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_784B8C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000015C, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8008034B, 0x00000003, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000015C, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8008034B, 0x00000003, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19B0_784550, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001C, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0x00000019, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010007, 0x0001000C, 0x00000043, 0x00000003, func_80275F00, 0x00000019, 0x00000004, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000015C, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x80080364, 0x00000003, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A15D8_784178, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/move/sleep_stomp/746F00.data.s b/ver/us/asm/data/battle/move/sleep_stomp/746F00.data.s deleted file mode 100644 index 6751f3f450..0000000000 --- a/ver/us/asm/data/battle/move/sleep_stomp/746F00.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A10F0_746F00 -.word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 - -dlabel D_802A1130_746F40 -.word 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CheckButtonPress, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A11AC_746FBC -.word 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A1130_746F40, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1320_747130 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1408_747218 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A14F0_747300 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15D8_7473E8 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_sleep_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_sleep_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A19B0_7477C0 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_sleep_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_sleep_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_sleep_stomp_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1FEC_747DFC -.word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2184_747F94 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_746FBC, 0x00000046, 0x00000001, D_802A1320_747130, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_746FBC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_747218, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_746FBC, 0x00000046, 0x00000001, D_802A14F0_747300, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A10F0_746F00, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_sleep_stomp_main -.word 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A2694_7484A4, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2980_748790, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2CAC_748ABC, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2694_7484A4 -.word 0x00000046, 0x00000001, D_802A2184_747F94, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_747DFC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8000134B, 0x00000001, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8000134B, 0x00000001, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19B0_7477C0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0x00000018, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x80001364, 0x00000001, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A15D8_7473E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2980_748790 -.word 0x00000046, 0x00000001, D_802A2184_747F94, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_747DFC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8000134B, 0x00000002, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8000134B, 0x00000002, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19B0_7477C0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0x00000025, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0x00000014, 0x00000004, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x80001364, 0x00000002, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A15D8_7473E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2CAC_748ABC -.word 0x00000046, 0x00000001, D_802A2184_747F94, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_747DFC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8000134B, 0x00000003, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x8000134B, 0x00000003, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A19B0_7477C0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8F, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001C, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, ShowActionHud, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0x00000019, 0x00000003, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010007, 0x0001000C, 0x00000043, 0x00000003, func_80275F00, 0x00000019, 0x00000004, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x80001364, 0x00000003, 0x000000E0, 0x00000043, 0x00000002, func_80269550, 0xFE363C8F, 0x00000046, 0x00000001, D_802A15D8_7473E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/super_jump/76F420.data.s b/ver/us/asm/data/battle/move/super_jump/76F420.data.s deleted file mode 100644 index 875b3f3d58..0000000000 --- a/ver/us/asm/data/battle/move/super_jump/76F420.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A10F0_76F420 -.word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 - -dlabel D_802A1130_76F460 -.word 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CheckButtonPress, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A11AC_76F4DC -.word 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A1130_76F460, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1320_76F650 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1408_76F738 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A14F0_76F820 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15D8_76F908 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_super_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A17C4_76FAF4 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_super_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_super_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_super_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_super_jump_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1FEC_77031C -.word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2184_7704B4 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_76F4DC, 0x00000046, 0x00000001, D_802A1320_76F650, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_76F4DC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A1408_76F738, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A11AC_76F4DC, 0x00000046, 0x00000001, D_802A14F0_76F820, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A10F0_76F420, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel battle_move_super_jump_main -.word 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A278C_770ABC, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2908_770C38, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A2A84_770DB4, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A26B4_7709E4 -.word 0x00000043, 0x00000002, StartRumble, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A278C_770ABC -.word 0x00000046, 0x00000001, D_802A2184_7704B4, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_77031C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A26B4_7709E4, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000005, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000004, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A15D8_76F908, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, D_802A17C4_76FAF4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2908_770C38 -.word 0x00000046, 0x00000001, D_802A2184_7704B4, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_77031C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802A26B4_7709E4, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000007, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000005, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A15D8_76F908, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, D_802A17C4_76FAF4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2A84_770DB4 -.word 0x00000046, 0x00000001, D_802A2184_7704B4, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1FEC_77031C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000009, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000006, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A15D8_76F908, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, D_802A17C4_76FAF4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/super_smash/7751B0.data.s b/ver/us/asm/data/battle/move/super_smash/7751B0.data.s deleted file mode 100644 index d5d9f194da..0000000000 --- a/ver/us/asm/data/battle/move/super_smash/7751B0.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A10B0_7751B0 -.word 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000020, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A118C_77528C -.word 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFFFFFFDF, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1204_775304 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000D, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1388_775488 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030014, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A150C_77560C -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001B, 0x00000014, 0x00000001, 0xFE363C81, 0x00000018, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000004, 0x00000018, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000018, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000002, 0x00000018, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x00000001, 0x00000018, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0x00000024, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A18AC_7759AC -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000004, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000005, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1A64_775B64 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1B40_775C40 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_7751B0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_775304, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_super_smash_IsBerserkerEquipped, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, battle_move_super_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, SetActionCommandMode, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetActionCommandMode, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2000_776100 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_7751B0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_775488, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_super_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_super_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030017, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A23E8_7764E8 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A10B0_7751B0, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_77560C, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000008, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000001, battle_move_super_smash_IsBerserkerEquipped, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_super_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C81, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001E, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_77528C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1204_775304, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000E, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003000F, 0x00000043, 0x00000001, battle_move_super_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000043, 0x00000002, SetActionResult, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionResult, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002115, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030011, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030012, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002118, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_77528C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A1388_775488, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030015, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030016, 0x00000043, 0x00000001, battle_move_super_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002116, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030018, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002119, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ChooseNextTarget, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000002, LoadActionCommand, 0x00000002, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A118C_77528C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802A150C_77560C, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002B, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000050, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010B, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001D, 0x00000043, 0x00000001, battle_move_super_smash_ShouldMovesAutoSucceed, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000006, 0x00000043, 0x00000004, action_command_hammer_start, 0x00000000, 0xFE363C8D, 0x00000003, 0x00000005, 0x00000001, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, CheckButtonDown, 0x00040000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetActionSuccess, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002117, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0003001F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030020, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000211A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel battle_move_super_smash_main -.word 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000046, 0x00000001, D_802A3260_777360, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000007, 0x00000046, 0x00000001, D_802A3260_777360, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000006, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000009, 0x00000046, 0x00000001, D_802A3260_777360, 0x00000023, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3188_777288 -.word 0x00000043, 0x00000002, StartRumble, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3260_777360 -.word 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1B40_775C40, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A2000_776100, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A23E8_7764E8, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000002C, 0x00000008, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802A3188_777288, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A1A64_775B64, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8F, 0x00000070, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000000E9, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000010E, 0x00000023, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00000040, 0x00000019, 0x00000000, 0xFE363C8E, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802A18AC_7759AC, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A64_775B64, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/move/unknown_move/779E30.data.s b/ver/us/asm/data/battle/move/unknown_move/779E30.data.s deleted file mode 100644 index 0a603ef88e..0000000000 --- a/ver/us/asm/data/battle/move/unknown_move/779E30.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A11A0_779E30 -.word 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000009, 0x00000003, 0x00000008, 0x00000003, 0x00000007, 0x00000003, 0x00000006, 0x00000002, 0x00000005, 0x00000002, 0x00000004, 0x00000002 - -dlabel D_802A11E0_779E70 -.word 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CheckButtonPress, 0x00008000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A125C_779EEC -.word 0x00000043, 0x00000002, SetGoalToFirstTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xF24B9280, 0x0000000C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001A, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000003, CancelablePlayerRunToGoal, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000046, 0x00000001, D_802A11E0_779E70, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A13D0_77A060 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A14B8_77A148 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AD480, 0x0000002C, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A15A0_77A230 -.word 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000D, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C86, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C86, 0xF24AC280, 0x0000002C, 0x00000002, 0xFE363C86, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1688_77A318 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_move_unknown_move_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_unknown_move_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A1A60_77A6F0 -.word 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001D, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, battle_move_unknown_move_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00010009, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000001, battle_move_unknown_move_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010017, 0x00010017, 0x00010009, 0x00000043, 0x00000001, battle_move_unknown_move_UnkMoveFunc1, 0x00000043, 0x00000004, func_80273444, 0xFE363C80, 0x00000000, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000008, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000005, AddGoalPos, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x00000006, 0x00000000, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000004, func_80273444, 0x00000004, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A209C_77AD2C -.word 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001000C, 0x00000043, 0x00000001, PlayerLandJump, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001000C, 0x00000008, 0x00000001, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000162, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010031, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000100, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000001, func_802693F0, 0x00000043, 0x00000002, EnablePlayerBlur, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80276EFC, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A125C_779EEC, 0x00000046, 0x00000001, D_802A13D0_77A060, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A125C_779EEC, 0x00000043, 0x00000001, InitTargetIterator, 0x00000046, 0x00000001, D_802A14B8_77A148, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000025, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000003, func_802752AC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000005, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000046, 0x00000001, D_802A125C_779EEC, 0x00000046, 0x00000001, D_802A15A0_77A230, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A11A0_779E30, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8A, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFD, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8B, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000026, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00080000, 0x00030000, 0x00000043, 0x00000003, func_80275F00, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00030000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x0000000D, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000027, 0x00000043, 0x00000003, func_80275F00, 0x0000000F, 0x00000002, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000003, action_command_jump_start, 0x00000002, 0x00000003, 0x00000043, 0x00000003, func_80275F00, 0x00000004, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A26B0_77B340 -.word 0x00000007, 0x00000006, 0x00000005, 0x00000004, 0x00000003, 0x00000002, 0x00000001, 0x00000000 - -dlabel D_802A26D0_77B360 -.word 0x000000C8, 0x00000024, 0x00000002, 0xFBD3E28A, 0x00000000, 0x00000043, 0x00000002, ShowActionHud, 0x00000001, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00001000, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000046, 0x00000001, D_802A27BC_77B44C, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000046, 0x00000001, D_802A2F7C_77BC0C, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000046, 0x00000001, D_802A3750_77C3E0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A27BC_77B44C -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A26B0_77B340, 0x00000046, 0x00000001, D_802A125C_779EEC, 0x00000046, 0x00000001, D_802A13D0_77A060, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A209C_77AD2C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A60_77A6F0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A26B0_77B340, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000018, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000005, 0x00000023, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x0001000C, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_80274A18, 0x00000018, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCommandAutoSuccess, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x0000000F, 0x00000002, 0xFE363C8F, 0x00000003, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802A10E4_779D74, 0x0000000F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x00000040, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x000000E0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015A, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x00000020, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A60_77A6F0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A1688_77A318, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A2F7C_77BC0C -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A26B0_77B340, 0x00000046, 0x00000001, D_802A125C_779EEC, 0x00000046, 0x00000001, D_802A13D0_77A060, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A209C_77AD2C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A60_77A6F0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A26B0_77B340, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000025, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000005, 0x00000023, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x0001000A, 0x0001000B, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000014, 0x00000003, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000006, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_802752AC, 0x00000014, 0x00000004, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, func_802752AC, 0x00000003, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000043, 0x00000002, GetCommandAutoSuccess, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000003, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802A10E4_779D74, 0x0000000D, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x00000040, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x000000E0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015B, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x00000020, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A60_77A6F0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A1688_77A318, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802A3750_77C3E0 -.word 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A26B0_77B340, 0x00000046, 0x00000001, D_802A125C_779EEC, 0x00000046, 0x00000001, D_802A13D0_77A060, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000022, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010008, 0x00030000, 0x00000043, 0x00000003, func_80274A18, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, PlayerTestEnemy, 0xFE363C80, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000046, 0x00000001, D_802A209C_77AD2C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0x00000050, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000007, PlayerDamageEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0x00000030, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A60_77A6F0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269524, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000058, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000001C, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000023, 0x00000059, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000002, SetActionDifficultyTable, D_802A26B0_77B340, 0x00000043, 0x00000002, LoadActionCommand, 0x00000001, 0x00000043, 0x00000001, action_command_jump_init, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000019, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, action_command_jump_start, 0xFE363C8A, 0x00000005, 0x00000023, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x00010007, 0x00010007, 0x0001000C, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000043, 0x00000003, func_80275F00, 0x00000019, 0x00000002, 0x00000012, 0x00000000, 0x00000043, 0x00000003, func_80275F00, 0x00000019, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000002, EnablePlayerBlur, 0x00000000, 0x00000043, 0x00000002, GetCommandAutoSuccess, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000003, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802A10E4_779D74, 0x0000000D, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DidActionSucceed, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000019, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x00000040, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x000000E0, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000000, 0x00000003, 0x0000015C, 0x00000000, 0x00000043, 0x00000008, PlayerPowerBounceEnemy, 0xFE363C80, 0x00100080, 0x00000000, 0x00000000, 0xFE363C8C, 0xFE363C8D, 0x00000020, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000235, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000236, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000237, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000238, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80269550, 0xFE363C8E, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_802A1A60_77A6F0, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000046, 0x00000001, D_802A1688_77A318, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 4302b29e04..deaa92e4d7 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -1379,15 +1379,15 @@ segments: - [0x18F340, c, 18F340] - [0x190A10, c] - [0x190B20, c, 190B20] - - [0x1967B0, c, load_script] - - [0x196A10, c, move_script] + - [0x1967B0, c, battle/use_items] + - [0x196A10, c, battle/use_moves] - [0x196AA0, c, battle/action_cmd] - [0x197F40, c, actor_api] - [0x19FAF0, c, 19FAF0] - [0x1A5830, c, 1A5830] - [0x1AC760, c] - [0x1AF120, c] - - [0x1AF230, c] + - [0x1AF230, c, battle/use_star_powers] - [0x1AF2D0, .data, 16c8e0] - [0x1AF5C0, .data, battle_cam] - [0x1B2050, .data, 17D6A0] @@ -1563,13 +1563,13 @@ segments: - [0x1C0560, ia8, ui/battle/swap_background, 48, 16] - [0x1C0860] - [0x1C2100, .data, 190B20] - - [0x1C2460, .data, load_script] - - [0x1C2760, .data, move_script] + - [0x1C2460, .data, battle/use_items] + - [0x1C2760, .data, battle/use_moves] - [0x1C2A70, .data, battle/action_cmd] - [0x1C2EC0, .data, 19FAF0] - [0x1C2FC0, .data, 1A5830] - [0x1C3000, .data, 1AF120] - - [0x1CB0B0, .data, 1AF230] + - [0x1CB0B0, .data, battle/use_star_powers] - [0x1CB240] - [0x1CC310, ci4, icon/present, 32, 32] - [0x1CC510, palette, icon/present] @@ -2496,9 +2496,9 @@ segments: - [0x1FA790, ci4, icon/battle/ultra_boot, 32, 32] - [0x1FA990, palette, icon/battle/ultra_boot] - [0x1FA9B0, palette, icon/battle/ultra_boot.disabled] - - [0x1FA9D0, ci4, icon/battle/items, 32, 32] - - [0x1FABD0, palette, icon/battle/items] - - [0x1FABF0, palette, icon/battle/items.disabled] + - [0x1FA9D0, ci4, icon/battle/move/items, 32, 32] + - [0x1FABD0, palette, icon/battle/move/items] + - [0x1FABF0, palette, icon/battle/move/items.disabled] - [0x1FAC10, ci4, icon/heart/heart_1, 32, 32] - [0x1FAE10, palette, icon/heart/heart_1] - [0x1FAE30, ci4, icon/heart/heart_2, 32, 32] @@ -7141,7 +7141,7 @@ segments: #################### ### Battle Areas ### #################### - - dir: battle/area_kmr_part_1 + - dir: battle/area/kmr_part_1 type: code start: 0x4309A0 vram: 0x80218000 @@ -7158,7 +7158,7 @@ segments: - [0x431660, c, stage/kmr_05] - [0x4318D0, c, stage/kmr_06] - [0x431B80] - - dir: battle/area_kmr_part_2 + - dir: battle/area/kmr_part_2 type: code start: 0x439A90 vram: 0x80218000 @@ -7178,7 +7178,7 @@ segments: - [0x43ACC0, c, stage/kmr_05] - [0x43AF30, c, stage/kmr_06] - [0x43B1E0] - - dir: battle/area_kmr_part_3 + - dir: battle/area/kmr_part_3 type: code start: 0x447440 vram: 0x80218000 @@ -7206,7 +7206,7 @@ segments: - [0x4491A0, c, stage/mac_01] - [0x4495F0, c, stage/kpa_01] - [0x4495F0] - - dir: battle/area_mac + - dir: battle/area/mac type: code start: 0x464490 vram: 0x80218000 @@ -7221,7 +7221,7 @@ segments: - [0x4661E0, c, stage/mac_02] - [0x4661E0, c, area] - [0x4661E0] - - dir: battle/area_hos + - dir: battle/area/hos type: code start: 0x47F0B0 vram: 0x80218000 @@ -7235,7 +7235,7 @@ segments: - [0x4800C0, c, stage/hos_02] - [0x4800C0, c, area] - [0x4800C0] - - dir: battle/area_nok + - dir: battle/area/nok type: code start: 0x48D1A0 vram: 0x80218000 @@ -7255,7 +7255,7 @@ segments: - [0x48DFC0, c, stage/nok_03] - [0x48DFC0, c, stage/nok_04] - [0x48DFC0] - - dir: battle/area_trd_part_1 + - dir: battle/area/trd_part_1 type: code start: 0x4A10A0 vram: 0x80218000 @@ -7282,7 +7282,7 @@ segments: - [0x4A1530, c, stage/trd_05e] - [0x4A1530, c, stage/trd_05f] - [0x4A1530] - - dir: battle/area_trd_part_2 + - dir: battle/area/trd_part_2 type: code start: 0x4B11F0 vram: 0x80218000 @@ -7308,7 +7308,7 @@ segments: - [0x4B3740, c, stage/trd_05e] - [0x4B3740, c, stage/trd_05f] - [0x4B3740] - - dir: battle/area_trd_part_3 + - dir: battle/area/trd_part_3 type: code start: 0x4CF1B0 vram: 0x80218000 @@ -7318,7 +7318,7 @@ segments: - [0x4CF1B0, c, actor/eldstar] - [0x4CF3D0, c, stage/nok_01] - [0x4CF3D0] - - dir: battle/area_iwa + - dir: battle/area/iwa type: code start: 0x4D01F0 vram: 0x80218000 @@ -7334,7 +7334,7 @@ segments: - [0x4D03B0, c, stage/iwa_01b] - [0x4D03B0, c, stage/iwa_02] - [0x4D0400] - - dir: battle/area_sbk + - dir: battle/area/sbk type: code start: 0x4DA5E0 vram: 0x80218000 @@ -7346,7 +7346,7 @@ segments: - [0x4DA6B0, c, stage/sbk_02] - [0x4DA860, c, area] - [0x4DA860] - - dir: battle/area_isk_part_1 + - dir: battle/area/isk_part_1 type: code start: 0x4E2740 vram: 0x80218000 @@ -7372,7 +7372,7 @@ segments: - [0x4E32E0, c, stage/isk_08] - [0x4E3350, c, area] - [0x4E3350] - - dir: battle/area_isk_part_2 + - dir: battle/area/isk_part_2 type: code start: 0x4EF4A0 vram: 0x80218000 @@ -7394,7 +7394,7 @@ segments: - [0x4EFF70, c, stage/isk_07] - [0x4EFFE0, c, area] - [0x4EFFE0] - - dir: battle/area_mim + - dir: battle/area/mim type: code start: 0x4F7BE0 vram: 0x80218000 @@ -7406,7 +7406,7 @@ segments: - [0x4F7F40, c, stage/mim_01] - [0x4F7FA0, c, area] - [0x4F7FA0] - - dir: battle/area_arn + - dir: battle/area/arn type: code start: 0x4FEA50 vram: 0x80218000 @@ -7425,7 +7425,7 @@ segments: - [0x4FF1C0, c, stage/arn_06] - [0x4FF1C0, c, area] - [0x4FF1C0] - - dir: battle/area_dgb + - dir: battle/area/dgb type: code start: 0x50F020 vram: 0x80218000 @@ -7440,7 +7440,7 @@ segments: - [0x50F020, c, stage/dgb_05] - [0x50F020, c, area] - [0x50F020] - - dir: battle/area_omo + - dir: battle/area/omo type: code start: 0x5125D0 vram: 0x80218000 @@ -7468,7 +7468,7 @@ segments: - [0x5137E0, c, stage/omo_07] - [0x5137E0, c, area] - [0x5137E0] - - dir: battle/area_omo2 + - dir: battle/area/omo2 type: code start: 0x52B6A0 vram: 0x80218000 @@ -7479,49 +7479,49 @@ segments: - [0x52B8F0, c, actor/light_bulb] - [0x52B9D0, c, stage/omo_07] - [0x52B9D0, c, area] - - dir: battle/area_omo2_1 + - dir: battle/area/omo2_1 type: code start: 0x543570 vram: 0x80231000 vram_of_symbol: Vine1Base subsegments: - [0x543570, c, actor/shy_squad] - - dir: battle/area_omo2_2 + - dir: battle/area/omo2_2 type: code start: 0x5483E0 vram: 0x80231000 vram_of_symbol: Vine1Base subsegments: - [0x5483E0, c, actor/stilt_guy] - - dir: battle/area_omo2_3 + - dir: battle/area/omo2_3 type: code start: 0x54CC70 vram: 0x80231000 vram_of_symbol: Vine1Base subsegments: - [0x54CC70, c, actor/shy_stack] - - dir: battle/area_omo2_4 + - dir: battle/area/omo2_4 type: code start: 0x552440 vram: 0x80231000 vram_of_symbol: Vine1Base subsegments: - [0x552440, c, actor/signal_guy] - - dir: battle/area_omo2_5 + - dir: battle/area/omo2_5 type: code start: 0x552BB0 vram: 0x80231000 vram_of_symbol: Vine1Base subsegments: - [0x552BB0, c, actor/shy_squad_dup] - - dir: battle/area_omo2_6 + - dir: battle/area/omo2_6 type: code start: 0x556C90 vram: 0x80231000 vram_of_symbol: Vine1Base subsegments: - [0x556C90, c, actor/shy_guy_dup] - - dir: battle/area_omo3 + - dir: battle/area/omo3 type: code start: 0x5573E0 vram: 0x80218000 @@ -7546,7 +7546,7 @@ segments: - [0x5580C0, c, actor/red_shy_guy] - [0x558190, c, area] - [0x558190] - - dir: battle/area_kgr + - dir: battle/area/kgr type: code start: 0x56E2A0 vram: 0x80218000 @@ -7556,7 +7556,7 @@ segments: - [0x56E800, c, stage/kgr_01] - [0x56EC50, c, area] - [0x56EC50] - - dir: battle/area_jan + - dir: battle/area/jan type: code start: 0x573920 vram: 0x80218000 @@ -7578,7 +7578,7 @@ segments: - [0x573EE0, c, stage/jan_04b] - [0x573EE0, c, area] - [0x573EE0] - - dir: battle/area_jan2 + - dir: battle/area/jan2 type: code start: 0x584940 vram: 0x80218000 @@ -7596,7 +7596,7 @@ segments: - [0x585000, c, stage/jan_04b] - [0x585000, c, area] - [0x585000] - - dir: battle/area_kzn + - dir: battle/area/kzn type: code start: 0x58C2F0 vram: 0x80218000 @@ -7617,7 +7617,7 @@ segments: - [0x58D100, c, stage/kzn_05] - [0x58D100, c, area] - [0x58D100] - - dir: battle/area_kzn2 + - dir: battle/area/kzn2 type: code start: 0x59E6E0 vram: 0x80218000 @@ -7693,7 +7693,7 @@ segments: - [0x5B0720, .data, stage/kzn_05] - [0x5B1070, .data, area] - [0x5B1240] - - dir: battle/area_flo + - dir: battle/area/flo type: code start: 0x5B14B0 vram: 0x80218000 @@ -7722,7 +7722,7 @@ segments: - [0x5B32B0, c, stage/flo_06] - [0x5B3370, c, area] - [0x5B3370] - - dir: battle/area_flo2 + - dir: battle/area/flo2 type: code start: 0x5CE690 vram: 0x80218000 @@ -7744,7 +7744,7 @@ segments: - [0x5CFE40, c, stage/flo_06] - [0x5CFF00, c, area] - [0x5CFF00] - - dir: battle/area_tik + - dir: battle/area/tik type: code start: 0x5EC490 vram: 0x80218000 @@ -7765,7 +7765,7 @@ segments: - [0x5EE240, c, stage/tik_05] - [0x5EE550, c, area] - [0x5EE550] - - dir: battle/area_tik2 + - dir: battle/area/tik2 type: code start: 0x608AB0 vram: 0x80218000 @@ -7782,7 +7782,7 @@ segments: - [0x60A8C0, c, stage/tik_05] - [0x60ABD0, c, area] - [0x60ABD0] - - dir: battle/area_tik3 + - dir: battle/area/tik3 type: code start: 0x6186F0 vram: 0x80218000 @@ -7797,7 +7797,7 @@ segments: - [0x619C30, c, stage/tik_05] - [0x619F40, c, area] - [0x619F40] - - dir: battle/area_sam + - dir: battle/area/sam type: code start: 0x623BA0 vram: 0x80218000 @@ -7816,7 +7816,7 @@ segments: - [0x6263D0, c, stage/sam_02d] - [0x6266F0, c, stage/sam_03] - [0x626A30, c, area] - - dir: battle/area_sam2 + - dir: battle/area/sam2 type: code start: 0x63D1E0 vram: 0x80218000 @@ -7857,7 +7857,7 @@ segments: subsegments: - [0x648860, vtx, monstar_bubbles] - [0x648C80] - - dir: battle/area_pra + - dir: battle/area/pra type: code start: 0x648E10 vram: 0x80218000 @@ -7878,7 +7878,7 @@ segments: - [0x64A340, c, stage/pra_03c] - [0x64A340, c, stage/pra_04] - [0x64A340, c, area] - - dir: battle/area_pra2 + - dir: battle/area/pra2 type: code start: 0x660750 vram: 0x80218000 @@ -7889,7 +7889,7 @@ segments: - [0x660D20, c, actor/crystal_bit] - [0x660E10, c, stage/sam_04] - [0x661150, c, area] - - dir: battle/area_pra3 + - dir: battle/area/pra3 type: code start: 0x669D80 vram: 0x80218000 @@ -7907,7 +7907,7 @@ segments: - [0x66BC90, c, stage/pra_03c] - [0x66BC90, c, stage/pra_04] - [0x66BC90, c, area] - - dir: battle/area_kpa + - dir: battle/area/kpa type: code start: 0x684A30 vram: 0x80218000 @@ -7935,7 +7935,7 @@ segments: - [0x685260, c, stage/kpa_14] - [0x685260, c, area] - [0x685260] - - dir: battle/area_kpa2 + - dir: battle/area/kpa2 type: code start: 0x69F200 vram: 0x80218000 @@ -7951,7 +7951,7 @@ segments: - [0x6A4490, c, stage/kpa_03] - [0x6A44E0, c, area] - [0x6A44E0] - - dir: battle/area_kpa3 + - dir: battle/area/kpa3 type: code start: 0x6BBB90 vram: 0x80218000 @@ -7962,7 +7962,7 @@ segments: - [0x6BD250, c, stage/kpa_01] - [0x6BD250, c, area] - [0x6BD250] - - dir: battle/area_kpa4 + - dir: battle/area/kpa4 type: code start: 0x6CC070 vram: 0x80218000 @@ -7988,7 +7988,7 @@ segments: - [0x6CC6C0, c, stage/kpa_14] - [0x6CC6C0, c, area] - [0x6CC6C0] - - dir: battle/area_kkj + - dir: battle/area/kkj type: code start: 0x6DBDA0 vram: 0x80218000 @@ -7998,7 +7998,7 @@ segments: - [0x6DBDA0, c, actor/kammy_koopa] - [0x6DC2F0, c, stage/kpa_05] - [0x6DC340] - - dir: battle/area_dig + - dir: battle/area/dig type: code start: 0x6DDDC0 vram: 0x80218000 @@ -8122,7 +8122,7 @@ segments: ### Battle Items ### #################### - name: mushroom - dir: battle/item + dir: battle/move/item type: code start: 0x715850 vram: 0x802A1000 @@ -8131,7 +8131,7 @@ segments: - [0x715850, c, mushroom] - [0x715E50] - name: fire_flower - dir: battle/item + dir: battle/move/item type: code start: 0x716C60 vram: 0x802A1000 @@ -8140,7 +8140,7 @@ segments: - [0x716C60, c, fire_flower] - [0x717060] - name: dusty_hammer - dir: battle/item + dir: battle/move/item type: code start: 0x7179D0 vram: 0x802A1000 @@ -8155,7 +8155,7 @@ segments: - [0x7183D0, palette, dusty_hammer] - [0x7183F0] - name: pow_block - dir: battle/item + dir: battle/move/item type: code start: 0x718850 vram: 0x802A1000 @@ -8164,7 +8164,7 @@ segments: - [0x718850, c, pow_block] - [0x718BF0] - name: pebble - dir: battle/item + dir: battle/move/item type: code start: 0x719970 vram: 0x802A1000 @@ -8179,7 +8179,7 @@ segments: - [0x71A370, palette, pebble] - [0x71A390] - name: volt_shroom - dir: battle/item + dir: battle/move/item type: code start: 0x71A7F0 vram: 0x802A1000 @@ -8188,7 +8188,7 @@ segments: - [0x71A7F0, c, volt_shroom] - [0x71AA70] - name: thunder_rage - dir: battle/item + dir: battle/move/item type: code start: 0x71B1A0 vram: 0x802A1000 @@ -8197,7 +8197,7 @@ segments: - [0x71B1A0, c, thunder_rage] - [0x71B640] - name: snowman_doll - dir: battle/item + dir: battle/move/item type: code start: 0x71BE30 vram: 0x802A1000 @@ -8206,7 +8206,7 @@ segments: - [0x71BE30, c, snowman_doll] - [0x71C270] - name: dried_shroom - dir: battle/item + dir: battle/move/item type: code start: 0x71CCE0 vram: 0x802A1000 @@ -8215,7 +8215,7 @@ segments: - [0x71CCE0, c, dried_shroom] - [0x71D010] - name: shooting_star - dir: battle/item + dir: battle/move/item type: code start: 0x71D770 vram: 0x802A1000 @@ -8224,7 +8224,7 @@ segments: - [0x71D770, c, shooting_star] - [0x71DCC0] - name: sleepy_sheep - dir: battle/item + dir: battle/move/item type: code start: 0x71E650 vram: 0x802A1000 @@ -8244,7 +8244,7 @@ segments: - [0x720580, palette, sleepy_sheep3] - [0x7205A0] - name: stone_cap - dir: battle/item + dir: battle/move/item type: code start: 0x7215A0 vram: 0x802A1000 @@ -8253,7 +8253,7 @@ segments: - [0x7215A0, c, stone_cap] - [0x721970] - name: tasty_tonic - dir: battle/item + dir: battle/move/item type: code start: 0x722000 vram: 0x802A1000 @@ -8262,7 +8262,7 @@ segments: - [0x722000, c, tasty_tonic] - [0x7222D0] - name: thunder_bolt - dir: battle/item + dir: battle/move/item type: code start: 0x722B40 vram: 0x802A1000 @@ -8271,7 +8271,7 @@ segments: - [0x722B40, c, thunder_bolt] - [0x722FE0] - name: ultra_shroom - dir: battle/item + dir: battle/move/item type: code start: 0x723780 vram: 0x802A1000 @@ -8280,7 +8280,7 @@ segments: - [0x723780, c, ultra_shroom] - [0x723AB0] - name: unknown_item - dir: battle/item + dir: battle/move/item type: code start: 0x724240 vram: 0x802A1000 @@ -8289,7 +8289,7 @@ segments: - [0x724240, c, unknown_item] - [0x724570] - name: super_soda - dir: battle/item + dir: battle/move/item type: code start: 0x724CE0 vram: 0x802A1000 @@ -8298,7 +8298,7 @@ segments: - [0x724CE0, c, super_soda] - [0x725210] - name: hustle_drink - dir: battle/item + dir: battle/move/item type: code start: 0x725F60 vram: 0x802A1000 @@ -8307,7 +8307,7 @@ segments: - [0x725F60, c, hustle_drink] - [0x726240] - name: stop_watch - dir: battle/item + dir: battle/move/item type: code start: 0x726DD0 vram: 0x802A1000 @@ -8316,7 +8316,7 @@ segments: - [0x726DD0, c, stop_watch] - [0x727120] - name: dizzy_dial - dir: battle/item + dir: battle/move/item type: code start: 0x727910 vram: 0x802A1000 @@ -8325,7 +8325,7 @@ segments: - [0x727910, c, dizzy_dial] - [0x727CE0] - name: please_come_back - dir: battle/item + dir: battle/move/item type: code start: 0x7285E0 vram: 0x802A1000 @@ -8334,7 +8334,7 @@ segments: - [0x7285E0, c, please_come_back] - [0x728820] - name: egg_missile - dir: battle/item + dir: battle/move/item type: code start: 0x728EC0 vram: 0x802A1000 @@ -8356,7 +8356,7 @@ segments: - [0x729FF0, palette, egg_missile4] - [0x72A010] - name: insecticide_herb - dir: battle/item + dir: battle/move/item type: code start: 0x72A750 vram: 0x802A1000 @@ -8372,7 +8372,7 @@ segments: - [0x72B330, palette, insecticide_herb] - [0x72B350] - name: fright_jar - dir: battle/item + dir: battle/move/item type: code start: 0x72B910 vram: 0x802A1000 @@ -8381,7 +8381,7 @@ segments: - [0x72B910, c, fright_jar] - [0x72BC60] - name: mystery - dir: battle/item + dir: battle/move/item type: code start: 0x72C5B0 vram: 0x802A1000 @@ -8397,7 +8397,7 @@ segments: - [0x72D6C0, palette, mystery] - [0x72D6E0] - name: repel_gel - dir: battle/item + dir: battle/move/item type: code start: 0x72DB70 vram: 0x802A1000 @@ -8406,7 +8406,7 @@ segments: - [0x72DB70, c, repel_gel] - [0x72DE00] - name: life_shroom - dir: battle/item + dir: battle/move/item type: code start: 0x72E530 vram: 0x802A1000 @@ -8415,7 +8415,7 @@ segments: - [0x72E530, c, life_shroom] - [0x72EA20] - name: coconut - dir: battle/item + dir: battle/move/item type: code start: 0x72F720 vram: 0x802A1000 @@ -8431,7 +8431,7 @@ segments: - [0x730120, palette, coconut] - [0x730140] - name: electro_pop - dir: battle/item + dir: battle/move/item type: code start: 0x7305A0 vram: 0x802A1000 @@ -8440,7 +8440,7 @@ segments: - [0x7305A0, c, electro_pop] - [0x730AE0] - name: strange_cake - dir: battle/item + dir: battle/move/item type: code start: 0x731300 vram: 0x802A1000 @@ -8460,7 +8460,7 @@ segments: - [0x732AB0, palette, strange_cake3] - [0x732AD0] - name: food - dir: battle/item + dir: battle/move/item type: code start: 0x7330D0 vram: 0x802A1000 @@ -8472,15 +8472,17 @@ segments: #################### ### Battle Moves ### #################### - - dir: battle/move/hammer + - name: battle_move_hammer_attack + dir: battle/move/hammer type: code start: 0x7345A0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7345A0, c, hammer] + - [0x7345A0, c, attack] - [0x734650] - - dir: battle/move/spin_smash + - name: battle_move_spin_smash + dir: battle/move/hammer type: code start: 0x737890 vram: 0x802A1000 @@ -8488,7 +8490,8 @@ segments: subsegments: - [0x737890, c, spin_smash] - [0x737A20] - - dir: battle/move/quake_hammer + - name: battle_move_quake_hammer + dir: battle/move/hammer type: code start: 0x73AED0 vram: 0x802A1000 @@ -8496,119 +8499,152 @@ segments: subsegments: - [0x73AED0, c, quake_hammer] - [0x73AF80] - - dir: battle/move/jump + - name: battle_move_jump_attack + dir: battle/move/jump type: code start: 0x73D860 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x73D860, c, jump] + - [0x73D860, c, attack] - [0x73D9A0] - - dir: battle/move/multibounce + - name: battle_move_multibounce + dir: battle/move/jump type: code start: 0x740CC0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x740CC0, c] - - [0x740DB0, data] - - dir: battle/move/power_bounce + - [0x740CC0, c, multibounce] + - [0x740DB0] + - name: battle_move_power_bounce + dir: battle/move/jump type: code start: 0x743DF0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x743DF0, c] - - [0x743FF0, data] - - dir: battle/move/sleep_stomp + - [0x743DF0, c, power_bounce] + - [0x743FF0] + - name: battle_move_sleep_stomp + dir: battle/move/jump type: code start: 0x746E10 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x746E10, c] - - [0x746F00, data] - - dir: battle/move/dizzy_stomp + - [0x746E10, c, sleep_stomp] + - [0x746F00] + - name: battle_move_dizzy_stomp + dir: battle/move/jump type: code start: 0x748DD0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x748DD0, c] - - [0x748EC0, data] - - dir: battle/move/d_down_pound + - [0x748DD0, c, dizzy_stomp] + - [0x748EC0] + - name: battle_move_d_down_pound + dir: battle/move/hammer type: code start: 0x74AD90 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x74AD90, c] - - [0x74AF40, data] - - dir: battle/move/jump_charge_0 + - [0x74AD90, c, d_down_pound] + - [0x74AF40] + - name: battle_move_jump_charge_0 + dir: battle/move/jump type: code start: 0x74D570 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x74D570, c] - - [0x74D850, data] - - dir: battle/move/hammer_charge_0 + - [0x74D570, c, jump_charge_0] + - [0x74D850] + - name: battle_move_hammer_charge_0 + dir: battle/move/hammer type: code start: 0x74F130 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x74F130, c] - - [0x74F3D0, data] - - dir: battle/move/hammer_throw + - [0x74F130, c, hammer_charge_0] + - [0x74F3D0] + - name: battle_move_hammer_throw + dir: battle/move/hammer type: code start: 0x752450 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x752450, c] - - [0x752500, data] - - dir: battle/move/mega_quake + - [0x752450, c, hammer_throw] + - start: 0x752500 + type: .data + name: hammer_throw + subsegments: + - [0x752500] + - [0x754498, ci4, dusty_hammer, 32, 32] + - [0x754698, palette, dusty_hammer] + - [0x7546B8, ci4, basic_hammer, 32, 32] + - [0x7548B8, palette, basic_hammer] + - [0x7548D8, ci4, super_hammer, 32, 32] + - [0x754AD8, palette, super_hammer] + - [0x754AF8, ci4, ultra_hammer, 32, 32] + - [0x754CF8, palette, ultra_hammer] + - [0x754D18, vtx, hammer_throw] + - [0x754D58, gfx, dusty_hammer] + - [0x754E48, gfx, basic_hammer] + - [0x754F38, gfx, super_hammer] + - [0x755028, gfx, ultra_hammer] + - [0x755118] + - name: battle_move_mega_quake + dir: battle/move/hammer type: code start: 0x756780 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x756780, c] - - [0x756900, data] - - dir: battle/move/hammer_charge_1 + - [0x756780, c, mega_quake] + - [0x756900] + - name: battle_move_hammer_charge_1 + dir: battle/move/hammer type: code start: 0x7595B0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7595B0, c] - - [0x7598D0, data] - - dir: battle/move/jump_charge_1 + - [0x7595B0, c, hammer_charge_1] + - [0x7598D0] + - name: battle_move_jump_charge_1 + dir: battle/move/jump type: code start: 0x75C980 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x75C980, c] - - [0x75CCE0, data] - - dir: battle/move/hammer_charge_2 + - [0x75C980, c, jump_charge_1] + - [0x75CCE0] + - name: battle_move_hammer_charge_2 + dir: battle/move/hammer type: code start: 0x75E5D0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x75E5D0, c] - - [0x75E8F0, data] - - dir: battle/move/jump_charge_2 + - [0x75E5D0, c, hammer_charge_2] + - [0x75E8F0] + - name: battle_move_jump_charge_2 + dir: battle/move/jump type: code start: 0x761920 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x761920, c] - - [0x761C80, data] - - dir: battle/move/auto_smash + - [0x761920, c, jump_charge_2] + - [0x761C80] + - name: battle_move_auto_smash + dir: battle/move/hammer type: code start: 0x763540 vram: 0x802A1000 @@ -8616,7 +8652,8 @@ segments: subsegments: - [0x763540, c, auto_smash] - [0x7635F0] - - dir: battle/move/auto_jump + - name: battle_move_auto_jump + dir: battle/move/jump type: code start: 0x765C20 vram: 0x802A1000 @@ -8624,15 +8661,17 @@ segments: subsegments: - [0x765C20, c, auto_jump] - [0x765D10] - - dir: battle/move/power_quake + - name: battle_move_power_quake + dir: battle/move/hammer type: code start: 0x767C90 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x767C90, c] - - [0x767D40, data] - - dir: battle/move/auto_multibounce + - [0x767C90, c, power_quake] + - [0x767D40] + - name: battle_move_auto_multibounce + dir: battle/move/jump type: code start: 0x76A830 vram: 0x802A1000 @@ -8640,197 +8679,221 @@ segments: subsegments: - [0x76A830, c, auto_multibounce] - [0x76A920] - - dir: battle/move/power_jump + - name: battle_move_power_jump + dir: battle/move/jump type: code start: 0x76D760 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x76D760, c] - - [0x76D850, data] - - dir: battle/move/super_jump + - [0x76D760, c, power_jump] + - [0x76D850] + - name: battle_move_super_jump + dir: battle/move/jump type: code start: 0x76F330 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x76F330, c] - - [0x76F420, data] - - dir: battle/move/mega_jump + - [0x76F330, c, super_jump] + - [0x76F420] + - name: battle_move_mega_jump + dir: battle/move/jump type: code start: 0x770F30 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x770F30, c] - - [0x771020, data] - - dir: battle/move/power_smash + - [0x770F30, c, mega_jump] + - [0x771020] + - name: battle_move_power_smash + dir: battle/move/hammer type: code start: 0x772BA0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x772BA0, c] - - [0x772C50, data] - - dir: battle/move/super_smash + - [0x772BA0, c, power_smash] + - [0x772C50] + - name: battle_move_super_smash + dir: battle/move/hammer type: code start: 0x775100 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x775100, c] - - [0x7751B0, data] - - dir: battle/move/mega_smash + - [0x775100, c, super_smash] + - [0x7751B0] + - name: battle_move_mega_smash + dir: battle/move/hammer type: code start: 0x777690 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x777690, c] - - [0x777740, data] - - dir: battle/move/unknown_move + - [0x777690, c, mega_smash] + - [0x777740] + - name: battle_move_demo_power_bounce + dir: battle/move/jump type: code start: 0x779C90 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x779C90, c] - - [0x779E30, data] - - dir: battle/move/shrink_smash + - [0x779C90, c, demo_power_bounce] + - [0x779E30] + - name: battle_move_shrink_smash + dir: battle/move/hammer type: code start: 0x77CB80 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x77CB80, c] - - [0x77CC30, data] - - dir: battle/move/shell_crack + - [0x77CB80, c, shrink_smash] + - [0x77CC30] + - name: battle_move_shell_crack + dir: battle/move/hammer type: code start: 0x77F240 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x77F240, c] - - [0x77F3D0, data] - - dir: battle/move/d_down_jump + - [0x77F240, c, shell_crack] + - [0x77F3D0] + - name: battle_move_d_down_jump + dir: battle/move/jump type: code start: 0x781920 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x781920, c] - - [0x781AF0, data] - - dir: battle/move/shrink_stomp + - [0x781920, c, d_down_jump] + - [0x781AF0] + - name: battle_move_shrink_stomp + dir: battle/move/jump type: code start: 0x783BA0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x783BA0, c] - - [0x783C90, data] - - dir: battle/move/earthquake_jump + - [0x783BA0, c, shrink_stomp] + - [0x783C90] + - name: battle_move_earthquake_jump + dir: battle/move/jump type: code start: 0x785B20 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x785B20, c] - - [0x785C20, data] - - dir: battle/star/focus + - [0x785B20, c, earthquake_jump] + - [0x785C20] + - name: battle_move_focus + dir: battle/move/star_power type: code start: 0x789E60 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x789E60, c] + - [0x789E60, c, focus] - [0x78A490] - - dir: battle/star/refresh + - name: battle_move_refresh + dir: battle/move/star_power type: code start: 0x78B600 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x78B600, c] + - [0x78B600, c, refresh] - [0x78C070] - - dir: battle/star/lullaby + - name: battle_move_lullaby + dir: battle/move/star_power type: code start: 0x78D150 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x78D150, c] + - [0x78D150, c, lullaby] - [0x78D770] - - dir: battle/star/star_storm + - name: battle_move_star_storm + dir: battle/move/star_power type: code start: 0x78E7D0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x78E7D0, c] + - [0x78E7D0, c, star_storm] - [0x78EEC0] - - dir: battle/star/chill_out + - name: battle_move_chill_out + dir: battle/move/star_power type: code start: 0x7900D0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7900D0, c] + - [0x7900D0, c, chill_out] - [0x7909C0] - - dir: battle/star/smooch + - name: battle_move_smooch + dir: battle/move/star_power type: code start: 0x791D90 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x791D90, c] + - [0x791D90, c, smooch] - [0x7923C0] - - dir: battle/star/time_out + - name: battle_move_time_out + dir: battle/move/star_power type: code start: 0x793D20 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x793D20, c] + - [0x793D20, c, time_out] - [0x794240] - - dir: battle/star/up_and_away + - name: battle_move_up_and_away + dir: battle/move/star_power type: code start: 0x7952E0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7952E0, c] + - [0x7952E0, c, up_and_away] - [0x7959B0] - - dir: battle/star/star_beam + - name: battle_move_star_beam + dir: battle/move/star_power type: code start: 0x796FC0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x796FC0, c] + - [0x796FC0, c, star_beam] - [0x7984B0] - - dir: battle/star/peach_beam + - name: battle_move_peach_beam + dir: battle/move/star_power type: code start: 0x7997B0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x7997B0, c] + - [0x7997B0, c, peach_beam] - [0x79ACA0] - - dir: battle/star/peach_focus + - name: battle_move_peach_focus + dir: battle/move/star_power type: code start: 0x79BFA0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x79BFA0, c] + - [0x79BFA0, c, peach_focus] - [0x79C4D0] - - dir: battle/star/peach_dash + - name: battle_move_twink_dash + dir: battle/move/star_power type: code start: 0x79D8A0 vram: 0x802A1000 follows_vram: battle_code subsegments: - - [0x79D8A0, c] + - [0x79D8A0, c, twink_dash] - [0x79DE50] - type: code name: level_up diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index aae645834f..7c126a39e0 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -7192,7 +7192,7 @@ func_8027D2D8 = 0x8027D2D8; // type:func rom:0x1ABBB8 func_8027D32C = 0x8027D32C; // type:func rom:0x1ABC0C SetTargetOffset = 0x8027D380; // type:func rom:0x1ABC60 func_8027D434 = 0x8027D434; // type:func rom:0x1ABD14 -func_8027D4C8 = 0x8027D4C8; // type:func rom:0x1ABDA8 +SetProjectileTargetOffset = 0x8027D4C8; // type:func rom:0x1ABDA8 EnableActorBlur = 0x8027D57C; // type:func rom:0x1ABE5C func_8027D628 = 0x8027D628; // type:func rom:0x1ABF08 AfflictActor = 0x8027D67C; // type:func rom:0x1ABF5C @@ -7588,7 +7588,7 @@ D_8029C0A4 = 0x8029C0A4; // type:data rom:0x1CA984 D_8029C12C = 0x8029C12C; // type:data rom:0x1CAA0C DoAirLift = 0x8029C37C; // rom:0x1CAC5C DoBlowAway = 0x8029C4A8; // rom:0x1CAD88 -D_8029C7D0 = 0x8029C7D0; // type:data rom:0x1CB0B0 +StarPowersTable = 0x8029C7D0; // type:data rom:0x1CB0B0 D_8029C890 = 0x8029C890; // type:data rom:0x1CB170 D_8029CAAC = 0x8029CAAC; // type:data rom:0x1CB38C D_8029CC00 = 0x8029CC00; // type:data rom:0x1CB4E0 @@ -9364,20 +9364,20 @@ b_area_kmr_part_1_kmr_04_UnkAngleFunc2 = 0x80218A50; // type:func rom:0x4313F0 b_area_kmr_part_1_kmr_05_UnkAngleFunc2 = 0x80218CC0; // type:func rom:0x431660 b_area_kmr_part_1_kmr_06_UnkAngleFunc2 = 0x80218F30; // type:func rom:0x4318D0 b_area_kmr_part_1_kmr_06_UnkFogFunc = 0x80219198; // type:func rom:0x431B38 -b_area_kmr_part_1_formation_00 = 0x802191E0; // type:data rom:0x431B80 -b_area_kmr_part_1_formation_01 = 0x802191FC; // type:data rom:0x431B9C -b_area_kmr_part_1_formation_02 = 0x80219234; // type:data rom:0x431BD4 -b_area_kmr_part_1_formation_03 = 0x80219288; // type:data rom:0x431C28 -b_area_kmr_part_1_formation_04 = 0x802192C0; // type:data rom:0x431C60 -b_area_kmr_part_1_formation_05 = 0x80219330; // type:data rom:0x431CD0 -b_area_kmr_part_1_formation_06 = 0x80219368; // type:data rom:0x431D08 -b_area_kmr_part_1_formation_07 = 0x802193D8; // type:data rom:0x431D78 -b_area_kmr_part_1_formation_08 = 0x802193F4; // type:data rom:0x431D94 -b_area_kmr_part_1_formation_09 = 0x8021942C; // type:data rom:0x431DCC -b_area_kmr_part_1_formation_0A = 0x80219480; // type:data rom:0x431E20 -b_area_kmr_part_1_formation_0B = 0x8021949C; // type:data rom:0x431E3C -b_area_kmr_part_1_formationTable = 0x802194D4; // type:data rom:0x431E74 -b_area_kmr_part_1_stageTable = 0x802195D8; // type:data rom:0x431F78 +b_area_kmr_part_1_Formation_00 = 0x802191E0; // type:data rom:0x431B80 +b_area_kmr_part_1_Formation_01 = 0x802191FC; // type:data rom:0x431B9C +b_area_kmr_part_1_Formation_02 = 0x80219234; // type:data rom:0x431BD4 +b_area_kmr_part_1_Formation_03 = 0x80219288; // type:data rom:0x431C28 +b_area_kmr_part_1_Formation_04 = 0x802192C0; // type:data rom:0x431C60 +b_area_kmr_part_1_Formation_05 = 0x80219330; // type:data rom:0x431CD0 +b_area_kmr_part_1_Formation_06 = 0x80219368; // type:data rom:0x431D08 +b_area_kmr_part_1_Formation_07 = 0x802193D8; // type:data rom:0x431D78 +b_area_kmr_part_1_Formation_08 = 0x802193F4; // type:data rom:0x431D94 +b_area_kmr_part_1_Formation_09 = 0x8021942C; // type:data rom:0x431DCC +b_area_kmr_part_1_Formation_0A = 0x80219480; // type:data rom:0x431E20 +b_area_kmr_part_1_Formation_0B = 0x8021949C; // type:data rom:0x431E3C +b_area_kmr_part_1_Formations = 0x802194D4; // type:data rom:0x431E74 +b_area_kmr_part_1_Stages = 0x802195D8; // type:data rom:0x431F78 b_area_kmr_part_1_goomba_defenseTable_80219750 = 0x80219610; // type:data rom:0x431FB0 b_area_kmr_part_1_goomba_statusTable_8021975C = 0x8021961C; // type:data rom:0x431FBC b_area_kmr_part_1_goomba_partsTable_80219808 = 0x802196C8; // type:data rom:0x432068 @@ -9474,14 +9474,14 @@ b_area_kmr_part_2_kmr_06_UnkAngleFunc2 = 0x802194A0; // type:func rom:0x43AF30 b_area_kmr_part_2_kmr_06_UnkFogFunc = 0x80219708; // type:func rom:0x43B198 b_area_kmr_part_2_pos00 = 0x80219750; // type:data rom:0x43B1E0 b_area_kmr_part_2_pos01 = 0x8021975C; // type:data rom:0x43B1EC -b_area_kmr_part_2_formation_00 = 0x80219768; // type:data rom:0x43B1F8 +b_area_kmr_part_2_Formation_00 = 0x80219768; // type:data rom:0x43B1F8 b_area_kmr_part_2_pos02 = 0x802197A0; // type:data rom:0x43B230 b_area_kmr_part_2_pos03 = 0x802197AC; // type:data rom:0x43B23C b_area_kmr_part_2_pos04 = 0x802197B8; // type:data rom:0x43B248 b_area_kmr_part_2_pos05 = 0x802197C4; // type:data rom:0x43B254 -b_area_kmr_part_2_formation_01 = 0x802197D0; // type:data rom:0x43B260 -b_area_kmr_part_2_formationTable = 0x80219840; // type:data rom:0x43B2D0 -b_area_kmr_part_2_stageTable = 0x8021987C; // type:data rom:0x43B30C +b_area_kmr_part_2_Formation_01 = 0x802197D0; // type:data rom:0x43B260 +b_area_kmr_part_2_Formations = 0x80219840; // type:data rom:0x43B2D0 +b_area_kmr_part_2_Stages = 0x8021987C; // type:data rom:0x43B30C b_area_kmr_part_2_blue_goomba_defenseTable_802198B0 = 0x802198B0; // type:data rom:0x43B340 b_area_kmr_part_2_blue_goomba_statusTable_802198BC = 0x802198BC; // type:data rom:0x43B34C b_area_kmr_part_2_blue_goomba_partsTable_80219968 = 0x80219968; // type:data rom:0x43B3F8 @@ -9627,16 +9627,16 @@ b_area_kmr_part_3_sam_01_UnkModelStuff_func1 = 0x80219A40; // type:func rom:0x44 b_area_kmr_part_3_sam_01_Set80071270_0_16 = 0x80219C38; // type:func rom:0x449078 b_area_kmr_part_3_sam_01_UnkFloatFunc2 = 0x80219C5C; // type:func rom:0x44909C func_80219D60_4491A0 = 0x80219D60; // type:func rom:0x4491A0 -b_area_kmr_part_3_formation_00 = 0x8021A1B0; // type:data rom:0x4495F0 -b_area_kmr_part_3_formation_01 = 0x8021A1CC; // type:data rom:0x44960C -b_area_kmr_part_3_formation_02 = 0x8021A204; // type:data rom:0x449644 -b_area_kmr_part_3_formation_03 = 0x8021A220; // type:data rom:0x449660 -b_area_kmr_part_3_formation_04 = 0x8021A23C; // type:data rom:0x44967C -b_area_kmr_part_3_formation_05 = 0x8021A258; // type:data rom:0x449698 -b_area_kmr_part_3_formation_06 = 0x8021A274; // type:data rom:0x4496B4 -b_area_kmr_part_3_formation_07 = 0x8021A290; // type:data rom:0x4496D0 -b_area_kmr_part_3_formationTable = 0x8021A2AC; // type:data rom:0x4496EC -b_area_kmr_part_3_stageTable = 0x8021A360; // type:data rom:0x4497A0 +b_area_kmr_part_3_Formation_00 = 0x8021A1B0; // type:data rom:0x4495F0 +b_area_kmr_part_3_Formation_01 = 0x8021A1CC; // type:data rom:0x44960C +b_area_kmr_part_3_Formation_02 = 0x8021A204; // type:data rom:0x449644 +b_area_kmr_part_3_Formation_03 = 0x8021A220; // type:data rom:0x449660 +b_area_kmr_part_3_Formation_04 = 0x8021A23C; // type:data rom:0x44967C +b_area_kmr_part_3_Formation_05 = 0x8021A258; // type:data rom:0x449698 +b_area_kmr_part_3_Formation_06 = 0x8021A274; // type:data rom:0x4496B4 +b_area_kmr_part_3_Formation_07 = 0x8021A290; // type:data rom:0x4496D0 +b_area_kmr_part_3_Formations = 0x8021A2AC; // type:data rom:0x4496EC +b_area_kmr_part_3_Stages = 0x8021A360; // type:data rom:0x4497A0 b_area_kmr_part_3_spiked_goomba_defenseTable_8021A390 = 0x8021A390; // type:data rom:0x4497D0 b_area_kmr_part_3_spiked_goomba_statusTable_8021A39C = 0x8021A39C; // type:data rom:0x4497DC b_area_kmr_part_3_spiked_goomba_partsTable_8021A448 = 0x8021A448; // type:data rom:0x449888 @@ -10109,13 +10109,13 @@ b_area_mac_mac_01 = 0x80232900; // type:data rom:0x47ED90 b_area_mac_mac_02_beforeBattle_80232930 = 0x80232930; // type:data rom:0x47EDC0 b_area_mac_mac_02_afterBattle_8023297C = 0x8023297C; // type:data rom:0x47EE0C b_area_mac_mac_02 = 0x8023299C; // type:data rom:0x47EE2C -b_area_mac_formation_00 = 0x802329D0; // type:data rom:0x47EE60 -b_area_mac_formation_01 = 0x802329EC; // type:data rom:0x47EE7C -b_area_mac_formation_02 = 0x80232A08; // type:data rom:0x47EE98 -b_area_mac_formation_03 = 0x80232A24; // type:data rom:0x47EEB4 -b_area_mac_formation_04 = 0x80232A40; // type:data rom:0x47EED0 -b_area_mac_formationTable = 0x80232A5C; // type:data rom:0x47EEEC -b_area_mac_stageTable = 0x80232AD4; // type:data rom:0x47EF64 +b_area_mac_Formation_00 = 0x802329D0; // type:data rom:0x47EE60 +b_area_mac_Formation_01 = 0x802329EC; // type:data rom:0x47EE7C +b_area_mac_Formation_02 = 0x80232A08; // type:data rom:0x47EE98 +b_area_mac_Formation_03 = 0x80232A24; // type:data rom:0x47EEB4 +b_area_mac_Formation_04 = 0x80232A40; // type:data rom:0x47EED0 +b_area_mac_Formations = 0x80232A5C; // type:data rom:0x47EEEC +b_area_mac_Stages = 0x80232AD4; // type:data rom:0x47EF64 D_80232B38_47EFC8 = 0x80232B38; // type:data rom:0x47EFC8 b_area_mac_lee_pad = 0x80232C18; // type:data rom:0x47F0A8 func_80218000_47F0B0 = 0x80232C20; // type:data rom:0x47F0B0 @@ -10218,12 +10218,12 @@ b_area_hos_hos_00 = 0x802258B8; // type:data rom:0x48C968 b_area_hos_hos_02_beforeBattle_802258E0 = 0x802258E0; // type:data rom:0x48C990 b_area_hos_hos_02_afterBattle_80225E20 = 0x80225E20; // type:data rom:0x48CED0 b_area_hos_hos_02 = 0x80225E30; // type:data rom:0x48CEE0 -b_area_hos_formation_00 = 0x80225E60; // type:data rom:0x48CF10 -b_area_hos_formation_01 = 0x80225E7C; // type:data rom:0x48CF2C -b_area_hos_formation_02 = 0x80225EB4; // type:data rom:0x48CF64 -b_area_hos_formation_03 = 0x80225F08; // type:data rom:0x48CFB8 -b_area_hos_formationTable = 0x80225F24; // type:data rom:0x48CFD4 -b_area_hos_stageTable = 0x80225F88; // type:data rom:0x48D038 +b_area_hos_Formation_00 = 0x80225E60; // type:data rom:0x48CF10 +b_area_hos_Formation_01 = 0x80225E7C; // type:data rom:0x48CF2C +b_area_hos_Formation_02 = 0x80225EB4; // type:data rom:0x48CF64 +b_area_hos_Formation_03 = 0x80225F08; // type:data rom:0x48CFB8 +b_area_hos_Formations = 0x80225F24; // type:data rom:0x48CFD4 +b_area_hos_Stages = 0x80225F88; // type:data rom:0x48D038 D_80225FB0_48D060 = 0x80225FB0; // type:data rom:0x48D060 D_80225FB8_48D068 = 0x80225FB8; // type:data rom:0x48D068 D_80225FC0_48D070 = 0x80225FC0; // type:data rom:0x48D070 @@ -10247,33 +10247,33 @@ b_area_nok_kent_c_koopa_StartRumbleWithParams = 0x80218B50; // type:func rom:0x4 b_area_nok_kent_c_koopa_UnkBattleFunc1 = 0x80218BA8; // type:func rom:0x48DD48 func_80218C74_48DE14 = 0x80218C74; // type:func rom:0x48DE14 func_80218DF8_48DF98 = 0x80218DF8; // type:func rom:0x48DF98 -b_area_nok_formation_00 = 0x80218E20; // type:data rom:0x48DFC0 -b_area_nok_formation_01 = 0x80218E58; // type:data rom:0x48DFF8 -b_area_nok_formation_02 = 0x80218E90; // type:data rom:0x48E030 -b_area_nok_formation_03 = 0x80218EC8; // type:data rom:0x48E068 -b_area_nok_formation_04 = 0x80218F00; // type:data rom:0x48E0A0 -b_area_nok_formation_05 = 0x80218F38; // type:data rom:0x48E0D8 -b_area_nok_formation_06 = 0x80218F8C; // type:data rom:0x48E12C -b_area_nok_formation_07 = 0x80218FE0; // type:data rom:0x48E180 -b_area_nok_formation_08 = 0x80219050; // type:data rom:0x48E1F0 -b_area_nok_formation_09 = 0x80219088; // type:data rom:0x48E228 -b_area_nok_formation_0A = 0x802190C0; // type:data rom:0x48E260 -b_area_nok_formation_0B = 0x80219114; // type:data rom:0x48E2B4 -b_area_nok_formation_0C = 0x8021914C; // type:data rom:0x48E2EC -b_area_nok_formation_0D = 0x802191A0; // type:data rom:0x48E340 -b_area_nok_formation_0E = 0x802191F4; // type:data rom:0x48E394 -b_area_nok_formation_0F = 0x80219248; // type:data rom:0x48E3E8 -b_area_nok_formation_10 = 0x8021929C; // type:data rom:0x48E43C -b_area_nok_formation_11 = 0x8021930C; // type:data rom:0x48E4AC -b_area_nok_formation_12 = 0x80219344; // type:data rom:0x48E4E4 -b_area_nok_formation_13 = 0x8021937C; // type:data rom:0x48E51C -b_area_nok_formation_14 = 0x802193D0; // type:data rom:0x48E570 -b_area_nok_formation_15 = 0x80219440; // type:data rom:0x48E5E0 -b_area_nok_formation_16 = 0x8021945C; // type:data rom:0x48E5FC -b_area_nok_formation_17 = 0x80219494; // type:data rom:0x48E634 -b_area_nok_formation_18 = 0x80219504; // type:data rom:0x48E6A4 -b_area_nok_formationTable = 0x80219520; // type:data rom:0x48E6C0 -b_area_nok_stageTable = 0x80219728; // type:data rom:0x48E8C8 +b_area_nok_Formation_00 = 0x80218E20; // type:data rom:0x48DFC0 +b_area_nok_Formation_01 = 0x80218E58; // type:data rom:0x48DFF8 +b_area_nok_Formation_02 = 0x80218E90; // type:data rom:0x48E030 +b_area_nok_Formation_03 = 0x80218EC8; // type:data rom:0x48E068 +b_area_nok_Formation_04 = 0x80218F00; // type:data rom:0x48E0A0 +b_area_nok_Formation_05 = 0x80218F38; // type:data rom:0x48E0D8 +b_area_nok_Formation_06 = 0x80218F8C; // type:data rom:0x48E12C +b_area_nok_Formation_07 = 0x80218FE0; // type:data rom:0x48E180 +b_area_nok_Formation_08 = 0x80219050; // type:data rom:0x48E1F0 +b_area_nok_Formation_09 = 0x80219088; // type:data rom:0x48E228 +b_area_nok_Formation_0A = 0x802190C0; // type:data rom:0x48E260 +b_area_nok_Formation_0B = 0x80219114; // type:data rom:0x48E2B4 +b_area_nok_Formation_0C = 0x8021914C; // type:data rom:0x48E2EC +b_area_nok_Formation_0D = 0x802191A0; // type:data rom:0x48E340 +b_area_nok_Formation_0E = 0x802191F4; // type:data rom:0x48E394 +b_area_nok_Formation_0F = 0x80219248; // type:data rom:0x48E3E8 +b_area_nok_Formation_10 = 0x8021929C; // type:data rom:0x48E43C +b_area_nok_Formation_11 = 0x8021930C; // type:data rom:0x48E4AC +b_area_nok_Formation_12 = 0x80219344; // type:data rom:0x48E4E4 +b_area_nok_Formation_13 = 0x8021937C; // type:data rom:0x48E51C +b_area_nok_Formation_14 = 0x802193D0; // type:data rom:0x48E570 +b_area_nok_Formation_15 = 0x80219440; // type:data rom:0x48E5E0 +b_area_nok_Formation_16 = 0x8021945C; // type:data rom:0x48E5FC +b_area_nok_Formation_17 = 0x80219494; // type:data rom:0x48E634 +b_area_nok_Formation_18 = 0x80219504; // type:data rom:0x48E6A4 +b_area_nok_Formations = 0x80219520; // type:data rom:0x48E6C0 +b_area_nok_Stages = 0x80219728; // type:data rom:0x48E8C8 b_area_nok_goomba_defenseTable_80219750 = 0x80219750; // type:data rom:0x48E8F0 b_area_nok_goomba_statusTable_8021975C = 0x8021975C; // type:data rom:0x48E8FC b_area_nok_goomba_partsTable_80219808 = 0x80219808; // type:data rom:0x48E9A8 @@ -10415,38 +10415,38 @@ b_area_trd_part_1_koopa_troopa_UnkBattleFunc1 = 0x80218020; // type:func rom:0x4 b_area_trd_part_1_paratroopa_StartRumbleWithParams = 0x802180F0; // type:func rom:0x4A1190 b_area_trd_part_1_paratroopa_UnkBattleFunc1 = 0x80218148; // type:func rom:0x4A11E8 b_area_trd_part_1_trd_03_UnkAngleFunc2 = 0x80218220; // type:func rom:0x4A12C0 -b_area_trd_part_1_formation_00 = 0x80218490; // type:data rom:0x4A1530 -b_area_trd_part_1_formation_01 = 0x802184AC; // type:data rom:0x4A154C -b_area_trd_part_1_formation_02 = 0x802184E4; // type:data rom:0x4A1584 -b_area_trd_part_1_formation_03 = 0x80218538; // type:data rom:0x4A15D8 -b_area_trd_part_1_formation_04 = 0x80218570; // type:data rom:0x4A1610 -b_area_trd_part_1_formation_05 = 0x802185C4; // type:data rom:0x4A1664 -b_area_trd_part_1_formation_06 = 0x80218634; // type:data rom:0x4A16D4 -b_area_trd_part_1_formation_07 = 0x80218688; // type:data rom:0x4A1728 -b_area_trd_part_1_formation_08 = 0x802186F8; // type:data rom:0x4A1798 -b_area_trd_part_1_formation_09 = 0x80218730; // type:data rom:0x4A17D0 -b_area_trd_part_1_formation_0A = 0x80218784; // type:data rom:0x4A1824 -b_area_trd_part_1_formation_0B = 0x802187BC; // type:data rom:0x4A185C -b_area_trd_part_1_formation_0C = 0x80218810; // type:data rom:0x4A18B0 -b_area_trd_part_1_formation_0D = 0x80218880; // type:data rom:0x4A1920 -b_area_trd_part_1_formation_0E = 0x802188D4; // type:data rom:0x4A1974 -b_area_trd_part_1_formation_0F = 0x80218944; // type:data rom:0x4A19E4 -b_area_trd_part_1_formation_10 = 0x80218960; // type:data rom:0x4A1A00 -b_area_trd_part_1_formation_11 = 0x80218998; // type:data rom:0x4A1A38 -b_area_trd_part_1_formation_12 = 0x802189EC; // type:data rom:0x4A1A8C -b_area_trd_part_1_formation_13 = 0x80218A5C; // type:data rom:0x4A1AFC -b_area_trd_part_1_formation_14 = 0x80218A94; // type:data rom:0x4A1B34 -b_area_trd_part_1_formation_15 = 0x80218AE8; // type:data rom:0x4A1B88 -b_area_trd_part_1_formation_16 = 0x80218B3C; // type:data rom:0x4A1BDC +b_area_trd_part_1_Formation_00 = 0x80218490; // type:data rom:0x4A1530 +b_area_trd_part_1_Formation_01 = 0x802184AC; // type:data rom:0x4A154C +b_area_trd_part_1_Formation_02 = 0x802184E4; // type:data rom:0x4A1584 +b_area_trd_part_1_Formation_03 = 0x80218538; // type:data rom:0x4A15D8 +b_area_trd_part_1_Formation_04 = 0x80218570; // type:data rom:0x4A1610 +b_area_trd_part_1_Formation_05 = 0x802185C4; // type:data rom:0x4A1664 +b_area_trd_part_1_Formation_06 = 0x80218634; // type:data rom:0x4A16D4 +b_area_trd_part_1_Formation_07 = 0x80218688; // type:data rom:0x4A1728 +b_area_trd_part_1_Formation_08 = 0x802186F8; // type:data rom:0x4A1798 +b_area_trd_part_1_Formation_09 = 0x80218730; // type:data rom:0x4A17D0 +b_area_trd_part_1_Formation_0A = 0x80218784; // type:data rom:0x4A1824 +b_area_trd_part_1_Formation_0B = 0x802187BC; // type:data rom:0x4A185C +b_area_trd_part_1_Formation_0C = 0x80218810; // type:data rom:0x4A18B0 +b_area_trd_part_1_Formation_0D = 0x80218880; // type:data rom:0x4A1920 +b_area_trd_part_1_Formation_0E = 0x802188D4; // type:data rom:0x4A1974 +b_area_trd_part_1_Formation_0F = 0x80218944; // type:data rom:0x4A19E4 +b_area_trd_part_1_Formation_10 = 0x80218960; // type:data rom:0x4A1A00 +b_area_trd_part_1_Formation_11 = 0x80218998; // type:data rom:0x4A1A38 +b_area_trd_part_1_Formation_12 = 0x802189EC; // type:data rom:0x4A1A8C +b_area_trd_part_1_Formation_13 = 0x80218A5C; // type:data rom:0x4A1AFC +b_area_trd_part_1_Formation_14 = 0x80218A94; // type:data rom:0x4A1B34 +b_area_trd_part_1_Formation_15 = 0x80218AE8; // type:data rom:0x4A1B88 +b_area_trd_part_1_Formation_16 = 0x80218B3C; // type:data rom:0x4A1BDC b_area_trd_part_1_vector3D_80218B90 = 0x80218B90; // type:data rom:0x4A1C30 b_area_trd_part_1_vector3D_80218B9C = 0x80218B9C; // type:data rom:0x4A1C3C b_area_trd_part_1_vector3D_80218BA8 = 0x80218BA8; // type:data rom:0x4A1C48 -b_area_trd_part_1_formation_17 = 0x80218BB4; // type:data rom:0x4A1C54 -b_area_trd_part_1_formation_18 = 0x80218C08; // type:data rom:0x4A1CA8 -b_area_trd_part_1_formation_19 = 0x80218C40; // type:data rom:0x4A1CE0 -b_area_trd_part_1_formation_1A = 0x80218C5C; // type:data rom:0x4A1CFC -b_area_trd_part_1_formationTable = 0x80218CB0; // type:data rom:0x4A1D50 -b_area_trd_part_1_stageTable = 0x80218EE0; // type:data rom:0x4A1F80 +b_area_trd_part_1_Formation_17 = 0x80218BB4; // type:data rom:0x4A1C54 +b_area_trd_part_1_Formation_18 = 0x80218C08; // type:data rom:0x4A1CA8 +b_area_trd_part_1_Formation_19 = 0x80218C40; // type:data rom:0x4A1CE0 +b_area_trd_part_1_Formation_1A = 0x80218C5C; // type:data rom:0x4A1CFC +b_area_trd_part_1_Formations = 0x80218CB0; // type:data rom:0x4A1D50 +b_area_trd_part_1_Stages = 0x80218EE0; // type:data rom:0x4A1F80 b_area_trd_part_1_bullet_bill_defenseTable_80218F60 = 0x80218F60; // type:data rom:0x4A2000 b_area_trd_part_1_bullet_bill_statusTable_80218F6C = 0x80218F6C; // type:data rom:0x4A200C b_area_trd_part_1_bullet_bill_partsTable_80219018 = 0x80219018; // type:data rom:0x4A20B8 @@ -10628,9 +10628,9 @@ b_area_trd_part_2_yellow_ninja_koopa_UnkEnemyFunc = 0x80219C50; // type:func rom b_area_trd_part_2_yellow_ninja_koopa_UnkEnemyPosFunc = 0x80219CF0; // type:func rom:0x4B2EE0 b_area_trd_part_2_yellow_ninja_koopa_GetLastActorEventType = 0x8021A288; // type:func rom:0x4B3478 b_area_trd_part_2_trd_03_UnkAngleFunc2 = 0x8021A2E0; // type:func rom:0x4B34D0 -b_area_trd_part_2_formation_00 = 0x8021A550; // type:data rom:0x4B3740 -b_area_trd_part_2_formationTable = 0x8021A5DC; // type:data rom:0x4B37CC -b_area_trd_part_2_stageTable = 0x8021A604; // type:data rom:0x4B37F4 +b_area_trd_part_2_Formation_00 = 0x8021A550; // type:data rom:0x4B3740 +b_area_trd_part_2_Formations = 0x8021A5DC; // type:data rom:0x4B37CC +b_area_trd_part_2_Stages = 0x8021A604; // type:data rom:0x4B37F4 b_area_trd_part_2_fake_bowser_defenseTable_8021A670 = 0x8021A670; // type:data rom:0x4B3860 b_area_trd_part_2_fake_bowser_defenseTable_8021A684 = 0x8021A684; // type:data rom:0x4B3874 b_area_trd_part_2_fake_bowser_statusTable_8021A690 = 0x8021A690; // type:data rom:0x4B3880 @@ -10834,9 +10834,9 @@ func_80218158_4CF308 = 0x80218158; // type:func rom:0x4CF308 func_80218170_4CF320 = 0x80218170; // type:func rom:0x4CF320 func_802181B4_4CF364 = 0x802181B4; // type:func rom:0x4CF364 func_802181F8_4CF3A8 = 0x802181F8; // type:func rom:0x4CF3A8 -b_area_trd_part_3_formation_00 = 0x80218220; // type:data rom:0x4CF3D0 -b_area_trd_part_3_formationTable = 0x8021823C; // type:data rom:0x4CF3EC -b_area_trd_part_3_stageTable = 0x80218264; // type:data rom:0x4CF414 +b_area_trd_part_3_Formation_00 = 0x80218220; // type:data rom:0x4CF3D0 +b_area_trd_part_3_Formations = 0x8021823C; // type:data rom:0x4CF3EC +b_area_trd_part_3_Stages = 0x80218264; // type:data rom:0x4CF414 b_area_trd_part_3_eldstar_idleAnimations_80218280 = 0x80218280; // type:data rom:0x4CF430 b_area_trd_part_3_eldstar_defenseTable_8021828C = 0x8021828C; // type:data rom:0x4CF43C b_area_trd_part_3_eldstar_statusTable_80218298 = 0x80218298; // type:data rom:0x4CF448 @@ -10861,23 +10861,23 @@ b_area_iwa_buzzar_StartRumbleWithParams = 0x802180C0; // type:func rom:0x4D02B0 b_area_iwa_whacka_IsSaveVar123 = 0x80218120; // type:func rom:0x4D0310 b_area_iwa_iwa_01_IsSaveVar123 = 0x80218170; // type:func rom:0x4D0360 b_area_iwa_iwa_02_IsSaveVar123 = 0x802181C0; // type:func rom:0x4D03B0 -b_area_iwa_formation_00 = 0x80218210; // type:data rom:0x4D0400 -b_area_iwa_formation_01 = 0x8021822C; // type:data rom:0x4D041C -b_area_iwa_formation_02 = 0x80218264; // type:data rom:0x4D0454 -b_area_iwa_formation_03 = 0x802182B8; // type:data rom:0x4D04A8 -b_area_iwa_formation_04 = 0x802182F0; // type:data rom:0x4D04E0 -b_area_iwa_formation_05 = 0x80218344; // type:data rom:0x4D0534 -b_area_iwa_formation_06 = 0x80218360; // type:data rom:0x4D0550 -b_area_iwa_formation_07 = 0x80218398; // type:data rom:0x4D0588 -b_area_iwa_formation_08 = 0x802183EC; // type:data rom:0x4D05DC -b_area_iwa_formation_09 = 0x8021845C; // type:data rom:0x4D064C -b_area_iwa_formation_0A = 0x80218494; // type:data rom:0x4D0684 -b_area_iwa_formation_0B = 0x802184E8; // type:data rom:0x4D06D8 +b_area_iwa_Formation_00 = 0x80218210; // type:data rom:0x4D0400 +b_area_iwa_Formation_01 = 0x8021822C; // type:data rom:0x4D041C +b_area_iwa_Formation_02 = 0x80218264; // type:data rom:0x4D0454 +b_area_iwa_Formation_03 = 0x802182B8; // type:data rom:0x4D04A8 +b_area_iwa_Formation_04 = 0x802182F0; // type:data rom:0x4D04E0 +b_area_iwa_Formation_05 = 0x80218344; // type:data rom:0x4D0534 +b_area_iwa_Formation_06 = 0x80218360; // type:data rom:0x4D0550 +b_area_iwa_Formation_07 = 0x80218398; // type:data rom:0x4D0588 +b_area_iwa_Formation_08 = 0x802183EC; // type:data rom:0x4D05DC +b_area_iwa_Formation_09 = 0x8021845C; // type:data rom:0x4D064C +b_area_iwa_Formation_0A = 0x80218494; // type:data rom:0x4D0684 +b_area_iwa_Formation_0B = 0x802184E8; // type:data rom:0x4D06D8 b_area_iwa_vector3D_8021853C = 0x8021853C; // type:data rom:0x4D072C -b_area_iwa_formation_0C = 0x80218548; // type:data rom:0x4D0738 -b_area_iwa_formation_0D = 0x80218564; // type:data rom:0x4D0754 -b_area_iwa_formationTable = 0x802185B8; // type:data rom:0x4D07A8 -b_area_iwa_stageTable = 0x802186E4; // type:data rom:0x4D08D4 +b_area_iwa_Formation_0C = 0x80218548; // type:data rom:0x4D0738 +b_area_iwa_Formation_0D = 0x80218564; // type:data rom:0x4D0754 +b_area_iwa_Formations = 0x802185B8; // type:data rom:0x4D07A8 +b_area_iwa_Stages = 0x802186E4; // type:data rom:0x4D08D4 b_area_iwa_cleft_defenseTable_80218710 = 0x80218710; // type:data rom:0x4D0900 b_area_iwa_cleft_defenseTable_8021872C = 0x8021872C; // type:data rom:0x4D091C b_area_iwa_cleft_statusTable_80218740 = 0x80218740; // type:data rom:0x4D0930 @@ -11033,25 +11033,25 @@ b_area_sbk_sbk_02_beforeBattle_8021F800 = 0x8021F800; // type:data rom:0x4E1DE0 b_area_sbk_sbk_02_afterBattle_8021F8E8 = 0x8021F8E8; // type:data rom:0x4E1EC8 b_area_sbk_sbk_02_foregroundModelList_8021F8F8 = 0x8021F8F8; // type:data rom:0x4E1ED8 b_area_sbk_sbk_02 = 0x8021F90C; // type:data rom:0x4E1EEC -b_area_sbk_formation_00 = 0x8021F940; // type:data rom:0x4E1F20 -b_area_sbk_formation_01 = 0x8021F95C; // type:data rom:0x4E1F3C -b_area_sbk_formation_02 = 0x8021F994; // type:data rom:0x4E1F74 -b_area_sbk_formation_03 = 0x8021F9E8; // type:data rom:0x4E1FC8 -b_area_sbk_formation_04 = 0x8021FA58; // type:data rom:0x4E2038 -b_area_sbk_formation_05 = 0x8021FA90; // type:data rom:0x4E2070 -b_area_sbk_formation_06 = 0x8021FAE4; // type:data rom:0x4E20C4 -b_area_sbk_formation_07 = 0x8021FB54; // type:data rom:0x4E2134 -b_area_sbk_formation_08 = 0x8021FBA8; // type:data rom:0x4E2188 -b_area_sbk_formation_09 = 0x8021FC18; // type:data rom:0x4E21F8 -b_area_sbk_formation_0A = 0x8021FC34; // type:data rom:0x4E2214 -b_area_sbk_formation_0B = 0x8021FC6C; // type:data rom:0x4E224C -b_area_sbk_formation_0C = 0x8021FCC0; // type:data rom:0x4E22A0 -b_area_sbk_formation_0D = 0x8021FD30; // type:data rom:0x4E2310 -b_area_sbk_formation_0E = 0x8021FD68; // type:data rom:0x4E2348 -b_area_sbk_formation_0F = 0x8021FDBC; // type:data rom:0x4E239C -b_area_sbk_formation_10 = 0x8021FE2C; // type:data rom:0x4E240C -b_area_sbk_formationTable = 0x8021FE80; // type:data rom:0x4E2460 -b_area_sbk_stageTable = 0x8021FFE8; // type:data rom:0x4E25C8 +b_area_sbk_Formation_00 = 0x8021F940; // type:data rom:0x4E1F20 +b_area_sbk_Formation_01 = 0x8021F95C; // type:data rom:0x4E1F3C +b_area_sbk_Formation_02 = 0x8021F994; // type:data rom:0x4E1F74 +b_area_sbk_Formation_03 = 0x8021F9E8; // type:data rom:0x4E1FC8 +b_area_sbk_Formation_04 = 0x8021FA58; // type:data rom:0x4E2038 +b_area_sbk_Formation_05 = 0x8021FA90; // type:data rom:0x4E2070 +b_area_sbk_Formation_06 = 0x8021FAE4; // type:data rom:0x4E20C4 +b_area_sbk_Formation_07 = 0x8021FB54; // type:data rom:0x4E2134 +b_area_sbk_Formation_08 = 0x8021FBA8; // type:data rom:0x4E2188 +b_area_sbk_Formation_09 = 0x8021FC18; // type:data rom:0x4E21F8 +b_area_sbk_Formation_0A = 0x8021FC34; // type:data rom:0x4E2214 +b_area_sbk_Formation_0B = 0x8021FC6C; // type:data rom:0x4E224C +b_area_sbk_Formation_0C = 0x8021FCC0; // type:data rom:0x4E22A0 +b_area_sbk_Formation_0D = 0x8021FD30; // type:data rom:0x4E2310 +b_area_sbk_Formation_0E = 0x8021FD68; // type:data rom:0x4E2348 +b_area_sbk_Formation_0F = 0x8021FDBC; // type:data rom:0x4E239C +b_area_sbk_Formation_10 = 0x8021FE2C; // type:data rom:0x4E240C +b_area_sbk_Formations = 0x8021FE80; // type:data rom:0x4E2460 +b_area_sbk_Stages = 0x8021FFE8; // type:data rom:0x4E25C8 D_80220160 = 0x80218000; // type:func rom:0x4E2740 b_area_isk_part_1_swooper_UnkBattleFunc1 = 0x802180D0; // type:func rom:0x4E2810 b_area_isk_part_1_buzzy_beetle_UnkBattleFunc1 = 0x802181A0; // type:func rom:0x4E28E0 @@ -11190,34 +11190,34 @@ b_area_isk_part_1_vector3D_802240A0 = 0x802240A0; // type:data rom:0x4EE7E0 b_area_isk_part_1_vector3D_802240AC = 0x802240AC; // type:data rom:0x4EE7EC b_area_isk_part_1_vector3D_802240B8 = 0x802240B8; // type:data rom:0x4EE7F8 b_area_isk_part_1_vector3D_802240C4 = 0x802240C4; // type:data rom:0x4EE804 -b_area_isk_part_1_formation_00 = 0x802240D0; // type:data rom:0x4EE810 -b_area_isk_part_1_formation_01 = 0x80224108; // type:data rom:0x4EE848 -b_area_isk_part_1_formation_02 = 0x8022415C; // type:data rom:0x4EE89C -b_area_isk_part_1_formation_03 = 0x80224194; // type:data rom:0x4EE8D4 +b_area_isk_part_1_Formation_00 = 0x802240D0; // type:data rom:0x4EE810 +b_area_isk_part_1_Formation_01 = 0x80224108; // type:data rom:0x4EE848 +b_area_isk_part_1_Formation_02 = 0x8022415C; // type:data rom:0x4EE89C +b_area_isk_part_1_Formation_03 = 0x80224194; // type:data rom:0x4EE8D4 b_area_isk_part_1_vector3D_802241E8 = 0x802241E8; // type:data rom:0x4EE928 b_area_isk_part_1_vector3D_802241F4 = 0x802241F4; // type:data rom:0x4EE934 -b_area_isk_part_1_formation_04 = 0x80224200; // type:data rom:0x4EE940 -b_area_isk_part_1_formation_05 = 0x80224270; // type:data rom:0x4EE9B0 -b_area_isk_part_1_formation_06 = 0x802242A8; // type:data rom:0x4EE9E8 -b_area_isk_part_1_formation_07 = 0x802242FC; // type:data rom:0x4EEA3C -b_area_isk_part_1_formation_08 = 0x80224334; // type:data rom:0x4EEA74 -b_area_isk_part_1_formation_09 = 0x80224388; // type:data rom:0x4EEAC8 -b_area_isk_part_1_formation_0A = 0x802243C0; // type:data rom:0x4EEB00 -b_area_isk_part_1_formation_0B = 0x80224430; // type:data rom:0x4EEB70 -b_area_isk_part_1_formation_0C = 0x80224484; // type:data rom:0x4EEBC4 -b_area_isk_part_1_formation_0D = 0x802244BC; // type:data rom:0x4EEBFC -b_area_isk_part_1_formation_0E = 0x802244F4; // type:data rom:0x4EEC34 -b_area_isk_part_1_formation_0F = 0x8022452C; // type:data rom:0x4EEC6C -b_area_isk_part_1_formation_10 = 0x80224564; // type:data rom:0x4EECA4 -b_area_isk_part_1_formation_11 = 0x802245B8; // type:data rom:0x4EECF8 +b_area_isk_part_1_Formation_04 = 0x80224200; // type:data rom:0x4EE940 +b_area_isk_part_1_Formation_05 = 0x80224270; // type:data rom:0x4EE9B0 +b_area_isk_part_1_Formation_06 = 0x802242A8; // type:data rom:0x4EE9E8 +b_area_isk_part_1_Formation_07 = 0x802242FC; // type:data rom:0x4EEA3C +b_area_isk_part_1_Formation_08 = 0x80224334; // type:data rom:0x4EEA74 +b_area_isk_part_1_Formation_09 = 0x80224388; // type:data rom:0x4EEAC8 +b_area_isk_part_1_Formation_0A = 0x802243C0; // type:data rom:0x4EEB00 +b_area_isk_part_1_Formation_0B = 0x80224430; // type:data rom:0x4EEB70 +b_area_isk_part_1_Formation_0C = 0x80224484; // type:data rom:0x4EEBC4 +b_area_isk_part_1_Formation_0D = 0x802244BC; // type:data rom:0x4EEBFC +b_area_isk_part_1_Formation_0E = 0x802244F4; // type:data rom:0x4EEC34 +b_area_isk_part_1_Formation_0F = 0x8022452C; // type:data rom:0x4EEC6C +b_area_isk_part_1_Formation_10 = 0x80224564; // type:data rom:0x4EECA4 +b_area_isk_part_1_Formation_11 = 0x802245B8; // type:data rom:0x4EECF8 b_area_isk_part_1_vector3D_8022460C = 0x8022460C; // type:data rom:0x4EED4C b_area_isk_part_1_vector3D_80224618 = 0x80224618; // type:data rom:0x4EED58 b_area_isk_part_1_vector3D_80224624 = 0x80224624; // type:data rom:0x4EED64 b_area_isk_part_1_vector3D_80224630 = 0x80224630; // type:data rom:0x4EED70 -b_area_isk_part_1_formation_12 = 0x8022463C; // type:data rom:0x4EED7C -b_area_isk_part_1_formation_13 = 0x802246AC; // type:data rom:0x4EEDEC -b_area_isk_part_1_formationTable = 0x80224700; // type:data rom:0x4EEE40 -b_area_isk_part_1_stageTable = 0x802248A4; // type:data rom:0x4EEFE4 +b_area_isk_part_1_Formation_12 = 0x8022463C; // type:data rom:0x4EED7C +b_area_isk_part_1_Formation_13 = 0x802246AC; // type:data rom:0x4EEDEC +b_area_isk_part_1_Formations = 0x80224700; // type:data rom:0x4EEE40 +b_area_isk_part_1_Stages = 0x802248A4; // type:data rom:0x4EEFE4 D_80224920_4EF060 = 0x80224920; // type:data rom:0x4EF060 b_area_isk_part_1_isk_04_pad = 0x80224D58; // type:data rom:0x4EF498 b_area_isk_part_1_isk_04_D_80224D60 = 0x80218000; // type:func rom:0x4EF4A0 @@ -11335,9 +11335,9 @@ b_area_isk_part_2_isk_07_beforeBattle_80220390 = 0x80220390; // type:data rom:0x b_area_isk_part_2_isk_07_afterBattle_802203D8 = 0x802203D8; // type:data rom:0x4F7878 b_area_isk_part_2_isk_07 = 0x802203F4; // type:data rom:0x4F7894 b_area_isk_part_2_vector3D_80220420 = 0x80220420; // type:data rom:0x4F78C0 -b_area_isk_part_2_formation_00 = 0x8022042C; // type:data rom:0x4F78CC -b_area_isk_part_2_formationTable = 0x80220448; // type:data rom:0x4F78E8 -b_area_isk_part_2_stageTable = 0x80220470; // type:data rom:0x4F7910 +b_area_isk_part_2_Formation_00 = 0x8022042C; // type:data rom:0x4F78CC +b_area_isk_part_2_Formations = 0x80220448; // type:data rom:0x4F78E8 +b_area_isk_part_2_Stages = 0x80220470; // type:data rom:0x4F7910 D_802204E0_4F7980 = 0x802204E0; // type:data rom:0x4F7980 b_area_mim_forest_fuzzy_UnkBattleFunc2 = 0x80220740; // type:data rom:0x4F7BE0 D_80220744 = 0x80220744; // type:data rom:0x4F7BE4 @@ -11393,26 +11393,26 @@ b_area_mim_piranha_plant_takeTurn_8021DCD4 = 0x8021DCD4; // type:data rom:0x4FD8 b_area_mim_mim_01_beforeBattle_8021E450 = 0x8021E450; // type:data rom:0x4FE030 b_area_mim_mim_01_afterBattle_8021E47C = 0x8021E47C; // type:data rom:0x4FE05C b_area_mim_mim_01 = 0x8021E48C; // type:data rom:0x4FE06C -b_area_mim_formation_00 = 0x8021E4C0; // type:data rom:0x4FE0A0 -b_area_mim_formation_01 = 0x8021E4F8; // type:data rom:0x4FE0D8 -b_area_mim_formation_02 = 0x8021E54C; // type:data rom:0x4FE12C -b_area_mim_formation_03 = 0x8021E5BC; // type:data rom:0x4FE19C -b_area_mim_formation_04 = 0x8021E5F4; // type:data rom:0x4FE1D4 -b_area_mim_formation_05 = 0x8021E648; // type:data rom:0x4FE228 -b_area_mim_formation_06 = 0x8021E6B8; // type:data rom:0x4FE298 -b_area_mim_formation_07 = 0x8021E728; // type:data rom:0x4FE308 -b_area_mim_formation_08 = 0x8021E798; // type:data rom:0x4FE378 -b_area_mim_formation_09 = 0x8021E7B4; // type:data rom:0x4FE394 -b_area_mim_formation_0A = 0x8021E7EC; // type:data rom:0x4FE3CC -b_area_mim_formation_0B = 0x8021E840; // type:data rom:0x4FE420 -b_area_mim_formation_0C = 0x8021E8B0; // type:data rom:0x4FE490 -b_area_mim_formation_0D = 0x8021E8E8; // type:data rom:0x4FE4C8 -b_area_mim_formation_0E = 0x8021E93C; // type:data rom:0x4FE51C -b_area_mim_formation_0F = 0x8021E990; // type:data rom:0x4FE570 -b_area_mim_formation_10 = 0x8021E9E4; // type:data rom:0x4FE5C4 -b_area_mim_formation_11 = 0x8021EA1C; // type:data rom:0x4FE5FC -b_area_mim_formationTable = 0x8021EA70; // type:data rom:0x4FE650 -b_area_mim_stageTable = 0x8021EBEC; // type:data rom:0x4FE7CC +b_area_mim_Formation_00 = 0x8021E4C0; // type:data rom:0x4FE0A0 +b_area_mim_Formation_01 = 0x8021E4F8; // type:data rom:0x4FE0D8 +b_area_mim_Formation_02 = 0x8021E54C; // type:data rom:0x4FE12C +b_area_mim_Formation_03 = 0x8021E5BC; // type:data rom:0x4FE19C +b_area_mim_Formation_04 = 0x8021E5F4; // type:data rom:0x4FE1D4 +b_area_mim_Formation_05 = 0x8021E648; // type:data rom:0x4FE228 +b_area_mim_Formation_06 = 0x8021E6B8; // type:data rom:0x4FE298 +b_area_mim_Formation_07 = 0x8021E728; // type:data rom:0x4FE308 +b_area_mim_Formation_08 = 0x8021E798; // type:data rom:0x4FE378 +b_area_mim_Formation_09 = 0x8021E7B4; // type:data rom:0x4FE394 +b_area_mim_Formation_0A = 0x8021E7EC; // type:data rom:0x4FE3CC +b_area_mim_Formation_0B = 0x8021E840; // type:data rom:0x4FE420 +b_area_mim_Formation_0C = 0x8021E8B0; // type:data rom:0x4FE490 +b_area_mim_Formation_0D = 0x8021E8E8; // type:data rom:0x4FE4C8 +b_area_mim_Formation_0E = 0x8021E93C; // type:data rom:0x4FE51C +b_area_mim_Formation_0F = 0x8021E990; // type:data rom:0x4FE570 +b_area_mim_Formation_10 = 0x8021E9E4; // type:data rom:0x4FE5C4 +b_area_mim_Formation_11 = 0x8021EA1C; // type:data rom:0x4FE5FC +b_area_mim_Formations = 0x8021EA70; // type:data rom:0x4FE650 +b_area_mim_Stages = 0x8021EBEC; // type:data rom:0x4FE7CC b_area_arn_hypergoomba_StartRumbleWithParams = 0x80218000; // type:func rom:0x4FEA50 b_area_arn_hypergoomba_ArcsinDeg = 0x80218058; // type:func rom:0x4FEAA8 b_area_arn_hypergoomba_CalculateRotationZ = 0x802181E4; // type:func rom:0x4FEC34 @@ -11547,27 +11547,27 @@ b_area_arn_arn_06_beforeBattle_80227C00 = 0x80227C00; // type:data rom:0x50E650 b_area_arn_arn_06_afterBattle_80227C20 = 0x80227C20; // type:data rom:0x50E670 b_area_arn_arn_06_foregroundModelList_80227C30 = 0x80227C30; // type:data rom:0x50E680 b_area_arn_arn_06 = 0x80227C38; // type:data rom:0x50E688 -b_area_arn_formation_00 = 0x80227C60; // type:data rom:0x50E6B0 -b_area_arn_formation_01 = 0x80227C7C; // type:data rom:0x50E6CC -b_area_arn_formation_02 = 0x80227CB4; // type:data rom:0x50E704 -b_area_arn_formation_03 = 0x80227D08; // type:data rom:0x50E758 -b_area_arn_formation_04 = 0x80227D5C; // type:data rom:0x50E7AC -b_area_arn_formation_05 = 0x80227DCC; // type:data rom:0x50E81C -b_area_arn_formation_06 = 0x80227E3C; // type:data rom:0x50E88C -b_area_arn_formation_07 = 0x80227E58; // type:data rom:0x50E8A8 -b_area_arn_formation_08 = 0x80227E90; // type:data rom:0x50E8E0 -b_area_arn_formation_09 = 0x80227EE4; // type:data rom:0x50E934 -b_area_arn_formation_0A = 0x80227F54; // type:data rom:0x50E9A4 -b_area_arn_formation_0B = 0x80227F70; // type:data rom:0x50E9C0 -b_area_arn_formation_0C = 0x80227FA8; // type:data rom:0x50E9F8 -b_area_arn_formation_0D = 0x80227FFC; // type:data rom:0x50EA4C -b_area_arn_formation_0E = 0x80228050; // type:data rom:0x50EAA0 +b_area_arn_Formation_00 = 0x80227C60; // type:data rom:0x50E6B0 +b_area_arn_Formation_01 = 0x80227C7C; // type:data rom:0x50E6CC +b_area_arn_Formation_02 = 0x80227CB4; // type:data rom:0x50E704 +b_area_arn_Formation_03 = 0x80227D08; // type:data rom:0x50E758 +b_area_arn_Formation_04 = 0x80227D5C; // type:data rom:0x50E7AC +b_area_arn_Formation_05 = 0x80227DCC; // type:data rom:0x50E81C +b_area_arn_Formation_06 = 0x80227E3C; // type:data rom:0x50E88C +b_area_arn_Formation_07 = 0x80227E58; // type:data rom:0x50E8A8 +b_area_arn_Formation_08 = 0x80227E90; // type:data rom:0x50E8E0 +b_area_arn_Formation_09 = 0x80227EE4; // type:data rom:0x50E934 +b_area_arn_Formation_0A = 0x80227F54; // type:data rom:0x50E9A4 +b_area_arn_Formation_0B = 0x80227F70; // type:data rom:0x50E9C0 +b_area_arn_Formation_0C = 0x80227FA8; // type:data rom:0x50E9F8 +b_area_arn_Formation_0D = 0x80227FFC; // type:data rom:0x50EA4C +b_area_arn_Formation_0E = 0x80228050; // type:data rom:0x50EAA0 b_area_arn_vector3D_802280C0 = 0x802280C0; // type:data rom:0x50EB10 -b_area_arn_formation_0F = 0x802280CC; // type:data rom:0x50EB1C +b_area_arn_Formation_0F = 0x802280CC; // type:data rom:0x50EB1C b_area_arn_vector3D_802280E8 = 0x802280E8; // type:data rom:0x50EB38 -b_area_arn_formation_10 = 0x802280F4; // type:data rom:0x50EB44 -b_area_arn_formationTable = 0x80228110; // type:data rom:0x50EB60 -b_area_arn_stageTable = 0x80228278; // type:data rom:0x50ECC8 +b_area_arn_Formation_10 = 0x802280F4; // type:data rom:0x50EB44 +b_area_arn_Formations = 0x80228110; // type:data rom:0x50EB60 +b_area_arn_Stages = 0x80228278; // type:data rom:0x50ECC8 b_area_dgb_clubba_idleAnimations_80218000 = 0x80218000; // type:data rom:0x50F020 b_area_dgb_clubba_defenseTable_8021804C = 0x8021804C; // type:data rom:0x50F06C b_area_dgb_clubba_statusTable_80218058 = 0x80218058; // type:data rom:0x50F078 @@ -11608,15 +11608,15 @@ b_area_dgb_dgb_04 = 0x8021B1A8; // type:data rom:0x5121C8 b_area_dgb_dgb_05_beforeBattle_8021B1D0 = 0x8021B1D0; // type:data rom:0x5121F0 b_area_dgb_dgb_05_afterBattle_8021B1F0 = 0x8021B1F0; // type:data rom:0x512210 b_area_dgb_dgb_05 = 0x8021B200; // type:data rom:0x512220 -b_area_dgb_formation_00 = 0x8021B230; // type:data rom:0x512250 -b_area_dgb_formation_01 = 0x8021B24C; // type:data rom:0x51226C -b_area_dgb_formation_02 = 0x8021B284; // type:data rom:0x5122A4 -b_area_dgb_formation_03 = 0x8021B2D8; // type:data rom:0x5122F8 +b_area_dgb_Formation_00 = 0x8021B230; // type:data rom:0x512250 +b_area_dgb_Formation_01 = 0x8021B24C; // type:data rom:0x51226C +b_area_dgb_Formation_02 = 0x8021B284; // type:data rom:0x5122A4 +b_area_dgb_Formation_03 = 0x8021B2D8; // type:data rom:0x5122F8 b_area_dgb_vector3D_8021B348 = 0x8021B348; // type:data rom:0x512368 -b_area_dgb_formation_04 = 0x8021B354; // type:data rom:0x512374 -b_area_dgb_formation_05 = 0x8021B370; // type:data rom:0x512390 -b_area_dgb_formationTable = 0x8021B38C; // type:data rom:0x5123AC -b_area_dgb_stageTable = 0x8021B418; // type:data rom:0x512438 +b_area_dgb_Formation_04 = 0x8021B354; // type:data rom:0x512374 +b_area_dgb_Formation_05 = 0x8021B370; // type:data rom:0x512390 +b_area_dgb_Formations = 0x8021B38C; // type:data rom:0x5123AC +b_area_dgb_Stages = 0x8021B418; // type:data rom:0x512438 b_area_omo_red_shy_guy_UnkBattleFunc1 = 0x80218000; // type:func rom:0x5125D0 b_area_omo_blue_shy_guy_UnkBattleFunc1 = 0x802180D0; // type:func rom:0x5126A0 b_area_omo_yellow_shy_guy_UnkBattleFunc1 = 0x802181A0; // type:func rom:0x512770 @@ -11853,53 +11853,53 @@ b_area_omo_omo_06 = 0x8022F87C; // type:data rom:0x529E4C b_area_omo_omo_07_beforeBattle_8022F8B0 = 0x8022F8B0; // type:data rom:0x529E80 b_area_omo_omo_07_afterBattle_8022F8EC = 0x8022F8EC; // type:data rom:0x529EBC b_area_omo_omo_07 = 0x8022F8FC; // type:data rom:0x529ECC -b_area_omo_formation_00 = 0x8022F930; // type:data rom:0x529F00 -b_area_omo_formation_01 = 0x8022F968; // type:data rom:0x529F38 -b_area_omo_formation_02 = 0x8022F9A0; // type:data rom:0x529F70 -b_area_omo_formation_03 = 0x8022F9D8; // type:data rom:0x529FA8 -b_area_omo_formation_04 = 0x8022FA2C; // type:data rom:0x529FFC -b_area_omo_formation_05 = 0x8022FA64; // type:data rom:0x52A034 -b_area_omo_formation_06 = 0x8022FA9C; // type:data rom:0x52A06C -b_area_omo_formation_07 = 0x8022FAF0; // type:data rom:0x52A0C0 -b_area_omo_formation_08 = 0x8022FB44; // type:data rom:0x52A114 -b_area_omo_formation_09 = 0x8022FB98; // type:data rom:0x52A168 -b_area_omo_formation_0A = 0x8022FC08; // type:data rom:0x52A1D8 -b_area_omo_formation_0B = 0x8022FC5C; // type:data rom:0x52A22C -b_area_omo_formation_0C = 0x8022FCCC; // type:data rom:0x52A29C -b_area_omo_formation_0D = 0x8022FD20; // type:data rom:0x52A2F0 -b_area_omo_formation_0E = 0x8022FD58; // type:data rom:0x52A328 -b_area_omo_formation_0F = 0x8022FD90; // type:data rom:0x52A360 -b_area_omo_formation_10 = 0x8022FDE4; // type:data rom:0x52A3B4 -b_area_omo_formation_11 = 0x8022FE1C; // type:data rom:0x52A3EC -b_area_omo_formation_12 = 0x8022FE70; // type:data rom:0x52A440 -b_area_omo_formation_13 = 0x8022FEC4; // type:data rom:0x52A494 -b_area_omo_formation_14 = 0x8022FF34; // type:data rom:0x52A504 -b_area_omo_formation_15 = 0x8022FF88; // type:data rom:0x52A558 -b_area_omo_formation_16 = 0x8022FFC0; // type:data rom:0x52A590 -b_area_omo_formation_17 = 0x8022FFF8; // type:data rom:0x52A5C8 -b_area_omo_formation_18 = 0x80230030; // type:data rom:0x52A600 -b_area_omo_formation_19 = 0x80230084; // type:data rom:0x52A654 -b_area_omo_formation_1A = 0x802300F4; // type:data rom:0x52A6C4 -b_area_omo_formation_1B = 0x80230164; // type:data rom:0x52A734 -b_area_omo_formation_1C = 0x802301D4; // type:data rom:0x52A7A4 -b_area_omo_formation_1D = 0x8023020C; // type:data rom:0x52A7DC -b_area_omo_formation_1E = 0x80230260; // type:data rom:0x52A830 -b_area_omo_formation_1F = 0x80230298; // type:data rom:0x52A868 -b_area_omo_formation_20 = 0x802302EC; // type:data rom:0x52A8BC -b_area_omo_formation_21 = 0x8023035C; // type:data rom:0x52A92C -b_area_omo_formation_22 = 0x802303B0; // type:data rom:0x52A980 -b_area_omo_formation_23 = 0x80230404; // type:data rom:0x52A9D4 -b_area_omo_formation_24 = 0x80230474; // type:data rom:0x52AA44 -b_area_omo_formation_25 = 0x802304C8; // type:data rom:0x52AA98 -b_area_omo_formation_26 = 0x80230500; // type:data rom:0x52AAD0 -b_area_omo_formation_27 = 0x80230554; // type:data rom:0x52AB24 -b_area_omo_formation_28 = 0x802305A8; // type:data rom:0x52AB78 -b_area_omo_formation_29 = 0x802305FC; // type:data rom:0x52ABCC -b_area_omo_formation_2A = 0x8023066C; // type:data rom:0x52AC3C -b_area_omo_formation_2B = 0x802306C0; // type:data rom:0x52AC90 -b_area_omo_formation_2C = 0x80230714; // type:data rom:0x52ACE4 -b_area_omo_formationTable = 0x80230730; // type:data rom:0x52AD00 -b_area_omo_stageTable = 0x80230AC8; // type:data rom:0x52B098 +b_area_omo_Formation_00 = 0x8022F930; // type:data rom:0x529F00 +b_area_omo_Formation_01 = 0x8022F968; // type:data rom:0x529F38 +b_area_omo_Formation_02 = 0x8022F9A0; // type:data rom:0x529F70 +b_area_omo_Formation_03 = 0x8022F9D8; // type:data rom:0x529FA8 +b_area_omo_Formation_04 = 0x8022FA2C; // type:data rom:0x529FFC +b_area_omo_Formation_05 = 0x8022FA64; // type:data rom:0x52A034 +b_area_omo_Formation_06 = 0x8022FA9C; // type:data rom:0x52A06C +b_area_omo_Formation_07 = 0x8022FAF0; // type:data rom:0x52A0C0 +b_area_omo_Formation_08 = 0x8022FB44; // type:data rom:0x52A114 +b_area_omo_Formation_09 = 0x8022FB98; // type:data rom:0x52A168 +b_area_omo_Formation_0A = 0x8022FC08; // type:data rom:0x52A1D8 +b_area_omo_Formation_0B = 0x8022FC5C; // type:data rom:0x52A22C +b_area_omo_Formation_0C = 0x8022FCCC; // type:data rom:0x52A29C +b_area_omo_Formation_0D = 0x8022FD20; // type:data rom:0x52A2F0 +b_area_omo_Formation_0E = 0x8022FD58; // type:data rom:0x52A328 +b_area_omo_Formation_0F = 0x8022FD90; // type:data rom:0x52A360 +b_area_omo_Formation_10 = 0x8022FDE4; // type:data rom:0x52A3B4 +b_area_omo_Formation_11 = 0x8022FE1C; // type:data rom:0x52A3EC +b_area_omo_Formation_12 = 0x8022FE70; // type:data rom:0x52A440 +b_area_omo_Formation_13 = 0x8022FEC4; // type:data rom:0x52A494 +b_area_omo_Formation_14 = 0x8022FF34; // type:data rom:0x52A504 +b_area_omo_Formation_15 = 0x8022FF88; // type:data rom:0x52A558 +b_area_omo_Formation_16 = 0x8022FFC0; // type:data rom:0x52A590 +b_area_omo_Formation_17 = 0x8022FFF8; // type:data rom:0x52A5C8 +b_area_omo_Formation_18 = 0x80230030; // type:data rom:0x52A600 +b_area_omo_Formation_19 = 0x80230084; // type:data rom:0x52A654 +b_area_omo_Formation_1A = 0x802300F4; // type:data rom:0x52A6C4 +b_area_omo_Formation_1B = 0x80230164; // type:data rom:0x52A734 +b_area_omo_Formation_1C = 0x802301D4; // type:data rom:0x52A7A4 +b_area_omo_Formation_1D = 0x8023020C; // type:data rom:0x52A7DC +b_area_omo_Formation_1E = 0x80230260; // type:data rom:0x52A830 +b_area_omo_Formation_1F = 0x80230298; // type:data rom:0x52A868 +b_area_omo_Formation_20 = 0x802302EC; // type:data rom:0x52A8BC +b_area_omo_Formation_21 = 0x8023035C; // type:data rom:0x52A92C +b_area_omo_Formation_22 = 0x802303B0; // type:data rom:0x52A980 +b_area_omo_Formation_23 = 0x80230404; // type:data rom:0x52A9D4 +b_area_omo_Formation_24 = 0x80230474; // type:data rom:0x52AA44 +b_area_omo_Formation_25 = 0x802304C8; // type:data rom:0x52AA98 +b_area_omo_Formation_26 = 0x80230500; // type:data rom:0x52AAD0 +b_area_omo_Formation_27 = 0x80230554; // type:data rom:0x52AB24 +b_area_omo_Formation_28 = 0x802305A8; // type:data rom:0x52AB78 +b_area_omo_Formation_29 = 0x802305FC; // type:data rom:0x52ABCC +b_area_omo_Formation_2A = 0x8023066C; // type:data rom:0x52AC3C +b_area_omo_Formation_2B = 0x802306C0; // type:data rom:0x52AC90 +b_area_omo_Formation_2C = 0x80230714; // type:data rom:0x52ACE4 +b_area_omo_Formations = 0x80230730; // type:data rom:0x52AD00 +b_area_omo_Stages = 0x80230AC8; // type:data rom:0x52B098 b_area_omo2_general_guy_FadeBackgroundToBlack = 0x80218000; // type:func rom:0x52B6A0 D_80231110 = 0x80231110; // type:data rom:0x52B6E0 b_area_omo2_general_guy_UnfadeBackgroundToBlack = 0x80218098; // type:func rom:0x52B738 @@ -11997,9 +11997,9 @@ b_area_omo2_light_bulb_onDeath = 0x8022FA54; // type:data rom:0x5430F4 b_area_omo2_omo_07_beforeBattle = 0x8022FB20; // type:data rom:0x5431C0 b_area_omo2_omo_07_afterBattle = 0x8022FB5C; // type:data rom:0x5431FC b_area_omo2_omo_07 = 0x8022FB6C; // type:data rom:0x54320C -b_area_omo2_formation_01 = 0x8022FBA0; // type:data rom:0x543240 -b_area_omo2_formationTable = 0x8022FBF4; // type:data rom:0x543294 -b_area_omo2_stageTable = 0x8022FC1C; // type:data rom:0x5432BC +b_area_omo2_Formation_01 = 0x8022FBA0; // type:data rom:0x543240 +b_area_omo2_Formations = 0x8022FBF4; // type:data rom:0x543294 +b_area_omo2_Stages = 0x8022FC1C; // type:data rom:0x5432BC b_area_omo2_1_shy_squad_GetActorPartSize = 0x80231000; // type:func rom:0x543570 b_area_omo2_1_shy_squad_defenseTable = 0x802310B0; // type:data rom:0x543620 b_area_omo2_1_shy_squad_statusTable = 0x802310BC; // type:data rom:0x54362C @@ -12180,9 +12180,9 @@ b_area_kgr_kgr_01_beforeBattle_8021D3B4 = 0x8021D3B4; // type:data rom:0x573654 b_area_kgr_kgr_01_afterBattle_8021D598 = 0x8021D598; // type:data rom:0x573838 b_area_kgr_kgr_01_foregroundModelList_8021D5A8 = 0x8021D5A8; // type:data rom:0x573848 b_area_kgr_kgr_01 = 0x8021D5B4; // type:data rom:0x573854 -b_area_kgr_formation_00 = 0x8021D5E0; // type:data rom:0x573880 -b_area_kgr_formationTable = 0x8021D5FC; // type:data rom:0x57389C -b_area_kgr_stageTable = 0x8021D624; // type:data rom:0x5738C4 +b_area_kgr_Formation_00 = 0x8021D5E0; // type:data rom:0x573880 +b_area_kgr_Formations = 0x8021D5FC; // type:data rom:0x57389C +b_area_kgr_Stages = 0x8021D624; // type:data rom:0x5738C4 b_area_jan_spear_guy_UnkBattleFunc1 = 0x80218000; // type:func rom:0x573920 b_area_jan_hurt_plant_UnkBattleFunc1 = 0x802180D0; // type:func rom:0x5739F0 b_area_jan_jungle_fuzzy_UnkBattleFunc2 = 0x802181A0; // type:func rom:0x573AC0 @@ -12328,25 +12328,25 @@ b_area_jan_jan_04b_beforeBattle_802284F0 = 0x802284F0; // type:data rom:0x583E10 b_area_jan_jan_04b_afterBattle_80228540 = 0x80228540; // type:data rom:0x583E60 b_area_jan_jan_04b_foregroundModelList_80228550 = 0x80228550; // type:data rom:0x583E70 b_area_jan_jan_04b = 0x80228558; // type:data rom:0x583E78 -b_area_jan_formation_00 = 0x80228580; // type:data rom:0x583EA0 -b_area_jan_formation_01 = 0x802285B8; // type:data rom:0x583ED8 -b_area_jan_formation_02 = 0x8022860C; // type:data rom:0x583F2C -b_area_jan_formation_03 = 0x80228644; // type:data rom:0x583F64 -b_area_jan_formation_04 = 0x802286B4; // type:data rom:0x583FD4 -b_area_jan_formation_05 = 0x80228708; // type:data rom:0x584028 -b_area_jan_formation_06 = 0x8022875C; // type:data rom:0x58407C -b_area_jan_formation_07 = 0x802287CC; // type:data rom:0x5840EC -b_area_jan_formation_08 = 0x80228820; // type:data rom:0x584140 -b_area_jan_formation_09 = 0x80228858; // type:data rom:0x584178 -b_area_jan_formation_0A = 0x802288AC; // type:data rom:0x5841CC -b_area_jan_formation_0B = 0x802288E4; // type:data rom:0x584204 -b_area_jan_formation_0C = 0x80228938; // type:data rom:0x584258 -b_area_jan_formation_0D = 0x802289A8; // type:data rom:0x5842C8 -b_area_jan_formation_0E = 0x802289FC; // type:data rom:0x58431C -b_area_jan_formation_0F = 0x80228A34; // type:data rom:0x584354 -b_area_jan_formation_10 = 0x80228A88; // type:data rom:0x5843A8 -b_area_jan_formationTable = 0x80228AF8; // type:data rom:0x584418 -b_area_jan_stageTable = 0x80228C60; // type:data rom:0x584580 +b_area_jan_Formation_00 = 0x80228580; // type:data rom:0x583EA0 +b_area_jan_Formation_01 = 0x802285B8; // type:data rom:0x583ED8 +b_area_jan_Formation_02 = 0x8022860C; // type:data rom:0x583F2C +b_area_jan_Formation_03 = 0x80228644; // type:data rom:0x583F64 +b_area_jan_Formation_04 = 0x802286B4; // type:data rom:0x583FD4 +b_area_jan_Formation_05 = 0x80228708; // type:data rom:0x584028 +b_area_jan_Formation_06 = 0x8022875C; // type:data rom:0x58407C +b_area_jan_Formation_07 = 0x802287CC; // type:data rom:0x5840EC +b_area_jan_Formation_08 = 0x80228820; // type:data rom:0x584140 +b_area_jan_Formation_09 = 0x80228858; // type:data rom:0x584178 +b_area_jan_Formation_0A = 0x802288AC; // type:data rom:0x5841CC +b_area_jan_Formation_0B = 0x802288E4; // type:data rom:0x584204 +b_area_jan_Formation_0C = 0x80228938; // type:data rom:0x584258 +b_area_jan_Formation_0D = 0x802289A8; // type:data rom:0x5842C8 +b_area_jan_Formation_0E = 0x802289FC; // type:data rom:0x58431C +b_area_jan_Formation_0F = 0x80228A34; // type:data rom:0x584354 +b_area_jan_Formation_10 = 0x80228A88; // type:data rom:0x5843A8 +b_area_jan_Formations = 0x80228AF8; // type:data rom:0x584418 +b_area_jan_Stages = 0x80228C60; // type:data rom:0x584580 b_area_jan2_putrid_piranha_UnkBattleFunc1 = 0x80218000; // type:func rom:0x584940 b_area_jan2_putrid_piranha_UnkEffect6FFunc = 0x802180CC; // type:func rom:0x584A0C b_area_jan2_white_magikoopa_ShrinkActor = 0x80218250; // type:func rom:0x584B90 @@ -12429,12 +12429,12 @@ b_area_jan2_jan_04b_beforeBattle_8021F520 = 0x8021F520; // type:data rom:0x58BE6 b_area_jan2_jan_04b_afterBattle_8021F570 = 0x8021F570; // type:data rom:0x58BEB0 b_area_jan2_jan_04b_foregroundModelList_8021F580 = 0x8021F580; // type:data rom:0x58BEC0 b_area_jan2_jan_04b = 0x8021F588; // type:data rom:0x58BEC8 -b_area_jan2_formation_00 = 0x8021F5B0; // type:data rom:0x58BEF0 -b_area_jan2_formation_01 = 0x8021F5CC; // type:data rom:0x58BF0C -b_area_jan2_formation_02 = 0x8021F604; // type:data rom:0x58BF44 -b_area_jan2_formation_03 = 0x8021F658; // type:data rom:0x58BF98 -b_area_jan2_formationTable = 0x8021F6C8; // type:data rom:0x58C008 -b_area_jan2_stageTable = 0x8021F72C; // type:data rom:0x58C06C +b_area_jan2_Formation_00 = 0x8021F5B0; // type:data rom:0x58BEF0 +b_area_jan2_Formation_01 = 0x8021F5CC; // type:data rom:0x58BF0C +b_area_jan2_Formation_02 = 0x8021F604; // type:data rom:0x58BF44 +b_area_jan2_Formation_03 = 0x8021F658; // type:data rom:0x58BF98 +b_area_jan2_Formations = 0x8021F6C8; // type:data rom:0x58C008 +b_area_jan2_Stages = 0x8021F72C; // type:data rom:0x58C06C b_area_kzn_lava_bubble_UnkSfxFunc = 0x80218000; // type:func rom:0x58C2F0 b_area_kzn_putrid_piranha_UnkBattleFunc1 = 0x80218130; // type:func rom:0x58C420 b_area_kzn_putrid_piranha_UnkEffect6FFunc = 0x802181FC; // type:func rom:0x58C4EC @@ -12599,29 +12599,29 @@ b_area_kzn_kzn_05_80228FBC = 0x80228FBC; // type:data rom:0x59D2AC b_area_kzn_kzn_05_beforeBattle_8022916C = 0x8022916C; // type:data rom:0x59D45C b_area_kzn_kzn_05_afterBattle_8022974C = 0x8022974C; // type:data rom:0x59DA3C b_area_kzn_kzn_05 = 0x8022975C; // type:data rom:0x59DA4C -b_area_kzn_formation_00 = 0x80229790; // type:data rom:0x59DA80 -b_area_kzn_formation_01 = 0x802297C8; // type:data rom:0x59DAB8 -b_area_kzn_formation_02 = 0x8022981C; // type:data rom:0x59DB0C -b_area_kzn_formation_03 = 0x8022988C; // type:data rom:0x59DB7C -b_area_kzn_formation_04 = 0x802298FC; // type:data rom:0x59DBEC -b_area_kzn_formation_05 = 0x80229950; // type:data rom:0x59DC40 -b_area_kzn_formation_06 = 0x802299A4; // type:data rom:0x59DC94 -b_area_kzn_formation_07 = 0x802299F8; // type:data rom:0x59DCE8 -b_area_kzn_formation_08 = 0x80229A4C; // type:data rom:0x59DD3C -b_area_kzn_formation_09 = 0x80229A84; // type:data rom:0x59DD74 -b_area_kzn_formation_0A = 0x80229ABC; // type:data rom:0x59DDAC -b_area_kzn_formation_0B = 0x80229B10; // type:data rom:0x59DE00 -b_area_kzn_formation_0C = 0x80229B48; // type:data rom:0x59DE38 -b_area_kzn_formation_0D = 0x80229B9C; // type:data rom:0x59DE8C -b_area_kzn_formation_0E = 0x80229C0C; // type:data rom:0x59DEFC -b_area_kzn_formation_0F = 0x80229C7C; // type:data rom:0x59DF6C -b_area_kzn_formation_10 = 0x80229CB4; // type:data rom:0x59DFA4 -b_area_kzn_formation_11 = 0x80229D08; // type:data rom:0x59DFF8 -b_area_kzn_formation_12 = 0x80229D5C; // type:data rom:0x59E04C -b_area_kzn_formation_13 = 0x80229DB0; // type:data rom:0x59E0A0 -b_area_kzn_formation_14 = 0x80229E04; // type:data rom:0x59E0F4 -b_area_kzn_formationTable = 0x80229E74; // type:data rom:0x59E164 -b_area_kzn_stageTable = 0x8022A02C; // type:data rom:0x59E31C +b_area_kzn_Formation_00 = 0x80229790; // type:data rom:0x59DA80 +b_area_kzn_Formation_01 = 0x802297C8; // type:data rom:0x59DAB8 +b_area_kzn_Formation_02 = 0x8022981C; // type:data rom:0x59DB0C +b_area_kzn_Formation_03 = 0x8022988C; // type:data rom:0x59DB7C +b_area_kzn_Formation_04 = 0x802298FC; // type:data rom:0x59DBEC +b_area_kzn_Formation_05 = 0x80229950; // type:data rom:0x59DC40 +b_area_kzn_Formation_06 = 0x802299A4; // type:data rom:0x59DC94 +b_area_kzn_Formation_07 = 0x802299F8; // type:data rom:0x59DCE8 +b_area_kzn_Formation_08 = 0x80229A4C; // type:data rom:0x59DD3C +b_area_kzn_Formation_09 = 0x80229A84; // type:data rom:0x59DD74 +b_area_kzn_Formation_0A = 0x80229ABC; // type:data rom:0x59DDAC +b_area_kzn_Formation_0B = 0x80229B10; // type:data rom:0x59DE00 +b_area_kzn_Formation_0C = 0x80229B48; // type:data rom:0x59DE38 +b_area_kzn_Formation_0D = 0x80229B9C; // type:data rom:0x59DE8C +b_area_kzn_Formation_0E = 0x80229C0C; // type:data rom:0x59DEFC +b_area_kzn_Formation_0F = 0x80229C7C; // type:data rom:0x59DF6C +b_area_kzn_Formation_10 = 0x80229CB4; // type:data rom:0x59DFA4 +b_area_kzn_Formation_11 = 0x80229D08; // type:data rom:0x59DFF8 +b_area_kzn_Formation_12 = 0x80229D5C; // type:data rom:0x59E04C +b_area_kzn_Formation_13 = 0x80229DB0; // type:data rom:0x59E0A0 +b_area_kzn_Formation_14 = 0x80229E04; // type:data rom:0x59E0F4 +b_area_kzn_Formations = 0x80229E74; // type:data rom:0x59E164 +b_area_kzn_Stages = 0x8022A02C; // type:data rom:0x59E31C b_area_kzn2_StartRumbleWithParams = 0x80218000; // type:func rom:0x59E6E0 b_area_kzn2_make_vine_interpolation = 0x80218058; // type:func rom:0x59E738 b_area_kzn2_SetVineBonePos = 0x8021812C; // type:func rom:0x59E80C @@ -13040,22 +13040,22 @@ b_area_sam_pos_rocks_5 = 0x80230760; // type:data rom:0x63C300 b_area_sam_pos_rocks_6 = 0x8023079C; // type:data rom:0x63C33C b_area_sam_pos_rocks_7 = 0x802307D8; // type:data rom:0x63C378 b_area_sam_pos_rocks_8 = 0x80230814; // type:data rom:0x63C3B4 -b_area_sam_formation_01 = 0x80230850; // type:data rom:0x63C3F0 -b_area_sam_formation_02 = 0x80230888; // type:data rom:0x63C428 -b_area_sam_formation_03 = 0x8023094C; // type:data rom:0x63C4EC -b_area_sam_formation_04 = 0x80230A2C; // type:data rom:0x63C5CC -b_area_sam_formation_05 = 0x80230B0C; // type:data rom:0x63C6AC -b_area_sam_formation_06 = 0x80230BEC; // type:data rom:0x63C78C -b_area_sam_formation_07 = 0x80230CE8; // type:data rom:0x63C888 -b_area_sam_formation_08 = 0x80230D20; // type:data rom:0x63C8C0 -b_area_sam_formation_09 = 0x80230D90; // type:data rom:0x63C930 -b_area_sam_formation_0A = 0x80230E70; // type:data rom:0x63CA10 -b_area_sam_formation_0B = 0x80230F50; // type:data rom:0x63CAF0 -b_area_sam_formation_0C = 0x8023104C; // type:data rom:0x63CBEC -b_area_sam_formation_0D = 0x80231084; // type:data rom:0x63CC24 -b_area_sam_formation_0E = 0x802310F4; // type:data rom:0x63CC94 -b_area_sam_formationTable = 0x80231164; // type:data rom:0x63CD04 -b_area_sam_stageTable = 0x80231290; // type:data rom:0x63CE30 +b_area_sam_Formation_01 = 0x80230850; // type:data rom:0x63C3F0 +b_area_sam_Formation_02 = 0x80230888; // type:data rom:0x63C428 +b_area_sam_Formation_03 = 0x8023094C; // type:data rom:0x63C4EC +b_area_sam_Formation_04 = 0x80230A2C; // type:data rom:0x63C5CC +b_area_sam_Formation_05 = 0x80230B0C; // type:data rom:0x63C6AC +b_area_sam_Formation_06 = 0x80230BEC; // type:data rom:0x63C78C +b_area_sam_Formation_07 = 0x80230CE8; // type:data rom:0x63C888 +b_area_sam_Formation_08 = 0x80230D20; // type:data rom:0x63C8C0 +b_area_sam_Formation_09 = 0x80230D90; // type:data rom:0x63C930 +b_area_sam_Formation_0A = 0x80230E70; // type:data rom:0x63CA10 +b_area_sam_Formation_0B = 0x80230F50; // type:data rom:0x63CAF0 +b_area_sam_Formation_0C = 0x8023104C; // type:data rom:0x63CBEC +b_area_sam_Formation_0D = 0x80231084; // type:data rom:0x63CC24 +b_area_sam_Formation_0E = 0x802310F4; // type:data rom:0x63CC94 +b_area_sam_Formations = 0x80231164; // type:data rom:0x63CD04 +b_area_sam_Stages = 0x80231290; // type:data rom:0x63CE30 D_80231318_63CEB8 = 0x80231318; // type:data rom:0x63CEB8 D_80231350_63CEF0 = 0x80231350; // type:data rom:0x63CEF0 D_80231358_63CEF8 = 0x80231358; // type:data rom:0x63CEF8 @@ -13251,10 +13251,10 @@ b_area_sam2_sam_03_afterBattle = 0x80223448; // type:data rom:0x648628 b_area_sam2_sam_03_foregroundModelList = 0x80223458; // type:data rom:0x648638 b_area_sam2_sam_03 = 0x80223464; // type:data rom:0x648644 b_area_sam2_80223490 = 0x80223490; // type:data rom:0x648670 -b_area_sam2_formation_01 = 0x8022349C; // type:data rom:0x64867C -b_area_sam2_formation_02 = 0x802234B8; // type:data rom:0x648698 -b_area_sam2_formationTable = 0x802234F0; // type:data rom:0x6486D0 -b_area_sam2_stageTable = 0x8022352C; // type:data rom:0x64870C +b_area_sam2_Formation_01 = 0x8022349C; // type:data rom:0x64867C +b_area_sam2_Formation_02 = 0x802234B8; // type:data rom:0x648698 +b_area_sam2_Formations = 0x802234F0; // type:data rom:0x6486D0 +b_area_sam2_Stages = 0x8022352C; // type:data rom:0x64870C b_area_sam2_monstar_dlist = 0x80223570; // type:data rom:0x648750 monstar_bubbles = 0x80223680; // type:data rom:0x648860 b_area_pra_UnkBattleFunc1 = 0x80218000; // type:func rom:0x648E10 @@ -13365,9 +13365,9 @@ b_area_pra2_pos_crystal_king = 0x80221500; // type:data rom:0x669C50 b_area_pra2_pos_crystal_bit_1 = 0x8022150C; // type:data rom:0x669C5C b_area_pra2_pos_crystal_bit_2 = 0x80221518; // type:data rom:0x669C68 b_area_pra2_pos_crystal_bit_3 = 0x80221524; // type:data rom:0x669C74 -b_area_pra2_formation_01 = 0x80221530; // type:data rom:0x669C80 -b_area_pra2_formationTable = 0x802215A0; // type:data rom:0x669CF0 -b_area_pra2_stageTable = 0x802215C8; // type:data rom:0x669D18 +b_area_pra2_Formation_01 = 0x80221530; // type:data rom:0x669C80 +b_area_pra2_Formations = 0x802215A0; // type:data rom:0x669CF0 +b_area_pra2_Stages = 0x802215C8; // type:data rom:0x669D18 b_area_pra3_duplighost_UnkFunc62 = 0x80218000; // type:func rom:0x669D80 b_area_pra3_duplighost_ActorJumpToPos = 0x80218890; // type:func rom:0x66A610 b_area_pra3_duplighost_UnkActorSizeFunc = 0x802189E4; // type:func rom:0x66A764 @@ -13604,20 +13604,20 @@ b_area_pra3_pra_04_beforeBattle = 0x80232378; // type:data rom:0x6840F8 b_area_pra3_pra_04_afterBattle = 0x8023245C; // type:data rom:0x6841DC b_area_pra3_pra_04 = 0x8023246C; // type:data rom:0x6841EC b_area_pra3_pos_swoopula = 0x802324A0; // type:data rom:0x684220 -b_area_pra3_formation_01 = 0x802324D0; // type:data rom:0x684250 -b_area_pra3_formation_02 = 0x80232524; // type:data rom:0x6842A4 -b_area_pra3_formation_03 = 0x80232540; // type:data rom:0x6842C0 -b_area_pra3_formation_04 = 0x80232578; // type:data rom:0x6842F8 -b_area_pra3_formation_05 = 0x802325CC; // type:data rom:0x68434C -b_area_pra3_formation_06 = 0x8023263C; // type:data rom:0x6843BC -b_area_pra3_formation_07 = 0x80232690; // type:data rom:0x684410 -b_area_pra3_formation_08 = 0x802326E4; // type:data rom:0x684464 -b_area_pra3_formation_09 = 0x8023271C; // type:data rom:0x68449C -b_area_pra3_formation_0A = 0x80232770; // type:data rom:0x6844F0 -b_area_pra3_formation_0B = 0x802327C4; // type:data rom:0x684544 -b_area_pra3_formation_0C = 0x80232834; // type:data rom:0x6845B4 -b_area_pra3_formationTable = 0x80232888; // type:data rom:0x684608 -b_area_pra3_stageTable = 0x8023298C; // type:data rom:0x68470C +b_area_pra3_Formation_01 = 0x802324D0; // type:data rom:0x684250 +b_area_pra3_Formation_02 = 0x80232524; // type:data rom:0x6842A4 +b_area_pra3_Formation_03 = 0x80232540; // type:data rom:0x6842C0 +b_area_pra3_Formation_04 = 0x80232578; // type:data rom:0x6842F8 +b_area_pra3_Formation_05 = 0x802325CC; // type:data rom:0x68434C +b_area_pra3_Formation_06 = 0x8023263C; // type:data rom:0x6843BC +b_area_pra3_Formation_07 = 0x80232690; // type:data rom:0x684410 +b_area_pra3_Formation_08 = 0x802326E4; // type:data rom:0x684464 +b_area_pra3_Formation_09 = 0x8023271C; // type:data rom:0x68449C +b_area_pra3_Formation_0A = 0x80232770; // type:data rom:0x6844F0 +b_area_pra3_Formation_0B = 0x802327C4; // type:data rom:0x684544 +b_area_pra3_Formation_0C = 0x80232834; // type:data rom:0x6845B4 +b_area_pra3_Formations = 0x80232888; // type:data rom:0x684608 +b_area_pra3_Stages = 0x8023298C; // type:data rom:0x68470C D_80232A18_684798 = 0x80232A18; // type:data rom:0x684798 D_80232A50_6847D0 = 0x80232A50; // type:data rom:0x6847D0 D_80232A60_6847E0 = 0x80232A60; // type:data rom:0x6847E0 @@ -14534,12 +14534,12 @@ battle_move_multibounce_D_802A14F0 = 0x802A14F0; // type:data rom:0x7411B0 battle_move_multibounce_D_802A15D8 = 0x802A15D8; // type:data rom:0x741298 battle_move_multibounce_D_802A17C4 = 0x802A17C4; // type:data rom:0x741484 battle_move_multibounce_D_802A19B0 = 0x802A19B0; // type:data rom:0x741670 -battle_move_multibounce_D_802A1B9C = 0x802A1B9C; // type:data rom:0x74185C -battle_move_multibounce_D_802A1D88 = 0x802A1D88; // type:data rom:0x741A48 +battle_move_multibounce_EVS_JumpSupport_H = 0x802A1B9C; // type:data rom:0x74185C +battle_move_multibounce_EVS_JumpSupport_I = 0x802A1D88; // type:data rom:0x741A48 battle_move_multibounce_D_802A1FEC = 0x802A1FEC; // type:data rom:0x741CAC battle_move_multibounce_D_802A2184 = 0x802A2184; // type:data rom:0x741E44 -battle_move_multibounce_D_802A2230 = 0x802A2230; // type:data rom:0x741EF0 -battle_move_multibounce_D_802A2384 = 0x802A2384; // type:data rom:0x742044 +battle_move_multibounce_EVS_JumpSupport_L = 0x802A2230; // type:data rom:0x741EF0 +battle_move_multibounce_EVS_JumpSupport_M = 0x802A2384; // type:data rom:0x742044 battle_move_multibounce_D_802A2600 = 0x802A2600; // type:data rom:0x7422C0 D_802A26C8_742388 = 0x802A26B0; // type:data rom:0x742370 D_802A2F80_742C40 = 0x802A2F68; // type:data rom:0x742C28 @@ -14595,18 +14595,18 @@ battle_move_auto_smash_ShouldMovesAutoSucceed = 0x802A1050; // type:func rom:0x7 battle_move_auto_jump_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x765C20 battle_move_auto_jump_D_802A10F0 = 0x802A10F0; // type:data rom:0x765D10 battle_move_auto_jump_CheckForAPress = 0x802A1130; // type:data rom:0x765D50 -D_802A11AC_765DCC = 0x802A11AC; // type:data rom:0x765DCC -D_802A1320_765F40 = 0x802A1320; // type:data rom:0x765F40 -D_802A1408_766028 = 0x802A1408; // type:data rom:0x766028 -D_802A14F0_766110 = 0x802A14F0; // type:data rom:0x766110 -D_802A15D8_7661F8 = 0x802A15D8; // type:data rom:0x7661F8 +EVS_JumpSupport_A = 0x802A11AC; // type:data rom:0x765DCC +EVS_JumpSupport_B = 0x802A1320; // type:data rom:0x765F40 +EVS_JumpSupport_C = 0x802A1408; // type:data rom:0x766028 +EVS_JumpSupport_D = 0x802A14F0; // type:data rom:0x766110 +EVS_JumpSupport_E = 0x802A15D8; // type:data rom:0x7661F8 D_802A17C4 = 0x802A17C4; // type:data rom:0x7663E4 -D_802A1B9C = 0x802A1B9C; // type:data rom:0x7667BC -D_802A1D88 = 0x802A1D88; // type:data rom:0x7669A8 -D_802A1FEC_766C0C = 0x802A1FEC; // type:data rom:0x766C0C -D_802A2184_766DA4 = 0x802A2184; // type:data rom:0x766DA4 -D_802A2230 = 0x802A2230; // type:data rom:0x766E50 -D_802A2384 = 0x802A2384; // type:data rom:0x766FA4 +EVS_JumpSupport_H = 0x802A1B9C; // type:data rom:0x7667BC +EVS_JumpSupport_I = 0x802A1D88; // type:data rom:0x7669A8 +EVS_JumpSupport_J = 0x802A1FEC; // type:data rom:0x766C0C +EVS_JumpSupport_K = 0x802A2184; // type:data rom:0x766DA4 +EVS_JumpSupport_L = 0x802A2230; // type:data rom:0x766E50 +EVS_JumpSupport_M = 0x802A2384; // type:data rom:0x766FA4 D_802A2600 = 0x802A2600; // type:data rom:0x767220 D_802A26BC_7672DC = 0x802A26BC; // type:data rom:0x7672DC D_802A2A30_767650 = 0x802A2A30; // type:data rom:0x767650 @@ -14623,12 +14623,12 @@ battle_move_auto_multibounce_D_802A14F0 = 0x802A14F0; // type:data rom:0x76AD20 battle_move_auto_multibounce_D_802A15D8 = 0x802A15D8; // type:data rom:0x76AE08 battle_move_auto_multibounce_D_802A17C4 = 0x802A17C4; // type:data rom:0x76AFF4 battle_move_auto_multibounce_D_802A19B0 = 0x802A19B0; // type:data rom:0x76B1E0 -battle_move_auto_multibounce_D_802A1B9C = 0x802A1B9C; // type:data rom:0x76B3CC -battle_move_auto_multibounce_D_802A1D88 = 0x802A1D88; // type:data rom:0x76B5B8 +battle_move_auto_multibounce_EVS_JumpSupport_H = 0x802A1B9C; // type:data rom:0x76B3CC +battle_move_auto_multibounce_EVS_JumpSupport_I = 0x802A1D88; // type:data rom:0x76B5B8 battle_move_auto_multibounce_D_802A1FEC = 0x802A1FEC; // type:data rom:0x76B81C battle_move_auto_multibounce_D_802A2184 = 0x802A2184; // type:data rom:0x76B9B4 -battle_move_auto_multibounce_D_802A2230 = 0x802A2230; // type:data rom:0x76BA60 -battle_move_auto_multibounce_D_802A2384 = 0x802A2384; // type:data rom:0x76BBB4 +battle_move_auto_multibounce_EVS_JumpSupport_L = 0x802A2230; // type:data rom:0x76BA60 +battle_move_auto_multibounce_EVS_JumpSupport_M = 0x802A2384; // type:data rom:0x76BBB4 battle_move_auto_multibounce_main = 0x802A2600; // type:data rom:0x76BE30 battle_move_auto_multibounce_D_802A26A8 = 0x802A26A8; // type:data rom:0x76BED8 battle_move_auto_multibounce_D_802A2EC0 = 0x802A2EC0; // type:data rom:0x76C6F0 @@ -14670,7 +14670,7 @@ battle_star_focus_802A19C8 = 0x802A19C8; // type:data rom:0x78A828 battle_star_focus_802A1D60 = 0x802A1D60; // type:data rom:0x78ABC0 battle_star_focus_802A1F6C = 0x802A1F6C; // type:data rom:0x78ADCC battle_star_focus_802A23BC = 0x802A23BC; // type:data rom:0x78B21C -battle_star_focus_usePower = 0x802A24E8; // type:data rom:0x78B348 +battle_star_focus_EVS_UsePower = 0x802A24E8; // type:data rom:0x78B348 battle_star_refresh_UnkStarFunc1 = 0x802A1000; // type:func rom:0x78B600 battle_star_refresh_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x78B6AC battle_star_refresh_UnkStarFunc3 = 0x802A116C; // type:func rom:0x78B76C @@ -14691,7 +14691,7 @@ battle_star_refresh_802A1E08 = 0x802A1E08; // type:data rom:0x78C408 battle_star_refresh_802A21A0 = 0x802A21A0; // type:data rom:0x78C7A0 battle_star_refresh_802A23AC = 0x802A23AC; // type:data rom:0x78C9AC battle_star_refresh_802A27FC = 0x802A27FC; // type:data rom:0x78CDFC -battle_star_refresh_usePower = 0x802A2928; // type:data rom:0x78CF28 +battle_star_refresh_EVS_UsePower = 0x802A2928; // type:data rom:0x78CF28 battle_star_lullaby_UnkStarFunc1 = 0x802A1000; // type:func rom:0x78D150 battle_star_lullaby_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x78D1FC battle_star_lullaby_UnkStarFunc3 = 0x802A116C; // type:func rom:0x78D2BC @@ -14707,7 +14707,7 @@ battle_star_lullaby_802A19B8 = 0x802A19B8; // type:data rom:0x78DB08 battle_star_lullaby_802A1D50 = 0x802A1D50; // type:data rom:0x78DEA0 battle_star_lullaby_802A1F5C = 0x802A1F5C; // type:data rom:0x78E0AC battle_star_lullaby_802A23AC = 0x802A23AC; // type:data rom:0x78E4FC -battle_star_lullaby_usePower = 0x802A24D8; // type:data rom:0x78E628 +battle_star_lullaby_EVS_UsePower = 0x802A24D8; // type:data rom:0x78E628 battle_star_star_storm_UnkStarFunc1 = 0x802A1000; // type:func rom:0x78E7D0 battle_star_star_storm_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x78E87C battle_star_star_storm_UnkStarFunc3 = 0x802A116C; // type:func rom:0x78E93C @@ -14724,7 +14724,7 @@ battle_star_star_storm_802A1A88 = 0x802A1A88; // type:data rom:0x78F258 battle_star_star_storm_802A1E20 = 0x802A1E20; // type:data rom:0x78F5F0 battle_star_star_storm_802A202C = 0x802A202C; // type:data rom:0x78F7FC battle_star_star_storm_802A247C = 0x802A247C; // type:data rom:0x78FC4C -battle_star_star_storm_usePower = 0x802A25A8; // type:data rom:0x78FD78 +battle_star_star_storm_EVS_UsePower = 0x802A25A8; // type:data rom:0x78FD78 battle_star_chill_out_UnkStarFunc1 = 0x802A1000; // type:func rom:0x7900D0 battle_star_chill_out_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79017C battle_star_chill_out_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79023C @@ -14744,7 +14744,7 @@ battle_star_chill_out_802A1C88 = 0x802A1C88; // type:data rom:0x790D58 battle_star_chill_out_802A2020 = 0x802A2020; // type:data rom:0x7910F0 battle_star_chill_out_802A222C = 0x802A222C; // type:data rom:0x7912FC battle_star_chill_out_802A267C = 0x802A267C; // type:data rom:0x79174C -battle_star_chill_out_usePower = 0x802A27A8; // type:data rom:0x791878 +battle_star_chill_out_EVS_UsePower = 0x802A27A8; // type:data rom:0x791878 battle_star_smooch_UnkStarFunc1 = 0x802A1000; // type:func rom:0x791D90 battle_star_smooch_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x791E3C battle_star_smooch_UnkStarFunc3 = 0x802A116C; // type:func rom:0x791EFC @@ -14762,7 +14762,7 @@ battle_star_smooch_802A1D60 = 0x802A1D60; // type:data rom:0x792AF0 battle_star_smooch_802A1F6C = 0x802A1F6C; // type:data rom:0x792CFC battle_star_smooch_802A23BC = 0x802A23BC; // type:data rom:0x79314C battle_star_smooch_intTable_802A24E8 = 0x802A24E8; // type:data rom:0x793278 -battle_star_smooch_usePower = 0x802A2510; // type:data rom:0x7932A0 +battle_star_smooch_EVS_UsePower = 0x802A2510; // type:data rom:0x7932A0 battle_star_time_out_UnkStarFunc1 = 0x802A1000; // type:func rom:0x793D20 battle_star_time_out_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x793DCC battle_star_time_out_UnkStarFunc3 = 0x802A116C; // type:func rom:0x793E8C @@ -14777,7 +14777,7 @@ battle_star_time_out_802A18B8 = 0x802A18B8; // type:data rom:0x7945D8 battle_star_time_out_802A1C50 = 0x802A1C50; // type:data rom:0x794970 battle_star_time_out_802A1E5C = 0x802A1E5C; // type:data rom:0x794B7C battle_star_time_out_802A22AC = 0x802A22AC; // type:data rom:0x794FCC -battle_star_time_out_usePower = 0x802A23D8; // type:data rom:0x7950F8 +battle_star_time_out_EVS_UsePower = 0x802A23D8; // type:data rom:0x7950F8 battle_star_up_and_away_UnkStarFunc1 = 0x802A1000; // type:func rom:0x7952E0 battle_star_up_and_away_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79538C battle_star_up_and_away_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79544C @@ -14795,7 +14795,7 @@ battle_star_up_and_away_802A1A68 = 0x802A1A68; // type:data rom:0x795D48 battle_star_up_and_away_802A1E00 = 0x802A1E00; // type:data rom:0x7960E0 battle_star_up_and_away_802A200C = 0x802A200C; // type:data rom:0x7962EC battle_star_up_and_away_802A245C = 0x802A245C; // type:data rom:0x79673C -battle_star_up_and_away_usePower = 0x802A2588; // type:data rom:0x796868 +battle_star_up_and_away_EVS_UsePower = 0x802A2588; // type:data rom:0x796868 battle_star_star_beam_UnkStarFunc1 = 0x802A1000; // type:func rom:0x796FC0 battle_star_star_beam_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79706C battle_star_star_beam_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79712C @@ -14817,7 +14817,7 @@ battle_star_star_beam_802A33A8 = 0x802A33A8; // type:data rom:0x799368 D_802A3514_7994D4 = 0x802A3514; // type:data rom:0x7994D4 D_802A3534_7994F4 = 0x802A3534; // type:data rom:0x7994F4 D_802A3554_799514 = 0x802A3554; // type:data rom:0x799514 -battle_star_star_beam_usePower = 0x802A35B4; // type:data rom:0x799574 +battle_star_star_beam_EVS_UsePower = 0x802A35B4; // type:data rom:0x799574 battle_star_peach_beam_UnkStarFunc1 = 0x802A1000; // type:func rom:0x7997B0 battle_star_peach_beam_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79985C battle_star_peach_beam_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79991C @@ -14839,7 +14839,7 @@ battle_star_peach_beam_802A33A8 = 0x802A33A8; // type:data rom:0x79BB58 battle_star_peach_beam_D_802A3514_7FCCC4 = 0x802A3514; // type:data rom:0x79BCC4 battle_star_peach_beam_D_802A3534_7FCCE4 = 0x802A3534; // type:data rom:0x79BCE4 battle_star_peach_beam_D_802A3554_7FCD04 = 0x802A3554; // type:data rom:0x79BD04 -battle_star_peach_beam_usePower = 0x802A35B4; // type:data rom:0x79BD64 +battle_star_peach_beam_EVS_UsePower = 0x802A35B4; // type:data rom:0x79BD64 battle_star_peach_focus_UnkStarFunc1 = 0x802A1000; // type:func rom:0x79BFA0 battle_star_peach_focus_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79C04C battle_star_peach_focus_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79C10C @@ -14855,7 +14855,7 @@ battle_star_peach_focus_802A18C8 = 0x802A18C8; // type:data rom:0x79C868 battle_star_peach_focus_802A1C60 = 0x802A1C60; // type:data rom:0x79CC00 battle_star_peach_focus_802A1E6C = 0x802A1E6C; // type:data rom:0x79CE0C battle_star_peach_focus_802A22BC = 0x802A22BC; // type:data rom:0x79D25C -battle_star_peach_focus_usePower = 0x802A23E8; // type:data rom:0x79D388 +battle_star_peach_focus_EVS_UsePower = 0x802A23E8; // type:data rom:0x79D388 battle_star_peach_dash_UnkStarFunc1 = 0x802A1000; // type:func rom:0x79D8A0 battle_star_peach_dash_UnkStarFunc2 = 0x802A10AC; // type:func rom:0x79D94C battle_star_peach_dash_UnkStarFunc3 = 0x802A116C; // type:func rom:0x79DA0C @@ -14871,7 +14871,7 @@ battle_star_peach_dash_802A1948 = 0x802A1948; // type:data rom:0x79E1E8 battle_star_peach_dash_802A1CE0 = 0x802A1CE0; // type:data rom:0x79E580 battle_star_peach_dash_802A1EEC = 0x802A1EEC; // type:data rom:0x79E78C battle_star_peach_dash_802A233C = 0x802A233C; // type:data rom:0x79EBDC -battle_star_peach_dash_usePower = 0x802A2468; // type:data rom:0x79ED08 +battle_star_peach_dash_EVS_UsePower = 0x802A2468; // type:data rom:0x79ED08 level_up_heart_png = 0x802A7AB0; // type:data rom:0x7A59F0 level_up_heart_pal = 0x802A7DD0; // type:data rom:0x7A5D10 level_up_flower_png = 0x802A7DF0; // type:data rom:0x7A5D30 @@ -27343,3 +27343,17 @@ map_vram_end = 0x80267FF0; // type:data appears_after_overlays_addr:0x80240000 world_misc_vram_end = 0x802B7E00; // type:data appears_after_overlays_addr:0x802B7000 //entity_data_vram_end = 0x802BD100; // type:data appears_after_overlays_addr:0x802BAE00 world_partner_vram_end = 0x802C3000; // type:data appears_after_overlays_addr:0x802BD100 + +battle_move_hammer_throw_dusty_hammer_png = 0x802A3048; // type:data rom:0x754498 +battle_move_hammer_throw_dusty_hammer_pal = 0x802A3248; // type:data rom:0x754698 +battle_move_hammer_throw_basic_hammer_png = 0x802A3268; // type:data rom:0x7546B8 +battle_move_hammer_throw_basic_hammer_pal = 0x802A3468; // type:data rom:0x7548B8 +battle_move_hammer_throw_super_hammer_png = 0x802A3488; // type:data rom:0x7548D8 +battle_move_hammer_throw_super_hammer_pal = 0x802A3688; // type:data rom:0x754AD8 +battle_move_hammer_throw_ultra_hammer_png = 0x802A36A8; // type:data rom:0x754AF8 +battle_move_hammer_throw_ultra_hammer_pal = 0x802A38A8; // type:data rom:0x754CF8 +battle_move_hammer_throw_vtx = 0x802A38C8; // type:data rom:0x754D18 size:0x40 +battle_move_hammer_throw_dusty_hammer_gfx = 0x802A3908; // type:data rom:0x754D58 +battle_move_hammer_throw_basic_hammer_gfx = 0x802A39F8; // type:data rom:0x754E48 +battle_move_hammer_throw_super_hammer_gfx = 0x802A3AE8; // type:data rom:0x754F38 +battle_move_hammer_throw_ultra_hammer_gfx = 0x802A3BD8; // type:data rom:0x755028 diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 87ca044665..0d8a7796d5 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -41,10 +41,10 @@ battle_move_end = MAX(battle_move_end, coconut_VRAM_END); battle_move_end = MAX(battle_move_end, electro_pop_VRAM_END); battle_move_end = MAX(battle_move_end, strange_cake_VRAM_END); battle_move_end = MAX(battle_move_end, food_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_move_hammer_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_hammer_attack_VRAM_END); battle_move_end = MAX(battle_move_end, battle_move_spin_smash_VRAM_END); battle_move_end = MAX(battle_move_end, battle_move_quake_hammer_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_move_jump_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_jump_attack_VRAM_END); battle_move_end = MAX(battle_move_end, battle_move_multibounce_VRAM_END); battle_move_end = MAX(battle_move_end, battle_move_power_bounce_VRAM_END); battle_move_end = MAX(battle_move_end, battle_move_sleep_stomp_VRAM_END); @@ -68,24 +68,24 @@ battle_move_end = MAX(battle_move_end, battle_move_mega_jump_VRAM_END); battle_move_end = MAX(battle_move_end, battle_move_power_smash_VRAM_END); battle_move_end = MAX(battle_move_end, battle_move_super_smash_VRAM_END); battle_move_end = MAX(battle_move_end, battle_move_mega_smash_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_move_unknown_move_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_demo_power_bounce_VRAM_END); battle_move_end = MAX(battle_move_end, battle_move_shrink_smash_VRAM_END); battle_move_end = MAX(battle_move_end, battle_move_shell_crack_VRAM_END); battle_move_end = MAX(battle_move_end, battle_move_d_down_jump_VRAM_END); battle_move_end = MAX(battle_move_end, battle_move_shrink_stomp_VRAM_END); battle_move_end = MAX(battle_move_end, battle_move_earthquake_jump_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_star_focus_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_star_refresh_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_star_lullaby_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_star_star_storm_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_star_chill_out_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_star_smooch_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_star_time_out_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_star_up_and_away_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_star_star_beam_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_star_peach_beam_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_star_peach_focus_VRAM_END); -battle_move_end = MAX(battle_move_end, battle_star_peach_dash_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_focus_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_refresh_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_lullaby_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_star_storm_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_chill_out_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_smooch_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_time_out_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_up_and_away_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_star_beam_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_peach_beam_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_peach_focus_VRAM_END); +battle_move_end = MAX(battle_move_end, battle_move_twink_dash_VRAM_END); world_battle_vram_end = battle_code_VRAM_END; world_battle_vram_end = MAX(world_battle_vram_end, world_script_api_VRAM_END);