From 5a5d088d8383c24160b792c39be8430c4c476b95 Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Mon, 20 Feb 2023 10:22:38 -0500 Subject: [PATCH] battle cleanup (#947) * item cleanup * quick * star power cleanup * battle cleanup * battle cleanup * SetGroupVisibility * more stage cleanup * stage clean * misc * half of stages * stagework --------- Co-authored-by: HailSanta --- include/dead.h | 2 +- include/effects.h | 24 +- include/enums.h | 37 +- include/functions.h | 2 +- include/script_api/battle.h | 46 +- include/script_api/common.h | 2 +- src/16F740.c | 42 +- src/16c8e0.c | 2 +- src/18C790.c | 2 +- src/18F340.c | 206 ++-- src/190B20.c | 71 +- src/19FAF0.c | 4 +- src/1A5830.c | 4 +- src/23680.c | 15 +- src/a5dd0_len_114e0.c | 28 +- src/battle/area/arn/actor/hyper_cleft.c | 78 +- src/battle/area/arn/actor/hyper_paragoomba.c | 102 +- src/battle/area/arn/actor/hypergoomba.c | 26 +- src/battle/area/arn/actor/tubba_blubba.c | 46 +- src/battle/area/arn/actor/tubbas_heart.c | 32 +- src/battle/area/arn/stage/arn_01.c | 16 +- src/battle/area/arn/stage/arn_02.c | 36 +- src/battle/area/arn/stage/arn_03.c | 16 +- src/battle/area/arn/stage/arn_04.c | 17 +- src/battle/area/arn/stage/arn_05.c | 17 +- src/battle/area/arn/stage/arn_06.c | 15 +- src/battle/area/dgb/actor/tubba_blubba.c | 74 +- src/battle/area/dgb/stage/dgb_01.c | 9 +- src/battle/area/dgb/stage/dgb_02.c | 9 +- src/battle/area/dgb/stage/dgb_03.c | 9 +- src/battle/area/dgb/stage/dgb_04.c | 15 +- src/battle/area/dgb/stage/dgb_05.c | 9 +- src/battle/area/dig/actor/tubba_blubba.c | 66 +- src/battle/area/dig/script/dig_01.c | 10 +- src/battle/area/dig/script/dig_02.c | 8 +- src/battle/area/dig/script/dig_03.c | 6 +- src/battle/area/dig/script/dig_04.c | 8 +- src/battle/area/dig/script/dig_05.c | 6 +- src/battle/area/dig/stage/dig_01.c | 19 +- src/battle/area/dig/stage/dig_02.c | 18 +- src/battle/area/dig/stage/dig_03.c | 47 +- src/battle/area/dig/stage/dig_04.c | 27 +- src/battle/area/dig/stage/dig_05.c | 8 +- src/battle/area/flo/actor/amazy_dayzee.c | 10 +- src/battle/area/flo/actor/crazee_dayzee.c | 12 +- src/battle/area/flo/actor/lakitu.c | 68 +- src/battle/area/flo/actor/ruff_puff.c | 12 +- src/battle/area/flo/stage/flo_01.c | 88 +- src/battle/area/flo/stage/flo_01b.c | 88 +- src/battle/area/flo/stage/flo_01c.c | 89 +- src/battle/area/flo/stage/flo_02.c | 88 +- src/battle/area/flo/stage/flo_02b.c | 89 +- src/battle/area/flo/stage/flo_02c.c | 89 +- src/battle/area/flo/stage/flo_03.c | 187 +--- src/battle/area/flo/stage/flo_04.c | 85 +- src/battle/area/flo/stage/flo_05.c | 24 +- src/battle/area/flo/stage/flo_06.c | 24 +- src/battle/area/flo2/actor/huff_n_puff.c | 394 ++++---- src/battle/area/flo2/actor/monty_mole_boss.c | 24 +- src/battle/area/flo2/actor/spike.c | 26 +- src/battle/area/flo2/actor/tuff_puff.c | 2 +- src/battle/area/flo2/stage/flo_01.c | 88 +- src/battle/area/flo2/stage/flo_01b.c | 88 +- src/battle/area/flo2/stage/flo_01c.c | 88 +- src/battle/area/flo2/stage/flo_02.c | 88 +- src/battle/area/flo2/stage/flo_02b.c | 89 +- src/battle/area/flo2/stage/flo_02c.c | 89 +- src/battle/area/flo2/stage/flo_03.c | 187 +--- src/battle/area/flo2/stage/flo_04.c | 85 +- src/battle/area/flo2/stage/flo_05.c | 24 +- src/battle/area/flo2/stage/flo_06.c | 24 +- src/battle/area/hos/actor/goombario_tutor.c | 48 +- src/battle/area/hos/actor/magikoopa.c | 432 ++++----- src/battle/area/hos/stage/hos_00.c | 63 +- src/battle/area/hos/stage/hos_01.c | 157 +-- src/battle/area/hos/stage/hos_02.c | 16 +- .../area/isk_part_1/actor/pokey_mummy.c | 148 +-- .../area/isk_part_1/actor/stone_chomp.c | 6 +- src/battle/area/isk_part_1/stage/isk_00.c | 19 +- src/battle/area/isk_part_1/stage/isk_01.c | 20 +- src/battle/area/isk_part_1/stage/isk_02.c | 26 +- src/battle/area/isk_part_1/stage/isk_02b.c | 32 +- src/battle/area/isk_part_1/stage/isk_02c.c | 28 +- src/battle/area/isk_part_1/stage/isk_03.c | 21 +- src/battle/area/isk_part_1/stage/isk_03b.c | 20 +- src/battle/area/isk_part_1/stage/isk_04.c | 44 +- src/battle/area/isk_part_1/stage/isk_05.c | 38 +- src/battle/area/isk_part_1/stage/isk_06.c | 35 +- src/battle/area/isk_part_1/stage/isk_06b.c | 37 +- src/battle/area/isk_part_1/stage/isk_07.c | 35 +- src/battle/area/isk_part_1/stage/isk_08.c | 35 +- .../area/isk_part_2/actor/chain_chomp.c | 42 +- src/battle/area/isk_part_2/actor/tutankoopa.c | 108 +-- src/battle/area/isk_part_2/stage/isk_00.c | 19 +- src/battle/area/isk_part_2/stage/isk_01.c | 20 +- src/battle/area/isk_part_2/stage/isk_02.c | 26 +- src/battle/area/isk_part_2/stage/isk_02b.c | 32 +- src/battle/area/isk_part_2/stage/isk_02c.c | 28 +- src/battle/area/isk_part_2/stage/isk_03.c | 21 +- src/battle/area/isk_part_2/stage/isk_03b.c | 20 +- src/battle/area/isk_part_2/stage/isk_04.c | 44 +- src/battle/area/isk_part_2/stage/isk_05.c | 38 +- src/battle/area/isk_part_2/stage/isk_06.c | 35 +- src/battle/area/isk_part_2/stage/isk_06b.c | 37 +- src/battle/area/isk_part_2/stage/isk_07.c | 35 +- src/battle/area/iwa/actor/buzzar.c | 150 +-- src/battle/area/iwa/actor/cleft.c | 34 +- src/battle/area/iwa/stage/iwa_01.c | 31 +- src/battle/area/iwa/stage/iwa_01b.c | 18 +- src/battle/area/iwa/stage/iwa_02.c | 25 +- src/battle/area/jan/actor/hurt_plant.c | 16 +- src/battle/area/jan/actor/jungle_fuzzy.c | 20 +- src/battle/area/jan/actor/m_bush.c | 6 +- src/battle/area/jan/actor/spear_guy.c | 112 +-- src/battle/area/jan/stage/jan_00.c | 127 +-- src/battle/area/jan/stage/jan_01.c | 135 +-- src/battle/area/jan/stage/jan_01b.c | 135 +-- src/battle/area/jan/stage/jan_02.c | 26 +- src/battle/area/jan/stage/jan_03.c | 27 +- src/battle/area/jan/stage/jan_03b.c | 27 +- src/battle/area/jan/stage/jan_04.c | 27 +- src/battle/area/jan/stage/jan_04b.c | 27 +- src/battle/area/jan2/stage/jan_00.c | 126 +-- src/battle/area/jan2/stage/jan_01.c | 135 +-- src/battle/area/jan2/stage/jan_01b.c | 135 +-- src/battle/area/jan2/stage/jan_02.c | 26 +- src/battle/area/jan2/stage/jan_03.c | 27 +- src/battle/area/jan2/stage/jan_03b.c | 27 +- src/battle/area/jan2/stage/jan_04.c | 27 +- src/battle/area/jan2/stage/jan_04b.c | 27 +- src/battle/area/kgr/actor/fuzzipede.c | 50 +- src/battle/area/kgr/stage/kgr_01.c | 65 +- src/battle/area/kkj/actor/kammy_koopa.c | 68 +- src/battle/area/kkj/stage/kpa_05.c | 70 +- src/battle/area/kmr_part_1/stage/kmr_02.c | 19 +- src/battle/area/kmr_part_1/stage/kmr_03.c | 33 +- src/battle/area/kmr_part_1/stage/kmr_04.c | 33 +- src/battle/area/kmr_part_1/stage/kmr_05.c | 28 +- src/battle/area/kmr_part_1/stage/kmr_06.c | 35 +- .../area/kmr_part_2/actor/blue_goomba.c | 34 +- .../area/kmr_part_2/actor/blue_goomba2.c | 10 +- .../area/kmr_part_2/actor/goomba_king.c | 182 ++-- .../area/kmr_part_2/actor/goomnut_tree.c | 116 +-- src/battle/area/kmr_part_2/actor/red_goomba.c | 28 +- .../area/kmr_part_2/actor/red_goomba2.c | 10 +- src/battle/area/kmr_part_2/stage/kmr_02.c | 19 +- src/battle/area/kmr_part_2/stage/kmr_03.c | 33 +- src/battle/area/kmr_part_2/stage/kmr_04.c | 33 +- src/battle/area/kmr_part_2/stage/kmr_05.c | 28 +- src/battle/area/kmr_part_2/stage/kmr_06.c | 36 +- .../area/kmr_part_3/actor/egg_jr_troopa.c | 58 +- .../area/kmr_part_3/actor/final_jr_troopa.c | 272 +++--- src/battle/area/kmr_part_3/actor/jr_troopa.c | 80 +- .../area/kmr_part_3/actor/mage_jr_troopa.c | 88 +- .../area/kmr_part_3/actor/para_jr_troopa.c | 94 +- src/battle/area/kmr_part_3/actor/paragoomba.c | 80 +- .../area/kmr_part_3/actor/spiked_goomba.c | 16 +- .../kmr_part_3/actor/spiked_para_jr_troopa.c | 128 +-- src/battle/area/kmr_part_3/stage/kmr_02.c | 19 +- src/battle/area/kmr_part_3/stage/kmr_03.c | 33 +- src/battle/area/kmr_part_3/stage/kmr_04.c | 33 +- src/battle/area/kmr_part_3/stage/kmr_05.c | 21 +- src/battle/area/kmr_part_3/stage/kmr_06.c | 36 +- src/battle/area/kmr_part_3/stage/kpa_01.c | 15 +- src/battle/area/kmr_part_3/stage/mac_01.c | 33 +- src/battle/area/kmr_part_3/stage/mim_01.c | 9 +- src/battle/area/kmr_part_3/stage/nok_01.c | 56 +- src/battle/area/kmr_part_3/stage/sam_01.c | 37 +- src/battle/area/kpa/actor/bony_beetle.c | 74 +- src/battle/area/kpa/actor/dry_bones.c | 60 +- src/battle/area/kpa/stage/kpa_01.c | 21 +- src/battle/area/kpa/stage/kpa_01b.c | 21 +- src/battle/area/kpa/stage/kpa_02.c | 17 +- src/battle/area/kpa/stage/kpa_03.c | 15 +- src/battle/area/kpa/stage/kpa_04.c | 26 +- src/battle/area/kpa/stage/kpa_04b.c | 24 +- src/battle/area/kpa/stage/kpa_04c.c | 22 +- src/battle/area/kpa/stage/kpa_05.c | 17 +- src/battle/area/kpa/stage/kpa_07.c | 17 +- src/battle/area/kpa/stage/kpa_08.c | 17 +- src/battle/area/kpa/stage/kpa_09.c | 17 +- src/battle/area/kpa/stage/kpa_11.c | 17 +- src/battle/area/kpa/stage/kpa_13.c | 10 +- src/battle/area/kpa/stage/kpa_14.c | 10 +- src/battle/area/kpa2/actor/bowser.c | 24 +- src/battle/area/kpa2/actor/bowser_intro.c | 56 +- src/battle/area/kpa2/actor/bowser_phase_1.c | 108 +-- src/battle/area/kpa2/actor/bowser_phase_2.c | 112 +-- src/battle/area/kpa2/actor/bowser_phase_3.c | 140 +-- src/battle/area/kpa2/stage/kpa_01.c | 34 +- src/battle/area/kpa2/stage/kpa_02.c | 17 +- src/battle/area/kpa2/stage/kpa_03.c | 70 +- src/battle/area/kpa3/actor/anti_guy.c | 22 +- src/battle/area/kpa3/stage/kpa_01.c | 21 +- src/battle/area/kpa4/actor/bombshell_bill.c | 10 +- .../area/kpa4/actor/bombshell_bill_blaster.c | 8 +- src/battle/area/kpa4/stage/kpa_01.c | 21 +- src/battle/area/kpa4/stage/kpa_01b.c | 21 +- src/battle/area/kpa4/stage/kpa_02.c | 17 +- src/battle/area/kpa4/stage/kpa_03.c | 15 +- src/battle/area/kpa4/stage/kpa_04.c | 26 +- src/battle/area/kpa4/stage/kpa_04b.c | 24 +- src/battle/area/kpa4/stage/kpa_04c.c | 22 +- src/battle/area/kpa4/stage/kpa_05.c | 17 +- src/battle/area/kpa4/stage/kpa_07.c | 17 +- src/battle/area/kpa4/stage/kpa_08.c | 17 +- src/battle/area/kpa4/stage/kpa_09.c | 17 +- src/battle/area/kpa4/stage/kpa_11.c | 17 +- src/battle/area/kpa4/stage/kpa_13.c | 10 +- src/battle/area/kpa4/stage/kpa_14.c | 10 +- src/battle/area/kzn/actor/lava_bubble.c | 42 +- src/battle/area/kzn/stage/kzn_01.c | 23 +- src/battle/area/kzn/stage/kzn_01b.c | 21 +- src/battle/area/kzn/stage/kzn_02.c | 23 +- src/battle/area/kzn/stage/kzn_04.c | 27 +- src/battle/area/kzn/stage/kzn_04b.c | 27 +- src/battle/area/kzn/stage/kzn_04c.c | 27 +- src/battle/area/kzn/stage/kzn_05.c | 132 +-- src/battle/area/kzn2/actor/lava_bud.c | 34 +- src/battle/area/kzn2/actor/lava_piranha.c | 202 ++-- src/battle/area/kzn2/actor/petit_piranha.c | 30 +- .../area/kzn2/actor/petit_piranha_bomb.c | 2 +- src/battle/area/kzn2/stage/kzn_01.c | 23 +- src/battle/area/kzn2/stage/kzn_01b.c | 21 +- src/battle/area/kzn2/stage/kzn_02.c | 23 +- src/battle/area/kzn2/stage/kzn_04.c | 27 +- src/battle/area/kzn2/stage/kzn_04b.c | 27 +- src/battle/area/kzn2/stage/kzn_04c.c | 27 +- src/battle/area/kzn2/stage/kzn_05.c | 132 +-- src/battle/area/mac/actor/chan.c | 176 ++-- src/battle/area/mac/actor/lee.c | 546 +++++------ src/battle/area/mac/actor/master1.c | 46 +- src/battle/area/mac/actor/master2.c | 100 +- src/battle/area/mac/actor/master3.c | 218 ++--- src/battle/area/mac/stage/mac_01.c | 33 +- src/battle/area/mac/stage/mac_02.c | 11 +- src/battle/area/mim/actor/forest_fuzzy.c | 16 +- src/battle/area/mim/actor/piranha_plant.c | 18 +- src/battle/area/mim/stage/mim_01.c | 9 +- src/battle/area/nok/actor/kent_c_koopa.c | 214 ++--- src/battle/area/nok/stage/nok_01.c | 56 +- src/battle/area/nok/stage/nok_02.c | 84 +- src/battle/area/nok/stage/nok_03.c | 17 +- src/battle/area/nok/stage/nok_04.c | 20 +- src/battle/area/omo/actor/anti_guy.c | 2 +- src/battle/area/omo/actor/blue_shy_guy.c | 2 +- src/battle/area/omo/actor/green_shy_guy.c | 2 +- src/battle/area/omo/actor/groove_guy.c | 2 +- src/battle/area/omo/actor/pink_shy_guy.c | 2 +- src/battle/area/omo/actor/pyro_guy.c | 2 +- src/battle/area/omo/actor/sky_guy.c | 2 +- src/battle/area/omo/actor/spy_guy.c | 2 +- src/battle/area/omo/actor/yellow_shy_guy.c | 2 +- src/battle/area/omo/stage/omo_01.c | 10 +- src/battle/area/omo/stage/omo_02.c | 10 +- src/battle/area/omo/stage/omo_03.c | 12 +- src/battle/area/omo/stage/omo_03b.c | 10 +- src/battle/area/omo/stage/omo_04.c | 19 +- src/battle/area/omo/stage/omo_05.c | 22 +- src/battle/area/omo/stage/omo_05b.c | 21 +- src/battle/area/omo/stage/omo_06.c | 22 +- src/battle/area/omo/stage/omo_07.c | 10 +- src/battle/area/omo2/actor/general_guy.c | 60 +- src/battle/area/omo2/actor/light_bulb.c | 6 +- src/battle/area/omo2/actor/toy_tank.c | 38 +- src/battle/area/omo2/stage/omo_07.c | 10 +- src/battle/area/omo2_1/actor/shy_squad.c | 48 +- src/battle/area/omo2_2/actor/stilt_guy.c | 66 +- src/battle/area/omo2_3/actor/shy_stack.c | 154 +-- src/battle/area/omo2_4/actor/signal_guy.c | 10 +- src/battle/area/omo2_5/actor/shy_squad_dup.c | 28 +- src/battle/area/omo2_6/actor/shy_guy_dup.c | 2 +- .../area/omo3/actor/big_lantern_ghost.c | 20 +- src/battle/area/omo3/stage/omo_01.c | 10 +- src/battle/area/omo3/stage/omo_02.c | 10 +- src/battle/area/omo3/stage/omo_03.c | 12 +- src/battle/area/omo3/stage/omo_03b.c | 10 +- src/battle/area/omo3/stage/omo_04.c | 19 +- src/battle/area/omo3/stage/omo_05.c | 22 +- src/battle/area/omo3/stage/omo_05b.c | 21 +- src/battle/area/omo3/stage/omo_06.c | 22 +- src/battle/area/omo3/stage/omo_07.c | 10 +- src/battle/area/pra/actor/albino_dino.c | 12 +- src/battle/area/pra/stage/pra_01.c | 19 +- src/battle/area/pra/stage/pra_02.c | 19 +- src/battle/area/pra/stage/pra_03.c | 10 +- src/battle/area/pra/stage/pra_03b.c | 12 +- src/battle/area/pra/stage/pra_03c.c | 14 +- src/battle/area/pra/stage/pra_04.c | 35 +- src/battle/area/pra2/actor/crystal_bit.c | 8 +- src/battle/area/pra2/actor/crystal_king.c | 166 ++-- src/battle/area/pra2/stage/sam_04.c | 12 +- src/battle/area/pra3/stage/pra_01.c | 19 +- src/battle/area/pra3/stage/pra_02.c | 19 +- src/battle/area/pra3/stage/pra_03.c | 10 +- src/battle/area/pra3/stage/pra_03b.c | 12 +- src/battle/area/pra3/stage/pra_03c.c | 14 +- src/battle/area/pra3/stage/pra_04.c | 10 +- src/battle/area/sam/actor/frost_piranha.c | 18 +- src/battle/area/sam/actor/gulpit.c | 26 +- src/battle/area/sam/actor/gulpit_rocks.c | 6 +- src/battle/area/sam/stage/sam_01.c | 28 +- src/battle/area/sam/stage/sam_02.c | 32 +- src/battle/area/sam/stage/sam_02b.c | 24 +- src/battle/area/sam/stage/sam_02c.c | 26 +- src/battle/area/sam/stage/sam_02d.c | 28 +- src/battle/area/sam/stage/sam_03.c | 28 +- src/battle/area/sam2/actor/monstar.c | 22 +- src/battle/area/sam2/stage/sam_01.c | 28 +- src/battle/area/sam2/stage/sam_02.c | 32 +- src/battle/area/sam2/stage/sam_02b.c | 24 +- src/battle/area/sam2/stage/sam_02c.c | 26 +- src/battle/area/sam2/stage/sam_02d.c | 28 +- src/battle/area/sam2/stage/sam_03.c | 28 +- src/battle/area/sbk/stage/sbk_02.c | 24 +- src/battle/area/tik/actor/dark_koopa.c | 40 +- src/battle/area/tik/actor/dark_paratroopa.c | 96 +- src/battle/area/tik/actor/gloomba.c | 4 +- src/battle/area/tik/actor/paragloomba.c | 54 +- src/battle/area/tik/actor/spiked_gloomba.c | 6 +- src/battle/area/tik/stage/tik_01.c | 34 +- src/battle/area/tik/stage/tik_02.c | 34 +- src/battle/area/tik/stage/tik_03.c | 34 +- src/battle/area/tik/stage/tik_04.c | 18 +- src/battle/area/tik/stage/tik_05.c | 17 +- src/battle/area/tik2/actor/blooper.c | 20 +- src/battle/area/tik2/actor/blooper_baby.c | 26 +- src/battle/area/tik2/actor/electro_blooper.c | 24 +- src/battle/area/tik2/actor/super_blooper.c | 32 +- src/battle/area/tik2/stage/tik_01.c | 34 +- src/battle/area/tik2/stage/tik_02.c | 34 +- src/battle/area/tik2/stage/tik_03.c | 34 +- src/battle/area/tik2/stage/tik_04.c | 18 +- src/battle/area/tik2/stage/tik_05.c | 17 +- src/battle/area/tik3/stage/tik_01.c | 34 +- src/battle/area/tik3/stage/tik_02.c | 34 +- src/battle/area/tik3/stage/tik_03.c | 34 +- src/battle/area/tik3/stage/tik_04.c | 18 +- src/battle/area/tik3/stage/tik_05.c | 17 +- .../area/trd_part_1/actor/bill_blaster.c | 8 +- src/battle/area/trd_part_1/actor/bob_omb.c | 24 +- .../area/trd_part_1/actor/bullet_bill.c | 10 +- src/battle/area/trd_part_1/stage/trd_00.c | 17 +- src/battle/area/trd_part_1/stage/trd_01.c | 10 +- src/battle/area/trd_part_1/stage/trd_02.c | 19 +- src/battle/area/trd_part_1/stage/trd_02b.c | 16 +- src/battle/area/trd_part_1/stage/trd_02c.c | 21 +- src/battle/area/trd_part_1/stage/trd_02d.c | 29 +- src/battle/area/trd_part_1/stage/trd_03.c | 17 +- src/battle/area/trd_part_1/stage/trd_04.c | 17 +- src/battle/area/trd_part_1/stage/trd_05.c | 10 +- src/battle/area/trd_part_1/stage/trd_05b.c | 30 +- src/battle/area/trd_part_1/stage/trd_05c.c | 22 +- src/battle/area/trd_part_1/stage/trd_05d.c | 24 +- src/battle/area/trd_part_1/stage/trd_05e.c | 26 +- src/battle/area/trd_part_1/stage/trd_05f.c | 26 +- .../area/trd_part_2/actor/blue_ninja_koopa.c | 42 +- .../area/trd_part_2/actor/fake_bowser.c | 340 +++---- .../area/trd_part_2/actor/green_ninja_koopa.c | 54 +- .../area/trd_part_2/actor/red_ninja_koopa.c | 42 +- .../trd_part_2/actor/yellow_ninja_koopa.c | 42 +- src/battle/area/trd_part_2/stage/trd_00.c | 17 +- src/battle/area/trd_part_2/stage/trd_01.c | 10 +- src/battle/area/trd_part_2/stage/trd_02.c | 19 +- src/battle/area/trd_part_2/stage/trd_02b.c | 16 +- src/battle/area/trd_part_2/stage/trd_03.c | 17 +- src/battle/area/trd_part_2/stage/trd_04.c | 17 +- src/battle/area/trd_part_2/stage/trd_05.c | 10 +- src/battle/area/trd_part_2/stage/trd_05b.c | 30 +- src/battle/area/trd_part_2/stage/trd_05c.c | 22 +- src/battle/area/trd_part_2/stage/trd_05d.c | 24 +- src/battle/area/trd_part_2/stage/trd_05e.c | 26 +- src/battle/area/trd_part_2/stage/trd_05f.c | 26 +- src/battle/area/trd_part_3/actor/eldstar.c | 22 +- src/battle/area/trd_part_3/stage/nok_01.c | 56 +- src/battle/battle.h | 5 +- src/battle/common/actor/bandit.inc.c | 28 +- src/battle/common/actor/buzzy_beetle.inc.c | 48 +- src/battle/common/actor/bzzap.inc.c | 108 +-- src/battle/common/actor/clubba.inc.c | 6 +- src/battle/common/actor/duplighost.inc.c | 58 +- src/battle/common/actor/ember.inc.c | 108 +-- src/battle/common/actor/fuzzy.inc.c | 12 +- src/battle/common/actor/ghost_bombette.inc.c | 16 +- src/battle/common/actor/ghost_bow.inc.c | 18 +- src/battle/common/actor/ghost_goombario.inc.c | 22 +- src/battle/common/actor/ghost_kooper.inc.c | 20 +- .../common/actor/ghost_lakilester.inc.c | 28 +- src/battle/common/actor/ghost_parakarry.inc.c | 18 +- src/battle/common/actor/ghost_sushie.inc.c | 6 +- src/battle/common/actor/ghost_watt.inc.c | 20 +- src/battle/common/actor/goomba.inc.c | 4 +- src/battle/common/actor/gray_magikoopa.inc.c | 56 +- src/battle/common/actor/green_magikoopa.inc.c | 56 +- src/battle/common/actor/hammer_bro.inc.c | 62 +- src/battle/common/actor/koopa_troopa.inc.c | 24 +- src/battle/common/actor/koopatrol.inc.c | 72 +- src/battle/common/actor/magikoopa.inc.c | 168 ++-- src/battle/common/actor/medi_guy.inc.c | 26 +- src/battle/common/actor/monty_mole.inc.c | 24 +- src/battle/common/actor/paragoomba.inc.c | 54 +- src/battle/common/actor/paratroopa.inc.c | 80 +- src/battle/common/actor/pokey.inc.c | 134 +-- src/battle/common/actor/putrid_piranha.inc.c | 18 +- src/battle/common/actor/red_magikoopa.inc.c | 56 +- src/battle/common/actor/red_shy_guy.inc.c | 22 +- src/battle/common/actor/slot_machine.inc.c | 24 +- src/battle/common/actor/spike_top.inc.c | 52 +- src/battle/common/actor/spiked_goomba.inc.c | 6 +- src/battle/common/actor/spiny.inc.c | 40 +- src/battle/common/actor/swooper.inc.c | 40 +- src/battle/common/actor/swoopula.inc.c | 56 +- src/battle/common/actor/whacka.inc.c | 14 +- src/battle/common/actor/white_clubba.inc.c | 12 +- src/battle/common/actor/white_magikoopa.inc.c | 96 +- .../common/actor/yellow_magikoopa.inc.c | 56 +- src/battle/common/move/ItemRefund.inc.c | 2 +- src/battle/common/move/JumpSupport.inc.c | 20 +- src/battle/common/move/StarBeamSupport.inc.c | 64 +- src/battle/common/move/UseItem.inc.c | 10 +- .../common/stage/WaterEffects.inc.c} | 251 ++--- src/battle/common/stage/flo_01.inc.c | 46 + src/battle/common/stage/flo_01b.inc.c | 44 + src/battle/common/stage/flo_01c.inc.c | 46 + src/battle/common/stage/flo_02.inc.c | 41 + src/battle/common/stage/flo_02b.inc.c | 46 + src/battle/common/stage/flo_02c.inc.c | 42 + src/battle/common/stage/flo_03.inc.c | 198 ++++ src/battle/common/stage/flo_04.inc.c | 91 ++ src/battle/common/stage/flo_05.inc.c | 27 + src/battle/common/stage/flo_06.inc.c | 27 + .../common/stage/flo_RandomFlowers.inc.c | 65 ++ src/battle/common/stage/isk_00.inc.c | 21 + src/battle/common/stage/isk_01.inc.c | 23 + src/battle/common/stage/isk_02.inc.c | 31 + src/battle/common/stage/isk_02b.inc.c | 37 + src/battle/common/stage/isk_02c.inc.c | 33 + src/battle/common/stage/isk_03.inc.c | 24 + src/battle/common/stage/isk_03b.inc.c | 23 + src/battle/common/stage/isk_04.inc.c | 48 + src/battle/common/stage/isk_05.inc.c | 41 + src/battle/common/stage/isk_06.inc.c | 38 + src/battle/common/stage/isk_06b.inc.c | 39 + src/battle/common/stage/isk_07.inc.c | 38 + src/battle/common/stage/isk_08.inc.c | 38 + src/battle/common/stage/jan_00.inc.c | 34 + src/battle/common/stage/jan_01.inc.c | 44 + src/battle/common/stage/jan_01b.inc.c | 44 + src/battle/common/stage/jan_02.inc.c | 32 + src/battle/common/stage/jan_03.inc.c | 33 + src/battle/common/stage/jan_03b.inc.c | 33 + src/battle/common/stage/jan_04.inc.c | 31 + src/battle/common/stage/jan_04b.inc.c | 31 + .../common/stage/jan_BeachEffects.inc.c | 98 ++ src/battle/common/stage/kkj_02.inc.c | 73 ++ src/battle/common/stage/kmr_02.inc.c | 21 + src/battle/common/stage/kmr_03.inc.c | 38 + src/battle/common/stage/kmr_04.inc.c | 38 + src/battle/common/stage/kmr_05.inc.c | 33 + src/battle/common/stage/kmr_06.inc.c | 41 + src/battle/common/stage/nok_01.inc.c | 62 ++ src/battle/common/stage/sam_Snowflakes.inc.c | 109 +++ src/battle/move/hammer/auto_smash.c | 2 +- src/battle/move/hammer/hammer_charge_0.c | 12 +- src/battle/move/hammer/hammer_charge_1.c | 6 +- src/battle/move/hammer/hammer_charge_2.c | 6 +- src/battle/move/item/coconut.c | 2 +- src/battle/move/item/dizzy_dial.c | 22 +- src/battle/move/item/dusty_hammer.c | 2 +- src/battle/move/item/egg_missile.c | 22 +- src/battle/move/item/electro_pop.c | 4 +- src/battle/move/item/fire_flower.c | 6 +- src/battle/move/item/food.c | 4 +- src/battle/move/item/fright_jar.c | 9 +- src/battle/move/item/hustle_drink.c | 5 +- src/battle/move/item/insecticide_herb.c | 6 +- src/battle/move/item/life_shroom.c | 2 +- src/battle/move/item/mushroom.c | 2 +- src/battle/move/item/mystery.c | 4 +- src/battle/move/item/pebble.c | 2 +- src/battle/move/item/pow_block.c | 51 +- src/battle/move/item/repel_gel.c | 5 +- src/battle/move/item/shooting_star.c | 8 +- src/battle/move/item/sleepy_sheep.c | 50 +- src/battle/move/item/snowman_doll.c | 24 +- src/battle/move/item/stop_watch.c | 11 +- src/battle/move/item/strange_cake.c | 38 +- src/battle/move/item/super_soda.c | 2 +- src/battle/move/item/tasty_tonic.c | 16 +- src/battle/move/item/thunder_bolt.c | 14 +- src/battle/move/item/thunder_rage.c | 8 +- src/battle/move/item/volt_shroom.c | 5 +- src/battle/move/jump/demo_power_bounce.c | 6 - src/battle/move/jump/jump_charge_0.c | 4 +- src/battle/move/jump/jump_charge_1.c | 2 +- src/battle/move/jump/jump_charge_2.c | 2 +- src/battle/move/star_power/chill_out.c | 96 +- src/battle/move/star_power/focus.c | 98 +- src/battle/move/star_power/lullaby.c | 90 +- src/battle/move/star_power/peach_beam.c | 4 +- src/battle/move/star_power/peach_focus.c | 107 +-- src/battle/move/star_power/refresh.c | 92 +- src/battle/move/star_power/smooch.c | 125 +-- src/battle/move/star_power/star_beam.c | 4 +- src/battle/move/star_power/star_storm.c | 90 +- src/battle/move/star_power/time_out.c | 90 +- src/battle/move/star_power/twink_dash.c | 92 +- src/battle/move/star_power/up_and_away.c | 100 +- src/battle/partner/bombette.c | 220 ++--- src/battle/partner/bow.c | 82 +- src/battle/partner/goombario.c | 114 +-- src/battle/partner/goompa.c | 2 +- src/battle/partner/kooper.c | 86 +- src/battle/partner/lakilester.c | 134 +-- src/battle/partner/parakarry.c | 64 +- src/battle/partner/sushie.c | 32 +- src/battle/partner/twink.c | 24 +- src/battle/partner/watt.c | 114 +-- src/common/Set80071270_0_16.inc.c | 7 - src/common/Set80218630_Var0.inc.c | 9 - src/common/SetDemoBattleBeginDelay.inc.c | 9 + src/common/UnkFloatFunc2.inc.c | 17 - src/common/UnkFloatFunc3.inc.c | 37 - src/common/UnkModelStuff.inc.c | 90 -- src/common/UpdateSunPos.inc.c | 37 + src/effects/floating_flower.c | 114 +-- src/encounter.c | 5 +- src/entity/Block.c | 6 +- src/entity/Chest.c | 4 +- src/entity/HiddenPanel.c | 4 +- src/entity/ItemBlock.c | 6 +- src/entity/WoodenCrate.c | 4 +- src/entity/jan_iwa/Plants2.c | 3 +- src/evt/map_api.c | 20 +- src/world/area_dgb/dgb_01/dgb_01_3_bridges.c | 14 +- src/world/area_dro/dro_01/dro_01_5_rooms.c | 16 +- src/world/area_dro/dro_02/dro_02_4_rooms.c | 8 +- src/world/area_hos/hos_00/hos_00_2_main.c | 2 +- src/world/area_hos/hos_06/hos_06_4_rooms.c | 38 +- src/world/area_isk/isk_05/isk_05_1_main.c | 8 +- src/world/area_isk/isk_05/isk_05_3_npc.c | 4 +- src/world/area_jan/jan_02/jan_02_2_main.c | 4 +- src/world/area_jan/jan_03/jan_03_6_rooms.c | 8 +- src/world/area_jan/jan_22/jan_22_2_main.c | 6 +- src/world/area_jan/jan_22/jan_22_3_npc.c | 6 +- src/world/area_kmr/kmr_02/kmr_02_3_npc.c | 6 +- src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c | 18 +- src/world/area_kmr/kmr_02/kmr_02_6_rooms_2.c | 8 +- src/world/area_kmr/kmr_11/kmr_11_2_main.c | 8 +- src/world/area_kpa/kpa_133/kpa_133_5_water.c | 2 +- src/world/area_kpa/kpa_134/kpa_134_3_chains.c | 12 +- src/world/area_kpa/kpa_17/kpa_17_3_main.c | 2 +- src/world/area_kpa/kpa_50/kpa_50_2_main.c | 4 +- src/world/area_kzn/kzn_06/kzn_06_3_extra.c | 4 +- src/world/area_kzn/kzn_10/kzn_10_2_tromp.c | 6 +- src/world/area_kzn/kzn_17/kzn_17_4_tromp.c | 4 +- src/world/area_mac/mac_00/mac_00_4_rooms.c | 16 +- .../area_mac/mac_00/npc/russ_and_thief.inc.c | 4 +- src/world/area_mac/mac_01/mac_01_4_rooms.c | 12 +- src/world/area_mac/mac_01/mac_01_9_npc.c | 6 +- src/world/area_mac/mac_02/mac_02_3_rooms.c | 10 +- src/world/area_mac/mac_04/mac_04_3_rooms.c | 2 +- src/world/area_mgm/mgm_02/mgm_02_2_npc.c | 8 +- src/world/area_mim/mim_09/mim_09_4_hint.c | 4 +- src/world/area_nok/nok_01/nok_01_6_rooms.c | 12 +- src/world/area_nok/nok_02/nok_02_4_rooms.c | 12 +- src/world/area_nok/nok_02/nok_02_6_npc.c | 4 +- src/world/area_nok/nok_12/nok_12_4_bridge.c | 4 +- src/world/area_omo/omo_05/omo_05_2_main.c | 2 +- src/world/area_omo/omo_08/omo_08_3_boxes.c | 10 +- src/world/area_omo/omo_17/omo_17_1_main.c | 2 +- src/world/area_pra/pra_02/pra_02_2_main.c | 4 +- src/world/area_pra/pra_02/pra_02_4_entity.c | 8 +- src/world/area_pra/pra_18/pra_18_2_main.c | 12 +- src/world/area_pra/pra_18/pra_18_3_npc.c | 12 +- src/world/area_pra/pra_31/pra_31_4_puzzle.c | 24 +- src/world/area_sam/sam_01/sam_01_3_rooms.c | 36 +- src/world/area_sam/sam_02/sam_02_3_rooms.c | 30 +- src/world/area_sam/sam_06/sam_06_3_rooms.c | 34 +- src/world/area_sam/sam_06/sam_06_4_npc.c | 16 +- .../area_sam/sam_07/sam_07_4_frozen_pit.c | 6 +- src/world/area_sam/sam_10/sam_10_4_stairs.c | 20 +- src/world/area_sam/sam_11/sam_11_3_rooms.c | 28 +- src/world/area_sam/sam_11/sam_11_6_pond.c | 8 +- src/world/area_sbk/sbk_02/sbk_02_2_main.c | 2 +- src/world/area_trd/trd_00/trd_00_1_main.c | 4 +- src/world/area_trd/trd_01/trd_01_1_main.c | 4 +- src/world/area_trd/trd_02/trd_02_1_main.c | 10 +- src/world/area_trd/trd_03/trd_03_1_main.c | 14 +- src/world/area_trd/trd_05/trd_05_1_main.c | 12 +- src/world/area_trd/trd_05/trd_05_3_trap.c | 2 +- src/world/area_trd/trd_06/trd_06_1_main.c | 14 +- .../common/todo/HeartPlant_SpawnHeart.inc.c | 3 +- .../dead/area_kzn/kzn_17/kzn_17_4_tromp.c | 4 +- tools/ignored_funcs.txt | 2 +- tools/splat_ext/pm_sprite_shading_profiles.py | 8 +- tools/star_rod_idx_to_c.py | 2 +- ver/us/symbol_addrs.txt | 896 +++++++++--------- ver/us/undefined_syms.txt | 2 +- 599 files changed, 11000 insertions(+), 13006 deletions(-) rename src/{common/UnkModelStuff2.inc.c => battle/common/stage/WaterEffects.inc.c} (64%) create mode 100644 src/battle/common/stage/flo_01.inc.c create mode 100644 src/battle/common/stage/flo_01b.inc.c create mode 100644 src/battle/common/stage/flo_01c.inc.c create mode 100644 src/battle/common/stage/flo_02.inc.c create mode 100644 src/battle/common/stage/flo_02b.inc.c create mode 100644 src/battle/common/stage/flo_02c.inc.c create mode 100644 src/battle/common/stage/flo_03.inc.c create mode 100644 src/battle/common/stage/flo_04.inc.c create mode 100644 src/battle/common/stage/flo_05.inc.c create mode 100644 src/battle/common/stage/flo_06.inc.c create mode 100644 src/battle/common/stage/flo_RandomFlowers.inc.c create mode 100644 src/battle/common/stage/isk_00.inc.c create mode 100644 src/battle/common/stage/isk_01.inc.c create mode 100644 src/battle/common/stage/isk_02.inc.c create mode 100644 src/battle/common/stage/isk_02b.inc.c create mode 100644 src/battle/common/stage/isk_02c.inc.c create mode 100644 src/battle/common/stage/isk_03.inc.c create mode 100644 src/battle/common/stage/isk_03b.inc.c create mode 100644 src/battle/common/stage/isk_04.inc.c create mode 100644 src/battle/common/stage/isk_05.inc.c create mode 100644 src/battle/common/stage/isk_06.inc.c create mode 100644 src/battle/common/stage/isk_06b.inc.c create mode 100644 src/battle/common/stage/isk_07.inc.c create mode 100644 src/battle/common/stage/isk_08.inc.c create mode 100644 src/battle/common/stage/jan_00.inc.c create mode 100644 src/battle/common/stage/jan_01.inc.c create mode 100644 src/battle/common/stage/jan_01b.inc.c create mode 100644 src/battle/common/stage/jan_02.inc.c create mode 100644 src/battle/common/stage/jan_03.inc.c create mode 100644 src/battle/common/stage/jan_03b.inc.c create mode 100644 src/battle/common/stage/jan_04.inc.c create mode 100644 src/battle/common/stage/jan_04b.inc.c create mode 100644 src/battle/common/stage/jan_BeachEffects.inc.c create mode 100644 src/battle/common/stage/kkj_02.inc.c create mode 100644 src/battle/common/stage/kmr_02.inc.c create mode 100644 src/battle/common/stage/kmr_03.inc.c create mode 100644 src/battle/common/stage/kmr_04.inc.c create mode 100644 src/battle/common/stage/kmr_05.inc.c create mode 100644 src/battle/common/stage/kmr_06.inc.c create mode 100644 src/battle/common/stage/nok_01.inc.c create mode 100644 src/battle/common/stage/sam_Snowflakes.inc.c delete mode 100644 src/common/Set80071270_0_16.inc.c delete mode 100644 src/common/Set80218630_Var0.inc.c create mode 100644 src/common/SetDemoBattleBeginDelay.inc.c delete mode 100644 src/common/UnkFloatFunc2.inc.c delete mode 100644 src/common/UnkFloatFunc3.inc.c delete mode 100644 src/common/UnkModelStuff.inc.c create mode 100644 src/common/UpdateSunPos.inc.c diff --git a/include/dead.h b/include/dead.h index 9e676f87ba..f494071cd5 100644 --- a/include/dead.h +++ b/include/dead.h @@ -323,7 +323,7 @@ #define EVS_NpcHitRecoil dead_EVS_NpcHitRecoil #define SelfEnemyOverrideSyncPos dead_SelfEnemyOverrideSyncPos #define func_802CFD30 dead_func_802CFD30 -#define SetGroupEnabled dead_SetGroupEnabled +#define SetGroupVisibility dead_SetGroupVisibility #define Entity_HeartBlock dead_Entity_HeartBlock #define GetCamDistance dead_GetCamDistance #define GetCamPitch dead_GetCamPitch diff --git a/include/effects.h b/include/effects.h index f57c777cd5..033d863dd7 100644 --- a/include/effects.h +++ b/include/effects.h @@ -291,21 +291,15 @@ typedef struct FootprintFXData { } FootprintFXData; // size = 0x98 typedef struct FloatingFlowerFXData { - /* 0x00 */ s32 unk_00; - /* 0x04 */ f32 unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ f32 unk_20; - /* 0x24 */ f32 unk_24; - /* 0x28 */ f32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ f32 unk_30; - /* 0x34 */ s32 unk_34; - /* 0x38 */ s32 unk_38; + /* 0x00 */ s32 type; + /* 0x04 */ Vec3f pos; + /* 0x10 */ Vec3f vel; + /* 0x1C */ f32 accelY; + /* 0x20 */ f32 jerkY; + /* 0x24 */ Vec2f rot; + /* 0x2C */ Vec2f angularVel; + /* 0x34 */ s32 timeLeft; + /* 0x38 */ s32 lifetime; /* 0x3C */ s32 unk_3C; /* 0x40 */ s32 unk_40; /* 0x44 */ s32 unk_44; diff --git a/include/enums.h b/include/enums.h index d684a1b0ca..fbc737becd 100644 --- a/include/enums.h +++ b/include/enums.h @@ -918,6 +918,8 @@ enum SoundIDs { SOUND_238 = 0x00000238, SOUND_23D = 0x0000023D, SOUND_241 = 0x00000241, + SOUND_242 = 0x00000242, + SOUND_244 = 0x00000244, SOUND_245 = 0x00000245, SOUND_246 = 0x00000246, SOUND_247 = 0x00000247, @@ -1018,6 +1020,7 @@ enum SoundIDs { SOUND_2E9 = 0x000002E9, SOUND_2EA = 0x000002EA, SOUND_2EB = 0x000002EB, + SOUND_2EC = 0x000002EC, SOUND_2ED = 0x000002ED, SOUND_2EE = 0x000002EE, SOUND_2EF = 0x000002EF, @@ -1033,6 +1036,7 @@ enum SoundIDs { SOUND_2F9 = 0x000002F9, SOUND_2FA = 0x000002FA, SOUND_2FB = 0x000002FB, + SOUND_2FC = 0x000002FC, SOUND_2FD = 0x000002FD, SOUND_CLOSE_SHELL = 0x000002FF, SOUND_300 = 0x00000300, @@ -1042,6 +1046,7 @@ enum SoundIDs { SOUND_305 = 0x00000305, SOUND_306 = 0x00000306, SOUND_309 = 0x00000309, + SOUND_30A = 0x0000030A, SOUND_30B = 0x0000030B, SOUND_SHY_GUY_SCREAMS1 = 0x0000030C, SOUND_SHY_GUY_SCREAMS2 = 0x0000030D, @@ -1206,6 +1211,7 @@ enum SoundIDs { SOUND_3C7 = 0x000003C7, SOUND_3C8 = 0x000003C8, SOUND_3C9 = 0x000003C9, + SOUND_3CA = 0x000003CA, SOUND_3CB = 0x000003CB, SOUND_3CC = 0x000003CC, SOUND_3CD = 0x000003CD, @@ -1242,6 +1248,7 @@ enum SoundIDs { SOUND_DANGER = 0x000003F1, SOUND_PERIL = 0x000003F2, SOUND_3F3 = 0x000003F3, + SOUND_3F4 = 0x000003F4, SOUND_3F6 = 0x000003F6, SOUND_3F9 = 0x000003F9, SOUND_THROW = 0x000003FA, @@ -1268,6 +1275,7 @@ enum SoundIDs { SOUND_CANNON2 = 0x00002017, SOUND_CANNON3 = 0x00002018, SOUND_2019 = 0x00002019, + SOUND_201A = 0x0000201A, SOUND_201B = 0x0000201B, SOUND_201C = 0x0000201C, SOUND_201D = 0x0000201D, @@ -1314,6 +1322,8 @@ enum SoundIDs { SOUND_204B = 0x0000204B, SOUND_204D = 0x0000204D, SOUND_2051 = 0x00002051, + SOUND_2052 = 0x00002052, + SOUND_2053 = 0x00002053, SOUND_2055 = 0x00002055, SOUND_2056 = 0x00002056, SOUND_2059 = 0x00002059, @@ -1338,6 +1348,7 @@ enum SoundIDs { SOUND_206E = 0x0000206E, SOUND_206F = 0x0000206F, SOUND_2070 = 0x00002070, + SOUND_2071 = 0x00002071, SOUND_2072 = 0x00002072, SOUND_2073 = 0x00002073, SOUND_2074 = 0x00002074, @@ -1412,6 +1423,7 @@ enum SoundIDs { SOUND_20C5 = 0x000020C5, SOUND_20C6 = 0x000020C6, SOUND_20C8 = 0x000020C8, + SOUND_20C9 = 0x000020C9, SOUND_20CA = 0x000020CA, SOUND_20CB = 0x000020CB, SOUND_20CC = 0x000020CC, @@ -1436,13 +1448,16 @@ enum SoundIDs { SOUND_20DF = 0x000020DF, SOUND_20E0 = 0x000020E0, SOUND_20E1 = 0x000020E1, + SOUND_20E2 = 0x000020E2, SOUND_20E3 = 0x000020E3, SOUND_20E4 = 0x000020E4, SOUND_20E5 = 0x000020E5, SOUND_20E6 = 0x000020E6, SOUND_20E7 = 0x000020E7, + SOUND_20E8 = 0x000020E8, SOUND_20E9 = 0x000020E9, SOUND_20EA = 0x000020EA, + SOUND_20EB = 0x000020EB, SOUND_20EC = 0x000020EC, SOUND_20ED = 0x000020ED, SOUND_20EE = 0x000020EE, @@ -1455,6 +1470,9 @@ enum SoundIDs { SOUND_20F5 = 0x000020F5, SOUND_20F6 = 0x000020F6, SOUND_20F7 = 0x000020F7, + SOUND_20F9 = 0x000020F9, + SOUND_20FB = 0x000020FB, + SOUND_20FC = 0x000020FC, SOUND_20FD = 0x000020FD, SOUND_20FE = 0x000020FE, SOUND_2101 = 0x00002101, @@ -3064,6 +3082,7 @@ enum NpcIDs { NPC_PLAYER = -2, NPC_PARTNER = -4, NPC_BTL_MERLEE = -10, + NPC_BTL_SPIRIT = 100, }; enum EntityTypes { @@ -3323,6 +3342,15 @@ enum StatusFlags { STATUS_FLAG_80000000 = 0x80000000, }; +#define STATUS_FLAGS_IMMOBILIZED \ + (STATUS_FLAG_STONE \ + | STATUS_FLAG_STOP \ + | STATUS_FLAG_DIZZY \ + | STATUS_FLAG_PARALYZE \ + | STATUS_FLAG_FEAR \ + | STATUS_FLAG_FROZEN \ + | STATUS_FLAG_SLEEP) + enum DamageTypes { DAMAGE_TYPE_FIRE = 0x00000002, DAMAGE_TYPE_WATER = 0x00000004, @@ -4870,7 +4898,7 @@ enum GlobalOverrides { enum ModelFlags { MODEL_FLAG_FLAG_1 = 0x0001, - MODEL_FLAG_ENABLED = 0x0002, + MODEL_FLAG_HIDDEN = 0x0002, MODEL_FLAG_FLAG_4 = 0x0004, MODEL_FLAG_TRANSFORM_GROUP_MEMBER = 0x0008, MODEL_FLAG_USES_CUSTOM_GFX = 0x0010, @@ -4887,6 +4915,13 @@ enum ModelFlags { MODEL_FLAG_FLAG_8000 = 0x8000, }; +enum ModelGroupVisibility { + MODEL_GROUP_HIDDEN = 0, + MODEL_GROUP_VISIBLE = 1, + MODEL_GROUP_OTHERS_HIDDEN = 2, + MODEL_GROUP_OTHERS_VISIBLE = 3, +}; + enum TexPanner { //select pan unit TEX_PANNER_0 = 0x0, diff --git a/include/functions.h b/include/functions.h index 279964b363..fb5fa5e7df 100644 --- a/include/functions.h +++ b/include/functions.h @@ -448,7 +448,7 @@ void set_peach_shadow_scale(Shadow* shadow, f32 scale); s32 is_block_on_ground(Entity* block); void set_animation(s32 actorID, s32 partID, AnimID animID); void set_animation_rate(s32 actorID, s32 partID, f32 rate); -void set_model_flags(u16, s32, s32); +void set_model_group_visibility(u16, s32, s32); void init_enter_world_shared(void); s16 update_enter_map_screen_overlay(s16* progress); s16 update_exit_map_screen_overlay(s16* progress); diff --git a/include/script_api/battle.h b/include/script_api/battle.h index c23d6a0859..23d0816602 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -7,6 +7,8 @@ #include "script_api/common.h" #include "battle/action_cmd.h" +#include "effects.h" + ApiStatus EnablePartnerBlur(Evt* script, s32 isInitialCall); ApiStatus DisablePartnerBlur(Evt* script, s32 isInitialCall); ApiStatus UseBattleCamPreset(Evt* script, s32 isInitialCall); @@ -317,30 +319,30 @@ ApiStatus GetAnimatedNodeRotation(Evt* script, s32 isInitialCall); ApiStatus GetAnimatedNodePosition(Evt* script, s32 isInitialCall); ApiStatus DispatchEventPlayer(Evt* script, s32 isInitialCall); -extern EvtScript PlayerScriptDispatcher; -extern EvtScript PeachScriptDispatcher; -extern EvtScript ExecutePlayerAction; -extern EvtScript ExecutePeachAction; -extern EvtScript HandleEvent_Player; +extern EvtScript EVS_Mario_HandlePhase; +extern EvtScript EVS_Peach_HandlePhase; +extern EvtScript EVS_ExecuteMarioAction; +extern EvtScript EVS_ExecutePeachAction; +extern EvtScript EVS_Player_HandleEvent; extern EvtScript BtlPutPartnerAway; extern EvtScript BtlBringPartnerOut; -extern EvtScript MarioEnterStage; -extern EvtScript PeachEnterStage; -extern EvtScript PlayerFirstStrike; -extern EvtScript StartDefend; -extern EvtScript RunAwayStart; -extern EvtScript RunAwayFail; -extern EvtScript RunAwayReset; -extern EvtScript PlayEatFX; -extern EvtScript PlayDrinkFX; -extern EvtScript UseLifeShroom; -extern EvtScript MerleeRunOut; -extern EvtScript MerleeAttackBonus; -extern EvtScript MerleeDefenseBonus; -extern EvtScript MerleeExpBonus; -extern EvtScript PlayerHappy; -extern EvtScript DoDizzyAttack; -extern EvtScript RegainAbility; +extern EvtScript EVS_MarioEnterStage; +extern EvtScript EVS_PeachEnterStage; +extern EvtScript EVS_PlayerFirstStrike; +extern EvtScript EVS_StartDefend; +extern EvtScript EVS_RunAwayStart; +extern EvtScript EVS_RunAwayFail; +extern EvtScript EVS_RunAwayReset; +extern EvtScript EVS_PlayEatFX; +extern EvtScript EVS_PlayDrinkFX; +extern EvtScript EVS_UseLifeShroom; +extern EvtScript EVS_MerleeRunOut; +extern EvtScript EVS_MerleeAttackBonus; +extern EvtScript EVS_MerleeDefenseBonus; +extern EvtScript EVS_MerleeExpBonus; +extern EvtScript EVS_PlayerHappy; +extern EvtScript EVS_ApplyDizzyAttack; +extern EvtScript EVS_PlayerRegainAbility; extern EvtScript UseMystery; extern EvtScript DoSleepHit; extern EvtScript DoDizzyHit; diff --git a/include/script_api/common.h b/include/script_api/common.h index a848b4e106..d41b62a853 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -69,7 +69,7 @@ ApiStatus SetTexPanner(Evt* script, s32 isInitialCall); ApiStatus SetCustomGfxEnabled(Evt* script, s32 isInitialCall); ApiStatus EnableTexPanning(Evt* script, s32 isInitialCall); ApiStatus EnableModel(Evt* script, s32 isInitialCall); -ApiStatus SetGroupEnabled(Evt* script, s32 isInitialCall); +ApiStatus SetGroupVisibility(Evt* script, s32 isInitialCall); ApiStatus SetTexPanOffset(Evt* script, s32 isInitialCall); ApiStatus SetModelFlags(Evt* script, s32 isInitialCall); ApiStatus TranslateGroup(Evt* script, s32 isInitialCall); diff --git a/src/16F740.c b/src/16F740.c index 4e76be9df0..fffdc1412f 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -9,7 +9,7 @@ extern StageListRow* gCurrentStagePtr; extern s16 D_802809F6; -extern s16 D_802809F8; +extern s16 DemoBattleBeginDelay; extern s32 BattleScreenFadeAmt; extern EvtScript EVS_OnBattleInit; extern s32 D_80281454[]; @@ -447,9 +447,9 @@ void btl_state_update_normal_start(void) { if (!(gGameStatusPtr->demoFlags & 1)) { actor = battleStatus->playerActor; if (gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) { - script = start_script(&PeachEnterStage, EVT_PRIORITY_A, 0); + script = start_script(&EVS_PeachEnterStage, EVT_PRIORITY_A, 0); } else { - script = start_script(&MarioEnterStage, EVT_PRIORITY_A, 0); + script = start_script(&EVS_MarioEnterStage, EVT_PRIORITY_A, 0); } actor->takeTurnScript = script; actor->takeTurnScriptID = script->id; @@ -461,7 +461,7 @@ void btl_state_update_normal_start(void) { && is_ability_active(ABILITY_DIZZY_ATTACK) ) { actor = battleStatus->enemyActors[0]; - script = start_script(&DoDizzyAttack, EVT_PRIORITY_A, 0); + script = start_script(&EVS_ApplyDizzyAttack, EVT_PRIORITY_A, 0); actor->takeTurnScript = script; actor->takeTurnScriptID = script->id; script->owner1.enemyID = ACTOR_ENEMY0; @@ -979,7 +979,7 @@ back: if (battleStatus->hammerLossTurns >= 0) { battleStatus->hammerLossTurns--; if (battleStatus->hammerLossTurns == -1) { - script = start_script(&RegainAbility, EVT_PRIORITY_A, 0); + script = start_script(&EVS_PlayerRegainAbility, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PLAYER; @@ -993,7 +993,7 @@ back: if (battleStatus->jumpLossTurns >= 0) { battleStatus->jumpLossTurns--; if (battleStatus->jumpLossTurns == -1) { - script = start_script(&RegainAbility, EVT_PRIORITY_A, 0); + script = start_script(&EVS_PlayerRegainAbility, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PLAYER; @@ -1007,7 +1007,7 @@ back: if (battleStatus->itemLossTurns >= 0) { battleStatus->itemLossTurns--; if (battleStatus->itemLossTurns == -1) { - script = start_script(&RegainAbility, EVT_PRIORITY_A, 0); + script = start_script(&EVS_PlayerRegainAbility, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PLAYER; @@ -1452,7 +1452,7 @@ void btl_state_update_9(void) { battleStatus->merleeDefenseBoost = 3; battleStatus->nextMerleeSpellType = MERLEE_SPELL_0; battleStatus->battlePhase = PHASE_MERLEE_DEFENSE_BONUS; - script = start_script(&PlayerScriptDispatcher, EVT_PRIORITY_A, 0); + script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PLAYER; @@ -1862,7 +1862,7 @@ void btl_state_update_victory(void) { playerData->merleeCastsLeft++; } else { battleStatus->battlePhase = PHASE_MERLEE_EXP_BONUS; - script = start_script(&PlayerScriptDispatcher, EVT_PRIORITY_A, 0); + script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PLAYER; @@ -2163,7 +2163,7 @@ void btl_state_update_defend(void) { case BTL_SUBSTATE_DEFEND_INIT: gBattleStatus.unk_8C = 0; gBattleStatus.battlePhase = PHASE_USE_DEFEND; - player->takeTurnScript = script = start_script(&PlayerScriptDispatcher, EVT_PRIORITY_A, 0); + player->takeTurnScript = script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); player->takeTurnScriptID = script->id; gBattleSubState = BTL_SUBSTATE_DEFEND_AWAIT_SCRIPT; script->owner1.actorID = ACTOR_PLAYER; @@ -2234,7 +2234,7 @@ void btl_state_update_run_away(void) { } battleStatus->battlePhase = PHASE_RUN_AWAY_START; - script = start_script(&PlayerScriptDispatcher, EVT_PRIORITY_A, 0); + script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PLAYER; @@ -2316,7 +2316,7 @@ void btl_state_update_run_away(void) { switch (gBattleSubState) { case BTL_SUBSTATE_RUN_AWAY_EXEC_POST_FAILURE: battleStatus->battlePhase = PHASE_RUN_AWAY_FAIL; - script = start_script(&PlayerScriptDispatcher, EVT_PRIORITY_A, 0); + script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PLAYER; @@ -2379,7 +2379,7 @@ void btl_state_update_defeat(void) { btl_cam_use_preset(BTL_CAM_PRESET_25); btl_cam_target_actor(ACTOR_PLAYER); battleStatus->battlePhase = PHASE_RUN_AWAY_RESET; - script = start_script(&PlayerScriptDispatcher, EVT_PRIORITY_A, 0); + script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PLAYER; @@ -2398,7 +2398,7 @@ void btl_state_update_defeat(void) { } if (find_item(ITEM_LIFE_SHROOM) >= 0) { battleStatus->battlePhase = PHASE_USE_LIFE_SHROOM; - script = start_script(&PlayerScriptDispatcher, EVT_PRIORITY_A, 0); + script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PLAYER; @@ -2623,7 +2623,7 @@ void btl_state_update_player_move(void) { battleStatus->merleeAttackBoost = 3; battleStatus->nextMerleeSpellType = MERLEE_SPELL_0; battleStatus->battlePhase = PHASE_MERLEE_ATTACK_BONUS; - script = start_script(&PlayerScriptDispatcher, EVT_PRIORITY_A, 0); + script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PLAYER; @@ -2675,9 +2675,9 @@ void btl_state_update_player_move(void) { reset_all_actor_sounds(player); battleStatus->battlePhase = PHASE_EXECUTE_ACTION; if (gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) { - script = start_script(&PeachScriptDispatcher, EVT_PRIORITY_A, 0); + script = start_script(&EVS_Peach_HandlePhase, EVT_PRIORITY_A, 0); } else { - script = start_script(&PlayerScriptDispatcher, EVT_PRIORITY_A, 0); + script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); } player->takeTurnScript = script; gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_HANDLE_RESULTS; @@ -2980,7 +2980,7 @@ void btl_state_update_end_player_turn(void) { gBattleSubState = BTL_SUBSTATE_END_PLAYER_TURN_AWAIT_HAPPY; } else { battleStatus->battlePhase = PHASE_PLAYER_HAPPY; - script = start_script(&PlayerScriptDispatcher, EVT_PRIORITY_A, 0); + script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PLAYER; @@ -3859,7 +3859,7 @@ void btl_state_update_first_strike(void) { reset_actor_turn_info(); // begin the partner turn script battleStatus->battlePhase = PHASE_FIRST_STRIKE; - script = start_script(&PlayerScriptDispatcher, EVT_PRIORITY_A, 0); + script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PLAYER; @@ -4370,8 +4370,8 @@ void btl_state_update_end_demo_battle(void) { case BTL_SUBSTATE_END_DEMO_BATTLE_INIT: BattleScreenFadeAmt = 0; if (D_802809F6 == -1) { - if (D_802809F8 != 0) { - D_802809F8--; + if (DemoBattleBeginDelay != 0) { + DemoBattleBeginDelay--; break; } } diff --git a/src/16c8e0.c b/src/16c8e0.c index 40a626cca0..da9467d162 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -10,7 +10,7 @@ f32 D_802809F0 = 0.0f; s8 D_802809F4 = 0; s8 D_802809F5 = 0; s16 D_802809F6 = -1; -s16 D_802809F8 = 0; +s16 DemoBattleBeginDelay = 0; u16 gTattleBgTextureYOffset = 0; BSS s32 bSavedPartner; diff --git a/src/18C790.c b/src/18C790.c index 34510c0005..214bfe0f28 100644 --- a/src/18C790.c +++ b/src/18C790.c @@ -577,7 +577,7 @@ void btl_state_update_celebration(void) { partner->flags &= ~(ACTOR_FLAG_4000000 | ACTOR_FLAG_8000000); } battleStatus->battlePhase = PHASE_CELEBRATE; - script = start_script(&PlayerScriptDispatcher, EVT_PRIORITY_A, 0); + script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnScriptID = script->id; script->owner1.actorID = ACTOR_PLAYER; diff --git a/src/18F340.c b/src/18F340.c index 3a201e17c1..9029738fbd 100644 --- a/src/18F340.c +++ b/src/18F340.c @@ -11,11 +11,12 @@ extern HudScript HES_Happy; extern HudScript HES_HPDrain; -extern EvtScript PlayerCelebrate; +extern EvtScript EVS_PlayerCelebrate; extern EvtScript D_802988F0; extern EvtScript D_80298724; extern EvtScript D_80298948; -ApiStatus func_802749F8(Evt* script, s32 isInitialCall); + +extern PlayerCelebrationAnimOptions D_80280FC0; BSS s32 D_8029FB90; BSS f32 D_8029FB94; @@ -27,6 +28,8 @@ BSS s32 D_8029FBA8; BSS s32 D_8029FBAC; BSS s32 D_8029FBB0[3]; +API_CALLABLE(func_802749F8); + void func_80260A60(void) { BattleStatus* battleStatus = &gBattleStatus; ActorPart* actorPart = &battleStatus->playerActor->partsTable[0]; @@ -39,7 +42,7 @@ void func_80260A60(void) { } } -ApiStatus IsPartnerImmobile(Evt* script, s32 isInitialCall) { +API_CALLABLE(IsPartnerImmobile) { BattleStatus* battleStatus = &gBattleStatus; Actor* playerActor = battleStatus->playerActor; s32 isImmobile = playerActor->debuff == STATUS_FEAR @@ -57,7 +60,7 @@ ApiStatus IsPartnerImmobile(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus activate_defend_command(Evt* script, s32 isInitialCall) { +API_CALLABLE(ActivateDefend) { ActorPart* actorPart = &gBattleStatus.playerActor->partsTable[0]; deduct_current_move_fp(); @@ -67,7 +70,7 @@ ApiStatus activate_defend_command(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80260B70(Evt* script, s32 isInitialCall) { +API_CALLABLE(DoesMarioStatusPreventHappyAnimation) { Actor* player = gBattleStatus.playerActor; func_802667F0(2, player, player->currentPos.x, player->currentPos.y + 20.0f, player->currentPos.z); @@ -80,9 +83,7 @@ ApiStatus func_80260B70(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -extern PlayerCelebrationAnimOptions D_80280FC0; - -ApiStatus ChoosePlayerCelebrationAnim(Evt* script, s32 isInitialCall) { +API_CALLABLE(ChoosePlayerCelebrationAnim) { PlayerCelebrationAnimOptions* pcao = &D_80280FC0; PlayerData* playerData = &gPlayerData; s32 temp; @@ -132,12 +133,12 @@ ApiStatus ChoosePlayerCelebrationAnim(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus SetFledBattleFlag(Evt* script, s32 isInitialCall) { +API_CALLABLE(SetFledBattleFlag) { gBattleStatus.flags1 |= BS_FLAGS1_BATTLE_FLED; return ApiStatus_DONE2; } -ApiStatus func_80260DD8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80260DD8) { Actor* player = gBattleStatus.playerActor; s32 var; @@ -154,20 +155,19 @@ ApiStatus func_80260DD8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80260E38(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80260E38) { btl_show_battle_message(BTL_MSG_31, 60); return ApiStatus_DONE2; } -ApiStatus func_80260E5C(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80260E5C) { gBattleStatus.flags1 &= ~BS_FLAGS1_8000; gBattleStatus.flags1 &= ~BS_FLAGS1_2000; gBattleStatus.flags1 &= ~BS_FLAGS1_4000; return ApiStatus_DONE2; } -#define NAMESPACE base -ApiStatus N(GiveRefund)(Evt* script, s32 isInitialCall) { +API_CALLABLE(GiveRefund) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; s32 sellValue = gItemTable[battleStatus->moveArgument].sellValue; @@ -186,7 +186,7 @@ ApiStatus N(GiveRefund)(Evt* script, s32 isInitialCall) { posX = player->currentPos.x; posZ = player->currentPos.z; - make_item_entity(ITEM_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + make_item_entity(ITEM_COIN, posX, posY, posZ, ITEM_SPAWN_MODE_TOSS_FADE1, (i * 3) + 1, facingAngleSign, 0); add_coins(1); facingAngleSign += 30.0f; } @@ -206,7 +206,7 @@ ApiStatus N(GiveRefund)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(GiveRefundCleanup)(Evt* script, s32 isInitialCall) { +API_CALLABLE(GiveRefundCleanup) { s32 sellValue = gItemTable[gBattleStatus.moveArgument].sellValue; if (player_team_is_ability_active(gBattleStatus.playerActor, ABILITY_REFUND) && sellValue > 0) { @@ -216,7 +216,7 @@ ApiStatus N(GiveRefundCleanup)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802610CC(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802610CC) { if (isInitialCall) { mdl_set_all_fog_mode(FOG_MODE_1); *gBackgroundFogModePtr = FOG_MODE_1; @@ -231,7 +231,7 @@ ApiStatus func_802610CC(Evt* script, s32 isInitialCall) { return (script->functionTemp[0] == 0) * ApiStatus_DONE2; } -ApiStatus func_80261164(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80261164) { if (isInitialCall) { script->functionTemp[0] = 20; btl_cam_unfreeze(); @@ -248,7 +248,7 @@ ApiStatus func_80261164(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus ConsumeLifeShroom(Evt *script, s32 isInitialCall) { +API_CALLABLE(ConsumeLifeShroom) { PlayerData* playerData = &gPlayerData; ItemData* item = &gItemTable[ITEM_LIFE_SHROOM]; @@ -263,7 +263,7 @@ ApiStatus ConsumeLifeShroom(Evt *script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus RestorePreDefeatState(Evt* script, s32 isInitialCall) { +API_CALLABLE(RestorePreDefeatState) { PlayerData* playerData = &gPlayerData; BattleStatus* battleStatus = &gBattleStatus; @@ -288,7 +288,7 @@ ApiStatus RestorePreDefeatState(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80261388(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80261388) { s32 partnerActorExists = gBattleStatus.partnerActor != NULL; script->varTable[0] = FALSE; @@ -298,12 +298,12 @@ ApiStatus func_80261388(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus SetItemAsLifeShroom(Evt* script, s32 isInitialCall) { +API_CALLABLE(SetItemAsLifeShroom) { gBattleStatus.moveArgument = ITEM_LIFE_SHROOM; return ApiStatus_DONE2; } -ApiStatus PlayBattleMerleeGatherFX(Evt* script, s32 isInitialCall) { +API_CALLABLE(PlayBattleMerleeGatherFX) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); @@ -313,7 +313,7 @@ ApiStatus PlayBattleMerleeGatherFX(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus PlayBattleMerleeOrbFX(Evt* script, s32 isInitialCall) { +API_CALLABLE(PlayBattleMerleeOrbFX) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); @@ -323,7 +323,7 @@ ApiStatus PlayBattleMerleeOrbFX(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus BattleMerleeFadeStageToBlack(Evt* script, s32 isInitialCall) { +API_CALLABLE(BattleMerleeFadeStageToBlack) { if (isInitialCall) { mdl_set_all_fog_mode(FOG_MODE_1); *gBackgroundFogModePtr = FOG_MODE_1; @@ -341,7 +341,7 @@ ApiStatus BattleMerleeFadeStageToBlack(Evt* script, s32 isInitialCall) { } } -ApiStatus BattleMerleeFadeStageFromBlack(Evt* script, s32 isInitialCall) { +API_CALLABLE(BattleMerleeFadeStageFromBlack) { if (isInitialCall) { script->functionTemp[0] = 25; } @@ -357,7 +357,7 @@ ApiStatus BattleMerleeFadeStageFromBlack(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus BattleFadeInMerlee(Evt* script, s32 isInitialCall) { +API_CALLABLE(BattleFadeInMerlee) { Npc* merlee = get_npc_unsafe(NPC_BTL_MERLEE); if (isInitialCall) { @@ -374,7 +374,7 @@ ApiStatus BattleFadeInMerlee(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus BattleFadeOutMerlee(Evt* script, s32 isInitialCall) { +API_CALLABLE(BattleFadeOutMerlee) { Npc* merlee = get_npc_unsafe(NPC_BTL_MERLEE); merlee->alpha -= 17; @@ -386,7 +386,7 @@ ApiStatus BattleFadeOutMerlee(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus BattleMerleeUpdateFX(Evt* script, s32 isInitialCall) { +API_CALLABLE(BattleMerleeUpdateFX) { Npc* merlee = get_npc_unsafe(NPC_BTL_MERLEE); EnergyOrbWaveFXData* data; @@ -442,12 +442,12 @@ ApiStatus BattleMerleeUpdateFX(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus func_802619B4(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802619B4) { D_8029FBA4 = 1; return ApiStatus_DONE2; } -ApiStatus HasMerleeCastsLeft(Evt* script, s32 isInitialCall) { +API_CALLABLE(HasMerleeCastsLeft) { PlayerData* playerData = &gPlayerData; script->varTable[0] = FALSE; @@ -457,7 +457,7 @@ ApiStatus HasMerleeCastsLeft(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802619E8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802619E8) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_variable(script, *args++); s32 y = evt_get_variable(script, *args++); @@ -484,7 +484,7 @@ ApiStatus func_802619E8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80261B40(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80261B40) { if (script->varTable[10] > 0) { hud_element_free(D_8029FBAC); } @@ -494,7 +494,7 @@ ApiStatus func_80261B40(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus FXRecoverHP(Evt* script, s32 isInitialCall) { +API_CALLABLE(FXRecoverHP) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); @@ -505,7 +505,7 @@ ApiStatus FXRecoverHP(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus FXRecoverFP(Evt* script, s32 isInitialCall) { +API_CALLABLE(FXRecoverFP) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); @@ -516,7 +516,7 @@ ApiStatus FXRecoverFP(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus IncrementPlayerHP(Evt* script, s32 isInitialCall) { +API_CALLABLE(IncrementPlayerHP) { PlayerData* playerData = &gPlayerData; playerData->curHP++; @@ -526,7 +526,7 @@ ApiStatus IncrementPlayerHP(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus IncrementPlayerFP(Evt* script, s32 isInitialCall) { +API_CALLABLE(IncrementPlayerFP) { PlayerData* playerData = &gPlayerData; playerData->curFP++; @@ -536,13 +536,13 @@ ApiStatus IncrementPlayerFP(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80261D98(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80261D98) { inflict_status_set_duration(get_actor(script->owner1.actorID), 4, 0, 1); btl_update_ko_status(); return ApiStatus_DONE2; } -ApiStatus func_80261DD4(Evt* script, s32 isInitialCall) { +API_CALLABLE(GetLostHammerAndBootsLevel) { PlayerData* playerData = &gPlayerData; script->varTable[11] = playerData->bootsLevel; @@ -550,7 +550,7 @@ ApiStatus func_80261DD4(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80261DF4(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80261DF4) { ItemEntity* item = get_item_entity(script->varTable[10]); if (isInitialCall) { @@ -596,7 +596,7 @@ ApiStatus func_80261DF4(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus func_80261FB4(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80261FB4) { ItemEntity* item = get_item_entity(script->varTable[10]); Actor* player = gBattleStatus.playerActor; s32 ft1; @@ -635,7 +635,7 @@ ApiStatus func_80261FB4(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus func_802620F8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802620F8) { // TODO get type correct s32* temp_v1 = &D_8029FBB0[script->varTable[14]]; @@ -657,7 +657,7 @@ EvtScript EVS_Peach_OnActorCreate = { EVT_END }; -EvtScript MarioEnterStage = { +EvtScript EVS_MarioEnterStage = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_22) EVT_CALL(SetBattleCamTarget, -80, 35, 8) EVT_CALL(BattleCamTargetActor, ACTOR_PLAYER) @@ -699,7 +699,7 @@ EvtScript MarioEnterStage = { EVT_END }; -EvtScript PeachEnterStage = { +EvtScript EVS_PeachEnterStage = { EVT_CALL(func_8026BF48, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_22) EVT_CALL(SetBattleCamTarget, -80, 35, 8) @@ -726,49 +726,49 @@ EvtScript PeachEnterStage = { EVT_END }; -EvtScript PlayerScriptDispatcher = { +EvtScript EVS_Mario_HandlePhase = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(PHASE_EXECUTE_ACTION) - EVT_EXEC_WAIT(ExecutePlayerAction) + EVT_EXEC_WAIT(EVS_ExecuteMarioAction) EVT_CASE_EQ(PHASE_FIRST_STRIKE) - EVT_EXEC_WAIT(PlayerFirstStrike) + EVT_EXEC_WAIT(EVS_PlayerFirstStrike) EVT_CASE_EQ(PHASE_CELEBRATE) - EVT_EXEC_WAIT(PlayerCelebrate) + EVT_EXEC_WAIT(EVS_PlayerCelebrate) EVT_CASE_EQ(PHASE_RUN_AWAY_START) - EVT_EXEC_WAIT(RunAwayStart) + EVT_EXEC_WAIT(EVS_RunAwayStart) EVT_CASE_EQ(PHASE_RUN_AWAY_FAIL) - EVT_EXEC_WAIT(RunAwayFail) + EVT_EXEC_WAIT(EVS_RunAwayFail) EVT_CASE_EQ(PHASE_RUN_AWAY_RESET) - EVT_EXEC_WAIT(RunAwayReset) + EVT_EXEC_WAIT(EVS_RunAwayReset) EVT_CASE_EQ(PHASE_USE_LIFE_SHROOM) - EVT_EXEC_WAIT(UseLifeShroom) + EVT_EXEC_WAIT(EVS_UseLifeShroom) EVT_CASE_EQ(PHASE_USE_DEFEND) - EVT_EXEC_WAIT(StartDefend) + EVT_EXEC_WAIT(EVS_StartDefend) EVT_CASE_EQ(PHASE_MERLEE_ATTACK_BONUS) - EVT_EXEC_WAIT(MerleeAttackBonus) + EVT_EXEC_WAIT(EVS_MerleeAttackBonus) EVT_CASE_EQ(PHASE_MERLEE_DEFENSE_BONUS) - EVT_EXEC_WAIT(MerleeDefenseBonus) + EVT_EXEC_WAIT(EVS_MerleeDefenseBonus) EVT_CASE_EQ(PHASE_MERLEE_EXP_BONUS) - EVT_EXEC_WAIT(MerleeExpBonus) + EVT_EXEC_WAIT(EVS_MerleeExpBonus) EVT_CASE_EQ(PHASE_PLAYER_HAPPY) - EVT_EXEC_WAIT(PlayerHappy) + EVT_EXEC_WAIT(EVS_PlayerHappy) EVT_END_SWITCH EVT_RETURN EVT_END }; -EvtScript PeachScriptDispatcher = { +EvtScript EVS_Peach_HandlePhase = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(PHASE_EXECUTE_ACTION) - EVT_EXEC_WAIT(ExecutePeachAction) + EVT_EXEC_WAIT(EVS_ExecutePeachAction) EVT_END_SWITCH EVT_RETURN EVT_END }; -EvtScript ExecutePlayerAction = { +EvtScript EVS_ExecuteMarioAction = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) @@ -792,7 +792,7 @@ EvtScript ExecutePlayerAction = { EVT_END }; -EvtScript ExecutePeachAction = { +EvtScript EVS_ExecutePeachAction = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar0) @@ -805,7 +805,7 @@ EvtScript ExecutePeachAction = { EVT_END }; -EvtScript PlayerFirstStrike = { +EvtScript EVS_PlayerFirstStrike = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar0) @@ -822,13 +822,13 @@ EvtScript PlayerFirstStrike = { EVT_END }; -EvtScript StartDefend = { - EVT_CALL(activate_defend_command) +EvtScript EVS_StartDefend = { + EVT_CALL(ActivateDefend) EVT_RETURN EVT_END }; -EvtScript HandleEvent_Player = { +EvtScript EVS_Player_HandleEvent = { EVT_CALL(GetLastEvent, ACTOR_PLAYER, LVarF) EVT_SWITCH(LVarF) EVT_CASE_NE(EVENT_32) @@ -951,8 +951,8 @@ EvtScript HandleEvent_Player = { EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_LUCKY) - EVT_CALL(func_80260B70) - EVT_IF_EQ(LVar0, 0) + EVT_CALL(DoesMarioStatusPreventHappyAnimation) + EVT_IF_EQ(LVar0, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30009) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) @@ -1036,7 +1036,7 @@ EvtScript HandleEvent_Player = { EVT_END }; -EvtScript PlayerCelebrate = { +EvtScript EVS_PlayerCelebrate = { EVT_SET(LVar0, 0) EVT_LOOP(5) EVT_ADD(LVar0, 72) @@ -1050,7 +1050,7 @@ EvtScript PlayerCelebrate = { EVT_END }; -EvtScript D_80286228 = { +EvtScript EVS_RunAwayNoCommand = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50000) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15D) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) @@ -1146,11 +1146,11 @@ EvtScript D_80286228 = { EVT_END }; -EvtScript RunAwayStart = { +EvtScript EVS_RunAwayStart = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(GetActionCommandMode, LVar2) EVT_IF_EQ(LVar2, ACTION_COMMAND_MODE_NOT_LEARNED) - EVT_EXEC_WAIT(D_80286228) + EVT_EXEC_WAIT(EVS_RunAwayNoCommand) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_RETURN EVT_END_IF @@ -1260,7 +1260,7 @@ EvtScript RunAwayStart = { EVT_END }; -EvtScript RunAwayFail = { +EvtScript EVS_RunAwayFail = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -1273,7 +1273,7 @@ EvtScript RunAwayFail = { EVT_END }; -EvtScript RunAwayReset = { +EvtScript EVS_RunAwayReset = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30002) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_24) @@ -1338,10 +1338,10 @@ EvtScript D_80287404 = { EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(MakeItemEntity, LVarA, LVar0, LVar1, LVar2, 1, 0) EVT_SET(LVarA, LVar0) - EVT_CALL(base_GiveRefund) + EVT_CALL(GiveRefund) EVT_WAIT(LVar0) EVT_WAIT(15) - EVT_CALL(base_GiveRefundCleanup) + EVT_CALL(GiveRefundCleanup) EVT_CALL(RemoveItemEntity, LVarA) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -1374,10 +1374,10 @@ EvtScript D_80287708 = { EVT_ADD(LVar1, 45) EVT_CALL(MakeItemEntity, LVarA, LVar0, LVar1, LVar2, 1, 0) EVT_SET(LVarE, LVar0) - EVT_CALL(base_GiveRefund) + EVT_CALL(GiveRefund) EVT_WAIT(LVar0) EVT_WAIT(15) - EVT_CALL(base_GiveRefundCleanup) + EVT_CALL(GiveRefundCleanup) EVT_CALL(RemoveItemEntity, LVarE) EVT_RETURN EVT_END @@ -1395,7 +1395,7 @@ EvtScript D_80287834 = { EVT_END }; -EvtScript PlayEatFX = { +EvtScript EVS_PlayEatFX = { EVT_THREAD EVT_LOOP(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095) @@ -1408,7 +1408,7 @@ EvtScript PlayEatFX = { EVT_END }; -EvtScript PlayDrinkFX = { +EvtScript EVS_PlayDrinkFX = { EVT_THREAD EVT_LOOP(4) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095) @@ -1421,7 +1421,7 @@ EvtScript PlayDrinkFX = { EVT_END }; -EvtScript UseLifeShroom = { +EvtScript EVS_UseLifeShroom = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CHILD_THREAD EVT_CALL(func_80261388) @@ -1460,11 +1460,11 @@ EvtScript UseLifeShroom = { EVT_SET(LVar4, LVar1) EVT_SET(LVar5, LVar2) EVT_CALL(SetItemAsLifeShroom) - EVT_CALL(base_GiveRefund) + EVT_CALL(GiveRefund) EVT_IF_GT(LVar0, 0) EVT_WAIT(LVar0) EVT_WAIT(15) - EVT_CALL(base_GiveRefundCleanup) + EVT_CALL(GiveRefundCleanup) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_372) EVT_ADD(LVar4, 15) @@ -1562,7 +1562,7 @@ EvtScript UseLifeShroom = { EVT_END }; -EvtScript MerleeRunOut = { +EvtScript EVS_MerleeRunOut = { EVT_CALL(HasMerleeCastsLeft) EVT_IF_EQ(LVar0, 1) EVT_RETURN @@ -1574,7 +1574,7 @@ EvtScript MerleeRunOut = { EVT_END }; -EvtScript MerleeAttackBonus = { +EvtScript EVS_MerleeAttackBonus = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(BattleMerleeFadeStageToBlack) EVT_WAIT(10) @@ -1584,9 +1584,9 @@ EvtScript MerleeAttackBonus = { EVT_CALL(SetBattleCamZoom, 246) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(10) - EVT_CALL(CreateNpc, -10, ANIM_BattleMerlee_Gather) + EVT_CALL(CreateNpc, NPC_BTL_MERLEE, ANIM_BattleMerlee_Gather) EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) - EVT_CALL(SetNpcRenderMode, -10, 34) + EVT_CALL(SetNpcRenderMode, NPC_BTL_MERLEE, 34) EVT_CALL(SetNpcPos, NPC_BTL_MERLEE, 0, 65, 20) EVT_CHILD_THREAD EVT_CALL(BattleMerleeUpdateFX) @@ -1601,7 +1601,7 @@ EvtScript MerleeAttackBonus = { EVT_WAIT(20) EVT_CHILD_THREAD EVT_CALL(BattleFadeOutMerlee) - EVT_CALL(DeleteNpc, -10) + EVT_CALL(DeleteNpc, NPC_BTL_MERLEE) EVT_END_CHILD_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2075) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -1618,12 +1618,12 @@ EvtScript MerleeAttackBonus = { EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Mario_10002) EVT_CALL(ShowMessageBox, 0, 60) EVT_CALL(WaitForMessageBoxDone) - EVT_EXEC_WAIT(MerleeRunOut) + EVT_EXEC_WAIT(EVS_MerleeRunOut) EVT_RETURN EVT_END }; -EvtScript MerleeDefenseBonus = { +EvtScript EVS_MerleeDefenseBonus = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(BattleMerleeFadeStageToBlack) EVT_WAIT(10) @@ -1633,9 +1633,9 @@ EvtScript MerleeDefenseBonus = { EVT_CALL(SetBattleCamZoom, 246) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(10) - EVT_CALL(CreateNpc, -10, ANIM_BattleMerlee_Gather) + EVT_CALL(CreateNpc, NPC_BTL_MERLEE, ANIM_BattleMerlee_Gather) EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) - EVT_CALL(SetNpcRenderMode, -10, 34) + EVT_CALL(SetNpcRenderMode, NPC_BTL_MERLEE, 34) EVT_CALL(SetNpcPos, NPC_BTL_MERLEE, 0, 65, 20) EVT_CHILD_THREAD EVT_CALL(BattleMerleeUpdateFX) @@ -1650,7 +1650,7 @@ EvtScript MerleeDefenseBonus = { EVT_WAIT(20) EVT_CHILD_THREAD EVT_CALL(BattleFadeOutMerlee) - EVT_CALL(DeleteNpc, -10) + EVT_CALL(DeleteNpc, NPC_BTL_MERLEE) EVT_END_CHILD_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2075) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -1658,7 +1658,7 @@ EvtScript MerleeDefenseBonus = { EVT_CALL(PlayBattleMerleeOrbFX, LVar0, LVar1, LVar2) EVT_WAIT(15) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) - EVT_IF_FLAG(LVar0, 0x0035D000) + EVT_IF_FLAG(LVar0, STATUS_FLAGS_IMMOBILIZED) EVT_WAIT(22) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -1672,12 +1672,12 @@ EvtScript MerleeDefenseBonus = { EVT_END_IF EVT_CALL(ShowMessageBox, 1, 60) EVT_CALL(WaitForMessageBoxDone) - EVT_EXEC_WAIT(MerleeRunOut) + EVT_EXEC_WAIT(EVS_MerleeRunOut) EVT_RETURN EVT_END }; -EvtScript MerleeExpBonus = { +EvtScript EVS_MerleeExpBonus = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(BattleMerleeFadeStageToBlack) EVT_WAIT(10) @@ -1687,9 +1687,9 @@ EvtScript MerleeExpBonus = { EVT_CALL(SetBattleCamZoom, 246) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(10) - EVT_CALL(CreateNpc, -10, ANIM_BattleMerlee_Gather) + EVT_CALL(CreateNpc, NPC_BTL_MERLEE, ANIM_BattleMerlee_Gather) EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) - EVT_CALL(SetNpcRenderMode, -10, 34) + EVT_CALL(SetNpcRenderMode, NPC_BTL_MERLEE, 34) EVT_CALL(SetNpcPos, NPC_BTL_MERLEE, 0, 65, 20) EVT_CHILD_THREAD EVT_CALL(BattleMerleeUpdateFX) @@ -1704,7 +1704,7 @@ EvtScript MerleeExpBonus = { EVT_WAIT(20) EVT_CHILD_THREAD EVT_CALL(BattleFadeOutMerlee) - EVT_CALL(DeleteNpc, -10) + EVT_CALL(DeleteNpc, NPC_BTL_MERLEE) EVT_END_CHILD_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2075) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -1721,12 +1721,12 @@ EvtScript MerleeExpBonus = { EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Mario_10002) EVT_CALL(ShowMessageBox, 2, 60) EVT_CALL(WaitForMessageBoxDone) - EVT_EXEC_WAIT(MerleeRunOut) + EVT_EXEC_WAIT(EVS_MerleeRunOut) EVT_RETURN EVT_END }; -EvtScript PlayerHappy = { +EvtScript EVS_PlayerHappy = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(UseBattleCamPresetWait, BTL_CAM_PRESET_C) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) @@ -1780,7 +1780,7 @@ EvtScript PlayerHappy = { EVT_END }; -EvtScript DoDizzyAttack = { +EvtScript EVS_ApplyDizzyAttack = { EVT_SET(LVar0, 0) EVT_LOOP(40) EVT_ADD(LVar0, 72) @@ -1794,14 +1794,14 @@ EvtScript DoDizzyAttack = { }; -EvtScript RegainAbility = { +EvtScript EVS_PlayerRegainAbility = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVarF, LVar1, LVar2) EVT_LOOP(LVar0) EVT_ADD(LVarF, 3) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(func_80261DD4) + EVT_CALL(GetLostHammerAndBootsLevel) EVT_SWITCH(LVarA) EVT_CASE_EQ(2) EVT_SET(LVarE, 0) diff --git a/src/190B20.c b/src/190B20.c index e478909d8e..b5a41a5960 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -1388,7 +1388,7 @@ void load_partner_actor(void) { PlayerData* playerData = &gPlayerData; BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor; - ActorBlueprint* ActorBlueprint; + ActorBlueprint* actorBP; Evt* takeTurnScript; s32 partCount; s32 currentPartner; @@ -1405,9 +1405,9 @@ void load_partner_actor(void) { if (currentPartner != PARTNER_NONE) { partnerData = &bPartnerDmaTable[currentPartner]; - ActorBlueprint = partnerData->ActorBlueprint; + actorBP = partnerData->ActorBlueprint; - ASSERT(ActorBlueprint != NULL); + ASSERT(actorBP != NULL); nuPiReadRom(partnerData->dmaStart, partnerData->dmaDest, partnerData->dmaEnd - partnerData->dmaStart); if ((gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) || (gGameStatusPtr->demoFlags & 2)) { @@ -1420,28 +1420,28 @@ void load_partner_actor(void) { y = partnerData->y; z = -10.0f; } - partCount = ActorBlueprint->partCount; + partCount = actorBP->partCount; battleStatus->partnerActor = heap_malloc(sizeof(*partnerActor)); partnerActor = battleStatus->partnerActor; ASSERT(partnerActor != NULL); - ActorBlueprint->level = playerData->partners[playerData->currentPartner].level; + actorBP->level = playerData->partners[playerData->currentPartner].level; partnerActor->unk_134 = battleStatus->unk_93++; partnerActor->footStepCounter = 0; - partnerActor->actorBlueprint = ActorBlueprint; - partnerActor->actorType = ActorBlueprint->type; - partnerActor->flags = ActorBlueprint->flags; + partnerActor->actorBlueprint = actorBP; + partnerActor->actorType = actorBP->type; + partnerActor->flags = actorBP->flags; partnerActor->homePos.x = partnerActor->currentPos.x = x; partnerActor->homePos.y = partnerActor->currentPos.y = y; partnerActor->homePos.z = partnerActor->currentPos.z = z; partnerActor->headOffset.x = 0; partnerActor->headOffset.y = 0; partnerActor->headOffset.z = 0; - partnerActor->currentHP = ActorBlueprint->maxHP; + partnerActor->currentHP = actorBP->maxHP; partnerActor->numParts = partCount; partnerActor->idleSource = NULL; - partnerActor->takeTurnSource = ActorBlueprint->takeTurnScript; + partnerActor->takeTurnSource = actorBP->initScript; partnerActor->handleEventSource = NULL; partnerActor->handlePhaseSource = NULL; partnerActor->idleScript = NULL; @@ -1464,8 +1464,8 @@ void load_partner_actor(void) { partnerActor->scaleModifier.y = 1.0f; partnerActor->scaleModifier.z = 1.0f; partnerActor->verticalRenderOffset = 0; - partnerActor->size.x = ActorBlueprint->size.x; - partnerActor->size.y = ActorBlueprint->size.y; + partnerActor->size.x = actorBP->size.x; + partnerActor->size.y = actorBP->size.y; partnerActor->healthBarPosition.x = partnerActor->homePos.x; partnerActor->healthBarPosition.y = partnerActor->homePos.y; partnerActor->healthBarPosition.z = partnerActor->homePos.z; @@ -1479,7 +1479,7 @@ void load_partner_actor(void) { partnerActor->unk_197 = 0; partnerActor->renderMode = RENDER_MODE_ALPHATEST; partnerActor->actorID = ACTOR_PARTNER; - partnerActor->statusTable = ActorBlueprint->statusTable; + partnerActor->statusTable = actorBP->statusTable; partnerActor->debuff = 0; partnerActor->debuffDuration = 0; partnerActor->staticStatus = 0; @@ -1517,7 +1517,7 @@ void load_partner_actor(void) { ASSERT(part != NULL); for (i = 0; i < partCount; i++) { - ActorPartBlueprint* ActorPartBlueprint = &ActorBlueprint->partsData[i]; + ActorPartBlueprint* ActorPartBlueprint = &actorBP->partsData[i]; part->decorationTable = NULL; part->staticData = ActorPartBlueprint; @@ -1687,7 +1687,7 @@ Actor* create_actor(Formation formation) { actor->maxHP = actor->currentHP = formationActor->maxHP; actor->numParts = partCount; actor->idleSource = NULL; - actor->takeTurnSource = formationActor->takeTurnScript; + actor->takeTurnSource = formationActor->initScript; actor->handleEventSource = NULL; actor->handlePhaseSource = NULL; actor->idleScript = NULL; @@ -2956,47 +2956,47 @@ void reset_all_actor_sounds(Actor* actor) { } void hide_foreground_models_unchecked(void) { - Stage* data = gBattleStatus.currentStage; + Stage* stage = gBattleStatus.currentStage; - if (data != NULL && data->foregroundModelList != NULL) { - s32* idList = data->foregroundModelList; - while (*idList != 0) { + if (stage != NULL && stage->foregroundModelList != NULL) { + s32* idList = stage->foregroundModelList; + while (*idList != STAGE_MODEL_LIST_END) { s32 id = *idList++; if (id >= 0) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(id)); - model->flags |= MODEL_FLAG_ENABLED; + model->flags |= MODEL_FLAG_HIDDEN; } } } } void show_foreground_models_unchecked(void) { - Stage* data = gBattleStatus.currentStage; + Stage* stage = gBattleStatus.currentStage; - if (data != NULL && data->foregroundModelList != NULL) { - s32* idList = data->foregroundModelList; - while (*idList != 0) { + if (stage != NULL && stage->foregroundModelList != NULL) { + s32* idList = stage->foregroundModelList; + while (*idList != STAGE_MODEL_LIST_END) { s32 id = *idList++; if (id >= 0) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(id)); - model->flags &= ~MODEL_FLAG_ENABLED; + model->flags &= ~MODEL_FLAG_HIDDEN; } } } } void hide_foreground_models(void) { - Stage* data = gBattleStatus.currentStage; + Stage* stage = gBattleStatus.currentStage; - if (data != NULL && data->foregroundModelList != NULL) { - s32* idList = data->foregroundModelList; - while (*idList != 0) { + if (stage != NULL && stage->foregroundModelList != NULL) { + s32* idList = stage->foregroundModelList; + while (*idList != STAGE_MODEL_LIST_END) { s32 id = *idList++; if (id < 0) { break; } else { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(id)); - model->flags |= MODEL_FLAG_ENABLED; + model->flags |= MODEL_FLAG_HIDDEN; } } @@ -3004,23 +3004,22 @@ void hide_foreground_models(void) { } void show_foreground_models(void) { - Stage* data = gBattleStatus.currentStage; + Stage* stage = gBattleStatus.currentStage; - if (data != NULL && data->foregroundModelList != NULL) { - s32* idList = data->foregroundModelList; - while (*idList != 0) { + if (stage != NULL && stage->foregroundModelList != NULL) { + s32* idList = stage->foregroundModelList; + while (*idList != STAGE_MODEL_LIST_END) { s32 id = *idList++; if (id < 0) { break; } else { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(id)); - model->flags &= ~MODEL_FLAG_ENABLED; + model->flags &= ~MODEL_FLAG_HIDDEN; } } } } - #include "common/StartRumbleWithParams.inc.c" EvtScript D_802939C4 = { diff --git a/src/19FAF0.c b/src/19FAF0.c index 3a839b4bba..9bb94ff769 100644 --- a/src/19FAF0.c +++ b/src/19FAF0.c @@ -139,7 +139,7 @@ void dispatch_event_player(s32 eventType) { oldOnHitScript = player->handleEventScript; oldOnHitID = player->handleEventScriptID; - eventScript = start_script(&HandleEvent_Player, EVT_PRIORITY_A, EVT_FLAG_RUN_IMMEDIATELY); + eventScript = start_script(&EVS_Player_HandleEvent, EVT_PRIORITY_A, EVT_FLAG_RUN_IMMEDIATELY); player->handleEventScript = eventScript; player->handleEventScriptID = eventScript->id; eventScript->owner1.actor = NULL; @@ -165,7 +165,7 @@ void dispatch_event_player_continue_turn(s32 eventType) { oldOnHitScript = player->handleEventScript; oldOnHitID = player->handleEventScriptID; - eventScript = start_script(&HandleEvent_Player, EVT_PRIORITY_A, EVT_FLAG_RUN_IMMEDIATELY); + eventScript = start_script(&EVS_Player_HandleEvent, EVT_PRIORITY_A, EVT_FLAG_RUN_IMMEDIATELY); player->handleEventScript = eventScript; player->handleEventScriptID = eventScript->id; eventScript->owner1.actor = NULL; diff --git a/src/1A5830.c b/src/1A5830.c index 21489b71c0..cd074cce33 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -2680,8 +2680,8 @@ ApiStatus DropStarPoints(Evt* script, s32 isInitialCall) { } for (i = 0; i < numToDrop; i++) { - make_item_entity_delayed(ITEM_STAR_POINT, dropper->currentPos.x, dropper->currentPos.y, - dropper->currentPos.z, spawnMode, i, 0); + make_item_entity_delayed(ITEM_STAR_POINT, + dropper->currentPos.x, dropper->currentPos.y, dropper->currentPos.z, spawnMode, i, 0); } battleStatus->incrementStarPointDelay = 40; diff --git a/src/23680.c b/src/23680.c index 1f437ba9fc..ace796be18 100644 --- a/src/23680.c +++ b/src/23680.c @@ -89,7 +89,8 @@ void spawn_drops(Enemy* enemy) { } if (itemToDrop != ITEM_NONE) { - make_item_entity(itemToDrop, x, y, z, 4, pickupDelay, facingAngleSign + angleMult * 360, 0); + make_item_entity(itemToDrop, x, y, z, ITEM_SPAWN_MODE_BATTLE_REWARD, + pickupDelay, facingAngleSign + angleMult * 360, 0); spawnCounter++; pickupDelay += 2; facingAngleSign += 30.0; @@ -107,7 +108,8 @@ void spawn_drops(Enemy* enemy) { if (encounter->dropWhackaBump) { encounter->dropWhackaBump = FALSE; - make_item_entity(ITEM_WHACKAS_BUMP, x, y, z, 4, pickupDelay, facingAngleSign + angleMult * 360, 0); + make_item_entity(ITEM_WHACKAS_BUMP, x, y, z, ITEM_SPAWN_MODE_BATTLE_REWARD, + pickupDelay, facingAngleSign + angleMult * 360, 0); spawnCounter++; pickupDelay += 2; facingAngleSign += 30.0; @@ -161,7 +163,8 @@ void spawn_drops(Enemy* enemy) { availableShadows -= dropCount; for (i = 0; i < dropCount; i++) { - make_item_entity(itemToDrop, x, y, z, 4, pickupDelay, facingAngleSign + (angleMult * 360), 0); + make_item_entity(itemToDrop, x, y, z, ITEM_SPAWN_MODE_BATTLE_REWARD, + pickupDelay, facingAngleSign + (angleMult * 360), 0); spawnCounter++; pickupDelay += 2; facingAngleSign += 30.0; @@ -215,7 +218,8 @@ void spawn_drops(Enemy* enemy) { availableShadows -= dropCount; for (i = 0; i < dropCount; i++) { - make_item_entity(itemToDrop, x, y, z, 4, pickupDelay, facingAngleSign + (angleMult * 360), 0); + make_item_entity(itemToDrop, x, y, z, ITEM_SPAWN_MODE_BATTLE_REWARD, + pickupDelay, facingAngleSign + (angleMult * 360), 0); spawnCounter++; pickupDelay += 2; facingAngleSign += 30.0; @@ -280,7 +284,8 @@ void spawn_drops(Enemy* enemy) { } for (i = 0; i < dropCount; i++) { - make_item_entity(itemToDrop, x, y, z, 4, pickupDelay, facingAngleSign + (angleMult * 360), 0); + make_item_entity(itemToDrop, x, y, z, ITEM_SPAWN_MODE_BATTLE_REWARD, + pickupDelay, facingAngleSign + (angleMult * 360), 0); spawnCounter++; pickupDelay += 2; facingAngleSign = facingAngleSign + 30.0; diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index d5afa5f884..c2c688db49 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -4380,7 +4380,7 @@ void render_models(void) { if (model->flags & MODEL_FLAG_FLAG_4) { continue; } - if (model->flags & MODEL_FLAG_ENABLED) { + if (model->flags & MODEL_FLAG_HIDDEN) { continue; } if (model->flags & MODEL_FLAG_FLAG_20) { @@ -4592,7 +4592,7 @@ void render_transform_group_node(ModelNode* node) { if (groupTypeProp != NULL && groupTypeProp->data.s != 0) { model = get_model_from_list_index(mdl_currentTransformGroupChildIndex); - if (!(model->flags & MODEL_FLAG_ENABLED)) { + if (!(model->flags & MODEL_FLAG_HIDDEN)) { appendGfx_model_group(model); } mdl_currentTransformGroupChildIndex++; @@ -4624,7 +4624,7 @@ void render_transform_group_node(ModelNode* node) { } model = get_model_from_list_index(mdl_currentTransformGroupChildIndex); - if (!(model->flags & MODEL_FLAG_ENABLED)) { + if (!(model->flags & MODEL_FLAG_HIDDEN)) { appendGfx_model(model); } mdl_currentTransformGroupChildIndex++; @@ -5220,14 +5220,14 @@ void clone_model(u16 srcModelID, u16 newModelID) { newModel->modelID = newModelID; } -void set_model_flags(u16 treeIndex, s32 flags, s32 mode) { +void set_model_group_visibility(u16 treeIndex, s32 flags, s32 mode) { s32 maxGroupIndex = -1; s32 minGroupIndex; s32 modelIndex = (*mdl_currentModelTreeNodeInfo)[treeIndex].modelIndex; s32 siblingIndex; s32 i; - if (modelIndex < 255) { + if (modelIndex < MAX_MODELS - 1) { minGroupIndex = maxGroupIndex = modelIndex; } else { s32 treeDepth = (*mdl_currentModelTreeNodeInfo)[treeIndex].treeDepth; @@ -5238,7 +5238,7 @@ void set_model_flags(u16 treeIndex, s32 flags, s32 mode) { siblingIndex = (*mdl_currentModelTreeNodeInfo)[i].modelIndex; - if (siblingIndex < 255) { + if (siblingIndex < MAX_MODELS - 1) { if (maxGroupIndex == -1) { maxGroupIndex = siblingIndex; } @@ -5250,7 +5250,7 @@ void set_model_flags(u16 treeIndex, s32 flags, s32 mode) { if (mode < 2) { for (i = minGroupIndex; i <= maxGroupIndex; i++) { Model* model = (*gCurrentModels)[i]; - if (mode != 0) { + if (mode != MODEL_GROUP_HIDDEN) { model->flags &= ~flags; } else { model->flags |= flags; @@ -5259,16 +5259,16 @@ void set_model_flags(u16 treeIndex, s32 flags, s32 mode) { } else { for (i = 0; i < minGroupIndex; i++) { Model* model = (*gCurrentModels)[i]; - if (mode == 3) { + if (mode == MODEL_GROUP_OTHERS_VISIBLE) { model->flags &= ~flags; } else { model->flags |= flags; } } - for (i = maxGroupIndex + 1; i < 256; i++) { + for (i = maxGroupIndex + 1; i < MAX_MODELS; i++) { Model* model = (*gCurrentModels)[i]; if (model != NULL) { - if (mode == 3) { + if (mode == MODEL_GROUP_OTHERS_VISIBLE) { model->flags &= ~flags; } else { model->flags |= flags; @@ -5286,7 +5286,7 @@ void func_8011B950(u16 treeIndex, s32 customGfxIndex, s32 fogType, s32 arg3) { s32 siblingIndex; s32 maskLow, maskHigh, newIndex; - if (modelIndex < 255) { + if (modelIndex < MAX_MODELS - 1) { minGroupIndex = maxGroupIndex = modelIndex; } else { s32 treeDepth = (*mdl_currentModelTreeNodeInfo)[treeIndex].treeDepth; @@ -5297,7 +5297,7 @@ void func_8011B950(u16 treeIndex, s32 customGfxIndex, s32 fogType, s32 arg3) { siblingIndex = (*mdl_currentModelTreeNodeInfo)[i].modelIndex; - if (siblingIndex < 255) { + if (siblingIndex < MAX_MODELS - 1) { if (maxGroupIndex == -1) { maxGroupIndex = siblingIndex; } @@ -5330,7 +5330,7 @@ void func_8011B950(u16 treeIndex, s32 customGfxIndex, s32 fogType, s32 arg3) { Model* model = (*gCurrentModels)[i]; model->customGfxIndex = (model->customGfxIndex & (maskLow + maskHigh)) + newIndex; } - for (i = maxGroupIndex + 1; i < 256; i++) { + for (i = maxGroupIndex + 1; i < MAX_MODELS; i++) { Model* model = (*gCurrentModels)[i]; if (model != NULL) { model->customGfxIndex = (model->customGfxIndex & (maskLow + maskHigh)) + newIndex; @@ -5651,7 +5651,7 @@ void mdl_make_local_vertex_copy(s32 copyIndex, u16 modelID, s32 isMakingCopy) { copy->gfxCopy[i] = NULL; copy->vtxCopy[i] = NULL; } - model->flags |= MODEL_FLAG_ENABLED; + model->flags |= MODEL_FLAG_HIDDEN; } copy->selector = 0; diff --git a/src/battle/area/arn/actor/hyper_cleft.c b/src/battle/area/arn/actor/hyper_cleft.c index 5308dc71c8..a0e3437eca 100644 --- a/src/battle/area/arn/actor/hyper_cleft.c +++ b/src/battle/area/arn/actor/hyper_cleft.c @@ -7,7 +7,7 @@ #define NAMESPACE b_area_arn_hyper_cleft extern s32 N(idleAnimations_80221CD4)[]; -extern EvtScript N(init_80220CAC); +extern EvtScript N(EVS_Init); extern EvtScript N(idle_80221DD0); extern EvtScript N(handleEvent_80222140); extern EvtScript N(takeTurn_80221A58); @@ -28,7 +28,7 @@ s32 N(defenseTable_80220B54)[] = { ELEMENT_END, }; -s32 N(statusTable_80220B68)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 40, @@ -53,7 +53,7 @@ s32 N(statusTable_80220B68)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80220C14)[] = { +ActorPartBlueprint N(ActorParts)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -73,10 +73,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_HYPER_CLEFT, .level = 15, .maxHP = 4, - .partCount = ARRAY_COUNT(N(partsTable_80220C14)), - .partsData = N(partsTable_80220C14), - .takeTurnScript = &N(init_80220CAC), - .statusTable = N(statusTable_80220B68), + .partCount = ARRAY_COUNT(N(ActorParts)), + .partsData = N(ActorParts), + .initScript = &N(EVS_Init), + .statusTable = N(StatusTable), .escapeChance = 70, .airLiftChance = 30, .hurricaneChance = 30, @@ -104,7 +104,7 @@ s32 N(idleAnimations_80220C60)[] = { STATUS_END, }; -EvtScript N(init_80220CAC) = { +EvtScript N(EVS_Init) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80221DD0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80222140))) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80221A58))) @@ -143,7 +143,7 @@ EvtScript N(80220DC0) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Hyper_Anim04) EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -154,17 +154,17 @@ EvtScript N(80220DC0) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 200, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.5)) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2D9) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0, 0) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(SetActorVar, ACTOR_SELF, 0, 2) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220C60))) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, TRUE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -181,7 +181,7 @@ EvtScript N(80220DC0) = { EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DA) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -207,7 +207,7 @@ EvtScript N(80220DC0) = { EVT_THREAD EVT_LOOP(30) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -218,11 +218,11 @@ EvtScript N(80220DC0) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(15) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(YieldTurn) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetActorPos, ACTOR_SELF, 300, 0, 0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Hyper_Anim07) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -239,7 +239,7 @@ EvtScript N(80220DC0) = { EVT_THREAD EVT_LOOP(25) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -280,7 +280,7 @@ EvtScript N(80220DC0) = { EVT_WAIT(20) EVT_CALL(YieldTurn) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Hyper_Anim07) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -411,9 +411,9 @@ EvtScript N(80221DE0) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 200, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 40, 8, EVT_FLOAT(0.0), 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 40, 8, EVT_FLOAT(0.0), 20, 0) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) @@ -422,13 +422,13 @@ EvtScript N(80221DE0) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80220B54))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 15) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -7) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(N(SetSpinSmashable), 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_RETURN EVT_END }; @@ -461,7 +461,7 @@ EvtScript N(handleEvent_80222140) = { EVT_CASE_FLAG(DAMAGE_TYPE_BLAST) EVT_EXEC_WAIT(N(80221DE0)) EVT_CASE_DEFAULT - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_SET_CONST(LVar0, 1) @@ -474,7 +474,7 @@ EvtScript N(handleEvent_80222140) = { EVT_SET_CONST(LVar2, -1) EVT_EXEC_WAIT(DoBurnHit) EVT_END_IF - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, FALSE) EVT_END_SWITCH EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) @@ -527,7 +527,7 @@ EvtScript N(handleEvent_80222140) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80221CD4))) EVT_SET_CONST(LVar0, 1) @@ -546,7 +546,7 @@ EvtScript N(handleEvent_80222140) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80221CD4))) EVT_SET_CONST(LVar0, 1) @@ -562,7 +562,7 @@ EvtScript N(handleEvent_80222140) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80221CD4))) EVT_END_IF @@ -589,7 +589,7 @@ EvtScript N(handleEvent_80222140) = { EVT_ADD(LVar0, -8) EVT_ADD(LVar1, 27) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) @@ -669,7 +669,7 @@ EvtScript N(handleEvent_80222140) = { EvtScript N(80222F1C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Hyper_Anim03) EVT_WAIT(20) @@ -698,7 +698,7 @@ EvtScript N(80222F1C) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 200, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) @@ -709,10 +709,10 @@ EvtScript N(80222F1C) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80220B40))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 22) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -10) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_WAIT(1) EVT_CALL(N(SetSpinSmashable), 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, FALSE) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -731,11 +731,11 @@ EvtScript N(80223310) = { EVT_CALL(MoveBattleCamOver, 30) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(10) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Hyper_Anim10) EVT_WAIT(10) @@ -748,7 +748,7 @@ EvtScript N(80223310) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Hyper_Anim00) EVT_WAIT(8) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -777,7 +777,7 @@ EvtScript N(80223310) = { EVT_CALL(YieldTurn) EVT_CALL(SetPartRotation, ACTOR_SELF, 1, 0, 0, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Hyper_Anim07) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) diff --git a/src/battle/area/arn/actor/hyper_paragoomba.c b/src/battle/area/arn/actor/hyper_paragoomba.c index 7a8ae4962b..7c5d8fbd01 100644 --- a/src/battle/area/arn/actor/hyper_paragoomba.c +++ b/src/battle/area/arn/actor/hyper_paragoomba.c @@ -144,7 +144,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(partsTable_8021B460)), .partsData = N(partsTable_8021B460), - .takeTurnScript = &N(init_8021B564), + .initScript = &N(init_8021B564), .statusTable = N(statusTable_8021B3B4), .escapeChance = 50, .airLiftChance = 95, @@ -210,7 +210,7 @@ EvtScript N(8021B678) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Miss) EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -222,7 +222,7 @@ EvtScript N(8021B678) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021B518))) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, TRUE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -239,7 +239,7 @@ EvtScript N(8021B678) = { EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -247,7 +247,7 @@ EvtScript N(8021B678) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -285,7 +285,7 @@ EvtScript N(8021B678) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, FALSE) EVT_THREAD EVT_SET(LVar0, 0) EVT_LOOP(30) @@ -301,12 +301,12 @@ EvtScript N(8021B678) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(AddGoalPos, ACTOR_SELF, 30, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 2, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) @@ -352,7 +352,7 @@ EvtScript N(8021B678) = { EVT_WAIT(20) EVT_CALL(YieldTurn) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Run) EVT_EXEC_WAIT(N(8021C94C)) @@ -473,7 +473,7 @@ EvtScript N(idle_8021C690) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C5E0))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -487,7 +487,7 @@ EvtScript N(idle_8021C690) = { EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C594))) EVT_LOOP(40) EVT_LABEL(2) @@ -507,7 +507,7 @@ EvtScript N(8021C94C) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Idle) EVT_RETURN EVT_END @@ -560,7 +560,7 @@ EvtScript N(handleEvent_8021C9C4) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C594))) EVT_SET_CONST(LVar0, 2) @@ -575,7 +575,7 @@ EvtScript N(handleEvent_8021C9C4) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C594))) EVT_SET_CONST(LVar0, 2) @@ -591,7 +591,7 @@ EvtScript N(handleEvent_8021C9C4) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C594))) EVT_END_IF @@ -626,7 +626,7 @@ EvtScript N(handleEvent_8021C9C4) = { EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hyper_Idle) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hyper_Run) EVT_SET_CONST(LVar2, ANIM_Paragoomba_Hyper_Hurt) @@ -661,7 +661,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -673,7 +673,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Dive) @@ -681,14 +681,14 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) EVT_SET(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_THREAD EVT_LOOP(4) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DF) @@ -696,7 +696,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Miss) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 2, EVT_FLOAT(3.0)) EVT_WAIT(10) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) @@ -723,7 +723,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Dive) @@ -731,11 +731,11 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_END_SWITCH EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) @@ -747,7 +747,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(5) EVT_CALL(YieldTurn) @@ -780,7 +780,7 @@ EvtScript N(8021D9F4) = { EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Hurt) EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 769, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) @@ -788,42 +788,42 @@ EvtScript N(8021D9F4) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 100, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.3)) EVT_END_THREAD - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar3) EVT_IF_EQ(LVar3, EVENT_15) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Hurt) EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar4, 10) EVT_ADD(LVar5, 5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0) EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_LOOP(10) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(GetIndexFromHome, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) EVT_CALL(SetGoalToIndex, ACTOR_SELF, LVar0) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Idle) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021B308))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_HYPER_GOOMBA) EVT_EXEC_WAIT(N(8021E058)) - 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_RETURN @@ -865,8 +865,8 @@ EvtScript N(8021E058) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CASE_EQ(1) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 1) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, TRUE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, FALSE) EVT_END_SWITCH EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, 1, LVar0) @@ -901,7 +901,7 @@ EvtScript N(8021E218) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Run) EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -913,13 +913,13 @@ EvtScript N(8021E218) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DD) EVT_CALL(N(StartRumbleWithParams), 128, 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(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021DF7C))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Idle) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, TRUE) EVT_WAIT(2) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -959,7 +959,7 @@ EvtScript N(8021E218) = { EVT_END_THREAD EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 80) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 271, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_10F, 0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -200, 0, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.01)) @@ -972,10 +972,10 @@ EvtScript N(8021E218) = { EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_WAIT(20) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(YieldTurn) EVT_CALL(SetActorPos, ACTOR_SELF, 300, 0, 0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Run) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) @@ -989,7 +989,7 @@ EvtScript N(8021E218) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 271, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_10F, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 80) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -1028,7 +1028,7 @@ EvtScript N(8021E218) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_WAIT(10) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Run) @@ -1217,7 +1217,7 @@ EvtScript N(handleEvent_8021F41C) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021F05C))) EVT_SET_CONST(LVar0, 1) @@ -1241,7 +1241,7 @@ EvtScript N(handleEvent_8021F41C) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021F05C))) EVT_SET_CONST(LVar0, 1) @@ -1257,7 +1257,7 @@ EvtScript N(handleEvent_8021F41C) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021F05C))) EVT_END_IF @@ -1406,7 +1406,7 @@ EvtScript N(takeTurn_8021FE6C) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) diff --git a/src/battle/area/arn/actor/hypergoomba.c b/src/battle/area/arn/actor/hypergoomba.c index f73841bdfd..f340b4d89e 100644 --- a/src/battle/area/arn/actor/hypergoomba.c +++ b/src/battle/area/arn/actor/hypergoomba.c @@ -66,7 +66,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(partsTable_80218828)), .partsData = N(partsTable_80218828), - .takeTurnScript = &N(init_802188C0), + .initScript = &N(init_802188C0), .statusTable = N(statusTable_8021877C), .escapeChance = 60, .airLiftChance = 90, @@ -135,7 +135,7 @@ EvtScript N(802189D4) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Run) EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -147,13 +147,13 @@ EvtScript N(802189D4) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DD) EVT_CALL(N(StartRumbleWithParams), 128, 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(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218874))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Idle) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, TRUE) EVT_WAIT(2) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -193,7 +193,7 @@ EvtScript N(802189D4) = { EVT_END_THREAD EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 80) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 271, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_10F, 0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -200, 0, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.01)) @@ -206,10 +206,10 @@ EvtScript N(802189D4) = { EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_WAIT(20) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(YieldTurn) EVT_CALL(SetActorPos, ACTOR_SELF, 300, 0, 0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Run) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) @@ -223,7 +223,7 @@ EvtScript N(802189D4) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 271, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_10F, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 80) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -262,7 +262,7 @@ EvtScript N(802189D4) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_WAIT(10) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Run) @@ -451,7 +451,7 @@ EvtScript N(handleEvent_80219BD8) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219818))) EVT_SET_CONST(LVar0, 1) @@ -475,7 +475,7 @@ EvtScript N(handleEvent_80219BD8) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219818))) EVT_SET_CONST(LVar0, 1) @@ -491,7 +491,7 @@ EvtScript N(handleEvent_80219BD8) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219818))) EVT_END_IF @@ -640,7 +640,7 @@ EvtScript N(takeTurn_8021A628) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) diff --git a/src/battle/area/arn/actor/tubba_blubba.c b/src/battle/area/arn/actor/tubba_blubba.c index 1bde11340c..452bde1cfb 100644 --- a/src/battle/area/arn/actor/tubba_blubba.c +++ b/src/battle/area/arn/actor/tubba_blubba.c @@ -81,7 +81,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 10, .partCount = ARRAY_COUNT(N(partsTable_80225D4C)), .partsData = N(partsTable_80225D4C), - .takeTurnScript = &N(init_80225D98), + .initScript = &N(init_80225D98), .statusTable = N(statusTable_80225CA0), .escapeChance = 0, .airLiftChance = 0, @@ -128,7 +128,7 @@ EvtScript N(80225E08) = { EVT_GOTO(0) EVT_LABEL(1) EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN @@ -291,10 +291,10 @@ EvtScript N(80226558) = { EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0, 0) EVT_THREAD EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(15.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(15.0)) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) EVT_END_IF @@ -303,7 +303,7 @@ EvtScript N(80226558) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 0, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 0, LVar0, 0, LVar2, 0) EVT_WAIT(30) EVT_SET(LVar1, 7012353) EVT_EXEC_WAIT(N(80225F8C)) @@ -321,7 +321,7 @@ EvtScript N(80226558) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 1, LVar0, 0, LVar2, 0) EVT_END_IF EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -367,7 +367,7 @@ EvtScript N(80226B88) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim0A) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim0B) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 999, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_3E7, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -386,17 +386,17 @@ EvtScript N(80226B88) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 23, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 0, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 0, LVar0, 0, LVar2, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim0D) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_END_THREAD - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_SET(LVar1, 0) @@ -405,9 +405,9 @@ EvtScript N(80226B88) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -461,17 +461,17 @@ EvtScript N(80226B88) = { EVT_END_IF EVT_LABEL(0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 0, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 0, LVar0, 0, LVar2, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim0D) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_END_THREAD - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_SET(LVar1, 0) @@ -480,18 +480,18 @@ EvtScript N(80226B88) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_GOTO(2) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_WAIT(3) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 1, LVar0, 0, LVar2, 0) EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_END_IF EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) @@ -505,9 +505,9 @@ EvtScript N(80226B88) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_WAIT(8) EVT_END_IF EVT_LABEL(2) diff --git a/src/battle/area/arn/actor/tubbas_heart.c b/src/battle/area/arn/actor/tubbas_heart.c index 227e366f41..eb182aef47 100644 --- a/src/battle/area/arn/actor/tubbas_heart.c +++ b/src/battle/area/arn/actor/tubbas_heart.c @@ -111,7 +111,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 50, .partCount = ARRAY_COUNT(N(partsTable_80223D30)), .partsData = N(partsTable_80223D30), - .takeTurnScript = &N(init_80223DA0), + .initScript = &N(init_80223DA0), .statusTable = N(statusTable_80223C84), .escapeChance = 0, .airLiftChance = 0, @@ -137,7 +137,7 @@ EvtScript N(init_80223DA0) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_802245C8))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80223E98))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80224038))) - EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 2, 2, 1) + EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 2, 2, TRUE) EVT_RETURN EVT_END }; @@ -278,8 +278,8 @@ EvtScript N(80224414) = { EVT_CALL(ActorSpeak, MSG_CH3_00C6, ACTOR_SELF, 1, ANIM_TubbasHeart_Anim0D, ANIM_TubbasHeart_Anim0D) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 25) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, 1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, TRUE) EVT_CALL(func_8026F60C, 20) EVT_RETURN EVT_END @@ -500,8 +500,8 @@ EvtScript N(80225258) = { EVT_ADD(LVar1, 6) EVT_SETF(LVar3, EVT_FLOAT(0.4)) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 1, LVar0, LVar1, LVar2, LVar3, 60, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, LVar3, 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 1, LVar0, LVar1, LVar2, LVar3, 60, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, LVar3, 60, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F7) EVT_WAIT(60) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -520,7 +520,7 @@ EvtScript N(80225258) = { EVT_ADD(LVar1, 6) EVT_SETF(LVar3, EVT_FLOAT(0.4)) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 3, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 3, LVar0, LVar1, LVar2, LVar3, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 4, LVarF) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80223C1C))) @@ -545,7 +545,7 @@ EvtScript N(802255D8) = { EVT_ELSE EVT_ADD(LVar1, 6) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0) EVT_WAIT(60) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) @@ -566,7 +566,7 @@ EvtScript N(802255D8) = { EVT_CALL(SetActorVar, ACTOR_SELF, 4, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80223BC0))) EVT_END_IF - EVT_CALL(PlaySound, 0x20F9) + EVT_CALL(PlaySound, SOUND_20F9) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarA) @@ -574,7 +574,7 @@ EvtScript N(802255D8) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 5) - EVT_CALL(PlayEffect, EFFECT_TUBBA_HEART_ATTACK, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 200, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_TUBBA_HEART_ATTACK, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 200, 0) EVT_WAIT(145) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -585,10 +585,10 @@ EvtScript N(802255D8) = { EVT_END_SWITCH EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 5) - EVT_CALL(PlayEffect, EFFECT_TUBBA_HEART_ATTACK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 200, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_TUBBA_HEART_ATTACK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 200, 0) EVT_THREAD EVT_WAIT(160) - EVT_CALL(PlaySound, 0x20FC) + EVT_CALL(PlaySound, SOUND_20FC) EVT_END_THREAD EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002B) @@ -600,14 +600,14 @@ EvtScript N(802255D8) = { EVT_CALL(SetBattleCamOffsetZ, 35) EVT_CALL(MoveBattleCamOver, 50) EVT_WAIT(56) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x3DB) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03000C) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3DB) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000C) EVT_WAIT(37) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x3DB) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3DB) EVT_WAIT(22) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x20FB) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_20FB) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/area/arn/stage/arn_01.c b/src/battle/area/arn/stage/arn_01.c index 6ba4425bc5..22b6d0872b 100644 --- a/src/battle/area/arn/stage/arn_01.c +++ b/src/battle/area/arn/stage/arn_01.c @@ -4,19 +4,21 @@ #define NAMESPACE b_area_arn_arn_01 -EvtScript N(beforeBattle_802278F0) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80227910) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80227920)[] = { - -1, MODEL_iwa4, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_iwa4, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -24,7 +26,7 @@ Stage NAMESPACE = { .shape = "arn_bt01_shape", .hit = "arn_bt01_hit", .bg = "arn_bg", - .preBattle = &N(beforeBattle_802278F0), - .postBattle = &N(afterBattle_80227910), - .foregroundModelList = N(foregroundModelList_80227920), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/arn/stage/arn_02.c b/src/battle/area/arn/stage/arn_02.c index 42692f838e..ab0da44497 100644 --- a/src/battle/area/arn/stage/arn_02.c +++ b/src/battle/area/arn/stage/arn_02.c @@ -4,36 +4,38 @@ #define NAMESPACE b_area_arn_arn_02 -EvtScript N(80227960) = { +EvtScript N(EVS_RotateWindmill) = { EVT_SET(LVarA, LVar0) EVT_SET(LVar0, 0) EVT_LABEL(0) - EVT_ADD(LVar0, 1) - EVT_IF_GT(LVar0, 359) - EVT_SUB(LVar0, 360) - EVT_END_IF - EVT_CALL(RotateModel, LVarA, LVar0, 0, 0, 1) - EVT_WAIT(1) - EVT_GOTO(0) + EVT_ADD(LVar0, 1) + EVT_IF_GT(LVar0, 359) + EVT_SUB(LVar0, 360) + EVT_END_IF + EVT_CALL(RotateModel, LVarA, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_GOTO(0) EVT_RETURN EVT_END }; -EvtScript N(beforeBattle_80227A0C) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SET(LVar0, 8) - EVT_EXEC_WAIT(N(80227960)) + EVT_SET(LVar0, MODEL_o332) + EVT_EXEC_WAIT(N(EVS_RotateWindmill)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80227A48) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80227A58)[] = { - -1, MODEL_iwa4, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_iwa4, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -41,7 +43,7 @@ Stage NAMESPACE = { .shape = "arn_bt02_shape", .hit = "arn_bt02_hit", .bg = "arn_bg", - .preBattle = &N(beforeBattle_80227A0C), - .postBattle = &N(afterBattle_80227A48), - .foregroundModelList = N(foregroundModelList_80227A58), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/arn/stage/arn_03.c b/src/battle/area/arn/stage/arn_03.c index 4e6d510f74..5b6b7a2214 100644 --- a/src/battle/area/arn/stage/arn_03.c +++ b/src/battle/area/arn/stage/arn_03.c @@ -4,19 +4,21 @@ #define NAMESPACE b_area_arn_arn_03 -EvtScript N(beforeBattle_80227A90) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80227AB0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80227AC0)[] = { - -1, MODEL_iwa4, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_iwa4, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -24,7 +26,7 @@ Stage NAMESPACE = { .shape = "arn_bt03_shape", .hit = "arn_bt03_hit", .bg = "arn_bg", - .preBattle = &N(beforeBattle_80227A90), - .postBattle = &N(afterBattle_80227AB0), - .foregroundModelList = N(foregroundModelList_80227AC0), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/arn/stage/arn_04.c b/src/battle/area/arn/stage/arn_04.c index 30f2438345..5a2f5762b6 100644 --- a/src/battle/area/arn/stage/arn_04.c +++ b/src/battle/area/arn/stage/arn_04.c @@ -4,27 +4,28 @@ #define NAMESPACE b_area_arn_arn_04 -EvtScript N(beforeBattle_80227B00) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80227B3C) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80227B4C)[] = { - MODEL_o349, 0, +s32 N(ForegroundModels)[] = { + MODEL_o349, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "arn_tex", .shape = "arn_bt04_shape", .hit = "arn_bt04_hit", - .preBattle = &N(beforeBattle_80227B00), - .postBattle = &N(afterBattle_80227B3C), - .foregroundModelList = N(foregroundModelList_80227B4C), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/arn/stage/arn_05.c b/src/battle/area/arn/stage/arn_05.c index 1efe8ae008..e9a7517cda 100644 --- a/src/battle/area/arn/stage/arn_05.c +++ b/src/battle/area/arn/stage/arn_05.c @@ -4,27 +4,28 @@ #define NAMESPACE b_area_arn_arn_05 -EvtScript N(beforeBattle_80227B80) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80227BBC) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80227BCC)[] = { - MODEL_o354, 0, +s32 N(ForegroundModels)[] = { + MODEL_o354, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "arn_tex", .shape = "arn_bt05_shape", .hit = "arn_bt05_hit", - .preBattle = &N(beforeBattle_80227B80), - .postBattle = &N(afterBattle_80227BBC), - .foregroundModelList = N(foregroundModelList_80227BCC), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/arn/stage/arn_06.c b/src/battle/area/arn/stage/arn_06.c index 3aede165d4..4636b095c0 100644 --- a/src/battle/area/arn/stage/arn_06.c +++ b/src/battle/area/arn/stage/arn_06.c @@ -4,26 +4,27 @@ #define NAMESPACE b_area_arn_arn_06 -EvtScript N(beforeBattle_80227C00) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80227C20) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80227C30)[] = { - MODEL_kabe3, 0, +s32 N(ForegroundModels)[] = { + MODEL_kabe3, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "arn_tex", .shape = "arn_bt06_shape", .hit = "arn_bt06_hit", - .preBattle = &N(beforeBattle_80227C00), - .postBattle = &N(afterBattle_80227C20), - .foregroundModelList = N(foregroundModelList_80227C30), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/dgb/actor/tubba_blubba.c b/src/battle/area/dgb/actor/tubba_blubba.c index 8a1a63e8cf..1a6bc1fa27 100644 --- a/src/battle/area/dgb/actor/tubba_blubba.c +++ b/src/battle/area/dgb/actor/tubba_blubba.c @@ -6,7 +6,7 @@ #define NAMESPACE b_area_dgb_tubba_blubba -extern EvtScript N(init_80218D70); +extern EvtScript N(EVS_Init); extern EvtScript N(takeTurn_80219750); extern EvtScript N(idle_80219204); extern EvtScript N(handleEvent_80219338); @@ -15,7 +15,7 @@ extern EvtScript N(80218E60); extern EvtScript N(80219D88); extern EvtScript N(8021A36C); -s32 N(idleAnimations_80218C10)[] = { +s32 N(IdleAnims)[] = { STATUS_NORMAL, ANIM_BattleTubba_Anim02, STATUS_STONE, ANIM_BattleTubba_Anim00, STATUS_SLEEP, ANIM_BattleTubba_Anim00, @@ -30,12 +30,12 @@ s32 N(idleAnimations_80218C10)[] = { STATUS_END, }; -s32 N(defenseTable_80218C6C)[] = { - ELEMENT_NORMAL, 99, +s32 N(DefenseTable)[] = { + ELEMENT_NORMAL, 99, ELEMENT_END, }; -s32 N(statusTable_80218C78)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -60,15 +60,15 @@ s32 N(statusTable_80218C78)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80218D24)[] = { +ActorPartBlueprint N(ActorParts)[] = { { .flags = ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -15, 75 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218C10), - .defenseTable = N(defenseTable_80218C6C), + .idleAnimations = N(IdleAnims), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -80,10 +80,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_TUBBA_BLUBBA, .level = 0, .maxHP = 10, - .partCount = ARRAY_COUNT(N(partsTable_80218D24)), - .partsData = N(partsTable_80218D24), - .takeTurnScript = &N(init_80218D70), - .statusTable = N(statusTable_80218C78), + .partCount = ARRAY_COUNT(N(ActorParts)), + .partsData = N(ActorParts), + .initScript = &N(EVS_Init), + .statusTable = N(StatusTable), .escapeChance = 15, .airLiftChance = 0, .hurricaneChance = 0, @@ -98,7 +98,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 75 }, }; -EvtScript N(init_80218D70) = { +EvtScript N(EVS_Init) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80219750))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80219204))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80219338))) @@ -136,7 +136,7 @@ EvtScript N(80218E60) = { EVT_GOTO(0) EVT_LABEL(1) EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN @@ -323,7 +323,7 @@ EvtScript N(takeTurn_80219750) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim02) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 80) - EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 30, 315, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 30, 315, 30, 0, 0) EVT_WAIT(40) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim01) EVT_SET(LVar0, 0) @@ -340,8 +340,8 @@ EvtScript N(takeTurn_80219750) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_KILL_THREAD(LVar0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, 1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, TRUE) EVT_CALL(func_8026F60C, 10) EVT_RETURN EVT_END_IF @@ -411,11 +411,11 @@ EvtScript N(80219D88) = { EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 1, LVar0, LVar1, LVar2, 0) EVT_THREAD EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(15.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(15.0)) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) EVT_END_IF @@ -439,7 +439,7 @@ EvtScript N(80219D88) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 1, LVar0, 0, LVar2, 0) EVT_END_IF EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -485,7 +485,7 @@ EvtScript N(8021A36C) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim0F) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim10) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 999, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_3E7, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -507,13 +507,13 @@ EvtScript N(8021A36C) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim12) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_END_THREAD - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_SET(LVar1, 0) @@ -522,9 +522,9 @@ EvtScript N(8021A36C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -581,17 +581,17 @@ EvtScript N(8021A36C) = { EVT_END_IF EVT_LABEL(0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 0, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 0, LVar0, 0, LVar2, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim0D) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_END_THREAD - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_SET(LVar1, 0) @@ -600,18 +600,18 @@ EvtScript N(8021A36C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_GOTO(2) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_WAIT(3) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 1, LVar0, 0, LVar2, 0) EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_END_IF EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) @@ -625,9 +625,9 @@ EvtScript N(8021A36C) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_WAIT(8) EVT_END_IF EVT_LABEL(2) diff --git a/src/battle/area/dgb/stage/dgb_01.c b/src/battle/area/dgb/stage/dgb_01.c index 26d2c95bfe..2a1a1c48af 100644 --- a/src/battle/area/dgb/stage/dgb_01.c +++ b/src/battle/area/dgb/stage/dgb_01.c @@ -1,15 +1,16 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/dgb_bt01_shape.h" #define NAMESPACE b_area_dgb_dgb_01 -EvtScript N(beforeBattle_8021B050) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8021B070) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -18,6 +19,6 @@ Stage NAMESPACE = { .texture = "dgb_tex", .shape = "dgb_bt01_shape", .hit = "dgb_bt01_hit", - .preBattle = &N(beforeBattle_8021B050), - .postBattle = &N(afterBattle_8021B070), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/dgb/stage/dgb_02.c b/src/battle/area/dgb/stage/dgb_02.c index 876340d75b..540376c02d 100644 --- a/src/battle/area/dgb/stage/dgb_02.c +++ b/src/battle/area/dgb/stage/dgb_02.c @@ -1,15 +1,16 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/dgb_bt02_shape.h" #define NAMESPACE b_area_dgb_dgb_02 -EvtScript N(beforeBattle_8021B0B0) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8021B0D0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -18,6 +19,6 @@ Stage NAMESPACE = { .texture = "dgb_tex", .shape = "dgb_bt02_shape", .hit = "dgb_bt02_hit", - .preBattle = &N(beforeBattle_8021B0B0), - .postBattle = &N(afterBattle_8021B0D0), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/dgb/stage/dgb_03.c b/src/battle/area/dgb/stage/dgb_03.c index 9cb516dd71..d2bc1804a9 100644 --- a/src/battle/area/dgb/stage/dgb_03.c +++ b/src/battle/area/dgb/stage/dgb_03.c @@ -1,15 +1,16 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/dgb_bt03_shape.h" #define NAMESPACE b_area_dgb_dgb_03 -EvtScript N(beforeBattle_8021B110) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8021B130) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -18,6 +19,6 @@ Stage NAMESPACE = { .texture = "dgb_tex", .shape = "dgb_bt03_shape", .hit = "dgb_bt03_hit", - .preBattle = &N(beforeBattle_8021B110), - .postBattle = &N(afterBattle_8021B130), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/dgb/stage/dgb_04.c b/src/battle/area/dgb/stage/dgb_04.c index d155ca04bb..3cc2ff7b8f 100644 --- a/src/battle/area/dgb/stage/dgb_04.c +++ b/src/battle/area/dgb/stage/dgb_04.c @@ -4,26 +4,27 @@ #define NAMESPACE b_area_dgb_dgb_04 -EvtScript N(beforeBattle_8021B170) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8021B190) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_8021B1A0)[] = { - MODEL_kumo1, 0, +s32 N(ForegroundModels)[] = { + MODEL_kumo1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "dgb_tex", .shape = "dgb_bt04_shape", .hit = "dgb_bt04_hit", - .preBattle = &N(beforeBattle_8021B170), - .postBattle = &N(afterBattle_8021B190), - .foregroundModelList = N(foregroundModelList_8021B1A0), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/dgb/stage/dgb_05.c b/src/battle/area/dgb/stage/dgb_05.c index 78375a068b..428e63d0d8 100644 --- a/src/battle/area/dgb/stage/dgb_05.c +++ b/src/battle/area/dgb/stage/dgb_05.c @@ -1,15 +1,16 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/dgb_bt05_shape.h" #define NAMESPACE b_area_dgb_dgb_05 -EvtScript N(beforeBattle_8021B1D0) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8021B1F0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -18,6 +19,6 @@ Stage NAMESPACE = { .texture = "dgb_tex", .shape = "dgb_bt05_shape", .hit = "dgb_bt05_hit", - .preBattle = &N(beforeBattle_8021B1D0), - .postBattle = &N(afterBattle_8021B1F0), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/dig/actor/tubba_blubba.c b/src/battle/area/dig/actor/tubba_blubba.c index c85c80c069..4ac0f9fb6d 100644 --- a/src/battle/area/dig/actor/tubba_blubba.c +++ b/src/battle/area/dig/actor/tubba_blubba.c @@ -15,17 +15,17 @@ extern EvtScript N(shakeCam); extern EvtScript N(attackBodyCrush); s32 N(idleAnimations)[] = { - STATUS_NORMAL, ANIM_BattleTubba_Anim02, - STATUS_STONE, ANIM_BattleTubba_Anim00, - STATUS_SLEEP, ANIM_BattleTubba_Anim00, - STATUS_POISON, ANIM_BattleTubba_Anim02, - STATUS_STOP, ANIM_BattleTubba_Anim00, - STATUS_STATIC, ANIM_BattleTubba_Anim00, - STATUS_PARALYZE, ANIM_BattleTubba_Anim00, - STATUS_PARALYZE, ANIM_BattleTubba_Anim00, - STATUS_DIZZY, ANIM_BattleTubba_Anim00, - STATUS_DIZZY, ANIM_BattleTubba_Anim00, - STATUS_FEAR, ANIM_BattleTubba_Anim00, + STATUS_NORMAL, ANIM_BattleTubba_Anim02, + STATUS_STONE, ANIM_BattleTubba_Anim00, + STATUS_SLEEP, ANIM_BattleTubba_Anim00, + STATUS_POISON, ANIM_BattleTubba_Anim02, + STATUS_STOP, ANIM_BattleTubba_Anim00, + STATUS_STATIC, ANIM_BattleTubba_Anim00, + STATUS_PARALYZE, ANIM_BattleTubba_Anim00, + STATUS_PARALYZE, ANIM_BattleTubba_Anim00, + STATUS_DIZZY, ANIM_BattleTubba_Anim00, + STATUS_DIZZY, ANIM_BattleTubba_Anim00, + STATUS_FEAR, ANIM_BattleTubba_Anim00, STATUS_END, }; @@ -81,7 +81,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 10, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -130,7 +130,7 @@ EvtScript N(shakeCam) = { EVT_END_IF EVT_GOTO(0) EVT_LABEL(1) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN @@ -194,7 +194,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim02) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 80) - EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 30, 315, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 30, 315, 30, 0, 0) EVT_WAIT(40) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim01) EVT_SET(LVar0, 0) @@ -211,8 +211,8 @@ EvtScript N(takeTurn) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_KILL_THREAD(LVar0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, 1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, TRUE) EVT_CALL(func_8026F60C, 10) EVT_RETURN EVT_END_IF @@ -267,10 +267,10 @@ EvtScript N(attackFistDrop) = { EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 1, LVar0, LVar1, LVar2, 0) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(15.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(15.0)) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) EVT_END_IF @@ -293,7 +293,7 @@ EvtScript N(attackFistDrop) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 1, LVar0, 0, LVar2, 0) EVT_END_IF EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -356,10 +356,10 @@ EvtScript N(attackBodyCrush) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim12) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_END_THREAD EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) @@ -368,9 +368,9 @@ EvtScript N(attackBodyCrush) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -425,14 +425,14 @@ EvtScript N(attackBodyCrush) = { EVT_END_IF EVT_LABEL(0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 0, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 0, LVar0, 0, LVar2, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleTubba_Anim0D) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_END_THREAD EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) @@ -441,17 +441,17 @@ EvtScript N(attackBodyCrush) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_GOTO(2) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_WAIT(3) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 1, LVar0, 0, LVar2, 0) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_END_IF EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) @@ -464,9 +464,9 @@ EvtScript N(attackBodyCrush) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 60, 8, 10, 20, 0) EVT_WAIT(8) EVT_END_IF EVT_LABEL(2) diff --git a/src/battle/area/dig/script/dig_01.c b/src/battle/area/dig/script/dig_01.c index 2559aa47dc..b9f8e4b3c8 100644 --- a/src/battle/area/dig/script/dig_01.c +++ b/src/battle/area/dig/script/dig_01.c @@ -3,9 +3,9 @@ #define NAMESPACE b_area_dig_dig_01_script -#include "common/Set80218630_Var0.inc.c" +#include "common/SetDemoBattleBeginDelay.inc.c" -API_CALLABLE(func_80218644_6DE404) { +API_CALLABLE(N(SetupDemoPlayerMove)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; SelectableTarget* selectableTarget; @@ -26,12 +26,12 @@ API_CALLABLE(func_80218644_6DE404) { EvtScript NAMESPACE = { EVT_WAIT(3) - EVT_CALL(SetCamViewport, 1, 29, 20, 262, 177) + EVT_CALL(SetCamViewport, CAM_BATTLE, 29, 20, 262, 177) EVT_CALL(func_802535B4, 0) EVT_SET(LVar0, 15) - EVT_CALL(N(Set80218630_Var0)) + EVT_CALL(N(SetDemoBattleBeginDelay)) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MENU) - EVT_CALL(func_80218644_6DE404) + EVT_CALL(N(SetupDemoPlayerMove)) EVT_CALL(SetBattleState, BATTLE_STATE_PLAYER_MOVE) EVT_WAIT(10000) EVT_RETURN diff --git a/src/battle/area/dig/script/dig_02.c b/src/battle/area/dig/script/dig_02.c index 466752da03..17ba8125c1 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 -API_CALLABLE(func_802186E0_6DE4A0) { +API_CALLABLE(N(SetupDemoPlayerMove)) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; SelectableTarget* selectableTarget; @@ -26,14 +26,14 @@ EvtScript NAMESPACE = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 1) EVT_WAIT(3) - EVT_CALL(SetCamViewport, 1, 29, 20, 262, 177) + EVT_CALL(SetCamViewport, CAM_BATTLE, 29, 20, 262, 177) EVT_CALL(func_802535B4, 0) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MENU) - EVT_CALL(func_802186E0_6DE4A0) + EVT_CALL(N(SetupDemoPlayerMove)) EVT_CALL(SetBattleState, BATTLE_STATE_PLAYER_MOVE) EVT_WAIT(130) EVT_LOOP(30) - EVT_CALL(SetCommandAutoSuccess, 0) + EVT_CALL(SetCommandAutoSuccess, FALSE) EVT_WAIT(1) EVT_END_LOOP EVT_RETURN diff --git a/src/battle/area/dig/script/dig_03.c b/src/battle/area/dig/script/dig_03.c index 111e823ea6..92c764d8d8 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 -API_CALLABLE(func_80218770_6DE530) { +API_CALLABLE(N(SetupDemoPlayerMove)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; SelectableTarget* selectableTarget; @@ -26,10 +26,10 @@ EvtScript NAMESPACE = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 1) EVT_WAIT(3) - EVT_CALL(SetCamViewport, 1, 29, 20, 262, 177) + EVT_CALL(SetCamViewport, CAM_BATTLE, 29, 20, 262, 177) EVT_CALL(func_802535B4, 0) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MENU) - EVT_CALL(func_80218770_6DE530) + EVT_CALL(N(SetupDemoPlayerMove)) EVT_CALL(SetBattleState, BATTLE_STATE_PARTNER_MOVE) EVT_WAIT(90) EVT_RETURN diff --git a/src/battle/area/dig/script/dig_04.c b/src/battle/area/dig/script/dig_04.c index fcfea02dcd..72c7e008e6 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 -API_CALLABLE(func_802187F0_6DE5B0) { +API_CALLABLE(N(SetupDemoPlayerMove)) { BattleStatus* battleStatus = &gBattleStatus; PlayerData* playerData = &gPlayerData; s32 selectedItemID; @@ -16,7 +16,7 @@ API_CALLABLE(func_802187F0_6DE5B0) { battleStatus->selectedMoveID = 0; battleStatus->currentAttackElement = 0; playerData->invItems[0] = selectedItemID; - battleStatus->currentTargetListFlags = gItemTable[playerData->invItems[0]].targetFlags | 0x8000; + battleStatus->currentTargetListFlags = gItemTable[playerData->invItems[0]].targetFlags | ITEM_TARGET_FLAG_8000; player_create_target_list(player); player->selectedTargetIndex = 0; @@ -31,10 +31,10 @@ EvtScript NAMESPACE = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 1) EVT_WAIT(3) - EVT_CALL(SetCamViewport, 1, 29, 20, 262, 177) + EVT_CALL(SetCamViewport, CAM_BATTLE, 29, 20, 262, 177) EVT_CALL(func_802535B4, 0) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MENU) - EVT_CALL(func_802187F0_6DE5B0) + EVT_CALL(N(SetupDemoPlayerMove)) EVT_CALL(SetBattleState, BATTLE_STATE_PLAYER_MOVE) EVT_RETURN EVT_END diff --git a/src/battle/area/dig/script/dig_05.c b/src/battle/area/dig/script/dig_05.c index 821b44e9bb..4918287d9c 100644 --- a/src/battle/area/dig/script/dig_05.c +++ b/src/battle/area/dig/script/dig_05.c @@ -3,16 +3,16 @@ #define NAMESPACE b_area_dig_dig_05_script -#include "common/Set80218630_Var0.inc.c" +#include "common/SetDemoBattleBeginDelay.inc.c" EvtScript NAMESPACE = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 1) EVT_WAIT(3) - EVT_CALL(SetCamViewport, 1, 29, 20, 262, 177) + EVT_CALL(SetCamViewport, CAM_BATTLE, 29, 20, 262, 177) EVT_CALL(func_802535B4, 0) EVT_SET(LVar0, 5) - EVT_CALL(N(Set80218630_Var0)) + EVT_CALL(N(SetDemoBattleBeginDelay)) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MENU) EVT_CALL(SetBattleState, BATTLE_STATE_NEXT_ENEMY) EVT_RETURN diff --git a/src/battle/area/dig/stage/dig_01.c b/src/battle/area/dig/stage/dig_01.c index bd49c5956b..1963a9fa78 100644 --- a/src/battle/area/dig/stage/dig_01.c +++ b/src/battle/area/dig/stage/dig_01.c @@ -4,19 +4,24 @@ #define NAMESPACE b_area_dig_dig_01 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_ueki2, MODEL_ueki1, MODEL_kabu2, MODEL_kabu1, MODEL_kusa3, 0, +s32 N(ForegroundModels)[] = { + MODEL_ueki2, + MODEL_ueki1, + MODEL_kabu2, + MODEL_kabu1, + MODEL_kusa3, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -24,7 +29,7 @@ Stage NAMESPACE = { .shape = "nok_bt04_shape", .hit = "nok_bt04_hit", .bg = "nok_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/dig/stage/dig_02.c b/src/battle/area/dig/stage/dig_02.c index dc6cc9b234..934f99c1b9 100644 --- a/src/battle/area/dig/stage/dig_02.c +++ b/src/battle/area/dig/stage/dig_02.c @@ -5,20 +5,22 @@ #define NAMESPACE b_area_dig_dig_02 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetGroupEnabled, MODEL_a, FALSE) + EVT_CALL(SetGroupVisibility, MODEL_a, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_iwa1, MODEL_o331, 0, +s32 N(ForegroundModels)[] = { + MODEL_iwa1, + MODEL_o331, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -26,7 +28,7 @@ Stage NAMESPACE = { .shape = "iwa_bt01_shape", .hit = "iwa_bt01_hit", .bg = "iwa_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/dig/stage/dig_03.c b/src/battle/area/dig/stage/dig_03.c index 9e428c7c3e..b0a60d2388 100644 --- a/src/battle/area/dig/stage/dig_03.c +++ b/src/battle/area/dig/stage/dig_03.c @@ -6,51 +6,54 @@ #define NAMESPACE b_area_dig_dig_03 -#include "common/UnkFloatFunc3.inc.c" - +#include "common/UpdateSunPos.inc.c" #include "common/GetModelPos.inc.c" -EvtScript N(updateModels) = { +EvtScript N(EVS_UpdateSunPos) = { EVT_SET(LVarA, LVar0) EVT_SET(LVar7, LVar1) EVT_MUL(LVar7, 10) EVT_CALL(N(GetModelPos)) EVT_LABEL(0) - EVT_ADD(LVar7, 1) - EVT_IF_GT(LVar7, 3599) - EVT_SUB(LVar7, 3600) - EVT_END_IF - EVT_CALL(N(UnkFloatFunc3), LVar7, LVar0, LVar1, LVar2) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) + EVT_ADD(LVar7, 1) + EVT_IF_GT(LVar7, 3599) + EVT_SUB(LVar7, 3600) + EVT_END_IF + EVT_CALL(N(UpdateSunPos), LVar7, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) EVT_RETURN EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_SET(LVar0, MODEL_g60) EVT_SET(LVar1, 0) - EVT_EXEC(N(updateModels)) + EVT_EXEC(N(EVS_UpdateSunPos)) EVT_SET(LVar0, MODEL_g63) EVT_SET(LVar1, 120) - EVT_EXEC(N(updateModels)) + EVT_EXEC(N(EVS_UpdateSunPos)) EVT_SET(LVar0, MODEL_g62) EVT_SET(LVar1, 240) - EVT_EXEC(N(updateModels)) - EVT_CALL(PlayEffect, EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateSunPos)) + EVT_PLAY_EFFECT(EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o322, MODEL_o321, MODEL_o320, MODEL_o319, 0, +s32 N(ForegroundModels)[] = { + MODEL_o322, + MODEL_o321, + MODEL_o320, + MODEL_o319, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -58,7 +61,7 @@ Stage NAMESPACE = { .shape = "sbk_bt02_shape", .hit = "sbk_bt02_hit", .bg = "sbk_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/dig/stage/dig_04.c b/src/battle/area/dig/stage/dig_04.c index 1d5994c331..a9695ef54a 100644 --- a/src/battle/area/dig/stage/dig_04.c +++ b/src/battle/area/dig/stage/dig_04.c @@ -5,18 +5,18 @@ #define NAMESPACE b_area_dig_dig_04 -extern Formation N(formation_slot_machine); +extern Formation N(Formation_SlotMachine); extern ActorBlueprint N(slot_machine_stop); extern ActorBlueprint N(slot_machine_start); -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_CALL(SetTexPanner, 29, TEX_PANNER_A) EVT_THREAD EVT_SET(LVarE, 0) EVT_LOOP(0) - EVT_ADD(LVarE, 32768) + EVT_ADD(LVarE, 0x8000) EVT_CALL(SetTexPanOffset, TEX_PANNER_A, TEX_PANNER_MAIN, LVarE, 0) EVT_WAIT(10) EVT_END_LOOP @@ -25,13 +25,16 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_itigo, MODEL_kisya, MODEL_kusari, 0, +s32 N(ForegroundModels)[] = { + MODEL_itigo, + MODEL_kisya, + MODEL_kusari, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -39,11 +42,11 @@ Stage NAMESPACE = { .shape = "omo_bt04_shape", .hit = "omo_bt04_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), .stageEnemyCount = 4, - .stageFormation = &N(formation_slot_machine), + .stageFormation = &N(Formation_SlotMachine), }; Vec3i N(slot_machine_pos1) = { -49, 56, -68 }; @@ -51,7 +54,7 @@ Vec3i N(slot_machine_pos2) = { -13, 56, -68 }; Vec3i N(slot_machine_pos3) = { 20, 56, -68 }; Vec3i N(slot_machine_pos4) = { 53, 56, -68 }; -Formation N(formation_slot_machine) = { +Formation N(Formation_SlotMachine) = { { .actor = &N(slot_machine_start), .home = { .vec = &N(slot_machine_pos1) }, .var0 = 0 }, { .actor = &N(slot_machine_stop), .home = { .vec = &N(slot_machine_pos2) }, .var0 = 1 }, { .actor = &N(slot_machine_stop), .home = { .vec = &N(slot_machine_pos3) }, .var0 = 2 }, diff --git a/src/battle/area/dig/stage/dig_05.c b/src/battle/area/dig/stage/dig_05.c index b4c4d158ae..a87d0da991 100644 --- a/src/battle/area/dig/stage/dig_05.c +++ b/src/battle/area/dig/stage/dig_05.c @@ -3,13 +3,13 @@ #define NAMESPACE b_area_dig_dig_05 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -18,6 +18,6 @@ Stage NAMESPACE = { .texture = "dgb_tex", .shape = "dgb_bt05_shape", .hit = "dgb_bt05_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/flo/actor/amazy_dayzee.c b/src/battle/area/flo/actor/amazy_dayzee.c index 562996df83..92d65aae88 100644 --- a/src/battle/area/flo/actor/amazy_dayzee.c +++ b/src/battle/area/flo/actor/amazy_dayzee.c @@ -64,7 +64,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 20, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 90, .airLiftChance = 85, @@ -106,7 +106,7 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 2, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 2, LVar0, LVar1, LVar2, 30, 0) EVT_WAIT(15) EVT_GOTO(0) EVT_RETURN @@ -281,7 +281,7 @@ EvtScript N(attackPainfulSong) = { EVT_CALL(RandInt, 30, LVar3) EVT_SUB(LVar3, 15) EVT_ADD(LVar3, LVar0) - EVT_CALL(PlayEffect, EFFECT_MUSIC_NOTE, 1, LVar3, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 1, LVar3, LVar1, LVar2, 0) EVT_WAIT(10) EVT_END_LOOP EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Dayzee_Amazy_Anim01) @@ -298,7 +298,7 @@ EvtScript N(attackPainfulSong) = { EVT_WAIT(15) EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -351,7 +351,7 @@ EvtScript N(flee) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_BATTLE_FLED, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_BATTLE_FLED, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN diff --git a/src/battle/area/flo/actor/crazee_dayzee.c b/src/battle/area/flo/actor/crazee_dayzee.c index 5dc66e9617..7ea1c3aad3 100644 --- a/src/battle/area/flo/actor/crazee_dayzee.c +++ b/src/battle/area/flo/actor/crazee_dayzee.c @@ -6,7 +6,7 @@ #define NAMESPACE b_area_flo_crazee_dayzee -extern EvtScript N(init); +extern EvtScript N(EVS_Init); extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); @@ -64,7 +64,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(EVS_Init), .statusTable = N(statusTable), .escapeChance = 50, .airLiftChance = 85, @@ -93,7 +93,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -EvtScript N(init) = { +EvtScript N(EVS_Init) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) @@ -274,7 +274,7 @@ EvtScript N(attackPainfulSong) = { EVT_CALL(RandInt, 30, LVar3) EVT_SUB(LVar3, 15) EVT_ADD(LVar3, LVar0) - EVT_CALL(PlayEffect, EFFECT_MUSIC_NOTE, 1, LVar3, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 1, LVar3, LVar1, LVar2, 0) EVT_WAIT(10) EVT_END_LOOP EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Dayzee_Anim01) @@ -291,7 +291,7 @@ EvtScript N(attackPainfulSong) = { EVT_WAIT(15) EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -344,7 +344,7 @@ EvtScript N(flee) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_BATTLE_FLED, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_BATTLE_FLED, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN diff --git a/src/battle/area/flo/actor/lakitu.c b/src/battle/area/flo/actor/lakitu.c index 4534dbf173..dc55dd4055 100644 --- a/src/battle/area/flo/actor/lakitu.c +++ b/src/battle/area/flo/actor/lakitu.c @@ -114,7 +114,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 12, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 40, .airLiftChance = 90, @@ -148,7 +148,7 @@ EvtScript N(returnHome) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Lakitu_Anim03) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Lakitu_Anim01) EVT_RETURN EVT_END @@ -279,7 +279,7 @@ EvtScript N(attackSpinyFlip) = { EVT_ADD(LVar0, -3) EVT_ADD(LVar1, 16) EVT_ADD(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.4), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.4), 10, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 12) EVT_ADD(LVar2, 0) @@ -290,14 +290,14 @@ EvtScript N(attackSpinyFlip) = { EVT_ADD(LVar0, -8) EVT_ADD(LVar1, 40) EVT_ADD(LVar2, 5) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 10, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) EVT_ADD(LVar2, 2) EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_CALL(SetPartScale, ACTOR_SELF, 2, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_IF - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(10) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Lakitu_Anim15) @@ -306,7 +306,7 @@ EvtScript N(attackSpinyFlip) = { EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Lakitu_Anim0C) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 2, SOUND_20D2) - EVT_CALL(SetPartSounds, ACTOR_SELF, 2, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 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) @@ -317,20 +317,20 @@ EvtScript N(attackSpinyFlip) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 40) EVT_SET(LVar1, 0) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 20, TRUE) EVT_SUB(LVar0, 30) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 10, TRUE) EVT_SUB(LVar0, 20) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 5, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 5, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(20) EVT_CALL(YieldTurn) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -343,7 +343,7 @@ EvtScript N(attackSpinyFlip) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(1.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 20, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) @@ -356,12 +356,12 @@ EvtScript N(attackSpinyFlip) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 40) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 20, TRUE) EVT_SUB(LVar0, 30) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 10, TRUE) EVT_SUB(LVar0, 20) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 5, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 5, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_WAIT(20) EVT_CALL(YieldTurn) @@ -399,7 +399,7 @@ EvtScript N(summonSpiny) = { EVT_ADD(LVar0, -3) EVT_ADD(LVar1, 16) EVT_ADD(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.4), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.4), 10, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 12) EVT_ADD(LVar2, 0) @@ -411,7 +411,7 @@ EvtScript N(summonSpiny) = { EVT_ADD(LVar0, -8) EVT_ADD(LVar1, 40) EVT_ADD(LVar2, 5) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 10, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) EVT_ADD(LVar2, 2) @@ -419,7 +419,7 @@ EvtScript N(summonSpiny) = { EVT_CALL(SetPartScale, ACTOR_SELF, 2, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_IF - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(10) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Lakitu_Anim15) @@ -428,12 +428,12 @@ EvtScript N(summonSpiny) = { EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 2, SOUND_20D2) - EVT_CALL(SetPartSounds, ACTOR_SELF, 2, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 2, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Lakitu_Anim0C) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(1.6)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 40) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 12, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 12, TRUE) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, 0, LVar2) EVT_SUB(LVar0, 30) EVT_THREAD @@ -447,12 +447,12 @@ EvtScript N(summonSpiny) = { EVT_ADD(LVar1, 1) EVT_IF_GE(LVar1, 6) EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_SET(LocalFlag(0), 0) EVT_ELSE - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_SET(LocalFlag(0), 1) EVT_END_IF EVT_END_IF @@ -461,17 +461,17 @@ EvtScript N(summonSpiny) = { EVT_END_THREAD EVT_THREAD EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(1.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, 0, LVar2, 12, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, 0, LVar2, 12, TRUE) EVT_END_THREAD EVT_WAIT(1) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(1.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 12, 1) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 12, TRUE) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar0, 0, LVar2, 0, 0) EVT_CALL(GetPartOffset, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_CALL(SetActorPos, LVarB, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetAnimation, LVarB, 1, ANIM_Spiny_Anim01) EVT_WAIT(20) EVT_CALL(SetAnimation, LVarB, 1, ANIM_Spiny_Anim04) @@ -500,7 +500,7 @@ EvtScript N(summonSpiny) = { }; EvtScript N(findPlacesForSummon) = { - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar5) @@ -516,7 +516,7 @@ EvtScript N(findPlacesForSummon) = { 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 @@ -543,7 +543,7 @@ EvtScript N(findPlacesForSummon) = { EvtScript N(calcSummonChance) = { EVT_SET(LVar9, 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -558,7 +558,7 @@ EvtScript N(calcSummonChance) = { 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 diff --git a/src/battle/area/flo/actor/ruff_puff.c b/src/battle/area/flo/actor/ruff_puff.c index cdde10c0a5..14804283c6 100644 --- a/src/battle/area/flo/actor/ruff_puff.c +++ b/src/battle/area/flo/actor/ruff_puff.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_flo_ruff_puff -extern EvtScript N(init); +extern EvtScript N(EVS_Init); extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); @@ -75,7 +75,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 10, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(EVS_Init), .statusTable = N(statusTable), .escapeChance = 50, .airLiftChance = 90, @@ -91,7 +91,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -EvtScript N(init) = { +EvtScript N(EVS_Init) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) @@ -122,7 +122,7 @@ EvtScript N(returnHome) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TuffPuff_Run) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_SIN_OUT) EVT_RETURN EVT_END }; @@ -240,7 +240,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TuffPuff_Idle) EVT_WAIT(5) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TuffPuff_Grin) @@ -289,7 +289,7 @@ EvtScript N(takeTurn) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) diff --git a/src/battle/area/flo/stage/flo_01.c b/src/battle/area/flo/stage/flo_01.c index df14197aee..df2026ddd4 100644 --- a/src/battle/area/flo/stage/flo_01.c +++ b/src/battle/area/flo/stage/flo_01.c @@ -1,93 +1,7 @@ #include "common.h" #include "battle/battle.h" #include "mapfs/flo_bt01_shape.h" -#include "effects.h" #define NAMESPACE b_area_flo_flo_01 -EvtScript N(80230E90) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 40, LVar2) - EVT_SUB(LVar2, 100) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 20, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80230FA8) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 50, LVar2) - EVT_ADD(LVar2, 71) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(802310C0) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 50) - EVT_CALL(RandInt, 40, LVar2) - EVT_ADD(LVar2, -124) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 37, 1) - EVT_CALL(SetGroupEnabled, 28, 0) - EVT_CALL(SetGroupEnabled, 22, 0) - EVT_EXEC(N(80230E90)) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_o400, MODEL_o401, MODEL_o407, MODEL_o411, MODEL_o422, MODEL_o423, MODEL_o424, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt01_shape", - .hit = "flo_bt01_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_01.inc.c" diff --git a/src/battle/area/flo/stage/flo_01b.c b/src/battle/area/flo/stage/flo_01b.c index 59ada80400..696ddc9a0d 100644 --- a/src/battle/area/flo/stage/flo_01b.c +++ b/src/battle/area/flo/stage/flo_01b.c @@ -1,93 +1,7 @@ #include "common.h" #include "battle/battle.h" #include "mapfs/flo_bt01_shape.h" -#include "effects.h" #define NAMESPACE b_area_flo_flo_01b -EvtScript N(80231330) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 40, LVar2) - EVT_SUB(LVar2, 100) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 20, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80231448) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 50, LVar2) - EVT_ADD(LVar2, 71) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80231560) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 50) - EVT_CALL(RandInt, 40, LVar2) - EVT_ADD(LVar2, -124) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 37, 0) - EVT_CALL(SetGroupEnabled, 28, 1) - EVT_CALL(SetGroupEnabled, 22, 0) - EVT_EXEC(N(80231330)) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_kuki, MODEL_hana1, MODEL_mae1, MODEL_mae2, MODEL_mae3, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt01_shape", - .hit = "flo_bt01_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_01b.inc.c" diff --git a/src/battle/area/flo/stage/flo_01c.c b/src/battle/area/flo/stage/flo_01c.c index a47589422c..a54397aa2e 100644 --- a/src/battle/area/flo/stage/flo_01c.c +++ b/src/battle/area/flo/stage/flo_01c.c @@ -1,94 +1,7 @@ #include "common.h" #include "battle/battle.h" #include "mapfs/flo_bt01_shape.h" -#include "effects.h" #define NAMESPACE b_area_flo_flo_01c -EvtScript N(802317C0) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 40, LVar2) - EVT_SUB(LVar2, 100) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 20, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(802318D8) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 50, LVar2) - EVT_ADD(LVar2, 71) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(802319F0) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 50) - EVT_CALL(RandInt, 40, LVar2) - EVT_ADD(LVar2, -124) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 37, 0) - EVT_CALL(SetGroupEnabled, 28, 0) - EVT_CALL(SetGroupEnabled, 22, 1) - EVT_EXEC(N(802317C0)) - EVT_EXEC(N(802318D8)) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_o381, MODEL_o382, MODEL_o388, MODEL_o389, MODEL_o390, MODEL_o383, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt01_shape", - .hit = "flo_bt01_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_01c.inc.c" diff --git a/src/battle/area/flo/stage/flo_02.c b/src/battle/area/flo/stage/flo_02.c index ec3cc8157b..36e50e1d91 100644 --- a/src/battle/area/flo/stage/flo_02.c +++ b/src/battle/area/flo/stage/flo_02.c @@ -1,93 +1,7 @@ #include "common.h" #include "battle/battle.h" #include "mapfs/flo_bt02_shape.h" -#include "effects.h" #define NAMESPACE b_area_flo_flo_02 -EvtScript N(80231C60) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 40, LVar2) - EVT_SUB(LVar2, 100) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 20, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80231D78) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 50, LVar2) - EVT_ADD(LVar2, 71) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80231E90) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 50) - EVT_CALL(RandInt, 40, LVar2) - EVT_ADD(LVar2, -124) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 35, 1) - EVT_CALL(SetGroupEnabled, 47, 0) - EVT_CALL(SetGroupEnabled, 22, 0) - EVT_EXEC(N(80231E90)) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_o403, MODEL_o404, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt02_shape", - .hit = "flo_bt02_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_02.inc.c" diff --git a/src/battle/area/flo/stage/flo_02b.c b/src/battle/area/flo/stage/flo_02b.c index 7ceb7ef343..8c59279033 100644 --- a/src/battle/area/flo/stage/flo_02b.c +++ b/src/battle/area/flo/stage/flo_02b.c @@ -1,94 +1,7 @@ #include "common.h" #include "battle/battle.h" #include "mapfs/flo_bt02_shape.h" -#include "effects.h" #define NAMESPACE b_area_flo_flo_02b -EvtScript N(802320E0) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 40, LVar2) - EVT_SUB(LVar2, 100) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 20, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(802321F8) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 50, LVar2) - EVT_ADD(LVar2, 71) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80232310) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 50) - EVT_CALL(RandInt, 40, LVar2) - EVT_ADD(LVar2, -124) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 35, 0) - EVT_CALL(SetGroupEnabled, 47, 1) - EVT_CALL(SetGroupEnabled, 22, 0) - EVT_EXEC(N(80232310)) - EVT_CALL(ModifyColliderFlags, 3, 0, 0x00000006) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_8hana4, MODEL_8hana5, MODEL_8hana6, MODEL_8hana1, MODEL_8hana1, MODEL_8hana3, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt02_shape", - .hit = "flo_bt02_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_02b.inc.c" diff --git a/src/battle/area/flo/stage/flo_02c.c b/src/battle/area/flo/stage/flo_02c.c index c48de22e0e..a994e62882 100644 --- a/src/battle/area/flo/stage/flo_02c.c +++ b/src/battle/area/flo/stage/flo_02c.c @@ -1,94 +1,7 @@ #include "common.h" #include "battle/battle.h" #include "mapfs/flo_bt02_shape.h" -#include "effects.h" #define NAMESPACE b_area_flo_flo_02c -EvtScript N(80232590) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 40, LVar2) - EVT_SUB(LVar2, 100) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 20, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(802326A8) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 50, LVar2) - EVT_ADD(LVar2, 71) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(802327C0) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 50) - EVT_CALL(RandInt, 40, LVar2) - EVT_ADD(LVar2, -124) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 35, 1) - EVT_CALL(SetGroupEnabled, 47, 0) - EVT_CALL(SetGroupEnabled, 16, 0) - EVT_CALL(SetGroupEnabled, 22, 1) - EVT_EXEC(N(802327C0)) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_o403, MODEL_o404, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt02_shape", - .hit = "flo_bt02_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_02c.inc.c" diff --git a/src/battle/area/flo/stage/flo_03.c b/src/battle/area/flo/stage/flo_03.c index 89f44cae6c..b59be9e8d1 100644 --- a/src/battle/area/flo/stage/flo_03.c +++ b/src/battle/area/flo/stage/flo_03.c @@ -4,189 +4,4 @@ #define NAMESPACE b_area_flo_flo_03 -EvtScript N(80232A30) = { - EVT_SET(LVarA, LVar0) - EVT_USE_BUF(LVarA) - EVT_LOOP(0) - EVT_BUF_READ1(LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_CALL(SetTexPanner, LVar0, TEX_PANNER_E) - EVT_BUF_READ1(LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_CALL(SetTexPanner, LVar0, TEX_PANNER_F) - EVT_END_LOOP - EVT_SET(LVar0, 0) - EVT_SET(LVar1, 0) - EVT_LABEL(0) - EVT_LABEL(0) - EVT_ADD(LVar0, -140) - EVT_IF_LT(LVar0, 0) - EVT_ADD(LVar0, 65536) - EVT_END_IF - EVT_CALL(SetTexPanOffset, TEX_PANNER_E, TEX_PANNER_MAIN, LVar0, 0) - EVT_ADD(LVar1, -200) - EVT_IF_LT(LVar1, 0) - EVT_ADD(LVar1, 65536) - EVT_END_IF - EVT_CALL(SetTexPanOffset, TEX_PANNER_F, TEX_PANNER_MAIN, LVar1, 0) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -#include "common/CosInterpMinMax.inc.c" - -EvtScript N(80232C48) = { - EVT_CALL(EnableModel, LVarF, 1) - EVT_SET(LVarE, 159) - EVT_LOOP(LVarE) - EVT_ADDF(LVar3, 0) - EVT_ADDF(LVar4, EVT_FLOAT(0.0)) - EVT_SETF(LVar5, EVT_FLOAT(0.01)) - EVT_ADDF(LVar0, LVar3) - EVT_ADDF(LVar1, LVar4) - EVT_ADDF(LVar2, LVar5) - EVT_MULF(LVar6, EVT_FLOAT(1.01)) - EVT_ADDF(LVar7, EVT_FLOAT(0.01)) - EVT_SETF(LVar8, LVar6) - EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 15, 0, 0) - EVT_ADDF(LVar8, LVarA) - EVT_SETF(LVar9, LVar7) - EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 20, 0, 90) - EVT_ADDF(LVar9, LVarA) - EVT_SETF(LVarA, LVar0) - EVT_MULF(LVarA, EVT_FLOAT(10.0)) - EVT_CALL(TranslateModel, LVarF, LVar0, LVar1, LVar2) - EVT_CALL(ScaleModel, LVarF, LVar8, LVar9, 1) - EVT_CALL(RotateModel, LVarF, LVarA, 0, 0, 1) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(EnableModel, LVarF, 0) - EVT_RETURN - EVT_END -}; - -s32 N(modelList)[] = { - MODEL_o419, MODEL_o420, MODEL_o422, 0, -}; - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_SET(LVar0, N(modelList)) - EVT_EXEC(N(80232A30)) - EVT_CALL(SetTexPanner, 36, TEX_PANNER_1) - EVT_CALL(SetTexPanner, 37, TEX_PANNER_2) - EVT_CALL(SetTexPanner, 38, TEX_PANNER_3) - EVT_CALL(SetTexPanner, 39, TEX_PANNER_4) - EVT_CALL(SetTexPanner, 40, TEX_PANNER_5) - EVT_CALL(SetTexPanner, 41, TEX_PANNER_6) - EVT_CALL(SetTexPanner, 42, TEX_PANNER_7) - EVT_THREAD - EVT_SET(LVarE, 1) - EVT_SET(LVarF, 0) - EVT_LOOP(0) - EVT_ADDF(LVarF, LVarE) - EVT_IF_GE(LVarF, 1080) - EVT_SET(LVarF, 0) - EVT_END_IF - EVT_SET(LVar0, LVarF) - EVT_DIV(LVar0, 9) - EVT_MOD(LVar0, 2) - EVT_MUL(LVar0, 16384) - EVT_SET(LVar1, LVarF) - EVT_DIV(LVar1, 4) - EVT_MOD(LVar1, 2) - EVT_MUL(LVar1, 16384) - EVT_SET(LVar2, LVarF) - EVT_DIV(LVar2, 5) - EVT_MOD(LVar2, 2) - EVT_MUL(LVar2, 16384) - EVT_SET(LVar3, LVarF) - EVT_DIV(LVar3, 6) - EVT_MOD(LVar3, 2) - EVT_MUL(LVar3, 16384) - EVT_SET(LVar4, LVarF) - EVT_DIV(LVar4, 2) - EVT_MOD(LVar4, 2) - EVT_MUL(LVar4, 16384) - EVT_SET(LVar5, LVarF) - EVT_DIV(LVar5, 8) - EVT_MOD(LVar5, 2) - EVT_MUL(LVar5, 16384) - EVT_SET(LVar6, LVarF) - EVT_DIV(LVar6, 8) - EVT_MOD(LVar6, 2) - EVT_MUL(LVar6, 32768) - EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) - EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar1, 0) - EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, LVar2, 0) - EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_MAIN, LVar3, 0) - EVT_CALL(SetTexPanOffset, TEX_PANNER_5, TEX_PANNER_MAIN, LVar4, 0) - EVT_CALL(SetTexPanOffset, TEX_PANNER_6, TEX_PANNER_MAIN, LVar5, 0) - EVT_CALL(SetTexPanOffset, TEX_PANNER_7, TEX_PANNER_MAIN, LVar6, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_THREAD - EVT_SET(LVar0, 0) - EVT_LOOP(16) - EVT_SET(LVar1, LVar0) - EVT_ADD(LVar1, 10000) - EVT_ADD(LVar0, 1) - EVT_CALL(CloneModel, 44, LVar1) - EVT_CALL(EnableModel, LVar1, 0) - EVT_END_LOOP - EVT_CALL(EnableModel, 44, 0) - EVT_SET(LVarE, 0) - EVT_LOOP(0) - EVT_SETF(LVar0, EVT_FLOAT(106.0)) - EVT_SETF(LVar1, EVT_FLOAT(94.0)) - EVT_SETF(LVar2, EVT_FLOAT(-91.0)) - EVT_CALL(RandInt, 100, LVar3) - EVT_ADDF(LVar3, -50) - EVT_DIVF(LVar3, EVT_FLOAT(200.0)) - EVT_SETF(LVar4, EVT_FLOAT(1.0)) - EVT_SETF(LVar5, 0) - EVT_SETF(LVar6, EVT_FLOAT(0.296)) - EVT_SETF(LVar7, EVT_FLOAT(0.296)) - EVT_SET(LVarF, LVarE) - EVT_ADD(LVarF, 10000) - EVT_EXEC(N(80232C48)) - EVT_ADD(LVarE, 1) - EVT_IF_GE(LVarE, 16) - EVT_SET(LVarE, 0) - EVT_END_IF - EVT_WAIT(10) - EVT_END_LOOP - EVT_END_THREAD - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_o411, MODEL_o415, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt03_shape", - .hit = "flo_bt03_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_03.inc.c" diff --git a/src/battle/area/flo/stage/flo_04.c b/src/battle/area/flo/stage/flo_04.c index ef4988a4ca..a0214bee84 100644 --- a/src/battle/area/flo/stage/flo_04.c +++ b/src/battle/area/flo/stage/flo_04.c @@ -4,87 +4,4 @@ #define NAMESPACE b_area_flo_flo_04 -#include "common/CosInterpMinMax.inc.c" - -EvtScript N(80233470) = { - EVT_SET(LVarA, LVar0) - EVT_SET(LVarF, 0) - EVT_LOOP(0) - EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, EVT_FLOAT(0.968), EVT_FLOAT(1.031), 15, 0, 0) - EVT_CALL(N(CosInterpMinMax), LVarF, LVar1, EVT_FLOAT(1.031), EVT_FLOAT(0.968), 15, 0, 0) - EVT_CALL(ScaleModel, LVarA, LVar1, LVar0, 1) - EVT_ADD(LVarF, 1) - EVT_IF_GE(LVarF, 30) - EVT_SET(LVarF, 0) - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_SET(LVar0, 14) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 16) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 18) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 20) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 25) - EVT_EXEC(N(80233470)) - EVT_THREAD - EVT_SET(LVar0, 31) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 32) - EVT_EXEC(N(80233470)) - EVT_WAIT(5) - EVT_SET(LVar0, 0) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 1) - EVT_EXEC(N(80233470)) - EVT_WAIT(5) - EVT_SET(LVar0, 5) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 4) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 6) - EVT_EXEC(N(80233470)) - EVT_WAIT(5) - EVT_SET(LVar0, 33) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 34) - EVT_EXEC(N(80233470)) - EVT_END_THREAD - EVT_CALL(CloneModel, 27, 10000) - EVT_CALL(EnableModel, 10000, 0) - EVT_CALL(TranslateModel, 10000, 0, 9, 0) - EVT_CALL(ParentColliderToModel, 0, 10000) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_o431, MODEL_o419, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt04_shape", - .hit = "flo_bt04_hit", - .bg = "sra_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_04.inc.c" diff --git a/src/battle/area/flo/stage/flo_05.c b/src/battle/area/flo/stage/flo_05.c index 27fdcb3c21..44cdc19fe4 100644 --- a/src/battle/area/flo/stage/flo_05.c +++ b/src/battle/area/flo/stage/flo_05.c @@ -3,26 +3,4 @@ #define NAMESPACE b_area_flo_flo_05 -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt05_shape", - .hit = "flo_bt05_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), -}; +#include "battle/common/stage/flo_05.inc.c" diff --git a/src/battle/area/flo/stage/flo_06.c b/src/battle/area/flo/stage/flo_06.c index a00575e413..bfb2c48874 100644 --- a/src/battle/area/flo/stage/flo_06.c +++ b/src/battle/area/flo/stage/flo_06.c @@ -3,26 +3,4 @@ #define NAMESPACE b_area_flo_flo_06 -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt06_shape", - .hit = "flo_bt06_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), -}; +#include "battle/common/stage/flo_06.inc.c" diff --git a/src/battle/area/flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c index 62f9117719..a4fab96477 100644 --- a/src/battle/area/flo2/actor/huff_n_puff.c +++ b/src/battle/area/flo2/actor/huff_n_puff.c @@ -33,7 +33,7 @@ enum N(Flags) { extern ActorBlueprint b_area_flo2_tuff_puff; -extern EvtScript N(init); +extern EvtScript N(EVS_Init); extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); @@ -400,7 +400,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 60, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(EVS_Init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -416,7 +416,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -EvtScript N(init) = { +EvtScript N(EVS_Init) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) @@ -660,7 +660,7 @@ EvtScript N(spawnTuffPuff) = { EVT_CALL(PlaySoundAtActor, LVar0, SOUND_OPEN_SHELL) EVT_THREAD EVT_SET(LVar3, LVar0) - EVT_CALL(MakeLerp, 150, 255, 15, 1) + EVT_CALL(MakeLerp, 150, 255, 15, EASING_QUADRATIC_IN) EVT_LABEL(123) EVT_CALL(UpdateLerp) EVT_CALL(SetPartAlpha, LVar3, 1, LVar0) @@ -1515,7 +1515,7 @@ EvtScript N(attackBodySlam) = { EVT_DIVF(LVar3, EVT_FLOAT(100.0)) EVT_CALL(AddGoalPos, ACTOR_SELF, LVar2, LVar3, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 20, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, EASING_SIN_OUT) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E7) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) @@ -1532,7 +1532,7 @@ EvtScript N(attackBodySlam) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, FALSE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(0.8)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(0.8)) EVT_END_THREAD EVT_IF_EQ(LVar0, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -1544,17 +1544,17 @@ EvtScript N(attackBodySlam) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -80, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 25, FALSE, FALSE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 8, EVT_FLOAT(0.6)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 8, EVT_FLOAT(0.6)) EVT_END_THREAD EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, FALSE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(0.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.4)) EVT_END_THREAD EVT_CALL(AddGoalPos, ACTOR_SELF, -30, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, FALSE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.2)) EVT_END_THREAD EVT_CALL(AddGoalPos, ACTOR_SELF, -20, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) @@ -1564,7 +1564,7 @@ EvtScript N(attackBodySlam) = { EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim03) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 80, -20, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 80, -20, EASING_SIN_OUT) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP @@ -1600,7 +1600,7 @@ EvtScript N(attackBodySlam) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 20, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 20, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(GetBattleFlags, LVar0) @@ -1611,7 +1611,7 @@ EvtScript N(attackBodySlam) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_WAIT(55) - EVT_CALL(PlayEffect, EFFECT_CLOUD_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_CLOUD_PUFF, LVar0, LVar1, LVar2, 0, 0) EVT_END_THREAD EVT_END_IF EVT_END_IF @@ -1624,7 +1624,7 @@ EvtScript N(attackBodySlam) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim02) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim03) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, EASING_SIN_OUT) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -1656,7 +1656,7 @@ EvtScript N(inhaleOne) = { EVT_WAIT(15) EVT_THREAD EVT_WAIT(35) - EVT_CALL(MakeLerp, 255, 0, 10, 0) + EVT_CALL(MakeLerp, 255, 0, 10, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, LVar0) @@ -1664,29 +1664,29 @@ EvtScript N(inhaleOne) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_END_THREAD EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[0]), 3, 1) + EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[0]), 3, EASING_QUADRATIC_IN) EVT_CASE_EQ(1) - EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[1]), 3, 1) + EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[1]), 3, EASING_QUADRATIC_IN) EVT_CASE_EQ(2) - EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[2]), 3, 1) + EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[2]), 3, EASING_QUADRATIC_IN) EVT_CASE_EQ(3) - EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[3]), 3, 1) + EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[3]), 3, EASING_QUADRATIC_IN) EVT_CASE_EQ(4) - EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[4]), 3, 1) + EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[4]), 3, EASING_QUADRATIC_IN) EVT_CASE_EQ(5) - EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[5]), 3, 1) + EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[5]), 3, EASING_QUADRATIC_IN) EVT_CASE_EQ(6) - EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[6]), 3, 1) + EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[6]), 3, EASING_QUADRATIC_IN) EVT_CASE_EQ(7) - EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[7]), 3, 1) + EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[7]), 3, EASING_QUADRATIC_IN) EVT_CASE_EQ(8) - EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[8]), 3, 1) + EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[8]), 3, EASING_QUADRATIC_IN) EVT_CASE_EQ(9) - EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[9]), 3, 1) + EVT_CALL(LoadPath, 40, EVT_PTR(N(suctionPaths)[9]), 3, EASING_QUADRATIC_IN) EVT_END_SWITCH EVT_LABEL(0) EVT_CALL(GetNextPathPos) @@ -1786,7 +1786,7 @@ EvtScript N(normalAction) = { EVT_CALL(HuffPuffBreath, 0, LVar0, LVar1, LVar2, EVT_FLOAT(180.0), EVT_FLOAT(-1.0), EVT_FLOAT(1.2), 0, LVar8) EVT_CALL(N(StartRumbleWithParams), 80, 220) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 110, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 110, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) @@ -1870,9 +1870,9 @@ EvtScript N(normalAction) = { EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar3) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, LVar3, 0) EVT_ADD(LVar0, 20) - EVT_CALL(PlayEffect, EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVarA, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVarA, 0) EVT_CALL(GetActorHP, ACTOR_SELF, LVarB) EVT_ADD(LVarB, LVarA) EVT_CALL(SetEnemyHP, ACTOR_SELF, LVarB) @@ -1902,16 +1902,16 @@ EvtScript N(attackWindBreath) = { EVT_DIVF(LVar4, EVT_FLOAT(100.0)) EVT_ADD(LVar0, LVar3) EVT_ADD(LVar1, LVar4) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 1, LVar0, LVar1, LVar2, EVT_FLOAT(190.0), EVT_FLOAT(-1.0), EVT_FLOAT(1.5), 100, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 1, LVar0, LVar1, LVar2, EVT_FLOAT(190.0), EVT_FLOAT(-1.0), EVT_FLOAT(1.5), 100, 0) EVT_CALL(N(StartRumbleWithParams), 80, 150) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 75, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 75, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_THREAD EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar2) EVT_SET(LVar3, LVar2) EVT_ADD(LVar3, 25) - EVT_CALL(MakeLerp, LVar2, LVar3, 90, 11) + EVT_CALL(MakeLerp, LVar2, LVar3, 90, EASING_SIN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar0) @@ -1924,7 +1924,7 @@ EvtScript N(attackWindBreath) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_Y), LVar2) EVT_SET(LVar3, LVar2) EVT_ADD(LVar3, 25) - EVT_CALL(MakeLerp, LVar2, LVar3, 90, 11) + EVT_CALL(MakeLerp, LVar2, LVar3, 90, EASING_SIN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_SCALE_Y), LVar0) @@ -1966,7 +1966,7 @@ EvtScript N(attackWindBreath) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar2) EVT_SET(LVar3, LVar2) EVT_SUB(LVar3, 25) - EVT_CALL(MakeLerp, LVar2, LVar3, 40, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 40, EASING_CUBIC_IN) EVT_LABEL(2) EVT_CALL(UpdateLerp) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar0) @@ -1979,7 +1979,7 @@ EvtScript N(attackWindBreath) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_Y), LVar2) EVT_SET(LVar3, LVar2) EVT_SUB(LVar3, 25) - EVT_CALL(MakeLerp, LVar2, LVar3, 40, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 40, EASING_CUBIC_IN) EVT_LABEL(3) EVT_CALL(UpdateLerp) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_SCALE_Y), LVar0) @@ -1997,10 +1997,10 @@ EvtScript N(attackWindBreath) = { EVT_DIVF(LVar4, EVT_FLOAT(100.0)) EVT_ADD(LVar0, LVar3) EVT_ADD(LVar1, LVar4) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(190.0), EVT_FLOAT(1.5), EVT_FLOAT(1.0), 40, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(190.0), EVT_FLOAT(1.5), EVT_FLOAT(1.0), 40, 0) EVT_CALL(N(StartRumbleWithParams), 80, 60) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 30, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 30, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_LOOP(10) EVT_CALL(RandInt, 150, LVar3) @@ -2014,7 +2014,7 @@ EvtScript N(attackWindBreath) = { EVT_CALL(RandInt, 40, LVar6) EVT_ADDF(LVar5, LVar6) EVT_DIVF(LVar5, EVT_FLOAT(10.0)) - EVT_CALL(PlayEffect, EFFECT_MOVING_CLOUD, 0, 200, LVar3, 5, -200, LVar4, 5, LVar5, LVar4, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_MOVING_CLOUD, 0, 200, LVar3, 5, -200, LVar4, 5, LVar5, LVar4, 0) EVT_CALL(RandInt, 5, LVar0) EVT_ADD(LVar0, 5) EVT_WAIT(LVar0) @@ -2034,19 +2034,19 @@ EvtScript N(attackWindBreath) = { EVT_END_SWITCH EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_STONE) - EVT_CALL(ShowMessageBox, 49, 180) - EVT_CALL(ShowActionHud, 1) + EVT_CALL(ShowMessageBox, BTL_MSG_31, 180) + EVT_CALL(ShowActionHud, TRUE) EVT_CALL(LoadActionCommand, ACTION_COMMAND_WHIRLWIND) EVT_CALL(action_command_whirlwind_init, 0) EVT_CALL(SetupMashMeter, 5, 20, 40, 60, 80, 100) EVT_WAIT(10) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(action_command_whirlwind_start, 0, 200, 3) EVT_THREAD EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar2) EVT_SET(LVar3, LVar2) EVT_SUB(LVar3, 25) - EVT_CALL(MakeLerp, LVar2, LVar3, 200, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 200, EASING_CUBIC_IN) EVT_LABEL(4) EVT_CALL(UpdateLerp) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar0) @@ -2059,7 +2059,7 @@ EvtScript N(attackWindBreath) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_Y), LVar2) EVT_SET(LVar3, LVar2) EVT_SUB(LVar3, 25) - EVT_CALL(MakeLerp, LVar2, LVar3, 200, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 200, EASING_CUBIC_IN) EVT_LABEL(5) EVT_CALL(UpdateLerp) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_SCALE_Y), LVar0) @@ -2077,10 +2077,10 @@ EvtScript N(attackWindBreath) = { EVT_DIVF(LVar4, EVT_FLOAT(100.0)) EVT_ADD(LVar0, LVar3) EVT_ADD(LVar1, LVar4) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(190.0), EVT_FLOAT(1.5), EVT_FLOAT(1.0), 200, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(190.0), EVT_FLOAT(1.5), EVT_FLOAT(1.0), 200, 0) EVT_CALL(N(StartRumbleWithParams), 100, 350) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 175, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 175, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_THREAD EVT_LOOP(25) @@ -2095,13 +2095,13 @@ EvtScript N(attackWindBreath) = { EVT_CALL(RandInt, 40, LVar6) EVT_ADDF(LVar5, LVar6) EVT_DIVF(LVar5, EVT_FLOAT(10.0)) - EVT_CALL(PlayEffect, EFFECT_MOVING_CLOUD, 0, 200, LVar3, 5, -200, LVar4, 5, LVar5, LVar4, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_MOVING_CLOUD, 0, 200, LVar3, 5, -200, LVar4, 5, LVar5, LVar4, 0) EVT_CALL(RandInt, 5, LVar0) EVT_ADD(LVar0, 5) EVT_WAIT(LVar0) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(MakeLerp, 0, 7200, 200, 11) + EVT_CALL(MakeLerp, 0, 0x00001C20, 200, EASING_SIN_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) EVT_CALL(SetActorYaw, ACTOR_PLAYER, LVar0) @@ -2115,7 +2115,7 @@ EvtScript N(attackWindBreath) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar2) EVT_SET(LVar3, LVar2) EVT_SUB(LVar3, 25) - EVT_CALL(MakeLerp, LVar2, LVar3, 100, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 100, EASING_CUBIC_IN) EVT_LABEL(6) EVT_CALL(UpdateLerp) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar0) @@ -2128,7 +2128,7 @@ EvtScript N(attackWindBreath) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_Y), LVar2) EVT_SET(LVar3, LVar2) EVT_SUB(LVar3, 25) - EVT_CALL(MakeLerp, LVar2, LVar3, 100, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 100, EASING_CUBIC_IN) EVT_LABEL(7) EVT_CALL(UpdateLerp) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_SCALE_Y), LVar0) @@ -2146,10 +2146,10 @@ EvtScript N(attackWindBreath) = { EVT_DIVF(LVar4, EVT_FLOAT(100.0)) EVT_ADD(LVar0, LVar3) EVT_ADD(LVar1, LVar4) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(190.0), EVT_FLOAT(1.5), EVT_FLOAT(1.0), 100, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(190.0), EVT_FLOAT(1.5), EVT_FLOAT(1.0), 100, 0) EVT_CALL(N(StartRumbleWithParams), 100, 200) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 100, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 100, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_THREAD EVT_LOOP(15) @@ -2164,7 +2164,7 @@ EvtScript N(attackWindBreath) = { EVT_CALL(RandInt, 40, LVar6) EVT_ADDF(LVar5, LVar6) EVT_DIVF(LVar5, EVT_FLOAT(10.0)) - EVT_CALL(PlayEffect, EFFECT_MOVING_CLOUD, 0, 200, LVar3, 5, -200, LVar4, 5, LVar5, LVar4, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_MOVING_CLOUD, 0, 200, LVar3, 5, -200, LVar4, 5, LVar5, LVar4, 0) EVT_CALL(RandInt, 5, LVar0) EVT_ADD(LVar0, 5) EVT_WAIT(LVar0) @@ -2222,11 +2222,11 @@ EvtScript N(electricCharge) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_charged1))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_charged2))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 3, EVT_PTR(N(idleAnimations_charged3))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ELECTRIFIED, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ELECTRIFIED, TRUE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35C) EVT_CALL(N(StartRumbleWithParams), 70, 120) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 60, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 60, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar3) @@ -2253,10 +2253,10 @@ EvtScript N(attackGroundLightning) = { EVT_CALL(MoveBattleCamOver, 60) EVT_CALL(N(StartRumbleWithParams), 70, 100) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 100, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 100, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_CALL(N(UnkBackgroundFunc3)) - EVT_CALL(MakeLerp, 0, 200, 60, 0) + EVT_CALL(MakeLerp, 0, 200, 60, EASING_LINEAR) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -2278,10 +2278,10 @@ EvtScript N(attackGroundLightning) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HuffNPuff_Anim0E) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim0F) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim10) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ELECTRIFIED, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ELECTRIFIED, FALSE) EVT_THREAD EVT_WAIT(20) - EVT_CALL(MakeLerp, 200, 0, 30, 0) + EVT_CALL(MakeLerp, 200, 0, 30, EASING_LINEAR) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -2296,13 +2296,13 @@ EvtScript N(attackGroundLightning) = { EVT_SUB(LVar2, 10) EVT_SET(LVar3, LVar0) EVT_SUB(LVar3, 30) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, 1, LVar2, EVT_FLOAT(3.0), 30, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, 1, LVar2, EVT_FLOAT(3.0), 30, 0) EVT_WAIT(5) EVT_CALL(N(StartRumbleWithParams), 256, 30) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(5.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(5.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(4.0)) EVT_END_THREAD EVT_SETF(LVar6, EVT_FLOAT(0.0)) EVT_LOOP(10) @@ -2310,7 +2310,7 @@ EvtScript N(attackGroundLightning) = { EVT_SET(LVar5, LVar2) EVT_ADDF(LVar6, EVT_FLOAT(36.0)) EVT_CALL(AddVectorPolar, LVar4, LVar5, EVT_FLOAT(300.0), LVar6) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar3, 1, LVar2, LVar4, 1, LVar5, EVT_FLOAT(4.0), 30, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar3, 1, LVar2, LVar4, 1, LVar5, EVT_FLOAT(4.0), 30, 0) EVT_END_LOOP EVT_WAIT(10) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) @@ -2366,11 +2366,11 @@ EvtScript N(electicCharge_copy) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_charged1))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_charged2))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 3, EVT_PTR(N(idleAnimations_charged3))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ELECTRIFIED, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ELECTRIFIED, TRUE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35C) EVT_CALL(N(StartRumbleWithParams), 70, 120) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 60, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 60, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar3) @@ -2397,11 +2397,11 @@ EvtScript N(attackDirectLightning) = { EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(N(StartRumbleWithParams), 70, 80) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 40, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 40, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_THREAD EVT_CALL(N(UnkBackgroundFunc3)) - EVT_CALL(MakeLerp, 0, 200, 40, 0) + EVT_CALL(MakeLerp, 0, 200, 40, EASING_LINEAR) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -2429,7 +2429,7 @@ EvtScript N(attackDirectLightning) = { EVT_DIVF(LVar3, EVT_FLOAT(100.0)) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, LVar3, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, 20, 40, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, EASING_SIN_OUT) EVT_WAIT(30) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_THREAD_ID), LVarA) EVT_KILL_THREAD(LVarA) @@ -2442,10 +2442,10 @@ EvtScript N(attackDirectLightning) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HuffNPuff_Anim0E) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim0F) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim10) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ELECTRIFIED, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ELECTRIFIED, FALSE) EVT_THREAD EVT_WAIT(20) - EVT_CALL(MakeLerp, 200, 0, 30, 0) + EVT_CALL(MakeLerp, 200, 0, 30, EASING_LINEAR) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -2464,7 +2464,7 @@ EvtScript N(attackDirectLightning) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVarD, LVarE, LVarF) EVT_SUB(LVarD, 100) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVarA, LVarB, LVarC, LVarD, 0, LVarF, EVT_FLOAT(1.5), 20, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVarA, LVarB, LVarC, LVarD, 0, LVarF, EVT_FLOAT(1.5), 20, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HuffNPuff_Anim04) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim05) @@ -2472,7 +2472,7 @@ EvtScript N(attackDirectLightning) = { EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, EASING_SIN_OUT) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_EQ(HIT_RESULT_MISS) @@ -2493,27 +2493,27 @@ EvtScript N(attackDirectLightning) = { EVT_SETF(LVar9, LVar8) EVT_MULF(LVar9, 3) EVT_ADDF(LVar9, LVar0) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0) EVT_WAIT(3) EVT_SETF(LVar9, LVar8) EVT_MULF(LVar9, 1) EVT_ADDF(LVar9, LVar0) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0) EVT_WAIT(3) EVT_SETF(LVar9, LVar8) EVT_MULF(LVar9, 4) EVT_ADDF(LVar9, LVar0) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0) EVT_WAIT(3) EVT_SETF(LVar9, LVar8) EVT_MULF(LVar9, 2) EVT_ADDF(LVar9, LVar0) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0) EVT_WAIT(3) EVT_SETF(LVar9, LVar8) EVT_MULF(LVar9, 5) EVT_ADDF(LVar9, LVar0) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0) EVT_END_THREAD EVT_WAIT(2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HuffNPuff_Anim04) @@ -2522,7 +2522,7 @@ EvtScript N(attackDirectLightning) = { EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, EASING_SIN_OUT) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_SWITCH @@ -2543,27 +2543,27 @@ EvtScript N(attackDirectLightning) = { EVT_SETF(LVar9, LVar8) EVT_MULF(LVar9, 3) EVT_ADDF(LVar9, LVar0) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0) EVT_WAIT(3) EVT_SETF(LVar9, LVar8) EVT_MULF(LVar9, 1) EVT_ADDF(LVar9, LVar0) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0) EVT_WAIT(3) EVT_SETF(LVar9, LVar8) EVT_MULF(LVar9, 4) EVT_ADDF(LVar9, LVar0) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0) EVT_WAIT(3) EVT_SETF(LVar9, LVar8) EVT_MULF(LVar9, 2) EVT_ADDF(LVar9, LVar0) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0) EVT_WAIT(3) EVT_SETF(LVar9, LVar8) EVT_MULF(LVar9, 5) EVT_ADDF(LVar9, LVar0) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar9, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.2), 10, 0) EVT_END_THREAD EVT_WAIT(2) EVT_WAIT(2) @@ -2579,7 +2579,7 @@ EvtScript N(attackDirectLightning) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim02) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim03) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, EASING_SIN_OUT) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -2654,7 +2654,7 @@ EvtScript N(attackGroundSlam) = { EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(4), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(4), LVarA, LVarB, LVarF) - EVT_CALL(FlyToGoal, ArrayVar(4), 20, 10, 1) + EVT_CALL(FlyToGoal, ArrayVar(4), 20, 10, EASING_QUADRATIC_IN) EVT_SET(LVarD, LVarA) EVT_SET(LVarE, LVarC) EVT_SET(LVarF, 4) @@ -2683,7 +2683,7 @@ EvtScript N(attackGroundSlam) = { EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(9), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(9), LVarA, LVarB, LVarF) - EVT_CALL(FlyToGoal, ArrayVar(9), 20, 10, 1) + EVT_CALL(FlyToGoal, ArrayVar(9), 20, 10, EASING_QUADRATIC_IN) EVT_SET(LVarD, LVarA) EVT_SET(LVarE, LVarC) EVT_SET(LVarF, 9) @@ -2712,7 +2712,7 @@ EvtScript N(attackGroundSlam) = { EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(3), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(3), LVarA, LVarB, LVarF) - EVT_CALL(FlyToGoal, ArrayVar(3), 20, 10, 1) + EVT_CALL(FlyToGoal, ArrayVar(3), 20, 10, EASING_QUADRATIC_IN) EVT_SET(LVarD, LVarA) EVT_SET(LVarE, LVarC) EVT_SET(LVarF, 3) @@ -2741,7 +2741,7 @@ EvtScript N(attackGroundSlam) = { EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(5), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(5), LVarA, LVarB, LVarF) - EVT_CALL(FlyToGoal, ArrayVar(5), 20, 10, 1) + EVT_CALL(FlyToGoal, ArrayVar(5), 20, 10, EASING_QUADRATIC_IN) EVT_SET(LVarD, LVarA) EVT_SET(LVarE, LVarC) EVT_SET(LVarF, 5) @@ -2770,7 +2770,7 @@ EvtScript N(attackGroundSlam) = { EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(1), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(1), LVarA, LVarB, LVarF) - EVT_CALL(FlyToGoal, ArrayVar(1), 20, 10, 1) + EVT_CALL(FlyToGoal, ArrayVar(1), 20, 10, EASING_QUADRATIC_IN) EVT_SET(LVarD, LVarA) EVT_SET(LVarE, LVarC) EVT_SET(LVarF, 1) @@ -2799,7 +2799,7 @@ EvtScript N(attackGroundSlam) = { EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(0), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(0), LVarA, LVarB, LVarF) - EVT_CALL(FlyToGoal, ArrayVar(0), 20, 10, 1) + EVT_CALL(FlyToGoal, ArrayVar(0), 20, 10, EASING_QUADRATIC_IN) EVT_SET(LVarD, LVarA) EVT_SET(LVarE, LVarC) EVT_SET(LVarF, 0) @@ -2828,7 +2828,7 @@ EvtScript N(attackGroundSlam) = { EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(8), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(8), LVarA, LVarB, LVarF) - EVT_CALL(FlyToGoal, ArrayVar(8), 20, 10, 1) + EVT_CALL(FlyToGoal, ArrayVar(8), 20, 10, EASING_QUADRATIC_IN) EVT_SET(LVarD, LVarA) EVT_SET(LVarE, LVarC) EVT_SET(LVarF, 8) @@ -2857,7 +2857,7 @@ EvtScript N(attackGroundSlam) = { EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(2), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(2), LVarA, LVarB, LVarF) - EVT_CALL(FlyToGoal, ArrayVar(2), 20, 10, 1) + EVT_CALL(FlyToGoal, ArrayVar(2), 20, 10, EASING_QUADRATIC_IN) EVT_SET(LVarD, LVarA) EVT_SET(LVarE, LVarC) EVT_SET(LVarF, 2) @@ -2886,7 +2886,7 @@ EvtScript N(attackGroundSlam) = { EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(7), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(7), LVarA, LVarB, LVarF) - EVT_CALL(FlyToGoal, ArrayVar(7), 20, 10, 1) + EVT_CALL(FlyToGoal, ArrayVar(7), 20, 10, EASING_QUADRATIC_IN) EVT_SET(LVarD, LVarA) EVT_SET(LVarE, LVarC) EVT_SET(LVarF, 7) @@ -2915,7 +2915,7 @@ EvtScript N(attackGroundSlam) = { EVT_END_IF EVT_CALL(GetActorPos, ArrayVar(6), LVarD, LVarE, LVarF) EVT_CALL(SetGoalPos, ArrayVar(6), LVarA, LVarB, LVarF) - EVT_CALL(FlyToGoal, ArrayVar(6), 20, 10, 1) + EVT_CALL(FlyToGoal, ArrayVar(6), 20, 10, EASING_QUADRATIC_IN) EVT_SET(LVarD, LVarA) EVT_SET(LVarE, LVarC) EVT_SET(LVarF, 6) @@ -2931,7 +2931,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 10, 1) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 10, EASING_QUADRATIC_IN) EVT_WAIT(75) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_TUFF_PUFF_BIT_ARRAY), LVar0) EVT_IF_FLAG(LVar0, 0x00000001) @@ -2943,10 +2943,10 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(0), 1, 0, 0) + EVT_CALL(SetActorSounds, ArrayVar(0), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalPos, ArrayVar(0), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(0), 20, 0, 2) - EVT_CALL(ResetActorSounds, ArrayVar(0), 1) + EVT_CALL(FlyToGoal, ArrayVar(0), 20, 0, EASING_CUBIC_IN) + EVT_CALL(ResetActorSounds, ArrayVar(0), ACTOR_SOUND_FLY) EVT_END_THREAD EVT_END_IF EVT_IF_FLAG(LVar0, 0x00000002) @@ -2958,10 +2958,10 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(1), 1, 0, 0) + EVT_CALL(SetActorSounds, ArrayVar(1), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalPos, ArrayVar(1), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(1), 20, 0, 2) - EVT_CALL(ResetActorSounds, ArrayVar(1), 1) + EVT_CALL(FlyToGoal, ArrayVar(1), 20, 0, EASING_CUBIC_IN) + EVT_CALL(ResetActorSounds, ArrayVar(1), ACTOR_SOUND_FLY) EVT_END_THREAD EVT_END_IF EVT_IF_FLAG(LVar0, 0x00000004) @@ -2973,10 +2973,10 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(2), 1, 0, 0) + EVT_CALL(SetActorSounds, ArrayVar(2), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalPos, ArrayVar(2), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(2), 20, 0, 2) - EVT_CALL(ResetActorSounds, ArrayVar(2), 1) + EVT_CALL(FlyToGoal, ArrayVar(2), 20, 0, EASING_CUBIC_IN) + EVT_CALL(ResetActorSounds, ArrayVar(2), ACTOR_SOUND_FLY) EVT_END_THREAD EVT_END_IF EVT_IF_FLAG(LVar0, 0x00000008) @@ -2988,10 +2988,10 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(3), 1, 0, 0) + EVT_CALL(SetActorSounds, ArrayVar(3), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalPos, ArrayVar(3), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(3), 20, 0, 2) - EVT_CALL(ResetActorSounds, ArrayVar(3), 1) + EVT_CALL(FlyToGoal, ArrayVar(3), 20, 0, EASING_CUBIC_IN) + EVT_CALL(ResetActorSounds, ArrayVar(3), ACTOR_SOUND_FLY) EVT_END_THREAD EVT_END_IF EVT_IF_FLAG(LVar0, 0x00000010) @@ -3003,10 +3003,10 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(4), 1, 0, 0) + EVT_CALL(SetActorSounds, ArrayVar(4), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalPos, ArrayVar(4), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(4), 20, 0, 2) - EVT_CALL(ResetActorSounds, ArrayVar(4), 1) + EVT_CALL(FlyToGoal, ArrayVar(4), 20, 0, EASING_CUBIC_IN) + EVT_CALL(ResetActorSounds, ArrayVar(4), ACTOR_SOUND_FLY) EVT_END_THREAD EVT_END_IF EVT_IF_FLAG(LVar0, 0x00000020) @@ -3018,10 +3018,10 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(5), 1, 0, 0) + EVT_CALL(SetActorSounds, ArrayVar(5), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalPos, ArrayVar(5), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(5), 20, 0, 2) - EVT_CALL(ResetActorSounds, ArrayVar(5), 1) + EVT_CALL(FlyToGoal, ArrayVar(5), 20, 0, EASING_CUBIC_IN) + EVT_CALL(ResetActorSounds, ArrayVar(5), ACTOR_SOUND_FLY) EVT_END_THREAD EVT_END_IF EVT_IF_FLAG(LVar0, 0x00000040) @@ -3033,10 +3033,10 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(6), 1, 0, 0) + EVT_CALL(SetActorSounds, ArrayVar(6), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalPos, ArrayVar(6), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(6), 20, 0, 2) - EVT_CALL(ResetActorSounds, ArrayVar(6), 1) + EVT_CALL(FlyToGoal, ArrayVar(6), 20, 0, EASING_CUBIC_IN) + EVT_CALL(ResetActorSounds, ArrayVar(6), ACTOR_SOUND_FLY) EVT_END_THREAD EVT_END_IF EVT_IF_FLAG(LVar0, 0x00000080) @@ -3048,10 +3048,10 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(7), 1, 0, 0) + EVT_CALL(SetActorSounds, ArrayVar(7), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalPos, ArrayVar(7), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(7), 20, 0, 2) - EVT_CALL(ResetActorSounds, ArrayVar(7), 1) + EVT_CALL(FlyToGoal, ArrayVar(7), 20, 0, EASING_CUBIC_IN) + EVT_CALL(ResetActorSounds, ArrayVar(7), ACTOR_SOUND_FLY) EVT_END_THREAD EVT_END_IF EVT_IF_FLAG(LVar0, 0x00000100) @@ -3063,10 +3063,10 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(8), 1, 0, 0) + EVT_CALL(SetActorSounds, ArrayVar(8), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalPos, ArrayVar(8), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(8), 20, 0, 2) - EVT_CALL(ResetActorSounds, ArrayVar(8), 1) + EVT_CALL(FlyToGoal, ArrayVar(8), 20, 0, EASING_CUBIC_IN) + EVT_CALL(ResetActorSounds, ArrayVar(8), ACTOR_SOUND_FLY) EVT_END_THREAD EVT_END_IF EVT_IF_FLAG(LVar0, 0x00000200) @@ -3078,13 +3078,13 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(9), 1, 0, 0) + EVT_CALL(SetActorSounds, ArrayVar(9), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalPos, ArrayVar(9), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(9), 20, 0, 2) - EVT_CALL(ResetActorSounds, ArrayVar(9), 1) + EVT_CALL(FlyToGoal, ArrayVar(9), 20, 0, EASING_CUBIC_IN) + EVT_CALL(ResetActorSounds, ArrayVar(9), ACTOR_SOUND_FLY) EVT_END_THREAD EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_THREAD EVT_WAIT(3) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E9) @@ -3094,20 +3094,20 @@ EvtScript N(attackGroundSlam) = { EVT_MUL(LVar4, 95) EVT_DIV(LVar4, 200) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar1, LVar4, LVar3) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, 2) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 1) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_CUBIC_IN) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 3, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 3, LVar0, 0, LVar2, 0) EVT_THREAD - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar1, LVar4, LVar3, 60, 8, 0, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar1, LVar4, LVar3, 60, 8, 0, 30, 0) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar1, LVar4, LVar3, 60, 8, 33, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar1, LVar4, LVar3, 60, 8, 33, 30, 0) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar1, LVar4, LVar3, 60, 8, 66, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar1, LVar4, LVar3, 60, 8, 66, 30, 0) EVT_END_THREAD EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 20, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 20, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_THREAD EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar0) @@ -3613,7 +3613,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(4)) - EVT_CALL(FlyToGoal, ArrayVar(4), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(4), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3627,7 +3627,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(9)) - EVT_CALL(FlyToGoal, ArrayVar(9), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(9), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3641,7 +3641,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(3)) - EVT_CALL(FlyToGoal, ArrayVar(3), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(3), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3655,7 +3655,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(5)) - EVT_CALL(FlyToGoal, ArrayVar(5), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(5), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3669,7 +3669,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(1)) - EVT_CALL(FlyToGoal, ArrayVar(1), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(1), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3683,7 +3683,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(0)) - EVT_CALL(FlyToGoal, ArrayVar(0), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(0), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3697,7 +3697,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(8)) - EVT_CALL(FlyToGoal, ArrayVar(8), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(8), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3711,7 +3711,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(2)) - EVT_CALL(FlyToGoal, ArrayVar(2), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(2), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3725,7 +3725,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(7)) - EVT_CALL(FlyToGoal, ArrayVar(7), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(7), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3739,13 +3739,13 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(6)) - EVT_CALL(FlyToGoal, ArrayVar(6), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(6), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) EVT_END_IF EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -10, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -10, EASING_SIN_OUT) EVT_WAIT(15) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -3793,7 +3793,7 @@ EvtScript N(attackGroundSlam) = { EVT_WAIT(50) EVT_SET(LVarA, 0) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -10, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -10, EASING_SIN_OUT) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_TUFF_PUFF_BIT_ARRAY), LVar0) EVT_IF_FLAG(LVar0, 0x00000010) EVT_THREAD @@ -3804,7 +3804,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(4)) - EVT_CALL(FlyToGoal, ArrayVar(4), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(4), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3818,7 +3818,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(9)) - EVT_CALL(FlyToGoal, ArrayVar(9), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(9), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3832,7 +3832,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(3)) - EVT_CALL(FlyToGoal, ArrayVar(3), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(3), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3846,7 +3846,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(5)) - EVT_CALL(FlyToGoal, ArrayVar(5), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(5), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3860,7 +3860,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(1)) - EVT_CALL(FlyToGoal, ArrayVar(1), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(1), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3874,7 +3874,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(0)) - EVT_CALL(FlyToGoal, ArrayVar(0), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(0), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3888,7 +3888,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(8)) - EVT_CALL(FlyToGoal, ArrayVar(8), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(8), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3902,7 +3902,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(2)) - EVT_CALL(FlyToGoal, ArrayVar(2), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(2), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3916,7 +3916,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(7)) - EVT_CALL(FlyToGoal, ArrayVar(7), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(7), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -3930,7 +3930,7 @@ EvtScript N(attackGroundSlam) = { EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(6)) - EVT_CALL(FlyToGoal, ArrayVar(6), 20, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(6), 20, -10, EASING_SIN_OUT) EVT_END_THREAD EVT_ADD(LVarA, 1) EVT_WAIT(8) @@ -4016,7 +4016,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(GetActorPos, ArrayVar(4), LVar1, LVar2, LVar3) EVT_ADD(LVar2, 15) EVT_CALL(SetGoalPos, ArrayVar(4), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(4), 20, 0, 0) + EVT_CALL(FlyToGoal, ArrayVar(4), 20, 0, EASING_LINEAR) EVT_WAIT(3) EVT_END_THREAD EVT_END_IF @@ -4025,7 +4025,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(GetActorPos, ArrayVar(9), LVar1, LVar2, LVar3) EVT_ADD(LVar2, 15) EVT_CALL(SetGoalPos, ArrayVar(9), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(9), 20, 0, 0) + EVT_CALL(FlyToGoal, ArrayVar(9), 20, 0, EASING_LINEAR) EVT_WAIT(3) EVT_END_THREAD EVT_END_IF @@ -4034,7 +4034,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(GetActorPos, ArrayVar(3), LVar1, LVar2, LVar3) EVT_ADD(LVar2, 15) EVT_CALL(SetGoalPos, ArrayVar(3), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(3), 20, 0, 0) + EVT_CALL(FlyToGoal, ArrayVar(3), 20, 0, EASING_LINEAR) EVT_WAIT(3) EVT_END_THREAD EVT_END_IF @@ -4043,7 +4043,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(GetActorPos, ArrayVar(5), LVar1, LVar2, LVar3) EVT_ADD(LVar2, 15) EVT_CALL(SetGoalPos, ArrayVar(5), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(5), 20, 0, 0) + EVT_CALL(FlyToGoal, ArrayVar(5), 20, 0, EASING_LINEAR) EVT_WAIT(3) EVT_END_THREAD EVT_END_IF @@ -4052,7 +4052,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(GetActorPos, ArrayVar(1), LVar1, LVar2, LVar3) EVT_ADD(LVar2, 15) EVT_CALL(SetGoalPos, ArrayVar(1), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(1), 20, 0, 0) + EVT_CALL(FlyToGoal, ArrayVar(1), 20, 0, EASING_LINEAR) EVT_WAIT(3) EVT_END_THREAD EVT_END_IF @@ -4061,7 +4061,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(GetActorPos, ArrayVar(0), LVar1, LVar2, LVar3) EVT_ADD(LVar2, 15) EVT_CALL(SetGoalPos, ArrayVar(0), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(0), 20, 0, 0) + EVT_CALL(FlyToGoal, ArrayVar(0), 20, 0, EASING_LINEAR) EVT_WAIT(3) EVT_END_THREAD EVT_END_IF @@ -4070,7 +4070,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(GetActorPos, ArrayVar(8), LVar1, LVar2, LVar3) EVT_ADD(LVar2, 15) EVT_CALL(SetGoalPos, ArrayVar(8), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(8), 20, 0, 0) + EVT_CALL(FlyToGoal, ArrayVar(8), 20, 0, EASING_LINEAR) EVT_WAIT(3) EVT_END_THREAD EVT_END_IF @@ -4079,7 +4079,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(GetActorPos, ArrayVar(2), LVar1, LVar2, LVar3) EVT_ADD(LVar2, 15) EVT_CALL(SetGoalPos, ArrayVar(2), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(2), 20, 0, 0) + EVT_CALL(FlyToGoal, ArrayVar(2), 20, 0, EASING_LINEAR) EVT_WAIT(3) EVT_END_THREAD EVT_END_IF @@ -4088,7 +4088,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(GetActorPos, ArrayVar(7), LVar1, LVar2, LVar3) EVT_ADD(LVar2, 15) EVT_CALL(SetGoalPos, ArrayVar(7), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(7), 20, 0, 0) + EVT_CALL(FlyToGoal, ArrayVar(7), 20, 0, EASING_LINEAR) EVT_WAIT(3) EVT_END_THREAD EVT_END_IF @@ -4097,7 +4097,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(GetActorPos, ArrayVar(6), LVar1, LVar2, LVar3) EVT_ADD(LVar2, 15) EVT_CALL(SetGoalPos, ArrayVar(6), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(6), 20, 0, 0) + EVT_CALL(FlyToGoal, ArrayVar(6), 20, 0, EASING_LINEAR) EVT_WAIT(3) EVT_END_THREAD EVT_END_IF @@ -4172,7 +4172,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(4), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(4), 30, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(4), 30, -10, EASING_SIN_OUT) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar4, LVar5, LVar6) EVT_IF_LT(LVar1, LVar4) EVT_CALL(SetActorYaw, ArrayVar(4), 180) @@ -4206,7 +4206,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(9), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(9), 30, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(9), 30, -10, EASING_SIN_OUT) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar4, LVar5, LVar6) EVT_IF_LT(LVar1, LVar4) EVT_CALL(SetActorYaw, ArrayVar(9), 180) @@ -4240,7 +4240,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(3), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(3), 30, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(3), 30, -10, EASING_SIN_OUT) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar4, LVar5, LVar6) EVT_IF_LT(LVar1, LVar4) EVT_CALL(SetActorYaw, ArrayVar(3), 180) @@ -4274,7 +4274,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(5), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(5), 30, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(5), 30, -10, EASING_SIN_OUT) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar4, LVar5, LVar6) EVT_IF_LT(LVar1, LVar4) EVT_CALL(SetActorYaw, ArrayVar(5), 180) @@ -4308,7 +4308,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(1), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(1), 30, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(1), 30, -10, EASING_SIN_OUT) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar4, LVar5, LVar6) EVT_IF_LT(LVar1, LVar4) EVT_CALL(SetActorYaw, ArrayVar(1), 180) @@ -4342,7 +4342,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(0), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(0), 30, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(0), 30, -10, EASING_SIN_OUT) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar4, LVar5, LVar6) EVT_IF_LT(LVar1, LVar4) EVT_CALL(SetActorYaw, ArrayVar(0), 180) @@ -4376,7 +4376,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(8), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(8), 30, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(8), 30, -10, EASING_SIN_OUT) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar4, LVar5, LVar6) EVT_IF_LT(LVar1, LVar4) EVT_CALL(SetActorYaw, ArrayVar(8), 180) @@ -4410,7 +4410,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(2), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(2), 30, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(2), 30, -10, EASING_SIN_OUT) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar4, LVar5, LVar6) EVT_IF_LT(LVar1, LVar4) EVT_CALL(SetActorYaw, ArrayVar(2), 180) @@ -4444,7 +4444,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(7), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(7), 30, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(7), 30, -10, EASING_SIN_OUT) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar4, LVar5, LVar6) EVT_IF_LT(LVar1, LVar4) EVT_CALL(SetActorYaw, ArrayVar(7), 180) @@ -4478,7 +4478,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalPos, ArrayVar(6), LVar1, LVar2, LVar3) - EVT_CALL(FlyToGoal, ArrayVar(6), 30, -10, 11) + EVT_CALL(FlyToGoal, ArrayVar(6), 30, -10, EASING_SIN_OUT) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar4, LVar5, LVar6) EVT_IF_LT(LVar1, LVar4) EVT_CALL(SetActorYaw, ArrayVar(6), 180) @@ -4825,7 +4825,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(4)) - EVT_CALL(FlyToGoal, ArrayVar(4), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(4), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(4), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(4), 0) EVT_CALL(GetActorVar, ArrayVar(4), 0, LVar1) @@ -4854,7 +4854,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(9)) - EVT_CALL(FlyToGoal, ArrayVar(9), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(9), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(9), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(9), 0) EVT_CALL(GetActorVar, ArrayVar(9), 0, LVar1) @@ -4883,7 +4883,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(3)) - EVT_CALL(FlyToGoal, ArrayVar(3), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(3), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(3), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(3), 0) EVT_CALL(GetActorVar, ArrayVar(3), 0, LVar1) @@ -4912,7 +4912,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(5)) - EVT_CALL(FlyToGoal, ArrayVar(5), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(5), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(5), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(5), 0) EVT_CALL(GetActorVar, ArrayVar(5), 0, LVar1) @@ -4941,7 +4941,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(1)) - EVT_CALL(FlyToGoal, ArrayVar(1), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(1), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(1), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(1), 0) EVT_CALL(GetActorVar, ArrayVar(1), 0, LVar1) @@ -4970,7 +4970,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(0)) - EVT_CALL(FlyToGoal, ArrayVar(0), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(0), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(0), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(0), 0) EVT_CALL(GetActorVar, ArrayVar(0), 0, LVar1) @@ -4999,7 +4999,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(8)) - EVT_CALL(FlyToGoal, ArrayVar(8), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(8), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(8), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(8), 0) EVT_CALL(GetActorVar, ArrayVar(8), 0, LVar1) @@ -5028,7 +5028,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(2)) - EVT_CALL(FlyToGoal, ArrayVar(2), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(2), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(2), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(2), 0) EVT_CALL(GetActorVar, ArrayVar(2), 0, LVar1) @@ -5057,7 +5057,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(7)) - EVT_CALL(FlyToGoal, ArrayVar(7), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(7), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(7), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(7), 0) EVT_CALL(GetActorVar, ArrayVar(7), 0, LVar1) @@ -5086,7 +5086,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(6)) - EVT_CALL(FlyToGoal, ArrayVar(6), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(6), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(6), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(6), 0) EVT_CALL(GetActorVar, ArrayVar(6), 0, LVar1) @@ -5126,13 +5126,13 @@ EvtScript N(attackTuffPuffs) = { EVT_WAIT(1) EVT_END_LOOP EVT_ELSE - EVT_CALL(ShowMessageBox, 49, 180) - EVT_CALL(ShowActionHud, 1) + EVT_CALL(ShowMessageBox, BTL_MSG_31, 180) + EVT_CALL(ShowActionHud, TRUE) EVT_CALL(LoadActionCommand, ACTION_COMMAND_STOP_LEECH) EVT_CALL(action_command_stop_leech_init) EVT_CALL(SetupMashMeter, 1, 25, 0, 0, 0, 0) EVT_WAIT(10) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(action_command_stop_leech_start, 0, 32767, 3) EVT_SET(LVarB, LVarA) EVT_DIV(LVarB, 2) @@ -5428,7 +5428,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(4)) - EVT_CALL(FlyToGoal, ArrayVar(4), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(4), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(4), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(4), 0) EVT_CALL(GetActorVar, ArrayVar(4), 0, LVar1) @@ -5457,7 +5457,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(9)) - EVT_CALL(FlyToGoal, ArrayVar(9), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(9), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(9), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(9), 0) EVT_CALL(GetActorVar, ArrayVar(9), 0, LVar1) @@ -5486,7 +5486,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(3)) - EVT_CALL(FlyToGoal, ArrayVar(3), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(3), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(3), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(3), 0) EVT_CALL(GetActorVar, ArrayVar(3), 0, LVar1) @@ -5515,7 +5515,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(5)) - EVT_CALL(FlyToGoal, ArrayVar(5), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(5), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(5), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(5), 0) EVT_CALL(GetActorVar, ArrayVar(5), 0, LVar1) @@ -5544,7 +5544,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(1)) - EVT_CALL(FlyToGoal, ArrayVar(1), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(1), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(1), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(1), 0) EVT_CALL(GetActorVar, ArrayVar(1), 0, LVar1) @@ -5573,7 +5573,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(0)) - EVT_CALL(FlyToGoal, ArrayVar(0), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(0), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(0), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(0), 0) EVT_CALL(GetActorVar, ArrayVar(0), 0, LVar1) @@ -5602,7 +5602,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(8)) - EVT_CALL(FlyToGoal, ArrayVar(8), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(8), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(8), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(8), 0) EVT_CALL(GetActorVar, ArrayVar(8), 0, LVar1) @@ -5631,7 +5631,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(2)) - EVT_CALL(FlyToGoal, ArrayVar(2), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(2), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(2), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(2), 0) EVT_CALL(GetActorVar, ArrayVar(2), 0, LVar1) @@ -5660,7 +5660,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(7)) - EVT_CALL(FlyToGoal, ArrayVar(7), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(7), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(7), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(7), 0) EVT_CALL(GetActorVar, ArrayVar(7), 0, LVar1) @@ -5689,7 +5689,7 @@ EvtScript N(attackTuffPuffs) = { EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6) EVT_END_IF EVT_CALL(SetGoalToHome, ArrayVar(6)) - EVT_CALL(FlyToGoal, ArrayVar(6), 30, 10, 11) + EVT_CALL(FlyToGoal, ArrayVar(6), 30, 10, EASING_SIN_OUT) EVT_CALL(SetPartAlpha, ArrayVar(6), 1, 255) EVT_CALL(SetActorYaw, ArrayVar(6), 0) EVT_CALL(GetActorVar, ArrayVar(6), 0, LVar1) diff --git a/src/battle/area/flo2/actor/monty_mole_boss.c b/src/battle/area/flo2/actor/monty_mole_boss.c index 39b7faa2ef..01f8409389 100644 --- a/src/battle/area/flo2/actor/monty_mole_boss.c +++ b/src/battle/area/flo2/actor/monty_mole_boss.c @@ -91,7 +91,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 12, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 50, .airLiftChance = 55, @@ -166,7 +166,7 @@ ActorBlueprint N(hole) = { .maxHP = 5, .partCount = ARRAY_COUNT(N(parts_hole)), .partsData = N(parts_hole), - .takeTurnScript = &N(init_hole), + .initScript = &N(init_hole), .statusTable = NULL, .escapeChance = 80, .airLiftChance = 0, @@ -210,7 +210,7 @@ EvtScript N(init) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_RETURN EVT_END }; @@ -304,7 +304,7 @@ EvtScript N(handleEvent) = { EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MontyMole_Dark_Anim08) EVT_WAIT(15) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TARGET_ONLY | ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TARGET_ONLY | ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_hole))) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) @@ -369,7 +369,7 @@ EvtScript N(takeTurn) = { EVT_ADD(LVar1, 20) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) @@ -377,7 +377,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_IF EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 3, SOUND_MOLE_THROW) - EVT_CALL(SetPartSounds, ACTOR_SELF, 3, 1, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 3, ACTOR_SOUND_FLY, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -391,8 +391,8 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 3, EVT_FLOAT(12.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(0.1)) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_MontyMole_Dark_Anim0F) - EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 30, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 30, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -408,7 +408,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 3, EVT_FLOAT(12.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(0.1)) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_MontyMole_Dark_Anim0F) - EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 20, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 20, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) @@ -419,11 +419,11 @@ EvtScript N(takeTurn) = { EVT_SET(LVar1, 0) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 3, EVT_FLOAT(6.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(0.1)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 25, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 25, EASING_LINEAR) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 3, EVT_FLOAT(4.0)) EVT_SUB(LVar0, 20) - EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 21, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 21, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/area/flo2/actor/spike.c b/src/battle/area/flo2/actor/spike.c index 9f4dd10511..81713dbcfd 100644 --- a/src/battle/area/flo2/actor/spike.c +++ b/src/battle/area/flo2/actor/spike.c @@ -93,7 +93,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 50, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -126,7 +126,7 @@ EvtScript N(returnHome) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Idle) EVT_RETURN EVT_END @@ -244,7 +244,7 @@ EvtScript N(attack) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, 20, 30, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Idle) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -261,7 +261,7 @@ EvtScript N(attack) = { EVT_END_IF EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_BattleLakilester_Spiny) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_LiftSpiny) EVT_LOOP(4) @@ -287,7 +287,7 @@ EvtScript N(attack) = { EVT_ADD(LVar2, 5) EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2C5) EVT_THREAD EVT_LOOP(15) @@ -310,7 +310,7 @@ EvtScript N(attack) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_ThrowSpiny) EVT_WAIT(3) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 2, SOUND_2C6) - EVT_CALL(SetPartSounds, ACTOR_SELF, 2, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 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) @@ -323,12 +323,12 @@ EvtScript N(attack) = { EVT_CALL(RandInt, 100, LVar3) EVT_SUB(LVar3, 50) EVT_ADD(LVar0, LVar3) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 20, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_THREAD EVT_ADD(LVar0, -50) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 15, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 15, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -336,7 +336,7 @@ EvtScript N(attack) = { EVT_WAIT(15) EVT_CALL(YieldTurn) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -350,12 +350,12 @@ EvtScript N(attack) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(1.5)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 20, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_THREAD EVT_ADD(LVar0, -50) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 15, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 15, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) diff --git a/src/battle/area/flo2/actor/tuff_puff.c b/src/battle/area/flo2/actor/tuff_puff.c index 1e12fe13f4..94b81268dd 100644 --- a/src/battle/area/flo2/actor/tuff_puff.c +++ b/src/battle/area/flo2/actor/tuff_puff.c @@ -118,7 +118,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 1, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, diff --git a/src/battle/area/flo2/stage/flo_01.c b/src/battle/area/flo2/stage/flo_01.c index c3a7dd4750..b9abc65b4c 100644 --- a/src/battle/area/flo2/stage/flo_01.c +++ b/src/battle/area/flo2/stage/flo_01.c @@ -1,93 +1,7 @@ #include "common.h" #include "battle/battle.h" #include "mapfs/flo_bt01_shape.h" -#include "effects.h" #define NAMESPACE b_area_flo2_flo_01 -EvtScript N(80230E90) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 40, LVar2) - EVT_SUB(LVar2, 100) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 20, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80230FA8) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 50, LVar2) - EVT_ADD(LVar2, 71) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(802310C0) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 50) - EVT_CALL(RandInt, 40, LVar2) - EVT_ADD(LVar2, -124) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 37, 1) - EVT_CALL(SetGroupEnabled, 28, 0) - EVT_CALL(SetGroupEnabled, 22, 0) - EVT_EXEC(N(80230E90)) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_o400, MODEL_o401, MODEL_o407, MODEL_o411, MODEL_o422, MODEL_o423, MODEL_o424, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt01_shape", - .hit = "flo_bt01_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_01.inc.c" diff --git a/src/battle/area/flo2/stage/flo_01b.c b/src/battle/area/flo2/stage/flo_01b.c index c6587ca7b5..e844564ca4 100644 --- a/src/battle/area/flo2/stage/flo_01b.c +++ b/src/battle/area/flo2/stage/flo_01b.c @@ -1,93 +1,7 @@ #include "common.h" #include "battle/battle.h" #include "mapfs/flo_bt01_shape.h" -#include "effects.h" #define NAMESPACE b_area_flo2_flo_01b -EvtScript N(80231330) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 40, LVar2) - EVT_SUB(LVar2, 100) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 20, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80231448) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 50, LVar2) - EVT_ADD(LVar2, 71) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80231560) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 50) - EVT_CALL(RandInt, 40, LVar2) - EVT_ADD(LVar2, -124) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 37, 0) - EVT_CALL(SetGroupEnabled, 28, 1) - EVT_CALL(SetGroupEnabled, 22, 0) - EVT_EXEC(N(80231330)) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_kuki, MODEL_hana1, MODEL_mae1, MODEL_mae2, MODEL_mae3, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt01_shape", - .hit = "flo_bt01_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_01b.inc.c" diff --git a/src/battle/area/flo2/stage/flo_01c.c b/src/battle/area/flo2/stage/flo_01c.c index dbcb4a0cb5..7edbb3f34e 100644 --- a/src/battle/area/flo2/stage/flo_01c.c +++ b/src/battle/area/flo2/stage/flo_01c.c @@ -5,90 +5,4 @@ #define NAMESPACE b_area_flo2_flo_01c -EvtScript N(802317C0) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 40, LVar2) - EVT_SUB(LVar2, 100) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 20, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(802318D8) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 50, LVar2) - EVT_ADD(LVar2, 71) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(802319F0) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 50) - EVT_CALL(RandInt, 40, LVar2) - EVT_ADD(LVar2, -124) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 37, 0) - EVT_CALL(SetGroupEnabled, 28, 0) - EVT_CALL(SetGroupEnabled, 22, 1) - EVT_EXEC(N(802317C0)) - EVT_EXEC(N(802318D8)) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_o381, MODEL_o382, MODEL_o388, MODEL_o389, MODEL_o390, MODEL_o383, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt01_shape", - .hit = "flo_bt01_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_01c.inc.c" diff --git a/src/battle/area/flo2/stage/flo_02.c b/src/battle/area/flo2/stage/flo_02.c index 661a7201df..6dfc8f89df 100644 --- a/src/battle/area/flo2/stage/flo_02.c +++ b/src/battle/area/flo2/stage/flo_02.c @@ -1,93 +1,7 @@ #include "common.h" #include "battle/battle.h" #include "mapfs/flo_bt02_shape.h" -#include "effects.h" #define NAMESPACE b_area_flo2_flo_02 -EvtScript N(80231C60) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 40, LVar2) - EVT_SUB(LVar2, 100) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 20, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80231D78) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 50, LVar2) - EVT_ADD(LVar2, 71) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80231E90) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 50) - EVT_CALL(RandInt, 40, LVar2) - EVT_ADD(LVar2, -124) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 35, 1) - EVT_CALL(SetGroupEnabled, 47, 0) - EVT_CALL(SetGroupEnabled, 22, 0) - EVT_EXEC(N(80231E90)) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_o403, MODEL_o404, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt02_shape", - .hit = "flo_bt02_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_02.inc.c" diff --git a/src/battle/area/flo2/stage/flo_02b.c b/src/battle/area/flo2/stage/flo_02b.c index 8756c537df..8f103b094c 100644 --- a/src/battle/area/flo2/stage/flo_02b.c +++ b/src/battle/area/flo2/stage/flo_02b.c @@ -1,94 +1,7 @@ #include "common.h" #include "battle/battle.h" #include "mapfs/flo_bt02_shape.h" -#include "effects.h" #define NAMESPACE b_area_flo2_flo_02b -EvtScript N(802320E0) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 40, LVar2) - EVT_SUB(LVar2, 100) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 20, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(802321F8) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 50, LVar2) - EVT_ADD(LVar2, 71) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80232310) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 50) - EVT_CALL(RandInt, 40, LVar2) - EVT_ADD(LVar2, -124) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 35, 0) - EVT_CALL(SetGroupEnabled, 47, 1) - EVT_CALL(SetGroupEnabled, 22, 0) - EVT_EXEC(N(80232310)) - EVT_CALL(ModifyColliderFlags, 3, 0, 0x00000006) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_8hana4, MODEL_8hana5, MODEL_8hana6, MODEL_8hana1, MODEL_8hana1, MODEL_8hana3, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt02_shape", - .hit = "flo_bt02_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_02b.inc.c" diff --git a/src/battle/area/flo2/stage/flo_02c.c b/src/battle/area/flo2/stage/flo_02c.c index 03756934e6..6be879aa92 100644 --- a/src/battle/area/flo2/stage/flo_02c.c +++ b/src/battle/area/flo2/stage/flo_02c.c @@ -1,94 +1,7 @@ #include "common.h" #include "battle/battle.h" #include "mapfs/flo_bt02_shape.h" -#include "effects.h" #define NAMESPACE b_area_flo2_flo_02c -EvtScript N(80232590) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 40, LVar2) - EVT_SUB(LVar2, 100) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 20, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(802326A8) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 0) - EVT_CALL(RandInt, 50, LVar2) - EVT_ADD(LVar2, 71) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(802327C0) = { - EVT_LABEL(0) - EVT_CALL(RandInt, 250, LVar0) - EVT_SUB(LVar0, 125) - EVT_SET(LVar1, 50) - EVT_CALL(RandInt, 40, LVar2) - EVT_ADD(LVar2, -124) - EVT_CALL(RandInt, 30, LVar3) - EVT_ADD(LVar3, 90) - EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 20) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 35, 1) - EVT_CALL(SetGroupEnabled, 47, 0) - EVT_CALL(SetGroupEnabled, 16, 0) - EVT_CALL(SetGroupEnabled, 22, 1) - EVT_EXEC(N(802327C0)) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_o403, MODEL_o404, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt02_shape", - .hit = "flo_bt02_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_02c.inc.c" diff --git a/src/battle/area/flo2/stage/flo_03.c b/src/battle/area/flo2/stage/flo_03.c index 2a1c441287..2e01129d6d 100644 --- a/src/battle/area/flo2/stage/flo_03.c +++ b/src/battle/area/flo2/stage/flo_03.c @@ -4,189 +4,4 @@ #define NAMESPACE b_area_flo2_flo_03 -EvtScript N(80232A30) = { - EVT_SET(LVarA, LVar0) - EVT_USE_BUF(LVarA) - EVT_LOOP(0) - EVT_BUF_READ1(LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_CALL(SetTexPanner, LVar0, TEX_PANNER_E) - EVT_BUF_READ1(LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_BREAK_LOOP - EVT_END_IF - EVT_CALL(SetTexPanner, LVar0, TEX_PANNER_F) - EVT_END_LOOP - EVT_SET(LVar0, 0) - EVT_SET(LVar1, 0) - EVT_LABEL(0) - EVT_LABEL(0) - EVT_ADD(LVar0, -140) - EVT_IF_LT(LVar0, 0) - EVT_ADD(LVar0, 65536) - EVT_END_IF - EVT_CALL(SetTexPanOffset, TEX_PANNER_E, TEX_PANNER_MAIN, LVar0, 0) - EVT_ADD(LVar1, -200) - EVT_IF_LT(LVar1, 0) - EVT_ADD(LVar1, 65536) - EVT_END_IF - EVT_CALL(SetTexPanOffset, TEX_PANNER_F, TEX_PANNER_MAIN, LVar1, 0) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -#include "common/CosInterpMinMax.inc.c" - -EvtScript N(80232C48) = { - EVT_CALL(EnableModel, LVarF, 1) - EVT_SET(LVarE, 159) - EVT_LOOP(LVarE) - EVT_ADDF(LVar3, 0) - EVT_ADDF(LVar4, EVT_FLOAT(0.0)) - EVT_SETF(LVar5, EVT_FLOAT(0.01)) - EVT_ADDF(LVar0, LVar3) - EVT_ADDF(LVar1, LVar4) - EVT_ADDF(LVar2, LVar5) - EVT_MULF(LVar6, EVT_FLOAT(1.01)) - EVT_ADDF(LVar7, EVT_FLOAT(0.01)) - EVT_SETF(LVar8, LVar6) - EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 15, 0, 0) - EVT_ADDF(LVar8, LVarA) - EVT_SETF(LVar9, LVar7) - EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 20, 0, 90) - EVT_ADDF(LVar9, LVarA) - EVT_SETF(LVarA, LVar0) - EVT_MULF(LVarA, EVT_FLOAT(10.0)) - EVT_CALL(TranslateModel, LVarF, LVar0, LVar1, LVar2) - EVT_CALL(ScaleModel, LVarF, LVar8, LVar9, 1) - EVT_CALL(RotateModel, LVarF, LVarA, 0, 0, 1) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(EnableModel, LVarF, 0) - EVT_RETURN - EVT_END -}; - -s32 N(modelList)[] = { - MODEL_o419, MODEL_o420, MODEL_o422, 0, -}; - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_SET(LVar0, N(modelList)) - EVT_EXEC(N(80232A30)) - EVT_CALL(SetTexPanner, 36, TEX_PANNER_1) - EVT_CALL(SetTexPanner, 37, TEX_PANNER_2) - EVT_CALL(SetTexPanner, 38, TEX_PANNER_3) - EVT_CALL(SetTexPanner, 39, TEX_PANNER_4) - EVT_CALL(SetTexPanner, 40, TEX_PANNER_5) - EVT_CALL(SetTexPanner, 41, TEX_PANNER_6) - EVT_CALL(SetTexPanner, 42, TEX_PANNER_7) - EVT_THREAD - EVT_SET(LVarE, 1) - EVT_SET(LVarF, 0) - EVT_LOOP(0) - EVT_ADDF(LVarF, LVarE) - EVT_IF_GE(LVarF, 1080) - EVT_SET(LVarF, 0) - EVT_END_IF - EVT_SET(LVar0, LVarF) - EVT_DIV(LVar0, 9) - EVT_MOD(LVar0, 2) - EVT_MUL(LVar0, 16384) - EVT_SET(LVar1, LVarF) - EVT_DIV(LVar1, 4) - EVT_MOD(LVar1, 2) - EVT_MUL(LVar1, 16384) - EVT_SET(LVar2, LVarF) - EVT_DIV(LVar2, 5) - EVT_MOD(LVar2, 2) - EVT_MUL(LVar2, 16384) - EVT_SET(LVar3, LVarF) - EVT_DIV(LVar3, 6) - EVT_MOD(LVar3, 2) - EVT_MUL(LVar3, 16384) - EVT_SET(LVar4, LVarF) - EVT_DIV(LVar4, 2) - EVT_MOD(LVar4, 2) - EVT_MUL(LVar4, 16384) - EVT_SET(LVar5, LVarF) - EVT_DIV(LVar5, 8) - EVT_MOD(LVar5, 2) - EVT_MUL(LVar5, 16384) - EVT_SET(LVar6, LVarF) - EVT_DIV(LVar6, 8) - EVT_MOD(LVar6, 2) - EVT_MUL(LVar6, 32768) - EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) - EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar1, 0) - EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, LVar2, 0) - EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_MAIN, LVar3, 0) - EVT_CALL(SetTexPanOffset, TEX_PANNER_5, TEX_PANNER_MAIN, LVar4, 0) - EVT_CALL(SetTexPanOffset, TEX_PANNER_6, TEX_PANNER_MAIN, LVar5, 0) - EVT_CALL(SetTexPanOffset, TEX_PANNER_7, TEX_PANNER_MAIN, LVar6, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_THREAD - EVT_SET(LVar0, 0) - EVT_LOOP(16) - EVT_SET(LVar1, LVar0) - EVT_ADD(LVar1, 10000) - EVT_ADD(LVar0, 1) - EVT_CALL(CloneModel, 44, LVar1) - EVT_CALL(EnableModel, LVar1, 0) - EVT_END_LOOP - EVT_CALL(EnableModel, 44, 0) - EVT_SET(LVarE, 0) - EVT_LOOP(0) - EVT_SETF(LVar0, EVT_FLOAT(106.0)) - EVT_SETF(LVar1, EVT_FLOAT(94.0)) - EVT_SETF(LVar2, EVT_FLOAT(-91.0)) - EVT_CALL(RandInt, 100, LVar3) - EVT_ADDF(LVar3, -50) - EVT_DIVF(LVar3, EVT_FLOAT(200.0)) - EVT_SETF(LVar4, EVT_FLOAT(1.0)) - EVT_SETF(LVar5, 0) - EVT_SETF(LVar6, EVT_FLOAT(0.296)) - EVT_SETF(LVar7, EVT_FLOAT(0.296)) - EVT_SET(LVarF, LVarE) - EVT_ADD(LVarF, 10000) - EVT_EXEC(N(80232C48)) - EVT_ADD(LVarE, 1) - EVT_IF_GE(LVarE, 16) - EVT_SET(LVarE, 0) - EVT_END_IF - EVT_WAIT(10) - EVT_END_LOOP - EVT_END_THREAD - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_o411, MODEL_o415, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt03_shape", - .hit = "flo_bt03_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_03.inc.c" diff --git a/src/battle/area/flo2/stage/flo_04.c b/src/battle/area/flo2/stage/flo_04.c index d03fb8d7f8..5b27566929 100644 --- a/src/battle/area/flo2/stage/flo_04.c +++ b/src/battle/area/flo2/stage/flo_04.c @@ -4,87 +4,4 @@ #define NAMESPACE b_area_flo2_flo_04 -#include "common/CosInterpMinMax.inc.c" - -EvtScript N(80233470) = { - EVT_SET(LVarA, LVar0) - EVT_SET(LVarF, 0) - EVT_LOOP(0) - EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, EVT_FLOAT(0.968), EVT_FLOAT(1.031), 15, 0, 0) - EVT_CALL(N(CosInterpMinMax), LVarF, LVar1, EVT_FLOAT(1.031), EVT_FLOAT(0.968), 15, 0, 0) - EVT_CALL(ScaleModel, LVarA, LVar1, LVar0, 1) - EVT_ADD(LVarF, 1) - EVT_IF_GE(LVarF, 30) - EVT_SET(LVarF, 0) - EVT_END_IF - EVT_WAIT(1) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_SET(LVar0, 14) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 16) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 18) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 20) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 25) - EVT_EXEC(N(80233470)) - EVT_THREAD - EVT_SET(LVar0, 31) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 32) - EVT_EXEC(N(80233470)) - EVT_WAIT(5) - EVT_SET(LVar0, 0) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 1) - EVT_EXEC(N(80233470)) - EVT_WAIT(5) - EVT_SET(LVar0, 5) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 4) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 6) - EVT_EXEC(N(80233470)) - EVT_WAIT(5) - EVT_SET(LVar0, 33) - EVT_EXEC(N(80233470)) - EVT_SET(LVar0, 34) - EVT_EXEC(N(80233470)) - EVT_END_THREAD - EVT_CALL(CloneModel, 27, 10000) - EVT_CALL(EnableModel, 10000, 0) - EVT_CALL(TranslateModel, 10000, 0, 9, 0) - EVT_CALL(ParentColliderToModel, 0, 10000) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList)[] = { - -1, MODEL_o431, MODEL_o419, 0, -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt04_shape", - .hit = "flo_bt04_hit", - .bg = "sra_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), -}; +#include "battle/common/stage/flo_04.inc.c" diff --git a/src/battle/area/flo2/stage/flo_05.c b/src/battle/area/flo2/stage/flo_05.c index 0cff3375a6..7ca0d8e867 100644 --- a/src/battle/area/flo2/stage/flo_05.c +++ b/src/battle/area/flo2/stage/flo_05.c @@ -3,26 +3,4 @@ #define NAMESPACE b_area_flo2_flo_05 -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt05_shape", - .hit = "flo_bt05_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), -}; +#include "battle/common/stage/flo_05.inc.c" diff --git a/src/battle/area/flo2/stage/flo_06.c b/src/battle/area/flo2/stage/flo_06.c index cdacb8525b..ad87047792 100644 --- a/src/battle/area/flo2/stage/flo_06.c +++ b/src/battle/area/flo2/stage/flo_06.c @@ -3,26 +3,4 @@ #define NAMESPACE b_area_flo2_flo_06 -#include "common/MakeSun.inc.c" - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_EXEC_WAIT(N(MakeSun)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "flo_tex", - .shape = "flo_bt06_shape", - .hit = "flo_bt06_hit", - .bg = "fla_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), -}; +#include "battle/common/stage/flo_06.inc.c" diff --git a/src/battle/area/hos/actor/goombario_tutor.c b/src/battle/area/hos/actor/goombario_tutor.c index f51bf197ff..26d726c1f4 100644 --- a/src/battle/area/hos/actor/goombario_tutor.c +++ b/src/battle/area/hos/actor/goombario_tutor.c @@ -75,7 +75,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(partsTable_80219114)), .partsData = N(partsTable_80219114), - .takeTurnScript = &N(init_80219160), + .initScript = &N(init_80219160), .statusTable = N(statusTable_80219068), .escapeChance = 0, .airLiftChance = 0, @@ -118,14 +118,14 @@ EvtScript N(handleEvent_802191E0) = { EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(RandInt, 2, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(ActorSpeak, MSG_HOS_002D, -127, 1, 589834, 589826) + EVT_CALL(ActorSpeak, MSG_HOS_002D, ACTOR_SELF, 1, 0x0009000A, 0x00090002) EVT_CASE_EQ(1) - EVT_CALL(ActorSpeak, MSG_HOS_002E, -127, 1, 589834, 589826) + EVT_CALL(ActorSpeak, MSG_HOS_002E, ACTOR_SELF, 1, 0x0009000A, 0x00090002) EVT_CASE_EQ(2) EVT_END_SWITCH EVT_END_IF @@ -203,7 +203,7 @@ EvtScript N(takeTurn_80219444) = { EVT_THREAD EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_CALL(ShowActionHud, 1) + EVT_CALL(ShowActionHud, TRUE) EVT_WAIT(10) EVT_CALL(action_command_jump_start, 12, 3) EVT_END_THREAD @@ -225,7 +225,7 @@ EvtScript N(takeTurn_80219444) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_IF - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(func_80269EAC, 5) EVT_END_IF @@ -284,7 +284,7 @@ API_CALLABLE(func_80218000_47F0B0) { } EvtScript N(80219C74) = { - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_TUTORIAL_BATTLE, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_TUTORIAL_BATTLE, TRUE) EVT_CALL(func_802535B4, 0) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MENU) EVT_WAIT(15) @@ -303,12 +303,12 @@ EvtScript N(80219C74) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_WAIT(15) EVT_CALL(SetGoalPos, ACTOR_PARTNER, -73, 40, 202) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 20, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 20, EASING_COS_IN_OUT) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(ActorSpeak, MSG_HOS_001A, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_LEARNED) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(SetMessageBoxDuration, -1) EVT_THREAD EVT_LOOP(15) @@ -318,10 +318,10 @@ EvtScript N(80219C74) = { EVT_END_THREAD EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 20, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 20, EASING_COS_IN_OUT) EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL) EVT_CALL(WaitForState, BATTLE_STATE_0) - EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_200, 1) + EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_200, TRUE) EVT_LOOP(0) EVT_CALL(GetActionCommandMode, LVar0) EVT_IF_NE(LVar0, ACTION_COMMAND_MODE_TUTORIAL) @@ -345,7 +345,7 @@ EvtScript N(80219C74) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(EndActorSpeech, 256, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) + EVT_CALL(EndActorSpeech, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_CALL(SetActionSuccess, 1) EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_LEARNED) @@ -353,7 +353,7 @@ EvtScript N(80219C74) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_WAIT(15) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) - EVT_CALL(ActorSpeak, MSG_HOS_001D, 256, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) + EVT_CALL(ActorSpeak, MSG_HOS_001D, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_CALL(WaitForState, BATTLE_STATE_9) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -404,14 +404,14 @@ EvtScript N(80219C74) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(ActorSpeak, MSG_HOS_0022, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) EVT_LOOP(0) - EVT_CALL(CheckButtonDown, 262144, LVar0) + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) EVT_IF_EQ(LVar0, 0) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_END_LOOP EVT_LOOP(0) - EVT_CALL(CheckButtonPress, 262144, LVar0) + EVT_CALL(CheckButtonPress, BUTTON_STICK_LEFT, LVar0) EVT_IF_EQ(LVar0, 1) EVT_BREAK_LOOP EVT_END_IF @@ -428,14 +428,14 @@ EvtScript N(80219C74) = { EVT_IF_NE(LVar0, ACTION_COMMAND_MODE_TUTORIAL) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(CheckButtonDown, 262144, LVar0) + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL_BLOCK) - EVT_CALL(PauseTakeTurn, 0) + EVT_CALL(PauseTakeTurn, ACTOR_PLAYER) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(ActorSpeak, MSG_HOS_0023, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) EVT_LOOP(0) - EVT_CALL(CheckButtonPress, 262144, LVar0) + EVT_CALL(CheckButtonPress, BUTTON_STICK_LEFT, LVar0) EVT_IF_EQ(LVar0, 1) EVT_BREAK_LOOP EVT_END_IF @@ -444,7 +444,7 @@ EvtScript N(80219C74) = { EVT_CALL(EndActorSpeech, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL) - EVT_CALL(ResumeTakeTurn, 0) + EVT_CALL(ResumeTakeTurn, ACTOR_PLAYER) EVT_END_IF EVT_WAIT(1) EVT_END_LOOP @@ -458,7 +458,7 @@ EvtScript N(80219C74) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(ActorSpeak, MSG_HOS_0024, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) EVT_LOOP(0) - EVT_CALL(CheckButtonDown, 262144, LVar0) + EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) EVT_IF_EQ(LVar0, 0) EVT_BREAK_LOOP EVT_END_IF @@ -474,7 +474,7 @@ EvtScript N(80219C74) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(ActorSpeak, MSG_HOS_0025, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY0, ACTOR_FLAG_NO_ATTACK, 1) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY0, ACTOR_FLAG_NO_ATTACK, TRUE) EVT_CALL(WaitForState, BATTLE_STATE_0) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MENU) EVT_CALL(ShowBattleChoice, MSG_Choice_001D) @@ -487,7 +487,7 @@ EvtScript N(80219C74) = { EVT_CALL(ActorSpeak, MSG_HOS_0028, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_200, 0) + EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_200, FALSE) EVT_LABEL(10) EVT_CALL(SetBattleMenuDisableFlags, BTL_MENU_DISABLED_JUMP | BTL_MENU_DISABLED_SMASH | BTL_MENU_DISABLED_STRATEGIES) EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL) @@ -510,7 +510,7 @@ EvtScript N(80219C74) = { EVT_END_SWITCH EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_CALL(SetEnemyHP, ACTOR_ENEMY0, 99) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY0, ACTOR_FLAG_NO_ATTACK, 0) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY0, ACTOR_FLAG_NO_ATTACK, FALSE) EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_LEARNED) EVT_CALL(WaitForState, BATTLE_STATE_END_TURN) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) @@ -531,7 +531,7 @@ EvtScript N(80219C74) = { EVT_CALL(ActorSpeak, MSG_HOS_002C, ACTOR_PARTNER, 1, ANIM_Twink_Talk, ANIM_Twink_Fly) EVT_LABEL(100) EVT_CALL(WaitForState, BATTLE_STATE_0) - EVT_CALL(SetBattleState, 30) + EVT_CALL(SetBattleState, BATTLE_STATE_END_TRAINING_BATTLE) EVT_CALL(func_80218000_47F0B0) EVT_WAIT(10000) EVT_RETURN diff --git a/src/battle/area/hos/actor/magikoopa.c b/src/battle/area/hos/actor/magikoopa.c index 8a02346437..ca4464c44e 100644 --- a/src/battle/area/hos/actor/magikoopa.c +++ b/src/battle/area/hos/actor/magikoopa.c @@ -134,7 +134,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(partsTable_8021D5F0)), .partsData = N(partsTable_8021D5F0), - .takeTurnScript = &N(init_8021E100), + .initScript = &N(init_8021E100), .statusTable = N(statusTable_8021D498), .escapeChance = 0, .airLiftChance = 0, @@ -159,7 +159,7 @@ ActorBlueprint N(flying) = { .maxHP = 8, .partCount = ARRAY_COUNT(N(partsTable_8021D614)), .partsData = N(partsTable_8021D614), - .takeTurnScript = &N(init_8021E2C0), + .initScript = &N(init_8021E2C0), .statusTable = N(statusTable_8021D544), .escapeChance = 0, .airLiftChance = 0, @@ -219,7 +219,7 @@ EvtScript N(8021D784) = { EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_PARTNER_ACTING) EVT_IF_FLAG(LVar0, BS_FLAGS1_200 | BS_FLAGS1_40) - EVT_CALL(SetActorVar, -127, 2, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_END_IF EVT_ELSE EVT_CALL(N(GetSelectedMoveID), LVar0) @@ -230,7 +230,7 @@ EvtScript N(8021D784) = { EVT_CASE_OR_EQ(MOVE_MULTIBONK) EVT_CALL(GetBattleFlags, LVar0) EVT_IF_FLAG(LVar0, BS_FLAGS1_200 | BS_FLAGS1_40) - EVT_CALL(SetActorVar, -127, 2, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_END_IF EVT_END_CASE_GROUP EVT_END_SWITCH @@ -246,7 +246,7 @@ EvtScript N(8021D784) = { extern EvtScript N(handleEvent_8021E6D8); EvtScript N(8021D890) = { - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim04) EVT_GOTO(0) @@ -261,14 +261,14 @@ EvtScript N(8021D890) = { EVT_CALL(func_8027D32C, -127) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, 0x80000) - EVT_CALL(SetPartScale, -127, 3, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) + EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) EVT_END_IF - EVT_CALL(SetPartFlagBits, -127, 1, 8388608, 1) - EVT_CALL(SetPartFlagBits, -127, 1, 131073, 0) - EVT_CALL(SetPartFlagBits, -127, 2, 131073, 1) - EVT_CALL(SetPartFlagBits, -127, 2, 8388608, 0) - EVT_CALL(SetPartFlagBits, -127, 3, 1048576, 1) - EVT_CALL(SetPartFlagBits, -127, 3, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 0x00800000, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 0x00020001, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 0x00020001, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 0x00800000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 0x00100000, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 1, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) @@ -280,7 +280,7 @@ EvtScript N(8021D890) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 150, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.7)) EVT_END_THREAD EVT_CALL(GetLastEvent, ACTOR_SELF, LVar3) EVT_IF_EQ(LVar3, 15) @@ -288,30 +288,30 @@ EvtScript N(8021D890) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar4, 10) EVT_ADD(LVar5, 5) - EVT_CALL(PlayEffect, 0x27, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0) EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, -127, 3, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 1, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, -127, 3, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 1, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, -127, 3, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 1, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim01) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021E6D8))) - EVT_CALL(SetActorType, -127, 149) - EVT_CALL(SetStatusTable, -127, EVT_PTR(N(statusTable_8021D498))) + EVT_CALL(SetActorType, ACTOR_SELF, 149) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021D498))) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 32) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(GetIndexFromPos, -127, LVar0) + EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) - EVT_CALL(SetGoalToIndex, -127, LVar0) + EVT_CALL(SetGoalToIndex, ACTOR_SELF, LVar0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -340,7 +340,7 @@ EvtScript N(runAway) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(10) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 200) @@ -350,15 +350,15 @@ EvtScript N(runAway) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_EXEC_WAIT(ForceNextTarget) EVT_CALL(func_8027D32C, -127) - EVT_CALL(RemoveActor, -127) + EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN EVT_END }; EvtScript N(nextTurn_8021E0B0) = { - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_BITWISE_AND_CONST(LVar0, -2) // TODO - EVT_CALL(SetActorVar, -127, 0, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0) EVT_RETURN EVT_END }; @@ -369,23 +369,23 @@ EvtScript N(init_8021E100) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8021D774))) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80223B24))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021E6D8))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_8021E0B0))) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8021E0B0))) EVT_CALL(GetBattleVar, 2, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(SetBattleVar, 2, -1) EVT_END_IF - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) - EVT_CALL(SetActorVar, -127, 2, 0) - EVT_CALL(SetActorVar, -127, 3, 0) - EVT_CALL(SetActorVar, -127, 4, 0) - EVT_CALL(SetActorVar, -127, 5, 0) - EVT_CALL(SetActorVar, -127, 6, 0) - EVT_CALL(SetActorVar, -127, 7, 0) - EVT_CALL(SetActorVar, -127, 8, 0) - EVT_CALL(SetActorVar, -127, 9, -1) - EVT_CALL(SetActorVar, -127, 10, 0) - EVT_CALL(SetActorVar, -127, 11, -1) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 5, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 7, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 9, -1) + EVT_CALL(SetActorVar, ACTOR_SELF, 10, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 11, -1) EVT_RETURN EVT_END }; @@ -400,33 +400,33 @@ EvtScript N(init_8021E2C0) = { EVT_IF_EQ(LVar0, 0) EVT_CALL(SetBattleVar, 2, -1) EVT_END_IF - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) - EVT_CALL(SetActorVar, -127, 2, 0) - EVT_CALL(SetActorVar, -127, 3, 0) - EVT_CALL(SetActorVar, -127, 4, 0) - EVT_CALL(SetActorVar, -127, 5, 0) - EVT_CALL(SetActorVar, -127, 6, 0) - EVT_CALL(SetActorVar, -127, 7, 0) - EVT_CALL(SetActorVar, -127, 8, 0) - EVT_CALL(SetActorVar, -127, 9, -1) - EVT_CALL(SetActorVar, -127, 10, 0) - EVT_CALL(SetActorVar, -127, 11, -1) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 5, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 7, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 9, -1) + EVT_CALL(SetActorVar, ACTOR_SELF, 10, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 11, -1) EVT_RETURN EVT_END }; EvtScript N(8021E46C) = { - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 1) EVT_RETURN EVT_END_IF - EVT_CALL(GetActorVar, -127, 9, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 9, LVar0) EVT_CALL(ActorExists, LVar0, LVar1) EVT_IF_EQ(LVar1, 0) EVT_RETURN EVT_END_IF - EVT_CALL(SetActorVar, -127, 10, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 10, 0) EVT_CALL(GetLastElement, LVarA) EVT_IF_FLAG(LVarA, 0x20000000) EVT_LABEL(0) @@ -436,20 +436,20 @@ EvtScript N(8021E46C) = { EVT_GOTO(0) EVT_END_IF EVT_END_IF - EVT_CALL(GetActorVar, -127, 9, LVar0) - EVT_CALL(SetActorVar, -127, 9, -1) - EVT_CALL(GetActorFlags, -127, LVarA) + EVT_CALL(GetActorVar, ACTOR_SELF, 9, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 9, -1) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, 0x200) - EVT_CALL(SetPartEventBits, -127, 2, 4194304, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, 0x00400000, FALSE) EVT_ELSE - EVT_CALL(SetPartEventBits, -127, 1, 4194304, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, 0x00400000, FALSE) EVT_END_IF EVT_CALL(GetActorPos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(RemoveActor, LVar0) EVT_THREAD EVT_ADD(LVar3, 2) EVT_LOOP(2) - EVT_CALL(PlayEffect, 0x1, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD @@ -460,13 +460,13 @@ EvtScript N(8021E46C) = { EvtScript N(handleEvent_8021E6D8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(SetPartAlpha, -127, 1, 255) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, 255) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(9) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_BITWISE_OR_CONST(LVar0, 0x1) - EVT_CALL(SetActorVar, -127, 0, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04) EVT_EXEC_WAIT(DoNormalHit) @@ -515,7 +515,7 @@ EvtScript N(handleEvent_8021E6D8) = { EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim01) EVT_EXEC_WAIT(DoImmune) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_FLAG(LVar0, 0x1) EVT_EXEC_WAIT(N(8021E46C)) EVT_RETURN @@ -587,13 +587,13 @@ EvtScript N(handleEvent_8021E6D8) = { EvtScript N(handleEvent_8021EDF0) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(SetPartAlpha, -127, 2, 255) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 2, 255) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(9) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_BITWISE_OR_CONST(LVar0, 0x1) - EVT_CALL(SetActorVar, -127, 0, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0) EVT_EXEC_WAIT(N(8021D784)) EVT_SET_CONST(LVar0, 0x00000002) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04) @@ -654,7 +654,7 @@ EvtScript N(handleEvent_8021EDF0) = { EVT_SET_CONST(LVar0, 0x00000002) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim01) EVT_EXEC_WAIT(DoImmune) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_FLAG(LVar0, 0x1) EVT_EXEC_WAIT(N(8021E46C)) EVT_RETURN @@ -680,7 +680,7 @@ EvtScript N(handleEvent_8021EDF0) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Anim01) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Anim01) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CASE_EQ(49) @@ -734,9 +734,9 @@ EvtScript N(handleEvent_8021EDF0) = { }; EvtScript N(healOne) = { - EVT_CALL(SetActorVar, -127, 10, 0) - EVT_CALL(SetActorVar, -127, 11, 0) - EVT_CALL(AddActorVar, -127, 4, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 10, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 11, 0) + EVT_CALL(AddActorVar, ACTOR_SELF, 4, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -744,7 +744,7 @@ EvtScript N(healOne) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 15) EVT_WAIT(15) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim02) EVT_ELSE @@ -752,7 +752,7 @@ EvtScript N(healOne) = { EVT_END_IF EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST1) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -760,12 +760,12 @@ EvtScript N(healOne) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -774,16 +774,16 @@ EvtScript N(healOne) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim01) EVT_ELSE @@ -792,14 +792,14 @@ EvtScript N(healOne) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, LVarB, 0x206D) - EVT_CALL(PlaySoundAtActor, LVarB, 0x214) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_206D) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_214) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, LVarB, SOUND_25C) EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, LVarB, 0, 0) + EVT_CALL(HealActor, LVarB, 0, FALSE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_CALL(WaitForBuffDone) @@ -814,9 +814,9 @@ EvtScript N(healOne) = { }; EvtScript N(healAll) = { - EVT_CALL(SetActorVar, -127, 10, 0) - EVT_CALL(SetActorVar, -127, 11, 1) - EVT_CALL(AddActorVar, -127, 3, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 10, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 11, 1) + EVT_CALL(AddActorVar, ACTOR_SELF, 3, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -824,7 +824,7 @@ EvtScript N(healAll) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 15) EVT_WAIT(15) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim02) EVT_ELSE @@ -832,7 +832,7 @@ EvtScript N(healAll) = { EVT_END_IF EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST1) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -840,12 +840,12 @@ EvtScript N(healAll) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -854,23 +854,23 @@ EvtScript N(healAll) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim01) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Anim01) EVT_END_IF EVT_WAIT(5) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_SET(LocalFlag(0), 0) @@ -885,18 +885,18 @@ EvtScript N(healAll) = { EVT_IF_EQ(LocalFlag(0), 0) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, LVar0, 0x206D) - EVT_CALL(PlaySoundAtActor, LVar0, 0x214) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_206D) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_214) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_25C) EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, LVar0, 0, 1) + EVT_CALL(HealActor, LVar0, 0, TRUE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -913,15 +913,15 @@ EvtScript N(healAll) = { }; EvtScript N(shapeSpell) = { - EVT_CALL(SetActorVar, -127, 11, 2) + EVT_CALL(SetActorVar, ACTOR_SELF, 11, 2) EVT_SET(LocalFlag(0), 0) EVT_SET(LocalFlag(1), 0) - EVT_CALL(GetActorVar, -127, 10, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 10, LVar0) EVT_IF_EQ(LVar0, 1) EVT_SET(LocalFlag(0), 1) - EVT_CALL(GetActorVar, -127, 9, LVarA) + EVT_CALL(GetActorVar, ACTOR_SELF, 9, LVarA) EVT_END_IF - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, 0x200) EVT_SET(LocalFlag(1), 1) EVT_END_IF @@ -941,11 +941,11 @@ EvtScript N(shapeSpell) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST1) EVT_IF_EQ(LocalFlag(1), 0) EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(SetAnimation, LVarA, 1, 0x560002) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_Magikoopa_Anim02) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 17) EVT_ADD(LVar1, 33) - EVT_CALL(PlayEffect, 0x47, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim02) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -957,14 +957,14 @@ EvtScript N(shapeSpell) = { EVT_SUB(LVar0, 17) EVT_ADD(LVar1, 33) EVT_END_IF - EVT_CALL(PlayEffect, 0x47, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_ELSE EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(SetAnimation, LVarA, 1, 0x570002) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_FlyingMagikoopa_Anim02) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) - EVT_CALL(PlayEffect, 0x47, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Anim02) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -976,7 +976,7 @@ EvtScript N(shapeSpell) = { EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_END_IF - EVT_CALL(PlayEffect, 0x47, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_END_IF EVT_WAIT(30) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar9, 0, 0, 1, 16) @@ -989,12 +989,12 @@ EvtScript N(shapeSpell) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST2) EVT_IF_EQ(LocalFlag(1), 0) EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(SetAnimation, LVarA, 1, 0x560003) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_Magikoopa_Anim03) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim03) EVT_ELSE EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(SetAnimation, LVarA, 1, 0x570003) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_FlyingMagikoopa_Anim03) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Anim03) EVT_END_IF @@ -1057,12 +1057,12 @@ EvtScript N(shapeSpell) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST2) EVT_IF_EQ(LocalFlag(1), 0) EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(SetAnimation, LVarA, 1, 0x560003) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_Magikoopa_Anim03) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim03) EVT_ELSE EVT_IF_EQ(LocalFlag(0), 1) - EVT_CALL(SetAnimation, LVarA, 1, 0x570003) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_FlyingMagikoopa_Anim03) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Anim03) EVT_END_IF @@ -1128,7 +1128,7 @@ EvtScript N(shapeSpell) = { }; EvtScript N(80221144) = { - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -1144,12 +1144,12 @@ EvtScript N(80221144) = { EVT_CASE_EQ(3) EVT_SET(LocalFlag(14), 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 EVT_SET(LVar0, -1) - EVT_CALL(GetIndexFromHome, -127, LVar1) + EVT_CALL(GetIndexFromHome, ACTOR_SELF, LVar1) EVT_MOD(LVar1, 4) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) @@ -1176,7 +1176,7 @@ EvtScript N(80221144) = { EVT_END_IF EVT_END_SWITCH EVT_IF_NE(LVar0, -1) - EVT_CALL(GetActorFlags, -127, LVar1) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar1) EVT_IF_FLAG(LVar1, 0x200) EVT_ADD(LVar0, 4) EVT_END_IF @@ -1192,14 +1192,14 @@ EvtScript N(handleEvent_8022142C) = { EvtScript N(init_8022143C) = { EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8022142C))) - EVT_CALL(SetActorVar, -127, 1, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_RETURN EVT_END }; EvtScript N(init_80221478) = { EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8022142C))) - EVT_CALL(SetActorVar, -127, 1, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_RETURN EVT_END }; @@ -1301,7 +1301,7 @@ ActorBlueprint N(clone) = { .maxHP = 11, .partCount = ARRAY_COUNT(N(partsTable_80221624)), .partsData = N(partsTable_80221624), - .takeTurnScript = &N(init_8022143C), + .initScript = &N(init_8022143C), .statusTable = N(statusTable_802214CC), .escapeChance = 40, .airLiftChance = 0, @@ -1324,7 +1324,7 @@ ActorBlueprint N(flying_clone) = { .maxHP = 11, .partCount = ARRAY_COUNT(N(partsTable_80221648)), .partsData = N(partsTable_80221648), - .takeTurnScript = &N(init_80221478), + .initScript = &N(init_80221478), .statusTable = N(statusTable_80221578), .escapeChance = 40, .airLiftChance = 0, @@ -1351,15 +1351,15 @@ Formation N(specialFormation_802216E4) = { }; EvtScript N(makeCopy) = { - EVT_CALL(CountPlayerTargets, -127, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(runAway)) EVT_RETURN EVT_END_IF - EVT_CALL(SetActorVar, -127, 10, 1) - EVT_CALL(SetActorVar, -127, 11, 3) + EVT_CALL(SetActorVar, ACTOR_SELF, 10, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 11, 3) EVT_SET(LocalFlag(0), 0) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, 0x200) EVT_SET(LocalFlag(0), 1) EVT_END_IF @@ -1368,7 +1368,7 @@ EvtScript N(makeCopy) = { EVT_ELSE EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_802216E4)), 0) EVT_END_IF - EVT_CALL(SetActorVar, -127, 9, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 9, LVar0) EVT_SET(LVarA, LVar0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(EnableIdleScript, LVarA, 0) @@ -1382,16 +1382,16 @@ EvtScript N(makeCopy) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST3) EVT_IF_EQ(LocalFlag(0), 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim02) - EVT_CALL(SetAnimation, LVarA, 1, 0x560002) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_Magikoopa_Anim02) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 23) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Anim02) - EVT_CALL(SetAnimation, LVarA, 1, 0x570002) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_FlyingMagikoopa_Anim02) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 23) EVT_END_IF - EVT_CALL(PlayEffect, 0x6B, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) EVT_WAIT(10) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, LVar9, 1) @@ -1405,21 +1405,21 @@ EvtScript N(makeCopy) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST4) EVT_CALL(PlaySoundAtActor, LVar9, SOUND_SPELL_CAST4) - EVT_CALL(SetPartFlagBits, LVar9, 1, 8388608, 0) + EVT_CALL(SetPartFlagBits, LVar9, 1, 0x00800000, FALSE) EVT_CALL(RandInt, 1000, LVar0) EVT_IF_LT(LVar0, 500) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_EXEC_WAIT(N(80221144)) - EVT_CALL(SetGoalToIndex, -127, LVar0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetGoalToIndex, ACTOR_SELF, LVar0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_ELSE EVT_CALL(SetActorSpeed, LVar9, EVT_FLOAT(2.0)) EVT_EXEC_WAIT(N(80221144)) EVT_CALL(SetGoalToIndex, LVar9, LVar0) - EVT_CALL(FlyToGoal, LVar9, 0, 0, 0) + EVT_CALL(FlyToGoal, LVar9, 0, 0, EASING_LINEAR) EVT_END_IF - EVT_CALL(SetPartFlagBits, LVar9, 1, 8388608, 1) - EVT_CALL(GetActorHP, -127, LVar0) + EVT_CALL(SetPartFlagBits, LVar9, 1, 0x00800000, TRUE) + EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_CALL(SetEnemyHP, LVar9, LVar0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1428,16 +1428,16 @@ EvtScript N(makeCopy) = { EVT_CALL(ForceHomePos, LVar9, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, LVar9) EVT_IF_EQ(LocalFlag(0), 0) - EVT_CALL(SetPartEventBits, -127, 1, 4194304, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, 0x00400000, TRUE) EVT_ELSE - EVT_CALL(SetPartEventBits, -127, 2, 4194304, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, 0x00400000, TRUE) EVT_END_IF EVT_IF_EQ(LocalFlag(0), 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim01) - EVT_CALL(SetAnimation, LVar9, 1, 0x560001) + EVT_CALL(SetAnimation, LVar9, 1, ANIM_Magikoopa_Anim01) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Anim01) - EVT_CALL(SetAnimation, LVar9, 1, 0x570001) + EVT_CALL(SetAnimation, LVar9, 1, ANIM_FlyingMagikoopa_Anim01) EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(UseIdleAnimation, LVar9, TRUE) @@ -1450,7 +1450,7 @@ EvtScript N(makeCopy) = { EvtScript N(boostAttack) = { EVT_SET(LocalFlag(0), 0) EVT_LABEL(10) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -1467,7 +1467,7 @@ EvtScript N(boostAttack) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -1476,7 +1476,7 @@ EvtScript N(boostAttack) = { EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(CountPlayerTargets, -127, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(runAway)) EVT_RETURN @@ -1484,9 +1484,9 @@ EvtScript N(boostAttack) = { EVT_EXEC_WAIT(N(shapeSpell)) EVT_RETURN EVT_LABEL(100) - EVT_CALL(SetActorVar, -127, 10, 0) - EVT_CALL(SetActorVar, -127, 11, 4) - EVT_CALL(AddActorVar, -127, 5, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 10, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 11, 4) + EVT_CALL(AddActorVar, ACTOR_SELF, 5, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1494,7 +1494,7 @@ EvtScript N(boostAttack) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 15) EVT_WAIT(15) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim02) EVT_ELSE @@ -1502,7 +1502,7 @@ EvtScript N(boostAttack) = { EVT_END_IF EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST1) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -1510,12 +1510,12 @@ EvtScript N(boostAttack) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1524,16 +1524,16 @@ EvtScript N(boostAttack) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim01) EVT_ELSE @@ -1542,7 +1542,7 @@ EvtScript N(boostAttack) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, 0x2DD) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DD) EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) @@ -1562,7 +1562,7 @@ EvtScript N(boostAttack) = { EvtScript N(boostDefense) = { EVT_SET(LocalFlag(0), 0) EVT_LABEL(10) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -1579,7 +1579,7 @@ EvtScript N(boostDefense) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -1588,7 +1588,7 @@ EvtScript N(boostDefense) = { EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(CountPlayerTargets, -127, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(runAway)) EVT_RETURN @@ -1596,9 +1596,9 @@ EvtScript N(boostDefense) = { EVT_EXEC_WAIT(N(shapeSpell)) EVT_RETURN EVT_LABEL(100) - EVT_CALL(SetActorVar, -127, 10, 0) - EVT_CALL(SetActorVar, -127, 11, 5) - EVT_CALL(AddActorVar, -127, 6, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 10, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 11, 5) + EVT_CALL(AddActorVar, ACTOR_SELF, 6, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1606,7 +1606,7 @@ EvtScript N(boostDefense) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 15) EVT_WAIT(15) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim02) EVT_ELSE @@ -1614,7 +1614,7 @@ EvtScript N(boostDefense) = { EVT_END_IF EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST1) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -1622,12 +1622,12 @@ EvtScript N(boostDefense) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1636,16 +1636,16 @@ EvtScript N(boostDefense) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim01) EVT_ELSE @@ -1654,7 +1654,7 @@ EvtScript N(boostDefense) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, 0x2DD) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DD) EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) @@ -1674,7 +1674,7 @@ EvtScript N(boostDefense) = { EvtScript N(electrify) = { EVT_SET(LocalFlag(0), 0) EVT_LABEL(10) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -1691,7 +1691,7 @@ EvtScript N(electrify) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -1700,7 +1700,7 @@ EvtScript N(electrify) = { EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(CountPlayerTargets, -127, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(runAway)) EVT_RETURN @@ -1708,9 +1708,9 @@ EvtScript N(electrify) = { EVT_EXEC_WAIT(N(shapeSpell)) EVT_RETURN EVT_LABEL(100) - EVT_CALL(SetActorVar, -127, 10, 0) - EVT_CALL(SetActorVar, -127, 11, 6) - EVT_CALL(AddActorVar, -127, 7, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 10, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 11, 6) + EVT_CALL(AddActorVar, ACTOR_SELF, 7, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1718,7 +1718,7 @@ EvtScript N(electrify) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 15) EVT_WAIT(15) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim02) EVT_ELSE @@ -1726,7 +1726,7 @@ EvtScript N(electrify) = { EVT_END_IF EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F0) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -1734,12 +1734,12 @@ EvtScript N(electrify) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x57, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x57, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1748,16 +1748,16 @@ EvtScript N(electrify) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x57, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x57, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim01) EVT_ELSE @@ -1767,7 +1767,7 @@ EvtScript N(electrify) = { EVT_THREAD EVT_WAIT(10) EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, LVar8, 0x3D2) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_3D2) EVT_CALL(RandInt, 3, LVar0) EVT_ADD(LVar0, 3) EVT_WAIT(LVar0) @@ -1791,7 +1791,7 @@ EvtScript N(electrify) = { EvtScript N(vanish) = { EVT_SET(LocalFlag(0), 0) EVT_LABEL(10) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -1808,7 +1808,7 @@ EvtScript N(vanish) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -1817,7 +1817,7 @@ EvtScript N(vanish) = { EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(CountPlayerTargets, -127, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(runAway)) EVT_RETURN @@ -1825,9 +1825,9 @@ EvtScript N(vanish) = { EVT_EXEC_WAIT(N(shapeSpell)) EVT_RETURN EVT_LABEL(100) - EVT_CALL(SetActorVar, -127, 10, 0) - EVT_CALL(SetActorVar, -127, 11, 7) - EVT_CALL(AddActorVar, -127, 8, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 10, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 11, 7) + EVT_CALL(AddActorVar, ACTOR_SELF, 8, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1835,7 +1835,7 @@ EvtScript N(vanish) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 15) EVT_WAIT(15) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim02) EVT_ELSE @@ -1843,7 +1843,7 @@ EvtScript N(vanish) = { EVT_END_IF EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST1) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -1851,12 +1851,12 @@ EvtScript N(vanish) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1865,16 +1865,16 @@ EvtScript N(vanish) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, 0x33, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) - EVT_CALL(GetActorFlags, -127, LVar0) + EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x200) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim01) EVT_ELSE @@ -1883,7 +1883,7 @@ EvtScript N(vanish) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, 0x2DB) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DB) EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) @@ -1906,12 +1906,12 @@ EvtScript N(takeTurn_80223B24) = { EVT_EXEC_WAIT(N(shapeSpell)) EVT_RETURN EVT_END_IF - EVT_CALL(GetActorVar, -127, 10, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 10, LVar0) EVT_IF_EQ(LVar0, 1) EVT_GOTO(20) EVT_END_IF EVT_SET(LVarA, 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_SET(LocalFlag(0), 0) @@ -1937,7 +1937,7 @@ EvtScript N(takeTurn_80223B24) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -1945,7 +1945,7 @@ EvtScript N(takeTurn_80223B24) = { EVT_GOTO(10) EVT_END_IF EVT_SET(LVarA, 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(1) EVT_SET(LocalFlag(0), 0) @@ -1971,7 +1971,7 @@ EvtScript N(takeTurn_80223B24) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(1) EVT_END_IF @@ -1979,7 +1979,7 @@ EvtScript N(takeTurn_80223B24) = { EVT_GOTO(10) EVT_END_IF EVT_SET(LVarA, 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(2) EVT_SET(LocalFlag(0), 0) @@ -2005,7 +2005,7 @@ EvtScript N(takeTurn_80223B24) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(2) EVT_END_IF @@ -2014,13 +2014,13 @@ EvtScript N(takeTurn_80223B24) = { EVT_END_IF EVT_GOTO(20) EVT_LABEL(10) - EVT_CALL(CountPlayerTargets, -127, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(runAway)) EVT_RETURN EVT_END_IF EVT_IF_EQ(LVarA, 1) - EVT_CALL(GetActorVar, -127, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_IF_LT(LVar0, 0) EVT_CALL(RandInt, 1000, LVar0) EVT_IF_LT(LVar0, 0) @@ -2028,7 +2028,7 @@ EvtScript N(takeTurn_80223B24) = { EVT_RETURN EVT_END_IF EVT_ELSE - EVT_CALL(GetActorVar, -127, 3, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_IF_LT(LVar0, 0) EVT_CALL(RandInt, 1000, LVar0) EVT_IF_LT(LVar0, 0) @@ -2038,7 +2038,7 @@ EvtScript N(takeTurn_80223B24) = { EVT_END_IF EVT_END_IF EVT_ELSE - EVT_CALL(GetActorVar, -127, 3, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_IF_LT(LVar0, 0) EVT_CALL(RandInt, 1000, LVar0) EVT_IF_LT(LVar0, 0) @@ -2046,10 +2046,10 @@ EvtScript N(takeTurn_80223B24) = { EVT_RETURN EVT_END_IF EVT_ELSE - EVT_CALL(GetActorVar, -127, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_IF_LT(LVar0, 0) EVT_SETF(LVar9, EVT_FLOAT(100.0)) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(11) EVT_SET(LocalFlag(0), 0) @@ -2071,7 +2071,7 @@ EvtScript N(takeTurn_80223B24) = { EVT_SET(LVarB, LVar0) EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(11) EVT_END_IF @@ -2090,7 +2090,7 @@ EvtScript N(takeTurn_80223B24) = { EVT_SET(LVarD, 0) EVT_SET(LVarE, 0) EVT_SET(LVarF, 0) - EVT_CALL(GetActorVar, -127, 10, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 10, LVar0) EVT_IF_EQ(LVar0, 1) EVT_SET(LVarA, 100) EVT_SET(LVarB, 0) @@ -2109,10 +2109,10 @@ EvtScript N(takeTurn_80223B24) = { EVT_IF_NE(LVar0, 0) EVT_SET(LVarB, 0) EVT_END_IF - EVT_CALL(GetActorVar, -127, 11, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 11, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(4) - EVT_CALL(GetActorVar, -127, 5, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar1) EVT_IF_LT(LVar1, 0) EVT_CALL(RandInt, 99, LVar0) EVT_ADD(LVar0, 1) @@ -2126,7 +2126,7 @@ EvtScript N(takeTurn_80223B24) = { EVT_END_IF EVT_END_IF EVT_CASE_EQ(5) - EVT_CALL(GetActorVar, -127, 6, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 6, LVar1) EVT_IF_LT(LVar1, 0) EVT_CALL(RandInt, 99, LVar0) EVT_ADD(LVar0, 1) @@ -2140,19 +2140,19 @@ EvtScript N(takeTurn_80223B24) = { EVT_END_IF EVT_END_IF EVT_END_SWITCH - EVT_CALL(GetActorVar, -127, 5, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar0) EVT_IF_GE(LVar0, 0) EVT_SET(LVarC, 0) EVT_END_IF - EVT_CALL(GetActorVar, -127, 6, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 6, LVar0) EVT_IF_GE(LVar0, 0) EVT_SET(LVarD, 0) EVT_END_IF - EVT_CALL(GetActorVar, -127, 7, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 7, LVar0) EVT_IF_GE(LVar0, 0) EVT_SET(LVarE, 0) EVT_END_IF - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_GE(LVar0, 0) EVT_SET(LVarF, 0) EVT_END_IF diff --git a/src/battle/area/hos/stage/hos_00.c b/src/battle/area/hos/stage/hos_00.c index 6b723c2c84..dd78481b7e 100644 --- a/src/battle/area/hos/stage/hos_00.c +++ b/src/battle/area/hos/stage/hos_00.c @@ -4,70 +4,71 @@ #define NAMESPACE b_area_hos_hos_00 -// Shakes a model (ID input on LVar0) on loop, waiting up to 30 frames between. -EvtScript N(802255E0) = { +EvtScript N(EVS_AnimateFlower) = { EVT_SET(LVarA, LVar0) EVT_LABEL(0) - EVT_CALL(TranslateModel, LVarA, 0, 2, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 2, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) + EVT_CALL(TranslateModel, LVarA, 0, 2, 0) + EVT_WAIT(5) + EVT_CALL(TranslateModel, LVarA, 0, 0, 0) + EVT_WAIT(5) + EVT_CALL(TranslateModel, LVarA, 0, 2, 0) + EVT_WAIT(5) + EVT_CALL(TranslateModel, LVarA, 0, 0, 0) + EVT_WAIT(5) + EVT_CALL(RandInt, 30, LVar0) + EVT_ADD(LVar0, 30) + EVT_WAIT(LVar0) + EVT_GOTO(0) EVT_RETURN EVT_END }; -EvtScript N(beforeBattle_802256E8) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_THREAD EVT_SET(LVar0, MODEL_h1) - EVT_EXEC(N(802255E0)) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) EVT_SET(LVar0, MODEL_h3) - EVT_EXEC(N(802255E0)) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) EVT_SET(LVar0, MODEL_h4) - EVT_EXEC(N(802255E0)) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) EVT_SET(LVar0, MODEL_h5) - EVT_EXEC(N(802255E0)) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) EVT_SET(LVar0, MODEL_h6) - EVT_EXEC(N(802255E0)) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) EVT_SET(LVar0, MODEL_h7) - EVT_EXEC(N(802255E0)) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) EVT_SET(LVar0, MODEL_h9) - EVT_EXEC(N(802255E0)) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) EVT_SET(LVar0, MODEL_h10) - EVT_EXEC(N(802255E0)) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) EVT_SET(LVar0, MODEL_h11) - EVT_EXEC(N(802255E0)) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) EVT_SET(LVar0, MODEL_h12) - EVT_EXEC(N(802255E0)) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_END_THREAD EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8022589C) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_802258AC)[] = { - MODEL_hap, MODEL_kusa3, 0, +s32 N(ForegroundModels)[] = { + MODEL_hap, + MODEL_kusa3, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -75,7 +76,7 @@ Stage NAMESPACE = { .shape = "nok_bt02_shape", .hit = "nok_bt02_hit", .bg = "nok_bg", - .preBattle = &N(beforeBattle_802256E8), - .postBattle = &N(afterBattle_8022589C), - .foregroundModelList = N(foregroundModelList_802258AC), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/hos/stage/hos_01.c b/src/battle/area/hos/stage/hos_01.c index 2dfa422a9d..1b1257689d 100644 --- a/src/battle/area/hos/stage/hos_01.c +++ b/src/battle/area/hos/stage/hos_01.c @@ -4,157 +4,157 @@ #define NAMESPACE b_area_hos_hos_01 -u16 D_80224BB0_48BC60[16] = { }; +u16 N(StarPhaseAngles)[16] = {}; -void func_802184C0_47F570(s32 arg0) { +void N(build_gfx_yellow_stars)(s32 index) { Vtx* firstVertex; Vtx* copiedVertices; s32 numVertices; s32 i; s32 temp3; - arg0--; - mdl_get_copied_vertices(arg0, &firstVertex, &copiedVertices, &numVertices); + index--; + mdl_get_copied_vertices(index, &firstVertex, &copiedVertices, &numVertices); for (i = 0; i < numVertices; i++) { Vtx* vtx = &copiedVertices[i]; - s16 temp1 = (sins(D_80224BB0_48BC60[arg0] * (i % 3 + 1) + i) + 0x8000) / 2; + s16 temp1 = (sins(N(StarPhaseAngles)[index] * (i % 3 + 1) + i) + 0x8000) / 2; s32 temp2 = temp1 * 155; vtx->v.cn[0] = temp2 / 0x8000 + 100; vtx->v.cn[1] = temp2 / 0x8000 + 100; - temp3 = sins(D_80224BB0_48BC60[arg0] / 0x8000 * (((i / 2) % 3 + 1) << 15) + D_80224BB0_48BC60[arg0] / 0x4000 * 0x8000 + i) + 0x8000; + temp3 = sins(N(StarPhaseAngles)[index] / 0x8000 * (((i / 2) % 3 + 1) << 15) + N(StarPhaseAngles)[index] / 0x4000 * 0x8000 + i) + 0x8000; vtx->v.cn[2] = vtx->v.cn[0] * temp3 / 0x10000; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(arg0)); - D_80224BB0_48BC60[arg0] += 0x253; + gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(index)); + N(StarPhaseAngles)[index] += (s32)RAD_TO_BINANG(25.1898); } -void func_802186B8_47F768(s32 arg0) { +void N(build_gfx_blue_stars)(s32 index) { Vtx* firstVertex; Vtx* copiedVertices; s32 numVertices; s32 i; s32 temp3; - arg0--; - mdl_get_copied_vertices(arg0, &firstVertex, &copiedVertices, &numVertices); + index--; + mdl_get_copied_vertices(index, &firstVertex, &copiedVertices, &numVertices); for (i = 0; i < numVertices; i++) { u8* colors = copiedVertices[i].v.cn; - s16 temp1 = (sins(D_80224BB0_48BC60[arg0] * (i % 3 + 1) + i) + 0x8000) / 2; + s16 temp1 = (sins(N(StarPhaseAngles)[index] * (i % 3 + 1) + i) + 0x8000) / 2; colors[0] = temp1 * 155 / 0x8000 + 48.62745098039216; colors[1] = temp1 * 155 / 0x8000 + 89.41176470588236; - temp3 = sins(D_80224BB0_48BC60[arg0] / 0x8000 * (((i / 2) % 3 + 1) << 15) + D_80224BB0_48BC60[arg0] / 0x4000 * 0x8000 + i) + 0x8000; + temp3 = sins(N(StarPhaseAngles)[index] / 0x8000 * (((i / 2) % 3 + 1) << 15) + N(StarPhaseAngles)[index] / 0x4000 * 0x8000 + i) + 0x8000; colors[2] = colors[0] * temp3 / 0x10000 + 99.6078431372549; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(arg0)); - D_80224BB0_48BC60[arg0] += 0x253; + gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(index)); + N(StarPhaseAngles)[index] += (s32)RAD_TO_BINANG(25.1898); } -void func_802189D0_47FA80(s32 arg0) { +void N(build_gfx_green_stars)(s32 index) { Vtx* firstVertex; Vtx* copiedVertices; s32 numVertices; s32 i; s32 temp3; - arg0--; - mdl_get_copied_vertices(arg0, &firstVertex, &copiedVertices, &numVertices); + index--; + mdl_get_copied_vertices(index, &firstVertex, &copiedVertices, &numVertices); for (i = 0; i < numVertices; i++) { u8* colors = copiedVertices[i].v.cn; - s16 temp1 = (sins(D_80224BB0_48BC60[arg0] * (i % 3 + 1) + i) + 0x8000) / 2; + s16 temp1 = (sins(N(StarPhaseAngles)[index] * (i % 3 + 1) + i) + 0x8000) / 2; colors[0] = temp1 * 155 / 0x8000 + 67.45098039215686; colors[1] = temp1 * 155 / 0x8000 + 100.0; - temp3 = sins(D_80224BB0_48BC60[arg0] / 0x8000 * (((i / 2) % 3 + 1) << 15) + D_80224BB0_48BC60[arg0] / 0x4000 * 0x8000 + i) + 0x8000; + temp3 = sins(N(StarPhaseAngles)[index] / 0x8000 * (((i / 2) % 3 + 1) << 15) + N(StarPhaseAngles)[index] / 0x4000 * 0x8000 + i) + 0x8000; colors[2] = colors[0] * temp3 / 0x10000 + 59.21568627450981; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(arg0)); - D_80224BB0_48BC60[arg0] += 0x253; + gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(index)); + N(StarPhaseAngles)[index] += (s32)RAD_TO_BINANG(25.1898); } -void func_80218CEC_47FD9C(s32 arg0) { +void N(build_gfx_pink_stars)(s32 index) { Vtx* firstVertex; Vtx* copiedVertices; s32 numVertices; s32 i; s32 temp3; - arg0--; - mdl_get_copied_vertices(arg0, &firstVertex, &copiedVertices, &numVertices); + index--; + mdl_get_copied_vertices(index, &firstVertex, &copiedVertices, &numVertices); for (i = 0; i < numVertices; i++) { u8* colors = copiedVertices[i].v.cn; - s16 temp1 = (sins(D_80224BB0_48BC60[arg0] * (i % 3 + 1) + i) + 0x8000) / 2; + s16 temp1 = (sins(N(StarPhaseAngles)[index] * (i % 3 + 1) + i) + 0x8000) / 2; colors[0] = temp1 * 155 / 0x8000 + 100.0; colors[1] = temp1 * 155 / 0x8000 + 80.3921568627451; - temp3 = sins(D_80224BB0_48BC60[arg0] / 0x8000 * (((i / 2) % 3 + 1) << 15) + D_80224BB0_48BC60[arg0] / 0x4000 * 0x8000 + i) + 0x8000; + temp3 = sins(N(StarPhaseAngles)[index] / 0x8000 * (((i / 2) % 3 + 1) << 15) + N(StarPhaseAngles)[index] / 0x4000 * 0x8000 + i) + 0x8000; colors[2] = colors[0] * temp3 / 0x10000 + 96.07843137254902; } - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(arg0)); - D_80224BB0_48BC60[arg0] += 0x253; + gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(index)); + N(StarPhaseAngles)[index] += (s32)RAD_TO_BINANG(25.1898); } -EvtScript N(beforeBattle_80224BD0) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_CALL(MakeLocalVertexCopy, VTX_COPY_0, MODEL_o345, TRUE) - EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_1, EVT_PTR(func_802184C0_47F570), 0) - EVT_CALL(SetModelCustomGfx, MODEL_o345, CUSTOM_GFX_1, -1) - EVT_CALL(SetModelFlags, MODEL_o345, 128, 1) + EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_1, EVT_PTR(N(build_gfx_yellow_stars)), NULL) + EVT_CALL(SetModelCustomGfx, MODEL_o345, CUSTOM_GFX_1, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelFlags, MODEL_o345, MODEL_FLAG_HAS_LOCAL_VERTEX_COPY, TRUE) EVT_CALL(MakeLocalVertexCopy, VTX_COPY_1, MODEL_o338, TRUE) - EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_2, EVT_PTR(func_802184C0_47F570), 0) - EVT_CALL(SetModelCustomGfx, MODEL_o338, CUSTOM_GFX_2, -1) - EVT_CALL(SetModelFlags, MODEL_o338, 128, 1) + EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_2, EVT_PTR(N(build_gfx_yellow_stars)), NULL) + EVT_CALL(SetModelCustomGfx, MODEL_o338, CUSTOM_GFX_2, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelFlags, MODEL_o338, MODEL_FLAG_HAS_LOCAL_VERTEX_COPY, TRUE) EVT_CALL(MakeLocalVertexCopy, VTX_COPY_2, MODEL_o344, TRUE) - EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_3, EVT_PTR(func_802184C0_47F570), 0) - EVT_CALL(SetModelCustomGfx, MODEL_o344, CUSTOM_GFX_3, -1) - EVT_CALL(SetModelFlags, MODEL_o344, 128, 1) + EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_3, EVT_PTR(N(build_gfx_yellow_stars)), NULL) + EVT_CALL(SetModelCustomGfx, MODEL_o344, CUSTOM_GFX_3, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelFlags, MODEL_o344, MODEL_FLAG_HAS_LOCAL_VERTEX_COPY, TRUE) EVT_CALL(MakeLocalVertexCopy, VTX_COPY_3, MODEL_o354, TRUE) - EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_4, EVT_PTR(func_802184C0_47F570), 0) - EVT_CALL(SetModelCustomGfx, MODEL_o354, CUSTOM_GFX_4, -1) - EVT_CALL(SetModelFlags, MODEL_o354, 128, 1) + EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_4, EVT_PTR(N(build_gfx_yellow_stars)), NULL) + EVT_CALL(SetModelCustomGfx, MODEL_o354, CUSTOM_GFX_4, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelFlags, MODEL_o354, MODEL_FLAG_HAS_LOCAL_VERTEX_COPY, TRUE) EVT_CALL(MakeLocalVertexCopy, VTX_COPY_4, MODEL_o341, TRUE) - EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_5, EVT_PTR(func_802184C0_47F570), 0) - EVT_CALL(SetModelCustomGfx, MODEL_o341, CUSTOM_GFX_5, -1) - EVT_CALL(SetModelFlags, MODEL_o341, 128, 1) + EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_5, EVT_PTR(N(build_gfx_yellow_stars)), NULL) + EVT_CALL(SetModelCustomGfx, MODEL_o341, CUSTOM_GFX_5, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelFlags, MODEL_o341, MODEL_FLAG_HAS_LOCAL_VERTEX_COPY, TRUE) EVT_CALL(MakeLocalVertexCopy, VTX_COPY_5, MODEL_o352, TRUE) - EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_6, EVT_PTR(func_802186B8_47F768), 0) - EVT_CALL(SetModelCustomGfx, MODEL_o352, CUSTOM_GFX_6, -1) - EVT_CALL(SetModelFlags, MODEL_o352, 128, 1) + EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_6, EVT_PTR(N(build_gfx_blue_stars)), NULL) + EVT_CALL(SetModelCustomGfx, MODEL_o352, CUSTOM_GFX_6, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelFlags, MODEL_o352, MODEL_FLAG_HAS_LOCAL_VERTEX_COPY, TRUE) EVT_CALL(MakeLocalVertexCopy, VTX_COPY_6, MODEL_o346, TRUE) - EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_7, EVT_PTR(func_802186B8_47F768), 0) - EVT_CALL(SetModelCustomGfx, MODEL_o346, CUSTOM_GFX_7, -1) - EVT_CALL(SetModelFlags, MODEL_o346, 128, 1) + EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_7, EVT_PTR(N(build_gfx_blue_stars)), NULL) + EVT_CALL(SetModelCustomGfx, MODEL_o346, CUSTOM_GFX_7, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelFlags, MODEL_o346, MODEL_FLAG_HAS_LOCAL_VERTEX_COPY, TRUE) EVT_CALL(MakeLocalVertexCopy, VTX_COPY_7, MODEL_o349, TRUE) - EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_8, EVT_PTR(func_802189D0_47FA80), 0) - EVT_CALL(SetModelCustomGfx, MODEL_o349, CUSTOM_GFX_8, -1) - EVT_CALL(SetModelFlags, MODEL_o349, 128, 1) + EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_8, EVT_PTR(N(build_gfx_green_stars)), NULL) + EVT_CALL(SetModelCustomGfx, MODEL_o349, CUSTOM_GFX_8, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelFlags, MODEL_o349, MODEL_FLAG_HAS_LOCAL_VERTEX_COPY, TRUE) EVT_CALL(MakeLocalVertexCopy, VTX_COPY_8, MODEL_o353, TRUE) - EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_9, EVT_PTR(func_802189D0_47FA80), 0) - EVT_CALL(SetModelCustomGfx, MODEL_o353, CUSTOM_GFX_9, -1) - EVT_CALL(SetModelFlags, MODEL_o353, 128, 1) + EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_9, EVT_PTR(N(build_gfx_green_stars)), NULL) + EVT_CALL(SetModelCustomGfx, MODEL_o353, CUSTOM_GFX_9, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelFlags, MODEL_o353, MODEL_FLAG_HAS_LOCAL_VERTEX_COPY, TRUE) EVT_CALL(MakeLocalVertexCopy, VTX_COPY_9, MODEL_o347, TRUE) - EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_A, EVT_PTR(func_80218CEC_47FD9C), 0) - EVT_CALL(SetModelCustomGfx, MODEL_o347, CUSTOM_GFX_A, -1) - EVT_CALL(SetModelFlags, MODEL_o347, 128, 1) + EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_A, EVT_PTR(N(build_gfx_pink_stars)), NULL) + EVT_CALL(SetModelCustomGfx, MODEL_o347, CUSTOM_GFX_A, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelFlags, MODEL_o347, MODEL_FLAG_HAS_LOCAL_VERTEX_COPY, TRUE) EVT_THREAD EVT_CALL(SetTexPanner, MODEL_o332, TEX_PANNER_0) @@ -168,19 +168,19 @@ EvtScript N(beforeBattle_80224BD0) = { EVT_LOOP(0) EVT_ADD(LVar0, 80) EVT_ADD(LVar1, -150) - EVT_IF_GT(LVar0, 32768) - EVT_ADD(LVar0, -32768) + EVT_IF_GT(LVar0, 0x8000) + EVT_ADD(LVar0, -0x8000) EVT_END_IF - EVT_IF_LT(LVar1, -32768) - EVT_ADD(LVar1, 32768) + EVT_IF_LT(LVar1, -0x8000) + EVT_ADD(LVar1, 0x8000) EVT_END_IF EVT_ADD(LVar2, -50) EVT_ADD(LVar3, 100) - EVT_IF_LT(LVar2, -32768) - EVT_ADD(LVar2, 32768) + EVT_IF_LT(LVar2, -0x8000) + EVT_ADD(LVar2, 0x8000) EVT_END_IF - EVT_IF_GT(LVar3, 32768) - EVT_ADD(LVar3, -32768) + EVT_IF_GT(LVar3, 0x8000) + EVT_ADD(LVar3, -0x8000) EVT_END_IF EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, LVar0, LVar1) EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_AUX, LVar2, LVar3) @@ -189,7 +189,7 @@ EvtScript N(beforeBattle_80224BD0) = { EVT_END_THREAD EVT_THREAD EVT_LABEL(2) - EVT_CALL(MakeLerp, -7, 7, 30, 10) + EVT_CALL(MakeLerp, -7, 7, 30, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o357, 0, LVar0, 0) @@ -202,7 +202,7 @@ EvtScript N(beforeBattle_80224BD0) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(MakeLerp, 7, -7, 30, 10) + EVT_CALL(MakeLerp, 7, -7, 30, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o357, 0, LVar0, 0) @@ -219,7 +219,7 @@ EvtScript N(beforeBattle_80224BD0) = { EVT_END_THREAD EVT_THREAD EVT_LABEL(3) - EVT_CALL(MakeLerp, 7, -7, 30, 10) + EVT_CALL(MakeLerp, 7, -7, 30, EASING_COS_IN_OUT) EVT_LABEL(4) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o363, 0, LVar0, 0) @@ -230,7 +230,7 @@ EvtScript N(beforeBattle_80224BD0) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(4) EVT_END_IF - EVT_CALL(MakeLerp, -7, 7, 30, 10) + EVT_CALL(MakeLerp, -7, 7, 30, EASING_COS_IN_OUT) EVT_LABEL(5) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o363, 0, LVar0, 0) @@ -247,13 +247,14 @@ EvtScript N(beforeBattle_80224BD0) = { EVT_END }; -EvtScript N(afterBattle_80225598) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_802255A8)[] = { - MODEL_o345, 0, +s32 N(ForegroundModels)[] = { + MODEL_o345, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -261,7 +262,7 @@ Stage NAMESPACE = { .shape = "hos_bt01_shape", .hit = "hos_bt01_hit", .bg = "hos_bg", - .preBattle = &N(beforeBattle_80224BD0), - .postBattle = &N(afterBattle_80225598), - .foregroundModelList = N(foregroundModelList_802255A8), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/hos/stage/hos_02.c b/src/battle/area/hos/stage/hos_02.c index cafec8e2e6..830c3407b4 100644 --- a/src/battle/area/hos/stage/hos_02.c +++ b/src/battle/area/hos/stage/hos_02.c @@ -4,7 +4,7 @@ #define NAMESPACE b_area_hos_hos_02 -EvtScript N(beforeBattle_802258E0) = { +EvtScript N(EVS_PreBattle) = { EVT_THREAD EVT_CALL(SetTexPanner, MODEL_o372, TEX_PANNER_1) EVT_CALL(SetTexPanner, MODEL_o375, TEX_PANNER_1) @@ -25,7 +25,7 @@ EvtScript N(beforeBattle_802258E0) = { EVT_THREAD EVT_SET(LVarA, 0) EVT_LABEL(2) - EVT_CALL(MakeLerp, -7, 7, 40, 10) + EVT_CALL(MakeLerp, -7, 7, 40, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o371, 0, LVar0, 0) @@ -38,7 +38,7 @@ EvtScript N(beforeBattle_802258E0) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(MakeLerp, 7, -7, 40, 10) + EVT_CALL(MakeLerp, 7, -7, 40, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o371, 0, LVar0, 0) @@ -56,7 +56,7 @@ EvtScript N(beforeBattle_802258E0) = { EVT_THREAD EVT_SET(LVarA, 0) EVT_LABEL(2) - EVT_CALL(MakeLerp, -10, 4, 40, 10) + EVT_CALL(MakeLerp, -10, 4, 40, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o376, 0, LVar0, 0) @@ -69,7 +69,7 @@ EvtScript N(beforeBattle_802258E0) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(MakeLerp, 4, -10, 40, 10) + EVT_CALL(MakeLerp, 4, -10, 40, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o376, 0, LVar0, 0) @@ -88,7 +88,7 @@ EvtScript N(beforeBattle_802258E0) = { EVT_END }; -EvtScript N(afterBattle_80225E20) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -98,6 +98,6 @@ Stage NAMESPACE = { .shape = "hos_bt02_shape", .hit = "hos_bt02_hit", .bg = "nok_bg", - .preBattle = &N(beforeBattle_802258E0), - .postBattle = &N(afterBattle_80225E20), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/isk_part_1/actor/pokey_mummy.c b/src/battle/area/isk_part_1/actor/pokey_mummy.c index be3da691ff..6e987347a9 100644 --- a/src/battle/area/isk_part_1/actor/pokey_mummy.c +++ b/src/battle/area/isk_part_1/actor/pokey_mummy.c @@ -131,7 +131,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 4, .partCount = ARRAY_COUNT(N(partsTable_80218CC8)), .partsData = N(partsTable_80218CC8), - .takeTurnScript = &N(init_80218EC4), + .initScript = &N(init_80218EC4), .statusTable = N(statusTable_80218C1C), .escapeChance = 60, .airLiftChance = 90, @@ -206,13 +206,13 @@ EvtScript N(init_80218EC4) = { EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, 9, LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 3211524) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 3211528) - EVT_CALL(SetActorVar, ACTOR_SELF, 3, 3211532) - EVT_CALL(SetActorVar, ACTOR_SELF, 4, 3211536) - EVT_CALL(SetActorVar, ACTOR_SELF, 5, 3211537) - EVT_CALL(SetActorVar, ACTOR_SELF, 6, 3211544) - EVT_CALL(SetActorVar, ACTOR_SELF, 7, 3211545) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0x00310104) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0x00310108) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0x0031010C) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 0x00310110) + EVT_CALL(SetActorVar, ACTOR_SELF, 5, 0x00310111) + EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0x00310118) + EVT_CALL(SetActorVar, ACTOR_SELF, 7, 0x00310119) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -406,7 +406,7 @@ EvtScript N(handleEvent_80219050) = { EVT_CASE_EQ(EVENT_SPIKE_TAUNT) EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_PARTNER_ACTING) - EVT_CALL(AfflictActor, 0, 9, 3) + EVT_CALL(AfflictActor, ACTOR_PLAYER, STATUS_POISON, 3) EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_SWITCH(LVar0) @@ -439,7 +439,7 @@ EvtScript N(handleEvent_80219050) = { EVT_END_IF EVT_ADDF(LVar3, LVar0) EVT_ADDF(LVar4, LVar1) - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar3, LVar4, LVar5, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar3, LVar4, LVar5, 20, 0) EVT_WAIT(30) EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -469,7 +469,7 @@ EvtScript N(takeTurn_80219D88) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 1) EVT_END_IF - EVT_CALL(SetPartSounds, ACTOR_SELF, 6, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 6, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, 6, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -477,7 +477,7 @@ EvtScript N(takeTurn_80219D88) = { EVT_CALL(SetPartScale, ACTOR_SELF, 6, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(1.0)) EVT_END_IF EVT_CHILD_THREAD - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 6, LVar0, LVar1, LVar2) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(2.2)) @@ -492,7 +492,7 @@ EvtScript N(takeTurn_80219D88) = { EVT_ADD(LVar1, 15) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(1.2)) EVT_END_IF - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 15, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 15, TRUE) EVT_CASE_EQ(1) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_ADD(LVar1, 20) @@ -500,7 +500,7 @@ EvtScript N(takeTurn_80219D88) = { EVT_ADD(LVar1, 8) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(1.2)) EVT_END_IF - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 15, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 15, TRUE) EVT_CASE_EQ(2) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_ADD(LVar1, 8) @@ -508,7 +508,7 @@ EvtScript N(takeTurn_80219D88) = { EVT_ADD(LVar1, 3) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(1.2)) EVT_END_IF - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 15, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 15, TRUE) EVT_CASE_EQ(3) EVT_END_SWITCH EVT_END_CHILD_THREAD @@ -541,8 +541,8 @@ EvtScript N(takeTurn_80219D88) = { EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(20.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.1)) EVT_CALL(SetAnimation, ACTOR_SELF, 6, ANIM_Pokey_Mummy_Anim16) - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, LVar1) EVT_RETURN @@ -554,7 +554,7 @@ EvtScript N(takeTurn_80219D88) = { EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(20.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.1)) EVT_CALL(SetAnimation, ACTOR_SELF, 6, ANIM_Pokey_Mummy_Anim16) - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, TRUE) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_CHANCE(STATUS_FLAG_POISON, 3, 40), 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, LVar1) @@ -566,14 +566,14 @@ EvtScript N(takeTurn_80219D88) = { 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(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 25, EASING_LINEAR) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(4.0)) EVT_SUB(LVar0, 24) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 21, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 21, EASING_LINEAR) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(3.0)) EVT_SUB(LVar0, 20) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 20, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 20, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -585,8 +585,8 @@ EvtScript N(takeTurn_80219D88) = { EvtScript N(8021A6C8) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 748, 748) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 748, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_2EC, SOUND_2EC) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EC, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) @@ -655,7 +655,7 @@ EvtScript N(8021A6C8) = { EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) @@ -746,50 +746,50 @@ EvtScript N(8021B1B4) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarA) EVT_SWITCH(LVarA) EVT_CASE_EQ(0) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 3211525) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 3211529) - EVT_CALL(SetActorVar, ACTOR_SELF, 3, 3211533) - EVT_CALL(SetActorVar, ACTOR_SELF, 4, 3211538) - EVT_CALL(SetActorVar, ACTOR_SELF, 5, 3211539) - EVT_CALL(SetActorVar, ACTOR_SELF, 6, 3211546) - EVT_CALL(SetActorVar, ACTOR_SELF, 7, 3211547) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0x00310105) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0x00310109) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0x0031010D) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 0x00310112) + EVT_CALL(SetActorVar, ACTOR_SELF, 5, 0x00310113) + EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0x0031011A) + EVT_CALL(SetActorVar, ACTOR_SELF, 7, 0x0031011B) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218E04))) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(SetActorSize, ACTOR_SELF, 62, EVT_IGNORE_ARG) EVT_CALL(SetPartSize, ACTOR_SELF, 1, 62, EVT_IGNORE_ARG) EVT_CALL(N(UnkBattleFunc1), -15, 55, 10, 45) EVT_CASE_EQ(1) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 3211526) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 3211530) - EVT_CALL(SetActorVar, ACTOR_SELF, 3, 3211534) - EVT_CALL(SetActorVar, ACTOR_SELF, 4, 3211540) - EVT_CALL(SetActorVar, ACTOR_SELF, 5, 3211541) - EVT_CALL(SetActorVar, ACTOR_SELF, 6, 3211548) - EVT_CALL(SetActorVar, ACTOR_SELF, 7, 3211549) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0x00310106) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0x0031010A) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0x0031010E) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 0x00310114) + EVT_CALL(SetActorVar, ACTOR_SELF, 5, 0x00310115) + EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0x0031011C) + EVT_CALL(SetActorVar, ACTOR_SELF, 7, 0x0031011D) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218E40))) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 2) EVT_CALL(SetActorSize, ACTOR_SELF, 44, EVT_IGNORE_ARG) EVT_CALL(SetPartSize, ACTOR_SELF, 1, 44, EVT_IGNORE_ARG) EVT_CALL(N(UnkBattleFunc1), -15, 35, 10, 25) EVT_CASE_EQ(2) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, 3211527) - EVT_CALL(SetActorVar, ACTOR_SELF, 2, 3211531) - EVT_CALL(SetActorVar, ACTOR_SELF, 3, 3211535) - EVT_CALL(SetActorVar, ACTOR_SELF, 6, 3211550) - EVT_CALL(SetActorVar, ACTOR_SELF, 7, 3211551) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0x00310107) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0x0031010B) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0x0031010F) + EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0x0031011E) + EVT_CALL(SetActorVar, ACTOR_SELF, 7, 0x0031011F) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218E7C))) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_MULTI_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 3) EVT_CALL(SetActorSize, ACTOR_SELF, 26, EVT_IGNORE_ARG) EVT_CALL(SetPartSize, ACTOR_SELF, 1, 26, EVT_IGNORE_ARG) @@ -845,7 +845,7 @@ EvtScript N(8021B6AC) = { EvtScript N(8021B998) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 6, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, 6, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -860,18 +860,18 @@ EvtScript N(8021B998) = { EVT_WAIT(4) EVT_EXEC_WAIT(N(8021B6AC)) EVT_END_CHILD_THREAD - EVT_CALL(EnemyCreateTargetList, 98308) + EVT_CALL(EnemyCreateTargetList, 0x00018004) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerID, LVar1) EVT_CALL(GetOwnerTarget, LVar0, LVar9) EVT_IF_NE(LVar1, LVar0) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_GOTO(0) EVT_END_IF EVT_LABEL(1) EVT_ADD(LVarF, 1) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_EQ(LVar0, -1) EVT_GOTO(10) EVT_END_IF @@ -887,21 +887,21 @@ EvtScript N(8021B998) = { EVT_SET(LVar1, 0) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.1)) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(7.0)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, TRUE) EVT_CHILD_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_END_CHILD_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_CALL(DispatchDamageEvent, LVar0, 1, 17) + EVT_CALL(DispatchDamageEvent, LVar0, 1, EVENT_SPIN_SMASH_LAUNCH_HIT) EVT_GOTO(1) EVT_LABEL(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.1)) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(6.0)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, 296, 0, 0, 0, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, 296, 0, 0, 0, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_RETURN EVT_END }; @@ -934,22 +934,22 @@ EvtScript N(8021BDE4) = { EVT_IF_NE(LVarA, 3) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 6, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(6.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 30) EVT_SET(LVar1, 0) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 10, 18, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 10, 18, EASING_LINEAR) EVT_ADD(LVar0, 20) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 8, 10, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 8, 10, EASING_LINEAR) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_ELSE EVT_WAIT(30) EVT_END_IF @@ -964,7 +964,7 @@ EvtScript N(8021BDE4) = { EVT_ADD(LVar1, LVar3) EVT_ADD(LVar2, 5) EVT_DIVF(LVar3, EVT_FLOAT(10.0)) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_CALL(GetActorVar, ACTOR_SELF, 7, LVar1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, LVar1) diff --git a/src/battle/area/isk_part_1/actor/stone_chomp.c b/src/battle/area/isk_part_1/actor/stone_chomp.c index 653897837a..95c28d809b 100644 --- a/src/battle/area/isk_part_1/actor/stone_chomp.c +++ b/src/battle/area/isk_part_1/actor/stone_chomp.c @@ -221,7 +221,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 4, .partCount = ARRAY_COUNT(N(partsTable_80221604)), .partsData = N(partsTable_80221604), - .takeTurnScript = &N(init_80221ABC), + .initScript = &N(init_80221ABC), .statusTable = N(statusTable_80221558), .escapeChance = 0, .airLiftChance = 25, @@ -625,7 +625,7 @@ EvtScript N(handleEvent_80222364) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3F9) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -772,7 +772,7 @@ EvtScript N(takeTurn_80222ED0) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) diff --git a/src/battle/area/isk_part_1/stage/isk_00.c b/src/battle/area/isk_part_1/stage/isk_00.c index abae3a94d2..d290debff9 100644 --- a/src/battle/area/isk_part_1/stage/isk_00.c +++ b/src/battle/area/isk_part_1/stage/isk_00.c @@ -3,21 +3,4 @@ #define NAMESPACE b_area_isk_part_1_isk_00 -EvtScript N(beforeBattle_802238B0) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_802238EC) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt00_shape", - .preBattle = &N(beforeBattle_802238B0), - .postBattle = &N(afterBattle_802238EC), -}; +#include "battle/common/stage/isk_00.inc.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 index 508f0b4939..aff8dc5dea 100644 --- a/src/battle/area/isk_part_1/stage/isk_01.c +++ b/src/battle/area/isk_part_1/stage/isk_01.c @@ -3,22 +3,4 @@ #define NAMESPACE b_area_isk_part_1_isk_01 -EvtScript N(beforeBattle_80223930) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8022396C) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt01_shape", - .hit = "isk_bt01_hit", - .preBattle = &N(beforeBattle_80223930), - .postBattle = &N(afterBattle_8022396C), -}; +#include "battle/common/stage/isk_01.inc.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 index c08b92c6dd..61da2d5f6a 100644 --- a/src/battle/area/isk_part_1/stage/isk_02.c +++ b/src/battle/area/isk_part_1/stage/isk_02.c @@ -1,30 +1,6 @@ #include "common.h" #include "battle/battle.h" -#include "mapfs/isk_bt02_shape.h" #define NAMESPACE b_area_isk_part_1_isk_02 -EvtScript N(beforeBattle_802239B0) = { - EVT_CALL(SetSpriteShading, 786432) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_802239EC) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_802239FC)[] = { - MODEL_o398, MODEL_o397, MODEL_o399, 0, -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt02_shape", - .hit = "isk_bt02_hit", - .preBattle = &N(beforeBattle_802239B0), - .postBattle = &N(afterBattle_802239EC), - .foregroundModelList = N(foregroundModelList_802239FC), -}; +#include "battle/common/stage/isk_02.inc.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 index e3d8df2304..cf060dcb7e 100644 --- a/src/battle/area/isk_part_1/stage/isk_02b.c +++ b/src/battle/area/isk_part_1/stage/isk_02b.c @@ -1,36 +1,6 @@ #include "common.h" #include "battle/battle.h" -#include "mapfs/isk_bt02_shape.h" #define NAMESPACE b_area_isk_part_1_isk_02b -EvtScript N(beforeBattle_80223D90) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, MODEL_o365, FALSE) - EVT_CALL(EnableModel, MODEL_o366, FALSE) - EVT_CALL(EnableModel, MODEL_o367, FALSE) - EVT_CALL(EnableModel, MODEL_o389, FALSE) - EVT_CALL(EnableModel, MODEL_o390, FALSE) - EVT_CALL(EnableModel, MODEL_o391, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80223E44) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80223E54)[] = { - MODEL_o398, MODEL_o397, MODEL_o399, 0, -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt02_shape", - .hit = "isk_bt02_hit", - .preBattle = &N(beforeBattle_80223D90), - .postBattle = &N(afterBattle_80223E44), - .foregroundModelList = N(foregroundModelList_80223E54), -}; +#include "battle/common/stage/isk_02b.inc.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 index 35ae3cbf51..3b486abdb4 100644 --- a/src/battle/area/isk_part_1/stage/isk_02c.c +++ b/src/battle/area/isk_part_1/stage/isk_02c.c @@ -1,32 +1,6 @@ #include "common.h" #include "battle/battle.h" -#include "mapfs/isk_bt02_shape.h" #define NAMESPACE b_area_isk_part_1_isk_02c -EvtScript N(beforeBattle_80223E90) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, MODEL_kai2, 0) - EVT_CALL(EnableModel, MODEL_kai1, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80223EF4) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80223F04)[] = { - MODEL_o398, MODEL_o397, MODEL_o399, 0, -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt02_shape", - .hit = "isk_bt02_hit", - .preBattle = &N(beforeBattle_80223E90), - .postBattle = &N(afterBattle_80223EF4), - .foregroundModelList = N(foregroundModelList_80223F04), -}; +#include "battle/common/stage/isk_02c.inc.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 index 7b8c07181f..5bd9e9ec93 100644 --- a/src/battle/area/isk_part_1/stage/isk_03.c +++ b/src/battle/area/isk_part_1/stage/isk_03.c @@ -3,23 +3,4 @@ #define NAMESPACE b_area_isk_part_1_isk_03 -EvtScript N(beforeBattle_80223A40) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80223A7C) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt03_shape", - .hit = "isk_bt03_hit", - .bg = "sbk3_bg", - .preBattle = &N(beforeBattle_80223A40), - .postBattle = &N(afterBattle_80223A7C), -}; +#include "battle/common/stage/isk_03.inc.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 index 4cb03a4e2c..03f79f2017 100644 --- a/src/battle/area/isk_part_1/stage/isk_03b.c +++ b/src/battle/area/isk_part_1/stage/isk_03b.c @@ -3,22 +3,4 @@ #define NAMESPACE b_area_isk_part_1_isk_03b -EvtScript N(beforeBattle_80223D10) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80223D4C) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt03_shape", - .hit = "isk_bt03_hit", - .preBattle = &N(beforeBattle_80223D10), - .postBattle = &N(afterBattle_80223D4C), -}; +#include "battle/common/stage/isk_03b.inc.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 index 666de0a866..2682f03995 100644 --- a/src/battle/area/isk_part_1/stage/isk_04.c +++ b/src/battle/area/isk_part_1/stage/isk_04.c @@ -1,48 +1,6 @@ #include "common.h" -#include "effects.h" #include "battle/battle.h" -#include "mapfs/isk_bt04_shape.h" #define NAMESPACE b_area_isk_part_1_isk_04 -BSS EffectInstance* N(D_80224D60); -BSS EffectInstance* N(D_80224D64); - -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; -} - -API_CALLABLE(N(DeleteTorchFX)) { - remove_effect(N(D_80224D60)); - remove_effect(N(D_80224D64)); - return ApiStatus_DONE2; -} - -EvtScript N(beforeBattle_80223AC0) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(N(CreateTorchFX)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80223B08) = { - EVT_CALL(N(DeleteTorchFX)) - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80223B24)[] = { - MODEL_o500, MODEL_o501, 0, -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt04_shape", - .hit = "isk_bt04_hit", - .preBattle = &N(beforeBattle_80223AC0), - .postBattle = &N(afterBattle_80223B08), - .foregroundModelList = N(foregroundModelList_80223B24), -}; +#include "battle/common/stage/isk_04.inc.c" diff --git a/src/battle/area/isk_part_1/stage/isk_05.c b/src/battle/area/isk_part_1/stage/isk_05.c index a43c8258f7..ce4dbb5002 100644 --- a/src/battle/area/isk_part_1/stage/isk_05.c +++ b/src/battle/area/isk_part_1/stage/isk_05.c @@ -1,42 +1,6 @@ #include "common.h" -#include "effects.h" #include "battle/battle.h" #define NAMESPACE b_area_isk_part_1_isk_05 -BSS EffectInstance* N(D_80224D70); -BSS EffectInstance* N(D_80224D74); - -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; -} - -API_CALLABLE(N(DeleteTorchFX)) { - remove_effect(N(D_80224D70)); - remove_effect(N(D_80224D74)); - return ApiStatus_DONE2; -} - -EvtScript N(beforeBattle_80223B60) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(N(CreateTorchFX)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80223BA8) = { - EVT_CALL(N(DeleteTorchFX)) - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt05_shape", - .hit = "isk_bt05_hit", - .preBattle = &N(beforeBattle_80223B60), - .postBattle = &N(afterBattle_80223BA8), -}; +#include "battle/common/stage/isk_05.inc.c" diff --git a/src/battle/area/isk_part_1/stage/isk_06.c b/src/battle/area/isk_part_1/stage/isk_06.c index 80f14e75c6..13900c0b27 100644 --- a/src/battle/area/isk_part_1/stage/isk_06.c +++ b/src/battle/area/isk_part_1/stage/isk_06.c @@ -1,39 +1,6 @@ #include "common.h" -#include "effects.h" #include "battle/battle.h" #define NAMESPACE b_area_isk_part_1_isk_06 -BSS EffectInstance* N(D_80224D80); - -API_CALLABLE(func_80218A50_4E3190) { - fx_flame(1, -110.0f, 80.0f, -146.0f, 0.3f, &N(D_80224D80)); - return ApiStatus_DONE2; -} - -API_CALLABLE(func_80218A98_4E31D8) { - remove_effect(N(D_80224D80)); - return ApiStatus_DONE2; -} - -EvtScript N(beforeBattle_80223BF0) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(func_80218A50_4E3190) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80223C38) = { - EVT_CALL(func_80218A98_4E31D8) - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt06_shape", - .hit = "isk_bt06_hit", - .preBattle = &N(beforeBattle_80223BF0), - .postBattle = &N(afterBattle_80223C38), -}; +#include "battle/common/stage/isk_06.inc.c" diff --git a/src/battle/area/isk_part_1/stage/isk_06b.c b/src/battle/area/isk_part_1/stage/isk_06b.c index 2aad07cec5..ea33100627 100644 --- a/src/battle/area/isk_part_1/stage/isk_06b.c +++ b/src/battle/area/isk_part_1/stage/isk_06b.c @@ -1,41 +1,6 @@ #include "common.h" -#include "effects.h" #include "battle/battle.h" -#include "mapfs/isk_bt06_shape.h" #define NAMESPACE b_area_isk_part_1_isk_06b -BSS EffectInstance* N(D_80224DA0); - -API_CALLABLE(func_80218B30_4E3270) { - fx_flame(1, -110.0f, 80.0f, -146.0, 0.3f, &N(D_80224DA0)); - return ApiStatus_DONE2; -} - -API_CALLABLE(func_80218B78_4E32B8) { - remove_effect(N(D_80224DA0)); - return ApiStatus_DONE2; -} - -EvtScript N(beforeBattle_80223F40) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(func_80218B30_4E3270) - EVT_CALL(EnableModel, MODEL_kesu, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80223F9C) = { - EVT_CALL(func_80218B78_4E32B8) - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt06_shape", - .hit = "isk_bt06_hit", - .preBattle = &N(beforeBattle_80223F40), - .postBattle = &N(afterBattle_80223F9C), -}; +#include "battle/common/stage/isk_06b.inc.c" diff --git a/src/battle/area/isk_part_1/stage/isk_07.c b/src/battle/area/isk_part_1/stage/isk_07.c index 603a9e20d2..0c6b93cded 100644 --- a/src/battle/area/isk_part_1/stage/isk_07.c +++ b/src/battle/area/isk_part_1/stage/isk_07.c @@ -1,39 +1,6 @@ #include "common.h" -#include "effects.h" #include "battle/battle.h" #define NAMESPACE b_area_isk_part_1_isk_07 -BSS EffectInstance* N(D_80224D90); - -API_CALLABLE(func_80218AC0_4E3200) { - fx_flame(1, 110.0f, 80.0f, -146.0f, 0.3f, &N(D_80224D90)); - return ApiStatus_DONE2; -} - -API_CALLABLE(func_80218B08_4E3248) { - remove_effect(N(D_80224D90)); - return ApiStatus_DONE2; -} - -EvtScript N(beforeBattle_80223C80) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(func_80218AC0_4E3200) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80223CC8) = { - EVT_CALL(func_80218B08_4E3248) - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt07_shape", - .hit = "isk_bt07_hit", - .preBattle = &N(beforeBattle_80223C80), - .postBattle = &N(afterBattle_80223CC8), -}; +#include "battle/common/stage/isk_07.inc.c" diff --git a/src/battle/area/isk_part_1/stage/isk_08.c b/src/battle/area/isk_part_1/stage/isk_08.c index 237e62150d..b97582d1e3 100644 --- a/src/battle/area/isk_part_1/stage/isk_08.c +++ b/src/battle/area/isk_part_1/stage/isk_08.c @@ -1,39 +1,6 @@ #include "common.h" -#include "effects.h" #include "battle/battle.h" #define NAMESPACE b_area_isk_part_1_isk_08 -BSS EffectInstance* N(D_80224DB0); - -API_CALLABLE(func_80218BA0_4E32E0) { - fx_flame(1, 0, 72.0f, -146.0, 0.3f, &N(D_80224DB0)); - return ApiStatus_DONE2; -} - -API_CALLABLE(func_80218BE8_4E3328) { - remove_effect(N(D_80224DB0)); - return ApiStatus_DONE2; -} - -EvtScript N(beforeBattle_80223FE0) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(func_80218BA0_4E32E0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80224028) = { - EVT_CALL(func_80218BE8_4E3328) - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt08_shape", - .hit = "isk_bt08_hit", - .preBattle = &N(beforeBattle_80223FE0), - .postBattle = &N(afterBattle_80224028), -}; +#include "battle/common/stage/isk_08.inc.c" diff --git a/src/battle/area/isk_part_2/actor/chain_chomp.c b/src/battle/area/isk_part_2/actor/chain_chomp.c index c3101681bf..4b705ea967 100644 --- a/src/battle/area/isk_part_2/actor/chain_chomp.c +++ b/src/battle/area/isk_part_2/actor/chain_chomp.c @@ -232,7 +232,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 4, .partCount = ARRAY_COUNT(N(partsTable_80218D34)), .partsData = N(partsTable_80218D34), - .takeTurnScript = &N(init_80218EC4), + .initScript = &N(init_80218EC4), .statusTable = N(statusTable_80218C88), .escapeChance = 0, .airLiftChance = 0, @@ -594,7 +594,7 @@ EvtScript N(handleEvent_802197C4) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -706,7 +706,7 @@ EvtScript N(8021A200) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 0, FALSE, TRUE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) @@ -718,7 +718,7 @@ EvtScript N(8021A200) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_SET(LVar1, 0) @@ -729,7 +729,7 @@ EvtScript N(8021A200) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) @@ -745,7 +745,7 @@ EvtScript N(8021A200) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_SET(LVar1, 0) @@ -756,7 +756,7 @@ EvtScript N(8021A200) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) @@ -788,7 +788,7 @@ EvtScript N(takeTurn_8021A7C4) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ChainChomp_Anim05) @@ -799,7 +799,7 @@ EvtScript N(takeTurn_8021A7C4) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(PlaySound, 0x10F) + EVT_CALL(PlaySound, SOUND_10F) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ChainChomp_Anim01) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -812,7 +812,7 @@ EvtScript N(takeTurn_8021A7C4) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) @@ -824,7 +824,7 @@ EvtScript N(takeTurn_8021A7C4) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_SUB(LVar0, 15) @@ -834,7 +834,7 @@ EvtScript N(takeTurn_8021A7C4) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ChainChomp_Anim04) @@ -845,7 +845,7 @@ EvtScript N(takeTurn_8021A7C4) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_ChainChomp_Anim01) EVT_EXEC_WAIT(N(8021B41C)) @@ -890,7 +890,7 @@ EvtScript N(takeTurn_8021A7C4) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_ADD(LVar0, 30) @@ -900,7 +900,7 @@ EvtScript N(takeTurn_8021A7C4) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_ADD(LVar0, 20) @@ -910,7 +910,7 @@ EvtScript N(takeTurn_8021A7C4) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_SUB(LVar0, 10) @@ -919,7 +919,7 @@ EvtScript N(takeTurn_8021A7C4) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ChainChomp_Anim01) @@ -981,7 +981,7 @@ EvtScript N(8021B50C) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_ELSE @@ -993,7 +993,7 @@ EvtScript N(8021B50C) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_END_IF @@ -1007,7 +1007,7 @@ EvtScript N(8021B50C) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_ELSE @@ -1018,7 +1018,7 @@ EvtScript N(8021B50C) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_END_IF diff --git a/src/battle/area/isk_part_2/actor/tutankoopa.c b/src/battle/area/isk_part_2/actor/tutankoopa.c index b6d9cae9af..0f8bcef38b 100644 --- a/src/battle/area/isk_part_2/actor/tutankoopa.c +++ b/src/battle/area/isk_part_2/actor/tutankoopa.c @@ -203,7 +203,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 30, .partCount = ARRAY_COUNT(N(partsTable_8021BAD4)), .partsData = N(partsTable_8021BAD4), - .takeTurnScript = &N(init_8021BC1C), + .initScript = &N(init_8021BC1C), .statusTable = N(statusTable_8021BA28), .escapeChance = 0, .airLiftChance = 0, @@ -468,10 +468,10 @@ EvtScript N(8021C974) = { EVT_CALL(StartRumble, 1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Tutankoopa_Anim07) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 40) - EVT_CALL(PlayEffect, EFFECT_STARS_ORBITING, 0, LVar0, LVar1, LVar2, 20, 4, LVarF, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STARS_ORBITING, 0, LVar0, LVar1, LVar2, 20, 4, LVarF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Tutankoopa_Anim0A) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) EVT_WAIT(30) @@ -581,9 +581,9 @@ EvtScript N(8021D04C) = { EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 40) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar9, EVT_FLOAT(0.8)) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 5, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 5, TRUE) EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_SELF, LVar9, 0x330005) + EVT_CALL(SetAnimation, ACTOR_SELF, LVar9, ANIM_BuzzyBeetle_Anim05) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F9) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) @@ -597,15 +597,15 @@ EvtScript N(8021D04C) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 50) EVT_SET(LVar1, -5) - EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 0, 30, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 0, 30, EASING_LINEAR) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 65) EVT_SET(LVar1, -5) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, LVar9, EVT_FLOAT(6.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar9, EVT_FLOAT(0.1)) - EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 0, 15, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar9, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 0, 15, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar9, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -621,7 +621,7 @@ EvtScript N(8021D04C) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar9, EVT_FLOAT(0.2)) - EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 0, 30, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 0, 30, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar8, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -630,11 +630,11 @@ EvtScript N(8021D04C) = { EVT_SET(LVar1, 0) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, LVar9, EVT_FLOAT(6.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar9, EVT_FLOAT(0.1)) - EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 0, 25, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 0, 25, EASING_LINEAR) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, LVar9, EVT_FLOAT(4.0)) EVT_SUB(LVar0, 20) - EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 0, 21, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar9, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 0, 21, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar9, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(19) EVT_IF_EQ(LVar8, HIT_RESULT_10) EVT_RETURN @@ -671,41 +671,41 @@ EvtScript N(8021D81C) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Tutankoopa_Anim03) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_HIEROGLYPHS, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HIEROGLYPHS, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0) EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 70) - EVT_CALL(PlaySound, 0x20E7) - EVT_CALL(PlayEffect, EFFECT_CHOMP_DROP, 0, 0, 60, 0, EVT_FLOAT(0.2), 0, EVT_FLOAT(1.4), 255, EVT_FLOAT(0.1), 150, 0, 0, 0) + EVT_CALL(PlaySound, SOUND_20E7) + EVT_PLAY_EFFECT(EFFECT_CHOMP_DROP, 0, 0, 60, 0, EVT_FLOAT(0.2), 0, EVT_FLOAT(1.4), 255, EVT_FLOAT(0.1), 150, 0) EVT_WAIT(15) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP | STATUS_FLAG_TRANSPARENT) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002B) EVT_WAIT(49) - EVT_CALL(PlaySound, 0x20E9) + EVT_CALL(PlaySound, SOUND_20E9) EVT_WAIT(5) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Tutankoopa_Anim05) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Crouch) EVT_WAIT(5) EVT_CALL(StartRumble, 10) - EVT_CALL(PlaySound, 0x20EA) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(4.0)) + EVT_CALL(PlaySound, SOUND_20EA) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(4.0)) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Question) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0, 0, 0, 0) - EVT_CALL(PlaySound, 0x20E8) + EVT_PLAY_EFFECT(EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0) + EVT_CALL(PlaySound, SOUND_20E8) EVT_ELSE EVT_WAIT(50) - EVT_CALL(PlaySound, 0x20E9) + EVT_CALL(PlaySound, SOUND_20E9) EVT_WAIT(18) EVT_CALL(StartRumble, 10) - EVT_CALL(PlaySound, 0x20EA) + EVT_CALL(PlaySound, SOUND_20EA) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x20E8) + EVT_CALL(PlaySound, SOUND_20E8) EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, 6, LVar0) EVT_SWITCH(LVar0) @@ -743,17 +743,17 @@ EvtScript N(8021DDE8) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar3, 170) EVT_CALL(SetPartPos, ACTOR_SELF, 8, LVar0, LVar3, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 8, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 8, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 8, ANIM_Tutankoopa_Anim16) - EVT_CALL(PlaySound, 0x20EB) + EVT_CALL(PlaySound, SOUND_20EB) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 8, EVT_FLOAT(8.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 8, EVT_FLOAT(0.3)) EVT_CALL(FallPartTo, ACTOR_SELF, 8, LVar0, LVar1, LVar2, 20) EVT_THREAD EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 8, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 8, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 8, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 8, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -780,7 +780,7 @@ EvtScript N(8021E008) = { EVT_SUB(LVar0, 150) EVT_CALL(RandInt, 90, LVar1) EVT_SUB(LVar0, 40) - EVT_CALL(PlaySound, 0x20EB) + EVT_CALL(PlaySound, SOUND_20EB) EVT_CALL(func_8021875C_4EFBFC, LVar0, 0, LVar1) EVT_CALL(RandInt, 5, LVar0) EVT_ADD(LVar0, 5) @@ -795,7 +795,7 @@ EvtScript N(8021E008) = { EVT_CASE_DEFAULT EVT_CALL(func_8026BF48, 1) EVT_THREAD - EVT_CALL(PlaySound, 0x20EB) + EVT_CALL(PlaySound, SOUND_20EB) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -803,7 +803,7 @@ EvtScript N(8021E008) = { EVT_SET(LVar1, 0) EVT_SET(LVar3, 170) EVT_CALL(SetPartPos, ACTOR_SELF, 6, LVar0, LVar3, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 6, ANIM_Tutankoopa_Anim16) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(8.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.3)) @@ -821,9 +821,9 @@ EvtScript N(8021E008) = { EVT_ADD(LVar5, 5) EVT_SET(LVar7, 170) EVT_CALL(SetPartPos, ACTOR_SELF, 7, LVar4, LVar7, LVar6) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 7, ANIM_Tutankoopa_Anim16) - EVT_CALL(PlaySound, 0x20EB) + EVT_CALL(PlaySound, SOUND_20EB) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 7, EVT_FLOAT(8.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 7, EVT_FLOAT(0.3)) EVT_CALL(FallPartTo, ACTOR_SELF, 7, LVar4, LVar5, LVar6, 20) @@ -832,7 +832,7 @@ EvtScript N(8021E008) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_WAIT(20) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(func_8026BF48, 0) EVT_RETURN EVT_END_SWITCH @@ -845,7 +845,7 @@ EvtScript N(8021E008) = { EVT_SUB(LVar0, 150) EVT_CALL(RandInt, 90, LVar1) EVT_SUB(LVar0, 40) - EVT_CALL(PlaySound, 0x20EB) + EVT_CALL(PlaySound, SOUND_20EB) EVT_CALL(func_8021875C_4EFBFC, LVar0, 0, LVar1) EVT_CALL(RandInt, 5, LVar0) EVT_ADD(LVar0, 5) @@ -862,9 +862,9 @@ EvtScript N(8021E008) = { EVT_ADD(LVar5, 5) EVT_SET(LVar7, 170) EVT_CALL(SetPartPos, ACTOR_SELF, 7, LVar4, LVar7, LVar6) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 7, ANIM_Tutankoopa_Anim16) - EVT_CALL(PlaySound, 0x20EB) + EVT_CALL(PlaySound, SOUND_20EB) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 7, EVT_FLOAT(8.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 7, EVT_FLOAT(0.3)) EVT_CALL(FallPartTo, ACTOR_SELF, 7, LVar4, LVar5, LVar6, 20) @@ -872,10 +872,10 @@ EvtScript N(8021E008) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_WAIT(20) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD - EVT_CALL(PlaySound, 0x20EB) + EVT_CALL(PlaySound, SOUND_20EB) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -883,7 +883,7 @@ EvtScript N(8021E008) = { EVT_ADD(LVar1, 5) EVT_SET(LVar3, 170) EVT_CALL(SetPartPos, ACTOR_SELF, 6, LVar0, LVar3, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 6, ANIM_Tutankoopa_Anim16) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(8.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.3)) @@ -893,7 +893,7 @@ EvtScript N(8021E008) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_WAIT(19) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_IF_EQ(LVar0, HIT_RESULT_10) EVT_RETURN EVT_END_IF @@ -944,14 +944,14 @@ EvtScript N(8021E9C8) = { EVT_THREAD EVT_LABEL(0) EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_WAIT(1) EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar0) EVT_IF_LT(LVar0, 60) EVT_GOTO(0) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySound, 0x26B) + EVT_CALL(PlaySound, SOUND_26B) EVT_LABEL(10) EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVarD) EVT_CALL(TranslateModel, 31, 0, LVarD, 0) @@ -961,7 +961,7 @@ EvtScript N(8021E9C8) = { EVT_IF_LT(LVarD, 60) EVT_GOTO(10) EVT_END_IF - EVT_CALL(StopSound, 619) + EVT_CALL(StopSound, SOUND_26B) EVT_WAIT(10) EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_8021E9AC)), 0) EVT_SET(LVarB, LVar0) @@ -1007,12 +1007,12 @@ EvtScript N(8021E9C8) = { EVT_CALL(SetGoalPos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, LVarB, 8, FALSE, TRUE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_CALL(SetGoalPos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, LVarB, 8, FALSE, TRUE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_WAIT(8) EVT_END_IF @@ -1038,14 +1038,14 @@ EvtScript N(8021E9C8) = { EVT_THREAD EVT_LABEL(40) EVT_CALL(StartRumble, 1) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_WAIT(1) EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar0) EVT_IF_NE(LVar0, 0) EVT_GOTO(40) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySound, 0x26B) + EVT_CALL(PlaySound, SOUND_26B) EVT_LABEL(50) EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVarD) EVT_CALL(TranslateModel, 31, 0, LVarD, 0) @@ -1055,9 +1055,9 @@ EvtScript N(8021E9C8) = { EVT_IF_GT(LVarD, 0) EVT_GOTO(50) EVT_END_IF - EVT_CALL(StopSound, 619) - EVT_CALL(PlaySound, 0x26C) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.5)) + EVT_CALL(StopSound, SOUND_26B) + EVT_CALL(PlaySound, SOUND_26C) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.5)) EVT_CALL(SetActorVar, ACTOR_SELF, 3, 1) EVT_RETURN EVT_END @@ -1076,7 +1076,7 @@ EvtScript N(8021F42C) = { EVT_CALL(JumpToGoal, LVarB, LVar3, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_ELSE EVT_SUB(LVar5, LVar4) @@ -1084,7 +1084,7 @@ EvtScript N(8021F42C) = { EVT_CALL(JumpToGoal, LVarB, LVar3, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2062) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_END_IF EVT_GOTO(20) @@ -1101,7 +1101,7 @@ EvtScript N(8021F5E8) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Tutankoopa_Anim08) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_HIEROGLYPHS, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HIEROGLYPHS, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0) EVT_WAIT(45) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 60) @@ -1184,7 +1184,7 @@ EvtScript N(8021FA54) = { EVT_CALL(SetActorYaw, ACTOR_ENEMY1, 0) EVT_CALL(GetActorPos, ACTOR_ENEMY1, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_DEATH) EVT_SET(LVar3, 0) EVT_LOOP(12) diff --git a/src/battle/area/isk_part_2/stage/isk_00.c b/src/battle/area/isk_part_2/stage/isk_00.c index d1d9126017..779dd9821a 100644 --- a/src/battle/area/isk_part_2/stage/isk_00.c +++ b/src/battle/area/isk_part_2/stage/isk_00.c @@ -3,21 +3,4 @@ #define NAMESPACE b_area_isk_part_2_isk_00 -EvtScript N(beforeBattle_8021FCF0) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8021FD2C) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt00_shape", - .preBattle = &N(beforeBattle_8021FCF0), - .postBattle = &N(afterBattle_8021FD2C), -}; +#include "battle/common/stage/isk_00.inc.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 index ef0bccc2ac..3d125db233 100644 --- a/src/battle/area/isk_part_2/stage/isk_01.c +++ b/src/battle/area/isk_part_2/stage/isk_01.c @@ -3,22 +3,4 @@ #define NAMESPACE b_area_isk_part_2_isk_01 -EvtScript N(beforeBattle_8021FD70) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8021FDAC) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt01_shape", - .hit = "isk_bt01_hit", - .preBattle = &N(beforeBattle_8021FD70), - .postBattle = &N(afterBattle_8021FDAC), -}; +#include "battle/common/stage/isk_01.inc.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 index 8ff4113111..634c392c30 100644 --- a/src/battle/area/isk_part_2/stage/isk_02.c +++ b/src/battle/area/isk_part_2/stage/isk_02.c @@ -1,30 +1,6 @@ #include "common.h" #include "battle/battle.h" -#include "mapfs/isk_bt02_shape.h" #define NAMESPACE b_area_isk_part_2_isk_02 -EvtScript N(beforeBattle_8021FDF0) = { - EVT_CALL(SetSpriteShading, 786432) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8021FE2C) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_8021FE3C)[] = { - MODEL_o398, MODEL_o397, MODEL_o399, 0, -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt02_shape", - .hit = "isk_bt02_hit", - .preBattle = &N(beforeBattle_8021FDF0), - .postBattle = &N(afterBattle_8021FE2C), - .foregroundModelList = N(foregroundModelList_8021FE3C), -}; +#include "battle/common/stage/isk_02.inc.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 index 9a31e8dac2..4f13f91dd1 100644 --- a/src/battle/area/isk_part_2/stage/isk_02b.c +++ b/src/battle/area/isk_part_2/stage/isk_02b.c @@ -1,36 +1,6 @@ #include "common.h" #include "battle/battle.h" -#include "mapfs/isk_bt02_shape.h" #define NAMESPACE b_area_isk_part_2_isk_02b -EvtScript N(beforeBattle_8021FE80) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, MODEL_o365, FALSE) - EVT_CALL(EnableModel, MODEL_o366, FALSE) - EVT_CALL(EnableModel, MODEL_o367, FALSE) - EVT_CALL(EnableModel, MODEL_o389, FALSE) - EVT_CALL(EnableModel, MODEL_o390, FALSE) - EVT_CALL(EnableModel, MODEL_o391, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8021FF34) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_8021FF44)[] = { - MODEL_o398, MODEL_o397, MODEL_o399, 0, -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt02_shape", - .hit = "isk_bt02_hit", - .preBattle = &N(beforeBattle_8021FE80), - .postBattle = &N(afterBattle_8021FF34), - .foregroundModelList = N(foregroundModelList_8021FF44), -}; +#include "battle/common/stage/isk_02b.inc.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 index 493fdc0b64..7e9490118a 100644 --- a/src/battle/area/isk_part_2/stage/isk_02c.c +++ b/src/battle/area/isk_part_2/stage/isk_02c.c @@ -1,32 +1,6 @@ #include "common.h" #include "battle/battle.h" -#include "mapfs/isk_bt02_shape.h" #define NAMESPACE b_area_isk_part_2_isk_02c -EvtScript N(beforeBattle_8021FF80) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(EnableModel, MODEL_kai2, 0) - EVT_CALL(EnableModel, MODEL_kai1, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8021FFE4) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_8021FFF4)[] = { - MODEL_o398, MODEL_o397, MODEL_o399, 0, -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt02_shape", - .hit = "isk_bt02_hit", - .preBattle = &N(beforeBattle_8021FF80), - .postBattle = &N(afterBattle_8021FFE4), - .foregroundModelList = N(foregroundModelList_8021FFF4), -}; +#include "battle/common/stage/isk_02c.inc.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 index c11902bf48..065b379dd6 100644 --- a/src/battle/area/isk_part_2/stage/isk_03.c +++ b/src/battle/area/isk_part_2/stage/isk_03.c @@ -3,23 +3,4 @@ #define NAMESPACE b_area_isk_part_2_isk_03 -EvtScript N(beforeBattle_80220030) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8022006C) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt03_shape", - .hit = "isk_bt03_hit", - .bg = "sbk3_bg", - .preBattle = &N(beforeBattle_80220030), - .postBattle = &N(afterBattle_8022006C), -}; +#include "battle/common/stage/isk_03.inc.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 index b51ab1d5f9..83d6eb381b 100644 --- a/src/battle/area/isk_part_2/stage/isk_03b.c +++ b/src/battle/area/isk_part_2/stage/isk_03b.c @@ -3,22 +3,4 @@ #define NAMESPACE b_area_isk_part_2_isk_03b -EvtScript N(beforeBattle_802200B0) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_802200EC) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt03_shape", - .hit = "isk_bt03_hit", - .preBattle = &N(beforeBattle_802200B0), - .postBattle = &N(afterBattle_802200EC), -}; +#include "battle/common/stage/isk_03b.inc.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 index 5b54eea71e..3e79d18451 100644 --- a/src/battle/area/isk_part_2/stage/isk_04.c +++ b/src/battle/area/isk_part_2/stage/isk_04.c @@ -1,48 +1,6 @@ #include "common.h" -#include "effects.h" #include "battle/battle.h" -#include "mapfs/isk_bt04_shape.h" #define NAMESPACE b_area_isk_part_2_isk_04 -BSS EffectInstance* D_80220740; -BSS EffectInstance* D_80220744; - -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; -} - -API_CALLABLE(func_802188E4_4EFD84) { - remove_effect(D_80220740); - remove_effect(D_80220744); - return ApiStatus_DONE2; -} - -EvtScript N(beforeBattle_80220130) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(func_80218850_4EFCF0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80220178) = { - EVT_CALL(func_802188E4_4EFD84) - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80220194)[] = { - MODEL_o500, MODEL_o501, 0, -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt04_shape", - .hit = "isk_bt04_hit", - .preBattle = &N(beforeBattle_80220130), - .postBattle = &N(afterBattle_80220178), - .foregroundModelList = N(foregroundModelList_80220194), -}; +#include "battle/common/stage/isk_04.inc.c" diff --git a/src/battle/area/isk_part_2/stage/isk_05.c b/src/battle/area/isk_part_2/stage/isk_05.c index 7540e05f6e..060a1b7f60 100644 --- a/src/battle/area/isk_part_2/stage/isk_05.c +++ b/src/battle/area/isk_part_2/stage/isk_05.c @@ -1,42 +1,6 @@ #include "common.h" -#include "effects.h" #include "battle/battle.h" #define NAMESPACE b_area_isk_part_2_isk_05 -BSS EffectInstance* D_80220750; -BSS EffectInstance* D_80220754; - -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; -} - -API_CALLABLE(func_802189B0_4EFE50) { - remove_effect(D_80220750); - remove_effect(D_80220754); - return ApiStatus_DONE2; -} - -EvtScript N(beforeBattle_802201D0) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(func_80218920_4EFDC0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80220218) = { - EVT_CALL(func_802189B0_4EFE50) - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt05_shape", - .hit = "isk_bt05_hit", - .preBattle = &N(beforeBattle_802201D0), - .postBattle = &N(afterBattle_80220218), -}; +#include "battle/common/stage/isk_05.inc.c" diff --git a/src/battle/area/isk_part_2/stage/isk_06.c b/src/battle/area/isk_part_2/stage/isk_06.c index 235f775831..37d9132bbd 100644 --- a/src/battle/area/isk_part_2/stage/isk_06.c +++ b/src/battle/area/isk_part_2/stage/isk_06.c @@ -1,39 +1,6 @@ #include "common.h" -#include "effects.h" #include "battle/battle.h" #define NAMESPACE b_area_isk_part_2_isk_06 -BSS EffectInstance* D_80220760; - -API_CALLABLE(func_802189F0_4EFE90) { - fx_flame(1, -110.0f, 80.0f, -146.0f, 0.3f, &D_80220760); - return ApiStatus_DONE2; -} - -API_CALLABLE(func_80218A38_4EFED8) { - remove_effect(D_80220760); - return ApiStatus_DONE2; -} - -EvtScript N(beforeBattle_80220260) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(func_802189F0_4EFE90) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_802202A8) = { - EVT_CALL(func_80218A38_4EFED8) - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt06_shape", - .hit = "isk_bt06_hit", - .preBattle = &N(beforeBattle_80220260), - .postBattle = &N(afterBattle_802202A8), -}; +#include "battle/common/stage/isk_06.inc.c" diff --git a/src/battle/area/isk_part_2/stage/isk_06b.c b/src/battle/area/isk_part_2/stage/isk_06b.c index d9a80947c8..93341a80bd 100644 --- a/src/battle/area/isk_part_2/stage/isk_06b.c +++ b/src/battle/area/isk_part_2/stage/isk_06b.c @@ -1,41 +1,6 @@ #include "common.h" -#include "effects.h" #include "battle/battle.h" -#include "mapfs/isk_bt06_shape.h" #define NAMESPACE b_area_isk_part_2_isk_06b -BSS EffectInstance* D_80220770; - -API_CALLABLE(func_80218A60_4EFF00) { - fx_flame(1, -110.0f, 80.0f, -146.0f, 0.3f, &D_80220770); - return ApiStatus_DONE2; -} - -API_CALLABLE(func_80218AA8_4EFF48) { - remove_effect(D_80220770); - return ApiStatus_DONE2; -} - -EvtScript N(beforeBattle_802202F0) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) - EVT_CALL(func_80218A60_4EFF00) - EVT_CALL(EnableModel, MODEL_kesu, FALSE) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8022034C) = { - EVT_CALL(func_80218AA8_4EFF48) - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt06_shape", - .hit = "isk_bt06_hit", - .preBattle = &N(beforeBattle_802202F0), - .postBattle = &N(afterBattle_8022034C), -}; +#include "battle/common/stage/isk_06b.inc.c" diff --git a/src/battle/area/isk_part_2/stage/isk_07.c b/src/battle/area/isk_part_2/stage/isk_07.c index 7735ae0b6d..58f586299b 100644 --- a/src/battle/area/isk_part_2/stage/isk_07.c +++ b/src/battle/area/isk_part_2/stage/isk_07.c @@ -1,39 +1,6 @@ #include "common.h" -#include "effects.h" #include "battle/battle.h" #define NAMESPACE b_area_isk_part_2_isk_07 -BSS EffectInstance* D_80220780; - -API_CALLABLE(func_80218AD0_4EFF70) { - fx_flame(1, 110.0f, 80.0f, -146.0f, 0.3f, &D_80220780); - return ApiStatus_DONE2; -} - -API_CALLABLE(func_80218B18_4EFFB8) { - remove_effect(D_80220780); - return ApiStatus_DONE2; -} - -EvtScript N(beforeBattle_80220390) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(func_80218AD0_4EFF70) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_802203D8) = { - EVT_CALL(func_80218B18_4EFFB8) - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "isk_tex", - .shape = "isk_bt07_shape", - .hit = "isk_bt07_hit", - .preBattle = &N(beforeBattle_80220390), - .postBattle = &N(afterBattle_802203D8), -}; +#include "battle/common/stage/isk_07.inc.c" diff --git a/src/battle/area/iwa/actor/buzzar.c b/src/battle/area/iwa/actor/buzzar.c index 3c3b61e022..0ce0654163 100644 --- a/src/battle/area/iwa/actor/buzzar.c +++ b/src/battle/area/iwa/actor/buzzar.c @@ -141,7 +141,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 40, .partCount = ARRAY_COUNT(N(partsTable_8021B708)), .partsData = N(partsTable_8021B708), - .takeTurnScript = &N(init_8021B7E4), + .initScript = &N(init_8021B7E4), .statusTable = N(statusTable_8021B65C), .escapeChance = 0, .airLiftChance = 0, @@ -319,7 +319,7 @@ EvtScript N(8021BEBC) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim02) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_COS_IN_OUT) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVarA) EVT_CASE_EQ(HIT_RESULT_MISS) @@ -337,7 +337,7 @@ EvtScript N(8021BEBC) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 50) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 90, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 90, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 70, 100) EVT_THREAD @@ -345,7 +345,7 @@ EvtScript N(8021BEBC) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 10) - EVT_CALL(PlayEffect, EFFECT_WINDY_LEAVES, 2, LVar0, 10, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WINDY_LEAVES, 2, LVar0, 10, LVar2, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD @@ -359,8 +359,8 @@ EvtScript N(8021BEBC) = { EVT_RETURN EVT_CASE_DEFAULT EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - EVT_CALL(ShowMessageBox, 65, 90) - EVT_CALL(ShowActionHud, 1) + EVT_CALL(ShowMessageBox, BTL_MSG_41, 90) + EVT_CALL(ShowActionHud, TRUE) EVT_CALL(LoadActionCommand, ACTION_COMMAND_WHIRLWIND) EVT_CALL(action_command_whirlwind_init, 1) EVT_CALL(SetupMashMeter, 3, 40, 70, 100, 0, 0) @@ -370,7 +370,7 @@ EvtScript N(8021BEBC) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim13) EVT_WAIT(6) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F0) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(action_command_whirlwind_start, 0, 88, 3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, -25, 60, 0) @@ -383,12 +383,12 @@ EvtScript N(8021BEBC) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 10) - EVT_CALL(PlayEffect, EFFECT_WINDY_LEAVES, 2, LVar0, 10, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WINDY_LEAVES, 2, LVar0, 10, LVar2, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 90, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 90, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_CALL(ActorExists, ACTOR_PARTNER, LVar0) EVT_IF_EQ(LVar0, TRUE) @@ -424,8 +424,8 @@ EvtScript N(8021BEBC) = { EVT_END_SWITCH EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(ShowMessageBox, 65, 90) - EVT_CALL(ShowActionHud, 1) + EVT_CALL(ShowMessageBox, BTL_MSG_41, 90) + EVT_CALL(ShowActionHud, TRUE) EVT_CALL(LoadActionCommand, ACTION_COMMAND_WHIRLWIND) EVT_CALL(action_command_whirlwind_init, 1) EVT_CALL(SetupMashMeter, 3, 40, 70, 100, 0, 0) @@ -435,7 +435,7 @@ EvtScript N(8021BEBC) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim13) EVT_WAIT(6) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F0) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(action_command_whirlwind_start, 0, 88, 3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, -25, 60, 0) @@ -448,18 +448,18 @@ EvtScript N(8021BEBC) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 10) - EVT_CALL(PlayEffect, EFFECT_WINDY_LEAVES, 2, LVar0, 10, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WINDY_LEAVES, 2, LVar0, 10, LVar2, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 90, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 90, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar1) EVT_IF_NOT_FLAG(LVar1, STATUS_FLAG_STONE) EVT_THREAD EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002E) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002E) EVT_SET(LVar0, 0) EVT_SET(LVar1, 3) EVT_LOOP(90) @@ -540,7 +540,7 @@ EvtScript N(8021CCE8) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim02) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -15, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -15, EASING_COS_IN_OUT) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -30) EVT_ADD(LVar1, 25) @@ -558,12 +558,12 @@ EvtScript N(8021CCE8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 24) EVT_ADD(LVar1, 24) - EVT_CALL(PlayEffect, EFFECT_SHINY_FLARE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.6), 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHINY_FLARE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.6), 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F3) EVT_WAIT(10) - EVT_CALL(SetPartSounds, ACTOR_SELF, 3, 1, 0, 0) - EVT_CALL(SetPartSounds, ACTOR_SELF, 4, 1, 0, 0) - EVT_CALL(SetPartSounds, ACTOR_SELF, 5, 1, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 3, ACTOR_SOUND_FLY, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 4, ACTOR_SOUND_FLY, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 5, ACTOR_SOUND_FLY, 0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) EVT_THREAD @@ -578,9 +578,9 @@ EvtScript N(8021CCE8) = { EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_Buzzar_Anim14) EVT_CALL(SetAnimation, ACTOR_SELF, 4, ANIM_Buzzar_Anim14) EVT_CALL(SetAnimation, ACTOR_SELF, 5, ANIM_Buzzar_Anim14) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 3, EVT_FLOAT(6.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(0.1)) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 4, EVT_FLOAT(6.0)) @@ -599,7 +599,7 @@ EvtScript N(8021CCE8) = { EVT_CALL(RandInt, 10, LVar3) EVT_SUB(LVar3, 30) EVT_ADD(LVar0, LVar3) - EVT_CALL(FlyPartTo, ACTOR_SELF, 4, LVar0, 5, LVar2, 9, 0, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 4, LVar0, 5, LVar2, 9, 0, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 4, ANIM_Buzzar_Anim15) EVT_END_THREAD EVT_THREAD @@ -607,12 +607,12 @@ EvtScript N(8021CCE8) = { EVT_CALL(RandInt, 10, LVar3) EVT_SUB(LVar3, 40) EVT_ADD(LVar0, LVar3) - EVT_CALL(FlyPartTo, ACTOR_SELF, 5, LVar0, 5, LVar2, 9, 0, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 5, LVar0, 5, LVar2, 9, 0, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 5, ANIM_Buzzar_Anim15) EVT_END_THREAD EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) - EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, 5, LVar2, 9, 0, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, 5, LVar2, 9, 0, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_Buzzar_Anim15) EVT_THREAD EVT_WAIT(10) @@ -620,9 +620,9 @@ EvtScript N(8021CCE8) = { EVT_CALL(SetAnimation, ACTOR_SELF, 4, ANIM_Buzzar_Anim14) EVT_CALL(SetAnimation, ACTOR_SELF, 5, ANIM_Buzzar_Anim14) EVT_WAIT(20) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(func_8024ECF8, 0, 1, 0) @@ -644,17 +644,17 @@ EvtScript N(8021CCE8) = { EVT_CALL(RandInt, 10, LVar3) EVT_SUB(LVar3, 10) EVT_ADD(LVar1, LVar3) - EVT_CALL(FlyPartTo, ACTOR_SELF, 4, LVar0, LVar1, LVar2, 6, 0, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 4, LVar0, LVar1, LVar2, 6, 0, EASING_LINEAR) EVT_END_THREAD EVT_THREAD EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RandInt, 10, LVar3) EVT_ADD(LVar3, 10) EVT_ADD(LVar1, LVar3) - EVT_CALL(FlyPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 6, 0, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 6, 0, EASING_LINEAR) EVT_END_THREAD EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 6, 0, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 6, 0, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SET(LVarF, LVar0) @@ -666,13 +666,13 @@ EvtScript N(8021CCE8) = { EVT_SUB(LVar0, 40) EVT_SET(LVar1, 2) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 4, EVT_FLOAT(1.5)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 4, LVar0, LVar1, LVar2, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 4, LVar0, LVar1, LVar2, 10, TRUE) EVT_CALL(SetPartRotation, ACTOR_SELF, 4, 0, 80, 90) EVT_WAIT(8) EVT_LOOP(15) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -682,13 +682,13 @@ EvtScript N(8021CCE8) = { EVT_ADD(LVar0, 20) EVT_SET(LVar1, 4) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 5, EVT_FLOAT(1.5)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 10, TRUE) EVT_CALL(SetPartRotation, ACTOR_SELF, 5, 0, 90, -90) EVT_WAIT(8) EVT_LOOP(15) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -698,13 +698,13 @@ EvtScript N(8021CCE8) = { EVT_SUB(LVar0, 5) EVT_SET(LVar1, 4) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(1.5)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 10, TRUE) EVT_CALL(SetPartRotation, ACTOR_SELF, 3, 0, 90, -90) EVT_WAIT(8) EVT_LOOP(15) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -735,8 +735,8 @@ EvtScript N(8021DCB8) = { EVT_END_LOOP EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(ResetActorSounds, ACTOR_SELF, 1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 5, -8, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY_INCREMENT, -8, 0) EVT_CHILD_THREAD EVT_LOOP(0) EVT_CALL(N(StartRumbleWithParams), 100, 10) @@ -749,14 +749,14 @@ EvtScript N(8021DCB8) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 180) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PLAYER, 99, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PLAYER, 99, 0, EASING_LINEAR) EVT_END_CHILD_THREAD EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.1)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 180) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 99, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 99, 0, EASING_LINEAR) EVT_RETURN EVT_END }; @@ -789,7 +789,7 @@ EvtScript N(8021DF2C) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim02) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_COS_IN_OUT) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 4, BS_FLAGS1_10) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -806,12 +806,12 @@ EvtScript N(8021DF2C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -45, -20, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim18) - EVT_CALL(FlyToGoal, ACTOR_SELF, 12, -12, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 12, -12, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim01) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -835,12 +835,12 @@ EvtScript N(8021DF2C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -15, -10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim18) - EVT_CALL(FlyToGoal, ACTOR_SELF, 8, -5, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 8, -5, EASING_LINEAR) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 10, 0) @@ -861,10 +861,10 @@ EvtScript N(8021DF2C) = { EVT_END_LOOP EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(ResetActorSounds, ACTOR_SELF, 1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 5, -14, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY_INCREMENT, -14, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim02) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_EXEC_WAIT(N(8021F7EC)) @@ -893,12 +893,12 @@ EvtScript N(8021DF2C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -15, -10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim18) - EVT_CALL(FlyToGoal, ACTOR_SELF, 8, -5, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 8, -5, EASING_LINEAR) EVT_IF_EQ(LVarA, HIT_RESULT_HIT_STATIC) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_IF @@ -907,7 +907,7 @@ EvtScript N(8021DF2C) = { EVT_CALL(N(StartRumbleWithParams), 180, 20) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002B) - EVT_CALL(ShowMessageBox, 64, 90) + EVT_CALL(ShowMessageBox, BTL_MSG_40, 90) EVT_THREAD EVT_LOOP(90) EVT_CALL(SetMessageBoxDuration, 99) @@ -926,8 +926,8 @@ EvtScript N(8021DF2C) = { EVT_CALL(SetBattleCamOffsetZ, -10) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 60) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) - EVT_CALL(ShowActionHud, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) + EVT_CALL(ShowActionHud, TRUE) EVT_CALL(action_command_break_free_start, 0, 60, 30, 3) EVT_EXEC_GET_TID(N(8021DCB8), LVarA) EVT_WAIT(62) @@ -994,10 +994,10 @@ EvtScript N(8021DF2C) = { EVT_END_LOOP EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(ResetActorSounds, ACTOR_SELF, 1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 5, -14, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY_INCREMENT, -14, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim02) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) @@ -1039,7 +1039,7 @@ EvtScript N(8021F030) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim02) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -15, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -15, EASING_COS_IN_OUT) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -1053,12 +1053,12 @@ EvtScript N(8021F030) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -45, -20, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim18) - EVT_CALL(FlyToGoal, ACTOR_SELF, 12, -12, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 12, -12, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim01) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -1079,12 +1079,12 @@ EvtScript N(8021F030) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -5, -10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim18) - EVT_CALL(FlyToGoal, ACTOR_SELF, 8, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 8, 0, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SET(LVarF, LVar0) @@ -1107,13 +1107,13 @@ EvtScript N(8021F030) = { EVT_END_LOOP EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(ResetActorSounds, ACTOR_SELF, 1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 5, -14, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY_INCREMENT, -14, 0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim02) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) @@ -1155,15 +1155,15 @@ EvtScript N(8021F824) = { EVT_END_LOOP EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(ResetActorSounds, ACTOR_SELF, 1) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 40) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim01) - EVT_CALL(SetActorSounds, ACTOR_SELF, 5, -20, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY_INCREMENT, -20, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim01) @@ -1189,15 +1189,15 @@ EvtScript N(8021FA2C) = { EVT_END_LOOP EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(ResetActorSounds, ACTOR_SELF, 1) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 40) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim01) - EVT_CALL(SetActorSounds, ACTOR_SELF, 5, -20, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY_INCREMENT, -20, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 45, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 45, EASING_LINEAR) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim01) diff --git a/src/battle/area/iwa/actor/cleft.c b/src/battle/area/iwa/actor/cleft.c index 1e5df1899c..2ed7ba7ace 100644 --- a/src/battle/area/iwa/actor/cleft.c +++ b/src/battle/area/iwa/actor/cleft.c @@ -72,7 +72,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 2, .partCount = ARRAY_COUNT(N(partsTable_802187EC)), .partsData = N(partsTable_802187EC), - .takeTurnScript = &N(init_802188D0), + .initScript = &N(init_802188D0), .statusTable = N(statusTable_80218740), .escapeChance = 80, .airLiftChance = 40, @@ -152,9 +152,9 @@ EvtScript N(80218944) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 200, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 40, 8, EVT_FLOAT(0.0), 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 40, 8, EVT_FLOAT(0.0), 20, 0) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) @@ -163,9 +163,9 @@ EvtScript N(80218944) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8021872C))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 15) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -7) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(N(SetSpinSmashable), 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_RETURN EVT_END }; @@ -198,7 +198,7 @@ EvtScript N(handleEvent_80218C3C) = { EVT_CASE_FLAG(DAMAGE_TYPE_BLAST) EVT_EXEC_WAIT(N(80218944)) EVT_CASE_DEFAULT - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_SET_CONST(LVar0, 1) @@ -211,7 +211,7 @@ EvtScript N(handleEvent_80218C3C) = { EVT_SET_CONST(LVar2, -1) EVT_EXEC_WAIT(DoBurnHit) EVT_END_IF - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, FALSE) EVT_END_SWITCH EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) @@ -297,7 +297,7 @@ EvtScript N(handleEvent_80218C3C) = { EVT_ADD(LVar0, -8) EVT_ADD(LVar1, 27) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) @@ -377,7 +377,7 @@ EvtScript N(handleEvent_80218C3C) = { EvtScript N(802197AC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Anim03) EVT_WAIT(20) @@ -406,7 +406,7 @@ EvtScript N(802197AC) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 200, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) @@ -417,10 +417,10 @@ EvtScript N(802197AC) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80218710))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 22) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -10) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_WAIT(1) EVT_CALL(N(SetSpinSmashable), 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, FALSE) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -439,11 +439,11 @@ EvtScript N(80219BA0) = { EVT_CALL(MoveBattleCamOver, 30) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(10) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Anim10) EVT_WAIT(10) @@ -456,7 +456,7 @@ EvtScript N(80219BA0) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Anim00) EVT_WAIT(8) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -485,7 +485,7 @@ EvtScript N(80219BA0) = { EVT_CALL(YieldTurn) EVT_CALL(SetPartRotation, ACTOR_SELF, 1, 0, 0, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Anim07) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) diff --git a/src/battle/area/iwa/stage/iwa_01.c b/src/battle/area/iwa/stage/iwa_01.c index ac0da9fd7e..3d4817417e 100644 --- a/src/battle/area/iwa/stage/iwa_01.c +++ b/src/battle/area/iwa/stage/iwa_01.c @@ -1,28 +1,31 @@ #include "common.h" #include "battle/battle.h" #include "script_api/battle.h" -#include "sprite/npc/Whacka.h" #include "mapfs/iwa_bt01_shape.h" +#include "sprite/npc/Whacka.h" + #define NAMESPACE b_area_iwa_iwa_01 extern ActorBlueprint N(whacka); -extern Formation N(specialFormation_802208E4); +extern Formation N(WhackaFormation); -EvtScript N(beforeBattle_80220860) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetGroupEnabled, MODEL_b, FALSE) + EVT_CALL(SetGroupVisibility, MODEL_b, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80220894) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_802208A4)[] = { - MODEL_iwa1, MODEL_o331, 0, +s32 N(ForegroundModels)[] = { + MODEL_iwa1, + MODEL_o331, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -30,18 +33,18 @@ Stage NAMESPACE = { .shape = "iwa_bt01_shape", .hit = "iwa_bt01_hit", .bg = "iwa_bg\0", - .preBattle = &N(beforeBattle_80220860), - .postBattle = &N(afterBattle_80220894), - .foregroundModelList = N(foregroundModelList_802208A4), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), .stageEnemyCount = 1, - .stageFormation = &N(specialFormation_802208E4), + .stageFormation = &N(WhackaFormation), .stageEnemyChance = 512, }; -Vec3i N(vector3D_802208D8) = { 116, 0, -30 }; +Vec3i N(WhackaPos) = { 116, 0, -30 }; -Formation N(specialFormation_802208E4) = { - { .actor = &N(whacka), .home = { .vec = &N(vector3D_802208D8) }}, +Formation N(WhackaFormation) = { + { .actor = &N(whacka), .home = { .vec = &N(WhackaPos) }}, }; #define NAMESPACE b_area_iwa_iwa_01_whacka diff --git a/src/battle/area/iwa/stage/iwa_01b.c b/src/battle/area/iwa/stage/iwa_01b.c index ada0ae518f..77c6e3f3e8 100644 --- a/src/battle/area/iwa/stage/iwa_01b.c +++ b/src/battle/area/iwa/stage/iwa_01b.c @@ -5,20 +5,22 @@ #define NAMESPACE b_area_iwa_iwa_01b -EvtScript N(beforeBattle_80221510) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetGroupEnabled, MODEL_a, FALSE) + EVT_CALL(SetGroupVisibility, MODEL_a, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80221544) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80221554)[] = { - MODEL_iwa1, MODEL_o331, 0, +s32 N(ForegroundModels)[] = { + MODEL_iwa1, + MODEL_o331, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -26,7 +28,7 @@ Stage NAMESPACE = { .shape = "iwa_bt01_shape", .hit = "iwa_bt01_hit", .bg = "iwa_bg", - .preBattle = &N(beforeBattle_80221510), - .postBattle = &N(afterBattle_80221544), - .foregroundModelList = N(foregroundModelList_80221554), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/iwa/stage/iwa_02.c b/src/battle/area/iwa/stage/iwa_02.c index 2dc1bfaeab..9ef02a50bc 100644 --- a/src/battle/area/iwa/stage/iwa_02.c +++ b/src/battle/area/iwa/stage/iwa_02.c @@ -1,26 +1,29 @@ #include "common.h" #include "battle/battle.h" #include "script_api/battle.h" -#include "sprite/npc/Whacka.h" #include "mapfs/iwa_bt02_shape.h" +#include "sprite/npc/Whacka.h" + #define NAMESPACE b_area_iwa_iwa_02 extern ActorBlueprint N(whacka); -EvtScript N(beforeBattle_80221590) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_802215B0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_802215C0)[] = { - MODEL_o331, MODEL_iwa1, 0, +s32 N(ForegroundModels)[] = { + MODEL_o331, + MODEL_iwa1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -28,15 +31,15 @@ Stage NAMESPACE = { .shape = "iwa_bt02_shape", .hit = "iwa_bt02_hit", .bg = "iwa_bg", - .preBattle = &N(beforeBattle_80221590), - .postBattle = &N(afterBattle_802215B0), - .foregroundModelList = N(foregroundModelList_802215C0), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; -Vec3i N(D_802215F4_4B17E4) = { 0, 0, 0 }; +Vec3i N(WHACKAPOS) = { 0, 0, 0 }; -Formation N(specialFormation_whacka) = { - { .actor = &N(whacka), .home = { .vec = &N(D_802215F4_4B17E4) }}, +Formation N(WhackaFormation) = { + { .actor = &N(whacka), .home = { .vec = &N(WHACKAPOS) }}, }; #define NAMESPACE b_area_iwa_iwa_02_whacka diff --git a/src/battle/area/jan/actor/hurt_plant.c b/src/battle/area/jan/actor/hurt_plant.c index ab865b3780..cfd47156fb 100644 --- a/src/battle/area/jan/actor/hurt_plant.c +++ b/src/battle/area/jan/actor/hurt_plant.c @@ -76,7 +76,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(partsTable_8021DA4C)), .partsData = N(partsTable_8021DA4C), - .takeTurnScript = &N(init_8021DA98), + .initScript = &N(init_8021DA98), .statusTable = N(statusTable_8021D9A0), .escapeChance = 70, .airLiftChance = 20, @@ -122,7 +122,7 @@ EvtScript N(idle_8021DAE4) = { }; EvtScript N(8021DBFC) = { - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_DIG) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HurtPlant_Anim04) EVT_WAIT(10) @@ -132,7 +132,7 @@ EvtScript N(8021DBFC) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_SURFACE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HurtPlant_Anim03) EVT_WAIT(10) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_RETURN EVT_END }; @@ -228,7 +228,7 @@ EvtScript N(handleEvent_8021DCF4) = { EVT_EXEC_WAIT(DoNormalHit) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_DIG) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HurtPlant_Anim04) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_WAIT(20) EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -258,7 +258,7 @@ EvtScript N(takeTurn_8021E33C) = { EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HurtPlant_Anim04) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) @@ -273,7 +273,7 @@ EvtScript N(takeTurn_8021E33C) = { EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_DIG) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HurtPlant_Anim04) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_WAIT(8) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -290,13 +290,13 @@ EvtScript N(takeTurn_8021E33C) = { EVT_ADD(LVar0, 27) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_LABEL(123) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_SURFACE) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HurtPlant_Anim03) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HurtPlant_Anim05) diff --git a/src/battle/area/jan/actor/jungle_fuzzy.c b/src/battle/area/jan/actor/jungle_fuzzy.c index 9156a04e04..fe12bff9c2 100644 --- a/src/battle/area/jan/actor/jungle_fuzzy.c +++ b/src/battle/area/jan/actor/jungle_fuzzy.c @@ -67,7 +67,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(partsTable_8021EA90)), .partsData = N(partsTable_8021EA90), - .takeTurnScript = &N(init_8021EB28), + .initScript = &N(init_8021EB28), .statusTable = N(statusTable_8021E9E4), .escapeChance = 30, .airLiftChance = 85, @@ -364,7 +364,7 @@ EvtScript N(leechAttack) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -426,13 +426,13 @@ EvtScript N(leechAttack) = { EVT_WAIT(30) EVT_END_LOOP EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_31, 32767) - EVT_CALL(ShowActionHud, 1) + EVT_CALL(ShowMessageBox, BTL_MSG_31, 0x00007FFF) + EVT_CALL(ShowActionHud, TRUE) EVT_CALL(LoadActionCommand, ACTION_COMMAND_STOP_LEECH) EVT_CALL(action_command_stop_leech_init) EVT_CALL(SetupMashMeter, 1, 23, 0, 0, 0, 0) EVT_WAIT(10) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(action_command_stop_leech_start, 0, 32767, 3) EVT_SET(LVarD, 0) EVT_LOOP(5) @@ -570,7 +570,7 @@ EvtScript N(leechAttack) = { EVT_END_THREAD EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_ADD(LVar0, LVar3) EVT_CALL(SetEnemyHP, ACTOR_SELF, LVar0) @@ -685,7 +685,7 @@ EvtScript N(802210E0) = { 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) @@ -701,7 +701,7 @@ EvtScript N(802210E0) = { 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 @@ -752,7 +752,7 @@ EvtScript N(802210E0) = { EvtScript N(80221468) = { EVT_SET(LVar9, 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -777,7 +777,7 @@ EvtScript N(80221468) = { 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 diff --git a/src/battle/area/jan/actor/m_bush.c b/src/battle/area/jan/actor/m_bush.c index 6daa4a8b24..4fec736959 100644 --- a/src/battle/area/jan/actor/m_bush.c +++ b/src/battle/area/jan/actor/m_bush.c @@ -76,7 +76,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(partsTable_8022193C)), .partsData = N(partsTable_8022193C), - .takeTurnScript = &N(init_80221988), + .initScript = &N(init_80221988), .statusTable = N(statusTable_80221890), .escapeChance = 70, .airLiftChance = 85, @@ -228,7 +228,7 @@ EvtScript N(takeTurn_80221F78) = { 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(SetActorSounds, ACTOR_SELF, 2, 8393, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20C9, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -254,7 +254,7 @@ EvtScript N(takeTurn_80221F78) = { EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(802219E4)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) diff --git a/src/battle/area/jan/actor/spear_guy.c b/src/battle/area/jan/actor/spear_guy.c index d493e700c3..70454b0e20 100644 --- a/src/battle/area/jan/actor/spear_guy.c +++ b/src/battle/area/jan/actor/spear_guy.c @@ -176,7 +176,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(partsTable_802187F0)), .partsData = N(partsTable_802187F0), - .takeTurnScript = &N(init_80218980), + .initScript = &N(init_80218980), .statusTable = N(statusTable_80218698), .escapeChance = 50, .airLiftChance = 85, @@ -198,11 +198,11 @@ EvtScript N(setSpearStance) = { EVT_CASE_EQ(0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_802185C0))) - EVT_CALL(SetPartEventFlags, -127, 2, 65536) + EVT_CALL(SetPartEventFlags, ACTOR_SELF, 2, 0x00010000) EVT_CASE_EQ(1) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021860C))) - EVT_CALL(SetPartEventFlags, -127, 2, 16) + EVT_CALL(SetPartEventFlags, ACTOR_SELF, 2, 16) EVT_END_SWITCH EVT_RETURN EVT_END @@ -216,7 +216,7 @@ EvtScript N(init_80218980) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim04) EVT_CASE_EQ(1) EVT_EXEC_WAIT(N(setSpearStance)) - EVT_CALL(SetPartEventFlags, -127, 2, 16) + EVT_CALL(SetPartEventFlags, ACTOR_SELF, 2, 16) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim03) EVT_END_SWITCH EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8021BCB4))) @@ -228,7 +228,7 @@ EvtScript N(init_80218980) = { EVT_CASE_EQ(2) EVT_CASE_OR_EQ(4) EVT_CASE_OR_EQ(6) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_FRONT, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_FRONT, FALSE) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021860C))) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim03) EVT_END_CASE_GROUP @@ -265,17 +265,17 @@ EvtScript N(idle_80218BE0) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FEAR | STATUS_FLAG_DIZZY) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021860C))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_TOP, 1) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_FRONT, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_FRONT, FALSE) EVT_ELSE EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_802185C0))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_TOP, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_FRONT, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_FRONT, TRUE) EVT_END_IF EVT_CASE_EQ(1) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021860C))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_TOP, 1) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_FRONT, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_FRONT, FALSE) EVT_END_SWITCH EVT_WAIT(1) EVT_GOTO(0) @@ -497,7 +497,7 @@ EvtScript N(handleEvent_80218E3C) = { EVT_ADD(LVar1, 38) EVT_END_IF EVT_END_SWITCH - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_CASE_DEFAULT EVT_END_SWITCH @@ -554,7 +554,7 @@ EvtScript N(spearStab) = { EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(80218D7C)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 2, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -629,12 +629,12 @@ EvtScript N(summonBackup) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) - 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, 2, ANIM_SpearGuy_Anim0E) EVT_WAIT(20) EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVar0) - EVT_CALL(EnemyCreateTargetList, 32772) + EVT_CALL(EnemyCreateTargetList, 0x00008004) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar1, LVar2) @@ -652,12 +652,12 @@ EvtScript N(summonBackup) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar1) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar1) EVT_IF_NE(LVar1, -1) EVT_GOTO(0) EVT_END_IF EVT_SET(LocalFlag(0), 0) - EVT_CALL(EnemyCreateTargetList, 32772) + EVT_CALL(EnemyCreateTargetList, 0x00008004) EVT_CALL(InitTargetIterator) EVT_LABEL(1) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -665,7 +665,7 @@ EvtScript N(summonBackup) = { EVT_IF_LT(LVar1, LVarA) EVT_SET(LocalFlag(0), 1) EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(1) EVT_END_IF @@ -681,7 +681,7 @@ EvtScript N(summonBackup) = { EVT_CALL(GetGoalPos, LVarB, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 220) EVT_CALL(SetActorPos, LVarB, LVar0, 0, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FA) EVT_WAIT(15) @@ -698,7 +698,7 @@ EvtScript N(summonBackup) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) - 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(SetAnimation, LVarB, 2, ANIM_SpearGuy_Anim0E) EVT_WAIT(20) EVT_IF_EQ(LocalFlag(0), 0) @@ -746,7 +746,7 @@ EvtScript N(becomeShyGuy) = { EVT_ADD(LVar1, 15) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, 4, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 4, EVT_FLOAT(0.5)) EVT_ADD(LVar0, 50) EVT_SUB(LVar2, 30) @@ -762,13 +762,13 @@ EvtScript N(becomeShyGuy) = { EVT_THREAD EVT_LOOP(10) EVT_CALL(GetPartOffset, ACTOR_SELF, 4, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 5, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 5, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 4, 0x2FC) - EVT_CALL(SetPartSounds, ACTOR_SELF, 4, 2, 0, 0) - EVT_CALL(JumpPartTo, ACTOR_SELF, 4, LVar0, 0, LVar2, 30, 1) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 4, SOUND_2FC) + EVT_CALL(SetPartSounds, ACTOR_SELF, 4, ACTOR_SOUND_JUMP, 0, 0) + EVT_CALL(JumpPartTo, ACTOR_SELF, 4, LVar0, 0, LVar2, 30, TRUE) EVT_WAIT(5) EVT_CALL(SetPartFlags, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_NO_TARGET) EVT_CALL(SetPartFlags, ACTOR_SELF, 1, ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_MULTI_TARGET) @@ -776,7 +776,7 @@ EvtScript N(becomeShyGuy) = { EVT_CALL(SetPartFlags, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_NO_TARGET) EVT_EXEC_WAIT(N(8021BF8C)) 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(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_80218744))) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) @@ -835,9 +835,9 @@ EvtScript N(spearThrow) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, 20, LVar2) EVT_CALL(SetPartRotation, ACTOR_SELF, 3, 0, 0, -30) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_THREAD - EVT_CALL(MakeLerp, -30, 45, 20, 0) + EVT_CALL(MakeLerp, -30, 45, 20, EASING_LINEAR) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(SetPartRotation, ACTOR_SELF, 3, 0, 0, LVar0) @@ -846,21 +846,21 @@ EvtScript N(spearThrow) = { EVT_GOTO(0) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 3, 0x30A) - EVT_CALL(SetPartSounds, ACTOR_SELF, 3, 2, 0, 0) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 3, SOUND_30A) + EVT_CALL(SetPartSounds, ACTOR_SELF, 3, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_SET(LVar1, 10) EVT_ADD(LVar2, 2) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(0.7)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 20, TRUE) EVT_WAIT(10) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) 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(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 2, 0) EVT_WAIT(10) @@ -888,9 +888,9 @@ EvtScript N(spearThrow) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, 20, LVar2) EVT_CALL(SetPartRotation, ACTOR_SELF, 3, 0, 0, -30) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_THREAD - EVT_CALL(MakeLerp, -30, 45, 20, 0) + EVT_CALL(MakeLerp, -30, 45, 20, EASING_LINEAR) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(SetPartRotation, ACTOR_SELF, 3, 0, 0, LVar0) @@ -899,18 +899,18 @@ EvtScript N(spearThrow) = { EVT_GOTO(0) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 3, 0x30A) - EVT_CALL(SetPartSounds, ACTOR_SELF, 3, 2, 0, 0) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 3, SOUND_30A) + EVT_CALL(SetPartSounds, ACTOR_SELF, 3, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 2) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(0.7)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 20, TRUE) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_WAIT(3) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(20) EVT_EXEC_WAIT(N(becomeShyGuy)) EVT_SWITCH(LVar0) @@ -925,7 +925,7 @@ EvtScript N(spearThrow) = { }; EvtScript N(8021B770) = { - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar5) @@ -941,7 +941,7 @@ EvtScript N(8021B770) = { 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 @@ -968,7 +968,7 @@ EvtScript N(8021B770) = { EvtScript N(8021B96C) = { EVT_SET(LVar9, 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -991,7 +991,7 @@ EvtScript N(8021B96C) = { 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 @@ -1002,7 +1002,7 @@ EvtScript N(8021B96C) = { EvtScript N(8021BB18) = { EVT_CALL(GetIndexFromHome, ACTOR_SELF, LVarA) EVT_SET(LocalFlag(0), 0) - EVT_CALL(EnemyCreateTargetList, 32772) + EVT_CALL(EnemyCreateTargetList, 0x00008004) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -1010,7 +1010,7 @@ EvtScript N(8021BB18) = { EVT_IF_LT(LVar1, LVarA) EVT_SET(LocalFlag(0), 1) EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -1073,7 +1073,7 @@ EvtScript N(takeTurn_8021BCB4) = { EVT_EXEC_WAIT(N(8021BB18)) EVT_END_CASE_GROUP EVT_CASE_EQ(2) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(GetTargetListLength, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(spearThrow)) @@ -1255,9 +1255,9 @@ EvtScript N(8021C628) = { 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(SetGoalToTarget, ACTOR_SELF) @@ -1279,7 +1279,7 @@ EvtScript N(8021C628) = { 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, 1, 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) @@ -1296,8 +1296,8 @@ EvtScript N(8021C628) = { 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(SetGoalToTarget, ACTOR_SELF) @@ -1348,8 +1348,8 @@ EvtScript N(8021CD50) = { 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(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, 1, ANIM_ShyGuy_Red_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_SUB(LVar0, 40) @@ -1390,7 +1390,7 @@ EvtScript N(8021CD50) = { 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, 1, 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) @@ -1465,7 +1465,7 @@ EvtScript N(8021CD50) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim11) diff --git a/src/battle/area/jan/stage/jan_00.c b/src/battle/area/jan/stage/jan_00.c index 2c3e36ac0a..16787dd4d2 100644 --- a/src/battle/area/jan/stage/jan_00.c +++ b/src/battle/area/jan/stage/jan_00.c @@ -1,130 +1,7 @@ #include "common.h" -#include "effects.h" #include "battle/battle.h" +#include "mapfs/jan_bt00_shape.h" #define NAMESPACE b_area_jan_jan_00 -EvtScript N(80226B00) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80226C18) = { - EVT_SET(LVarA, LVar0) - EVT_LOOP(0) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(2) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(beforeBattle_802271C4) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_SET(LVar0, 32) - EVT_EXEC(N(80226B00)) - EVT_SET(LVar0, 43) - EVT_EXEC(N(80226B00)) - EVT_SET(LVar0, 53) - EVT_EXEC(N(80226C18)) - EVT_CALL(PlayEffect, EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80227298) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt00_shape", - .hit = "jan_bt00_hit", - .bg = "yos_bg", - .preBattle = &N(beforeBattle_802271C4), - .postBattle = &N(afterBattle_80227298), -}; +#include "battle/common/stage/jan_00.inc.c" diff --git a/src/battle/area/jan/stage/jan_01.c b/src/battle/area/jan/stage/jan_01.c index 00326527c2..a51db03466 100644 --- a/src/battle/area/jan/stage/jan_01.c +++ b/src/battle/area/jan/stage/jan_01.c @@ -3,137 +3,4 @@ #define NAMESPACE b_area_jan_jan_01 -EvtScript N(802272D0) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(802273E8) = { - EVT_SET(LVarA, LVar0) - EVT_LOOP(0) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(2) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(beforeBattle_80227994) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 63, 0) - EVT_THREAD - EVT_WAIT(5) - EVT_SET(LVar0, 9) - EVT_EXEC(N(802273E8)) - EVT_WAIT(5) - EVT_SET(LVar0, 10) - EVT_EXEC(N(802273E8)) - EVT_WAIT(5) - EVT_SET(LVar0, 11) - EVT_EXEC(N(802273E8)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80227A6C) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80227A7C)[] = { - 0x00000012, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt01_shape", - .hit = "jan_bt01_hit", - .bg = "yos_bg", - .preBattle = &N(beforeBattle_80227994), - .postBattle = &N(afterBattle_80227A6C), - .foregroundModelList = N(foregroundModelList_80227A7C), -}; +#include "battle/common/stage/jan_01.inc.c" diff --git a/src/battle/area/jan/stage/jan_01b.c b/src/battle/area/jan/stage/jan_01b.c index c7b279503a..563314be06 100644 --- a/src/battle/area/jan/stage/jan_01b.c +++ b/src/battle/area/jan/stage/jan_01b.c @@ -3,137 +3,4 @@ #define NAMESPACE b_area_jan_jan_01b -EvtScript N(80227AB0) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(80227BC8) = { - EVT_SET(LVarA, LVar0) - EVT_LOOP(0) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(2) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(beforeBattle_80228174) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 40, 0) - EVT_THREAD - EVT_WAIT(5) - EVT_SET(LVar0, 9) - EVT_EXEC(N(80227BC8)) - EVT_WAIT(5) - EVT_SET(LVar0, 10) - EVT_EXEC(N(80227BC8)) - EVT_WAIT(5) - EVT_SET(LVar0, 11) - EVT_EXEC(N(80227BC8)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8022824C) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_8022825C)[] = { - 0x00000012, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt01_shape", - .hit = "jan_bt01_hit", - .bg = "yos_bg", - .preBattle = &N(beforeBattle_80228174), - .postBattle = &N(afterBattle_8022824C), - .foregroundModelList = N(foregroundModelList_8022825C), -}; +#include "battle/common/stage/jan_01b.inc.c" diff --git a/src/battle/area/jan/stage/jan_02.c b/src/battle/area/jan/stage/jan_02.c index 13df990fc0..cc1591b5df 100644 --- a/src/battle/area/jan/stage/jan_02.c +++ b/src/battle/area/jan/stage/jan_02.c @@ -3,28 +3,4 @@ #define NAMESPACE b_area_jan_jan_02 -EvtScript N(beforeBattle_80228290) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_802282CC) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_802282DC)[] = { - 0x00000005, 0x00000006, 0x00000007, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt02_shape", - .hit = "jan_bt02_hit", - .bg = "yos_bg", - .preBattle = &N(beforeBattle_80228290), - .postBattle = &N(afterBattle_802282CC), - .foregroundModelList = N(foregroundModelList_802282DC), -}; +#include "battle/common/stage/jan_02.inc.c" diff --git a/src/battle/area/jan/stage/jan_03.c b/src/battle/area/jan/stage/jan_03.c index 06059caaf9..d0d557c8ea 100644 --- a/src/battle/area/jan/stage/jan_03.c +++ b/src/battle/area/jan/stage/jan_03.c @@ -3,29 +3,4 @@ #define NAMESPACE b_area_jan_jan_03 -EvtScript N(beforeBattle_80228320) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 22, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80228370) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80228380)[] = { - 0x00000040, 0x0000003F, 0x0000003E, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt03_shape", - .hit = "jan_bt03_hit", - .bg = "jan_bg", - .preBattle = &N(beforeBattle_80228320), - .postBattle = &N(afterBattle_80228370), - .foregroundModelList = N(foregroundModelList_80228380), -}; +#include "battle/common/stage/jan_03.inc.c" diff --git a/src/battle/area/jan/stage/jan_03b.c b/src/battle/area/jan/stage/jan_03b.c index d03d0fdc09..3d41352469 100644 --- a/src/battle/area/jan/stage/jan_03b.c +++ b/src/battle/area/jan/stage/jan_03b.c @@ -3,29 +3,4 @@ #define NAMESPACE b_area_jan_jan_03b -EvtScript N(beforeBattle_802283C0) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 66, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80228410) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80228420)[] = { - 0x00000040, 0x0000003F, 0x0000003E, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt03_shape", - .hit = "jan_bt03_hit", - .bg = "jan_bg", - .preBattle = &N(beforeBattle_802283C0), - .postBattle = &N(afterBattle_80228410), - .foregroundModelList = N(foregroundModelList_80228420), -}; +#include "battle/common/stage/jan_03b.inc.c" diff --git a/src/battle/area/jan/stage/jan_04.c b/src/battle/area/jan/stage/jan_04.c index b5117b684f..683da04306 100644 --- a/src/battle/area/jan/stage/jan_04.c +++ b/src/battle/area/jan/stage/jan_04.c @@ -3,29 +3,4 @@ #define NAMESPACE b_area_jan_jan_04 -EvtScript N(beforeBattle_80228460) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 65, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_802284B0) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_802284C0)[] = { - 0x00000025, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt04_shape", - .hit = "jan_bt04_hit", - .bg = "jan_bg", - .preBattle = &N(beforeBattle_80228460), - .postBattle = &N(afterBattle_802284B0), - .foregroundModelList = N(foregroundModelList_802284C0), -}; +#include "battle/common/stage/jan_04.inc.c" diff --git a/src/battle/area/jan/stage/jan_04b.c b/src/battle/area/jan/stage/jan_04b.c index 6b41700fea..8094656c9f 100644 --- a/src/battle/area/jan/stage/jan_04b.c +++ b/src/battle/area/jan/stage/jan_04b.c @@ -3,29 +3,4 @@ #define NAMESPACE b_area_jan_jan_04b -EvtScript N(beforeBattle_802284F0) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 33, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80228540) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80228550)[] = { - 0x00000025, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt04_shape", - .hit = "jan_bt04_hit", - .bg = "jan_bg", - .preBattle = &N(beforeBattle_802284F0), - .postBattle = &N(afterBattle_80228540), - .foregroundModelList = N(foregroundModelList_80228550), -}; +#include "battle/common/stage/jan_04b.inc.c" diff --git a/src/battle/area/jan2/stage/jan_00.c b/src/battle/area/jan2/stage/jan_00.c index 7d372edc5f..005872d37d 100644 --- a/src/battle/area/jan2/stage/jan_00.c +++ b/src/battle/area/jan2/stage/jan_00.c @@ -1,130 +1,6 @@ #include "common.h" -#include "effects.h" #include "battle/battle.h" #define NAMESPACE b_area_jan2_jan_00 -EvtScript N(8021DB30) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(8021DC48) = { - EVT_SET(LVarA, LVar0) - EVT_LOOP(0) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(2) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(beforeBattle_8021E1F4) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_SET(LVar0, 32) - EVT_EXEC(N(8021DB30)) - EVT_SET(LVar0, 43) - EVT_EXEC(N(8021DB30)) - EVT_SET(LVar0, 53) - EVT_EXEC(N(8021DC48)) - EVT_CALL(PlayEffect, EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8021E2C8) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt00_shape", - .hit = "jan_bt00_hit", - .bg = "yos_bg", - .preBattle = &N(beforeBattle_8021E1F4), - .postBattle = &N(afterBattle_8021E2C8), -}; +#include "battle/common/stage/jan_00.inc.c" diff --git a/src/battle/area/jan2/stage/jan_01.c b/src/battle/area/jan2/stage/jan_01.c index 598633e63e..ff7c26148e 100644 --- a/src/battle/area/jan2/stage/jan_01.c +++ b/src/battle/area/jan2/stage/jan_01.c @@ -3,137 +3,4 @@ #define NAMESPACE b_area_jan2_jan_01 -EvtScript N(8021E300) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(8021E418) = { - EVT_SET(LVarA, LVar0) - EVT_LOOP(0) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(2) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(beforeBattle_8021E9C4) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 63, 0) - EVT_THREAD - EVT_WAIT(5) - EVT_SET(LVar0, 9) - EVT_EXEC(N(8021E418)) - EVT_WAIT(5) - EVT_SET(LVar0, 10) - EVT_EXEC(N(8021E418)) - EVT_WAIT(5) - EVT_SET(LVar0, 11) - EVT_EXEC(N(8021E418)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8021EA9C) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_8021EAAC)[] = { - 0x00000012, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt01_shape", - .hit = "jan_bt01_hit", - .bg = "yos_bg", - .preBattle = &N(beforeBattle_8021E9C4), - .postBattle = &N(afterBattle_8021EA9C), - .foregroundModelList = N(foregroundModelList_8021EAAC), -}; +#include "battle/common/stage/jan_01.inc.c" diff --git a/src/battle/area/jan2/stage/jan_01b.c b/src/battle/area/jan2/stage/jan_01b.c index aca8b4a84f..11c32a3c56 100644 --- a/src/battle/area/jan2/stage/jan_01b.c +++ b/src/battle/area/jan2/stage/jan_01b.c @@ -3,137 +3,4 @@ #define NAMESPACE b_area_jan2_jan_01b -EvtScript N(8021EAE0) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(8021EBF8) = { - EVT_SET(LVarA, LVar0) - EVT_LOOP(0) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, 3, -3, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 3, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -2, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 2, -1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 1, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, -1, 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) - EVT_WAIT(1) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(2) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(beforeBattle_8021F1A4) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 40, 0) - EVT_THREAD - EVT_WAIT(5) - EVT_SET(LVar0, 9) - EVT_EXEC(N(8021EBF8)) - EVT_WAIT(5) - EVT_SET(LVar0, 10) - EVT_EXEC(N(8021EBF8)) - EVT_WAIT(5) - EVT_SET(LVar0, 11) - EVT_EXEC(N(8021EBF8)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8021F27C) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_8021F28C)[] = { - 0x00000012, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt01_shape", - .hit = "jan_bt01_hit", - .bg = "yos_bg", - .preBattle = &N(beforeBattle_8021F1A4), - .postBattle = &N(afterBattle_8021F27C), - .foregroundModelList = N(foregroundModelList_8021F28C), -}; +#include "battle/common/stage/jan_01b.inc.c" diff --git a/src/battle/area/jan2/stage/jan_02.c b/src/battle/area/jan2/stage/jan_02.c index 3f5d848447..26cde47abf 100644 --- a/src/battle/area/jan2/stage/jan_02.c +++ b/src/battle/area/jan2/stage/jan_02.c @@ -3,28 +3,4 @@ #define NAMESPACE b_area_jan2_jan_02 -EvtScript N(beforeBattle_8021F2C0) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8021F2FC) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_8021F30C)[] = { - 0x00000005, 0x00000006, 0x00000007, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt02_shape", - .hit = "jan_bt02_hit", - .bg = "yos_bg", - .preBattle = &N(beforeBattle_8021F2C0), - .postBattle = &N(afterBattle_8021F2FC), - .foregroundModelList = N(foregroundModelList_8021F30C), -}; +#include "battle/common/stage/jan_02.inc.c" diff --git a/src/battle/area/jan2/stage/jan_03.c b/src/battle/area/jan2/stage/jan_03.c index 092a6b6277..bc8aedbc15 100644 --- a/src/battle/area/jan2/stage/jan_03.c +++ b/src/battle/area/jan2/stage/jan_03.c @@ -3,29 +3,4 @@ #define NAMESPACE b_area_jan2_jan_03 -EvtScript N(beforeBattle_8021F350) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 22, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8021F3A0) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_8021F3B0)[] = { - 0x00000040, 0x0000003F, 0x0000003E, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt03_shape", - .hit = "jan_bt03_hit", - .bg = "jan_bg", - .preBattle = &N(beforeBattle_8021F350), - .postBattle = &N(afterBattle_8021F3A0), - .foregroundModelList = N(foregroundModelList_8021F3B0), -}; +#include "battle/common/stage/jan_03.inc.c" diff --git a/src/battle/area/jan2/stage/jan_03b.c b/src/battle/area/jan2/stage/jan_03b.c index 8ed81756ef..16b68081b4 100644 --- a/src/battle/area/jan2/stage/jan_03b.c +++ b/src/battle/area/jan2/stage/jan_03b.c @@ -3,29 +3,4 @@ #define NAMESPACE b_area_jan2_jan_03b -EvtScript N(beforeBattle_8021F3F0) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 66, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8021F440) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_8021F450)[] = { - 0x00000040, 0x0000003F, 0x0000003E, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt03_shape", - .hit = "jan_bt03_hit", - .bg = "jan_bg", - .preBattle = &N(beforeBattle_8021F3F0), - .postBattle = &N(afterBattle_8021F440), - .foregroundModelList = N(foregroundModelList_8021F450), -}; +#include "battle/common/stage/jan_03b.inc.c" diff --git a/src/battle/area/jan2/stage/jan_04.c b/src/battle/area/jan2/stage/jan_04.c index 683bf4c4c7..8430f254ab 100644 --- a/src/battle/area/jan2/stage/jan_04.c +++ b/src/battle/area/jan2/stage/jan_04.c @@ -3,29 +3,4 @@ #define NAMESPACE b_area_jan2_jan_04 -EvtScript N(beforeBattle_8021F490) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 65, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8021F4E0) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_8021F4F0)[] = { - 0x00000025, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt04_shape", - .hit = "jan_bt04_hit", - .bg = "jan_bg", - .preBattle = &N(beforeBattle_8021F490), - .postBattle = &N(afterBattle_8021F4E0), - .foregroundModelList = N(foregroundModelList_8021F4F0), -}; +#include "battle/common/stage/jan_04.inc.c" diff --git a/src/battle/area/jan2/stage/jan_04b.c b/src/battle/area/jan2/stage/jan_04b.c index f49a6dcad2..a2ed18b914 100644 --- a/src/battle/area/jan2/stage/jan_04b.c +++ b/src/battle/area/jan2/stage/jan_04b.c @@ -3,29 +3,4 @@ #define NAMESPACE b_area_jan2_jan_04b -EvtScript N(beforeBattle_8021F520) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 33, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8021F570) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_8021F580)[] = { - 0x00000025, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "jan_tex", - .shape = "jan_bt04_shape", - .hit = "jan_bt04_hit", - .bg = "jan_bg", - .preBattle = &N(beforeBattle_8021F520), - .postBattle = &N(afterBattle_8021F570), - .foregroundModelList = N(foregroundModelList_8021F580), -}; +#include "battle/common/stage/jan_04b.inc.c" diff --git a/src/battle/area/kgr/actor/fuzzipede.c b/src/battle/area/kgr/actor/fuzzipede.c index 93000a2164..6ab518a2bb 100644 --- a/src/battle/area/kgr/actor/fuzzipede.c +++ b/src/battle/area/kgr/actor/fuzzipede.c @@ -104,7 +104,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 20, .partCount = ARRAY_COUNT(N(partsTable_80218B00)), .partsData = N(partsTable_80218B00), - .takeTurnScript = &N(init_80218B70), + .initScript = &N(init_80218B70), .statusTable = N(statusTable_80218A54), .escapeChance = 0, .airLiftChance = 0, @@ -179,14 +179,14 @@ EvtScript N(80218D68) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802189B0))) 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(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24) 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) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_RETURN EVT_END @@ -204,14 +204,14 @@ EvtScript N(80218FC8) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802189B0))) 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(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24) 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) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_RETURN EVT_END @@ -262,14 +262,14 @@ EvtScript N(802191AC) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802189FC))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim06) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80219ED4))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, TRUE) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24) 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) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_RETURN EVT_END @@ -409,7 +409,7 @@ EvtScript N(80219D68) = { EVT_EXEC_WAIT(N(8021A2E8)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802189B0))) 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(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -2, -10) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) @@ -513,7 +513,7 @@ EvtScript N(8021A2E8) = { EVT_CASE_OR_EQ(1) EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(4) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_HP_OFFSET_BELOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim04) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 180) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) @@ -577,7 +577,7 @@ EvtScript N(8021A6D8) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim12) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DA) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -614,7 +614,7 @@ EvtScript N(8021A6D8) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(80219668)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -701,7 +701,7 @@ EvtScript N(8021B008) = { 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_ADD(LVar1, 30) EVT_CALL(N(ItemEntityJumpToPos), LVar0, LVar1, LVar2, LVar3, 20, EVT_FLOAT(1.0)) EVT_ADD(LVar1, 20) @@ -743,7 +743,7 @@ EvtScript N(8021B22C) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim12) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DB) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -791,7 +791,7 @@ EvtScript N(8021B22C) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(80219668)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -873,7 +873,7 @@ EvtScript N(8021B22C) = { EVT_END_LOOP EVT_WAIT(10) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) - EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 0, 0) EVT_CALL(N(StartRumbleWithParams), 200, 10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DC) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim13) @@ -929,7 +929,7 @@ EvtScript N(8021C004) = { EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, ACTOR_SELF, 4, 0) + EVT_CALL(HealActor, ACTOR_SELF, 4, FALSE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_CALL(WaitForBuffDone) diff --git a/src/battle/area/kgr/stage/kgr_01.c b/src/battle/area/kgr/stage/kgr_01.c index 3ef0034e26..1ef07d807c 100644 --- a/src/battle/area/kgr/stage/kgr_01.c +++ b/src/battle/area/kgr/stage/kgr_01.c @@ -1,64 +1,67 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/kgr_bt01_shape.h" #define NAMESPACE b_area_kgr_kgr_01 -#include "common/UnkModelStuff2.inc.c" +#include "battle/common/stage/WaterEffects.inc.c" -EvtScript N(beforeBattle_8021D3B4) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_THREAD - EVT_SET(LVar0, 19) - EVT_EXEC(N(script4)) + EVT_SET(LVar0, MODEL_bin1) + EVT_EXEC(N(EVS_AnimateFlotsam)) EVT_WAIT(4) - EVT_SET(LVar0, 20) - EVT_EXEC(N(script4)) + EVT_SET(LVar0, MODEL_bin2) + EVT_EXEC(N(EVS_AnimateFlotsam)) EVT_WAIT(4) - EVT_SET(LVar0, 21) - EVT_EXEC(N(script4)) + EVT_SET(LVar0, MODEL_bin3) + EVT_EXEC(N(EVS_AnimateFlotsam)) EVT_WAIT(4) - EVT_SET(LVar0, 22) - EVT_EXEC(N(script4)) + EVT_SET(LVar0, MODEL_bin4) + EVT_EXEC(N(EVS_AnimateFlotsam)) EVT_END_THREAD EVT_THREAD - EVT_SET(LVar0, 14) - EVT_EXEC(N(script4)) + EVT_SET(LVar0, MODEL_hako1) + EVT_EXEC(N(EVS_AnimateFlotsam)) EVT_WAIT(4) - EVT_SET(LVar0, 15) - EVT_EXEC(N(script4)) + EVT_SET(LVar0, MODEL_hako2) + EVT_EXEC(N(EVS_AnimateFlotsam)) EVT_WAIT(4) - EVT_SET(LVar0, 16) - EVT_EXEC(N(script4)) + EVT_SET(LVar0, MODEL_hako4) + EVT_EXEC(N(EVS_AnimateFlotsam)) EVT_WAIT(4) - EVT_SET(LVar0, 17) - EVT_EXEC(N(script4)) + EVT_SET(LVar0, MODEL_hako5) + EVT_EXEC(N(EVS_AnimateFlotsam)) EVT_WAIT(4) - EVT_SET(LVar0, 18) - EVT_EXEC(N(script4)) + EVT_SET(LVar0, MODEL_hako6) + EVT_EXEC(N(EVS_AnimateFlotsam)) EVT_END_THREAD - EVT_SET(LVar0, 11) - EVT_EXEC(N(script4)) - EVT_SET(LVar0, 12) - EVT_EXEC(N(script4)) + EVT_SET(LVar0, MODEL_fune2) + EVT_EXEC(N(EVS_AnimateFlotsam)) + EVT_SET(LVar0, MODEL_fune1) + EVT_EXEC(N(EVS_AnimateFlotsam)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8021D598) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_8021D5A8)[] = { - 0x00000009, 0x00000010, 0x00000000, +s32 N(ForegroundModels)[] = { + MODEL_hone, + MODEL_hako4, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kgr_tex", .shape = "kgr_bt01_shape", .hit = "kgr_bt01_hit", - .preBattle = &N(beforeBattle_8021D3B4), - .postBattle = &N(afterBattle_8021D598), - .foregroundModelList = N(foregroundModelList_8021D5A8), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kkj/actor/kammy_koopa.c b/src/battle/area/kkj/actor/kammy_koopa.c index eb601b366e..f5fd6cd218 100644 --- a/src/battle/area/kkj/actor/kammy_koopa.c +++ b/src/battle/area/kkj/actor/kammy_koopa.c @@ -91,7 +91,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 10, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -112,7 +112,7 @@ EvtScript N(init) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn))) - EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_DONT_STOP_MUSIC, 1) + EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_DONT_STOP_MUSIC, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_RETURN @@ -264,7 +264,7 @@ EvtScript N(takeTurn) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 25) EVT_ADD(LVar1, 40) - EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 100, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 100, 0) EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, 80, 95, 15) @@ -275,15 +275,15 @@ EvtScript N(takeTurn) = { EVT_ADD(LVar1, 30) EVT_SET(LVar3, LVar1) EVT_ADD(LVar3, 20) - EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 60, 0) EVT_WAIT(20) - EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 60, 0) EVT_WAIT(10) - EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 60, 0) EVT_WAIT(5) - EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 60, 0) EVT_WAIT(3) - EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 60, 0) EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer1Block), LVar0, LVar1, LVar2, 0, MAKE_ENTITY_END) EVT_SET(LVar9, LVar0) EVT_CALL(N(BlockAppear)) @@ -292,7 +292,7 @@ EvtScript N(takeTurn) = { EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_207C) EVT_CALL(N(GetEntityPosition), LVar9, LVar2, LVar3, LVar4) - EVT_CALL(MakeLerp, LVar3, 300, 20, 1) + EVT_CALL(MakeLerp, LVar3, 300, 20, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetEntityPositionF), LVar9, LVar2, LVar0, LVar4) @@ -322,7 +322,7 @@ EvtScript N(takeTurn) = { EVT_ADD(LVar5, 200) EVT_CALL(N(SetEntityPositionF), LVar9, LVar0, LVar5, LVar2) EVT_CALL(N(GetEntityPosition), LVar9, LVar2, LVar3, LVar4) - EVT_CALL(MakeLerp, LVar5, LVar1, 20, 2) + EVT_CALL(MakeLerp, LVar5, LVar1, 20, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetEntityPositionF), LVar9, LVar2, LVar0, LVar4) @@ -334,16 +334,16 @@ EvtScript N(takeTurn) = { EVT_CALL(N(DropBlock)) EVT_CHILD_THREAD EVT_CALL(StartRumble, 5) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(6.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(5.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(4.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.2)) + 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_CHILD_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKammy_Anim05) EVT_WAIT(2) @@ -363,16 +363,16 @@ EvtScript N(takeTurn) = { EVT_CALL(SetBattleCamZoom, 340) EVT_CALL(SetBattleCamOffsetZ, 62) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(FreezeBattleCam, 1) + EVT_CALL(FreezeBattleCam, TRUE) EVT_WAIT(20) EVT_THREAD EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 10, 5, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 6, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 6, 0, EASING_LINEAR) EVT_END_THREAD EVT_CALL(ActorSpeak, MSG_CH8_009A, ACTOR_SELF, 1, ANIM_BattleKammy_Anim06, ANIM_BattleKammy_Anim05) EVT_WAIT(10) - EVT_CALL(FreezeBattleCam, 0) + EVT_CALL(FreezeBattleCam, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_END_IF EVT_WAIT(10) @@ -435,11 +435,11 @@ EvtScript N(speakOnHit) = { EVT_CALL(SetBattleCamZoom, 340) EVT_CALL(SetBattleCamOffsetZ, 62) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(FreezeBattleCam, 1) + EVT_CALL(FreezeBattleCam, TRUE) EVT_WAIT(20) EVT_CALL(ActorSpeak, MSG_CH8_0097, ACTOR_SELF, 1, ANIM_BattleKammy_Anim09, ANIM_BattleKammy_Anim05) EVT_WAIT(10) - EVT_CALL(FreezeBattleCam, 0) + EVT_CALL(FreezeBattleCam, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CASE_OR_EQ(9) EVT_CASE_OR_EQ(8) @@ -448,11 +448,11 @@ EvtScript N(speakOnHit) = { EVT_CALL(SetBattleCamZoom, 340) EVT_CALL(SetBattleCamOffsetZ, 62) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(FreezeBattleCam, 1) + EVT_CALL(FreezeBattleCam, TRUE) EVT_WAIT(20) EVT_CALL(ActorSpeak, MSG_CH8_0098, ACTOR_SELF, 1, ANIM_BattleKammy_Anim0A, ANIM_BattleKammy_Anim05) EVT_WAIT(10) - EVT_CALL(FreezeBattleCam, 0) + EVT_CALL(FreezeBattleCam, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(7) @@ -471,11 +471,11 @@ EvtScript N(speakOnHit) = { EVT_CALL(SetBattleCamZoom, 340) EVT_CALL(SetBattleCamOffsetZ, 62) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(FreezeBattleCam, 1) + EVT_CALL(FreezeBattleCam, TRUE) EVT_WAIT(20) EVT_CALL(ActorSpeak, MSG_CH8_0099, ACTOR_SELF, 1, ANIM_BattleKammy_Anim06, ANIM_BattleKammy_Anim05) EVT_WAIT(10) - EVT_CALL(FreezeBattleCam, 0) + EVT_CALL(FreezeBattleCam, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(AddActorVar, ACTOR_SELF, 0, 1) EVT_END_CASE_GROUP @@ -498,7 +498,7 @@ EvtScript N(onDeath) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) @@ -514,17 +514,17 @@ EvtScript N(onDeath) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 3) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SEEING_STARS) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKammy_Anim03) EVT_WAIT(50) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_CALL(ActorSpeak, MSG_CH8_009B, ACTOR_SELF, 1, ANIM_BattleKammy_Anim03, ANIM_BattleKammy_Anim03) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 60) EVT_WAIT(40) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_PLAYER_IN_BACK, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_PLAYER_IN_BACK, FALSE) EVT_RETURN EVT_END }; diff --git a/src/battle/area/kkj/stage/kpa_05.c b/src/battle/area/kkj/stage/kpa_05.c index 123a67abb5..372a440168 100644 --- a/src/battle/area/kkj/stage/kpa_05.c +++ b/src/battle/area/kkj/stage/kpa_05.c @@ -3,72 +3,4 @@ #define NAMESPACE b_area_kkj_kpa_05 -#include "world/common/util/SetLightningBoltPurple.inc.c" - -s32 N(lightningsSettings1)[] = { - 0xFFFFFFEA, 0x000000BE, 0xFFFFFFA5, 0xFFFFFFA8, 0x00000015, 0xFFFFFFA5, 0x0000003C, - 0xFFFFFFFF, 0x000000BE, 0xFFFFFFA5, 0x00000058, 0x00000018, 0xFFFFFFA5, 0x0000000A, - 0xFFFFFFBD, 0x000000BE, 0xFFFFFFA5, 0xFFFFFF86, 0x0000000A, 0xFFFFFFA5, 0x0000005A, - 0x00000039, 0x000000BE, 0xFFFFFFA5, 0xFFFFFFFC, 0x00000011, 0xFFFFFFA5, 0x0000003C, -}; - -EvtScript N(createLightnings1) = { - EVT_LABEL(0) - EVT_USE_BUF(N(lightningsSettings1)) - EVT_LOOP(4) - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_BUF_READ3(LVar3, LVar4, LVar5) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 8, 0, 0, 0, 0) - EVT_CALL(N(SetLightningBoltPurple)) - EVT_BUF_READ1(LVar0) - EVT_WAIT(LVar0) - EVT_END_LOOP - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -s32 N(lightningsSettings2)[] = { - 0xFFFFFF87, 0x00000021, 0xFFFFFF98, 0xFFFFFFE8, 0x00000029, 0xFFFFFF98, 0x00000005, - 0x00000024, 0x00000029, 0xFFFFFF98, 0x00000080, 0x00000022, 0xFFFFFF98, 0x0000001E, - 0x00000092, 0x00000001, 0x00000071, 0x00000026, 0xFFFFFFF1, 0x00000079, 0x00000005, - 0xFFFFFFBE, 0xFFFFFFF6, 0x00000073, 0xFFFFFF65, 0x00000001, 0x00000061, 0x0000005A, -}; - -EvtScript N(createLightnings2) = { - EVT_LABEL(0) - EVT_USE_BUF(N(lightningsSettings2)) - EVT_LOOP(4) - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_BUF_READ3(LVar3, LVar4, LVar5) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 5, 0, 0, 0, 0) - EVT_CALL(N(SetLightningBoltPurple)) - EVT_BUF_READ1(LVar0) - EVT_WAIT(LVar0) - EVT_END_LOOP - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_EXEC(N(createLightnings1)) - EVT_EXEC(N(createLightnings2)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "kkj_tex", - .shape = "kkj_bt02_shape", - .hit = "kkj_bt02_hit", - .bg = "kpa_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), -}; +#include "battle/common/stage/kkj_02.inc.c" diff --git a/src/battle/area/kmr_part_1/stage/kmr_02.c b/src/battle/area/kmr_part_1/stage/kmr_02.c index 5806687cae..8a719e0504 100644 --- a/src/battle/area/kmr_part_1/stage/kmr_02.c +++ b/src/battle/area/kmr_part_1/stage/kmr_02.c @@ -3,21 +3,4 @@ #define NAMESPACE b_area_kmr_part_1_kmr_02 -EvtScript N(beforeBattle_8021FDA0) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8021FDC0) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "kmr_tex", - .shape = "kmr_bt02_shape", - .bg = "kmr_bg", - .preBattle = &N(beforeBattle_8021FDA0), - .postBattle = &N(afterBattle_8021FDC0), -}; +#include "battle/common/stage/kmr_02.inc.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 index 8d071816c8..60f4a25464 100644 --- a/src/battle/area/kmr_part_1/stage/kmr_03.c +++ b/src/battle/area/kmr_part_1/stage/kmr_03.c @@ -3,35 +3,4 @@ #define NAMESPACE b_area_kmr_part_1_kmr_03 -#include "world/common/todo/clouds.inc.c" - -EvtScript N(beforeBattle_80220188) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SET(LVar0, 1) - EVT_SET(LVar2, 0) - EVT_EXEC(N(clouds1)) - EVT_SET(LVar0, 4) - EVT_SET(LVar2, 70) - EVT_EXEC(N(clouds1)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80220200) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80220210)[] = { - 0x00000027, 0x0000002B, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "kmr_tex", - .shape = "kmr_bt03_shape", - .hit = "kmr_bt03_hit", - .bg = "kmr_bg", - .preBattle = &N(beforeBattle_80220188), - .postBattle = &N(afterBattle_80220200), - .foregroundModelList = N(foregroundModelList_80220210), -}; +#include "battle/common/stage/kmr_03.inc.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 index 678bf91cf0..b645ba5a36 100644 --- a/src/battle/area/kmr_part_1/stage/kmr_04.c +++ b/src/battle/area/kmr_part_1/stage/kmr_04.c @@ -3,35 +3,4 @@ #define NAMESPACE b_area_kmr_part_1_kmr_04 -#include "world/common/todo/clouds.inc.c" - -EvtScript N(beforeBattle_802205D8) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SET(LVar0, 1) - EVT_SET(LVar2, 0) - EVT_EXEC(N(clouds1)) - EVT_SET(LVar0, 4) - EVT_SET(LVar2, 70) - EVT_EXEC(N(clouds1)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80220650) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80220660)[] = { - 0x00000024, 0x00000020, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "kmr_tex", - .shape = "kmr_bt04_shape", - .hit = "kmr_bt04_hit", - .bg = "kmr_bg", - .preBattle = &N(beforeBattle_802205D8), - .postBattle = &N(afterBattle_80220650), - .foregroundModelList = N(foregroundModelList_80220660), -}; +#include "battle/common/stage/kmr_04.inc.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 index 9a627e32e2..b49f16bea8 100644 --- a/src/battle/area/kmr_part_1/stage/kmr_05.c +++ b/src/battle/area/kmr_part_1/stage/kmr_05.c @@ -3,30 +3,4 @@ #define NAMESPACE b_area_kmr_part_1_kmr_05 -#include "world/common/todo/clouds.inc.c" - -EvtScript N(beforeBattle_80220A28) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(EnableModel, 27, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80220A5C) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80220A6C)[] = { - 0x00000020, 0x00000024, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "kmr_tex", - .shape = "kmr_bt05_shape", - .hit = "kmr_bt05_hit", - .bg = "kmr_bg", - .preBattle = &N(beforeBattle_80220A28), - .postBattle = &N(afterBattle_80220A5C), - .foregroundModelList = N(foregroundModelList_80220A6C), -}; +#include "battle/common/stage/kmr_05.inc.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 index f4997fada3..f1cf9bfed7 100644 --- a/src/battle/area/kmr_part_1/stage/kmr_06.c +++ b/src/battle/area/kmr_part_1/stage/kmr_06.c @@ -3,37 +3,4 @@ #define NAMESPACE b_area_kmr_part_1_kmr_06 -#include "world/common/todo/clouds.inc.c" -#include "common/UnkFogFunc.inc.c" - -EvtScript N(beforeBattle_80220E28) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(N(UnkFogFunc)) - EVT_SET(LVar0, 1) - EVT_SET(LVar2, 0) - EVT_EXEC(N(clouds1)) - EVT_SET(LVar0, 4) - EVT_SET(LVar2, 70) - EVT_EXEC(N(clouds1)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80220EAC) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80220EBC)[] = { - 0x0000001D, 0x00000022, 0x00000021, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "kmr_tex", - .shape = "kmr_bt06_shape", - .hit = "kmr_bt06_hit", - .bg = "kmr_bg", - .preBattle = &N(beforeBattle_80220E28), - .postBattle = &N(afterBattle_80220EAC), - .foregroundModelList = N(foregroundModelList_80220EBC), -}; +#include "battle/common/stage/kmr_06.inc.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 index f4a763e792..3017f3dcbb 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba.c @@ -65,7 +65,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 6, .partCount = ARRAY_COUNT(N(partsTable_80219968)), .partsData = N(partsTable_80219968), - .takeTurnScript = &N(init_8021B268), + .initScript = &N(init_8021B268), .statusTable = N(statusTable_802198BC), .escapeChance = 0, .airLiftChance = 0, @@ -133,7 +133,7 @@ EvtScript N(idle_80219A98) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219A00))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleRunToGoal, -127, 0) + EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802199B4))) EVT_LOOP(20) EVT_LABEL(1) @@ -149,7 +149,7 @@ EvtScript N(idle_80219A98) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219A00))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleRunToGoal, -127, 0) + EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802199B4))) EVT_LOOP(80) EVT_LABEL(2) @@ -372,7 +372,7 @@ EvtScript N(takeTurn_8021A5A0) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -458,22 +458,22 @@ EvtScript N(takeTurn_8021A5A0) = { EvtScript N(init_8021B268) = { EVT_EXEC_WAIT(N(init_80219A4C)) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8021B2C8))) EVT_RETURN EVT_END }; EvtScript N(takeTurn_8021B2C8) = { - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) - EVT_CALL(SetActorVar, -127, 0, 1) - EVT_CALL(ActorSpeak, 721087, -127, 1, -1, -1) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) + EVT_CALL(ActorSpeak, MSG_CH0_00BF, ACTOR_SELF, 1, -1, -1) EVT_END_IF EVT_EXEC_WAIT(N(takeTurn_8021A5A0)) EVT_RETURN @@ -493,21 +493,21 @@ EvtScript N(doDeath_8021B388) = { EVT_END_LOOP EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(PlayEffect, 0x1, LVar2, LVar3, LVar4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar2, LVar3, LVar4, 0, 0, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) - EVT_CALL(DropStarPoints, -127) + EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_SET(LVar3, 0) EVT_LOOP(12) EVT_CALL(SetActorRotation, ACTOR_SELF, LVar3, 0, 0) EVT_ADD(LVar3, 8) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, -127, 0, 1, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 0, 1, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4, TRUE) EVT_WAIT(30) - EVT_CALL(ActorExists, 513, LVar0) + EVT_CALL(ActorExists, ACTOR_ENEMY1, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(GetActorHP, 513, LVar0) + EVT_CALL(GetActorHP, ACTOR_ENEMY1, LVar0) EVT_END_IF EVT_IF_NE(LVar0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) @@ -517,14 +517,14 @@ EvtScript N(doDeath_8021B388) = { EVT_CALL(UseIdleAnimation, ACTOR_ENEMY1, FALSE) EVT_CALL(EnableIdleScript, ACTOR_ENEMY1, 0) EVT_CALL(SetAnimation, ACTOR_ENEMY1, 1, ANIM_GoombaBros_Red_CryTalk) - EVT_CALL(ActorSpeak, 721089, 513, 1, -1, -1) + EVT_CALL(ActorSpeak, MSG_CH0_00C1, ACTOR_ENEMY1, 1, -1, -1) EVT_CALL(EnableIdleScript, ACTOR_ENEMY1, 1) EVT_CALL(UseIdleAnimation, ACTOR_ENEMY1, TRUE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) EVT_END_IF - EVT_CALL(RemoveActor, -127) + EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN EVT_END }; diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba2.c b/src/battle/area/kmr_part_2/actor/blue_goomba2.c index 6c05a67f54..8e27efe25d 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba2.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba2.c @@ -63,7 +63,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 6, .partCount = ARRAY_COUNT(N(partsTable_8021D4B8)), .partsData = N(partsTable_8021D4B8), - .takeTurnScript = &N(init_8021EDB8), + .initScript = &N(init_8021EDB8), .statusTable = N(statusTable_8021D40C), .escapeChance = 0, .airLiftChance = 0, @@ -131,7 +131,7 @@ EvtScript N(idle_8021D5E8) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021D550))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleRunToGoal, -127, 0) + EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021D504))) EVT_LOOP(20) EVT_LABEL(1) @@ -147,7 +147,7 @@ EvtScript N(idle_8021D5E8) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021D550))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleRunToGoal, -127, 0) + EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021D504))) EVT_LOOP(80) EVT_LABEL(2) @@ -370,7 +370,7 @@ EvtScript N(takeTurn_8021E0F0) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -458,7 +458,7 @@ EvtScript N(takeTurn_8021E0F0) = { EvtScript N(init_8021EDB8) = { EVT_EXEC_WAIT(N(init_8021D59C)) - EVT_CALL(SetEnemyHP, -127, 2) + EVT_CALL(SetEnemyHP, ACTOR_SELF, 2) EVT_CALL(N(DivActorLevel4)) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_2/actor/goomba_king.c b/src/battle/area/kmr_part_2/actor/goomba_king.c index 83cfdeb598..c25675f193 100644 --- a/src/battle/area/kmr_part_2/actor/goomba_king.c +++ b/src/battle/area/kmr_part_2/actor/goomba_king.c @@ -128,7 +128,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 10, .partCount = ARRAY_COUNT(N(partsTable_802209C8)), .partsData = N(partsTable_802209C8), - .takeTurnScript = &N(init_80220A38), + .initScript = &N(init_80220A38), .statusTable = N(statusTable_8022091C), .escapeChance = 0, .airLiftChance = 0, @@ -158,15 +158,15 @@ EvtScript N(init_80220A38) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80221530))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80220B50))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80220F34))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_802229C4))) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_802229C4))) EVT_EXEC_GET_TID(N(80222D9C), LVar0) - EVT_CALL(SetActorVar, -127, 4, LVar0) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) - EVT_CALL(SetActorVar, -127, 2, 0) - EVT_CALL(SetActorVar, -127, 3, 0) - EVT_CALL(SetActorVar, -127, 5, 0) - EVT_CALL(SetActorVar, -127, 6, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 5, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0) EVT_RETURN EVT_END }; @@ -188,7 +188,7 @@ EvtScript N(idle_80220B50) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220844))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleRunToGoal, -127, 0) + EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220800))) EVT_WAIT(20) EVT_LABEL(2) @@ -202,7 +202,7 @@ EvtScript N(idle_80220B50) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220844))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleRunToGoal, -127, 0) + EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220800))) EVT_WAIT(80) EVT_GOTO(0) @@ -267,7 +267,7 @@ EvtScript N(handleEvent_80220F34) = { EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_GoombaKing_Dead) EVT_EXEC_WAIT(DoShockHit) - EVT_CALL(GetActorVar, -127, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_KILL_THREAD(LVar0) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_GoombaKing_Dead) @@ -284,7 +284,7 @@ EvtScript N(handleEvent_80220F34) = { EVT_SET_CONST(LVar1, ANIM_GoombaKing_Dead) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) - EVT_CALL(GetActorVar, -127, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_KILL_THREAD(LVar0) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_GoombaKing_Dead) @@ -296,7 +296,7 @@ EvtScript N(handleEvent_80220F34) = { EVT_SET_CONST(LVar2, ANIM_GoombaKing_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_WAIT(10) - EVT_CALL(GetActorVar, -127, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_KILL_THREAD(LVar0) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_GoombaKing_BurnStill) @@ -306,7 +306,7 @@ EvtScript N(handleEvent_80220F34) = { EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_GoombaKing_Dead) EVT_EXEC_WAIT(DoSpinSmashHit) - EVT_CALL(GetActorVar, -127, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_KILL_THREAD(LVar0) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_GoombaKing_Dead) @@ -345,12 +345,12 @@ EvtScript N(takeTurn_80221530) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x80000) - EVT_CALL(GetActorVar, 515, 6, LVar0) + EVT_CALL(GetActorVar, ACTOR_ENEMY3, 6, LVar0) EVT_IF_NE(LVar0, 0) EVT_CALL(RandInt, 100, LVar1) EVT_IF_LT(LVar1, 60) EVT_SUB(LVar0, 1) - EVT_CALL(SetActorVar, 515, 6, LVar0) + EVT_CALL(SetActorVar, ACTOR_ENEMY3, 6, LVar0) EVT_EXEC_WAIT(N(80221CD4)) EVT_RETURN EVT_END_IF @@ -477,12 +477,12 @@ EvtScript N(80221CD4) = { EVT_CALL(StartRumble, 11) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x80000) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(4.0)) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GoombaKing_Idle) - EVT_CALL(PlayEffect, 0x14, 0, -80, 125, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x14, 0, -15, 135, 0, 85, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x14, 0, 100, 103, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -80, 125, 0, 100, 0) + EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -15, 135, 0, 85, 0) + EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, 100, 103, 0, 70, 0) EVT_END_THREAD EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 2, BS_FLAGS1_10) EVT_SWITCH(LVarA) @@ -490,61 +490,61 @@ EvtScript N(80221CD4) = { EVT_CASE_OR_EQ(5) EVT_THREAD EVT_WAIT(12) - EVT_CALL(PlaySoundAtPart, 515, 3, 769) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, 3, SOUND_301) EVT_END_THREAD EVT_THREAD EVT_WAIT(10) - EVT_CALL(SetPartJumpGravity, 515, 3, EVT_FLOAT(1.5)) - EVT_CALL(GetPartOffset, 515, 3, LVar0, LVar1, LVar2) - EVT_CALL(FallPartTo, 515, 3, LVar0, 10, LVar2, 14) + EVT_CALL(SetPartJumpGravity, ACTOR_ENEMY3, 3, EVT_FLOAT(1.5)) + EVT_CALL(GetPartOffset, ACTOR_ENEMY3, 3, LVar0, LVar1, LVar2) + EVT_CALL(FallPartTo, ACTOR_ENEMY3, 3, LVar0, 10, LVar2, 14) EVT_SUB(LVar0, 12) - EVT_CALL(JumpPartTo, 515, 3, LVar0, 10, LVar2, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_ENEMY3, 3, LVar0, 10, LVar2, 10, TRUE) EVT_SUB(LVar0, 7) - EVT_CALL(JumpPartTo, 515, 3, LVar0, 10, LVar2, 7, 1) + EVT_CALL(JumpPartTo, ACTOR_ENEMY3, 3, LVar0, 10, LVar2, 7, TRUE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, 515, 3, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, 3, 1, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, 515, 3, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, 3, 1, TRUE) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtPart, 515, 4, 769) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, 4, SOUND_301) EVT_END_THREAD EVT_THREAD EVT_WAIT(3) - EVT_CALL(SetPartJumpGravity, 515, 4, EVT_FLOAT(1.5)) - EVT_CALL(GetPartOffset, 515, 4, LVar0, LVar1, LVar2) - EVT_CALL(FallPartTo, 515, 4, LVar0, 10, LVar2, 15) + EVT_CALL(SetPartJumpGravity, ACTOR_ENEMY3, 4, EVT_FLOAT(1.5)) + EVT_CALL(GetPartOffset, ACTOR_ENEMY3, 4, LVar0, LVar1, LVar2) + EVT_CALL(FallPartTo, ACTOR_ENEMY3, 4, LVar0, 10, LVar2, 15) EVT_SUB(LVar0, 12) - EVT_CALL(JumpPartTo, 515, 4, LVar0, 10, LVar2, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_ENEMY3, 4, LVar0, 10, LVar2, 10, TRUE) EVT_SUB(LVar0, 7) - EVT_CALL(JumpPartTo, 515, 4, LVar0, 10, LVar2, 7, 1) + EVT_CALL(JumpPartTo, ACTOR_ENEMY3, 4, LVar0, 10, LVar2, 7, TRUE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, 515, 4, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, 4, 1, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, 515, 4, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, 4, 1, TRUE) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_WAIT(17) - EVT_CALL(PlaySoundAtPart, 515, 5, 769) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, 5, SOUND_301) EVT_END_THREAD EVT_THREAD EVT_WAIT(15) - EVT_CALL(SetPartJumpGravity, 515, 5, EVT_FLOAT(1.5)) - EVT_CALL(GetPartOffset, 515, 5, LVar0, LVar1, LVar2) - EVT_CALL(FallPartTo, 515, 5, LVar0, 10, LVar2, 17) + EVT_CALL(SetPartJumpGravity, ACTOR_ENEMY3, 5, EVT_FLOAT(1.5)) + EVT_CALL(GetPartOffset, ACTOR_ENEMY3, 5, LVar0, LVar1, LVar2) + EVT_CALL(FallPartTo, ACTOR_ENEMY3, 5, LVar0, 10, LVar2, 17) EVT_ADD(LVar0, 12) - EVT_CALL(JumpPartTo, 515, 5, LVar0, 10, LVar2, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_ENEMY3, 5, LVar0, 10, LVar2, 10, TRUE) EVT_ADD(LVar0, 7) - EVT_CALL(JumpPartTo, 515, 5, LVar0, 10, LVar2, 7, 1) + EVT_CALL(JumpPartTo, ACTOR_ENEMY3, 5, LVar0, 10, LVar2, 7, TRUE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, 515, 5, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, 5, 1, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, 515, 5, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, 5, 1, TRUE) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -559,61 +559,61 @@ EvtScript N(80221CD4) = { EVT_END_SWITCH EVT_THREAD EVT_WAIT(12) - EVT_CALL(PlaySoundAtPart, 515, 3, 769) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, 3, SOUND_301) EVT_END_THREAD EVT_THREAD EVT_WAIT(10) - EVT_CALL(SetPartJumpGravity, 515, 3, EVT_FLOAT(1.5)) - EVT_CALL(GetPartOffset, 515, 3, LVar0, LVar1, LVar2) - EVT_CALL(FallPartTo, 515, 3, LVar0, 35, LVar2, 14) + EVT_CALL(SetPartJumpGravity, ACTOR_ENEMY3, 3, EVT_FLOAT(1.5)) + EVT_CALL(GetPartOffset, ACTOR_ENEMY3, 3, LVar0, LVar1, LVar2) + EVT_CALL(FallPartTo, ACTOR_ENEMY3, 3, LVar0, 35, LVar2, 14) EVT_SUB(LVar0, 12) - EVT_CALL(JumpPartTo, 515, 3, LVar0, 10, LVar2, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_ENEMY3, 3, LVar0, 10, LVar2, 10, TRUE) EVT_SUB(LVar0, 7) - EVT_CALL(JumpPartTo, 515, 3, LVar0, 10, LVar2, 7, 1) + EVT_CALL(JumpPartTo, ACTOR_ENEMY3, 3, LVar0, 10, LVar2, 7, TRUE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, 515, 3, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, 3, 1, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, 515, 3, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, 3, 1, TRUE) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtPart, 515, 4, 769) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, 4, SOUND_301) EVT_END_THREAD EVT_THREAD EVT_WAIT(3) - EVT_CALL(SetPartJumpGravity, 515, 4, EVT_FLOAT(1.5)) - EVT_CALL(GetPartOffset, 515, 4, LVar0, LVar1, LVar2) - EVT_CALL(FallPartTo, 515, 4, LVar0, 10, LVar2, 15) + EVT_CALL(SetPartJumpGravity, ACTOR_ENEMY3, 4, EVT_FLOAT(1.5)) + EVT_CALL(GetPartOffset, ACTOR_ENEMY3, 4, LVar0, LVar1, LVar2) + EVT_CALL(FallPartTo, ACTOR_ENEMY3, 4, LVar0, 10, LVar2, 15) EVT_SUB(LVar0, 12) - EVT_CALL(JumpPartTo, 515, 4, LVar0, 10, LVar2, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_ENEMY3, 4, LVar0, 10, LVar2, 10, TRUE) EVT_SUB(LVar0, 7) - EVT_CALL(JumpPartTo, 515, 4, LVar0, 10, LVar2, 7, 1) + EVT_CALL(JumpPartTo, ACTOR_ENEMY3, 4, LVar0, 10, LVar2, 7, TRUE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, 515, 4, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, 4, 1, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, 515, 4, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, 4, 1, TRUE) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_WAIT(17) - EVT_CALL(PlaySoundAtPart, 515, 5, 769) + EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, 5, SOUND_301) EVT_END_THREAD EVT_THREAD EVT_WAIT(15) - EVT_CALL(SetPartJumpGravity, 515, 5, EVT_FLOAT(1.5)) - EVT_CALL(GetPartOffset, 515, 5, LVar0, LVar1, LVar2) - EVT_CALL(FallPartTo, 515, 5, LVar0, 10, LVar2, 17) + EVT_CALL(SetPartJumpGravity, ACTOR_ENEMY3, 5, EVT_FLOAT(1.5)) + EVT_CALL(GetPartOffset, ACTOR_ENEMY3, 5, LVar0, LVar1, LVar2) + EVT_CALL(FallPartTo, ACTOR_ENEMY3, 5, LVar0, 10, LVar2, 17) EVT_ADD(LVar0, 12) - EVT_CALL(JumpPartTo, 515, 5, LVar0, 10, LVar2, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_ENEMY3, 5, LVar0, 10, LVar2, 10, TRUE) EVT_ADD(LVar0, 7) - EVT_CALL(JumpPartTo, 515, 5, LVar0, 10, LVar2, 7, 1) + EVT_CALL(JumpPartTo, ACTOR_ENEMY3, 5, LVar0, 10, LVar2, 7, TRUE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, 515, 5, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, 5, 1, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, 515, 5, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, 5, 1, TRUE) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -637,7 +637,7 @@ EvtScript N(nextTurn_802229C4) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, -127, 3, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(func_802535B4, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13) @@ -646,7 +646,7 @@ EvtScript N(nextTurn_802229C4) = { EVT_WAIT(20) EVT_CALL(UseIdleAnimation, ACTOR_ENEMY1, FALSE) EVT_CALL(EnableIdleScript, ACTOR_ENEMY1, 0) - EVT_CALL(ActorSpeak, 721099, 513, 1, 6422538, 6422538) + EVT_CALL(ActorSpeak, MSG_CH0_00CB, ACTOR_ENEMY1, 1, 0x0062000A, 0x0062000A) EVT_CALL(EnableIdleScript, ACTOR_ENEMY1, 1) EVT_CALL(UseIdleAnimation, ACTOR_ENEMY1, TRUE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13) @@ -655,15 +655,15 @@ EvtScript N(nextTurn_802229C4) = { EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_ENEMY2, FALSE) EVT_CALL(EnableIdleScript, ACTOR_ENEMY2, 0) - EVT_CALL(ActorSpeak, 721100, 514, 1, 6422794, 6422794) + EVT_CALL(ActorSpeak, MSG_CH0_00CC, ACTOR_ENEMY2, 1, 0x0062010A, 0x0062010A) EVT_CALL(EnableIdleScript, ACTOR_ENEMY2, 1) EVT_CALL(UseIdleAnimation, ACTOR_ENEMY2, TRUE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_ENEMY0) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(20) - EVT_CALL(ActorSpeak, 721101, 512, 1, 6488073, 6488073) - EVT_CALL(SetActorVar, -127, 3, 1) + EVT_CALL(ActorSpeak, MSG_CH0_00CD, ACTOR_ENEMY0, 1, 0x00630009, 0x00630009) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_PLAYER) EVT_CALL(MoveBattleCamOver, 10) @@ -672,7 +672,7 @@ EvtScript N(nextTurn_802229C4) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 180) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Question) - EVT_CALL(ActorSpeak, 721102, 256, 0, -1, -1) + EVT_CALL(ActorSpeak, MSG_CH0_00CE, ACTOR_PARTNER, 0, -1, -1) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_NodYes) EVT_WAIT(15) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) @@ -692,27 +692,27 @@ EvtScript N(nextTurn_802229C4) = { EvtScript N(80222D9C) = { EVT_LABEL(0) EVT_WAIT(1) - EVT_CALL(GetAnimation, -127, 1, LVar0) + EVT_CALL(GetAnimation, ACTOR_SELF, 1, LVar0) EVT_IF_NE(LVar0, 6488068) EVT_GOTO(0) EVT_END_IF - EVT_CALL(GetAnimation, -127, 1, LVar0) + EVT_CALL(GetAnimation, ACTOR_SELF, 1, LVar0) EVT_IF_NE(LVar0, 6488068) EVT_GOTO(0) EVT_END_IF EVT_CALL(StartRumble, 1) EVT_CALL(func_8026DF88, -127, 1, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x80000) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) EVT_END_IF EVT_ELSE EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x80000) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.7)) EVT_END_IF EVT_END_IF EVT_END_IF @@ -734,41 +734,41 @@ EvtScript N(doDeath_80222F50) = { EVT_END_LOOP EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(PlayEffect, 0x1, LVar2, LVar3, LVar4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar2, LVar3, LVar4, 0, 0, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) - EVT_CALL(DropStarPoints, -127) + EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_SET(LVar3, 0) EVT_LOOP(12) EVT_CALL(SetActorRotation, ACTOR_SELF, LVar3, 0, 0) EVT_ADD(LVar3, 8) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, -127, 1, 1, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 1, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4, TRUE) EVT_WAIT(30) - EVT_CALL(ActorExists, 513, LVar0) + EVT_CALL(ActorExists, ACTOR_ENEMY1, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(GetActorHP, 513, LVar0) + EVT_CALL(GetActorHP, ACTOR_ENEMY1, LVar0) EVT_END_IF EVT_IF_NE(LVar0, 0) EVT_CALL(UseIdleAnimation, ACTOR_ENEMY1, FALSE) EVT_CALL(EnableIdleScript, ACTOR_ENEMY1, 0) - EVT_CALL(ActorSpeak, 721103, 513, 1, 6422539, 6422539) + EVT_CALL(ActorSpeak, MSG_CH0_00CF, ACTOR_ENEMY1, 1, 0x0062000B, 0x0062000B) EVT_CALL(EnableIdleScript, ACTOR_ENEMY1, 1) EVT_CALL(UseIdleAnimation, ACTOR_ENEMY1, TRUE) EVT_END_IF - EVT_CALL(ActorExists, 514, LVar0) + EVT_CALL(ActorExists, ACTOR_ENEMY2, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(GetActorHP, 514, LVar0) + EVT_CALL(GetActorHP, ACTOR_ENEMY2, LVar0) EVT_END_IF EVT_IF_NE(LVar0, 0) EVT_CALL(UseIdleAnimation, ACTOR_ENEMY2, FALSE) EVT_CALL(EnableIdleScript, ACTOR_ENEMY2, 0) - EVT_CALL(ActorSpeak, 721104, 514, 1, 6422795, 6422795) + EVT_CALL(ActorSpeak, MSG_CH0_00D0, ACTOR_ENEMY2, 1, 0x0062010B, 0x0062010B) EVT_CALL(EnableIdleScript, ACTOR_ENEMY2, 1) EVT_CALL(UseIdleAnimation, ACTOR_ENEMY2, TRUE) EVT_END_IF - EVT_CALL(RemoveActor, -127) + EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN EVT_END }; diff --git a/src/battle/area/kmr_part_2/actor/goomnut_tree.c b/src/battle/area/kmr_part_2/actor/goomnut_tree.c index 8858e208df..6dc3de210f 100644 --- a/src/battle/area/kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area/kmr_part_2/actor/goomnut_tree.c @@ -118,7 +118,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 255, .partCount = ARRAY_COUNT(N(partsTable_8022339C)), .partsData = N(partsTable_8022339C), - .takeTurnScript = &N(init_80223488), + .initScript = &N(init_80223488), .statusTable = N(statusTable_802232F0), .escapeChance = 0, .airLiftChance = 0, @@ -144,21 +144,21 @@ EvtScript N(init_80223488) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80223804))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80223678))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80223688))) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) - EVT_CALL(SetActorVar, -127, 2, 0) - EVT_CALL(SetActorVar, -127, 3, 0) - EVT_CALL(SetActorVar, -127, 4, 0) - EVT_CALL(SetActorVar, -127, 5, 0) - EVT_CALL(SetActorVar, -127, 6, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 5, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 6, 1) EVT_CALL(SetPartPos, ACTOR_SELF, 2, 10, 140, 10) EVT_CALL(SetPartPos, ACTOR_SELF, 3, -95, 140, 10) EVT_CALL(SetPartPos, ACTOR_SELF, 4, -115, 130, 0) EVT_CALL(SetPartPos, ACTOR_SELF, 5, -65, 118, 5) - EVT_CALL(SetPartScale, -127, 3, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) - EVT_CALL(SetPartScale, -127, 4, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) - EVT_CALL(SetPartScale, -127, 5, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) - EVT_CALL(SetPartTargetFlagBits, -127, 1, 4, 1) + EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 4, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 5, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) + EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 1, 4, TRUE) EVT_RETURN EVT_END }; @@ -297,7 +297,7 @@ EvtScript N(EVS_ShakeTree) = { EVT_BUF_READ1(LVar5) EVT_LOOP(LVar5) EVT_BUF_READ3(LVar6, LVar7, LVar8) - EVT_CALL(PlayEffect, 0x14, 0, LVar6, LVar7, LVar8, 100, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, LVar6, LVar7, LVar8, 100, 0) EVT_END_LOOP EVT_END_IF EVT_END_THREAD @@ -331,60 +331,60 @@ EvtScript N(shake_goomnut_tree) = { }; EvtScript N(80223DBC) = { - EVT_CALL(PlayEffect, 0x14, 0, -25, 120, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(GetActorVar, -127, 5, LVar0) + EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -25, 120, 0, 90, 0) + EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar0) EVT_IF_NE(LVar0, 0) EVT_RETURN EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_15) EVT_CALL(BattleCamTargetActor, ACTOR_ENEMY0) EVT_WAIT(20) - EVT_CALL(SetActorVar, -127, 5, 1) - EVT_CALL(ActorExists, 512, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 5, 1) + EVT_CALL(ActorExists, ACTOR_ENEMY0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, 10, 0, 10) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 0) - EVT_CALL(PlaySoundAtPart, -127, 2, 769) - EVT_CALL(SetPartJumpGravity, -127, 2, EVT_FLOAT(0.8)) - EVT_CALL(SetPartMoveSpeed, -127, 2, EVT_FLOAT(4.0)) - EVT_CALL(FallPartTo, -127, 2, 10, 20, 10, 20) - EVT_CALL(JumpPartTo, -127, 2, 30, 20, 10, 10, 1) - EVT_CALL(JumpPartTo, -127, 2, 40, 20, 10, 5, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, FALSE) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 2, SOUND_301) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.8)) + EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(4.0)) + EVT_CALL(FallPartTo, ACTOR_SELF, 2, 10, 20, 10, 20) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, 30, 20, 10, 10, TRUE) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, 40, 20, 10, 5, TRUE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, TRUE) EVT_WAIT(1) EVT_END_LOOP EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAtPart, -127, 2, 769) - EVT_CALL(SetPartJumpGravity, -127, 2, EVT_FLOAT(0.8)) - EVT_CALL(SetPartMoveSpeed, -127, 2, EVT_FLOAT(4.0)) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 2, SOUND_301) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.8)) + EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(4.0)) EVT_CALL(GetStatusFlags, ACTOR_ENEMY0, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x80000) - EVT_CALL(FallPartTo, -127, 2, 10, 80, 10, 10) + EVT_CALL(FallPartTo, ACTOR_SELF, 2, 10, 80, 10, 10) EVT_ELSE - EVT_CALL(FallPartTo, -127, 2, 10, 32, 10, 10) + EVT_CALL(FallPartTo, ACTOR_SELF, 2, 10, 32, 10, 10) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(SetOwnerTarget, 512, 2) + EVT_CALL(SetOwnerTarget, ACTOR_ENEMY0, 2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((DAMAGE_TYPE_IGNORE_DEFENSE)), 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(ActorExists, 513, LVar0) + EVT_CALL(ActorExists, ACTOR_ENEMY1, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(GetPartOffset, -127, 2, LVar0, LVar1, LVar2) + EVT_CALL(GetPartOffset, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 65) EVT_SET(LVar1, 20) - EVT_CALL(SetPartJumpGravity, -127, 2, EVT_FLOAT(0.7)) - EVT_CALL(JumpPartTo, -127, 2, LVar0, LVar1, LVar2, 20, 1) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.7)) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 20, TRUE) EVT_ADD(LVar0, 12) - EVT_CALL(JumpPartTo, -127, 2, LVar0, LVar1, LVar2, 8, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 8, TRUE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, TRUE) EVT_WAIT(1) EVT_END_LOOP EVT_RETURN @@ -396,24 +396,24 @@ EvtScript N(80223DBC) = { EVT_ELSE EVT_ADD(LVar1, 20) EVT_END_IF - EVT_CALL(SetPartJumpGravity, -127, 2, EVT_FLOAT(0.7)) - EVT_CALL(JumpPartTo, -127, 2, LVar0, LVar1, LVar2, 20, 1) - EVT_CALL(SetOwnerTarget, 513, 1) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.7)) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 20, TRUE) + EVT_CALL(SetOwnerTarget, ACTOR_ENEMY1, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((DAMAGE_TYPE_IGNORE_DEFENSE)), 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(ActorExists, 514, LVar0) + EVT_CALL(ActorExists, ACTOR_ENEMY2, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(GetPartOffset, -127, 2, LVar0, LVar1, LVar2) + EVT_CALL(GetPartOffset, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 35) EVT_SET(LVar1, 20) - EVT_CALL(SetPartJumpGravity, -127, 2, EVT_FLOAT(0.7)) - EVT_CALL(JumpPartTo, -127, 2, LVar0, LVar1, LVar2, 20, 1) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.7)) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 20, TRUE) EVT_ADD(LVar0, 12) - EVT_CALL(JumpPartTo, -127, 2, LVar0, LVar1, LVar2, 8, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 8, TRUE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, TRUE) EVT_WAIT(1) EVT_END_LOOP EVT_RETURN @@ -425,22 +425,22 @@ EvtScript N(80223DBC) = { EVT_ELSE EVT_ADD(LVar1, 20) EVT_END_IF - EVT_CALL(SetPartJumpGravity, -127, 2, EVT_FLOAT(0.7)) - EVT_CALL(JumpPartTo, -127, 2, LVar0, LVar1, LVar2, 20, 1) - EVT_CALL(SetOwnerTarget, 514, 1) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.7)) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 20, TRUE) + EVT_CALL(SetOwnerTarget, ACTOR_ENEMY2, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((DAMAGE_TYPE_IGNORE_DEFENSE)), 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(GetPartOffset, -127, 2, LVar0, LVar1, LVar2) + EVT_CALL(GetPartOffset, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) EVT_SET(LVar1, 20) - EVT_CALL(SetPartJumpGravity, -127, 2, EVT_FLOAT(0.7)) - EVT_CALL(JumpPartTo, -127, 2, LVar0, LVar1, LVar2, 20, 1) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.7)) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 20, TRUE) EVT_ADD(LVar0, 12) - EVT_CALL(JumpPartTo, -127, 2, LVar0, LVar1, LVar2, 8, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 8, TRUE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, TRUE) EVT_WAIT(1) EVT_END_LOOP EVT_RETURN diff --git a/src/battle/area/kmr_part_2/actor/red_goomba.c b/src/battle/area/kmr_part_2/actor/red_goomba.c index 6fd3f374a0..615a098d24 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba.c @@ -65,7 +65,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(partsTable_8021B778)), .partsData = N(partsTable_8021B778), - .takeTurnScript = &N(init_8021D078), + .initScript = &N(init_8021D078), .statusTable = N(statusTable_8021B6CC), .escapeChance = 0, .airLiftChance = 0, @@ -133,7 +133,7 @@ EvtScript N(idle_8021B8A8) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021B810))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleRunToGoal, -127, 0) + EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021B7C4))) EVT_LOOP(20) EVT_LABEL(1) @@ -149,7 +149,7 @@ EvtScript N(idle_8021B8A8) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021B810))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleRunToGoal, -127, 0) + EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021B7C4))) EVT_LOOP(80) EVT_LABEL(2) @@ -372,7 +372,7 @@ EvtScript N(takeTurn_8021C3B0) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -458,8 +458,8 @@ EvtScript N(takeTurn_8021C3B0) = { EvtScript N(init_8021D078) = { EVT_EXEC_WAIT(N(init_8021B85C)) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_RETURN EVT_END }; @@ -477,21 +477,21 @@ EvtScript N(doDeath_8021D0C4) = { EVT_END_LOOP EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(PlayEffect, 0x1, LVar2, LVar3, LVar4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar2, LVar3, LVar4, 0, 0, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) - EVT_CALL(DropStarPoints, -127) + EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_SET(LVar3, 0) EVT_LOOP(12) EVT_CALL(SetActorRotation, ACTOR_SELF, LVar3, 0, 0) EVT_ADD(LVar3, 8) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, -127, 0, 1, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 0, 1, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4, TRUE) EVT_WAIT(30) - EVT_CALL(ActorExists, 512, LVar0) + EVT_CALL(ActorExists, ACTOR_ENEMY0, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(GetActorHP, 512, LVar0) + EVT_CALL(GetActorHP, ACTOR_ENEMY0, LVar0) EVT_END_IF EVT_IF_NE(LVar0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) @@ -501,14 +501,14 @@ EvtScript N(doDeath_8021D0C4) = { EVT_CALL(UseIdleAnimation, ACTOR_ENEMY0, FALSE) EVT_CALL(EnableIdleScript, ACTOR_ENEMY0, 0) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GoombaBros_Blue_CryTalk) - EVT_CALL(ActorSpeak, 721088, 512, 1, -1, -1) + EVT_CALL(ActorSpeak, MSG_CH0_00C0, ACTOR_ENEMY0, 1, -1, -1) EVT_CALL(EnableIdleScript, ACTOR_ENEMY0, 1) EVT_CALL(UseIdleAnimation, ACTOR_ENEMY0, TRUE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) EVT_END_IF - EVT_CALL(RemoveActor, -127) + EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN EVT_END }; diff --git a/src/battle/area/kmr_part_2/actor/red_goomba2.c b/src/battle/area/kmr_part_2/actor/red_goomba2.c index 31aa215546..2bd03c2473 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba2.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba2.c @@ -63,7 +63,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(partsTable_8021EEB8)), .partsData = N(partsTable_8021EEB8), - .takeTurnScript = &N(init_802207B8), + .initScript = &N(init_802207B8), .statusTable = N(statusTable_8021EE0C), .escapeChance = 0, .airLiftChance = 0, @@ -131,7 +131,7 @@ EvtScript N(idle_8021EFE8) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021EF50))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleRunToGoal, -127, 0) + EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021EF04))) EVT_LOOP(20) EVT_LABEL(1) @@ -147,7 +147,7 @@ EvtScript N(idle_8021EFE8) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021EF50))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleRunToGoal, -127, 0) + EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021EF04))) EVT_LOOP(80) EVT_LABEL(2) @@ -370,7 +370,7 @@ EvtScript N(takeTurn_8021FAF0) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -458,7 +458,7 @@ EvtScript N(takeTurn_8021FAF0) = { EvtScript N(init_802207B8) = { EVT_EXEC_WAIT(N(init_8021EF9C)) - EVT_CALL(SetEnemyHP, -127, 2) + EVT_CALL(SetEnemyHP, ACTOR_SELF, 2) EVT_CALL(N(DivActorLevel4)) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_2/stage/kmr_02.c b/src/battle/area/kmr_part_2/stage/kmr_02.c index 893d51627e..91129eca2c 100644 --- a/src/battle/area/kmr_part_2/stage/kmr_02.c +++ b/src/battle/area/kmr_part_2/stage/kmr_02.c @@ -3,21 +3,4 @@ #define NAMESPACE b_area_kmr_part_2_kmr_02 -EvtScript N(beforeBattle_80224700) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80224720) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "kmr_tex", - .shape = "kmr_bt02_shape", - .bg = "kmr_bg", - .preBattle = &N(beforeBattle_80224700), - .postBattle = &N(afterBattle_80224720), -}; +#include "battle/common/stage/kmr_02.inc.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 index 6f70c49a6d..dbd179fee8 100644 --- a/src/battle/area/kmr_part_2/stage/kmr_03.c +++ b/src/battle/area/kmr_part_2/stage/kmr_03.c @@ -3,35 +3,4 @@ #define NAMESPACE b_area_kmr_part_2_kmr_03 -#include "world/common/todo/clouds.inc.c" - -EvtScript N(beforeBattle_80224AE8) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SET(LVar0, 1) - EVT_SET(LVar2, 0) - EVT_EXEC(N(clouds1)) - EVT_SET(LVar0, 4) - EVT_SET(LVar2, 70) - EVT_EXEC(N(clouds1)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80224B60) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80224B70)[] = { - 0x00000027, 0x0000002B, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "kmr_tex", - .shape = "kmr_bt03_shape", - .hit = "kmr_bt03_hit", - .bg = "kmr_bg", - .preBattle = &N(beforeBattle_80224AE8), - .postBattle = &N(afterBattle_80224B60), - .foregroundModelList = N(foregroundModelList_80224B70), -}; +#include "battle/common/stage/kmr_03.inc.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 index 43490db2bd..a11a9cde13 100644 --- a/src/battle/area/kmr_part_2/stage/kmr_04.c +++ b/src/battle/area/kmr_part_2/stage/kmr_04.c @@ -3,35 +3,4 @@ #define NAMESPACE b_area_kmr_part_2_kmr_04 -#include "world/common/todo/clouds.inc.c" - -EvtScript N(beforeBattle_80224F38) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SET(LVar0, 1) - EVT_SET(LVar2, 0) - EVT_EXEC(N(clouds1)) - EVT_SET(LVar0, 4) - EVT_SET(LVar2, 70) - EVT_EXEC(N(clouds1)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80224FB0) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80224FC0)[] = { - 0x00000024, 0x00000020, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "kmr_tex", - .shape = "kmr_bt04_shape", - .hit = "kmr_bt04_hit", - .bg = "kmr_bg", - .preBattle = &N(beforeBattle_80224F38), - .postBattle = &N(afterBattle_80224FB0), - .foregroundModelList = N(foregroundModelList_80224FC0), -}; +#include "battle/common/stage/kmr_04.inc.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 index 0596ea7ea7..e611768d44 100644 --- a/src/battle/area/kmr_part_2/stage/kmr_05.c +++ b/src/battle/area/kmr_part_2/stage/kmr_05.c @@ -3,30 +3,4 @@ #define NAMESPACE b_area_kmr_part_2_kmr_05 -#include "world/common/todo/clouds.inc.c" - -EvtScript N(beforeBattle_80225388) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(EnableModel, 27, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_802253BC) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_802253CC)[] = { - 0x00000020, 0x00000024, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "kmr_tex", - .shape = "kmr_bt05_shape", - .hit = "kmr_bt05_hit", - .bg = "kmr_bg", - .preBattle = &N(beforeBattle_80225388), - .postBattle = &N(afterBattle_802253BC), - .foregroundModelList = N(foregroundModelList_802253CC), -}; +#include "battle/common/stage/kmr_05.inc.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 index 369474b74d..0929b16145 100644 --- a/src/battle/area/kmr_part_2/stage/kmr_06.c +++ b/src/battle/area/kmr_part_2/stage/kmr_06.c @@ -3,38 +3,4 @@ #define NAMESPACE b_area_kmr_part_2_kmr_06 -#include "world/common/todo/clouds.inc.c" - -#include "common/UnkFogFunc.inc.c" - -EvtScript N(beforeBattle_80225788) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(N(UnkFogFunc)) - EVT_SET(LVar0, 1) - EVT_SET(LVar2, 0) - EVT_EXEC(N(clouds1)) - EVT_SET(LVar0, 4) - EVT_SET(LVar2, 70) - EVT_EXEC(N(clouds1)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8022580C) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_8022581C)[] = { - 0x0000001D, 0x00000022, 0x00000021, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "kmr_tex", - .shape = "kmr_bt06_shape", - .hit = "kmr_bt06_hit", - .bg = "kmr_bg", - .preBattle = &N(beforeBattle_80225788), - .postBattle = &N(afterBattle_8022580C), - .foregroundModelList = N(foregroundModelList_8022581C), -}; +#include "battle/common/stage/kmr_06.inc.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 index 998cbfb452..04218215c9 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 @@ -87,7 +87,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 15, .partCount = ARRAY_COUNT(N(partsTable_802244C4)), .partsData = N(partsTable_802244C4), - .takeTurnScript = &N(init_80224A94), + .initScript = &N(init_80224A94), .statusTable = N(statusTable_80224418), .escapeChance = 0, .airLiftChance = 0, @@ -169,9 +169,9 @@ EvtScript N(80224658) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) - EVT_CALL(PlayEffect, 0x1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_CALL(PlaySound, SOUND_DEATH) - EVT_CALL(DropStarPoints, -127) + EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(SetBattleCamZoom, 260) @@ -179,12 +179,12 @@ EvtScript N(80224658) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) - EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, 0x210027) + EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Collapse) EVT_WAIT(12) - EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, 0x210014) + EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Defeated) EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVarA, EVT_PTR(N(idleAnimations_8022464C))) EVT_WAIT(60) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4194304, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00400000, TRUE) EVT_RETURN EVT_END }; @@ -195,8 +195,8 @@ EvtScript N(80224964) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 5) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, -4, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, 4, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, -4, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, 4, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_EnterEgg) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802243F8))) EVT_WAIT(10) @@ -213,9 +213,9 @@ EvtScript N(init_80224A94) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80225314))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80224B24))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80224B58))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_80225B4C))) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_80225B4C))) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_RETURN EVT_END }; @@ -305,7 +305,7 @@ EvtScript N(handleEvent_80224B58) = { EVT_SET_CONST(LVar1, ANIM_JrTroopa_Hurt) EVT_EXEC_WAIT(DoJumpBack) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetHomePos, -127, LVar0, LVar1, LVar2) + EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_JrTroopa_Panic) EVT_EXEC_WAIT(N(80224658)) @@ -335,16 +335,16 @@ EvtScript N(handleEvent_80224B58) = { }; EvtScript N(802250E4) = { - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(GetLastDamage, -127, LVar1) + EVT_CALL(GetLastDamage, ACTOR_SELF, LVar1) EVT_CALL(GetBattleFlags, LVar2) EVT_IF_NOT_FLAG(LVar2, BS_FLAGS1_PARTNER_ACTING) EVT_IF_NE(LVar1, 0) - EVT_CALL(SetActorVar, -127, 1, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x351000) - EVT_CALL(FreezeBattleCam, 1) + EVT_CALL(FreezeBattleCam, TRUE) EVT_END_IF EVT_END_IF EVT_END_IF @@ -354,24 +354,24 @@ EvtScript N(802250E4) = { }; EvtScript N(802251CC) = { - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x351000) - EVT_CALL(SetActorVar, -127, 1, 2) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) EVT_EXEC_WAIT(N(80224510)) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) - EVT_CALL(ActorSpeak, 786730, -127, 1, 2162717, 2162717) + EVT_CALL(ActorSpeak, MSG_CH1_012A, ACTOR_SELF, 1, 0x0021001D, 0x0021001D) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_PointTalk) - EVT_CALL(EndActorSpeech, -127, 1, -1, -1) + EVT_CALL(EndActorSpeech, ACTOR_SELF, 1, -1, -1) EVT_EXEC_WAIT(N(80224964)) EVT_EXEC_WAIT(N(802245A8)) EVT_ELSE - EVT_CALL(SetActorVar, -127, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_END_IF EVT_END_IF - EVT_CALL(FreezeBattleCam, 0) + EVT_CALL(FreezeBattleCam, FALSE) EVT_RETURN EVT_END }; @@ -432,7 +432,7 @@ EvtScript N(takeTurn_80225314) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 25) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_ChargeArmsUp) @@ -493,23 +493,23 @@ EvtScript N(nextTurn_80225B4C) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetActorVar, -127, 0, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_WAIT(15) EVT_EXEC_WAIT(N(80224510)) EVT_WAIT(10) - EVT_CALL(ActorSpeak, 786728, -127, 1, 2162714, 2162715) + EVT_CALL(ActorSpeak, MSG_CH1_0128, ACTOR_SELF, 1, 0x0021001A, 0x0021001B) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_ChargeArmsUp) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B9) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 16) - EVT_CALL(PlayEffect, 0x13, 0, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x13, 1, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 30, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar1, LVar2, 1, 30, 0) EVT_WAIT(30) EVT_EXEC_WAIT(N(80224964)) EVT_WAIT(30) - EVT_CALL(ActorSpeak, 786729, -127, 1, 2162711, 2162692) + EVT_CALL(ActorSpeak, MSG_CH1_0129, ACTOR_SELF, 1, 0x00210017, 0x00210004) EVT_WAIT(10) EVT_EXEC_WAIT(N(802245A8)) EVT_ELSE 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 index 574694a93f..26620a5563 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 @@ -182,7 +182,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 60, .partCount = ARRAY_COUNT(N(partsTable_8022C640)), .partsData = N(partsTable_8022C640), - .takeTurnScript = &N(init_8022CF80), + .initScript = &N(init_8022CF80), .statusTable = N(statusTable_8022C43C), .escapeChance = 0, .airLiftChance = 0, @@ -207,11 +207,11 @@ EvtScript N(8022C6D4) = { EVT_IF_FLAG(LVar2, BS_FLAGS1_PARTNER_ACTING) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar2, MOVE_SPOOK) - EVT_CALL(SetActorVar, -127, 1, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) - EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) + EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) EVT_WAIT(30) EVT_END_IF EVT_END_IF @@ -228,8 +228,8 @@ EvtScript N(8022C804) = { EVT_ELSE EVT_ADD(LVar1, 6) EVT_END_IF - EVT_CALL(PlayEffect, 0x13, 0, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x13, 1, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 30, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar1, LVar2, 1, 30, 0) EVT_THREAD EVT_SET(LVar0, 0) EVT_LOOP(32) @@ -242,11 +242,11 @@ EvtScript N(8022C804) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_300) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) - EVT_CALL(PlayEffect, 0x52, 4, LVar0, LVar1, LVar2, 1, 40, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, -4, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, -4, 4, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, 4, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, 4, 4, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, -4, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, -4, 4, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, 4, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, 4, 4, 0) EVT_RETURN EVT_END }; @@ -317,9 +317,9 @@ EvtScript N(8022CC74) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) - EVT_CALL(PlayEffect, 0x1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_CALL(PlaySound, SOUND_DEATH) - EVT_CALL(DropStarPoints, -127) + EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(SetBattleCamZoom, 260) @@ -327,12 +327,12 @@ EvtScript N(8022CC74) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) - EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, 0x210027) + EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Collapse) EVT_WAIT(12) - EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, 0x210014) + EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Defeated) EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVarA, EVT_PTR(N(idleAnimations_8022CC68))) EVT_WAIT(60) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_RETURN EVT_END }; @@ -343,32 +343,32 @@ extern EvtScript N(handleEvent_8022D1C4); extern EvtScript N(nextTurn_8023147C); EvtScript N(init_8022CF80) = { - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 2, 0) - EVT_CALL(SetActorVar, -127, 1, 0) - EVT_CALL(SetActorVar, -127, 3, 1) - EVT_CALL(SetActorVar, -127, 4, 5) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 5) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8022D920))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8022D058))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8022D1C4))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_8023147C))) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8023147C))) EVT_RETURN EVT_END }; EvtScript N(idle_8022D058) = { EVT_LABEL(0) - EVT_CALL(GetActorVar, -127, 3, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, 0x41000) - EVT_CALL(SetTargetOffset, -127, 2, -15, 28) - EVT_CALL(SetProjectileTargetOffset, -127, 2, 4, -6) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, -15, 28) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, 4, -6) EVT_CALL(N(UnkBattleFunc1), -25, 27, -1, 27) EVT_ELSE - EVT_CALL(SetTargetOffset, -127, 2, -8, 33) - EVT_CALL(SetProjectileTargetOffset, -127, 2, 0, -6) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, -8, 33) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 2, 0, -6) EVT_CALL(N(UnkBattleFunc1), -22, 30, 2, 28) EVT_END_IF EVT_CASE_DEFAULT @@ -429,8 +429,8 @@ EvtScript N(handleEvent_8022D1C4) = { EVT_EXEC_WAIT(N(802318F8)) EVT_RETURN EVT_CASE_EQ(47) - EVT_CALL(SetPartRotation, -127, 2, 0, 0, 0) - EVT_CALL(SetPartRotationOffset, -127, 2, 0, 0, 0) + EVT_CALL(SetPartRotation, ACTOR_SELF, 2, 0, 0, 0) + EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 2, 0, 0, 0) EVT_SET(LVar1, 0) EVT_EXEC_WAIT(N(802315F0)) EVT_EXEC_WAIT(DoShockHit) @@ -439,8 +439,8 @@ EvtScript N(handleEvent_8022D1C4) = { EVT_EXEC_WAIT(DoJumpBack) EVT_EXEC_WAIT(N(80232040)) EVT_CASE_EQ(38) - EVT_CALL(SetPartRotation, -127, 2, 0, 0, 0) - EVT_CALL(SetPartRotationOffset, -127, 2, 0, 0, 0) + EVT_CALL(SetPartRotation, ACTOR_SELF, 2, 0, 0, 0) + EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 2, 0, 0, 0) EVT_SET(LVar1, 0) EVT_EXEC_WAIT(N(802315F0)) EVT_EXEC_WAIT(DoShockHit) @@ -474,7 +474,7 @@ EvtScript N(handleEvent_8022D1C4) = { EVT_ADD(LVar0, -4) EVT_ADD(LVar1, 37) EVT_END_SWITCH - EVT_CALL(PlayEffect, 0x1A, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_CASE_EQ(58) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) @@ -495,7 +495,7 @@ EvtScript N(handleEvent_8022D1C4) = { EVT_SET(LVar1, 3) EVT_EXEC_WAIT(N(802315F0)) EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1) - EVT_CALL(ActorSpeak, 1900955, -127, LVar0, -1, -1) + EVT_CALL(ActorSpeak, MSG_Menus_019B, ACTOR_SELF, LVar0, -1, -1) EVT_EXEC_WAIT(N(8022CBC4)) EVT_END_IF EVT_CASE_EQ(42) @@ -527,10 +527,10 @@ extern EvtScript N(8023106C); extern EvtScript N(8022E198); EvtScript N(takeTurn_8022D920) = { - EVT_CALL(GetActorVar, -127, 3, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_IF_NE(LVar0, 3) - EVT_CALL(GetActorHP, -127, LVar1) - EVT_CALL(GetEnemyMaxHP, -127, LVar2) + EVT_CALL(GetActorHP, ACTOR_SELF, LVar1) + EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar2) EVT_MUL(LVar1, 100) EVT_DIV(LVar1, LVar2) EVT_IF_EQ(LVar0, 1) @@ -543,16 +543,16 @@ EvtScript N(takeTurn_8022D920) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(GetActorHP, -127, LVar0) + EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_IF_LT(LVar0, 15) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x2) EVT_BITWISE_OR_CONST(LVar0, 0x2) - EVT_CALL(SetActorVar, -127, 2, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(GetActorVar, -127, 3, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(2) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_Talk) @@ -561,10 +561,10 @@ EvtScript N(takeTurn_8022D920) = { EVT_CASE_DEFAULT EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Talk) EVT_END_SWITCH - EVT_CALL(ActorSpeak, 1245280, -127, 1, -1, -1) + EVT_CALL(ActorSpeak, MSG_CH8_0060, ACTOR_SELF, 1, -1, -1) EVT_END_IF EVT_END_IF - EVT_CALL(GetActorVar, -127, 3, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(2) EVT_CALL(RandInt, 100, LVar0) @@ -581,13 +581,13 @@ EvtScript N(takeTurn_8022D920) = { EVT_CASE_LT(80) EVT_EXEC_WAIT(N(80230794)) EVT_CASE_DEFAULT - EVT_CALL(GetActorHP, -127, LVar0) - EVT_CALL(GetEnemyMaxHP, -127, LVar1) + EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) + EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) EVT_IF_NE(LVar0, LVar1) - EVT_CALL(GetActorVar, -127, 4, LVar2) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar2) EVT_IF_GT(LVar2, 0) EVT_SUB(LVar2, 1) - EVT_CALL(SetActorVar, -127, 4, LVar2) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, LVar2) EVT_EXEC_WAIT(N(8023106C)) EVT_ELSE EVT_EXEC_WAIT(N(80230034)) @@ -609,24 +609,24 @@ EvtScript N(8022DD48) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(ActorSpeak, 1245278, -127, 1, 2162712, 2162712) + EVT_CALL(ActorSpeak, MSG_CH8_005E, ACTOR_SELF, 1, 0x00210018, 0x00210018) EVT_EXEC_WAIT(N(8022C804)) - EVT_CALL(SetPartFlagBits, -127, 1, 131073, 1) - EVT_CALL(SetPartFlagBits, -127, 1, 8388608, 0) - EVT_CALL(SetPartFlagBits, -127, 2, 131073, 0) - EVT_CALL(SetPartFlagBits, -127, 2, 8388608, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 0x00020001, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 0x00800000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 0x00020001, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 0x00800000, TRUE) EVT_WAIT(10) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 20, 60, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_LINEAR) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetActorVar, -127, 3, 2) - EVT_CALL(SetStatusTable, -127, EVT_PTR(N(statusTable_8022C4E8))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 2) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8022C4E8))) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE) EVT_RETURN EVT_END }; @@ -637,27 +637,27 @@ EvtScript N(8022DF54) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(ActorSpeak, 1245279, -127, 2, 2293775, 2293775) + EVT_CALL(ActorSpeak, MSG_CH8_005F, ACTOR_SELF, 2, 0x0023000F, 0x0023000F) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 120) EVT_EXEC_WAIT(N(8022C804)) - EVT_CALL(SetPartFlagBits, -127, 2, 131073, 1) - EVT_CALL(SetPartFlagBits, -127, 2, 8388608, 0) - EVT_CALL(SetPartFlagBits, -127, 3, 131073, 0) - EVT_CALL(SetPartFlagBits, -127, 3, 8388608, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 0x00020001, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 0x00800000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 0x00020001, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 0x00800000, TRUE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FallToGoal, -127, 10) + EVT_CALL(FallToGoal, ACTOR_SELF, 10) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetActorVar, -127, 3, 3) - EVT_CALL(SetStatusTable, -127, EVT_PTR(N(statusTable_8022C594))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 3) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8022C594))) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_RETURN EVT_END }; @@ -701,13 +701,13 @@ EvtScript N(8022E198) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 16, 0, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, 16, 0, EASING_CUBIC_OUT) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_ChargeArmsUp) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) @@ -725,7 +725,7 @@ EvtScript N(8022E198) = { EVT_ADD(LVar0, 50) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, -127, 2, 8418, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E2, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Jump) EVT_WAIT(2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Midair) @@ -766,7 +766,7 @@ EvtScript N(8022E198) = { EVT_ADD(LVar0, 50) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, -127, 2, 8418, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E2, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Jump) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -819,7 +819,7 @@ EvtScript N(8022ED10) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 6, BS_FLAGS1_10) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(6) @@ -828,14 +828,14 @@ EvtScript N(8022ED10) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(SetActorSounds, -127, 2, 8416, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_FlyFast) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetActorSounds, -127, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) @@ -843,7 +843,7 @@ EvtScript N(8022ED10) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -853,10 +853,10 @@ EvtScript N(8022ED10) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_FlyFast) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -868,19 +868,19 @@ EvtScript N(8022ED10) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(SetActorSounds, -127, 2, 8416, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_FlyFast) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetActorSounds, -127, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 8, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -888,14 +888,14 @@ EvtScript N(8022ED10) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_FlyFast) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(10) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(YieldTurn) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_FlyFast) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_Idle) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -921,7 +921,7 @@ EvtScript N(8022F468) = { EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, -127, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 6, BS_FLAGS1_10) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(6) @@ -941,7 +941,7 @@ EvtScript N(8022F468) = { EVT_LOOP(20) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) EVT_CALL(N(CalculateArcsinDeg), LVar1, LVar2, LVar4, LVar5, LVar0) - EVT_CALL(SetPartRotation, -127, 2, 0, 0, LVar0) + EVT_CALL(SetPartRotation, ACTOR_SELF, 2, 0, 0, LVar0) EVT_SET(LVar1, LVar4) EVT_SET(LVar2, LVar5) EVT_SET(LVar3, LVar6) @@ -964,23 +964,23 @@ EvtScript N(8022F468) = { EVT_CALL(N(CalculateArcsinDeg), LVar1, LVar2, LVar4, LVar5, LVar0) EVT_SET(LVar7, LVar0) EVT_ADD(LVar7, 180) - EVT_CALL(SetPartRotation, -127, 2, 0, 0, LVar7) + EVT_CALL(SetPartRotation, ACTOR_SELF, 2, 0, 0, LVar7) EVT_SET(LVar1, LVar4) EVT_SET(LVar2, LVar5) EVT_SET(LVar3, LVar6) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartRotation, -127, 2, 0, 0, 0) - EVT_CALL(SetPartRotationOffset, -127, 2, 0, 0, 0) + EVT_CALL(SetPartRotation, ACTOR_SELF, 2, 0, 0, 0) + EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 2, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_OPEN_SHELL) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_ExitEgg) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_FlyFast) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 2, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -989,7 +989,7 @@ EvtScript N(8022F468) = { EVT_END_CASE_GROUP EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(SetPartRotationOffset, -127, 2, 0, 12, 0) + EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 2, 0, 12, 0) EVT_THREAD EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) @@ -1001,7 +1001,7 @@ EvtScript N(8022F468) = { EVT_LOOP(20) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) EVT_CALL(N(CalculateArcsinDeg), LVar1, LVar2, LVar4, LVar5, LVar0) - EVT_CALL(SetPartRotation, -127, 2, 0, 0, LVar0) + EVT_CALL(SetPartRotation, ACTOR_SELF, 2, 0, 0, LVar0) EVT_SET(LVar1, LVar4) EVT_SET(LVar2, LVar5) EVT_SET(LVar3, LVar6) @@ -1024,21 +1024,21 @@ EvtScript N(8022F468) = { EVT_CALL(N(CalculateArcsinDeg), LVar1, LVar2, LVar4, LVar5, LVar0) EVT_SET(LVar7, LVar0) EVT_ADD(LVar7, 180) - EVT_CALL(SetPartRotation, -127, 2, 0, 0, LVar7) + EVT_CALL(SetPartRotation, ACTOR_SELF, 2, 0, 0, LVar7) EVT_SET(LVar1, LVar4) EVT_SET(LVar2, LVar5) EVT_SET(LVar3, LVar6) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartRotation, -127, 2, 0, 0, 0) - EVT_CALL(SetPartRotationOffset, -127, 2, 0, 0, 0) + EVT_CALL(SetPartRotation, ACTOR_SELF, 2, 0, 0, 0) + EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 2, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_OPEN_SHELL) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_ExitEgg) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpikedParaJrTroopa_FlyFast) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -1070,7 +1070,7 @@ EvtScript N(80230034) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, LVar3) EVT_ADD(LVar1, LVar4) - EVT_CALL(PlayEffect, 0x13, 0, LVar0, LVar1, LVar2, LVar5, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, LVar5, 30, 0) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_MageJrTroopa_SwingStaff) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_10) @@ -1093,7 +1093,7 @@ EvtScript N(80230034) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, LVar6) EVT_ADD(LVar1, LVar7) - EVT_CALL(PlayEffect, 0x12, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 30, 0) EVT_WAIT(35) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -1102,14 +1102,14 @@ EvtScript N(80230034) = { EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 12) - EVT_CALL(PlayEffect, 0x3E, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BLAST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 30, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_MageJrTroopa_BurnStaff) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_WAIT(40) EVT_SUB(LVar0, 7) EVT_ADD(LVar1, 14) EVT_ADD(LVar2, 4) - EVT_CALL(PlayEffect, 0x7, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2, 0, 0, 0) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_MageJrTroopa_Idle) EVT_END_THREAD @@ -1136,7 +1136,7 @@ EvtScript N(80230034) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, LVar6) EVT_ADD(LVar1, LVar7) - EVT_CALL(PlayEffect, 0x12, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 15, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 15, 0) EVT_WAIT(15) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT), 0, 0, 8, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -1173,14 +1173,14 @@ EvtScript N(80230794) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, LVar3) EVT_ADD(LVar1, LVar4) - EVT_CALL(PlayEffect, 0x13, 0, LVar0, LVar1, LVar2, LVar5, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, LVar5, 30, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 60) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_MageJrTroopa_SwingStaff) EVT_CALL(N(UnkBackgroundFunc3)) - EVT_CALL(MakeLerp, 0, 200, 60, 10) + EVT_CALL(MakeLerp, 0, 200, 60, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -1199,9 +1199,9 @@ EvtScript N(80230794) = { EVT_CASE_EQ(6) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, 0, LVar5) - EVT_CALL(PlayEffect, 0x5E, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_WAIT(20) - EVT_CALL(MakeLerp, 200, 0, 60, 0) + EVT_CALL(MakeLerp, 200, 0, 60, EASING_LINEAR) EVT_LABEL(2) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -1219,19 +1219,19 @@ EvtScript N(80230794) = { EVT_SUB(LVar0, LVar1) EVT_SET(LVar1, 200) EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) - EVT_CALL(PlayEffect, 0x5E, 0, LVar0, LVar1, LVar2, LVar3, 0, LVar5, EVT_FLOAT(1.0), 18, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, 0, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_THREAD EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 12) - EVT_CALL(PlayEffect, 0x3E, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BLAST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 30, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_MageJrTroopa_BurnStaff) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_WAIT(40) EVT_SUB(LVar0, 7) EVT_ADD(LVar1, 14) EVT_ADD(LVar2, 4) - EVT_CALL(PlayEffect, 0x7, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2, 0, 0, 0) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_MageJrTroopa_Idle) EVT_END_THREAD @@ -1239,7 +1239,7 @@ EvtScript N(80230794) = { EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_CALL(MakeLerp, 200, 0, 60, 0) + EVT_CALL(MakeLerp, 200, 0, 60, EASING_LINEAR) EVT_LABEL(2) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -1254,11 +1254,11 @@ EvtScript N(80230794) = { EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, 0, LVar5) - EVT_CALL(PlayEffect, 0x5E, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_WAIT(14) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT), 0, SUPPRESS_EVENT_FLAG_10000, 9, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(MakeLerp, 200, 0, 60, 0) + EVT_CALL(MakeLerp, 200, 0, 60, EASING_LINEAR) EVT_LABEL(2) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -1298,18 +1298,18 @@ EvtScript N(8023106C) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, LVar3) EVT_ADD(LVar1, LVar4) - EVT_CALL(PlayEffect, 0x13, 0, LVar0, LVar1, LVar2, LVar5, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, LVar5, 30, 0) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F8) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_ADD(LVar2, 50) - EVT_CALL(PlayEffect, 0x11, 1, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x40, 2, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar1, LVar2, LVar3, 10, 0) + EVT_PLAY_EFFECT(EFFECT_RECOVER, 2, LVar1, LVar2, LVar3, 0, 0) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_MageJrTroopa_Idle) EVT_WAIT(10) - EVT_CALL(GetEnemyMaxHP, -127, LVar0) + EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0) EVT_MUL(LVar0, 17) EVT_DIV(LVar0, 100) EVT_THREAD @@ -1321,7 +1321,7 @@ EvtScript N(8023106C) = { EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, -127, LVar0, 0) + EVT_CALL(HealActor, ACTOR_SELF, LVar0, FALSE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_WAIT(30) @@ -1337,14 +1337,14 @@ EvtScript N(nextTurn_8023147C) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x1) EVT_BITWISE_OR_CONST(LVar0, 0x1) - EVT_CALL(SetActorVar, -127, 2, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(ActorSpeak, 1245277, -127, 1, 2162714, 2162714) + EVT_CALL(ActorSpeak, MSG_CH8_005D, ACTOR_SELF, 1, 0x0021001A, 0x0021001A) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Idle) EVT_END_IF EVT_CASE_EQ(12) @@ -1358,7 +1358,7 @@ EvtScript N(nextTurn_8023147C) = { }; EvtScript N(802315F0) = { - EVT_CALL(GetActorVar, -127, 3, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) EVT_SWITCH(LVar0) @@ -1423,7 +1423,7 @@ EvtScript N(802315F0) = { }; EvtScript N(802318F8) = { - EVT_CALL(GetActorVar, -127, 3, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -1435,7 +1435,7 @@ EvtScript N(802318F8) = { EVT_CALL(func_8027D32C, -127) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2)) - EVT_CALL(FallToGoal, -127, 10) + EVT_CALL(FallToGoal, ACTOR_SELF, 10) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_CALL(HPBarToCurrent, ACTOR_SELF) @@ -1446,19 +1446,19 @@ EvtScript N(802318F8) = { EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) EVT_LOOP(3) - EVT_CALL(PlayEffect, 0x1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetPartFlagBits, -127, 2, 1, 1) - EVT_CALL(SetPartFlagBits, -127, 1, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_DefeatedBegin) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_WAIT(15) EVT_CALL(PlaySound, SOUND_DEATH) - EVT_CALL(DropStarPoints, -127) + EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(SetBattleCamZoom, 260) @@ -1468,7 +1468,7 @@ EvtScript N(802318F8) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Defeated) EVT_WAIT(60) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_RETURN EVT_CASE_EQ(3) EVT_CALL(func_8027D32C, -127) @@ -1499,19 +1499,19 @@ EvtScript N(802318F8) = { EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) EVT_LOOP(3) - EVT_CALL(PlayEffect, 0x1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetPartFlagBits, -127, 3, 1, 1) - EVT_CALL(SetPartFlagBits, -127, 1, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 1, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_DefeatedBegin) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_WAIT(15) EVT_CALL(PlaySound, SOUND_DEATH) - EVT_CALL(DropStarPoints, -127) + EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(SetBattleCamZoom, 260) @@ -1522,7 +1522,7 @@ EvtScript N(802318F8) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Defeated) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022C40C))) EVT_WAIT(60) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_RETURN EVT_CASE_DEFAULT EVT_SET(LVar1, 0) @@ -1536,7 +1536,7 @@ EvtScript N(802318F8) = { EvtScript N(80232040) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(GetActorVar, -127, 3, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(2) EVT_SET(LVar1, 4) @@ -1544,7 +1544,7 @@ EvtScript N(80232040) = { EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CASE_EQ(3) EVT_SET(LVar1, 4) EVT_EXEC_WAIT(N(802315F0)) @@ -1559,25 +1559,25 @@ EvtScript N(80232040) = { }; EvtScript N(80232170) = { - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 1) EVT_WAIT(10) EVT_EXEC_WAIT(N(8022CB2C)) - EVT_CALL(GetActorVar, -127, 3, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(2) - EVT_CALL(ActorSpeak, 1900954, -127, 2, 2293775, 2293763) + EVT_CALL(ActorSpeak, MSG_Menus_019A, ACTOR_SELF, 2, 0x0023000F, 0x00230003) EVT_CASE_EQ(3) - EVT_CALL(ActorSpeak, 1900954, -127, 3, 2359310, 2359299) + EVT_CALL(ActorSpeak, MSG_Menus_019A, ACTOR_SELF, 3, 0x0024000E, 0x00240003) EVT_CASE_DEFAULT - EVT_CALL(ActorSpeak, 1900954, -127, 1, 2162710, 2162691) + EVT_CALL(ActorSpeak, MSG_Menus_019A, ACTOR_SELF, 1, 0x00210016, 0x00210003) EVT_END_SWITCH - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_NE(LVar0, 1) EVT_EXEC_WAIT(N(8022CBC4)) EVT_END_IF EVT_END_IF - EVT_CALL(SetActorVar, -127, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_RETURN EVT_END }; diff --git a/src/battle/area/kmr_part_3/actor/jr_troopa.c b/src/battle/area/kmr_part_3/actor/jr_troopa.c index 79fdb44208..556bcf650b 100644 --- a/src/battle/area/kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/jr_troopa.c @@ -71,7 +71,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 5, .partCount = ARRAY_COUNT(N(partsTable_80222AE4)), .partsData = N(partsTable_80222AE4), - .takeTurnScript = &N(init_80223180), + .initScript = &N(init_80223180), .statusTable = N(statusTable_80222A38), .escapeChance = 0, .airLiftChance = 0, @@ -153,9 +153,9 @@ EvtScript N(80222C78) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) - EVT_CALL(PlayEffect, 0x1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_CALL(PlaySound, SOUND_DEATH) - EVT_CALL(DropStarPoints, -127) + EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(SetBattleCamZoom, 260) @@ -163,9 +163,9 @@ EvtScript N(80222C78) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) - EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, 0x210027) + EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Collapse) EVT_WAIT(12) - EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, 0x210014) + EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Defeated) EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVarA, EVT_PTR(N(idleAnimations_80222C6C))) EVT_WAIT(30) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) @@ -185,7 +185,7 @@ EvtScript N(80222C78) = { EVT_WAIT(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 180) EVT_WAIT(5) - EVT_CALL(ActorSpeak, 721076, 256, 0, 10289160, 10289153) + EVT_CALL(ActorSpeak, MSG_CH0_00B4, ACTOR_PARTNER, 0, 0x009D0008, 0x009D0001) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 150) EVT_WAIT(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 120) @@ -198,7 +198,7 @@ EvtScript N(80222C78) = { EVT_WAIT(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) EVT_WAIT(5) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4194304, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00400000, TRUE) EVT_RETURN EVT_END }; @@ -210,13 +210,13 @@ extern EvtScript N(nextTurn_80223D2C); EvtScript N(init_80223180) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_802234A4))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80223290))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_80223D2C))) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) - EVT_CALL(SetActorVar, -127, 2, 0) - EVT_CALL(SetActorVar, -127, 3, 0) - EVT_CALL(SetActorVar, -127, 4, 1) - EVT_CALL(SetActorVar, -127, 5, 0) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_80223D2C))) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 5, 0) EVT_RETURN EVT_END }; @@ -232,11 +232,11 @@ EvtScript N(8022325C) = { EvtScript N(handleEvent_80223290) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(GetLastDamage, -127, LVar1) + EVT_CALL(GetLastDamage, ACTOR_SELF, LVar1) EVT_IF_NE(LVar1, 0) - EVT_CALL(SetActorVar, -127, 2, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_END_IF EVT_END_IF EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) @@ -273,20 +273,20 @@ EvtScript N(handleEvent_80223290) = { EvtScript N(takeTurn_802234A4) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(AddActorVar, -127, 0, 1) - EVT_CALL(GetActorHP, -127, LVar0) - EVT_CALL(GetEnemyMaxHP, -127, LVar1) + EVT_CALL(AddActorVar, ACTOR_SELF, 0, 1) + EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) + EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) EVT_SUB(LVar1, LVar0) EVT_IF_EQ(LVar1, 3) - EVT_CALL(GetActorVar, -127, 5, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetActorVar, -127, 5, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 5, 1) EVT_EXEC_WAIT(N(80222B30)) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(20) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(ActorSpeak, 721073, -127, 1, 2162710, 2162691) + EVT_CALL(ActorSpeak, MSG_CH0_00B1, ACTOR_SELF, 1, 0x00210016, 0x00210003) EVT_END_IF EVT_END_IF EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -307,8 +307,8 @@ EvtScript N(takeTurn_802234A4) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Jump) - EVT_CALL(SetActorSounds, -127, 2, 8418, 0) - EVT_CALL(GetActorVar, -127, 4, LVar1) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E2, 0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar1) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, LVar1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_EQ(6) @@ -348,7 +348,7 @@ EvtScript N(takeTurn_802234A4) = { EVT_END_THREAD EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(GetActorVar, -127, 4, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar1) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(0) @@ -388,9 +388,9 @@ EvtScript N(nextTurn_80223D2C) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetActorVar, -127, 1, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_WAIT(15) EVT_CALL(func_802535B4, 0) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) @@ -404,7 +404,7 @@ EvtScript N(nextTurn_80223D2C) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Punch) - EVT_CALL(ActorSpeak, 721071, 256, 0, 10289160, 10289153) + EVT_CALL(ActorSpeak, MSG_CH0_00AF, ACTOR_PARTNER, 0, 0x009D0008, 0x009D0001) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Idle) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_NodYes) EVT_WAIT(10) @@ -424,9 +424,9 @@ EvtScript N(nextTurn_80223D2C) = { EVT_END_IF EVT_END_IF EVT_CASE_EQ(12) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(SetActorVar, -127, 2, 2) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) EVT_EXEC_WAIT(N(80222C08)) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) @@ -439,7 +439,7 @@ EvtScript N(nextTurn_80223D2C) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) - EVT_CALL(ActorSpeak, 721072, 256, 0, 10289160, 10289153) + EVT_CALL(ActorSpeak, MSG_CH0_00B0, ACTOR_PARTNER, 0, 0x009D0008, 0x009D0001) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) EVT_WAIT(20) @@ -447,25 +447,25 @@ EvtScript N(nextTurn_80223D2C) = { EVT_WAIT(4) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_END_IF - EVT_CALL(GetActorVar, -127, 3, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(GetActorHP, -127, LVar0) + EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_IF_LE(LVar0, 1) - EVT_CALL(SetActorVar, -127, 3, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 1) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) - EVT_CALL(ActorSpeak, 721074, 256, 0, 10289160, 10289153) + EVT_CALL(ActorSpeak, MSG_CH0_00B2, ACTOR_PARTNER, 0, 0x009D0008, 0x009D0001) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_EXEC_WAIT(N(80222B30)) - EVT_CALL(ActorSpeak, 721075, -127, 1, 2162710, 2162691) + EVT_CALL(ActorSpeak, MSG_CH0_00B3, ACTOR_SELF, 1, 0x00210016, 0x00210003) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B9) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_ChargeArmsUp) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 16) - EVT_CALL(PlayEffect, 0x13, 0, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x13, 1, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 30, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar1, LVar2, 1, 30, 0) EVT_WAIT(30) EVT_WAIT(20) - EVT_CALL(SetActorVar, -127, 4, 2) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Idle) EVT_WAIT(20) EVT_END_IF 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 index c8a7d9def7..07ace942f9 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 @@ -114,7 +114,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 50, .partCount = ARRAY_COUNT(N(partsTable_8022A6E0)), .partsData = N(partsTable_8022A6E0), - .takeTurnScript = &N(init_8022ACE4), + .initScript = &N(init_8022ACE4), .statusTable = N(statusTable_8022A634), .escapeChance = 0, .airLiftChance = 0, @@ -139,11 +139,11 @@ EvtScript N(8022A750) = { EVT_IF_FLAG(LVar2, BS_FLAGS1_PARTNER_ACTING) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar2, MOVE_SPOOK) - EVT_CALL(SetActorVar, -127, 3, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) - EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) + EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) EVT_WAIT(30) EVT_END_IF EVT_END_IF @@ -160,8 +160,8 @@ EvtScript N(8022A880) = { EVT_ELSE EVT_ADD(LVar1, 6) EVT_END_IF - EVT_CALL(PlayEffect, 0x13, 0, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x13, 1, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 30, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar1, LVar2, 1, 30, 0) EVT_THREAD EVT_SET(LVar0, 0) EVT_LOOP(32) @@ -174,11 +174,11 @@ EvtScript N(8022A880) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_300) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) - EVT_CALL(PlayEffect, 0x52, 4, LVar0, LVar1, LVar2, 1, 40, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, -4, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, -4, 4, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, 4, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, 4, 4, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, -4, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, -4, 4, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, 4, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, 4, 4, 0) EVT_RETURN EVT_END }; @@ -222,11 +222,11 @@ EvtScript N(init_8022ACE4) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8022B4F0))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8022ADA4))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8022ADD8))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_8022BB44))) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) - EVT_CALL(SetActorVar, -127, 2, 0) - EVT_CALL(SetActorVar, -127, 3, 0) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8022BB44))) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0) EVT_RETURN EVT_END }; @@ -338,7 +338,7 @@ EvtScript N(handleEvent_8022ADD8) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MageJrTroopa_Flail) EVT_WAIT(20) EVT_EXEC_WAIT(N(8022ABA8)) - EVT_CALL(ActorSpeak, 1900955, -127, 1, 2359310, 2359299) + EVT_CALL(ActorSpeak, MSG_Menus_019B, ACTOR_SELF, 1, 0x0024000E, 0x00240003) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MageJrTroopa_Idle) EVT_EXEC_WAIT(N(8022AC40)) EVT_END_IF @@ -388,7 +388,7 @@ EvtScript N(takeTurn_8022B4F0) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, LVar3) EVT_ADD(LVar1, LVar4) - EVT_CALL(PlayEffect, 0x13, 0, LVar0, LVar1, LVar2, LVar5, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, LVar5, 30, 0) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MageJrTroopa_SwingStaff) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -413,7 +413,7 @@ EvtScript N(takeTurn_8022B4F0) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, LVar6) EVT_ADD(LVar1, LVar7) - EVT_CALL(PlayEffect, 0x12, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 30, 0) EVT_WAIT(35) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -439,16 +439,16 @@ EvtScript N(takeTurn_8022B4F0) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, LVar6) EVT_ADD(LVar1, LVar7) - EVT_CALL(PlayEffect, 0x12, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 15, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 15, 0) EVT_WAIT(15) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT), 0, 0, 8, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(GetLastDamage, 0, LVar1) + EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar1) EVT_IF_NE(LVar1, 0) - EVT_CALL(SetActorVar, -127, 1, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_END_IF EVT_END_IF EVT_END_SWITCH @@ -464,17 +464,17 @@ EvtScript N(nextTurn_8022BB44) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(12) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) EVT_IF_NOT_FLAG(LVar1, STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) - EVT_CALL(SetActorVar, -127, 0, 2) - EVT_CALL(GetActorVar, -127, 3, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 2) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_IF_EQ(LVar0, 0) EVT_EXEC_WAIT(N(8022ABA8)) EVT_WAIT(20) EVT_END_IF - EVT_CALL(ActorSpeak, 1179869, -127, 1, 2359310, 2359299) + EVT_CALL(ActorSpeak, MSG_CH7_00DD, ACTOR_SELF, 1, 0x0024000E, 0x00240003) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MageJrTroopa_Idle) EVT_EXEC_WAIT(N(8022AC40)) EVT_WAIT(20) @@ -482,34 +482,34 @@ EvtScript N(nextTurn_8022BB44) = { EVT_ELSE EVT_WAIT(20) EVT_END_IF - EVT_CALL(SetActorVar, -127, 3, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0) EVT_RETURN EVT_CASE_EQ(11) - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(SetActorVar, -127, 1, 2) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) EVT_EXEC_WAIT(N(8022ABA8)) EVT_WAIT(20) - EVT_CALL(ActorSpeak, 1179870, -127, 1, 2359310, 2359299) + EVT_CALL(ActorSpeak, MSG_CH7_00DE, ACTOR_SELF, 1, 0x0024000E, 0x00240003) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MageJrTroopa_Idle) EVT_EXEC_WAIT(N(8022AC40)) EVT_WAIT(10) EVT_END_IF EVT_RETURN EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetActorVar, -127, 0, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_WAIT(15) EVT_EXEC_WAIT(N(8022ABA8)) EVT_WAIT(10) - EVT_CALL(ActorSpeak, 1179867, -127, 2, 2162714, 2162715) + EVT_CALL(ActorSpeak, MSG_CH7_00DB, ACTOR_SELF, 2, 0x0021001A, 0x0021001B) EVT_WAIT(8) EVT_EXEC_WAIT(N(8022A880)) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 1) - EVT_CALL(SetPartFlagBits, -127, 1, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 1, FALSE) EVT_WAIT(15) - EVT_CALL(ActorSpeak, 1179868, -127, 1, 2359310, 2359299) + EVT_CALL(ActorSpeak, MSG_CH7_00DC, ACTOR_SELF, 1, 0x0024000E, 0x00240003) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MageJrTroopa_Idle) EVT_WAIT(10) EVT_EXEC_WAIT(N(8022AC40)) @@ -551,19 +551,19 @@ EvtScript N(8022BF1C) = { EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) EVT_LOOP(3) - EVT_CALL(PlayEffect, 0x1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetPartFlagBits, -127, 1, 1, 1) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 1, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JrTroopa_DefeatedBegin) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_WAIT(15) EVT_CALL(PlaySound, SOUND_DEATH) - EVT_CALL(DropStarPoints, -127) + EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(SetBattleCamZoom, 260) @@ -574,19 +574,19 @@ EvtScript N(8022BF1C) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JrTroopa_Defeated) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8022A61C))) EVT_WAIT(60) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_RETURN EVT_END }; EvtScript N(8022C2A4) = { - EVT_CALL(GetActorVar, -127, 3, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_IF_EQ(LVar0, 1) EVT_WAIT(10) EVT_EXEC_WAIT(N(8022ABA8)) - EVT_CALL(ActorSpeak, 1900954, -127, 1, 2359310, 2359299) + EVT_CALL(ActorSpeak, MSG_Menus_019A, ACTOR_SELF, 1, 0x0024000E, 0x00240003) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MageJrTroopa_Idle) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_NE(LVar0, 1) EVT_EXEC_WAIT(N(8022AC40)) EVT_END_IF 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 index 34d3efc3a7..6f7c225ab1 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 @@ -101,7 +101,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 40, .partCount = ARRAY_COUNT(N(partsTable_80225F0C)), .partsData = N(partsTable_80225F0C), - .takeTurnScript = &N(init_80226510), + .initScript = &N(init_80226510), .statusTable = N(statusTable_80225E60), .escapeChance = 0, .airLiftChance = 0, @@ -126,11 +126,11 @@ EvtScript N(80225F7C) = { EVT_IF_FLAG(LVar2, BS_FLAGS1_PARTNER_ACTING) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar2, MOVE_SPOOK) - EVT_CALL(SetActorVar, -127, 1, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) - EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) + EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) EVT_WAIT(30) EVT_END_IF EVT_END_IF @@ -147,8 +147,8 @@ EvtScript N(802260AC) = { EVT_ELSE EVT_ADD(LVar1, 6) EVT_END_IF - EVT_CALL(PlayEffect, 0x13, 0, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x13, 1, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 30, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar1, LVar2, 1, 30, 0) EVT_THREAD EVT_SET(LVar0, 0) EVT_LOOP(32) @@ -161,11 +161,11 @@ EvtScript N(802260AC) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_300) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) - EVT_CALL(PlayEffect, 0x52, 4, LVar0, LVar1, LVar2, 1, 40, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, -4, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, -4, 4, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, 4, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, 4, 4, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, -4, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, -4, 4, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, 4, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, 4, 4, 0) EVT_RETURN EVT_END }; @@ -209,9 +209,9 @@ EvtScript N(init_80226510) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80226F58))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_802265A0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_802266B0))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_80227724))) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_80227724))) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_RETURN EVT_END }; @@ -222,12 +222,12 @@ EvtScript N(idle_802265A0) = { EVT_LABEL(0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, 0x41000) - EVT_CALL(SetTargetOffset, -127, 1, -12, 28) - EVT_CALL(SetProjectileTargetOffset, -127, 1, 4, -6) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -12, 28) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 4, -6) EVT_CALL(N(UnkBattleFunc1), -25, 27, -1, 27) EVT_ELSE - EVT_CALL(SetTargetOffset, -127, 1, -5, 33) - EVT_CALL(SetProjectileTargetOffset, -127, 1, 0, -6) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 33) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -6) EVT_CALL(N(UnkBattleFunc1), -22, 30, 2, 28) EVT_END_IF EVT_WAIT(1) @@ -340,7 +340,7 @@ EvtScript N(handleEvent_802266B0) = { EVT_SET_CONST(LVar1, ANIM_ParaJrTroopa_Flail) EVT_EXEC_WAIT(DoImmune) EVT_EXEC_WAIT(N(802263D4)) - EVT_CALL(ActorSpeak, 1900955, -127, 1, 2424844, 2424844) + EVT_CALL(ActorSpeak, MSG_Menus_019B, ACTOR_SELF, 1, 0x0025000C, 0x0025000C) EVT_EXEC_WAIT(N(8022646C)) EVT_END_IF EVT_CASE_EQ(53) @@ -400,7 +400,7 @@ EvtScript N(takeTurn_80226F58) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 5, BS_FLAGS1_10) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(6) @@ -409,14 +409,14 @@ EvtScript N(takeTurn_80226F58) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(SetActorSounds, -127, 2, 8416, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ParaJrTroopa_FlyFast) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetActorSounds, -127, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) @@ -424,7 +424,7 @@ EvtScript N(takeTurn_80226F58) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ParaJrTroopa_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -434,10 +434,10 @@ EvtScript N(takeTurn_80226F58) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ParaJrTroopa_FlyFast) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ParaJrTroopa_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -448,19 +448,19 @@ EvtScript N(takeTurn_80226F58) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(SetActorSounds, -127, 2, 8416, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ParaJrTroopa_FlyFast) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetActorSounds, -127, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ParaJrTroopa_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_END_SWITCH EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) @@ -474,14 +474,14 @@ EvtScript N(takeTurn_80226F58) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ParaJrTroopa_FlyFast) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(10) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(YieldTurn) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ParaJrTroopa_FlyFast) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ParaJrTroopa_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -497,29 +497,29 @@ EvtScript N(nextTurn_80227724) = { EVT_CALL(GetBattlePhase, LVarF) EVT_SWITCH(LVarF) EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetActorVar, -127, 0, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetBattleCamOffsetZ, 35) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) - EVT_CALL(ActorSpeak, 917536, -127, 2, 2162714, 2162715) + EVT_CALL(ActorSpeak, MSG_CH3_0020, ACTOR_SELF, 2, 0x0021001A, 0x0021001B) EVT_WAIT(8) EVT_EXEC_WAIT(N(802260AC)) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 1) - EVT_CALL(SetPartFlagBits, -127, 1, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 1, FALSE) EVT_WAIT(30) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 60, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 45, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 45, 0, EASING_LINEAR) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, 60, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_WAIT(8) - EVT_CALL(ActorSpeak, 917537, -127, 1, 2424844, 2424834) + EVT_CALL(ActorSpeak, MSG_CH3_0021, ACTOR_SELF, 1, 0x0025000C, 0x00250002) EVT_WAIT(10) EVT_EXEC_WAIT(N(8022646C)) EVT_END_IF @@ -538,11 +538,11 @@ EvtScript N(802279B0) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) - EVT_CALL(SetActorSounds, -127, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(func_8027D32C, -127) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2)) - EVT_CALL(FallToGoal, -127, 10) + EVT_CALL(FallToGoal, ACTOR_SELF, 10) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_CALL(HPBarToCurrent, ACTOR_SELF) @@ -553,19 +553,19 @@ EvtScript N(802279B0) = { EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) EVT_LOOP(3) - EVT_CALL(PlayEffect, 0x1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetPartFlagBits, -127, 1, 1, 1) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 1, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JrTroopa_DefeatedBegin) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) - EVT_CALL(DropStarPoints, -127) + EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(SetBattleCamZoom, 260) @@ -576,7 +576,7 @@ EvtScript N(802279B0) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JrTroopa_Defeated) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_80225E48))) EVT_WAIT(60) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4194304, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00400000, TRUE) EVT_RETURN EVT_END }; @@ -591,7 +591,7 @@ EvtScript N(80227D38) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_SUB(LVar4, LVar1) EVT_MULF(LVar4, EVT_FLOAT(0.3)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, LVar4, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, LVar4, EASING_LINEAR) EVT_RETURN EVT_END }; @@ -599,13 +599,13 @@ EvtScript N(80227D38) = { EvtScript N(80227E1C) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(SetActorVar, -127, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_WAIT(15) EVT_EXEC_WAIT(N(802263D4)) EVT_WAIT(10) - EVT_CALL(ActorSpeak, 1900954, -127, 1, 2424844, 2424834) + EVT_CALL(ActorSpeak, MSG_Menus_019A, ACTOR_SELF, 1, 0x0025000C, 0x00250002) EVT_WAIT(10) EVT_EXEC_WAIT(N(8022646C)) EVT_END_IF diff --git a/src/battle/area/kmr_part_3/actor/paragoomba.c b/src/battle/area/kmr_part_3/actor/paragoomba.c index 0ff227bcec..e9b6f045d9 100644 --- a/src/battle/area/kmr_part_3/actor/paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/paragoomba.c @@ -133,7 +133,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 2, .partCount = ARRAY_COUNT(N(partsTable)), .partsData = N(partsTable), - .takeTurnScript = &N(init_8021F450), + .initScript = &N(init_8021F450), .statusTable = N(statusTable_8021C274), .escapeChance = 90, .airLiftChance = 100, @@ -211,7 +211,7 @@ EvtScript N(idle_8021C4D4) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C424))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -225,7 +225,7 @@ EvtScript N(idle_8021C4D4) = { EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C3D8))) EVT_LOOP(40) EVT_LABEL(2) @@ -245,7 +245,7 @@ EvtScript N(8021C790) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Idle) EVT_RETURN EVT_END @@ -342,7 +342,7 @@ EvtScript N(handleEvent_8021C808) = { EVT_SET_CONST(LVar1, ANIM_Paragoomba_Idle) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(57) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, 512, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, 512, FALSE) EVT_SET_CONST(LVar0, 0x00000002) EVT_SET_CONST(LVar1, ANIM_Paragoomba_Run) EVT_SET_CONST(LVar2, ANIM_Paragoomba_Hurt) @@ -377,7 +377,7 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, ((0)), 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(6) @@ -389,7 +389,7 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, -127, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dive) @@ -397,14 +397,14 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, -127, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) EVT_SET(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_THREAD EVT_LOOP(4) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DF) @@ -412,7 +412,7 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Miss) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 2, EVT_FLOAT(3.0)) EVT_WAIT(10) EVT_IF_EQ(LVarA, 5) @@ -439,7 +439,7 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, -127, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dive) @@ -447,11 +447,11 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, -127, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_END_SWITCH EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((0)), 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) @@ -463,7 +463,7 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(5) EVT_CALL(YieldTurn) @@ -483,10 +483,10 @@ extern EvtScript N(8021DC34); EvtScript N(8021D614) = { EVT_CALL(func_8027D32C, -127) - EVT_CALL(SetPartFlags, ACTOR_SELF, 2, 131077) - EVT_CALL(SetPartFlags, ACTOR_SELF, 3, 1179652) - EVT_CALL(SetPartFlags, ACTOR_SELF, 4, 1179652) - EVT_CALL(SetPartFlags, ACTOR_SELF, 1, 8388612) + EVT_CALL(SetPartFlags, ACTOR_SELF, 2, 0x00020005) + EVT_CALL(SetPartFlags, ACTOR_SELF, 3, 0x00120004) + EVT_CALL(SetPartFlags, ACTOR_SELF, 4, 0x00120004) + EVT_CALL(SetPartFlags, ACTOR_SELF, 1, 0x00800004) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) EVT_CALL(SetPartDispOffset, ACTOR_SELF, 3, -9, 7, -2) @@ -498,7 +498,7 @@ EvtScript N(8021D614) = { EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hurt) EVT_END_IF - EVT_CALL(SetActorSounds, -127, 2, 769, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) @@ -506,42 +506,42 @@ EvtScript N(8021D614) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 100, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.3)) EVT_END_THREAD - EVT_CALL(ResetActorSounds, -127, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar3) EVT_IF_EQ(LVar3, 15) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hurt) EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar4, 10) EVT_ADD(LVar5, 5) - EVT_CALL(PlayEffect, 0x27, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0) EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_LOOP(10) - EVT_CALL(SetPartFlagBits, -127, 3, 1, 1) - EVT_CALL(SetPartFlagBits, -127, 4, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 1, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, 1, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, -127, 3, 1, 0) - EVT_CALL(SetPartFlagBits, -127, 4, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 1, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, 1, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, -127, 3, 1, 1) - EVT_CALL(SetPartFlagBits, -127, 4, 1, 1) - EVT_CALL(GetIndexFromHome, -127, LVar0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 1, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, 1, TRUE) + EVT_CALL(GetIndexFromHome, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) - EVT_CALL(SetGoalToIndex, -127, LVar0) + EVT_CALL(SetGoalToIndex, ACTOR_SELF, LVar0) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetHomePos, -127, LVar0, LVar1, LVar2) + EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Idle) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, 512, 0) - EVT_CALL(SetStatusTable, -127, EVT_PTR(N(statusTable_8021C1C8))) - EVT_CALL(SetActorType, -127, 7) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, 512, FALSE) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021C1C8))) + EVT_CALL(SetActorType, ACTOR_SELF, 7) EVT_EXEC_WAIT(N(8021DC34)) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4096, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00001000, TRUE) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_RETURN @@ -604,7 +604,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021DBE8))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleRunToGoal, -127, 0) + EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021DB9C))) EVT_LOOP(20) EVT_LABEL(1) @@ -620,7 +620,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021DBE8))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleRunToGoal, -127, 0) + EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021DB9C))) EVT_LOOP(80) EVT_LABEL(2) @@ -843,7 +843,7 @@ EvtScript N(takeTurn_8021E788) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -933,7 +933,7 @@ EvtScript N(init_8021F450) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8021CDFC))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8021C4D4))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021C808))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_8021F690))) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8021F690))) EVT_RETURN EVT_END }; @@ -953,7 +953,7 @@ EvtScript N(8021F4B0) = { EVT_WAIT(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 721080, 256, 0, 10289160, 10289153) + EVT_CALL(ActorSpeak, MSG_CH0_00B8, ACTOR_PARTNER, 0, 0x009D0008, 0x009D0001) EVT_SET(GF_Tutorial_FlyingEnemy, 1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 150) EVT_WAIT(1) diff --git a/src/battle/area/kmr_part_3/actor/spiked_goomba.c b/src/battle/area/kmr_part_3/actor/spiked_goomba.c index 4e65dbf6d9..31a6e1a0c8 100644 --- a/src/battle/area/kmr_part_3/actor/spiked_goomba.c +++ b/src/battle/area/kmr_part_3/actor/spiked_goomba.c @@ -63,7 +63,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 2, .partCount = ARRAY_COUNT(N(partsTable_8021A448)), .partsData = N(partsTable_8021A448), - .takeTurnScript = &N(init_8021BEBC), + .initScript = &N(init_8021BEBC), .statusTable = N(statusTable_8021A39C), .escapeChance = 90, .airLiftChance = 95, @@ -131,7 +131,7 @@ EvtScript N(idle_8021A578) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021A4E0))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleRunToGoal, -127, 0) + EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021A494))) EVT_LOOP(20) EVT_LABEL(1) @@ -147,7 +147,7 @@ EvtScript N(idle_8021A578) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021A4E0))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleRunToGoal, -127, 0) + EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021A494))) EVT_LOOP(80) EVT_LABEL(2) @@ -284,7 +284,7 @@ EvtScript N(handleEvent_8021A854) = { EVT_ELSE EVT_ADD(LVar1, 26) EVT_END_IF - EVT_CALL(PlayEffect, 0x1A, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_CASE_DEFAULT EVT_END_SWITCH @@ -385,7 +385,7 @@ EvtScript N(takeTurn_8021B19C) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -452,7 +452,7 @@ EvtScript N(takeTurn_8021B19C) = { EVT_ADD(LVar0, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) - EVT_CALL(GetLastDamage, 0, LVar0) + EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar0) EVT_IF_GT(LVar0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedGoomba_Laugh) EVT_WAIT(15) @@ -481,7 +481,7 @@ EvtScript N(init_8021BEBC) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8021B19C))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8021A578))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021A854))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_8021C0FC))) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8021C0FC))) EVT_RETURN EVT_END }; @@ -501,7 +501,7 @@ EvtScript N(8021BF1C) = { EVT_WAIT(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 721081, 256, 0, 10289160, 10289153) + EVT_CALL(ActorSpeak, MSG_CH0_00B9, ACTOR_PARTNER, 0, 0x009D0008, 0x009D0001) EVT_SET(GF_Tutorial_SpikyEnemy, 1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 150) EVT_WAIT(1) 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 index 163ca161d7..8ebe20a3b5 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 @@ -95,7 +95,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 40, .partCount = ARRAY_COUNT(N(partsTable_80228014)), .partsData = N(partsTable_80228014), - .takeTurnScript = &N(init_80228618), + .initScript = &N(init_80228618), .statusTable = N(statusTable_80227F68), .escapeChance = 0, .airLiftChance = 0, @@ -120,11 +120,11 @@ EvtScript N(80228084) = { EVT_IF_FLAG(LVar2, BS_FLAGS1_PARTNER_ACTING) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar2, MOVE_SPOOK) - EVT_CALL(SetActorVar, -127, 2, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) - EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) + EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) EVT_WAIT(30) EVT_END_IF EVT_END_IF @@ -141,8 +141,8 @@ EvtScript N(802281B4) = { EVT_ELSE EVT_ADD(LVar1, 6) EVT_END_IF - EVT_CALL(PlayEffect, 0x13, 0, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x13, 1, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 30, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar1, LVar2, 1, 30, 0) EVT_THREAD EVT_SET(LVar0, 0) EVT_LOOP(32) @@ -155,11 +155,11 @@ EvtScript N(802281B4) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_300) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) - EVT_CALL(PlayEffect, 0x52, 4, LVar0, LVar1, LVar2, 1, 40, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, -4, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, -4, 4, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, 4, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 0, LVar0, LVar1, LVar2, 4, 4, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, -4, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, -4, 4, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, 4, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, 4, 4, 0) EVT_RETURN EVT_END }; @@ -203,10 +203,10 @@ EvtScript N(init_80228618) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8022936C))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_802286C0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_802287D0))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_80229B38))) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) - EVT_CALL(SetActorVar, -127, 2, 0) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_80229B38))) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) EVT_RETURN EVT_END }; @@ -217,12 +217,12 @@ EvtScript N(idle_802286C0) = { EVT_LABEL(0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, 0x41000) - EVT_CALL(SetTargetOffset, -127, 1, -15, 28) - EVT_CALL(SetProjectileTargetOffset, -127, 1, 4, -6) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -15, 28) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 4, -6) EVT_CALL(N(UnkBattleFunc1), -25, 27, -1, 27) EVT_ELSE - EVT_CALL(SetTargetOffset, -127, 1, -8, 33) - EVT_CALL(SetProjectileTargetOffset, -127, 1, 0, -6) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -8, 33) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -6) EVT_CALL(N(UnkBattleFunc1), -22, 30, 2, 28) EVT_END_IF EVT_WAIT(1) @@ -339,7 +339,7 @@ EvtScript N(handleEvent_802287D0) = { EVT_ADD(LVar0, -4) EVT_ADD(LVar1, 37) EVT_END_SWITCH - EVT_CALL(PlayEffect, 0x1A, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_CASE_EQ(58) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) @@ -353,7 +353,7 @@ EvtScript N(handleEvent_802287D0) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedParaJrTroopa_Flail) EVT_WAIT(20) EVT_EXEC_WAIT(N(802284DC)) - EVT_CALL(ActorSpeak, 1900955, -127, 1, 2293775, 2293775) + EVT_CALL(ActorSpeak, MSG_Menus_019B, ACTOR_SELF, 1, 0x0023000F, 0x0023000F) EVT_EXEC_WAIT(N(80228574)) EVT_END_IF EVT_CASE_EQ(42) @@ -381,11 +381,11 @@ EvtScript N(handleEvent_802287D0) = { }; EvtScript N(80228FE8) = { - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(GetLastDamage, -127, LVar1) + EVT_CALL(GetLastDamage, ACTOR_SELF, LVar1) EVT_IF_NE(LVar1, 0) - EVT_CALL(SetActorVar, -127, 1, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_END_IF EVT_END_IF EVT_RETURN @@ -393,17 +393,17 @@ EvtScript N(80228FE8) = { }; EvtScript N(8022906C) = { - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x351000) - EVT_CALL(SetActorVar, -127, 1, 2) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) EVT_EXEC_WAIT(N(802284DC)) - EVT_CALL(ActorSpeak, 458940, -127, 1, -1, -1) + EVT_CALL(ActorSpeak, MSG_MAC_Port_00BC, ACTOR_SELF, 1, -1, -1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedParaJrTroopa_Idle) EVT_EXEC_WAIT(N(80228574)) EVT_ELSE - EVT_CALL(SetActorVar, -127, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_END_IF EVT_END_IF EVT_RETURN @@ -450,7 +450,7 @@ EvtScript N(takeTurn_8022936C) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 6, BS_FLAGS1_10) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(6) @@ -459,14 +459,14 @@ EvtScript N(takeTurn_8022936C) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(SetActorSounds, -127, 2, 8416, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedParaJrTroopa_FlyFast) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetActorSounds, -127, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) @@ -474,7 +474,7 @@ EvtScript N(takeTurn_8022936C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedParaJrTroopa_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -484,10 +484,10 @@ EvtScript N(takeTurn_8022936C) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedParaJrTroopa_FlyFast) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedParaJrTroopa_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -498,19 +498,19 @@ EvtScript N(takeTurn_8022936C) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_66) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(SetActorSounds, -127, 2, 8416, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedParaJrTroopa_FlyFast) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetActorSounds, -127, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedParaJrTroopa_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_END_SWITCH EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE) @@ -524,14 +524,14 @@ EvtScript N(takeTurn_8022936C) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedParaJrTroopa_FlyFast) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(10) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(YieldTurn) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedParaJrTroopa_FlyFast) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikedParaJrTroopa_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -563,18 +563,18 @@ EvtScript N(nextTurn_80229B38) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetActorVar, -127, 0, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetBattleCamOffsetZ, 35) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(20) - EVT_CALL(ActorSpeak, 458936, -127, 2, 2162693, 2162693) + EVT_CALL(ActorSpeak, MSG_MAC_Port_00B8, ACTOR_SELF, 2, 0x00210005, 0x00210005) EVT_WAIT(10) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4096, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00001000, TRUE) EVT_CALL(func_8026D940, -127, -20, 40) EVT_CALL(func_8027D2D8, -127) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -582,10 +582,10 @@ EvtScript N(nextTurn_80229B38) = { EVT_SET(LVar1, 150) EVT_CALL(func_802189DC_447E1C, LVar0, LVar1, LVarA) EVT_WAIT(10) - EVT_CALL(GetEnemyMaxHP, -127, LVar0) + EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0) EVT_LABEL(0) EVT_SUB(LVar0, 1) - EVT_CALL(SetEnemyHP, -127, LVar0) + EVT_CALL(SetEnemyHP, ACTOR_SELF, LVar0) EVT_WAIT(1) EVT_IF_GT(LVar0, 20) EVT_GOTO(0) @@ -593,32 +593,32 @@ EvtScript N(nextTurn_80229B38) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JrTroopa_Panic) EVT_WAIT(15) EVT_LOOP(2) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4096, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00001000, FALSE) EVT_WAIT(15) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4096, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00001000, TRUE) EVT_WAIT(15) EVT_END_LOOP - EVT_CALL(ActorSpeak, 458937, -127, 2, 2162707, 2162707) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4096, 0) + EVT_CALL(ActorSpeak, MSG_MAC_Port_00B9, ACTOR_SELF, 2, 0x00210013, 0x00210013) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00001000, FALSE) EVT_CALL(N(FreeIcon), LVarA) EVT_CALL(func_8027D32C, -127) EVT_CALL(func_8026D940, -127, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JrTroopa_OutOfBreath) EVT_WAIT(25) - EVT_CALL(ActorSpeak, 458938, -127, 2, 2162710, 2162691) + EVT_CALL(ActorSpeak, MSG_MAC_Port_00BA, ACTOR_SELF, 2, 0x00210016, 0x00210003) EVT_WAIT(10) EVT_EXEC_WAIT(N(802281B4)) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 1) - EVT_CALL(SetPartFlagBits, -127, 1, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 1, FALSE) EVT_WAIT(20) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 80, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_LINEAR) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_WAIT(10) - EVT_CALL(ActorSpeak, 458939, -127, 1, 2293775, 2293763) + EVT_CALL(ActorSpeak, MSG_MAC_Port_00BB, ACTOR_SELF, 1, 0x0023000F, 0x00230003) EVT_WAIT(10) EVT_EXEC_WAIT(N(80228574)) EVT_END_IF @@ -637,11 +637,11 @@ EvtScript N(8022A018) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) - EVT_CALL(SetActorSounds, -127, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(func_8027D32C, -127) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2)) - EVT_CALL(FallToGoal, -127, 10) + EVT_CALL(FallToGoal, ACTOR_SELF, 10) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_CALL(HPBarToCurrent, ACTOR_SELF) @@ -652,19 +652,19 @@ EvtScript N(8022A018) = { EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) EVT_LOOP(3) - EVT_CALL(PlayEffect, 0x1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetPartFlagBits, -127, 1, 1, 1) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 1, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JrTroopa_DefeatedBegin) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_WAIT(15) EVT_CALL(PlaySound, SOUND_DEATH) - EVT_CALL(DropStarPoints, -127) + EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(SetBattleCamZoom, 260) @@ -675,7 +675,7 @@ EvtScript N(8022A018) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JrTroopa_Defeated) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_80227F50))) EVT_WAIT(60) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, 4194304, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00400000, TRUE) EVT_RETURN EVT_END }; @@ -690,7 +690,7 @@ EvtScript N(8022A39C) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_SUB(LVar4, LVar1) EVT_MULF(LVar4, EVT_FLOAT(0.3)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, LVar4, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, LVar4, EASING_LINEAR) EVT_RETURN EVT_END }; @@ -698,12 +698,12 @@ EvtScript N(8022A39C) = { EvtScript N(8022A480) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(SetActorVar, -127, 2, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) EVT_WAIT(10) EVT_EXEC_WAIT(N(802284DC)) - EVT_CALL(ActorSpeak, 1900954, -127, 1, 2293775, 2293763) + EVT_CALL(ActorSpeak, MSG_Menus_019A, ACTOR_SELF, 1, 0x0023000F, 0x00230003) EVT_EXEC_WAIT(N(80228574)) EVT_END_IF EVT_END_IF diff --git a/src/battle/area/kmr_part_3/stage/kmr_02.c b/src/battle/area/kmr_part_3/stage/kmr_02.c index ad3f027c05..2adf1bd800 100644 --- a/src/battle/area/kmr_part_3/stage/kmr_02.c +++ b/src/battle/area/kmr_part_3/stage/kmr_02.c @@ -3,21 +3,4 @@ #define NAMESPACE b_area_kmr_part_3_kmr_02 -EvtScript N(beforeBattle_802322D0) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_802322F0) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "kmr_tex", - .shape = "kmr_bt02_shape", - .bg = "kmr_bg", - .preBattle = &N(beforeBattle_802322D0), - .postBattle = &N(afterBattle_802322F0), -}; +#include "battle/common/stage/kmr_02.inc.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 index 64adbbb47d..f736f70474 100644 --- a/src/battle/area/kmr_part_3/stage/kmr_03.c +++ b/src/battle/area/kmr_part_3/stage/kmr_03.c @@ -3,35 +3,4 @@ #define NAMESPACE b_area_kmr_part_3_kmr_03 -#include "world/common/todo/clouds.inc.c" - -EvtScript N(beforeBattle_802326B8) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SET(LVar0, 1) - EVT_SET(LVar2, 0) - EVT_EXEC(N(clouds1)) - EVT_SET(LVar0, 4) - EVT_SET(LVar2, 70) - EVT_EXEC(N(clouds1)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80232730) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80232740)[] = { - 0x00000027, 0x0000002B, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "kmr_tex", - .shape = "kmr_bt03_shape", - .hit = "kmr_bt03_hit", - .bg = "kmr_bg", - .preBattle = &N(beforeBattle_802326B8), - .postBattle = &N(afterBattle_80232730), - .foregroundModelList = N(foregroundModelList_80232740), -}; +#include "battle/common/stage/kmr_03.inc.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 index 60f6ac9684..0a47f2fba7 100644 --- a/src/battle/area/kmr_part_3/stage/kmr_04.c +++ b/src/battle/area/kmr_part_3/stage/kmr_04.c @@ -3,35 +3,4 @@ #define NAMESPACE b_area_kmr_part_3_kmr_04 -#include "world/common/todo/clouds.inc.c" - -EvtScript N(beforeBattle_80232B08) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SET(LVar0, 1) - EVT_SET(LVar2, 0) - EVT_EXEC(N(clouds1)) - EVT_SET(LVar0, 4) - EVT_SET(LVar2, 70) - EVT_EXEC(N(clouds1)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80232B80) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80232B90)[] = { - 0x00000024, 0x00000020, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "kmr_tex", - .shape = "kmr_bt04_shape", - .hit = "kmr_bt04_hit", - .bg = "kmr_bg", - .preBattle = &N(beforeBattle_80232B08), - .postBattle = &N(afterBattle_80232B80), - .foregroundModelList = N(foregroundModelList_80232B90), -}; +#include "battle/common/stage/kmr_04.inc.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 index 52e4e8d765..9f4084bb3d 100644 --- a/src/battle/area/kmr_part_3/stage/kmr_05.c +++ b/src/battle/area/kmr_part_3/stage/kmr_05.c @@ -1,25 +1,28 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/kmr_bt05_shape.h" #define NAMESPACE b_area_kmr_part_3_kmr_05 #include "world/common/todo/clouds.inc.c" -EvtScript N(beforeBattle_80232F58) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(EnableModel, 26, 0) - EVT_CALL(EnableModel, 29, 0) + EVT_CALL(EnableModel, MODEL_yuka, FALSE) + EVT_CALL(EnableModel, MODEL_o303, FALSE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80232FA0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80232FB0)[] = { - 0x00000020, 0x00000024, 0x00000000, +s32 N(ForegroundModels)[] = { + MODEL_n2, + MODEL_m4, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -27,7 +30,7 @@ Stage NAMESPACE = { .shape = "kmr_bt05_shape", .hit = "kmr_bt05_hit", .bg = "kmr_bg", - .preBattle = &N(beforeBattle_80232F58), - .postBattle = &N(afterBattle_80232FA0), - .foregroundModelList = N(foregroundModelList_80232FB0), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kmr_part_3/stage/kmr_06.c b/src/battle/area/kmr_part_3/stage/kmr_06.c index 4e92ab164f..9a182c9e70 100644 --- a/src/battle/area/kmr_part_3/stage/kmr_06.c +++ b/src/battle/area/kmr_part_3/stage/kmr_06.c @@ -3,38 +3,4 @@ #define NAMESPACE b_area_kmr_part_3_kmr_06 -#include "world/common/todo/clouds.inc.c" - -#include "common/UnkFogFunc.inc.c" - -EvtScript N(beforeBattle_80233378) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(N(UnkFogFunc)) - EVT_SET(LVar0, 1) - EVT_SET(LVar2, 0) - EVT_EXEC(N(clouds1)) - EVT_SET(LVar0, 4) - EVT_SET(LVar2, 70) - EVT_EXEC(N(clouds1)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_802333FC) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_8023340C)[] = { - 0x0000001D, 0x00000022, 0x00000021, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "kmr_tex", - .shape = "kmr_bt06_shape", - .hit = "kmr_bt06_hit", - .bg = "kmr_bg", - .preBattle = &N(beforeBattle_80233378), - .postBattle = &N(afterBattle_802333FC), - .foregroundModelList = N(foregroundModelList_8023340C), -}; +#include "battle/common/stage/kmr_06.inc.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 index de03cacd87..da303b8519 100644 --- a/src/battle/area/kmr_part_3/stage/kpa_01.c +++ b/src/battle/area/kmr_part_3/stage/kpa_01.c @@ -1,16 +1,17 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/kpa_bt13_shape.h" #define NAMESPACE b_area_kmr_part_3_kpa_01 -EvtScript N(80234CB0) = { +EvtScript N(EVS_TexPan_Unused) = { EVT_SET(LVarA, LVar0) EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) - EVT_ADD(LVar0, 32768) + EVT_ADD(LVar0, 0x8000) EVT_ADD(LVar1, 0) EVT_WAIT(5) EVT_END_LOOP @@ -18,14 +19,14 @@ EvtScript N(80234CB0) = { EVT_END }; -EvtScript N(beforeBattle_80234D60) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80234D9C) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -34,6 +35,6 @@ Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt13_shape", .hit = "kpa_bt13_hit", - .preBattle = &N(beforeBattle_80234D60), - .postBattle = &N(afterBattle_80234D9C), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/kmr_part_3/stage/mac_01.c b/src/battle/area/kmr_part_3/stage/mac_01.c index e4b1ebebe4..996f83a531 100644 --- a/src/battle/area/kmr_part_3/stage/mac_01.c +++ b/src/battle/area/kmr_part_3/stage/mac_01.c @@ -1,33 +1,34 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/mac_bt01_shape.h" #define NAMESPACE b_area_kmr_part_3_mac_01 -#include "common/UnkModelStuff2.inc.c" +#include "battle/common/stage/WaterEffects.inc.c" -EvtScript N(beforeBattle_80234B74) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_THREAD - EVT_SET(LVar0, 44) - EVT_EXEC(N(script2)) + EVT_SET(LVar0, MODEL_nami4) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_WAIT(5) - EVT_SET(LVar0, 47) - EVT_EXEC(N(script2)) + EVT_SET(LVar0, MODEL_nami3) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_WAIT(5) - EVT_SET(LVar0, 46) - EVT_EXEC(N(script2)) + EVT_SET(LVar0, MODEL_nami2) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_WAIT(5) - EVT_SET(LVar0, 45) - EVT_EXEC(N(script2)) + EVT_SET(LVar0, MODEL_nami1) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_END_THREAD - EVT_SET(LVar0, 40) - EVT_EXEC(N(script1)) + EVT_SET(LVar0, MODEL_o391) + EVT_EXEC(N(EVS_AnimateFishModel)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80234C70) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -37,6 +38,6 @@ Stage NAMESPACE = { .shape = "mac_bt01_shape", .hit = "mac_bt01_hit", .bg = "nok_bg", - .preBattle = &N(beforeBattle_80234B74), - .postBattle = &N(afterBattle_80234C70), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/kmr_part_3/stage/mim_01.c b/src/battle/area/kmr_part_3/stage/mim_01.c index bf47554a25..34a38d0c8f 100644 --- a/src/battle/area/kmr_part_3/stage/mim_01.c +++ b/src/battle/area/kmr_part_3/stage/mim_01.c @@ -1,18 +1,19 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/mim_bt01_shape.h" #define NAMESPACE b_area_kmr_part_3_mim_01 #include "common/UnkFogFunc2.inc.c" -EvtScript N(beforeBattle_80233670) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_CALL(N(UnkFogFunc2)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8023369C) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -21,7 +22,7 @@ Stage NAMESPACE = { .texture = "mim_tex", .shape = "mim_bt01_shape", .hit = "mim_bt01_hit", - .preBattle = &N(beforeBattle_80233670), - .postBattle = &N(afterBattle_8023369C), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/kmr_part_3/stage/nok_01.c b/src/battle/area/kmr_part_3/stage/nok_01.c index 214a7ade45..ecc779e2c8 100644 --- a/src/battle/area/kmr_part_3/stage/nok_01.c +++ b/src/battle/area/kmr_part_3/stage/nok_01.c @@ -3,58 +3,4 @@ #define NAMESPACE b_area_kmr_part_3_nok_01 -EvtScript N(80233450) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(TranslateModel, LVarA, 0, 2, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 2, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(beforeBattle_80233558) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SET(LVar0, 19) - EVT_EXEC(N(80233450)) - EVT_SET(LVar0, 20) - EVT_EXEC(N(80233450)) - EVT_SET(LVar0, 21) - EVT_EXEC(N(80233450)) - EVT_SET(LVar0, 22) - EVT_EXEC(N(80233450)) - EVT_SET(LVar0, 23) - EVT_EXEC(N(80233450)) - EVT_SET(LVar0, 24) - EVT_EXEC(N(80233450)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80233620) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80233630)[] = { - 0x0000001E, 0x0000001D, 0x0000001C, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "nok_tex", - .shape = "nok_bt01_shape", - .hit = "nok_bt01_hit", - .bg = "nok_bg", - .preBattle = &N(beforeBattle_80233558), - .postBattle = &N(afterBattle_80233620), - .foregroundModelList = N(foregroundModelList_80233630), -}; +#include "battle/common/stage/nok_01.inc.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 index 8a42eee845..d095da91e2 100644 --- a/src/battle/area/kmr_part_3/stage/sam_01.c +++ b/src/battle/area/kmr_part_3/stage/sam_01.c @@ -1,41 +1,44 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/sam_bt01_shape.h" #define NAMESPACE b_area_kmr_part_3_sam_01 -#include "common/UnkModelStuff.inc.c" +#include "battle/common/stage/sam_Snowflakes.inc.c" -EvtScript N(beforeBattle_80233998) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_EXEC(N(UnkModelStuffScript1)) + EVT_EXEC(N(EVS_SpawnSnowfall)) EVT_THREAD - EVT_SET(LVar0, 22) + EVT_SET(LVar0, MODEL_o262) EVT_SET(LVar1, 1) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) - EVT_SET(LVar0, 20) + EVT_SET(LVar0, MODEL_o261) EVT_SET(LVar1, 3) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) - EVT_SET(LVar0, 18) + EVT_SET(LVar0, MODEL_o260) EVT_SET(LVar1, 4) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) - EVT_SET(LVar0, 16) + EVT_SET(LVar0, MODEL_o253) EVT_SET(LVar1, 2) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_END_THREAD EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80233AA8) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80233AB8)[] = { - 0xFFFFFFFF, 0x0000001A, 0x00000000, +s32 N(ForegroundModels)[] = { + -1, + MODEL_saku, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -43,7 +46,7 @@ Stage NAMESPACE = { .shape = "sam_bt01_shape", .hit = "sam_bt01_hit", .bg = "yki_bg", - .preBattle = &N(beforeBattle_80233998), - .postBattle = &N(afterBattle_80233AA8), - .foregroundModelList = N(foregroundModelList_80233AB8), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa/actor/bony_beetle.c b/src/battle/area/kpa/actor/bony_beetle.c index 17cf231639..eb06f8a4b3 100644 --- a/src/battle/area/kpa/actor/bony_beetle.c +++ b/src/battle/area/kpa/actor/bony_beetle.c @@ -142,7 +142,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 50, .airLiftChance = 70, @@ -165,12 +165,12 @@ EvtScript N(init) = { EVT_IF_EQ(LVar1, 1) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_SPIKY)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_spiky))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim05) EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim04) EVT_END_IF EVT_ELSE @@ -178,19 +178,19 @@ EvtScript N(init) = { EVT_IF_LT(LVar0, 500) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim04) EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_SPIKY)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_spiky))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim05) EVT_END_IF EVT_END_IF EVT_END_IF 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(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) @@ -253,14 +253,14 @@ EvtScript N(changeSpikesState) = { EVT_CASE_EQ(N(STATE_NORMAL)) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20CE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_SPIKY)) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim2E) EVT_WAIT(25) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_spiky))) EVT_CASE_EQ(N(STATE_SPIKY)) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20CF) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim2F) EVT_WAIT(25) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal))) @@ -334,8 +334,8 @@ EvtScript N(handleEvent_normal) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), 1) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim08) EVT_USE_BUF(N(bounceTable)) EVT_LOOP(20) @@ -428,18 +428,18 @@ EvtScript N(attackShellToss) = { EVT_WAIT(10) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(10) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim16) EVT_WAIT(15) EVT_LABEL(100) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -460,7 +460,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim0E) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -556,8 +556,8 @@ EvtScript N(handleEvent_spiky) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), 1) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_spiky_flipped))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim09) EVT_USE_BUF(N(bounceTable)) EVT_LOOP(20) @@ -609,7 +609,7 @@ EvtScript N(handleEvent_spiky) = { EVT_ADD(LVar0, -8) EVT_ADD(LVar1, 26) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) @@ -666,15 +666,15 @@ EvtScript N(attackSpikeBounce) = { EVT_WAIT(10) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(10) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 32, 6, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 32, 6, 0, 10, 0) EVT_WAIT(5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 32, 8, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 32, 8, 0, 10, 0) EVT_WAIT(5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 32, 10, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 32, 10, 0, 10, 0) EVT_WAIT(5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 32, 12, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 32, 12, 0, 10, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim17) @@ -683,12 +683,12 @@ EvtScript N(attackSpikeBounce) = { EVT_THREAD EVT_LOOP(20) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 5, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -764,7 +764,7 @@ EvtScript N(attackSpikeBounce) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BonyBeetle_Anim0F) EVT_EXEC_WAIT(DoReturnHome) @@ -864,7 +864,7 @@ EvtScript N(8021B7C8) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), 1) 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(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -8) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 21) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) @@ -876,7 +876,7 @@ EvtScript N(8021B7C8) = { EVT_SET(LVar1, 0) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) @@ -934,7 +934,7 @@ EvtScript N(handleEvent_flipped) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim1A) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_USE_BUF(N(bounceTable)) EVT_LOOP(20) EVT_BUF_READ1(LVar0) @@ -992,7 +992,7 @@ EvtScript N(standUp) = { EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim1C) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim06) @@ -1002,7 +1002,7 @@ EvtScript N(standUp) = { EVT_CALL(SetBattleCamZoom, 350) EVT_CALL(SetBattleCamOffsetZ, 20) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim1C) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim06) @@ -1013,7 +1013,7 @@ EvtScript N(standUp) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, FALSE) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -1066,7 +1066,7 @@ EvtScript N(handleEvent_spiky_flipped) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_spiky_flipped))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim1B) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_USE_BUF(N(bounceTable)) EVT_LOOP(20) EVT_BUF_READ1(LVar0) @@ -1125,7 +1125,7 @@ EvtScript N(standUp_spiky) = { EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim1D) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim07) @@ -1135,7 +1135,7 @@ EvtScript N(standUp_spiky) = { EVT_CALL(SetBattleCamZoom, 350) EVT_CALL(SetBattleCamOffsetZ, 20) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim1D) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim07) @@ -1146,8 +1146,8 @@ EvtScript N(standUp_spiky) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_SPIKY)) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_spiky))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, FALSE) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/area/kpa/actor/dry_bones.c b/src/battle/area/kpa/actor/dry_bones.c index f79debe240..3accc74588 100644 --- a/src/battle/area/kpa/actor/dry_bones.c +++ b/src/battle/area/kpa/actor/dry_bones.c @@ -132,7 +132,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 50, .airLiftChance = 75, @@ -160,7 +160,7 @@ EvtScript N(init) = { EvtScript N(nextTurn) = { EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVarA) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -171,11 +171,11 @@ EvtScript N(nextTurn) = { EVT_RETURN EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(1) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -183,16 +183,16 @@ EvtScript N(nextTurn) = { EVT_IF_NE(LVar3, 1) EVT_RETURN EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(1) EVT_END_IF - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(2) EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_ATTACK | ACTOR_FLAG_NO_DMG_APPLY, 1) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_ATTACK | ACTOR_FLAG_NO_DMG_APPLY, TRUE) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(2) EVT_END_IF @@ -245,7 +245,7 @@ EvtScript N(reassemble) = { EVT_ADD(LVar0, 2) EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0) EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVarA) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -253,11 +253,11 @@ EvtScript N(reassemble) = { EVT_IF_NE(LVar2, LVarA) EVT_RETURN EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(1) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -265,16 +265,16 @@ EvtScript N(reassemble) = { EVT_IF_NE(LVar3, 1) EVT_RETURN EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(1) EVT_END_IF - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(2) EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_ATTACK | ACTOR_FLAG_NO_DMG_APPLY, 1) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_ATTACK | ACTOR_FLAG_NO_DMG_APPLY, TRUE) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(2) EVT_END_IF @@ -296,12 +296,12 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_DryBones_Anim07) EVT_EXEC_WAIT(DoNormalHit) EVT_CASE_EQ(EVENT_BURN_HIT) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, TRUE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_DryBones_Anim0B) EVT_SET_CONST(LVar2, ANIM_DryBones_Anim0C) EVT_EXEC_WAIT(DoBurnHit) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, FALSE) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_DryBones_Anim0B) @@ -447,7 +447,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(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_2000, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_2000, FALSE) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -8, 30) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -10) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0) @@ -485,24 +485,24 @@ EvtScript N(takeTurn) = { EVT_ADD(LVar1, 20) EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 2, SOUND_2D1) - EVT_CALL(SetPartSounds, ACTOR_SELF, 2, 0, 0, 0) - EVT_CALL(SetPartSounds, ACTOR_SELF, 2, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 2, ACTOR_SOUND_WALK, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 2, ACTOR_SOUND_JUMP, 0, 0) EVT_EXEC_GET_TID(N(rotateBone), LVarA) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 100) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(12.0)) - EVT_CALL(RunPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(RunPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_KILL_THREAD(LVarA) EVT_IF_EQ(LVarF, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_WAIT(15) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -514,15 +514,15 @@ EvtScript N(takeTurn) = { EVT_ADD(LVar1, 20) EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 2, SOUND_2D1) - EVT_CALL(SetPartSounds, ACTOR_SELF, 2, 0, 0, 0) - EVT_CALL(SetPartSounds, ACTOR_SELF, 2, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 2, ACTOR_SOUND_WALK, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 2, ACTOR_SOUND_JUMP, 0, 0) EVT_EXEC_GET_TID(N(rotateBone), LVarA) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(12.0)) - EVT_CALL(RunPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0) + EVT_CALL(RunPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, FALSE) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) @@ -531,8 +531,8 @@ EvtScript N(takeTurn) = { EVT_CALL(GetPartOffset, ACTOR_SELF, 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(JumpPartTo, ACTOR_SELF, 2, LVar0, 0, LVar2, 30, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_KILL_THREAD(LVarA) EVT_CALL(YieldTurn) EVT_END_CASE_GROUP diff --git a/src/battle/area/kpa/stage/kpa_01.c b/src/battle/area/kpa/stage/kpa_01.c index c83b43eec7..099f3ec2a1 100644 --- a/src/battle/area/kpa/stage/kpa_01.c +++ b/src/battle/area/kpa/stage/kpa_01.c @@ -19,10 +19,10 @@ EvtScript N(8022EFE0) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 36, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 36, MODEL_GROUP_HIDDEN) EVT_THREAD EVT_SET(LVar0, 37) EVT_EXEC(N(8022EFE0)) @@ -34,20 +34,23 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o383, MODEL_o382, MODEL_o381, 0, +s32 N(ForegroundModels)[] = { + MODEL_o383, + MODEL_o382, + MODEL_o381, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt01_shape", .hit = "kpa_bt01_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa/stage/kpa_01b.c b/src/battle/area/kpa/stage/kpa_01b.c index e2e2977823..ab2cdce74b 100644 --- a/src/battle/area/kpa/stage/kpa_01b.c +++ b/src/battle/area/kpa/stage/kpa_01b.c @@ -19,10 +19,10 @@ EvtScript N(8022F180) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 25, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 25, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, 37) EVT_EXEC(N(8022F180)) EVT_SET(LVar0, 39) @@ -31,20 +31,23 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o383, MODEL_o382, MODEL_o381, 0, +s32 N(ForegroundModels)[] = { + MODEL_o383, + MODEL_o382, + MODEL_o381, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt01_shape", .hit = "kpa_bt01_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa/stage/kpa_02.c b/src/battle/area/kpa/stage/kpa_02.c index 27d80f7d59..2a658f7c00 100644 --- a/src/battle/area/kpa/stage/kpa_02.c +++ b/src/battle/area/kpa/stage/kpa_02.c @@ -57,9 +57,9 @@ EvtScript N(8022F4BC) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 16) EVT_SET(LVar1, 1) EVT_SET(LVar2, -400) @@ -84,20 +84,21 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_saku, 0, +s32 N(ForegroundModels)[] = { + MODEL_saku, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt02_shape", .hit = "kpa_bt02_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa/stage/kpa_03.c b/src/battle/area/kpa/stage/kpa_03.c index cf48c94dec..03e51a9544 100644 --- a/src/battle/area/kpa/stage/kpa_03.c +++ b/src/battle/area/kpa/stage/kpa_03.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_kpa_kpa_03 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_CALL(func_80253734, BTL_DARKNESS_MODE_1) @@ -13,20 +13,21 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_tar1, 0, +s32 N(ForegroundModels)[] = { + MODEL_tar1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt03_shape", .hit = "kpa_bt03_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa/stage/kpa_04.c b/src/battle/area/kpa/stage/kpa_04.c index 86c38cbe61..461e4811c4 100644 --- a/src/battle/area/kpa/stage/kpa_04.c +++ b/src/battle/area/kpa/stage/kpa_04.c @@ -18,17 +18,17 @@ EvtScript N(8022F7F0) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 15, 0) - EVT_CALL(SetGroupEnabled, 17, 0) - EVT_CALL(SetGroupEnabled, 16, 0) - EVT_CALL(SetGroupEnabled, 26, 0) - EVT_CALL(SetGroupEnabled, 18, 0) - EVT_CALL(SetGroupEnabled, 20, 0) - EVT_CALL(SetGroupEnabled, 22, 0) - EVT_CALL(SetGroupEnabled, 24, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 15, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 17, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 16, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 26, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 18, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 20, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 22, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 24, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, 32) EVT_EXEC(N(8022F7F0)) EVT_SET(LVar0, 34) @@ -39,7 +39,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -48,6 +48,6 @@ Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt04_shape", .hit = "kpa_bt04_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/kpa/stage/kpa_04b.c b/src/battle/area/kpa/stage/kpa_04b.c index 2f8aedecc5..d47da69eae 100644 --- a/src/battle/area/kpa/stage/kpa_04b.c +++ b/src/battle/area/kpa/stage/kpa_04b.c @@ -18,16 +18,16 @@ EvtScript N(8022FA10) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 13, 0) - EVT_CALL(SetGroupEnabled, 17, 0) - EVT_CALL(SetGroupEnabled, 16, 0) - EVT_CALL(SetGroupEnabled, 18, 0) - EVT_CALL(SetGroupEnabled, 20, 0) - EVT_CALL(SetGroupEnabled, 22, 0) - EVT_CALL(SetGroupEnabled, 24, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 13, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 17, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 16, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 18, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 20, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 22, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 24, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, 32) EVT_EXEC(N(8022FA10)) EVT_SET(LVar0, 34) @@ -38,7 +38,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -47,6 +47,6 @@ Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt04_shape", .hit = "kpa_bt04_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/kpa/stage/kpa_04c.c b/src/battle/area/kpa/stage/kpa_04c.c index 38cb46a15b..21c3a5682a 100644 --- a/src/battle/area/kpa/stage/kpa_04c.c +++ b/src/battle/area/kpa/stage/kpa_04c.c @@ -18,15 +18,15 @@ EvtScript N(8022FC20) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 30, 0) - EVT_CALL(SetGroupEnabled, 39, 0) - EVT_CALL(SetGroupEnabled, 38, 0) - EVT_CALL(SetGroupEnabled, 36, 0) - EVT_CALL(SetGroupEnabled, 34, 0) - EVT_CALL(SetGroupEnabled, 32, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 30, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 39, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 38, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 36, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 34, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 32, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, 18) EVT_EXEC(N(8022FC20)) EVT_SET(LVar0, 20) @@ -39,7 +39,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -48,6 +48,6 @@ Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt04_shape", .hit = "kpa_bt04_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/kpa/stage/kpa_05.c b/src/battle/area/kpa/stage/kpa_05.c index 93ab680aca..3c3caab48e 100644 --- a/src/battle/area/kpa/stage/kpa_05.c +++ b/src/battle/area/kpa/stage/kpa_05.c @@ -4,27 +4,28 @@ #define NAMESPACE b_area_kpa_kpa_05 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_saku, 0, +s32 N(ForegroundModels)[] = { + MODEL_saku, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt05_shape", .hit = "kpa_bt05_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa/stage/kpa_07.c b/src/battle/area/kpa/stage/kpa_07.c index 344138e6e0..23c34596fe 100644 --- a/src/battle/area/kpa/stage/kpa_07.c +++ b/src/battle/area/kpa/stage/kpa_07.c @@ -57,9 +57,9 @@ EvtScript N(8023006C) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 16) EVT_SET(LVar1, 0) EVT_SET(LVar2, -200) @@ -79,20 +79,21 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_kemu1, 0, +s32 N(ForegroundModels)[] = { + MODEL_kemu1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt07_shape", .hit = "kpa_bt07_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa/stage/kpa_08.c b/src/battle/area/kpa/stage/kpa_08.c index dec7d78a45..6b8fb0af00 100644 --- a/src/battle/area/kpa/stage/kpa_08.c +++ b/src/battle/area/kpa/stage/kpa_08.c @@ -4,27 +4,28 @@ #define NAMESPACE b_area_kpa_kpa_08 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o478, 0, +s32 N(ForegroundModels)[] = { + MODEL_o478, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt08_shape", .hit = "kpa_bt08_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa/stage/kpa_09.c b/src/battle/area/kpa/stage/kpa_09.c index fe18a916ac..2475424531 100644 --- a/src/battle/area/kpa/stage/kpa_09.c +++ b/src/battle/area/kpa/stage/kpa_09.c @@ -4,27 +4,28 @@ #define NAMESPACE b_area_kpa_kpa_09 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o353, 0, +s32 N(ForegroundModels)[] = { + MODEL_o353, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt09_shape", .hit = "kpa_bt09_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa/stage/kpa_11.c b/src/battle/area/kpa/stage/kpa_11.c index 7558f7489a..ad4a2d5c47 100644 --- a/src/battle/area/kpa/stage/kpa_11.c +++ b/src/battle/area/kpa/stage/kpa_11.c @@ -4,27 +4,28 @@ #define NAMESPACE b_area_kpa_kpa_11 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_h2, 0, +s32 N(ForegroundModels)[] = { + MODEL_h2, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt11_shape", .hit = "kpa_bt11_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa/stage/kpa_13.c b/src/battle/area/kpa/stage/kpa_13.c index 8101b75c76..0ede990c7a 100644 --- a/src/battle/area/kpa/stage/kpa_13.c +++ b/src/battle/area/kpa/stage/kpa_13.c @@ -18,14 +18,14 @@ EvtScript N(80230440) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -34,6 +34,6 @@ Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt13_shape", .hit = "kpa_bt13_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/kpa/stage/kpa_14.c b/src/battle/area/kpa/stage/kpa_14.c index 5e932f1b87..99e72542bb 100644 --- a/src/battle/area/kpa/stage/kpa_14.c +++ b/src/battle/area/kpa/stage/kpa_14.c @@ -18,14 +18,14 @@ EvtScript N(80230570) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -34,6 +34,6 @@ Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt14_shape", .hit = "kpa_bt14_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/kpa2/actor/bowser.c b/src/battle/area/kpa2/actor/bowser.c index 58633c5671..9bb29bcf68 100644 --- a/src/battle/area/kpa2/actor/bowser.c +++ b/src/battle/area/kpa2/actor/bowser.c @@ -92,7 +92,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 50, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -353,13 +353,13 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 28, FALSE, TRUE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_SUB(LVar0, 35) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 14, FALSE, TRUE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(2.0)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) EVT_WAIT(3) @@ -380,7 +380,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(JumpToGoal, ACTOR_SELF, 24, FALSE, TRUE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Land) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_3), LVar0) @@ -396,7 +396,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) EVT_WAIT(3) @@ -437,7 +437,7 @@ EvtScript N(attackFlameBreath) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 40) EVT_SET(LVar4, 20) - EVT_CALL(PlayEffect, EFFECT_FIRE_BREATH, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIRE_BREATH, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 100) EVT_WAIT(20) @@ -498,9 +498,9 @@ EvtScript N(attackShockwaveDrain) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 15) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarF, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarF, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarE, 0) EVT_WAIT(16) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 45) @@ -510,7 +510,7 @@ EvtScript N(attackShockwaveDrain) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 13) EVT_SET(LVar1, 55) - EVT_CALL(PlayEffect, EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0) EVT_THREAD EVT_CALL(N(UnfadeBackgroundToBlack)) EVT_END_THREAD @@ -554,7 +554,7 @@ EvtScript N(attackShockwaveDrain) = { EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC, 0, STATUS_FLAG_POISON, 4, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(RemovePlayerBuffs, 268435455) + EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_JUMP_CHARGE | PLAYER_BUFF_HAMMER_CHARGE | PLAYER_BUFF_STONE | PLAYER_BUFF_HUSTLE | PLAYER_BUFF_STATIC | PLAYER_BUFF_TRANSPARENT | PLAYER_BUFF_CLOUD_NINE | PLAYER_BUFF_TURBO_CHARGE | PLAYER_BUFF_WATER_BLOCK | PLAYER_BUFF_PARTNER_GLOWING | 0xFFEFC04) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -595,10 +595,10 @@ EvtScript N(returnHome) = { EvtScript N(recover) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_ADD(LVar2, 60) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar1, LVar2, LVar3, EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar1, LVar2, LVar3, EVT_FLOAT(1.0), 0) EVT_ADD(LVar1, 30) EVT_ADD(LVar2, 20) - EVT_CALL(PlayEffect, EFFECT_RECOVER, 0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RECOVER, 0, LVar1, LVar2, LVar3, 10, 0) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_ADD(LVar0, 10) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) diff --git a/src/battle/area/kpa2/actor/bowser_intro.c b/src/battle/area/kpa2/actor/bowser_intro.c index 0bb640a9b7..680c90793a 100644 --- a/src/battle/area/kpa2/actor/bowser_intro.c +++ b/src/battle/area/kpa2/actor/bowser_intro.c @@ -124,7 +124,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 10, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -154,18 +154,18 @@ EvtScript N(init) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_PEACH_SPOKE), 0) EVT_CALL(SetActorVar, ACTOR_SELF, 14, 0) EVT_CALL(SetBattleMenuDisableFlags, BTL_MENU_DISABLED_JUMP) - EVT_CALL(CreateNpc, 0, ANIM_ParadePeach_IdleRaisedArms) - EVT_CALL(SetNpcYaw, 0, 90) - EVT_CALL(SetNpcPos, 0, -130, 0, -12) - EVT_CALL(EnableNpcShadow, 0, TRUE) + EVT_CALL(CreateNpc, 0x00000000, ANIM_ParadePeach_IdleRaisedArms) + EVT_CALL(SetNpcYaw, 0x00000000, 90) + EVT_CALL(SetNpcPos, 0x00000000, -130, 0, -12) + EVT_CALL(EnableNpcShadow, 0x00000000, TRUE) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn))) EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 1, 100, 0, 0, 0) EVT_EXEC(N(unkDecorationScript)) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_NO_GAME_OVER, 1) - EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_DONT_STOP_MUSIC, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_NO_GAME_OVER, TRUE) + EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_DONT_STOP_MUSIC, TRUE) EVT_RETURN EVT_END }; @@ -198,7 +198,7 @@ EvtScript N(nextTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 180) - EVT_CALL(SpeakToPlayer, 0, ANIM_ParadePeach_Talk, ANIM_ParadePeach_IdleRaisedArms, 5, MSG_Intro_0057) + EVT_CALL(SpeakToPlayer, 0x00000000, ANIM_ParadePeach_Talk, ANIM_ParadePeach_IdleRaisedArms, 5, MSG_Intro_0057) EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.5)) @@ -272,7 +272,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_BattleBowser_Jump) EVT_EXEC_WAIT(DoRecover) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_CASE_EQ(EVENT_30) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt) @@ -363,12 +363,12 @@ EvtScript N(attackClawSwipe) = { EVT_THREAD EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_TURN_COUNTER), LVar0) EVT_IF_GE(LVar0, 3) - EVT_CALL(SetNpcAnimation, 0, ANIM_ParadePeach_Weep) + EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_ParadePeach_Weep) EVT_ELSE - EVT_CALL(SetNpcAnimation, 0, ANIM_ParadePeach_HorrorLoop) + EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_ParadePeach_HorrorLoop) EVT_END_IF EVT_WAIT(45) - EVT_CALL(SetNpcAnimation, 0, ANIM_ParadePeach_IdleRaisedArms) + EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_ParadePeach_IdleRaisedArms) EVT_END_THREAD EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -411,7 +411,7 @@ EvtScript N(attackFireBreath) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 40) EVT_SET(LVar4, 20) - EVT_CALL(PlayEffect, EFFECT_FIRE_BREATH, 2, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIRE_BREATH, 2, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0) EVT_CALL(N(UnkFireBreathFXFunc), LVarF) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 50, 148) @@ -419,7 +419,7 @@ EvtScript N(attackFireBreath) = { EVT_WAIT(70) EVT_CALL(PlaySound, SOUND_3BD | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD - EVT_CALL(SetNpcAnimation, 0, ANIM_ParadePeach_Weep) + EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_ParadePeach_Weep) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 55) EVT_WAIT(20) @@ -438,7 +438,7 @@ EvtScript N(attackFireBreath) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) EVT_END_THREAD EVT_WAIT(60) - EVT_CALL(SetNpcAnimation, 0, ANIM_ParadePeach_HorrorLoop) + EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_ParadePeach_HorrorLoop) EVT_LOOP(68) EVT_CALL(GetAnimation, ACTOR_PLAYER, 0, LVar0) EVT_IF_EQ(LVar0, ANIM_Mario_FallDown) @@ -446,7 +446,7 @@ EvtScript N(attackFireBreath) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetNpcAnimation, 0, ANIM_ParadePeach_Bow) + EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_ParadePeach_Bow) EVT_WAIT(30) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -475,7 +475,7 @@ EvtScript N(powerUp) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 90) - EVT_CALL(PlayEffect, EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 30, 30, 7, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 30, 30, 7, 30, 0) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Brandish) EVT_WAIT(30) @@ -554,25 +554,25 @@ EvtScript N(useStarRod) = { EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_ADD(LVar0, 15) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarF, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarF, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarE, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarD, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarD, 0) EVT_ELSE EVT_ADD(LVar0, 6) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarF, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarF, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarE, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarD, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarD, 0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) EVT_CALL(RemoveEffect, LVarD) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ENCHANTED, 1) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, 11) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ENCHANTED, TRUE) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, ACTOR_DECORATION_RADIAL_STAR_EMITTER) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_boosted))) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_boosted))) EVT_CALL(N(RemoveChillOut)) @@ -582,12 +582,12 @@ EvtScript N(useStarRod) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 40) EVT_ADD(LVar2, 12) - EVT_CALL(PlayEffect, EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 70, 80, 25, 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 70, 80, 25, 60, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 16) EVT_ADD(LVar2, 12) - EVT_CALL(PlayEffect, EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 28, 32, 10, 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 28, 32, 10, 60, 0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2125) EVT_THREAD @@ -606,7 +606,7 @@ EvtScript N(useStarRod) = { EVT_ELSE EVT_ADD(LVar1, 16) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 15, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 15, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2124) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/area/kpa2/actor/bowser_phase_1.c b/src/battle/area/kpa2/actor/bowser_phase_1.c index ae1d3fa9c4..049188a4fb 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_1.c +++ b/src/battle/area/kpa2/actor/bowser_phase_1.c @@ -138,7 +138,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 50, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -348,7 +348,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_BattleBowser_Jump) EVT_EXEC_WAIT(DoRecover) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_CASE_EQ(EVENT_30) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt) @@ -357,7 +357,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_SWAP_PARTNER) EVT_CALL(N(UnfadeBackgroundToBlack)) EVT_CASE_EQ(EVENT_STAR_BEAM) - EVT_CALL(FreezeBattleCam, 1) + EVT_CALL(FreezeBattleCam, TRUE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -369,11 +369,11 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, LVar3) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 50, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 50, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, LVar4) - EVT_CALL(PlayEffect, EFFECT_SHIMMER_BURST, 1, LVar0, LVar1, LVar2, EVT_FLOAT(0.7), 30, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ENCHANTED, 0) + EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar0, LVar1, LVar2, EVT_FLOAT(0.7), 30, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ENCHANTED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_TURNS_SINCE_LAST_STAR_BEAM), 0) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) @@ -410,7 +410,7 @@ EvtScript N(handleEvent) = { EVT_CALL(ActorSpeak, MSG_CH8_0076, ACTOR_SELF, 1, ANIM_BattleBowser_Hurt, ANIM_BattleBowser_Hurt) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) EVT_END_IF - EVT_CALL(FreezeBattleCam, 0) + EVT_CALL(FreezeBattleCam, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) @@ -431,13 +431,13 @@ EvtScript N(onSpinSmashOrNormalHit) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLAGS), LVar0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) - EVT_CALL(FreezeBattleCam, 1) + EVT_CALL(FreezeBattleCam, TRUE) EVT_EXEC_WAIT(N(onHit)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(ActorSpeak, MSG_CH8_0077, ACTOR_SELF, 1, ANIM_BattleBowser_AnnoyedTalk, ANIM_BattleBowser_AnnoyedTalk) - EVT_CALL(FreezeBattleCam, 0) + EVT_CALL(FreezeBattleCam, FALSE) EVT_ELSE EVT_EXEC_WAIT(N(onHit)) EVT_END_IF @@ -501,7 +501,7 @@ EvtScript N(onDeath) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -611,25 +611,25 @@ EvtScript N(useStarRod) = { EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_ADD(LVar0, 15) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarF, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarF, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarE, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarD, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarD, 0) EVT_ELSE EVT_ADD(LVar0, 6) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarF, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarF, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarE, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarD, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarD, 0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) EVT_CALL(RemoveEffect, LVarD) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ENCHANTED, 1) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, 11) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ENCHANTED, TRUE) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, ACTOR_DECORATION_RADIAL_STAR_EMITTER) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_boosted))) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_boosted))) EVT_CALL(N(RemoveChillOut)) @@ -639,12 +639,12 @@ EvtScript N(useStarRod) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 40) EVT_ADD(LVar2, 12) - EVT_CALL(PlayEffect, EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 70, 80, 25, 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 70, 80, 25, 60, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 16) EVT_ADD(LVar2, 12) - EVT_CALL(PlayEffect, EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 28, 32, 10, 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 28, 32, 10, 60, 0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2125) EVT_THREAD @@ -663,7 +663,7 @@ EvtScript N(useStarRod) = { EVT_ELSE EVT_ADD(LVar1, 16) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 15, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 15, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2124) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 39) @@ -761,21 +761,21 @@ EvtScript N(recover) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 90) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 50, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 50, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 15) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, 90, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, 90, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 6) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.4), 50, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.4), 50, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 6) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, 36, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, 36, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_END_IF EVT_WAIT(30) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0) @@ -790,7 +790,7 @@ EvtScript N(recover) = { EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, ACTOR_SELF, LVar0, 0) + EVT_CALL(HealActor, ACTOR_SELF, LVar0, FALSE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -968,7 +968,7 @@ EvtScript N(inflictCommandLoss) = { 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, N(VAR_LOST_ABILITY_ITEM), LVar0) EVT_ADD(LVar1, 7) EVT_CALL(N(ItemEntityJumpToPos), LVar0, LVar1, LVar2, LVar3, 8, EVT_FLOAT(1.0)) @@ -1027,19 +1027,19 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_SUB(LVar0, 35) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 14, FALSE, TRUE, FALSE) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(2.0)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) EVT_WAIT(3) @@ -1059,7 +1059,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -1100,14 +1100,14 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_ADD(LVar0, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(2.0)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) EVT_WAIT(3) @@ -1134,22 +1134,22 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_LOST_ABILITY_ITEM), LVar0) EVT_CALL(N(GetItemEntityPosition), LVar0, LVar1, LVar2, LVar3) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_COMMAND_LOSS_STATE), 2) - EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.5), 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(2.0), 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.5), 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(2.0), 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_StompOnce) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.5), 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(2.0), 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.5), 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(2.0), 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_StompOnce) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.5), 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(2.0), 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.5), 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(2.0), 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Mock) @@ -1170,13 +1170,13 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) EVT_WAIT(3) @@ -1200,7 +1200,7 @@ EvtScript N(onAttackMissed) = { EVT_WAIT(5) EVT_LOOP(4) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(2.0)) EVT_WAIT(4) EVT_END_LOOP EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) @@ -1329,16 +1329,16 @@ EvtScript N(attackShockwaveDrain) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 15) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarF, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarF, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 90, LVar2, EVT_FLOAT(1.0), LVarE, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 6) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarF, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarF, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarE, 0) EVT_END_IF EVT_WAIT(25) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) @@ -1355,12 +1355,12 @@ EvtScript N(attackShockwaveDrain) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 13) EVT_SET(LVar1, 55) - EVT_CALL(PlayEffect, EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_SET(LVar1, 22) - EVT_CALL(PlayEffect, EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0) EVT_END_IF EVT_THREAD EVT_CALL(N(UnfadeBackgroundToBlack)) @@ -1394,7 +1394,7 @@ EvtScript N(attackShockwaveDrain) = { EVT_SET(LVar1, 3) EVT_END_IF EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(RemovePlayerBuffs, 65536) + EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_PARTNER_GLOWING) EVT_IF_NE(LVarA, HIT_RESULT_LUCKY) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) EVT_END_IF @@ -1425,7 +1425,7 @@ EvtScript N(attackShockwaveDrain) = { EVT_SET(LVar1, 4) EVT_END_IF EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(RemovePlayerBuffs, 268435455) + EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_JUMP_CHARGE | PLAYER_BUFF_HAMMER_CHARGE | PLAYER_BUFF_STONE | PLAYER_BUFF_HUSTLE | PLAYER_BUFF_STATIC | PLAYER_BUFF_TRANSPARENT | PLAYER_BUFF_CLOUD_NINE | PLAYER_BUFF_TURBO_CHARGE | PLAYER_BUFF_WATER_BLOCK | PLAYER_BUFF_PARTNER_GLOWING | 0xFFEFC04) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1495,9 +1495,9 @@ EvtScript N(attackFlameBreath) = { EVT_SET(LVar4, 20) EVT_CALL(GetPartEventFlags, ACTOR_SELF, 1, LVar6) EVT_IF_FLAG(LVar6, ACTOR_EVENT_FLAG_ENCHANTED) - EVT_CALL(PlayEffect, EFFECT_FIRE_BREATH, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIRE_BREATH, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0) EVT_ELSE - EVT_CALL(PlayEffect, EFFECT_FIRE_BREATH, 2, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIRE_BREATH, 2, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0) EVT_CALL(N(UnkFireBreathFXFunc), LVarF) EVT_END_IF EVT_THREAD @@ -1561,7 +1561,7 @@ EvtScript N(onBurnHit) = { EVT_CALL(GetLastEvent, ACTOR_SELF, LVar3) EVT_IF_EQ(LVar3, 36) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 1) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ENCHANTED, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ENCHANTED, FALSE) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1) EVT_CALL(func_80269E80, LVar3) @@ -1645,7 +1645,7 @@ EvtScript N(onBurnHit) = { EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_END_IF EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_END_SWITCH diff --git a/src/battle/area/kpa2/actor/bowser_phase_2.c b/src/battle/area/kpa2/actor/bowser_phase_2.c index 07b791f113..3accbf839a 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_2.c +++ b/src/battle/area/kpa2/actor/bowser_phase_2.c @@ -136,7 +136,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -180,11 +180,11 @@ EvtScript N(init) = { EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 1, 150, 0, 0, 0) EVT_EXEC(N(unkDecorationScript)) EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 0, 150, 150, 0, 0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 10) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_A) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) - EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_400 | BS_FLAGS2_DONT_STOP_MUSIC, 1) + EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_400 | BS_FLAGS2_DONT_STOP_MUSIC, TRUE) EVT_RETURN EVT_END }; @@ -292,7 +292,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_BattleBowser_Jump) EVT_EXEC_WAIT(DoRecover) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_CASE_EQ(EVENT_SWAP_PARTNER) EVT_CALL(N(UnfadeBackgroundToBlack)) EVT_CASE_EQ(EVENT_30) @@ -311,7 +311,7 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, LVar3) - EVT_CALL(PlayEffect, EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 20, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 20, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_RearUpLaugh) EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) @@ -350,8 +350,8 @@ EvtScript N(handleEvent) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(GetActorHP, ACTOR_SELF, GB_FinalBowserHP) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, 1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, TRUE) EVT_CALL(func_8026F60C, 20) EVT_RETURN EVT_CASE_EQ(20) @@ -462,25 +462,25 @@ EvtScript N(useStarRod) = { EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_ADD(LVar0, 22) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarF, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.0), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarF, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.0), LVarE, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarD, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarD, 0) EVT_ELSE EVT_ADD(LVar0, 9) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarF, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.4), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarF, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.4), LVarE, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarD, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarD, 0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) EVT_CALL(RemoveEffect, LVarD) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_80000, 1) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, 11) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_80000, TRUE) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, ACTOR_DECORATION_RADIAL_STAR_EMITTER) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_boosted))) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_boosted))) EVT_CALL(N(RemoveChillOut)) @@ -490,12 +490,12 @@ EvtScript N(useStarRod) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) EVT_ADD(LVar2, 12) - EVT_CALL(PlayEffect, EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 105, 120, 37, 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 105, 120, 37, 60, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 24) EVT_ADD(LVar2, 12) - EVT_CALL(PlayEffect, EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 42, 48, 15, 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 42, 48, 15, 60, 0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2125) EVT_THREAD @@ -514,7 +514,7 @@ EvtScript N(useStarRod) = { EVT_ELSE EVT_ADD(LVar1, 24) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 15, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2124) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 39) @@ -612,21 +612,21 @@ EvtScript N(recover) = { EVT_ADD(LVar0, 22) EVT_ADD(LVar1, 135) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 50, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 50, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 22) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, 135, LVar2, EVT_FLOAT(0.45), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, 135, LVar2, EVT_FLOAT(0.45), 30, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 9) EVT_ADD(LVar1, 54) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.6), 50, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.6), 50, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 9) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, 54, LVar2, EVT_FLOAT(0.18), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, 54, LVar2, EVT_FLOAT(0.18), 30, 0) EVT_END_IF EVT_WAIT(30) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0) @@ -641,7 +641,7 @@ EvtScript N(recover) = { EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, ACTOR_SELF, LVar0, 0) + EVT_CALL(HealActor, ACTOR_SELF, LVar0, FALSE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -821,7 +821,7 @@ EvtScript N(inflictCommandLoss) = { 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, N(VAR_LOST_ABILITY_ITEM), LVar0) EVT_ADD(LVar1, 7) EVT_CALL(N(ItemEntityJumpToPos), LVar0, LVar1, LVar2, LVar3, 8, EVT_FLOAT(1.0)) @@ -880,19 +880,19 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_SUB(LVar0, 35) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 14, FALSE, TRUE, FALSE) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(2.0)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) EVT_WAIT(3) @@ -912,7 +912,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -953,14 +953,14 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_ADD(LVar0, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(2.0)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) EVT_WAIT(3) @@ -987,22 +987,22 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_LOST_ABILITY_ITEM), LVar0) EVT_CALL(N(GetItemEntityPosition), LVar0, LVar1, LVar2, LVar3) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_COMMAND_LOSS_STATE), 2) - EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_StompOnce) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_StompOnce) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Mock) @@ -1023,13 +1023,13 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) EVT_WAIT(3) @@ -1053,7 +1053,7 @@ EvtScript N(onAttackMissed) = { EVT_WAIT(5) EVT_LOOP(4) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(2.0)) EVT_WAIT(4) EVT_END_LOOP EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) @@ -1180,16 +1180,16 @@ EvtScript N(attackShockwaveDrain) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 22) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 135, LVar2, EVT_FLOAT(1.0), LVarF, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 135, LVar2, EVT_FLOAT(1.0), LVarF, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.0), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.0), LVarE, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 9) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 54, LVar2, EVT_FLOAT(0.4), LVarF, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 54, LVar2, EVT_FLOAT(0.4), LVarF, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.4), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.4), LVarE, 0) EVT_END_IF EVT_WAIT(25) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) @@ -1206,12 +1206,12 @@ EvtScript N(attackShockwaveDrain) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 19) EVT_SET(LVar1, 55) - EVT_CALL(PlayEffect, EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 7) EVT_SET(LVar1, 22) - EVT_CALL(PlayEffect, EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0) EVT_END_IF EVT_THREAD EVT_CALL(N(UnfadeBackgroundToBlack)) @@ -1245,7 +1245,7 @@ EvtScript N(attackShockwaveDrain) = { EVT_SET(LVar1, 3) EVT_END_IF EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(RemovePlayerBuffs, 65536) + EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_PARTNER_GLOWING) EVT_IF_NE(LVarA, HIT_RESULT_LUCKY) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) EVT_END_IF @@ -1276,7 +1276,7 @@ EvtScript N(attackShockwaveDrain) = { EVT_SET(LVar1, 6) EVT_END_IF EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(RemovePlayerBuffs, 268435455) + EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_JUMP_CHARGE | PLAYER_BUFF_HAMMER_CHARGE | PLAYER_BUFF_STONE | PLAYER_BUFF_HUSTLE | PLAYER_BUFF_STATIC | PLAYER_BUFF_TRANSPARENT | PLAYER_BUFF_CLOUD_NINE | PLAYER_BUFF_TURBO_CHARGE | PLAYER_BUFF_WATER_BLOCK | PLAYER_BUFF_PARTNER_GLOWING | 0xFFEFC04) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1346,7 +1346,7 @@ EvtScript N(attackFlameBreath) = { EVT_SET(LVar4, 20) EVT_CALL(GetPartEventFlags, ACTOR_SELF, 1, LVar6) EVT_IF_FLAG(LVar6, ACTOR_EVENT_FLAG_80000) - EVT_CALL(PlayEffect, EFFECT_FIRE_BREATH, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIRE_BREATH, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0) EVT_ELSE EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar7) EVT_IF_NOT_FLAG(LVar7, STATUS_FLAG_SHRINK) @@ -1355,7 +1355,7 @@ EvtScript N(attackFlameBreath) = { EVT_ADD(LVar0, 6) EVT_END_IF EVT_SUB(LVar3, 10) - EVT_CALL(PlayEffect, EFFECT_FIRE_BREATH, 2, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIRE_BREATH, 2, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0) EVT_CALL(N(UnkFireBreathFXFunc), LVarF) EVT_END_IF EVT_THREAD @@ -1498,7 +1498,7 @@ EvtScript N(onBurnHit) = { EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_END_IF EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_END_SWITCH @@ -1521,15 +1521,15 @@ EvtScript N(attackLightningBlast) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 54) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 50, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 50, 0) EVT_WAIT(50) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 22) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarF, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarF, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarE, 0) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) @@ -1537,15 +1537,15 @@ EvtScript N(attackLightningBlast) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 21) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.6), 50, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.6), 50, 0) EVT_WAIT(50) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 9) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarF, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarF, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarE, 0) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) diff --git a/src/battle/area/kpa2/actor/bowser_phase_3.c b/src/battle/area/kpa2/actor/bowser_phase_3.c index 152225b0e5..492328ca76 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_3.c +++ b/src/battle/area/kpa2/actor/bowser_phase_3.c @@ -139,7 +139,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -227,16 +227,16 @@ EvtScript N(init) = { EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 1, 150, 0, 0, 0) EVT_EXEC(N(unkDecorationScript)) EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 0, 150, 150, 0, 0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 10) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_80000, 1) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, 11) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_A) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_80000, TRUE) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, ACTOR_DECORATION_RADIAL_STAR_EMITTER) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_boosted))) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_boosted))) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn))) - EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_DONT_STOP_MUSIC, 1) + EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_DONT_STOP_MUSIC, TRUE) EVT_RETURN EVT_END }; @@ -427,7 +427,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_BattleBowser_Jump) EVT_EXEC_WAIT(DoRecover) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_CASE_EQ(EVENT_SWAP_PARTNER) EVT_CALL(N(UnfadeBackgroundToBlack)) EVT_CASE_EQ(EVENT_30) @@ -439,12 +439,12 @@ EvtScript N(handleEvent) = { EVT_SET(LVar1, ANIM_BattleBowser_Idle) EVT_EXEC_WAIT(N(onImmune)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, 1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, TRUE) EVT_CALL(func_8026F60C, 10) EVT_RETURN EVT_CASE_EQ(EVENT_PEACH_BEAM) - EVT_CALL(FreezeBattleCam, 1) + EVT_CALL(FreezeBattleCam, TRUE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -456,11 +456,11 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, LVar3) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 75, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 75, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, LVar4) - EVT_CALL(PlayEffect, EFFECT_SHIMMER_BURST, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.05), 50, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_80000, 0) + EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.05), 50, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_80000, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_TURNS_SINCE_LAST_STAR_BEAM), 0) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) @@ -488,7 +488,7 @@ EvtScript N(handleEvent) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 45) EVT_END_IF - EVT_CALL(FreezeBattleCam, 0) + EVT_CALL(FreezeBattleCam, FALSE) EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -511,7 +511,7 @@ EvtScript N(doOnHit) = { }; EvtScript N(onDeath) = { - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_80000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_80000, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 1) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_WAIT(14) @@ -540,7 +540,7 @@ EvtScript N(onDeath) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2128) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Hurt) EVT_THREAD - EVT_CALL(MakeLerp, 0, 80, 8, 4) + EVT_CALL(MakeLerp, 0, 80, 8, EASING_QUADRATIC_OUT) EVT_SET(LVar2, 0) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -568,7 +568,7 @@ EvtScript N(onDeath) = { EVT_ELSE EVT_ADD(LVar1, 24) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_SHIMMER_BURST, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.05), 50, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.05), 50, 0) EVT_SET(LVar1, 50) EVT_IF_GT(LVar1, 0) EVT_SETF(LVar0, EVT_FLOAT(1.5)) @@ -581,7 +581,7 @@ EvtScript N(onDeath) = { EVT_END_IF EVT_END_THREAD EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(MakeLerp, 0, 6480, 100, 10) + EVT_CALL(MakeLerp, 0, 0x00001950, 100, EASING_COS_IN_OUT) EVT_LABEL(2) EVT_CALL(UpdateLerp) EVT_MOD(LVar0, 360) @@ -597,10 +597,10 @@ EvtScript N(onDeath) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_DefeatedIdle) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 180, 16) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0, 0) EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.1), EVT_FLOAT(0.93), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.2), EVT_FLOAT(0.85), EVT_FLOAT(1.0)) @@ -637,8 +637,8 @@ EvtScript N(onDeath) = { EVT_CALL(MoveBattleCamOver, 40) EVT_END_IF EVT_CALL(ActorSpeak, MSG_CH8_00A9, ACTOR_SELF, 1, ANIM_BattleBowser_DefeatedTalk, ANIM_BattleBowser_DefeatedIdle) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, 1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_DISABLE_CELEBRATION | BS_FLAGS1_BATTLE_FLED, TRUE) EVT_CALL(func_8026F60C, 20) EVT_RETURN EVT_END @@ -721,25 +721,25 @@ EvtScript N(useStarRod) = { EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_ADD(LVar0, 22) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarF, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.0), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarF, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.0), LVarE, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarD, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarD, 0) EVT_ELSE EVT_ADD(LVar0, 9) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarF, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.4), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarF, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.4), LVarE, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarD, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarD, 0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) EVT_CALL(RemoveEffect, LVarD) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_80000, 1) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, 11) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_80000, TRUE) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, ACTOR_DECORATION_RADIAL_STAR_EMITTER) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_boosted))) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_boosted))) EVT_CALL(N(RemoveChillOut)) @@ -749,12 +749,12 @@ EvtScript N(useStarRod) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) EVT_ADD(LVar2, 12) - EVT_CALL(PlayEffect, EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 105, 120, 37, 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 105, 120, 37, 60, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 24) EVT_ADD(LVar2, 12) - EVT_CALL(PlayEffect, EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 42, 48, 15, 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 42, 48, 15, 60, 0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2125) EVT_THREAD @@ -773,7 +773,7 @@ EvtScript N(useStarRod) = { EVT_ELSE EVT_ADD(LVar1, 24) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 15, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2124) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 39) @@ -871,21 +871,21 @@ EvtScript N(recover) = { EVT_ADD(LVar0, 22) EVT_ADD(LVar1, 135) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 50, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 50, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 22) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, 135, LVar2, EVT_FLOAT(0.45), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, 135, LVar2, EVT_FLOAT(0.45), 30, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 9) EVT_ADD(LVar1, 54) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.6), 50, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.6), 50, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 9) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, 54, LVar2, EVT_FLOAT(0.18), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, 54, LVar2, EVT_FLOAT(0.18), 30, 0) EVT_END_IF EVT_WAIT(30) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0) @@ -900,7 +900,7 @@ EvtScript N(recover) = { EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, ACTOR_SELF, LVar0, 0) + EVT_CALL(HealActor, ACTOR_SELF, LVar0, FALSE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -1054,7 +1054,7 @@ EvtScript N(inflictCommandLoss) = { 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, N(VAR_LOST_ABILITY_ITEM), LVar0) EVT_ADD(LVar1, 7) EVT_CALL(N(ItemEntityJumpToPos), LVar0, LVar1, LVar2, LVar3, 8, EVT_FLOAT(1.0)) @@ -1113,19 +1113,19 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_SUB(LVar0, 35) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 14, FALSE, TRUE, FALSE) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(2.0)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) EVT_WAIT(3) @@ -1145,7 +1145,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -1186,14 +1186,14 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_ADD(LVar0, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(2.0)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) EVT_WAIT(3) @@ -1220,22 +1220,22 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_LOST_ABILITY_ITEM), LVar0) EVT_CALL(N(GetItemEntityPosition), LVar0, LVar1, LVar2, LVar3) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_COMMAND_LOSS_STATE), 2) - EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_StompOnce) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_StompOnce) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Mock) @@ -1256,13 +1256,13 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_PostJump) EVT_WAIT(3) @@ -1286,7 +1286,7 @@ EvtScript N(onAttackMissed) = { EVT_WAIT(5) EVT_LOOP(4) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(2.0)) EVT_WAIT(4) EVT_END_LOOP EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) @@ -1413,16 +1413,16 @@ EvtScript N(attackShockwaveDrain) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 22) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 135, LVar2, EVT_FLOAT(1.0), LVarF, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 135, LVar2, EVT_FLOAT(1.0), LVarF, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.0), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.0), LVarE, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 9) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 54, LVar2, EVT_FLOAT(0.4), LVarF, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 54, LVar2, EVT_FLOAT(0.4), LVarF, 0) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.4), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.4), LVarE, 0) EVT_END_IF EVT_WAIT(25) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) @@ -1439,12 +1439,12 @@ EvtScript N(attackShockwaveDrain) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 19) EVT_SET(LVar1, 55) - EVT_CALL(PlayEffect, EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 7) EVT_SET(LVar1, 22) - EVT_CALL(PlayEffect, EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 60, 0) EVT_END_IF EVT_THREAD EVT_CALL(N(UnfadeBackgroundToBlack)) @@ -1478,7 +1478,7 @@ EvtScript N(attackShockwaveDrain) = { EVT_SET(LVar1, 3) EVT_END_IF EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(RemovePlayerBuffs, 65536) + EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_PARTNER_GLOWING) EVT_IF_NE(LVarA, 5) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) EVT_END_IF @@ -1509,7 +1509,7 @@ EvtScript N(attackShockwaveDrain) = { EVT_SET(LVar1, 6) EVT_END_IF EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(RemovePlayerBuffs, 268435455) + EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_JUMP_CHARGE | PLAYER_BUFF_HAMMER_CHARGE | PLAYER_BUFF_STONE | PLAYER_BUFF_HUSTLE | PLAYER_BUFF_STATIC | PLAYER_BUFF_TRANSPARENT | PLAYER_BUFF_CLOUD_NINE | PLAYER_BUFF_TURBO_CHARGE | PLAYER_BUFF_WATER_BLOCK | PLAYER_BUFF_PARTNER_GLOWING | 0xFFEFC04) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(2) @@ -1579,7 +1579,7 @@ EvtScript N(attackFlameBreath) = { EVT_SET(LVar4, 20) EVT_CALL(GetPartEventFlags, ACTOR_SELF, 1, LVar6) EVT_IF_FLAG(LVar6, ACTOR_EVENT_FLAG_80000) - EVT_CALL(PlayEffect, EFFECT_FIRE_BREATH, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIRE_BREATH, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0) EVT_ELSE EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar7) EVT_IF_NOT_FLAG(LVar7, STATUS_FLAG_SHRINK) @@ -1588,7 +1588,7 @@ EvtScript N(attackFlameBreath) = { EVT_ADD(LVar0, 6) EVT_END_IF EVT_SUB(LVar3, 10) - EVT_CALL(PlayEffect, EFFECT_FIRE_BREATH, 2, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIRE_BREATH, 2, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 50, 1, 24, 0) EVT_CALL(N(UnkFireBreathFXFunc), LVarF) EVT_END_IF EVT_THREAD @@ -1731,7 +1731,7 @@ EvtScript N(onBurnHit) = { EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_END_IF EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_END_SWITCH @@ -1754,15 +1754,15 @@ EvtScript N(attackLightningBlast) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 54) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 50, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 50, 0) EVT_WAIT(50) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 22) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarF, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarF, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarE, 0) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) @@ -1770,15 +1770,15 @@ EvtScript N(attackLightningBlast) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 21) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.6), 50, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.6), 50, 0) EVT_WAIT(50) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 9) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarF, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarF, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarE, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarE, 0) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) diff --git a/src/battle/area/kpa2/stage/kpa_01.c b/src/battle/area/kpa2/stage/kpa_01.c index e1ffba5727..5d5a70292f 100644 --- a/src/battle/area/kpa2/stage/kpa_01.c +++ b/src/battle/area/kpa2/stage/kpa_01.c @@ -4,14 +4,15 @@ #define NAMESPACE b_area_kpa2_kpa_01 -EvtScript N(8022EFE0) = { +// blue torches +EvtScript N(EVS_TexPan_Fire) = { EVT_SET(LVarA, LVar0) EVT_CALL(SetTexPanner, LVarA, TEX_PANNER_1) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar1) - EVT_ADD(LVar0, 32768) + EVT_ADD(LVar0, 0x8000) EVT_ADD(LVar1, 0) EVT_WAIT(5) EVT_END_LOOP @@ -19,35 +20,38 @@ EvtScript N(8022EFE0) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 36, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 36, MODEL_GROUP_HIDDEN) EVT_THREAD - EVT_SET(LVar0, 37) - EVT_EXEC(N(8022EFE0)) + EVT_SET(LVar0, MODEL_o416) + EVT_EXEC(N(EVS_TexPan_Fire)) EVT_WAIT(5) - EVT_SET(LVar0, 39) - EVT_EXEC(N(8022EFE0)) + EVT_SET(LVar0, MODEL_o418) + EVT_EXEC(N(EVS_TexPan_Fire)) EVT_END_THREAD EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o383, MODEL_o382, MODEL_o381, 0, +s32 N(ForegroundModels)[] = { + MODEL_o383, + MODEL_o382, + MODEL_o381, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt01_shape", .hit = "kpa_bt01_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa2/stage/kpa_02.c b/src/battle/area/kpa2/stage/kpa_02.c index 68abb1a495..73645e7af4 100644 --- a/src/battle/area/kpa2/stage/kpa_02.c +++ b/src/battle/area/kpa2/stage/kpa_02.c @@ -4,19 +4,22 @@ #define NAMESPACE b_area_kpa2_kpa_02 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_hana, MODEL_ha1, MODEL_ha2, 0, +s32 N(ForegroundModels)[] = { + MODEL_hana, + MODEL_ha1, + MODEL_ha2, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -24,7 +27,7 @@ Stage NAMESPACE = { .shape = "kkj_bt01_shape", .hit = "kkj_bt01_hit", .bg = "kpa_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa2/stage/kpa_03.c b/src/battle/area/kpa2/stage/kpa_03.c index 4505946e52..d79ffe4ce8 100644 --- a/src/battle/area/kpa2/stage/kpa_03.c +++ b/src/battle/area/kpa2/stage/kpa_03.c @@ -3,72 +3,4 @@ #define NAMESPACE b_area_kpa2_kpa_03 -#include "world/common/util/SetLightningBoltPurple.inc.c" - -s32 N(lightningsSettings1)[] = { - 0xFFFFFFEA, 0x000000BE, 0xFFFFFFA5, 0xFFFFFFA8, 0x00000015, 0xFFFFFFA5, 0x0000003C, - 0xFFFFFFFF, 0x000000BE, 0xFFFFFFA5, 0x00000058, 0x00000018, 0xFFFFFFA5, 0x0000000A, - 0xFFFFFFBD, 0x000000BE, 0xFFFFFFA5, 0xFFFFFF86, 0x0000000A, 0xFFFFFFA5, 0x0000005A, - 0x00000039, 0x000000BE, 0xFFFFFFA5, 0xFFFFFFFC, 0x00000011, 0xFFFFFFA5, 0x0000003C, -}; - -EvtScript N(createLightnings1) = { - EVT_LABEL(0) - EVT_USE_BUF(N(lightningsSettings1)) - EVT_LOOP(4) - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_BUF_READ3(LVar3, LVar4, LVar5) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 8, 0, 0, 0, 0) - EVT_CALL(N(SetLightningBoltPurple)) - EVT_BUF_READ1(LVar0) - EVT_WAIT(LVar0) - EVT_END_LOOP - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -s32 N(lightningsSettings2)[] = { - 0xFFFFFF87, 0x00000021, 0xFFFFFF98, 0xFFFFFFE8, 0x00000029, 0xFFFFFF98, 0x00000005, - 0x00000024, 0x00000029, 0xFFFFFF98, 0x00000080, 0x00000022, 0xFFFFFF98, 0x0000001E, - 0x00000092, 0x00000001, 0x00000071, 0x00000026, 0xFFFFFFF1, 0x00000079, 0x00000005, - 0xFFFFFFBE, 0xFFFFFFF6, 0x00000073, 0xFFFFFF65, 0x00000001, 0x00000061, 0x0000005A, -}; - -EvtScript N(createLightnings2) = { - EVT_LABEL(0) - EVT_USE_BUF(N(lightningsSettings2)) - EVT_LOOP(4) - EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_BUF_READ3(LVar3, LVar4, LVar5) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 5, 0, 0, 0, 0) - EVT_CALL(N(SetLightningBoltPurple)) - EVT_BUF_READ1(LVar0) - EVT_WAIT(LVar0) - EVT_END_LOOP - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(beforeBattle) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_EXEC(N(createLightnings1)) - EVT_EXEC(N(createLightnings2)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle) = { - EVT_RETURN - EVT_END -}; - -Stage NAMESPACE = { - .texture = "kkj_tex", - .shape = "kkj_bt02_shape", - .hit = "kkj_bt02_hit", - .bg = "kpa_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), -}; +#include "battle/common/stage/kkj_02.inc.c" diff --git a/src/battle/area/kpa3/actor/anti_guy.c b/src/battle/area/kpa3/actor/anti_guy.c index 8820ba4ca0..4db253e15c 100644 --- a/src/battle/area/kpa3/actor/anti_guy.c +++ b/src/battle/area/kpa3/actor/anti_guy.c @@ -63,7 +63,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 50, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -246,9 +246,9 @@ EvtScript N(bumpAttack) = { 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(SetGoalToTarget, ACTOR_SELF) @@ -270,7 +270,7 @@ EvtScript N(bumpAttack) = { 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, 1, 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) @@ -287,8 +287,8 @@ EvtScript N(bumpAttack) = { 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(SetGoalToTarget, ACTOR_SELF) @@ -339,8 +339,8 @@ EvtScript N(acrobaticAttack) = { 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(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, 1, ANIM_ShyGuy_Black_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_SUB(LVar0, 40) @@ -381,7 +381,7 @@ EvtScript N(acrobaticAttack) = { 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, 1, 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) @@ -456,7 +456,7 @@ EvtScript N(acrobaticAttack) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Black_Anim11) diff --git a/src/battle/area/kpa3/stage/kpa_01.c b/src/battle/area/kpa3/stage/kpa_01.c index 18ee48fc80..9b61c888cd 100644 --- a/src/battle/area/kpa3/stage/kpa_01.c +++ b/src/battle/area/kpa3/stage/kpa_01.c @@ -19,10 +19,10 @@ EvtScript N(8022EFE0) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 36, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 36, MODEL_GROUP_HIDDEN) EVT_THREAD EVT_SET(LVar0, 37) EVT_EXEC(N(8022EFE0)) @@ -34,20 +34,23 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o383, MODEL_o382, MODEL_o381, 0, +s32 N(ForegroundModels)[] = { + MODEL_o383, + MODEL_o382, + MODEL_o381, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt01_shape", .hit = "kpa_bt01_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa4/actor/bombshell_bill.c b/src/battle/area/kpa4/actor/bombshell_bill.c index ddc7e27971..38dc5fbe2b 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill.c +++ b/src/battle/area/kpa4/actor/bombshell_bill.c @@ -66,7 +66,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 3, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 40, .airLiftChance = 100, @@ -117,7 +117,7 @@ EvtScript N(init) = { EVT_CALL(SetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(CopyStatusEffects, LVar0, ACTOR_SELF) EVT_CALL(CopyBuffs, LVar0, ACTOR_SELF) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(GetActorPos, LVar0, LVar1, LVarB, LVarC) EVT_SUB(LVar1, 90) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.01)) @@ -290,14 +290,14 @@ EvtScript N(takeTurn) = { EvtScript N(playExplosionEffects) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0) EVT_ADD(LVar1, 16) EVT_ADD(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_BLAST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BLAST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 30, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2078) EVT_CALL(StartRumble, 11) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_RETURN EVT_END diff --git a/src/battle/area/kpa4/actor/bombshell_bill_blaster.c b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c index 3c7731b652..2734d08efa 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill_blaster.c +++ b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c @@ -69,7 +69,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 10, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 15, @@ -198,7 +198,7 @@ EvtScript N(bulletShot) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BillBlaster_Gold_Anim02) EVT_WAIT(13) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(StartRumble, 9) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2C8) @@ -206,8 +206,8 @@ EvtScript N(bulletShot) = { EVT_SUB(LVar0, 33) EVT_ADD(LVar1, 19) EVT_ADD(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 2, 5, 0, 2, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 2, 5, 2, 2, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 2, 5, 0, 2, 0) + EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 2, 5, 2, 2, 0) EVT_WAIT(2) EVT_CALL(ApplyBillSettings) EVT_CALL(SummonEnemy, EVT_PTR(N(formation_bill)), 0) diff --git a/src/battle/area/kpa4/stage/kpa_01.c b/src/battle/area/kpa4/stage/kpa_01.c index 23899a400e..e5b7d161f9 100644 --- a/src/battle/area/kpa4/stage/kpa_01.c +++ b/src/battle/area/kpa4/stage/kpa_01.c @@ -19,10 +19,10 @@ EvtScript N(8022EFE0) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 36, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 36, MODEL_GROUP_HIDDEN) EVT_THREAD EVT_SET(LVar0, 37) EVT_EXEC(N(8022EFE0)) @@ -34,20 +34,23 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o383, MODEL_o382, MODEL_o381, 0, +s32 N(ForegroundModels)[] = { + MODEL_o383, + MODEL_o382, + MODEL_o381, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt01_shape", .hit = "kpa_bt01_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa4/stage/kpa_01b.c b/src/battle/area/kpa4/stage/kpa_01b.c index 1037a8393b..d4d9f58860 100644 --- a/src/battle/area/kpa4/stage/kpa_01b.c +++ b/src/battle/area/kpa4/stage/kpa_01b.c @@ -19,10 +19,10 @@ EvtScript N(8022F180) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 25, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 25, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, 37) EVT_EXEC(N(8022F180)) EVT_SET(LVar0, 39) @@ -31,20 +31,23 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o383, MODEL_o382, MODEL_o381, 0, +s32 N(ForegroundModels)[] = { + MODEL_o383, + MODEL_o382, + MODEL_o381, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt01_shape", .hit = "kpa_bt01_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa4/stage/kpa_02.c b/src/battle/area/kpa4/stage/kpa_02.c index b232817fb7..ead6884e14 100644 --- a/src/battle/area/kpa4/stage/kpa_02.c +++ b/src/battle/area/kpa4/stage/kpa_02.c @@ -57,9 +57,9 @@ EvtScript N(8022F4BC) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 16) EVT_SET(LVar1, 1) EVT_SET(LVar2, -400) @@ -84,20 +84,21 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_saku, 0, +s32 N(ForegroundModels)[] = { + MODEL_saku, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt02_shape", .hit = "kpa_bt02_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa4/stage/kpa_03.c b/src/battle/area/kpa4/stage/kpa_03.c index ab43f5151b..43be7cdb3b 100644 --- a/src/battle/area/kpa4/stage/kpa_03.c +++ b/src/battle/area/kpa4/stage/kpa_03.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_kpa4_kpa_03 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_CALL(func_80253734, BTL_DARKNESS_MODE_1) @@ -13,20 +13,21 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_tar1, 0, +s32 N(ForegroundModels)[] = { + MODEL_tar1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt03_shape", .hit = "kpa_bt03_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa4/stage/kpa_04.c b/src/battle/area/kpa4/stage/kpa_04.c index f947188549..e1254738a2 100644 --- a/src/battle/area/kpa4/stage/kpa_04.c +++ b/src/battle/area/kpa4/stage/kpa_04.c @@ -18,17 +18,17 @@ EvtScript N(8022F7F0) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 15, 0) - EVT_CALL(SetGroupEnabled, 17, 0) - EVT_CALL(SetGroupEnabled, 16, 0) - EVT_CALL(SetGroupEnabled, 26, 0) - EVT_CALL(SetGroupEnabled, 18, 0) - EVT_CALL(SetGroupEnabled, 20, 0) - EVT_CALL(SetGroupEnabled, 22, 0) - EVT_CALL(SetGroupEnabled, 24, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 15, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 17, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 16, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 26, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 18, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 20, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 22, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 24, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, 32) EVT_EXEC(N(8022F7F0)) EVT_SET(LVar0, 34) @@ -39,7 +39,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -48,6 +48,6 @@ Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt04_shape", .hit = "kpa_bt04_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/kpa4/stage/kpa_04b.c b/src/battle/area/kpa4/stage/kpa_04b.c index b6775ceb13..c475cc3ccd 100644 --- a/src/battle/area/kpa4/stage/kpa_04b.c +++ b/src/battle/area/kpa4/stage/kpa_04b.c @@ -18,16 +18,16 @@ EvtScript N(8022FA10) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 13, 0) - EVT_CALL(SetGroupEnabled, 17, 0) - EVT_CALL(SetGroupEnabled, 16, 0) - EVT_CALL(SetGroupEnabled, 18, 0) - EVT_CALL(SetGroupEnabled, 20, 0) - EVT_CALL(SetGroupEnabled, 22, 0) - EVT_CALL(SetGroupEnabled, 24, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 13, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 17, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 16, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 18, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 20, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 22, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 24, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, 32) EVT_EXEC(N(8022FA10)) EVT_SET(LVar0, 34) @@ -38,7 +38,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -47,6 +47,6 @@ Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt04_shape", .hit = "kpa_bt04_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/kpa4/stage/kpa_04c.c b/src/battle/area/kpa4/stage/kpa_04c.c index dbad38ae26..77b526dfd4 100644 --- a/src/battle/area/kpa4/stage/kpa_04c.c +++ b/src/battle/area/kpa4/stage/kpa_04c.c @@ -18,15 +18,15 @@ EvtScript N(8022FC20) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 30, 0) - EVT_CALL(SetGroupEnabled, 39, 0) - EVT_CALL(SetGroupEnabled, 38, 0) - EVT_CALL(SetGroupEnabled, 36, 0) - EVT_CALL(SetGroupEnabled, 34, 0) - EVT_CALL(SetGroupEnabled, 32, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 30, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 39, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 38, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 36, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 34, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 32, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, 18) EVT_EXEC(N(8022FC20)) EVT_SET(LVar0, 20) @@ -39,7 +39,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -48,6 +48,6 @@ Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt04_shape", .hit = "kpa_bt04_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/kpa4/stage/kpa_05.c b/src/battle/area/kpa4/stage/kpa_05.c index 578bed0a9c..5944139811 100644 --- a/src/battle/area/kpa4/stage/kpa_05.c +++ b/src/battle/area/kpa4/stage/kpa_05.c @@ -4,27 +4,28 @@ #define NAMESPACE b_area_kpa4_kpa_05 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_saku, 0, +s32 N(ForegroundModels)[] = { + MODEL_saku, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt05_shape", .hit = "kpa_bt05_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa4/stage/kpa_07.c b/src/battle/area/kpa4/stage/kpa_07.c index 07bfbb43cf..ce94eb0b28 100644 --- a/src/battle/area/kpa4/stage/kpa_07.c +++ b/src/battle/area/kpa4/stage/kpa_07.c @@ -57,9 +57,9 @@ EvtScript N(8023006C) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 16) EVT_SET(LVar1, 0) EVT_SET(LVar2, -200) @@ -79,20 +79,21 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_kemu1, 0, +s32 N(ForegroundModels)[] = { + MODEL_kemu1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt07_shape", .hit = "kpa_bt07_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa4/stage/kpa_08.c b/src/battle/area/kpa4/stage/kpa_08.c index c46aaf9fba..b055bfed47 100644 --- a/src/battle/area/kpa4/stage/kpa_08.c +++ b/src/battle/area/kpa4/stage/kpa_08.c @@ -4,27 +4,28 @@ #define NAMESPACE b_area_kpa4_kpa_08 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o478, 0, +s32 N(ForegroundModels)[] = { + MODEL_o478, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt08_shape", .hit = "kpa_bt08_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa4/stage/kpa_09.c b/src/battle/area/kpa4/stage/kpa_09.c index 3472eaf465..763d6af284 100644 --- a/src/battle/area/kpa4/stage/kpa_09.c +++ b/src/battle/area/kpa4/stage/kpa_09.c @@ -4,27 +4,28 @@ #define NAMESPACE b_area_kpa4_kpa_09 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o353, 0, +s32 N(ForegroundModels)[] = { + MODEL_o353, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt09_shape", .hit = "kpa_bt09_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa4/stage/kpa_11.c b/src/battle/area/kpa4/stage/kpa_11.c index 2d88ea3a4f..7685f36380 100644 --- a/src/battle/area/kpa4/stage/kpa_11.c +++ b/src/battle/area/kpa4/stage/kpa_11.c @@ -4,27 +4,28 @@ #define NAMESPACE b_area_kpa4_kpa_11 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_h2, 0, +s32 N(ForegroundModels)[] = { + MODEL_h2, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt11_shape", .hit = "kpa_bt11_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kpa4/stage/kpa_13.c b/src/battle/area/kpa4/stage/kpa_13.c index c96f84e1e0..b78ea3dd2f 100644 --- a/src/battle/area/kpa4/stage/kpa_13.c +++ b/src/battle/area/kpa4/stage/kpa_13.c @@ -18,14 +18,14 @@ EvtScript N(80230440) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -34,6 +34,6 @@ Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt13_shape", .hit = "kpa_bt13_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/kpa4/stage/kpa_14.c b/src/battle/area/kpa4/stage/kpa_14.c index 6bcfbc30dc..7f733c04f6 100644 --- a/src/battle/area/kpa4/stage/kpa_14.c +++ b/src/battle/area/kpa4/stage/kpa_14.c @@ -18,14 +18,14 @@ EvtScript N(80230570) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -34,6 +34,6 @@ Stage NAMESPACE = { .texture = "kpa_tex", .shape = "kpa_bt14_shape", .hit = "kpa_bt14_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/kzn/actor/lava_bubble.c b/src/battle/area/kzn/actor/lava_bubble.c index 8dd0604e49..9752bf8c45 100644 --- a/src/battle/area/kzn/actor/lava_bubble.c +++ b/src/battle/area/kzn/actor/lava_bubble.c @@ -116,7 +116,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 9, .partCount = ARRAY_COUNT(N(partsTable_80218EE8)), .partsData = N(partsTable_80218EE8), - .takeTurnScript = &N(init_8021901C), + .initScript = &N(init_8021901C), .statusTable = N(statusTable_80218E3C), .escapeChance = 50, .airLiftChance = 90, @@ -177,7 +177,7 @@ EvtScript N(init_8021901C) = { EvtScript N(idle_802191E4) = { EVT_LABEL(0) - EVT_CALL(MakeLerp, 0, 10, 25, 10) + EVT_CALL(MakeLerp, 0, 10, 25, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(GetHomePos, ACTOR_SELF, LVar2, LVar3, LVar4) @@ -196,7 +196,7 @@ EvtScript N(idle_802191E4) = { EVT_END_IF EVT_GOTO(1) EVT_END_IF - EVT_CALL(MakeLerp, 10, 0, 25, 10) + EVT_CALL(MakeLerp, 10, 0, 25, EASING_COS_IN_OUT) EVT_LABEL(2) EVT_CALL(UpdateLerp) EVT_CALL(GetHomePos, ACTOR_SELF, LVar2, LVar3, LVar4) @@ -229,7 +229,7 @@ EvtScript N(80219464) = { EVT_THREAD EVT_CALL(N(UnkSfxFunc)) EVT_END_THREAD - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Anim01) EVT_RETURN EVT_END @@ -357,7 +357,7 @@ EvtScript N(fireTackle) = { EVT_THREAD EVT_CALL(N(UnkSfxFunc)) EVT_END_THREAD - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Anim01) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -387,7 +387,7 @@ EvtScript N(fireTackle) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 3, FALSE, TRUE, FALSE) EVT_WAIT(14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_EXEC_WAIT(N(80219464)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -434,12 +434,12 @@ EvtScript N(8021A074) = { EVT_CALL(SetPartScale, ACTOR_SELF, LVar6, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) EVT_END_IF EVT_CALL(SetPartPos, ACTOR_SELF, LVar6, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar6, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar6, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, LVar6, EVT_FLOAT(8.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar6, EVT_FLOAT(0.01)) - EVT_CALL(SetPartSounds, ACTOR_SELF, LVar6, 2, 720, 0) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar6, LVar3, LVar4, LVar5, 0, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartSounds, ACTOR_SELF, LVar6, ACTOR_SOUND_JUMP, 720, 0) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar6, LVar3, LVar4, LVar5, 0, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_WAIT(3) EVT_ADD(LVar6, 1) @@ -480,7 +480,7 @@ EvtScript N(fireballs_Partner) = { EVT_THREAD EVT_CALL(N(UnkSfxFunc)) EVT_END_THREAD - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Anim01) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Anim05) @@ -505,7 +505,7 @@ EvtScript N(fireballs_Partner) = { EVT_END_IF EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_EXEC_WAIT(N(80219464)) EVT_WAIT(20) @@ -556,14 +556,14 @@ EvtScript N(fireballs_Player) = { EVT_THREAD EVT_CALL(N(UnkSfxFunc)) EVT_END_THREAD - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_SIN_OUT) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_WAIT(10) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2CF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) @@ -571,7 +571,7 @@ EvtScript N(fireballs_Player) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -580,13 +580,13 @@ EvtScript N(fireballs_Player) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Anim04) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_EXEC_WAIT(N(80219464)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -597,7 +597,7 @@ EvtScript N(fireballs_Player) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_WAIT(5) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2CF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) @@ -605,7 +605,7 @@ EvtScript N(fireballs_Player) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_SET(LVarA, LVar0) EVT_SET(LVarB, LVar1) EVT_SET(LVarC, LVar2) @@ -615,7 +615,7 @@ EvtScript N(fireballs_Player) = { EVT_ADD(LVar2, 2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) @@ -623,7 +623,7 @@ EvtScript N(fireballs_Player) = { EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(20) EVT_EXEC_WAIT(N(80219464)) EVT_END_CASE_GROUP diff --git a/src/battle/area/kzn/stage/kzn_01.c b/src/battle/area/kzn/stage/kzn_01.c index 195918fd0a..7086a837d8 100644 --- a/src/battle/area/kzn/stage/kzn_01.c +++ b/src/battle/area/kzn/stage/kzn_01.c @@ -3,28 +3,33 @@ #define NAMESPACE b_area_kzn_kzn_01 -EvtScript N(beforeBattle_80227780) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 17, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 17, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_802277D0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_802277E0)[] = { - 0x0000000E, 0x0000000F, 0x00000018, 0x00000019, 0x0000001A, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x0000000E, + 0x0000000F, + 0x00000018, + 0x00000019, + 0x0000001A, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kzn_tex", .shape = "kzn_bt01_shape", .hit = "kzn_bt01_hit", - .preBattle = &N(beforeBattle_80227780), - .postBattle = &N(afterBattle_802277D0), - .foregroundModelList = N(foregroundModelList_802277E0), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kzn/stage/kzn_01b.c b/src/battle/area/kzn/stage/kzn_01b.c index 05000e07cf..a1188aae34 100644 --- a/src/battle/area/kzn/stage/kzn_01b.c +++ b/src/battle/area/kzn/stage/kzn_01b.c @@ -3,27 +3,32 @@ #define NAMESPACE b_area_kzn_kzn_01b -EvtScript N(beforeBattle_80227820) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8022785C) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_8022786C)[] = { - 0x0000000E, 0x0000000F, 0x00000018, 0x00000019, 0x0000001A, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x0000000E, + 0x0000000F, + 0x00000018, + 0x00000019, + 0x0000001A, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kzn_tex", .shape = "kzn_bt01_shape", .hit = "kzn_bt01_hit", - .preBattle = &N(beforeBattle_80227820), - .postBattle = &N(afterBattle_8022785C), - .foregroundModelList = N(foregroundModelList_8022786C), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kzn/stage/kzn_02.c b/src/battle/area/kzn/stage/kzn_02.c index c85f115465..e3be55edb6 100644 --- a/src/battle/area/kzn/stage/kzn_02.c +++ b/src/battle/area/kzn/stage/kzn_02.c @@ -42,7 +42,7 @@ EvtScript N(80227A2C) = { EVT_LABEL(0) EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, 0) + EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -53,7 +53,7 @@ EvtScript N(80227A2C) = { EVT_END_LOOP EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, 0) + EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -67,9 +67,9 @@ EvtScript N(80227A2C) = { EVT_END }; -EvtScript N(beforeBattle_80227BDC) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 25) EVT_SET(LVar1, 0) EVT_EXEC(N(802278B0)) @@ -100,20 +100,23 @@ EvtScript N(beforeBattle_80227BDC) = { EVT_END }; -EvtScript N(afterBattle_80227D98) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80227DA8)[] = { - 0x0000001E, 0x0000001F, 0x00000020, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x0000001E, + 0x0000001F, + 0x00000020, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kzn_tex", .shape = "kzn_bt02_shape", .hit = "kzn_bt02_hit", - .preBattle = &N(beforeBattle_80227BDC), - .postBattle = &N(afterBattle_80227D98), - .foregroundModelList = N(foregroundModelList_80227DA8), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kzn/stage/kzn_04.c b/src/battle/area/kzn/stage/kzn_04.c index f79e0bc9b7..3a0c8e45d9 100644 --- a/src/battle/area/kzn/stage/kzn_04.c +++ b/src/battle/area/kzn/stage/kzn_04.c @@ -42,7 +42,7 @@ EvtScript N(80227F5C) = { EVT_LABEL(0) EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, 0) + EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -53,7 +53,7 @@ EvtScript N(80227F5C) = { EVT_END_LOOP EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, 0) + EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -67,11 +67,11 @@ EvtScript N(80227F5C) = { EVT_END }; -EvtScript N(beforeBattle_8022810C) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 30, 0) - EVT_CALL(SetGroupEnabled, 44, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 30, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 44, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, 4) EVT_SET(LVar1, 0) EVT_EXEC(N(80227DE0)) @@ -106,20 +106,23 @@ EvtScript N(beforeBattle_8022810C) = { EVT_END }; -EvtScript N(afterBattle_80228328) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80228338)[] = { - 0x00000014, 0x00000015, 0x00000016, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x00000014, + 0x00000015, + 0x00000016, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kzn_tex", .shape = "kzn_bt04_shape", .hit = "kzn_bt04_hit", - .preBattle = &N(beforeBattle_8022810C), - .postBattle = &N(afterBattle_80228328), - .foregroundModelList = N(foregroundModelList_80228338), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kzn/stage/kzn_04b.c b/src/battle/area/kzn/stage/kzn_04b.c index 5b8e569e77..77cf166989 100644 --- a/src/battle/area/kzn/stage/kzn_04b.c +++ b/src/battle/area/kzn/stage/kzn_04b.c @@ -42,7 +42,7 @@ EvtScript N(802284EC) = { EVT_LABEL(0) EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, 0) + EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -53,7 +53,7 @@ EvtScript N(802284EC) = { EVT_END_LOOP EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, 0) + EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -67,11 +67,11 @@ EvtScript N(802284EC) = { EVT_END }; -EvtScript N(beforeBattle_8022869C) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 39, 0) - EVT_CALL(SetGroupEnabled, 44, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 39, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 44, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, 4) EVT_SET(LVar1, 0) EVT_EXEC(N(80228370)) @@ -106,20 +106,23 @@ EvtScript N(beforeBattle_8022869C) = { EVT_END }; -EvtScript N(afterBattle_802288B8) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_802288C8)[] = { - 0x00000014, 0x00000015, 0x00000016, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x00000014, + 0x00000015, + 0x00000016, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kzn_tex", .shape = "kzn_bt04_shape", .hit = "kzn_bt04_hit", - .preBattle = &N(beforeBattle_8022869C), - .postBattle = &N(afterBattle_802288B8), - .foregroundModelList = N(foregroundModelList_802288C8), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kzn/stage/kzn_04c.c b/src/battle/area/kzn/stage/kzn_04c.c index ac719201e5..badaa94492 100644 --- a/src/battle/area/kzn/stage/kzn_04c.c +++ b/src/battle/area/kzn/stage/kzn_04c.c @@ -42,7 +42,7 @@ EvtScript N(80228A7C) = { EVT_LABEL(0) EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, 0) + EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -53,7 +53,7 @@ EvtScript N(80228A7C) = { EVT_END_LOOP EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, 0) + EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -67,11 +67,11 @@ EvtScript N(80228A7C) = { EVT_END }; -EvtScript N(beforeBattle_80228C2C) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 39, 0) - EVT_CALL(SetGroupEnabled, 30, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 39, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 30, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, 4) EVT_SET(LVar1, 0) EVT_EXEC(N(80228900)) @@ -100,20 +100,23 @@ EvtScript N(beforeBattle_80228C2C) = { EVT_END }; -EvtScript N(afterBattle_80228DF0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80228E00)[] = { - 0x00000014, 0x00000015, 0x00000016, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x00000014, + 0x00000015, + 0x00000016, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kzn_tex", .shape = "kzn_bt04_shape", .hit = "kzn_bt04_hit", - .preBattle = &N(beforeBattle_80228C2C), - .postBattle = &N(afterBattle_80228DF0), - .foregroundModelList = N(foregroundModelList_80228E00), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kzn/stage/kzn_05.c b/src/battle/area/kzn/stage/kzn_05.c index 452b82c4c4..fad3d070b0 100644 --- a/src/battle/area/kzn/stage/kzn_05.c +++ b/src/battle/area/kzn/stage/kzn_05.c @@ -42,7 +42,7 @@ EvtScript N(80228FBC) = { EVT_LABEL(0) EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, 0) + EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -53,7 +53,7 @@ EvtScript N(80228FBC) = { EVT_END_LOOP EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, 0) + EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -67,9 +67,9 @@ EvtScript N(80228FBC) = { EVT_END }; -EvtScript N(beforeBattle_8022916C) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 17) EVT_SET(LVar1, 0) EVT_EXEC(N(80228E40)) @@ -88,70 +88,70 @@ EvtScript N(beforeBattle_8022916C) = { EVT_SET(LVar0, 27) EVT_SET(LVar1, 5) EVT_EXEC(N(80228F0C)) - EVT_CALL(EnableModel, 29, 0) - EVT_CALL(EnableModel, 30, 0) - EVT_CALL(EnableModel, 31, 0) - EVT_CALL(EnableModel, 32, 0) - EVT_CALL(EnableModel, 33, 0) - EVT_CALL(EnableModel, 34, 0) - EVT_CALL(EnableModel, 35, 0) - EVT_CALL(EnableModel, 36, 0) - EVT_CALL(EnableModel, 37, 0) - EVT_CALL(EnableModel, 38, 0) - EVT_CALL(EnableModel, 39, 0) - EVT_CALL(EnableModel, 40, 0) - EVT_CALL(EnableModel, 41, 0) - EVT_CALL(EnableModel, 42, 0) - EVT_CALL(EnableModel, 43, 0) - EVT_CALL(EnableModel, 44, 0) - EVT_CALL(EnableModel, 45, 0) - EVT_CALL(EnableModel, 46, 0) - EVT_CALL(EnableModel, 47, 0) - EVT_CALL(EnableModel, 48, 0) - EVT_CALL(EnableModel, 49, 0) - EVT_CALL(EnableModel, 50, 0) - EVT_CALL(EnableModel, 51, 0) - EVT_CALL(EnableModel, 52, 0) - EVT_CALL(EnableModel, 53, 0) - EVT_CALL(EnableModel, 54, 0) - EVT_CALL(EnableModel, 55, 0) - EVT_CALL(EnableModel, 56, 0) - EVT_CALL(EnableModel, 57, 0) - EVT_CALL(EnableModel, 58, 0) - EVT_CALL(EnableModel, 59, 0) - EVT_CALL(EnableModel, 60, 0) - EVT_CALL(EnableModel, 61, 0) - EVT_CALL(EnableModel, 62, 0) - EVT_CALL(EnableModel, 63, 0) - EVT_CALL(EnableModel, 64, 0) - EVT_CALL(EnableModel, 65, 0) - EVT_CALL(EnableModel, 66, 0) - EVT_CALL(EnableModel, 67, 0) - EVT_CALL(EnableModel, 68, 0) - EVT_CALL(EnableModel, 69, 0) - EVT_CALL(EnableModel, 70, 0) - EVT_CALL(EnableModel, 71, 0) - EVT_CALL(EnableModel, 72, 0) - EVT_CALL(EnableModel, 73, 0) - EVT_CALL(EnableModel, 74, 0) - EVT_CALL(EnableModel, 75, 0) - EVT_CALL(EnableModel, 76, 0) - EVT_CALL(EnableModel, 78, 0) - EVT_CALL(EnableModel, 79, 0) - EVT_CALL(EnableModel, 80, 0) - EVT_CALL(EnableModel, 81, 0) - EVT_CALL(EnableModel, 82, 0) - EVT_CALL(EnableModel, 83, 0) - EVT_CALL(EnableModel, 84, 0) - EVT_CALL(EnableModel, 85, 0) - EVT_CALL(EnableModel, 86, 0) - EVT_CALL(EnableModel, 87, 0) - EVT_CALL(EnableModel, 88, 0) + EVT_CALL(EnableModel, 29, FALSE) + EVT_CALL(EnableModel, 30, FALSE) + EVT_CALL(EnableModel, 31, FALSE) + EVT_CALL(EnableModel, 32, FALSE) + EVT_CALL(EnableModel, 33, FALSE) + EVT_CALL(EnableModel, 34, FALSE) + EVT_CALL(EnableModel, 35, FALSE) + EVT_CALL(EnableModel, 36, FALSE) + EVT_CALL(EnableModel, 37, FALSE) + EVT_CALL(EnableModel, 38, FALSE) + EVT_CALL(EnableModel, 39, FALSE) + EVT_CALL(EnableModel, 40, FALSE) + EVT_CALL(EnableModel, 41, FALSE) + EVT_CALL(EnableModel, 42, FALSE) + EVT_CALL(EnableModel, 43, FALSE) + EVT_CALL(EnableModel, 44, FALSE) + EVT_CALL(EnableModel, 45, FALSE) + EVT_CALL(EnableModel, 46, FALSE) + EVT_CALL(EnableModel, 47, FALSE) + EVT_CALL(EnableModel, 48, FALSE) + EVT_CALL(EnableModel, 49, FALSE) + EVT_CALL(EnableModel, 50, FALSE) + EVT_CALL(EnableModel, 51, FALSE) + EVT_CALL(EnableModel, 52, FALSE) + EVT_CALL(EnableModel, 53, FALSE) + EVT_CALL(EnableModel, 54, FALSE) + EVT_CALL(EnableModel, 55, FALSE) + EVT_CALL(EnableModel, 56, FALSE) + EVT_CALL(EnableModel, 57, FALSE) + EVT_CALL(EnableModel, 58, FALSE) + EVT_CALL(EnableModel, 59, FALSE) + EVT_CALL(EnableModel, 60, FALSE) + EVT_CALL(EnableModel, 61, FALSE) + EVT_CALL(EnableModel, 62, FALSE) + EVT_CALL(EnableModel, 63, FALSE) + EVT_CALL(EnableModel, 64, FALSE) + EVT_CALL(EnableModel, 65, FALSE) + EVT_CALL(EnableModel, 66, FALSE) + EVT_CALL(EnableModel, 67, FALSE) + EVT_CALL(EnableModel, 68, FALSE) + EVT_CALL(EnableModel, 69, FALSE) + EVT_CALL(EnableModel, 70, FALSE) + EVT_CALL(EnableModel, 71, FALSE) + EVT_CALL(EnableModel, 72, FALSE) + EVT_CALL(EnableModel, 73, FALSE) + EVT_CALL(EnableModel, 74, FALSE) + EVT_CALL(EnableModel, 75, FALSE) + EVT_CALL(EnableModel, 76, FALSE) + EVT_CALL(EnableModel, 78, FALSE) + EVT_CALL(EnableModel, 79, FALSE) + EVT_CALL(EnableModel, 80, FALSE) + EVT_CALL(EnableModel, 81, FALSE) + EVT_CALL(EnableModel, 82, FALSE) + EVT_CALL(EnableModel, 83, FALSE) + EVT_CALL(EnableModel, 84, FALSE) + EVT_CALL(EnableModel, 85, FALSE) + EVT_CALL(EnableModel, 86, FALSE) + EVT_CALL(EnableModel, 87, FALSE) + EVT_CALL(EnableModel, 88, FALSE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8022974C) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -160,6 +160,6 @@ Stage NAMESPACE = { .texture = "kzn_tex", .shape = "kzn_bt05_shape", .hit = "kzn_bt05_hit", - .preBattle = &N(beforeBattle_8022916C), - .postBattle = &N(afterBattle_8022974C), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/kzn2/actor/lava_bud.c b/src/battle/area/kzn2/actor/lava_bud.c index 0e4947d072..6eec1e4db4 100644 --- a/src/battle/area/kzn2/actor/lava_bud.c +++ b/src/battle/area/kzn2/actor/lava_bud.c @@ -152,7 +152,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -572,7 +572,7 @@ EvtScript N(summonPetitPiranha) = { EVT_CALL(SetHomePos, LVar5, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, LVar5, EVT_FLOAT(4.0)) EVT_CALL(SetActorJumpGravity, LVar5, EVT_FLOAT(1.0)) - EVT_CALL(FlyToGoal, LVar5, 24, -42, 6) + EVT_CALL(FlyToGoal, LVar5, 24, -42, EASING_QUARTIC_OUT) EVT_ELSE EVT_CALL(GetActorPos, LVar5, LVar0, LVar1, LVar2) EVT_SET(LVar0, 18) @@ -581,7 +581,7 @@ EvtScript N(summonPetitPiranha) = { EVT_CALL(SetHomePos, LVar5, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, LVar5, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, LVar5, EVT_FLOAT(1.2)) - EVT_CALL(FlyToGoal, LVar5, 16, -15, 5) + EVT_CALL(FlyToGoal, LVar5, 16, -15, EASING_CUBIC_OUT) EVT_END_IF EVT_CALL(HPBarToHome, LVar5) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) @@ -642,8 +642,8 @@ EvtScript N(onDeath) = { EVT_CALL(SetActorVar, ACTOR_SELF, 7, ANIM_LavaBud_Anim0F) EVT_CALL(SetActorVar, ACTOR_SELF, 8, ANIM_LavaBud_Anim09) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBud_Anim0F) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FIREY, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_FIREY, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FIREY, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_WAIT(29) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C7) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) @@ -688,8 +688,8 @@ EvtScript N(onDeath) = { EVT_WAIT(14) EVT_CALL(SetActorVar, ACTOR_SELF, 5, 2) EVT_EXEC_WAIT(N(8022630C)) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_2000 | ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, TRUE) EVT_ELSE EVT_EXEC_WAIT(N(onHit)) EVT_RETURN @@ -786,7 +786,7 @@ EvtScript N(onHitCombo) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_SUB(LVar2, 25) EVT_ADD(LVar3, 2) - EVT_CALL(PlayEffect, EFFECT_EMBERS, 0, LVar1, LVar2, LVar3, 40, 50, EVT_FLOAT(1.2), 24, 42, EVT_FLOAT(0.8), EVT_FLOAT(0.6), 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, LVar1, LVar2, LVar3, 40, 50, EVT_FLOAT(1.2), 24, 42, EVT_FLOAT(0.8), EVT_FLOAT(0.6), 0) EVT_WAIT(29) EVT_END_IF EVT_END_IF @@ -876,7 +876,7 @@ EvtScript N(onHit) = { EVT_CALL(RemoveEffect, LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_COLD_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(2.0), 45, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_COLD_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(2.0), 45, 0) EVT_END_IF EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_wet))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_wet))) @@ -884,8 +884,8 @@ EvtScript N(onHit) = { EVT_CALL(SetActorVar, ACTOR_SELF, 7, ANIM_LavaBud_Anim0F) EVT_CALL(SetActorVar, ACTOR_SELF, 8, ANIM_LavaBud_Anim09) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBud_Anim0F) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FIREY, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_FIREY, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FIREY, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_WAIT(29) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C7) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) @@ -945,7 +945,7 @@ EvtScript N(onHit) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_SUB(LVar2, 25) EVT_ADD(LVar3, 2) - EVT_CALL(PlayEffect, EFFECT_EMBERS, 0, LVar1, LVar2, LVar3, 40, 50, EVT_FLOAT(1.2), 24, 42, EVT_FLOAT(0.8), EVT_FLOAT(0.6), 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, LVar1, LVar2, LVar3, 40, 50, EVT_FLOAT(1.2), 24, 42, EVT_FLOAT(0.8), EVT_FLOAT(0.6), 0) EVT_WAIT(29) EVT_END_IF EVT_END_IF @@ -1032,7 +1032,7 @@ EvtScript N(attackPetitSpit) = { EVT_CALL(SetGoalPos, LVar5, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, LVar5, EVT_FLOAT(13.0)) EVT_CALL(SetActorJumpGravity, LVar5, EVT_FLOAT(1.8)) - EVT_CALL(FlyToGoal, LVar5, 0, 0, 0) + EVT_CALL(FlyToGoal, LVar5, 0, 0, EASING_LINEAR) EVT_IF_EQ(LVar9, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, LVar5, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -1045,7 +1045,7 @@ EvtScript N(attackPetitSpit) = { EVT_CALL(SetGoalToTarget, LVar5) EVT_CALL(SetActorSpeed, LVar5, EVT_FLOAT(13.0)) EVT_CALL(SetActorJumpGravity, LVar5, EVT_FLOAT(1.8)) - EVT_CALL(FlyToGoal, LVar5, 0, 0, 0) + EVT_CALL(FlyToGoal, LVar5, 0, 0, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, LVar5) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1055,13 +1055,13 @@ EvtScript N(attackPetitSpit) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CASE_OR_EQ(HIT_RESULT_10) - EVT_CALL(SetPartFlagBits, LVar5, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, LVar5, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetGoalToTarget, LVar5) EVT_CALL(GetGoalPos, LVar5, LVar0, LVar1, LVar2) EVT_SET(LVar1, 10) EVT_ADD(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_FLAME, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), LVarA, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(MakeLerp, 120, 10, 20, 1) + EVT_PLAY_EFFECT(EFFECT_FLAME, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), LVarA, 0) + EVT_CALL(MakeLerp, 120, 10, 20, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_MULF(LVar0, EVT_FLOAT(0.01)) diff --git a/src/battle/area/kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c index 2a37bcaa13..df1534b181 100644 --- a/src/battle/area/kzn2/actor/lava_piranha.c +++ b/src/battle/area/kzn2/actor/lava_piranha.c @@ -250,7 +250,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 40, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -540,8 +540,8 @@ static s32 N(unusedArray)[64]; EvtScript N(init) = { EVT_USE_ARRAY(N(unusedArray)) - EVT_CALL(EnableGroup, 23, 1) - EVT_CALL(EnableGroup, 28, 0) + EVT_CALL(EnableGroup, 23, TRUE) + EVT_CALL(EnableGroup, 28, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 5, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0) @@ -582,9 +582,9 @@ EvtScript N(init) = { EVT_CALL(SummonEnemy, EVT_PTR(N(formation_lava_bud_2)), 0) EVT_WAIT(2) EVT_EXEC(N(initVines)) - EVT_CALL(CreateNpc, 0, ANIM_BattleKolorado_Idle) - EVT_CALL(SetNpcYaw, 0, 90) - EVT_CALL(SetNpcPos, 0, -300, 0, 0) + EVT_CALL(CreateNpc, 0x00000000, ANIM_BattleKolorado_Idle) + EVT_CALL(SetNpcYaw, 0x00000000, 90) + EVT_CALL(SetNpcPos, 0x00000000, -300, 0, 0) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) @@ -658,64 +658,64 @@ EvtScript N(spawnColorado) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(func_802535B4, 0) - EVT_CALL(SpeakToPlayer, 0, -1, -1, 0, MSG_CH5_0104) + EVT_CALL(SpeakToPlayer, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0, MSG_CH5_0104) EVT_THREAD EVT_LOOP(9) - EVT_CALL(PlaySoundAtNpc, 0, SOUND_20BA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, 0x00000000, SOUND_20BA, SOUND_SPACE_MODE_0) EVT_WAIT(2) - EVT_CALL(PlaySoundAtNpc, 0, SOUND_3B4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, 0x00000000, SOUND_3B4, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetNpcAnimation, 0, ANIM_BattleKolorado_WalkSad) - EVT_CALL(SetNpcAnimationSpeed, 0, EVT_FLOAT(2.0)) - EVT_CALL(SetNpcSpeed, 0, EVT_FLOAT(10.0)) - EVT_CALL(NpcMoveTo, 0, 70, 0, 0) - EVT_CALL(PlaySoundAtNpc, 0, SOUND_E8, SOUND_SPACE_MODE_0) - EVT_CALL(SetNpcAnimationSpeed, 0, EVT_FLOAT(1.0)) - EVT_CALL(SetNpcJumpscale, 0, EVT_FLOAT(1.0)) - EVT_CALL(SetNpcAnimation, 0, ANIM_BattleKolorado_Injured) + EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_BattleKolorado_WalkSad) + EVT_CALL(SetNpcAnimationSpeed, 0x00000000, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcSpeed, 0x00000000, EVT_FLOAT(10.0)) + EVT_CALL(NpcMoveTo, 0x00000000, 70, 0, 0) + EVT_CALL(PlaySoundAtNpc, 0x00000000, SOUND_E8, SOUND_SPACE_MODE_0) + EVT_CALL(SetNpcAnimationSpeed, 0x00000000, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcJumpscale, 0x00000000, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_BattleKolorado_Injured) EVT_THREAD EVT_LOOP(10) - EVT_CALL(GetNpcPos, 0, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 20, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(GetNpcPos, 0x00000000, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 20, 0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(NpcJump0, 0, 70, 180, 0, 20) - EVT_CALL(SpeakToPlayer, 0, -1, -1, 0, MSG_CH5_0105) - EVT_CALL(SetNpcYaw, 0, 270) - EVT_CALL(SetNpcPos, 0, 50, 180, 0) + EVT_CALL(NpcJump0, 0x00000000, 70, 180, 0, 20) + EVT_CALL(SpeakToPlayer, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0, MSG_CH5_0105) + EVT_CALL(SetNpcYaw, 0x00000000, 270) + EVT_CALL(SetNpcPos, 0x00000000, 50, 180, 0) EVT_THREAD EVT_LOOP(10) - EVT_CALL(GetNpcPos, 0, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 20, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(GetNpcPos, 0x00000000, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 20, 0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(NpcJump0, 0, 50, 0, 0, 20) - EVT_CALL(NpcJump0, 0, 50, 0, 0, 6) - EVT_CALL(NpcJump0, 0, 50, 0, 0, 3) + EVT_CALL(NpcJump0, 0x00000000, 50, 0, 0, 20) + EVT_CALL(NpcJump0, 0x00000000, 50, 0, 0, 6) + EVT_CALL(NpcJump0, 0x00000000, 50, 0, 0, 3) EVT_WAIT(8) - EVT_CALL(SetNpcAnimation, 0, ANIM_BattleKolorado_Hurt) - EVT_CALL(SetNpcJumpscale, 0, EVT_FLOAT(0.7)) - EVT_CALL(NpcJump0, 0, 50, 0, 0, 12) + EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_BattleKolorado_Hurt) + EVT_CALL(SetNpcJumpscale, 0x00000000, EVT_FLOAT(0.7)) + EVT_CALL(NpcJump0, 0x00000000, 50, 0, 0, 12) EVT_THREAD EVT_LOOP(4) - EVT_CALL(PlaySoundAtNpc, 0, SOUND_20BA, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, 0x00000000, SOUND_20BA, SOUND_SPACE_MODE_0) EVT_WAIT(2) - EVT_CALL(PlaySoundAtNpc, 0, SOUND_3B4, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, 0x00000000, SOUND_3B4, SOUND_SPACE_MODE_0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetNpcAnimation, 0, ANIM_BattleKolorado_Run) - EVT_CALL(SetNpcSpeed, 0, EVT_FLOAT(8.0)) - EVT_CALL(NpcMoveTo, 0, -60, 0, 0) - EVT_CALL(SpeakToPlayer, 0, ANIM_BattleKolorado_Shout, ANIM_BattleKolorado_ShoutStill, 5, MSG_CH5_0106) + EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_BattleKolorado_Run) + EVT_CALL(SetNpcSpeed, 0x00000000, EVT_FLOAT(8.0)) + EVT_CALL(NpcMoveTo, 0x00000000, -60, 0, 0) + EVT_CALL(SpeakToPlayer, 0x00000000, ANIM_BattleKolorado_Shout, ANIM_BattleKolorado_ShoutStill, 5, MSG_CH5_0106) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_174) - EVT_CALL(SetNpcAnimation, 0, ANIM_BattleKolorado_Run) - EVT_CALL(SetNpcSpeed, 0, EVT_FLOAT(6.0)) - EVT_CALL(NpcMoveTo, 0, -300, 0, 0) + EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_BattleKolorado_Run) + EVT_CALL(SetNpcSpeed, 0x00000000, EVT_FLOAT(6.0)) + EVT_CALL(NpcMoveTo, 0x00000000, -300, 0, 0) EVT_CALL(func_802535B4, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -1157,11 +1157,11 @@ EvtScript N(attackFlameSpew) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 40) EVT_SET(LVar4, -10) - EVT_CALL(PlayEffect, EFFECT_63, 1, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 20, 20, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_63, 1, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 20, 20, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C3) EVT_WAIT(19) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) - EVT_CALL(PlayEffect, EFFECT_EMBERS, 0, LVar3, 0, LVar5, 50, 50, EVT_FLOAT(1.0), 40, 55, EVT_FLOAT(1.0), EVT_FLOAT(1.0), 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, LVar3, 0, LVar5, 50, 50, EVT_FLOAT(1.0), 40, 55, EVT_FLOAT(1.0), EVT_FLOAT(1.0), 0) EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE) EVT_CALL(LoadBattleDmaData, 3) EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) @@ -1237,12 +1237,12 @@ EvtScript N(attackFireStream) = { EVT_SET(LVar1, -10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) - EVT_CALL(PlayEffect, EFFECT_63, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 16, 40, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_63, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 16, 40, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C4) EVT_WAIT(15) EVT_THREAD EVT_WAIT(24) - EVT_CALL(PlayEffect, EFFECT_EMBERS, 0, LVar3, 0, LVar5, 50, 50, EVT_FLOAT(1.0), 40, 55, EVT_FLOAT(1.0), EVT_FLOAT(1.0), 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, LVar3, 0, LVar5, 50, 50, EVT_FLOAT(1.0), 40, 55, EVT_FLOAT(1.0), EVT_FLOAT(1.0), 0) EVT_END_THREAD EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_FIRE, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarA) @@ -1381,7 +1381,7 @@ EvtScript N(onDeath) = { EVT_WAIT(4) EVT_THREAD EVT_CALL(PlaySound, SOUND_3BC) - EVT_CALL(ShakeCam, 1, 0, 119, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 119, EVT_FLOAT(0.3)) EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 234) @@ -1479,7 +1479,7 @@ EvtScript N(onDeath) = { EVT_WAIT(80) EVT_THREAD EVT_CALL(PlaySound, SOUND_3BC) - EVT_CALL(ShakeCam, 1, 0, 165, EVT_FLOAT(1.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 165, EVT_FLOAT(1.2)) EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 300) @@ -1489,10 +1489,10 @@ EvtScript N(onDeath) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_263) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0) EVT_WAIT(50) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, 90, 90, 0) @@ -1519,8 +1519,8 @@ EvtScript N(onDeath) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(N(StartRumbleWithParams), 180, 16) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CHILD_THREAD EVT_WAIT(50) @@ -1553,8 +1553,8 @@ EvtScript N(onDeath) = { EVT_CALL(SetPartImmunityBits, ACTOR_ENEMY1, 2, ELEMENT_FIRE, 1) EVT_CALL(SetPartImmunityBits, ACTOR_ENEMY2, 1, ELEMENT_FIRE, 1) EVT_CALL(SetPartImmunityBits, ACTOR_ENEMY2, 2, ELEMENT_FIRE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY1, 2, ACTOR_PART_FLAG_2000, 0) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY2, 2, ACTOR_PART_FLAG_2000, 0) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY1, 2, ACTOR_PART_FLAG_2000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY2, 2, ACTOR_PART_FLAG_2000, FALSE) EVT_SET(LVar0, ACTOR_ENEMY0) EVT_EXEC_WAIT(N(ignite)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaPiranha_Anim04) @@ -1567,32 +1567,32 @@ EvtScript N(onDeath) = { EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_LAVA_PIRANHA_PHASE_2) EVT_CALL(SetActorType, ACTOR_ENEMY1, ACTOR_TYPE_LAVA_BUD_PHASE_2) EVT_CALL(SetActorType, ACTOR_ENEMY2, ACTOR_TYPE_LAVA_BUD_PHASE_2) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, 1) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY1, ACTOR_FLAG_1000, 1) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY2, ACTOR_FLAG_1000, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY1, ACTOR_FLAG_1000, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY2, ACTOR_FLAG_1000, TRUE) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar0) EVT_CALL(SetEnemyHP, ACTOR_SELF, LVar0) EVT_CALL(GetEnemyMaxHP, ACTOR_ENEMY1, LVar0) EVT_CALL(SetEnemyHP, ACTOR_ENEMY1, LVar0) EVT_CALL(GetEnemyMaxHP, ACTOR_ENEMY2, LVar0) EVT_CALL(SetEnemyHP, ACTOR_ENEMY2, LVar0) - EVT_CALL(EnableModel, 78, 1) - EVT_CALL(EnableModel, 79, 1) - EVT_CALL(EnableModel, 80, 1) - EVT_CALL(EnableModel, 81, 1) - EVT_CALL(EnableModel, 82, 1) - EVT_CALL(EnableModel, 83, 1) - EVT_CALL(EnableModel, 84, 1) - EVT_CALL(EnableModel, 85, 1) - EVT_CALL(EnableModel, 87, 1) - EVT_CALL(EnableModel, 88, 1) + EVT_CALL(EnableModel, 78, TRUE) + EVT_CALL(EnableModel, 79, TRUE) + EVT_CALL(EnableModel, 80, TRUE) + EVT_CALL(EnableModel, 81, TRUE) + EVT_CALL(EnableModel, 82, TRUE) + EVT_CALL(EnableModel, 83, TRUE) + EVT_CALL(EnableModel, 84, TRUE) + EVT_CALL(EnableModel, 85, TRUE) + EVT_CALL(EnableModel, 87, TRUE) + EVT_CALL(EnableModel, 88, TRUE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C5) - EVT_CALL(PlayEffect, EFFECT_EMBERS, 0, 100, 0, 0, 70, 80, EVT_FLOAT(2.5), 80, 55, EVT_FLOAT(2.0), EVT_FLOAT(2.0), 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, 100, 0, 0, 70, 80, EVT_FLOAT(2.5), 80, 55, EVT_FLOAT(2.0), EVT_FLOAT(2.0), 0) EVT_CALL(LoadAnimatedModel, VINE_4, EVT_PTR(N(anim1))) EVT_CALL(PlayModelAnimation, VINE_4, EVT_PTR(N(anim1_8021A364))) EVT_CALL(SetAnimatedModelRootPosition, VINE_4, 0, 0, 0) - EVT_CALL(EnableGroup, 23, 0) - EVT_CALL(EnableGroup, 28, 1) + EVT_CALL(EnableGroup, 23, FALSE) + EVT_CALL(EnableGroup, 28, TRUE) EVT_THREAD EVT_WAIT(45) EVT_CALL(DeleteAnimatedModel, 4) @@ -1651,8 +1651,8 @@ EvtScript N(onDeath) = { EVT_CALL(PlayModelAnimation, VINE_3, VINE_3_BASE) EVT_THREAD EVT_CALL(PlaySound, SOUND_3BC) - EVT_CALL(ShakeCam, 1, 0, 100, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 8, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 100, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 8, EVT_FLOAT(0.2)) EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 216) @@ -1675,7 +1675,7 @@ EvtScript N(onDeath) = { EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(PlayEffect, EFFECT_EMBERS, 0, 105, 60, 2, 80, 60, EVT_FLOAT(1.8), 90, 100, EVT_FLOAT(1.5), EVT_FLOAT(1.5), 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, 105, 60, 2, 80, 60, EVT_FLOAT(1.8), 90, 100, EVT_FLOAT(1.5), EVT_FLOAT(1.5), 0) EVT_END_IF EVT_WAIT(121) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3CD) @@ -1713,7 +1713,7 @@ EvtScript N(onDeath) = { EVT_CALL(PlayModelAnimation, VINE_1, VINE_1_BASE) EVT_CALL(GetActorVar, ACTOR_ENEMY1, 5, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(PlayEffect, EFFECT_EMBERS, 0, 67, 30, 2, 50, 40, EVT_FLOAT(1.3), 30, 70, EVT_FLOAT(1.2), EVT_FLOAT(1.2), 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, 67, 30, 2, 50, 40, EVT_FLOAT(1.3), 30, 70, EVT_FLOAT(1.2), EVT_FLOAT(1.2), 0) EVT_END_IF EVT_WAIT(96) EVT_CALL(OverrideBattleDmaDest, VINE_1_BASE) @@ -1749,7 +1749,7 @@ EvtScript N(onDeath) = { EVT_CALL(PlayModelAnimation, VINE_2, VINE_2_BASE) EVT_CALL(GetActorVar, ACTOR_ENEMY2, 5, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(PlayEffect, EFFECT_EMBERS, 0, 120, 35, 5, 50, 40, EVT_FLOAT(1.3), 30, 70, EVT_FLOAT(1.2), EVT_FLOAT(1.2), 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, 120, 35, 5, 50, 40, EVT_FLOAT(1.3), 30, 70, EVT_FLOAT(1.2), EVT_FLOAT(1.2), 0) EVT_END_IF EVT_WAIT(96) EVT_CALL(OverrideBattleDmaDest, VINE_2_BASE) @@ -1781,10 +1781,10 @@ EvtScript N(onDeath) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaPiranha_Anim0F) EVT_CALL(SetAnimation, ACTOR_ENEMY1, 1, ANIM_LavaBud_Anim0F) EVT_CALL(SetAnimation, ACTOR_ENEMY2, 1, ANIM_LavaBud_Anim0F) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 0, -60, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 0, -60, 0, 2, 0) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 180, 16) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(4.0)) EVT_END_THREAD EVT_WAIT(3) EVT_CALL(SetActorPos, ACTOR_SELF, -60, 0, 0) @@ -1807,11 +1807,11 @@ EvtScript N(onDeath) = { EVT_CALL(RemoveEffect, LVar0) EVT_END_IF EVT_WAIT(5) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY0, ACTOR_FLAG_NO_DMG_APPLY, 1) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 2, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY1, ACTOR_FLAG_NO_DMG_APPLY, 1) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY2, ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY0, ACTOR_FLAG_NO_DMG_APPLY, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 2, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY1, ACTOR_FLAG_NO_DMG_APPLY, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY2, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_END_IF EVT_RETURN EVT_END @@ -1838,7 +1838,7 @@ EvtScript N(handleBudDeath) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(GetActorPos, LVar0, LVar3, LVar4, LVar5) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar3, LVar4, LVar5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar3, LVar4, LVar5, 0, 0, 0, 0, 0) EVT_SET(LVar3, 0) EVT_LOOP(12) EVT_CALL(SetPartRotation, LVar0, 1, LVar3, LVar2, 0) @@ -1886,18 +1886,18 @@ EvtScript N(ignite) = { EVT_CALL(N(GetFlamePosition), LVar1, LVar2, LVar6, LVar7, LVar8, LVar3, LVar4) EVT_CALL(GetPartOffset, ACTOR_ENEMY1, 1, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_FLAME, 1, LVar3, LVar4, LVar2, EVT_FLOAT(0.3), LVarA, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, LVar3, LVar4, LVar2, EVT_FLOAT(0.3), LVarA, 0) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 6, LVarA) EVT_CALL(SetIdleAnimations, ACTOR_ENEMY1, 1, EVT_PTR(b_area_kzn2_lava_bud_idleAnimations_fiery)) EVT_CALL(SetDefenseTable, ACTOR_ENEMY1, 1, EVT_PTR(b_area_kzn2_lava_bud_defenseTable_fiery)) EVT_CALL(SetDefenseTable, ACTOR_ENEMY1, 2, EVT_PTR(b_area_kzn2_lava_bud_defenseTable_fiery)) - EVT_CALL(SetPartEventBits, ACTOR_ENEMY1, 1, ACTOR_EVENT_FLAG_FIREY, 1) - EVT_CALL(SetPartEventBits, ACTOR_ENEMY1, 2, ACTOR_EVENT_FLAG_FIREY, 1) + EVT_CALL(SetPartEventBits, ACTOR_ENEMY1, 1, ACTOR_EVENT_FLAG_FIREY, TRUE) + EVT_CALL(SetPartEventBits, ACTOR_ENEMY1, 2, ACTOR_EVENT_FLAG_FIREY, TRUE) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 7, ANIM_LavaBud_Anim04) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 8, ANIM_LavaBud_Anim0B) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 5, 1) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY1, 2, ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY1, ACTOR_FLAG_40000, 0) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY1, 2, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY1, ACTOR_FLAG_40000, FALSE) EVT_CASE_EQ(ACTOR_ENEMY2) EVT_CALL(SetActorVar, ACTOR_ENEMY2, 10, 35) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_2, 8, LVar1, LVar2, LVar3) @@ -1907,18 +1907,18 @@ EvtScript N(ignite) = { EVT_CALL(N(GetFlamePosition), LVar1, LVar2, LVar6, LVar7, LVar8, LVar3, LVar4) EVT_CALL(GetPartOffset, ACTOR_ENEMY2, 1, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_FLAME, 1, LVar3, LVar4, LVar2, EVT_FLOAT(0.3), LVarA, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, LVar3, LVar4, LVar2, EVT_FLOAT(0.3), LVarA, 0) EVT_CALL(SetActorVar, ACTOR_ENEMY2, 6, LVarA) EVT_CALL(SetIdleAnimations, ACTOR_ENEMY2, 1, EVT_PTR(b_area_kzn2_lava_bud_idleAnimations_fiery)) EVT_CALL(SetDefenseTable, ACTOR_ENEMY2, 1, EVT_PTR(b_area_kzn2_lava_bud_defenseTable_fiery)) EVT_CALL(SetDefenseTable, ACTOR_ENEMY2, 2, EVT_PTR(b_area_kzn2_lava_bud_defenseTable_fiery)) - EVT_CALL(SetPartEventBits, ACTOR_ENEMY2, 1, ACTOR_EVENT_FLAG_FIREY, 1) - EVT_CALL(SetPartEventBits, ACTOR_ENEMY2, 2, ACTOR_EVENT_FLAG_FIREY, 1) + EVT_CALL(SetPartEventBits, ACTOR_ENEMY2, 1, ACTOR_EVENT_FLAG_FIREY, TRUE) + EVT_CALL(SetPartEventBits, ACTOR_ENEMY2, 2, ACTOR_EVENT_FLAG_FIREY, TRUE) EVT_CALL(SetActorVar, ACTOR_ENEMY2, 7, ANIM_LavaBud_Anim04) EVT_CALL(SetActorVar, ACTOR_ENEMY2, 8, ANIM_LavaBud_Anim0B) EVT_CALL(SetActorVar, ACTOR_ENEMY2, 5, 1) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY2, 2, ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY2, ACTOR_FLAG_40000, 0) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY2, 2, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY2, ACTOR_FLAG_40000, FALSE) EVT_CASE_DEFAULT EVT_CALL(SetActorVar, ACTOR_ENEMY0, 10, 70) EVT_CALL(GetAnimatedPositionByTreeIndex, VINE_0, 10, LVar1, LVar2, LVar3) @@ -1928,18 +1928,18 @@ EvtScript N(ignite) = { EVT_CALL(N(GetFlamePosition), LVar1, LVar2, LVar6, LVar7, LVar8, LVar3, LVar4) EVT_CALL(GetPartOffset, ACTOR_ENEMY0, 1, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_FLAME, 1, LVar3, LVar4, LVar2, EVT_FLOAT(0.7), LVarA, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, LVar3, LVar4, LVar2, EVT_FLOAT(0.7), LVarA, 0) EVT_CALL(SetActorVar, ACTOR_ENEMY0, 6, LVarA) EVT_CALL(SetIdleAnimations, ACTOR_ENEMY0, 1, EVT_PTR(N(idleAnimations_fiery))) EVT_CALL(SetDefenseTable, ACTOR_ENEMY0, 1, EVT_PTR(N(defenseTable_fiery))) EVT_CALL(SetDefenseTable, ACTOR_ENEMY0, 2, EVT_PTR(N(defenseTable_fiery))) - EVT_CALL(SetPartEventBits, ACTOR_ENEMY0, 1, ACTOR_EVENT_FLAG_FIREY, 1) - EVT_CALL(SetPartEventBits, ACTOR_ENEMY0, 2, ACTOR_EVENT_FLAG_FIREY, 1) - EVT_CALL(SetActorVar, ACTOR_ENEMY0, 7, 7929860) - EVT_CALL(SetActorVar, ACTOR_ENEMY0, 8, 7929866) + EVT_CALL(SetPartEventBits, ACTOR_ENEMY0, 1, ACTOR_EVENT_FLAG_FIREY, TRUE) + EVT_CALL(SetPartEventBits, ACTOR_ENEMY0, 2, ACTOR_EVENT_FLAG_FIREY, TRUE) + EVT_CALL(SetActorVar, ACTOR_ENEMY0, 7, 0x00790004) + EVT_CALL(SetActorVar, ACTOR_ENEMY0, 8, 0x0079000A) EVT_CALL(SetActorVar, ACTOR_ENEMY0, 5, 1) EVT_CALL(ForceHomePos, ACTOR_SELF, 61, 61, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, FALSE) EVT_END_SWITCH EVT_RETURN EVT_END @@ -2026,15 +2026,15 @@ EvtScript N(doOnHit) = { EVT_CALL(RemoveEffect, LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_COLD_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 50, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_COLD_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 50, 0) EVT_END_IF EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_wet))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_wet))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 2, EVT_PTR(N(defenseTable_wet))) EVT_CALL(SetActorVar, ACTOR_SELF, 7, ANIM_LavaPiranha_Anim0A) EVT_CALL(SetActorVar, ACTOR_SELF, 8, ANIM_LavaPiranha_Anim09) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FIREY, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_FIREY, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FIREY, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_WAIT(29) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C8) EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE) @@ -2067,7 +2067,7 @@ EvtScript N(doOnHit) = { EVT_CALL(LoadBattleDmaData, 6) EVT_END_IF EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) - EVT_CALL(PlayEffect, EFFECT_EMBERS, 0, 80, 50, 0, 60, 50, EVT_FLOAT(1.5), 36, 42, EVT_FLOAT(0.8), EVT_FLOAT(0.8), 0, 0) + EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, 80, 50, 0, 60, 50, EVT_FLOAT(1.5), 36, 42, EVT_FLOAT(0.8), EVT_FLOAT(0.8), 0) EVT_WAIT(29) EVT_WAIT(14) EVT_END_IF diff --git a/src/battle/area/kzn2/actor/petit_piranha.c b/src/battle/area/kzn2/actor/petit_piranha.c index 509b866a6e..90571ae3da 100644 --- a/src/battle/area/kzn2/actor/petit_piranha.c +++ b/src/battle/area/kzn2/actor/petit_piranha.c @@ -82,7 +82,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 1, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -211,10 +211,10 @@ EvtScript N(handleEvent) = { EvtScript N(recoverHP) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 0) EVT_ADD(LVar0, 20) EVT_CALL(GetLastDamage, ACTOR_SELF, LVar3) - EVT_CALL(PlayEffect, EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_ADD(LVar0, LVar3) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) @@ -265,7 +265,7 @@ EvtScript N(takeTurn) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 15) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -12, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -12, EASING_LINEAR) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(SetBattleCamZoom, 380) @@ -276,16 +276,16 @@ EvtScript N(takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_PetitPiranha_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x3CA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3CA) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_LINEAR) EVT_WAIT(10) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x3CB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3CB) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -294,19 +294,19 @@ EvtScript N(takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_PetitPiranha_Anim05) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(8.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -16, 3) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -16, EASING_QUARTIC_IN) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 10) EVT_SET(LVar1, 0) EVT_ADD(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_FLAME, 1, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), LVarA, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FLAME, 1, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), LVarA, 0) EVT_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) - EVT_CALL(MakeLerp, 0, 30, 21, 0) + EVT_CALL(MakeLerp, 0, 30, 21, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_SET(LVar4, LVar3) @@ -318,7 +318,7 @@ EvtScript N(takeTurn) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(MakeLerp, 140, 160, 2, 1) + EVT_CALL(MakeLerp, 140, 160, 2, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_MULF(LVar0, EVT_FLOAT(0.01)) @@ -332,7 +332,7 @@ EvtScript N(takeTurn) = { EVT_SWITCH(LVar9) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) - EVT_CALL(MakeLerp, 160, 10, 20, 1) + EVT_CALL(MakeLerp, 160, 10, 20, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_MULF(LVar0, EVT_FLOAT(0.01)) @@ -361,7 +361,7 @@ EvtScript N(takeTurn) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CASE_OR_EQ(HIT_RESULT_10) - EVT_CALL(MakeLerp, 160, 10, 20, 1) + EVT_CALL(MakeLerp, 160, 10, 20, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_MULF(LVar0, EVT_FLOAT(0.01)) diff --git a/src/battle/area/kzn2/actor/petit_piranha_bomb.c b/src/battle/area/kzn2/actor/petit_piranha_bomb.c index bbdaa97af5..6836e3b00d 100644 --- a/src/battle/area/kzn2/actor/petit_piranha_bomb.c +++ b/src/battle/area/kzn2/actor/petit_piranha_bomb.c @@ -80,7 +80,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 1, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, diff --git a/src/battle/area/kzn2/stage/kzn_01.c b/src/battle/area/kzn2/stage/kzn_01.c index 1162d9e123..ee2f0e6d3e 100644 --- a/src/battle/area/kzn2/stage/kzn_01.c +++ b/src/battle/area/kzn2/stage/kzn_01.c @@ -3,28 +3,33 @@ #define NAMESPACE b_area_kzn2_kzn_01 -EvtScript N(beforeBattle_80227780) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 17, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 17, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_802277D0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_802277E0)[] = { - 0x0000000E, 0x0000000F, 0x00000018, 0x00000019, 0x0000001A, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x0000000E, + 0x0000000F, + 0x00000018, + 0x00000019, + 0x0000001A, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kzn_tex", .shape = "kzn_bt01_shape", .hit = "kzn_bt01_hit", - .preBattle = &N(beforeBattle_80227780), - .postBattle = &N(afterBattle_802277D0), - .foregroundModelList = N(foregroundModelList_802277E0), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kzn2/stage/kzn_01b.c b/src/battle/area/kzn2/stage/kzn_01b.c index ef205a86b2..46c214633b 100644 --- a/src/battle/area/kzn2/stage/kzn_01b.c +++ b/src/battle/area/kzn2/stage/kzn_01b.c @@ -3,27 +3,32 @@ #define NAMESPACE b_area_kzn2_kzn_01b -EvtScript N(beforeBattle_80227820) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8022785C) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_8022786C)[] = { - 0x0000000E, 0x0000000F, 0x00000018, 0x00000019, 0x0000001A, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x0000000E, + 0x0000000F, + 0x00000018, + 0x00000019, + 0x0000001A, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kzn_tex", .shape = "kzn_bt01_shape", .hit = "kzn_bt01_hit", - .preBattle = &N(beforeBattle_80227820), - .postBattle = &N(afterBattle_8022785C), - .foregroundModelList = N(foregroundModelList_8022786C), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kzn2/stage/kzn_02.c b/src/battle/area/kzn2/stage/kzn_02.c index 69661736bc..11610e5e35 100644 --- a/src/battle/area/kzn2/stage/kzn_02.c +++ b/src/battle/area/kzn2/stage/kzn_02.c @@ -42,7 +42,7 @@ EvtScript N(80227A2C) = { EVT_LABEL(0) EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, 0) + EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -53,7 +53,7 @@ EvtScript N(80227A2C) = { EVT_END_LOOP EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, 0) + EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -67,9 +67,9 @@ EvtScript N(80227A2C) = { EVT_END }; -EvtScript N(beforeBattle_80227BDC) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 25) EVT_SET(LVar1, 0) EVT_EXEC(N(802278B0)) @@ -100,20 +100,23 @@ EvtScript N(beforeBattle_80227BDC) = { EVT_END }; -EvtScript N(afterBattle_80227D98) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80227DA8)[] = { - 0x0000001E, 0x0000001F, 0x00000020, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x0000001E, + 0x0000001F, + 0x00000020, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kzn_tex", .shape = "kzn_bt02_shape", .hit = "kzn_bt02_hit", - .preBattle = &N(beforeBattle_80227BDC), - .postBattle = &N(afterBattle_80227D98), - .foregroundModelList = N(foregroundModelList_80227DA8), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kzn2/stage/kzn_04.c b/src/battle/area/kzn2/stage/kzn_04.c index 7659107020..9a8417efea 100644 --- a/src/battle/area/kzn2/stage/kzn_04.c +++ b/src/battle/area/kzn2/stage/kzn_04.c @@ -42,7 +42,7 @@ EvtScript N(80227F5C) = { EVT_LABEL(0) EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, 0) + EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -53,7 +53,7 @@ EvtScript N(80227F5C) = { EVT_END_LOOP EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, 0) + EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -67,11 +67,11 @@ EvtScript N(80227F5C) = { EVT_END }; -EvtScript N(beforeBattle_8022810C) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 30, 0) - EVT_CALL(SetGroupEnabled, 44, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 30, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 44, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, 4) EVT_SET(LVar1, 0) EVT_EXEC(N(80227DE0)) @@ -106,20 +106,23 @@ EvtScript N(beforeBattle_8022810C) = { EVT_END }; -EvtScript N(afterBattle_80228328) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80228338)[] = { - 0x00000014, 0x00000015, 0x00000016, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x00000014, + 0x00000015, + 0x00000016, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kzn_tex", .shape = "kzn_bt04_shape", .hit = "kzn_bt04_hit", - .preBattle = &N(beforeBattle_8022810C), - .postBattle = &N(afterBattle_80228328), - .foregroundModelList = N(foregroundModelList_80228338), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kzn2/stage/kzn_04b.c b/src/battle/area/kzn2/stage/kzn_04b.c index a952fc738c..11183fdd7d 100644 --- a/src/battle/area/kzn2/stage/kzn_04b.c +++ b/src/battle/area/kzn2/stage/kzn_04b.c @@ -42,7 +42,7 @@ EvtScript N(802284EC) = { EVT_LABEL(0) EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, 0) + EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -53,7 +53,7 @@ EvtScript N(802284EC) = { EVT_END_LOOP EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, 0) + EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -67,11 +67,11 @@ EvtScript N(802284EC) = { EVT_END }; -EvtScript N(beforeBattle_8022869C) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 39, 0) - EVT_CALL(SetGroupEnabled, 44, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 39, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 44, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, 4) EVT_SET(LVar1, 0) EVT_EXEC(N(80228370)) @@ -106,20 +106,23 @@ EvtScript N(beforeBattle_8022869C) = { EVT_END }; -EvtScript N(afterBattle_802288B8) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_802288C8)[] = { - 0x00000014, 0x00000015, 0x00000016, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x00000014, + 0x00000015, + 0x00000016, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kzn_tex", .shape = "kzn_bt04_shape", .hit = "kzn_bt04_hit", - .preBattle = &N(beforeBattle_8022869C), - .postBattle = &N(afterBattle_802288B8), - .foregroundModelList = N(foregroundModelList_802288C8), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kzn2/stage/kzn_04c.c b/src/battle/area/kzn2/stage/kzn_04c.c index 8e02b67d3c..a00276fcf5 100644 --- a/src/battle/area/kzn2/stage/kzn_04c.c +++ b/src/battle/area/kzn2/stage/kzn_04c.c @@ -42,7 +42,7 @@ EvtScript N(80228A7C) = { EVT_LABEL(0) EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, 0) + EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -53,7 +53,7 @@ EvtScript N(80228A7C) = { EVT_END_LOOP EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, 0) + EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -67,11 +67,11 @@ EvtScript N(80228A7C) = { EVT_END }; -EvtScript N(beforeBattle_80228C2C) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 39, 0) - EVT_CALL(SetGroupEnabled, 30, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 39, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 30, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, 4) EVT_SET(LVar1, 0) EVT_EXEC(N(80228900)) @@ -100,20 +100,23 @@ EvtScript N(beforeBattle_80228C2C) = { EVT_END }; -EvtScript N(afterBattle_80228DF0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80228E00)[] = { - 0x00000014, 0x00000015, 0x00000016, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x00000014, + 0x00000015, + 0x00000016, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "kzn_tex", .shape = "kzn_bt04_shape", .hit = "kzn_bt04_hit", - .preBattle = &N(beforeBattle_80228C2C), - .postBattle = &N(afterBattle_80228DF0), - .foregroundModelList = N(foregroundModelList_80228E00), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/kzn2/stage/kzn_05.c b/src/battle/area/kzn2/stage/kzn_05.c index b75b690649..3c8c0d57cf 100644 --- a/src/battle/area/kzn2/stage/kzn_05.c +++ b/src/battle/area/kzn2/stage/kzn_05.c @@ -42,7 +42,7 @@ EvtScript N(80228FBC) = { EVT_LABEL(0) EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, 0) + EVT_CALL(MakeLerp, LVar8, LVar2, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -53,7 +53,7 @@ EvtScript N(80228FBC) = { EVT_END_LOOP EVT_SET(LVar2, LVar8) EVT_ADD(LVar2, LVar9) - EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, 0) + EVT_CALL(MakeLerp, LVar2, LVar8, LVar7, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, LVar0, 0, 0) @@ -67,9 +67,9 @@ EvtScript N(80228FBC) = { EVT_END }; -EvtScript N(beforeBattle_8022916C) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 17) EVT_SET(LVar1, 0) EVT_EXEC(N(80228E40)) @@ -88,70 +88,70 @@ EvtScript N(beforeBattle_8022916C) = { EVT_SET(LVar0, 27) EVT_SET(LVar1, 5) EVT_EXEC(N(80228F0C)) - EVT_CALL(EnableModel, 29, 0) - EVT_CALL(EnableModel, 30, 0) - EVT_CALL(EnableModel, 31, 0) - EVT_CALL(EnableModel, 32, 0) - EVT_CALL(EnableModel, 33, 0) - EVT_CALL(EnableModel, 34, 0) - EVT_CALL(EnableModel, 35, 0) - EVT_CALL(EnableModel, 36, 0) - EVT_CALL(EnableModel, 37, 0) - EVT_CALL(EnableModel, 38, 0) - EVT_CALL(EnableModel, 39, 0) - EVT_CALL(EnableModel, 40, 0) - EVT_CALL(EnableModel, 41, 0) - EVT_CALL(EnableModel, 42, 0) - EVT_CALL(EnableModel, 43, 0) - EVT_CALL(EnableModel, 44, 0) - EVT_CALL(EnableModel, 45, 0) - EVT_CALL(EnableModel, 46, 0) - EVT_CALL(EnableModel, 47, 0) - EVT_CALL(EnableModel, 48, 0) - EVT_CALL(EnableModel, 49, 0) - EVT_CALL(EnableModel, 50, 0) - EVT_CALL(EnableModel, 51, 0) - EVT_CALL(EnableModel, 52, 0) - EVT_CALL(EnableModel, 53, 0) - EVT_CALL(EnableModel, 54, 0) - EVT_CALL(EnableModel, 55, 0) - EVT_CALL(EnableModel, 56, 0) - EVT_CALL(EnableModel, 57, 0) - EVT_CALL(EnableModel, 58, 0) - EVT_CALL(EnableModel, 59, 0) - EVT_CALL(EnableModel, 60, 0) - EVT_CALL(EnableModel, 61, 0) - EVT_CALL(EnableModel, 62, 0) - EVT_CALL(EnableModel, 63, 0) - EVT_CALL(EnableModel, 64, 0) - EVT_CALL(EnableModel, 65, 0) - EVT_CALL(EnableModel, 66, 0) - EVT_CALL(EnableModel, 67, 0) - EVT_CALL(EnableModel, 68, 0) - EVT_CALL(EnableModel, 69, 0) - EVT_CALL(EnableModel, 70, 0) - EVT_CALL(EnableModel, 71, 0) - EVT_CALL(EnableModel, 72, 0) - EVT_CALL(EnableModel, 73, 0) - EVT_CALL(EnableModel, 74, 0) - EVT_CALL(EnableModel, 75, 0) - EVT_CALL(EnableModel, 76, 0) - EVT_CALL(EnableModel, 78, 0) - EVT_CALL(EnableModel, 79, 0) - EVT_CALL(EnableModel, 80, 0) - EVT_CALL(EnableModel, 81, 0) - EVT_CALL(EnableModel, 82, 0) - EVT_CALL(EnableModel, 83, 0) - EVT_CALL(EnableModel, 84, 0) - EVT_CALL(EnableModel, 85, 0) - EVT_CALL(EnableModel, 86, 0) - EVT_CALL(EnableModel, 87, 0) - EVT_CALL(EnableModel, 88, 0) + EVT_CALL(EnableModel, 29, FALSE) + EVT_CALL(EnableModel, 30, FALSE) + EVT_CALL(EnableModel, 31, FALSE) + EVT_CALL(EnableModel, 32, FALSE) + EVT_CALL(EnableModel, 33, FALSE) + EVT_CALL(EnableModel, 34, FALSE) + EVT_CALL(EnableModel, 35, FALSE) + EVT_CALL(EnableModel, 36, FALSE) + EVT_CALL(EnableModel, 37, FALSE) + EVT_CALL(EnableModel, 38, FALSE) + EVT_CALL(EnableModel, 39, FALSE) + EVT_CALL(EnableModel, 40, FALSE) + EVT_CALL(EnableModel, 41, FALSE) + EVT_CALL(EnableModel, 42, FALSE) + EVT_CALL(EnableModel, 43, FALSE) + EVT_CALL(EnableModel, 44, FALSE) + EVT_CALL(EnableModel, 45, FALSE) + EVT_CALL(EnableModel, 46, FALSE) + EVT_CALL(EnableModel, 47, FALSE) + EVT_CALL(EnableModel, 48, FALSE) + EVT_CALL(EnableModel, 49, FALSE) + EVT_CALL(EnableModel, 50, FALSE) + EVT_CALL(EnableModel, 51, FALSE) + EVT_CALL(EnableModel, 52, FALSE) + EVT_CALL(EnableModel, 53, FALSE) + EVT_CALL(EnableModel, 54, FALSE) + EVT_CALL(EnableModel, 55, FALSE) + EVT_CALL(EnableModel, 56, FALSE) + EVT_CALL(EnableModel, 57, FALSE) + EVT_CALL(EnableModel, 58, FALSE) + EVT_CALL(EnableModel, 59, FALSE) + EVT_CALL(EnableModel, 60, FALSE) + EVT_CALL(EnableModel, 61, FALSE) + EVT_CALL(EnableModel, 62, FALSE) + EVT_CALL(EnableModel, 63, FALSE) + EVT_CALL(EnableModel, 64, FALSE) + EVT_CALL(EnableModel, 65, FALSE) + EVT_CALL(EnableModel, 66, FALSE) + EVT_CALL(EnableModel, 67, FALSE) + EVT_CALL(EnableModel, 68, FALSE) + EVT_CALL(EnableModel, 69, FALSE) + EVT_CALL(EnableModel, 70, FALSE) + EVT_CALL(EnableModel, 71, FALSE) + EVT_CALL(EnableModel, 72, FALSE) + EVT_CALL(EnableModel, 73, FALSE) + EVT_CALL(EnableModel, 74, FALSE) + EVT_CALL(EnableModel, 75, FALSE) + EVT_CALL(EnableModel, 76, FALSE) + EVT_CALL(EnableModel, 78, FALSE) + EVT_CALL(EnableModel, 79, FALSE) + EVT_CALL(EnableModel, 80, FALSE) + EVT_CALL(EnableModel, 81, FALSE) + EVT_CALL(EnableModel, 82, FALSE) + EVT_CALL(EnableModel, 83, FALSE) + EVT_CALL(EnableModel, 84, FALSE) + EVT_CALL(EnableModel, 85, FALSE) + EVT_CALL(EnableModel, 86, FALSE) + EVT_CALL(EnableModel, 87, FALSE) + EVT_CALL(EnableModel, 88, FALSE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8022974C) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -160,6 +160,6 @@ Stage NAMESPACE = { .texture = "kzn_tex", .shape = "kzn_bt05_shape", .hit = "kzn_bt05_hit", - .preBattle = &N(beforeBattle_8022916C), - .postBattle = &N(afterBattle_8022974C), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/mac/actor/chan.c b/src/battle/area/mac/actor/chan.c index 576d8d91fe..a8e6d591c9 100644 --- a/src/battle/area/mac/actor/chan.c +++ b/src/battle/area/mac/actor/chan.c @@ -67,7 +67,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 15, .partCount = ARRAY_COUNT(N(partsTable_80219E24)), .partsData = N(partsTable_80219E24), - .takeTurnScript = &N(init_8021CCDC), + .initScript = &N(init_8021CCDC), .statusTable = N(statusTable_80219D78), .escapeChance = 100, .airLiftChance = 0, @@ -131,22 +131,22 @@ extern EvtScript N(handleEvent_8021AAB8); EvtScript N(80219F4C) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8021A11C))) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(SetActorVar, -127, 8, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_CALL(N(UnkBattleFunc1), -10, 0, 10, 0) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8021B81C))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021A560))) - EVT_CALL(SetPartEventBits, -127, 1, 4096, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, 0x00001000, FALSE) EVT_ELSE - EVT_CALL(SetActorVar, -127, 8, 1) - EVT_CALL(SetTargetOffset, -127, 1, 0, 16) - EVT_CALL(SetProjectileTargetOffset, -127, 1, -1, -9) + EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 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))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) - EVT_CALL(SetPartEventBits, -127, 1, 4096, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, 0x00001000, TRUE) EVT_END_IF EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -162,34 +162,34 @@ EvtScript N(idle_8021A11C) = { EvtScript N(8021A12C) = { EVT_CALL(func_8027D32C, -127) - EVT_CALL(SetActorVar, -127, 8, 2) - EVT_CALL(SetTargetOffset, -127, 1, 0, 16) - EVT_CALL(SetProjectileTargetOffset, -127, 1, -1, -9) + EVT_CALL(SetActorVar, ACTOR_SELF, 8, 2) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) + 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_Chan))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021AAB8))) - EVT_CALL(SetActorVar, -127, 9, 1) - EVT_CALL(SetDefenseTable, -127, 1, EVT_PTR(N(defenseTable_80219D6C))) + EVT_CALL(SetActorVar, ACTOR_SELF, 9, 1) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80219D6C))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219F08))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) - EVT_CALL(SetPartEventBits, -127, 1, 16, 0) - EVT_CALL(SetPartEventBits, -127, 1, 4096, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, 16, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, 0x00001000, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Chan_ToppledHurt) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 24) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, -127, 2, 769, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) - EVT_CALL(GetIndexFromPos, -127, LVarA) + EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVarA) EVT_MOD(LVarA, 4) - EVT_CALL(SetGoalToIndex, -127, LVarA) + EVT_CALL(SetGoalToIndex, ACTOR_SELF, LVarA) EVT_CALL(GetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) - EVT_CALL(SetHomePos, -127, LVarA, LVarB, LVarC) + EVT_CALL(SetHomePos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_SET(LVarD, LVarA) EVT_SET(LVarE, LVarB) EVT_SET(LVarF, LVarC) @@ -289,7 +289,7 @@ EvtScript N(handleEvent_8021A560) = { EVT_RETURN EVT_CASE_EQ(49) EVT_CASE_EQ(57) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_Chan_Run) EVT_SET_CONST(LVar2, ANIM_Chan_Hurt) @@ -304,7 +304,7 @@ EvtScript N(handleEvent_8021A560) = { }; EvtScript N(8021AA1C) = { - EVT_CALL(GetActorVar, -127, 8, LVar3) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar3) EVT_IF_EQ(LVar3, 2) EVT_SET(LVar1, LVar2) EVT_END_IF @@ -332,7 +332,7 @@ EvtScript N(handleEvent_8021AAB8) = { EVT_EXEC_WAIT(DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(14) - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_NE(LVar0, 2) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_Chan_Hurt) @@ -345,7 +345,7 @@ EvtScript N(handleEvent_8021AAB8) = { EVT_EXEC_WAIT(DoBurnHit) EVT_END_IF EVT_CASE_EQ(36) - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_NE(LVar0, 2) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_Chan_Hurt) @@ -371,15 +371,15 @@ EvtScript N(handleEvent_8021AAB8) = { EVT_EXEC_WAIT(N(8021AA1C)) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_CASE_EQ(13) - EVT_CALL(SetActorVar, -127, 8, 2) - EVT_CALL(SetTargetOffset, -127, 1, 0, 16) - 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(SetActorVar, ACTOR_SELF, 8, 2) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) + 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_80219D6C))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219F08))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Chan_Hurt) - EVT_CALL(SetActorRotationOffset, -127, 0, 12, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD EVT_WAIT(1) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) @@ -400,7 +400,7 @@ EvtScript N(handleEvent_8021AAB8) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Chan_ToppledHurt) EVT_CASE_EQ(47) @@ -422,7 +422,7 @@ EvtScript N(handleEvent_8021AAB8) = { EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(23) - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 1) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_Chan_EnterShell) @@ -435,7 +435,7 @@ EvtScript N(handleEvent_8021AAB8) = { EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_CASE_EQ(25) - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 1) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_Chan_EnterShell) @@ -456,7 +456,7 @@ EvtScript N(handleEvent_8021AAB8) = { EVT_ELSE EVT_ADD(LVar1, 24) EVT_END_IF - EVT_CALL(PlayEffect, 0x1A, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_CASE_EQ(32) EVT_SET_CONST(LVar0, 0x00000001) @@ -484,14 +484,14 @@ EvtScript N(handleEvent_8021AAB8) = { EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(49) - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 1) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_Chan_Idle) EVT_EXEC_WAIT(DoRecover) EVT_END_IF EVT_CASE_EQ(57) - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 1) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_Chan_Run) @@ -504,7 +504,7 @@ EvtScript N(handleEvent_8021AAB8) = { EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_CASE_EQ(58) - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 1) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_Chan_Run) @@ -514,7 +514,7 @@ EvtScript N(handleEvent_8021AAB8) = { EVT_END_IF EVT_EXEC_WAIT(DoAirLift) EVT_CASE_EQ(22) - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 1) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_Chan_Hurt) @@ -525,7 +525,7 @@ EvtScript N(handleEvent_8021AAB8) = { EVT_EXEC_WAIT(DoBlowAway) EVT_RETURN EVT_CASE_EQ(31) - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 1) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_Chan_EnterShell) @@ -549,20 +549,20 @@ EvtScript N(takeTurn_8021B81C) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(SetActorVar, -127, 8, 1) - EVT_CALL(SetTargetOffset, -127, 1, 0, 16) - EVT_CALL(SetProjectileTargetOffset, -127, 1, -1, -9) + EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) + 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_Chan))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021AAB8))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219E70))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) - EVT_CALL(SetPartEventBits, -127, 1, 4096, 1) - EVT_CALL(GetIndexFromPos, -127, LVar0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, 0x00001000, TRUE) + EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) - EVT_CALL(SetGoalToIndex, -127, LVar0) + EVT_CALL(SetGoalToIndex, ACTOR_SELF, LVar0) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetHomePos, -127, LVar0, LVar1, LVar2) + EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -585,7 +585,7 @@ EvtScript N(takeTurn_8021B81C) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Chan_Still) EVT_WAIT(8) EVT_END_IF - EVT_CALL(SetActorSounds, -127, 2, 769, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_F) @@ -600,7 +600,7 @@ EvtScript N(takeTurn_8021B81C) = { EVT_CASE_OR_EQ(5) EVT_SET(LVarA, LVar0) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(SetPartYaw, -127, 1, 180) + EVT_CALL(SetPartYaw, ACTOR_SELF, 1, 180) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Chan_ToppledHurt) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 24) @@ -630,7 +630,7 @@ EvtScript N(takeTurn_8021B81C) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Chan_Run) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Chan_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) @@ -689,18 +689,18 @@ EvtScript N(takeTurn_8021B81C) = { EvtScript N(takeTurn_Chan) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 2) - EVT_CALL(GetActorVar, -127, 9, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 9, LVar0) EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) - EVT_CALL(SetActorVar, -127, 9, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(SetActorVar, ACTOR_SELF, 9, LVar0) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_SET_CONST(LVar0, 0x00000001) @@ -708,13 +708,13 @@ EvtScript N(takeTurn_Chan) = { EVT_SET_CONST(LVar2, ANIM_Chan_Idle) EVT_EXEC_WAIT(D_8029BBB4) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetActorVar, -127, 8, 1) - EVT_CALL(SetTargetOffset, -127, 1, 0, 16) - EVT_CALL(SetProjectileTargetOffset, -127, 1, -1, -9) - EVT_CALL(SetDefenseTable, -127, 1, EVT_PTR(N(defenseTable_80219D50))) + EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 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))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, FALSE) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -729,16 +729,16 @@ EvtScript N(takeTurn_Chan) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Chan_ShellStill) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, 0x1D, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(10) - EVT_CALL(PlayEffect, 0x1D, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(5) - EVT_CALL(PlayEffect, 0x1D, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Chan_ShellSpin) EVT_WAIT(20) - EVT_CALL(SetActorSounds, -127, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -769,7 +769,7 @@ EvtScript N(takeTurn_Chan) = { EVT_WAIT(15) EVT_CALL(YieldTurn) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 200) @@ -828,11 +828,11 @@ extern EvtScript N(nextTurn_8021CD7C); EvtScript N(init_8021CCDC) = { EVT_EXEC_WAIT(N(80219F4C)) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021D0CC))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_8021CD7C))) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) - EVT_CALL(SetActorVar, -127, 2, 0) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_NO_GAME_OVER, 1) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8021CD7C))) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_NO_GAME_OVER, TRUE) EVT_RETURN EVT_END }; @@ -843,15 +843,15 @@ EvtScript N(nextTurn_8021CD7C) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131103, -127, 1, 10682372, 10682371) - EVT_CALL(SetActorVar, -127, 0, 1) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_001F, ACTOR_SELF, 1, 0x00A30004, 0x00A30003) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_END_IF EVT_CASE_EQ(12) - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 2) EVT_BREAK_SWITCH EVT_END_IF @@ -861,21 +861,21 @@ EvtScript N(nextTurn_8021CD7C) = { EVT_END_IF EVT_SET_CONST(LVarA, ANIM_Chan_Run) EVT_SET_CONST(LVarB, ANIM_Chan_Walk) - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 2) EVT_SET_CONST(LVarA, ANIM_Chan_ToppledHurt) EVT_SET_CONST(LVarB, ANIM_Chan_Toppled) EVT_END_IF - EVT_CALL(GetActorHP, -127, LVar0) - EVT_CALL(GetEnemyMaxHP, -127, LVar1) + EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) + EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) EVT_DIV(LVar1, 2) EVT_IF_LE(LVar0, LVar1) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131105, -127, 1, LVarA, LVarB) - EVT_CALL(SetActorVar, -127, 2, 1) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0021, ACTOR_SELF, 1, LVarA, LVarB) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_BREAK_SWITCH EVT_END_IF EVT_END_IF @@ -883,7 +883,7 @@ EvtScript N(nextTurn_8021CD7C) = { EVT_IF_LE(LVar0, 5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131106, -127, 1, LVarA, LVarB) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0022, ACTOR_SELF, 1, LVarA, LVarB) EVT_BREAK_SWITCH EVT_END_IF EVT_END_SWITCH @@ -920,20 +920,20 @@ EvtScript N(handleEvent_8021D0CC) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_WAIT(30) - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 2) - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_ADD(LVar0, 1) EVT_SWITCH(LVar0) EVT_CASE_EQ(1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131104, -127, 1, 10682375, 10682370) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0020, ACTOR_SELF, 1, 0x00A30007, 0x00A30002) EVT_CASE_EQ(2) EVT_CASE_EQ(3) EVT_SET(LVar0, 0) EVT_END_SWITCH - EVT_CALL(SetActorVar, -127, 1, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, LVar0) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) diff --git a/src/battle/area/mac/actor/lee.c b/src/battle/area/mac/actor/lee.c index d29d361214..08aa35c85a 100644 --- a/src/battle/area/mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -89,7 +89,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 20, .partCount = ARRAY_COUNT(N(partsTable_8021D47C)), .partsData = N(partsTable_8021D47C), - .takeTurnScript = &N(init_8021D4C8), + .initScript = &N(init_8021D4C8), .statusTable = N(statusTable_8021D3D0), .escapeChance = 100, .airLiftChance = 0, @@ -128,16 +128,16 @@ EvtScript N(init_8021D4C8) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80229F9C))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8021D5B4))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021D600))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_8022A038))) - EVT_CALL(SetActorVar, -127, 8, 0) - EVT_CALL(SetActorVar, -127, 0, 0) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8022A038))) + EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_THREAD EVT_CALL(func_8026BF48, 1) EVT_EXEC_WAIT(N(copyPartner)) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_CALL(func_802180D0_464560) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_NO_GAME_OVER, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_NO_GAME_OVER, TRUE) EVT_RETURN EVT_END }; @@ -156,7 +156,7 @@ EvtScript N(8021D5C4) = { }; EvtScript N(handleEvent_8021D600) = { - EVT_CALL(SetActorVar, -127, 0, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) @@ -256,14 +256,14 @@ EvtScript N(handleEvent_8021D600) = { EvtScript N(flyingTackle) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(SetActorVar, -127, 8, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) 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_Lee_Crouch) EVT_WAIT(20) - EVT_CALL(SetActorSounds, -127, 2, 715, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2CB, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(6) @@ -283,11 +283,11 @@ EvtScript N(flyingTackle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Lee_Idle) - EVT_CALL(ResetActorSounds, -127, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_WAIT(15) EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(8021D5C4)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -313,7 +313,7 @@ EvtScript N(flyingTackle) = { EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(ResetActorSounds, -127, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Lee_Land) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) @@ -335,7 +335,7 @@ EvtScript N(flyingTackle) = { }; EvtScript N(8021E0E0) = { - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_CALL(RemoveActor, LVar0) EVT_RETURN EVT_END @@ -346,44 +346,44 @@ EvtScript N(8021E118) = { EVT_CALL(func_8027D32C, -127) EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1) EVT_WAIT(30) - EVT_CALL(GetActorVar, -127, 0, LVarA) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarA) EVT_CALL(UseIdleAnimation, LVarA, FALSE) EVT_CALL(func_8027D32C, LVarA) - EVT_CALL(CopyStatusEffects, -127, LVarA) + EVT_CALL(CopyStatusEffects, ACTOR_SELF, LVarA) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SMOKE_BURST) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 3) EVT_ADD(LVar2, 5) EVT_LOOP(3) - EVT_CALL(PlayEffect, 0x1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD EVT_WAIT(5) - EVT_CALL(GetActorHP, -127, LVarB) + EVT_CALL(GetActorHP, ACTOR_SELF, LVarB) EVT_CALL(SetEnemyHP, LVarA, LVarB) - EVT_CALL(CopyBuffs, -127, LVarA) + EVT_CALL(CopyBuffs, ACTOR_SELF, LVarA) EVT_CALL(GetActorPos, ACTOR_SELF, LVarB, LVarC, LVarD) EVT_CALL(SetActorPos, LVarA, LVarB, LVarC, LVarD) - EVT_CALL(SetPartFlagBits, LVarA, 1, 8388608, 1) - EVT_CALL(SetPartFlagBits, LVarA, 1, 131073, 0) - EVT_CALL(SetActorFlagBits, LVarA, (ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_NO_DMG_APPLY), 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetPartFlagBits, LVarA, 1, 0x00800000, TRUE) + EVT_CALL(SetPartFlagBits, LVarA, 1, 0x00020001, FALSE) + EVT_CALL(SetActorFlagBits, LVarA, (ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_NO_DMG_APPLY), FALSE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(SetActorVar, LVarA, 8, 2) - EVT_CALL(SetPartFlagBits, -127, LVar0, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, 1, TRUE) EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations_8021D3AC))) - EVT_CALL(SetAnimation, LVarA, 1, 0xA4000B) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_Lee_Hurt) EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(GetActorPos, LVarA, LVarB, LVarC, LVarD) EVT_IF_GT(LVarC, 0) EVT_SET(LVarC, 0) EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(0.5)) - EVT_CALL(SetActorSounds, LVarA, 2, 769, 0) + EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(SetGoalPos, LVarA, LVarB, LVarC, LVarD) EVT_CALL(JumpToGoal, LVarA, 15, FALSE, TRUE, FALSE) - EVT_CALL(ResetActorSounds, LVarA, 2) + EVT_CALL(ResetActorSounds, LVarA, ACTOR_SOUND_JUMP) EVT_CALL(SetGoalPos, LVarA, LVarB, LVarC, LVarD) EVT_CALL(JumpToGoal, LVarA, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, LVarA, LVarB, LVarC, LVarD) @@ -392,11 +392,11 @@ EvtScript N(8021E118) = { EVT_CALL(ForceHomePos, LVarA, LVarB, LVarC, LVarD) EVT_CALL(HPBarToHome, LVarA) EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations_8021D360))) - EVT_CALL(SetAnimation, LVarA, 1, 0xA40002) + EVT_CALL(SetAnimation, LVarA, 1, ANIM_Lee_Idle) EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(RemoveActor, -127) + EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN EVT_END }; @@ -422,14 +422,14 @@ EvtScript N(8021E5DC) = { EVT_EXEC_WAIT(DoShockHit) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_THREAD - EVT_CALL(SetActorRotationOffset, -127, 0, LVarC, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, LVarC, 0) EVT_SET(LVar0, 0) EVT_LOOP(15) EVT_ADD(LVar0, -48) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 60) @@ -516,7 +516,7 @@ ActorBlueprint N(goombario) = { .maxHP = 20, .partCount = ARRAY_COUNT(N(partsTable_8021EA50)), .partsData = N(partsTable_8021EA50), - .takeTurnScript = &N(init_Goombario), + .initScript = &N(init_Goombario), .statusTable = N(statusTable_8021E9A4), .escapeChance = 100, .airLiftChance = 0, @@ -541,8 +541,8 @@ EvtScript N(init_Goombario) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_802203F4))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8021EB14))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021EB24))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_80220450))) - EVT_CALL(SetActorVar, -127, 2, 1) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_80220450))) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_RETURN EVT_END }; @@ -659,7 +659,7 @@ EvtScript N(8021F08C) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleGoombario_Idle) EVT_THREAD - EVT_CALL(SetActorRotationOffset, -127, 0, 12, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_SET(LVar0, 180) EVT_LOOP(15) EVT_SUB(LVar0, 60) @@ -668,7 +668,7 @@ EvtScript N(8021F08C) = { EVT_END_LOOP EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleGoombario_Fall) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -847,7 +847,7 @@ EvtScript N(8021F6E0) = { EVT_CALL(SetJumpAnimations, ACTOR_SELF, 1, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(ActorJumpToPos)) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -861,15 +861,15 @@ EvtScript N(8021F6E0) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CHILD_THREAD - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_CHILD_THREAD EVT_WAIT(1) EVT_WAIT(2) - EVT_CALL(GetActorVar, -127, 1, LVar9) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) EVT_SWITCH(LVar9) EVT_CASE_EQ(0) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_10) @@ -878,12 +878,12 @@ EvtScript N(8021F6E0) = { EVT_CASE_EQ(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_10) EVT_END_SWITCH - EVT_CALL(GetActorHP, 0, LVar0) + EVT_CALL(GetActorHP, ACTOR_PLAYER, LVar0) EVT_IF_EQ(LVar0, 0) EVT_GOTO(100) EVT_END_IF EVT_SET(LVarA, 24) - EVT_CALL(GetActorVar, -127, 1, LVar9) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) EVT_SWITCH(LVar9) EVT_CASE_EQ(0) EVT_THREAD @@ -909,10 +909,10 @@ EvtScript N(8021F6E0) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetJumpAnimations, ACTOR_SELF, 1, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(UnkFunc62), LVarA, 3) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CASE_EQ(2) EVT_THREAD EVT_WAIT(4) @@ -933,21 +933,21 @@ EvtScript N(8021F6E0) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetJumpAnimations, ACTOR_SELF, 1, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(UnkFunc62), LVarA, 3) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_END_SWITCH EVT_CHILD_THREAD - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_CHILD_THREAD EVT_WAIT(1) EVT_WAIT(2) - EVT_CALL(GetActorVar, -127, 1, LVar9) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) EVT_SWITCH(LVar9) EVT_CASE_EQ(0) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) @@ -1000,13 +1000,13 @@ EvtScript N(80220100) = { EVT_WAIT(10) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4, TRUE) EVT_CALL(N(UnkEffect6CFunc), LVar5) EVT_WAIT(12) - EVT_CALL(SetCamEnabled, 2, 1) - EVT_CALL(SetCamFlag80, 2, 0) - EVT_CALL(SetCamPerspective, 2, 6, 25, 16, 1024) - EVT_CALL(SetCamViewport, 2, 37, 95, 138, 99) + EVT_CALL(SetCamEnabled, CAM_TATTLE, TRUE) + EVT_CALL(SetCamFlag80, CAM_TATTLE, FALSE) + EVT_CALL(SetCamPerspective, CAM_TATTLE, 6, 25, 16, 1024) + EVT_CALL(SetCamViewport, CAM_TATTLE, 37, 95, 138, 99) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 8) @@ -1017,15 +1017,15 @@ EvtScript N(80220100) = { EVT_CALL(func_802CABE8, 2, 0, LVar3, 100, 4) EVT_WAIT(2) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_282) - EVT_CALL(SetCamFlag80, 2, 1) + EVT_CALL(SetCamFlag80, CAM_TATTLE, TRUE) EVT_WAIT(10) - EVT_CALL(ActorSpeak, 1835154, -127, 1, 589839, 589825) + EVT_CALL(ActorSpeak, MSG_EnemyTattle_Mario, ACTOR_SELF, 1, 0x0009000F, 0x00090001) EVT_CALL(func_80218E2C_4652BC, LVar5) EVT_WAIT(12) - EVT_CALL(SetCamEnabled, 2, 0) + EVT_CALL(SetCamEnabled, CAM_TATTLE, FALSE) EVT_WAIT(32) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -1047,10 +1047,10 @@ EvtScript N(nextTurn_80220450) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(12) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_GT(LVar0, 0) EVT_SUB(LVar0, 1) - EVT_CALL(SetActorVar, -127, 2, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) EVT_BREAK_SWITCH EVT_END_IF EVT_SET_CONST(LVar0, 0x00000001) @@ -1151,7 +1151,7 @@ ActorBlueprint N(kooper) = { .maxHP = 20, .partCount = ARRAY_COUNT(N(partsTable_8022069C)), .partsData = N(partsTable_8022069C), - .takeTurnScript = &N(init_Kooper), + .initScript = &N(init_Kooper), .statusTable = N(statusTable_802205F0), .escapeChance = 100, .airLiftChance = 0, @@ -1176,10 +1176,10 @@ EvtScript N(init_Kooper) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80221200))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80220790))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80220908))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_802221A0))) - EVT_CALL(SetActorVar, -127, 4, 0) - EVT_CALL(SetActorVar, -127, 5, 0) - EVT_CALL(SetActorVar, -127, 2, 1) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_802221A0))) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 5, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_RETURN EVT_END }; @@ -1190,15 +1190,15 @@ EvtScript N(init_Kooper) = { EvtScript N(idle_80220790) = { EVT_LABEL(0) - EVT_CALL(GetActorVar, -127, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetTargetOffset, -127, 1, -2, 38) - EVT_CALL(SetProjectileTargetOffset, -127, 1, -3, -9) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -2, 38) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 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(SetProjectileTargetOffset, -127, 1, 0, -6) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 5, 15) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -6) EVT_CALL(N(kooper_UnkBattleFunc1), -10, 20, 10, 20) EVT_END_SWITCH EVT_WAIT(1) @@ -1253,14 +1253,14 @@ EvtScript N(handleEvent_80220908) = { EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(13) - EVT_CALL(SetActorVar, -127, 4, 1) - EVT_CALL(SetActorVar, -127, 5, 1) - EVT_CALL(SetDefenseTable, -127, 1, EVT_PTR(N(defenseTable_802205E4))) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 5, 1) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 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(SetProjectileTargetOffset, -127, 1, 0, -6) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 5, 15) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -6) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_Hurt) - EVT_CALL(SetActorRotationOffset, -127, 0, 12, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD EVT_WAIT(4) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 30) @@ -1280,14 +1280,14 @@ EvtScript N(handleEvent_80220908) = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_Toppled) EVT_CASE_OR_EQ(23) EVT_CASE_OR_EQ(25) EVT_CASE_OR_EQ(31) - EVT_CALL(GetActorVar, -127, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_SET_CONST(LVar0, 0x00000001) @@ -1310,7 +1310,7 @@ EvtScript N(handleEvent_80220908) = { EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(49) - EVT_CALL(GetActorVar, -127, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_IF_EQ(LVar0, 1) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_BattleKooper_Toppled) @@ -1327,7 +1327,7 @@ EvtScript N(handleEvent_80220908) = { EVT_EXEC_WAIT(DoScareAway) EVT_RETURN EVT_CASE_EQ(58) - EVT_CALL(GetActorVar, -127, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_SET_CONST(LVar0, 0x00000001) @@ -1339,7 +1339,7 @@ EvtScript N(handleEvent_80220908) = { EVT_END_SWITCH EVT_EXEC_WAIT(DoAirLift) EVT_CASE_EQ(22) - EVT_CALL(GetActorVar, -127, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) @@ -1372,26 +1372,26 @@ EvtScript N(takeTurn_80221200) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(GetActorVar, -127, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(GetActorVar, -127, 5, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar0) EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) - EVT_CALL(SetActorVar, -127, 5, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(SetActorVar, ACTOR_SELF, 5, LVar0) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_WAIT(30) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_WAIT(20) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_Toppled) EVT_SET(LVar0, 0) - EVT_CALL(SetActorRotationOffset, -127, 0, 12, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD EVT_LOOP(5) EVT_ADD(LVar0, 15) @@ -1403,15 +1403,15 @@ EvtScript N(takeTurn_80221200) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_Idle) - EVT_CALL(SetActorVar, -127, 4, 0) - EVT_CALL(SetDefenseTable, -127, 1, EVT_PTR(N(defenseTable_802205D8))) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 0) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 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(SetProjectileTargetOffset, -127, 1, -3, -9) + EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -2, 38) + EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -3, -9) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -1426,7 +1426,7 @@ EvtScript N(takeTurn_80221200) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 75) EVT_CALL(func_8024ECF8, 1, 1, 1) - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_SET(LVar0, 10) @@ -1444,33 +1444,33 @@ EvtScript N(takeTurn_80221200) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CASE_EQ(20) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, 0x1D, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_LT(40) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_ShellSpinSlower) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(12.0)) EVT_CASE_EQ(40) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, 0x1D, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_LT(50) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_ShellSpinFaster) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(14.0)) EVT_CASE_EQ(50) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, 0x1D, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_LT(60) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_ShellSpinFastest) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_CASE_EQ(60) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, 0x1D, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_END_SWITCH EVT_WAIT(1) EVT_END_LOOP EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_200A) - EVT_CALL(SetActorSounds, -127, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 15) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, 5) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, ACTOR_DECORATION_GREY_SMOKE_TRAIL) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) @@ -1484,7 +1484,7 @@ EvtScript N(takeTurn_80221200) = { EVT_END_THREAD EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_ShellStill) - EVT_CALL(SetActorRotationOffset, -127, -8, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, -8, 0, 0) EVT_SET(LVar0, 0) EVT_LOOP(2) EVT_ADD(LVar0, 30) @@ -1493,13 +1493,13 @@ EvtScript N(takeTurn_80221200) = { EVT_END_LOOP EVT_WAIT(5) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, 0x1D, 1, LVar4, LVar5, LVar6, 16, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 16, 4, 0, 10, 0) EVT_LOOP(5) EVT_ADD(LVar0, -12) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 2) EVT_WAIT(2) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -2) @@ -1524,7 +1524,7 @@ EvtScript N(takeTurn_80221200) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 0, 0) - EVT_CALL(GetActorVar, -127, 1, LVar9) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) EVT_SWITCH(LVar9) EVT_CASE_EQ(0) EVT_WAIT(2) @@ -1576,10 +1576,10 @@ EvtScript N(nextTurn_802221A0) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(12) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_GT(LVar0, 0) EVT_SUB(LVar0, 1) - EVT_CALL(SetActorVar, -127, 2, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) EVT_BREAK_SWITCH EVT_END_IF EVT_SET_CONST(LVar0, 0x00000001) @@ -1662,7 +1662,7 @@ ActorBlueprint N(bombette) = { .maxHP = 20, .partCount = ARRAY_COUNT(N(partsTable_80222394)), .partsData = N(partsTable_80222394), - .takeTurnScript = &N(init_LeeBombette), + .initScript = &N(init_LeeBombette), .statusTable = N(statusTable_802222E8), .escapeChance = 100, .airLiftChance = 0, @@ -1687,8 +1687,8 @@ EvtScript N(init_LeeBombette) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_802229C4))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80222458))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80222468))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_80223298))) - EVT_CALL(SetActorVar, -127, 2, 1) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_80223298))) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_RETURN EVT_END }; @@ -1819,7 +1819,7 @@ EvtScript N(takeTurn_802229C4) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBombette_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBombette_Brace) EVT_WAIT(15) - EVT_CALL(SetActorSounds, -127, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2020) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -1832,14 +1832,14 @@ EvtScript N(takeTurn_802229C4) = { EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBombette_Idle) EVT_THREAD - EVT_CALL(SetActorRotationOffset, -127, 0, 15, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 15, 0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 72) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_END_THREAD EVT_CALL(AddGoalPos, ACTOR_SELF, -60, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) @@ -1866,7 +1866,7 @@ EvtScript N(takeTurn_802229C4) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBombette_BodySlam) EVT_CALL(RunToGoal, ACTOR_SELF, 4, FALSE) - EVT_CALL(GetActorVar, -127, 1, LVar9) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) EVT_SWITCH(LVar9) EVT_CASE_EQ(0) EVT_WAIT(2) @@ -1930,10 +1930,10 @@ EvtScript N(nextTurn_80223298) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(12) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_GT(LVar0, 0) EVT_SUB(LVar0, 1) - EVT_CALL(SetActorVar, -127, 2, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) EVT_BREAK_SWITCH EVT_END_IF EVT_SET_CONST(LVar0, 0x00000001) @@ -2028,7 +2028,7 @@ ActorBlueprint N(parakarry) = { .maxHP = 20, .partCount = ARRAY_COUNT(N(partsTable_8022348C)), .partsData = N(partsTable_8022348C), - .takeTurnScript = &N(init_Parakarry), + .initScript = &N(init_Parakarry), .statusTable = N(statusTable_802233E0), .escapeChance = 100, .airLiftChance = 0, @@ -2053,8 +2053,8 @@ EvtScript N(init_Parakarry) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80224304))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80223574))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80223584))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_80224320))) - EVT_CALL(SetActorVar, -127, 2, 1) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_80224320))) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_RETURN EVT_END }; @@ -2112,7 +2112,7 @@ EvtScript N(handleEvent_80223584) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CASE_EQ(38) EVT_EXEC_WAIT(N(8021E0E0)) EVT_SET_CONST(LVar0, 0x00000001) @@ -2186,27 +2186,27 @@ EvtScript N(80223B74) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 20, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Still) EVT_WAIT(3) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_B) - EVT_CALL(SetActorSounds, -127, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2004) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_FlyFast) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 10, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_LINEAR) EVT_WAIT(2) EVT_THREAD EVT_WAIT(3) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_PreDive) EVT_END_THREAD EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 15, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -20, 6) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -20, EASING_QUARTIC_OUT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2005) - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_LINEAR) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(6) @@ -2218,28 +2218,28 @@ EvtScript N(80223B74) = { EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -40, 10, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 10, -20, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 10, -20, EASING_QUADRATIC_OUT) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_WAIT(20) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_PostDive) EVT_WAIT(1) - EVT_CALL(GetActorVar, -127, 1, LVar9) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) EVT_SWITCH(LVar9) EVT_CASE_EQ(0) EVT_WAIT(2) @@ -2266,14 +2266,14 @@ EvtScript N(80223B74) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Run) EVT_END_THREAD EVT_CALL(AddGoalPos, ACTOR_SELF, 30, 0, 0) - EVT_CALL(JumpWithBounce, -127, 10, EVT_FLOAT(4.0)) + EVT_CALL(JumpWithBounce, ACTOR_SELF, 10, EVT_FLOAT(4.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Idle) EVT_WAIT(6) EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -2292,10 +2292,10 @@ EvtScript N(nextTurn_80224320) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(12) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_GT(LVar0, 0) EVT_SUB(LVar0, 1) - EVT_CALL(SetActorVar, -127, 2, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) EVT_BREAK_SWITCH EVT_END_IF EVT_SET_CONST(LVar0, 0x00000001) @@ -2390,7 +2390,7 @@ ActorBlueprint N(bow) = { .maxHP = 20, .partCount = ARRAY_COUNT(N(partsTable_80224514)), .partsData = N(partsTable_80224514), - .takeTurnScript = &N(init_Bow), + .initScript = &N(init_Bow), .statusTable = N(statusTable_80224468), .escapeChance = 100, .airLiftChance = 0, @@ -2415,8 +2415,8 @@ EvtScript N(init_Bow) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80224CA0))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_802245FC))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8022460C))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_80225884))) - EVT_CALL(SetActorVar, -127, 2, 1) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_80225884))) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_RETURN EVT_END }; @@ -2476,7 +2476,7 @@ EvtScript N(handleEvent_8022460C) = { EVT_SET(LVar0, 200) EVT_LOOP(20) EVT_SUB(LVar0, 10) - EVT_CALL(SetPartAlpha, -127, 1, LVar0) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, LVar0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -2485,15 +2485,15 @@ EvtScript N(handleEvent_8022460C) = { EVT_CALL(MoveBattleCamOver, 60) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Idle) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) - EVT_CALL(SetPartAlpha, -127, 1, LVar0) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, LVar0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartAlpha, -127, 1, 255) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, 255) EVT_CASE_EQ(38) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_EXEC_WAIT(N(8021E0E0)) @@ -2557,7 +2557,7 @@ EvtScript N(takeTurn_80224CA0) = { EVT_SET(LVar0, 200) EVT_LOOP(20) EVT_SUB(LVar0, 10) - EVT_CALL(SetPartAlpha, -127, 1, LVar0) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, LVar0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -2573,7 +2573,7 @@ EvtScript N(takeTurn_80224CA0) = { EVT_ELSE EVT_CALL(AddGoalPos, ACTOR_SELF, 10, -10, 0) EVT_END_IF - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Idle) EVT_END_THREAD EVT_WAIT(15) @@ -2583,10 +2583,10 @@ EvtScript N(takeTurn_80224CA0) = { EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) - EVT_CALL(SetPartAlpha, -127, 1, LVar0) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, LVar0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartAlpha, -127, 1, 255) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, 255) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_PreSlap) EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -2597,10 +2597,10 @@ EvtScript N(takeTurn_80224CA0) = { EVT_CASE_OR_EQ(5) EVT_SET(LVarA, LVar0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_SlapOnce) EVT_WAIT(2) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_SET(LVar0, 0) EVT_LOOP(20) EVT_ADD(LVar0, -45) @@ -2612,7 +2612,7 @@ EvtScript N(takeTurn_80224CA0) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Injured) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 3) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SEEING_STARS) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Idle) @@ -2622,7 +2622,7 @@ EvtScript N(takeTurn_80224CA0) = { EVT_SET(LVar0, 200) EVT_LOOP(20) EVT_SUB(LVar0, 10) - EVT_CALL(SetPartAlpha, -127, 1, LVar0) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, LVar0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -2631,22 +2631,22 @@ EvtScript N(takeTurn_80224CA0) = { EVT_CALL(MoveBattleCamOver, 60) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Idle) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) - EVT_CALL(SetPartAlpha, -127, 1, LVar0) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, LVar0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartAlpha, -127, 1, 255) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, 255) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH EVT_SET(LVarA, 0) - EVT_CALL(GetActorVar, -127, 1, LVar8) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar8) EVT_SWITCH(LVar8) EVT_CASE_EQ(0) EVT_SET(LVar8, 4) @@ -2659,7 +2659,7 @@ EvtScript N(takeTurn_80224CA0) = { EVT_LOOP(LVar7) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2019) EVT_ADD(LVarA, 1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) EVT_IF_EQ(LocalFlag(0), 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_SlapOnce) EVT_SET(LocalFlag(0), 1) @@ -2678,14 +2678,14 @@ EvtScript N(takeTurn_80224CA0) = { EVT_END_IF EVT_END_IF EVT_WAIT(2) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.2)) + 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, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.2)) EVT_END_THREAD - EVT_CALL(GetActorVar, -127, 1, LVar9) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) EVT_SWITCH(LVar9) EVT_CASE_EQ(0) EVT_WAIT(2) @@ -2699,7 +2699,7 @@ EvtScript N(takeTurn_80224CA0) = { EVT_END_SWITCH EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Idle) - EVT_CALL(GetActorHP, 0, LVar1) + EVT_CALL(GetActorHP, ACTOR_PLAYER, LVar1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF @@ -2713,7 +2713,7 @@ EvtScript N(takeTurn_80224CA0) = { EVT_SET(LVar0, 200) EVT_LOOP(20) EVT_SUB(LVar0, 10) - EVT_CALL(SetPartAlpha, -127, 1, LVar0) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, LVar0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -2722,15 +2722,15 @@ EvtScript N(takeTurn_80224CA0) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Idle) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) - EVT_CALL(SetPartAlpha, -127, 1, LVar0) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, LVar0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartAlpha, -127, 1, 255) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, 255) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -2743,10 +2743,10 @@ EvtScript N(nextTurn_80225884) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(12) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_GT(LVar0, 0) EVT_SUB(LVar0, 1) - EVT_CALL(SetActorVar, -127, 2, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) EVT_BREAK_SWITCH EVT_END_IF EVT_SET_CONST(LVar0, 0x00000001) @@ -2842,7 +2842,7 @@ ActorBlueprint N(watt) = { .maxHP = 20, .partCount = ARRAY_COUNT(N(partsTable_80225A80)), .partsData = N(partsTable_80225A80), - .takeTurnScript = &N(init_Watt), + .initScript = &N(init_Watt), .statusTable = N(statusTable_802259D4), .escapeChance = 100, .airLiftChance = 0, @@ -2867,8 +2867,8 @@ EvtScript N(init_Watt) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80226004))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80225B68))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80225B90))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_80226880))) - EVT_CALL(SetActorVar, -127, 2, 1) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_80226880))) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_RETURN EVT_END }; @@ -3111,16 +3111,16 @@ EvtScript N(takeTurn_80226004) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Run) EVT_CALL(func_802196F0_465B80, 1) EVT_CALL(AddGoalPos, ACTOR_SELF, 15, -10, 5) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Idle) EVT_CALL(func_802196F0_465B80, 0) EVT_WAIT(5) EVT_CALL(func_80219658_465AE8, 0) EVT_CALL(AddGoalPos, ACTOR_SELF, 25, 20, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -20, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -20, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Strain) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_COS_IN_OUT) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(6) @@ -3132,7 +3132,7 @@ EvtScript N(takeTurn_80226004) = { EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -40, 10, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 10, -20, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 10, -20, EASING_QUADRATIC_OUT) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -3143,7 +3143,7 @@ EvtScript N(takeTurn_80226004) = { EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Idle) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -3159,11 +3159,11 @@ EvtScript N(takeTurn_80226004) = { EVT_IF_FLAG(LVar0, 0x80000) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 4) - EVT_CALL(PlayEffect, 0x33, 8, LVar0, LVar1, LVar2, EVT_FLOAT(0.52), LVarA, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 8, LVar0, LVar1, LVar2, EVT_FLOAT(0.52), LVarA, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 12) - EVT_CALL(PlayEffect, 0x33, 8, LVar0, LVar1, LVar2, EVT_FLOAT(1.3), LVarA, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 8, LVar0, LVar1, LVar2, EVT_FLOAT(1.3), LVarA, 0) EVT_END_IF EVT_CALL(N(UnkBackgroundFunc3)) EVT_SET(LVar9, 0) @@ -3184,7 +3184,7 @@ EvtScript N(takeTurn_80226004) = { EVT_WAIT(2) EVT_CALL(N(SetBackgroundAlpha), 0) EVT_END_THREAD - EVT_CALL(GetActorVar, -127, 1, LVar9) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) EVT_SWITCH(LVar9) EVT_CASE_EQ(0) EVT_WAIT(2) @@ -3203,12 +3203,12 @@ EvtScript N(takeTurn_80226004) = { EVT_CALL(func_802196A4_465B34, 1) EVT_CALL(func_80219658_465AE8, 1) EVT_CALL(AddGoalPos, ACTOR_SELF, 25, 10, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -10, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -10, EASING_COS_IN_OUT) EVT_WAIT(15) EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -3221,10 +3221,10 @@ EvtScript N(nextTurn_80226880) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(12) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_GT(LVar0, 0) EVT_SUB(LVar0, 1) - EVT_CALL(SetActorVar, -127, 2, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) EVT_BREAK_SWITCH EVT_END_IF EVT_SET_CONST(LVar0, 0x00000001) @@ -3308,7 +3308,7 @@ ActorBlueprint N(sushie) = { .maxHP = 20, .partCount = ARRAY_COUNT(N(partsTable_80226A80)), .partsData = N(partsTable_80226A80), - .takeTurnScript = &N(init_Sushie), + .initScript = &N(init_Sushie), .statusTable = N(statusTable_802269D4), .escapeChance = 100, .airLiftChance = 0, @@ -3333,8 +3333,8 @@ EvtScript N(init_Sushie) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_802270BC))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80226B44))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80226B54))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_8022831C))) - EVT_CALL(SetActorVar, -127, 2, 1) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8022831C))) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_RETURN EVT_END }; @@ -3487,7 +3487,7 @@ EvtScript N(takeTurn_802270BC) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleSushie_Jump) EVT_THREAD - EVT_CALL(SetActorRotationOffset, -127, 0, 12, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 36) @@ -3497,44 +3497,44 @@ EvtScript N(takeTurn_802270BC) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 20) EVT_END_THREAD EVT_THREAD - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_WAIT(13) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CASE_EQ(1) EVT_WAIT(13) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.05), EVT_FLOAT(1.05), EVT_FLOAT(1.05)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.05), EVT_FLOAT(1.05), EVT_FLOAT(1.05)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.1), EVT_FLOAT(1.1), EVT_FLOAT(1.1)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.1), EVT_FLOAT(1.1), EVT_FLOAT(1.1)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.15), EVT_FLOAT(1.15), EVT_FLOAT(1.15)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.15), EVT_FLOAT(1.15), EVT_FLOAT(1.15)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.25), EVT_FLOAT(1.25), EVT_FLOAT(1.25)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.25), EVT_FLOAT(1.25), EVT_FLOAT(1.25)) EVT_CASE_EQ(2) EVT_WAIT(13) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.1), EVT_FLOAT(1.1), EVT_FLOAT(1.1)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.1), EVT_FLOAT(1.1), EVT_FLOAT(1.1)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.3), EVT_FLOAT(1.3), EVT_FLOAT(1.3)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.3), EVT_FLOAT(1.3), EVT_FLOAT(1.3)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.4)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.4)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.5), EVT_FLOAT(1.5), EVT_FLOAT(1.5)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.5), EVT_FLOAT(1.5), EVT_FLOAT(1.5)) EVT_END_SWITCH EVT_END_THREAD - EVT_CALL(SetActorSounds, -127, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_THREAD @@ -3546,9 +3546,9 @@ EvtScript N(takeTurn_802270BC) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleSushie_Land) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_CALL(LandJump, -127) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(LandJump, ACTOR_SELF) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_29A) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -3577,7 +3577,7 @@ EvtScript N(takeTurn_802270BC) = { EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleSushie_Jump) EVT_THREAD - EVT_CALL(SetActorRotationOffset, -127, 0, 12, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 36) @@ -3587,44 +3587,44 @@ EvtScript N(takeTurn_802270BC) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 20) EVT_END_THREAD EVT_THREAD - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_WAIT(13) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.1), EVT_FLOAT(1.1), EVT_FLOAT(1.1)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.1), EVT_FLOAT(1.1), EVT_FLOAT(1.1)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.1), EVT_FLOAT(1.1), EVT_FLOAT(1.1)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.1), EVT_FLOAT(1.1), EVT_FLOAT(1.1)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.3), EVT_FLOAT(1.3), EVT_FLOAT(1.3)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.3), EVT_FLOAT(1.3), EVT_FLOAT(1.3)) EVT_CASE_EQ(1) EVT_WAIT(13) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.15), EVT_FLOAT(1.15), EVT_FLOAT(1.15)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.15), EVT_FLOAT(1.15), EVT_FLOAT(1.15)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.35), EVT_FLOAT(1.35), EVT_FLOAT(1.35)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.35), EVT_FLOAT(1.35), EVT_FLOAT(1.35)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.4)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.4)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.55), EVT_FLOAT(1.55), EVT_FLOAT(1.55)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.55), EVT_FLOAT(1.55), EVT_FLOAT(1.55)) EVT_CASE_EQ(2) EVT_WAIT(13) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.2), EVT_FLOAT(1.2), EVT_FLOAT(1.2)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.3), EVT_FLOAT(1.3), EVT_FLOAT(1.3)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.3), EVT_FLOAT(1.3), EVT_FLOAT(1.3)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.5), EVT_FLOAT(1.5), EVT_FLOAT(1.5)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.5), EVT_FLOAT(1.5), EVT_FLOAT(1.5)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.6), EVT_FLOAT(1.6), EVT_FLOAT(1.6)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.6), EVT_FLOAT(1.6), EVT_FLOAT(1.6)) EVT_WAIT(1) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.8), EVT_FLOAT(1.8), EVT_FLOAT(1.8)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.8), EVT_FLOAT(1.8), EVT_FLOAT(1.8)) EVT_END_SWITCH EVT_END_THREAD - EVT_CALL(SetActorSounds, -127, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_THREAD @@ -3636,12 +3636,12 @@ EvtScript N(takeTurn_802270BC) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleSushie_Land) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_THREAD EVT_WAIT(3) - EVT_CALL(SetPartScale, -127, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(GetActorVar, -127, 1, LVarA) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVarA) EVT_SWITCH(LVarA) EVT_CASE_EQ(0) EVT_WAIT(2) @@ -3696,10 +3696,10 @@ EvtScript N(nextTurn_8022831C) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(12) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_GT(LVar0, 0) EVT_SUB(LVar0, 1) - EVT_CALL(SetActorVar, -127, 2, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) EVT_BREAK_SWITCH EVT_END_IF EVT_SET_CONST(LVar0, 0x00000001) @@ -3799,7 +3799,7 @@ ActorBlueprint N(lakilester) = { .maxHP = 20, .partCount = ARRAY_COUNT(N(partsTable_8022851C)), .partsData = N(partsTable_8022851C), - .takeTurnScript = &N(init_Lakilester), + .initScript = &N(init_Lakilester), .statusTable = N(statusTable_80228470), .escapeChance = 100, .airLiftChance = 0, @@ -3824,8 +3824,8 @@ EvtScript N(init_Lakilester) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80228B78))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80228604))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80228614))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_80229658))) - EVT_CALL(SetActorVar, -127, 2, 1) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_80229658))) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_RETURN EVT_END }; @@ -3884,7 +3884,7 @@ EvtScript N(handleEvent_80228614) = { EVT_EXEC_WAIT(DoJumpBack) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CASE_EQ(38) EVT_EXEC_WAIT(N(8021E0E0)) EVT_SET_CONST(LVar0, 0x00000001) @@ -3948,7 +3948,7 @@ EvtScript N(takeTurn_80228B78) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, 20, 30, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Idle) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -3956,16 +3956,16 @@ EvtScript N(takeTurn_80228B78) = { EVT_ADD(LVar0, -1) EVT_ADD(LVar1, 4) EVT_ADD(LVar2, 2) - EVT_CALL(SetPartScale, -127, 3, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) + EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) EVT_ELSE EVT_ADD(LVar0, -3) EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 5) - EVT_CALL(SetPartScale, -127, 3, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) + EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_IF EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, -127, 3, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_BattleLakilester_Spiny) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_LiftSpiny) EVT_LOOP(4) @@ -3991,7 +3991,7 @@ EvtScript N(takeTurn_80228B78) = { EVT_ADD(LVar2, 5) EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF - EVT_CALL(PlayEffect, 0x6B, 0, LVar0, LVar1, LVar2, LVar3, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2C5) EVT_THREAD EVT_LOOP(15) @@ -4013,7 +4013,7 @@ EvtScript N(takeTurn_80228B78) = { EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_ThrowSpiny) EVT_WAIT(3) - EVT_CALL(SetPartSounds, -127, 3, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 3, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_201B) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -4021,16 +4021,16 @@ EvtScript N(takeTurn_80228B78) = { EVT_CASE_OR_EQ(5) EVT_SET(LVarA, LVar0) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_BattleLakilester_SpinySpin) - EVT_CALL(SetPartJumpGravity, -127, 3, EVT_FLOAT(1.5)) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(1.5)) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RandInt, 100, LVar3) EVT_SUB(LVar3, 50) EVT_ADD(LVar0, LVar3) - EVT_CALL(JumpPartTo, -127, 3, LVar0, 0, LVar2, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, 0, LVar2, 20, TRUE) EVT_THREAD EVT_ADD(LVar0, -50) - EVT_CALL(JumpPartTo, -127, 3, LVar0, 0, LVar2, 15, 1) - EVT_CALL(SetPartFlagBits, -127, 3, 1, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, 0, LVar2, 15, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 1, TRUE) EVT_END_THREAD EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -4041,23 +4041,23 @@ EvtScript N(takeTurn_80228B78) = { EVT_CALL(MoveBattleCamOver, 60) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) 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, 3, ANIM_BattleLakilester_SpinySpin) - EVT_CALL(SetPartJumpGravity, -127, 3, EVT_FLOAT(1.5)) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(1.5)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(JumpPartTo, -127, 3, LVar0, LVar1, LVar2, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 20, TRUE) EVT_THREAD EVT_ADD(LVar0, -50) - EVT_CALL(JumpPartTo, -127, 3, LVar0, 0, LVar2, 15, 1) - EVT_CALL(SetPartFlagBits, -127, 3, 1, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, 0, LVar2, 15, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 1, TRUE) EVT_END_THREAD - EVT_CALL(GetActorVar, -127, 1, LVar9) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) EVT_SWITCH(LVar9) EVT_CASE_EQ(0) EVT_WAIT(2) @@ -4078,7 +4078,7 @@ EvtScript N(takeTurn_80228B78) = { EVT_CALL(MoveBattleCamOver, 8) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -4091,10 +4091,10 @@ EvtScript N(nextTurn_80229658) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(12) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_GT(LVar0, 0) EVT_SUB(LVar0, 1) - EVT_CALL(SetActorVar, -127, 2, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) EVT_BREAK_SWITCH EVT_END_IF EVT_SET_CONST(LVar0, 0x00000001) @@ -4161,7 +4161,7 @@ EvtScript N(copyPartner) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 15) EVT_WAIT(15) - EVT_CALL(ActorSpeak, 131111, -127, 1, 10747910, 10747907) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0027, ACTOR_SELF, 1, 0x00A40006, 0x00A40003) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B8) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Lee_RaisedArmsTalk) @@ -4174,9 +4174,9 @@ EvtScript N(copyPartner) = { EVT_ADD(LVar1, 20) EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF - EVT_CALL(PlayEffect, 0x13, 1, LVar0, LVar1, LVar2, LVar3, 40, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar1, LVar2, LVar3, 40, 0) EVT_CALL(N(UnkBackgroundFunc3)) - EVT_CALL(MakeLerp, 0, 200, 20, 0) + EVT_CALL(MakeLerp, 0, 200, 20, EASING_LINEAR) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -4207,26 +4207,26 @@ EvtScript N(copyPartner) = { EVT_CALL(SummonEnemy, EVT_PTR(N(formation_lakilester)), 0) EVT_END_SWITCH EVT_SET(LVarA, LVar0) - EVT_CALL(CopyStatusEffects, -127, LVarA) + EVT_CALL(CopyStatusEffects, ACTOR_SELF, LVarA) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SMOKE_BURST) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 3) EVT_ADD(LVar2, 5) EVT_LOOP(3) - EVT_CALL(PlayEffect, 0x1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD EVT_WAIT(5) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorPos, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, -127, 1, 131073, 1) - EVT_CALL(SetPartFlagBits, -127, 1, 8388608, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, (ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_NO_DMG_APPLY), 1) - EVT_CALL(GetActorHP, -127, LVar0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 0x00020001, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, 0x00800000, FALSE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, (ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_NO_DMG_APPLY), TRUE) + EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_CALL(SetEnemyHP, LVarA, LVar0) - EVT_CALL(CopyBuffs, -127, LVarA) + EVT_CALL(CopyBuffs, ACTOR_SELF, LVarA) EVT_CALL(GetOwnerID, LVar0) EVT_CALL(SetActorVar, LVarA, 0, LVar0) EVT_CALL(SetActorVar, LVarA, 1, LVar6) @@ -4234,7 +4234,7 @@ EvtScript N(copyPartner) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) EVT_THREAD - EVT_CALL(MakeLerp, 200, 0, 20, 0) + EVT_CALL(MakeLerp, 200, 0, 20, EASING_LINEAR) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -4243,7 +4243,7 @@ EvtScript N(copyPartner) = { EVT_GOTO(1) EVT_END_IF EVT_END_THREAD - EVT_CALL(SetActorSounds, LVarA, 2, 0, 0) + EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_SWITCH(LVar5) EVT_CASE_EQ(8) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) @@ -4263,12 +4263,12 @@ EvtScript N(copyPartner) = { EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVarA, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, LVarA) - EVT_CALL(ResetActorSounds, LVarA, 2) + EVT_CALL(ResetActorSounds, LVarA, ACTOR_SOUND_JUMP) EVT_WAIT(20) EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetActorVar, -127, 8, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -4276,7 +4276,7 @@ EvtScript N(copyPartner) = { }; EvtScript N(takeTurn_80229F9C) = { - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_EXEC_WAIT(N(copyPartner)) @@ -4284,7 +4284,7 @@ EvtScript N(takeTurn_80229F9C) = { EVT_CASE_EQ(2) EVT_EXEC_WAIT(N(flyingTackle)) EVT_CASE_EQ(3) - EVT_CALL(SetActorVar, -127, 8, 2) + EVT_CALL(SetActorVar, ACTOR_SELF, 8, 2) EVT_END_SWITCH EVT_RETURN EVT_END @@ -4300,17 +4300,17 @@ EvtScript N(nextTurn_8022A038) = { EVT_IF_FLAG(LVar0, 0x3F1000) EVT_BREAK_SWITCH EVT_END_IF - EVT_CALL(GetActorHP, -127, LVar0) - EVT_CALL(GetEnemyMaxHP, -127, LVar1) + EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) + EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) EVT_DIV(LVar1, 2) EVT_IF_LE(LVar0, LVar1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(GetActorVar, -127, 8, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(ActorSpeak, 131112, 513, 1, 10747910, 10747907) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0028, ACTOR_ENEMY1, 1, 0x00A40006, 0x00A40003) EVT_ELSE - EVT_CALL(ActorSpeak, 131112, -127, 1, 10747910, 10747907) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0028, ACTOR_SELF, 1, 0x00A40006, 0x00A40003) EVT_END_IF EVT_BREAK_SWITCH EVT_END_IF @@ -4318,7 +4318,7 @@ EvtScript N(nextTurn_8022A038) = { EVT_IF_LE(LVar0, 5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131113, -127, 1, 10747910, 10747907) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0029, ACTOR_SELF, 1, 0x00A40006, 0x00A40003) EVT_BREAK_SWITCH EVT_END_IF EVT_END_SWITCH diff --git a/src/battle/area/mac/actor/master1.c b/src/battle/area/mac/actor/master1.c index fd221cc4cc..ffc6e19748 100644 --- a/src/battle/area/mac/actor/master1.c +++ b/src/battle/area/mac/actor/master1.c @@ -72,7 +72,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 50, .partCount = ARRAY_COUNT(N(partsTable_8022A364)), .partsData = N(partsTable_8022A364), - .takeTurnScript = &N(init_8022A3B0), + .initScript = &N(init_8022A3B0), .statusTable = N(statusTable_8022A2B8), .escapeChance = 100, .airLiftChance = 0, @@ -97,13 +97,13 @@ EvtScript N(init_8022A3B0) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8022AA54))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8022A494))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8022B2CC))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_8022B06C))) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) - EVT_CALL(SetActorVar, -127, 2, 0) - EVT_CALL(SetActorVar, -127, 3, 2) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8022B06C))) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 2) EVT_SET(GF_FoughtTheMaster, 1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_NO_GAME_OVER, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_NO_GAME_OVER, TRUE) EVT_RETURN EVT_END }; @@ -309,32 +309,32 @@ EvtScript N(nextTurn_8022B06C) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131118, -127, 1, 10616841, 10616837) - EVT_CALL(SetActorVar, -127, 0, 1) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_002E, ACTOR_SELF, 1, 0x00A20009, 0x00A20005) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_END_IF EVT_CASE_EQ(12) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, 0x351000) EVT_BREAK_SWITCH EVT_END_IF - EVT_CALL(GetActorHP, -127, LVar0) - EVT_CALL(GetEnemyMaxHP, -127, LVar1) + EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) + EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) EVT_DIV(LVar1, 2) EVT_IF_LE(LVar0, LVar1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131121, -127, 1, 10616841, 10616837) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0031, ACTOR_SELF, 1, 0x00A20009, 0x00A20005) EVT_BREAK_SWITCH EVT_END_IF EVT_CALL(GetPlayerHP, LVar0) EVT_IF_LE(LVar0, 5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131122, -127, 1, 10616841, 10616837) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0032, ACTOR_SELF, 1, 0x00A20009, 0x00A20005) EVT_BREAK_SWITCH EVT_END_IF EVT_END_SWITCH @@ -352,10 +352,10 @@ EvtScript N(handleEvent_8022B2CC) = { EVT_END_IF EVT_CALL(GetBattleFlags, LVar0) EVT_IF_FLAG(LVar0, BS_FLAGS1_200 | BS_FLAGS1_40) - EVT_CALL(GetLastDamage, -127, LVar0) + EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_GT(LVar0, 0) - EVT_CALL(SetActorVar, -127, 2, 1) - EVT_CALL(AddActorVar, -127, 3, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) + EVT_CALL(AddActorVar, ACTOR_SELF, 3, 1) EVT_END_IF EVT_END_IF EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) @@ -365,9 +365,9 @@ EvtScript N(handleEvent_8022B2CC) = { EVT_CASE_OR_EQ(11) EVT_CASE_OR_EQ(25) EVT_CASE_OR_EQ(31) - EVT_CALL(GetActorVar, -127, 2, LVarA) - EVT_CALL(GetActorVar, -127, 3, LVarB) - EVT_CALL(SetActorVar, -127, 2, 0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVarA) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVarB) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, 0x3F1000) EVT_BREAK_SWITCH @@ -389,13 +389,13 @@ EvtScript N(handleEvent_8022B2CC) = { EVT_IF_GT(LVarB, 2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131120, -127, 1, 10616841, 10616837) - EVT_CALL(SetActorVar, -127, 3, 0) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0030, ACTOR_SELF, 1, 0x00A20009, 0x00A20005) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0) EVT_END_IF EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131119, -127, 1, 10616841, 10616837) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_002F, ACTOR_SELF, 1, 0x00A20009, 0x00A20005) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) diff --git a/src/battle/area/mac/actor/master2.c b/src/battle/area/mac/actor/master2.c index 53075b31ad..f8a93ba6fc 100644 --- a/src/battle/area/mac/actor/master2.c +++ b/src/battle/area/mac/actor/master2.c @@ -85,7 +85,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 75, .partCount = ARRAY_COUNT(N(partsTable_8022B790)), .partsData = N(partsTable_8022B790), - .takeTurnScript = &N(init_8022B7DC), + .initScript = &N(init_8022B7DC), .statusTable = N(statusTable_8022B6E4), .escapeChance = 100, .airLiftChance = 0, @@ -110,12 +110,12 @@ EvtScript N(init_8022B7DC) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8022CF48))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8022B8B0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8022D634))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_8022CFFC))) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) - EVT_CALL(SetActorVar, -127, 2, 0) - EVT_CALL(SetActorVar, -127, 3, 2) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_NO_GAME_OVER, 1) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8022CFFC))) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 2) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_NO_GAME_OVER, TRUE) EVT_RETURN EVT_END }; @@ -254,12 +254,12 @@ EvtScript N(singleStrike2) = { EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_WAIT(10) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -273,11 +273,11 @@ EvtScript N(singleStrike2) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_WAIT(2) @@ -288,7 +288,7 @@ EvtScript N(singleStrike2) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_THREAD - EVT_CALL(SetActorRotationOffset, -127, 0, 20, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 20, 0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 36) @@ -306,7 +306,7 @@ EvtScript N(singleStrike2) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedLand) - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_WAIT(3) EVT_ADD(LVar0, 20) EVT_SET(LVar1, 0) @@ -351,13 +351,13 @@ EvtScript N(doubleStrike2) = { EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_WAIT(10) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -371,19 +371,19 @@ EvtScript N(doubleStrike2) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(4.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) + 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_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) @@ -393,17 +393,17 @@ EvtScript N(doubleStrike2) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedUppercut) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.9)) EVT_CALL(JumpToGoal, ACTOR_SELF, 25, FALSE, TRUE, FALSE) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_END_THREAD EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.2)) + 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_WAIT(2) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) @@ -418,7 +418,7 @@ EvtScript N(doubleStrike2) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_THREAD - EVT_CALL(SetActorRotationOffset, -127, 0, 10, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 10, 0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 36) @@ -436,7 +436,7 @@ EvtScript N(doubleStrike2) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 30, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedLand) - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_WAIT(3) EVT_ADD(LVar0, 20) EVT_SET(LVar1, 0) @@ -482,14 +482,14 @@ EvtScript N(nextTurn_8022CFFC) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_WAIT(10) - EVT_CALL(ActorSpeak, 131118, -127, 1, 10616841, 10616837) - EVT_CALL(SetActorVar, -127, 0, 1) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_002E, ACTOR_SELF, 1, 0x00A20009, 0x00A20005) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_Cough) EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_OpenMouth) @@ -497,7 +497,7 @@ EvtScript N(nextTurn_8022CFFC) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, 0x13, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) EVT_SET(LVar0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_Still) EVT_LOOP(15) @@ -517,7 +517,7 @@ EvtScript N(nextTurn_8022CFFC) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 3) EVT_LOOP(3) - EVT_CALL(PlayEffect, 0x1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD @@ -539,27 +539,27 @@ EvtScript N(nextTurn_8022CFFC) = { EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131123, -127, 1, 10616842, 10616838) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0033, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006) EVT_END_IF EVT_CASE_EQ(12) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, 0x351000) EVT_BREAK_SWITCH EVT_END_IF - EVT_CALL(GetActorHP, -127, LVar0) - EVT_CALL(GetEnemyMaxHP, -127, LVar1) + EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) + EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) EVT_DIV(LVar1, 2) EVT_IF_LE(LVar0, LVar1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131126, -127, 1, 10616842, 10616838) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0036, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006) EVT_BREAK_SWITCH EVT_END_IF EVT_CALL(GetPlayerHP, LVar0) EVT_IF_LE(LVar0, 5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131127, -127, 1, 10616842, 10616838) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0037, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006) EVT_BREAK_SWITCH EVT_END_IF EVT_END_SWITCH @@ -577,10 +577,10 @@ EvtScript N(handleEvent_8022D634) = { EVT_END_IF EVT_CALL(GetBattleFlags, LVar0) EVT_IF_FLAG(LVar0, BS_FLAGS1_200 | BS_FLAGS1_40) - EVT_CALL(GetLastDamage, -127, LVar0) + EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_GT(LVar0, 0) - EVT_CALL(SetActorVar, -127, 2, 1) - EVT_CALL(AddActorVar, -127, 3, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) + EVT_CALL(AddActorVar, ACTOR_SELF, 3, 1) EVT_END_IF EVT_END_IF EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) @@ -590,9 +590,9 @@ EvtScript N(handleEvent_8022D634) = { EVT_CASE_OR_EQ(11) EVT_CASE_OR_EQ(25) EVT_CASE_OR_EQ(31) - EVT_CALL(GetActorVar, -127, 2, LVarA) - EVT_CALL(GetActorVar, -127, 3, LVarB) - EVT_CALL(SetActorVar, -127, 2, 0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVarA) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVarB) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, 0x3F1000) EVT_BREAK_SWITCH @@ -614,13 +614,13 @@ EvtScript N(handleEvent_8022D634) = { EVT_IF_GT(LVarB, 2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131125, -127, 1, 10616842, 10616838) - EVT_CALL(SetActorVar, -127, 3, 0) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0035, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0) EVT_END_IF EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131124, -127, 1, 10616842, 10616838) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0034, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) diff --git a/src/battle/area/mac/actor/master3.c b/src/battle/area/mac/actor/master3.c index fbb60fea17..55605383e4 100644 --- a/src/battle/area/mac/actor/master3.c +++ b/src/battle/area/mac/actor/master3.c @@ -97,7 +97,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(partsTable_8022DAF0)), .partsData = N(partsTable_8022DAF0), - .takeTurnScript = &N(init_8022DB60), + .initScript = &N(init_8022DB60), .statusTable = N(statusTable_8022DA44), .escapeChance = 100, .airLiftChance = 0, @@ -122,12 +122,12 @@ EvtScript N(init_8022DB60) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80230B20))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8022DC34))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80231408))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_80230D44))) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 0) - EVT_CALL(SetActorVar, -127, 2, 0) - EVT_CALL(SetActorVar, -127, 3, 2) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_NO_GAME_OVER, 1) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_80230D44))) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 2) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_NO_GAME_OVER, TRUE) EVT_RETURN EVT_END }; @@ -154,9 +154,9 @@ EvtScript N(8022DC44) = { EVT_SET_CONST(LVar1, ANIM_TheMaster_BurnHurt) EVT_SET_CONST(LVar2, ANIM_TheMaster_BurnStill) EVT_EXEC_WAIT(DoBurnHit) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 1) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_GOLDEN_FLAMES) EVT_WAIT(1) - EVT_CALL(ModifyActorDecoration, -127, 1, 0, 50, 50, 0, 0) + EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 0, 50, 50, 0, 0) EVT_CASE_EQ(36) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_SET_CONST(LVar0, 0x00000001) @@ -174,9 +174,9 @@ EvtScript N(8022DC44) = { EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_WAIT(10) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 1) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_GOLDEN_FLAMES) EVT_WAIT(1) - EVT_CALL(ModifyActorDecoration, -127, 1, 0, 50, 50, 0, 0) + EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 0, 50, 50, 0, 0) EVT_END_CHILD_THREAD EVT_EXEC_WAIT(DoSpinSmashHit) EVT_CASE_EQ(47) @@ -279,12 +279,12 @@ EvtScript N(singleStrike3) = { EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_WAIT(10) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -298,11 +298,11 @@ EvtScript N(singleStrike3) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_WAIT(2) @@ -313,7 +313,7 @@ EvtScript N(singleStrike3) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_THREAD - EVT_CALL(SetActorRotationOffset, -127, 0, 20, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 20, 0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 36) @@ -331,7 +331,7 @@ EvtScript N(singleStrike3) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedLand) - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_WAIT(3) EVT_ADD(LVar0, 20) EVT_SET(LVar1, 0) @@ -376,13 +376,13 @@ EvtScript N(doubleStrike3) = { EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_WAIT(10) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -396,19 +396,19 @@ EvtScript N(doubleStrike3) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(4.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) + 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_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) @@ -418,17 +418,17 @@ EvtScript N(doubleStrike3) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedUppercut) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.9)) EVT_CALL(JumpToGoal, ACTOR_SELF, 25, FALSE, TRUE, FALSE) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_END_THREAD EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.2)) + 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_WAIT(2) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) @@ -443,7 +443,7 @@ EvtScript N(doubleStrike3) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_THREAD - EVT_CALL(SetActorRotationOffset, -127, 0, 10, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 10, 0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 36) @@ -461,7 +461,7 @@ EvtScript N(doubleStrike3) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 30, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedLand) - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_WAIT(3) EVT_ADD(LVar0, 20) EVT_SET(LVar1, 0) @@ -494,7 +494,7 @@ EvtScript N(tripleStrike3) = { EVT_CALL(MoveBattleCamOver, 60) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedDownwardStance) EVT_WAIT(20) - EVT_CALL(ActorSpeak, 131132, -127, 1, 10616842, 10616838) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_003C, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -507,13 +507,13 @@ EvtScript N(tripleStrike3) = { EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedIdle) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_WAIT(10) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -527,19 +527,19 @@ EvtScript N(tripleStrike3) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedPalmStance) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(4.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) + 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_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) @@ -548,19 +548,19 @@ EvtScript N(tripleStrike3) = { EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_THREAD - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedUppercut) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5)) EVT_CALL(JumpToGoal, ACTOR_SELF, 25, FALSE, TRUE, FALSE) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_END_THREAD EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.2)) + 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_WAIT(2) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED) @@ -588,7 +588,7 @@ EvtScript N(tripleStrike3) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 30, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedLand) - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_WAIT(3) EVT_ADD(LVar0, 20) EVT_SET(LVar1, 0) @@ -604,22 +604,22 @@ EvtScript N(tripleStrike3) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedKick) - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 3, FALSE) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(6.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(5.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(4.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.2)) + 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_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) @@ -633,7 +633,7 @@ EvtScript N(tripleStrike3) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_THREAD - EVT_CALL(SetActorRotationOffset, -127, 0, 10, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 10, 0) EVT_SET(LVar0, 0) EVT_LOOP(10) EVT_ADD(LVar0, 36) @@ -651,7 +651,7 @@ EvtScript N(tripleStrike3) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 30, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedLand) - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_WAIT(3) EVT_ADD(LVar0, 20) EVT_SET(LVar1, 0) @@ -692,30 +692,30 @@ EvtScript N(80230240) = { EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedDownwardStance) EVT_WAIT(15) - EVT_CALL(EnableActorBlur, -127, 1) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedIdle) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 90, 0, 10) - EVT_CALL(EnableActorBlur, -127, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 90, 0, EASING_COS_IN_OUT) + EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 1) - EVT_CALL(SetActorVar, -127, 1, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) EVT_SET(LVar0, 80) EVT_LOOP(5) EVT_ADD(LVar0, 20) - EVT_CALL(ModifyActorDecoration, -127, 1, 0, 80, LVar0, 0, 0) + EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 0, 80, LVar0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_LOOP(5) EVT_SUB(LVar0, 20) - EVT_CALL(ModifyActorDecoration, -127, 1, 0, 80, LVar0, 0, 0) + EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 0, 80, LVar0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) @@ -736,7 +736,7 @@ EvtScript N(8023059C) = { EVT_SET(LVar0, 80) EVT_LOOP(30) EVT_ADD(LVar0, 2) - EVT_CALL(ModifyActorDecoration, -127, 1, 0, 80, LVar0, 0, 0) + EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 0, 80, LVar0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -746,22 +746,22 @@ EvtScript N(8023059C) = { EVT_SET(LVar0, 140) EVT_LOOP(30) EVT_SUB(LVar0, 2) - EVT_CALL(ModifyActorDecoration, -127, 1, 0, 80, LVar0, 0, 0) + EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 0, 80, LVar0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 1) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_GOLDEN_FLAMES) EVT_WAIT(1) - EVT_CALL(ModifyActorDecoration, -127, 2, 0, 40, 40, 0, 0) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 0) + EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 2, 0, 40, 40, 0, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) - EVT_CALL(SetPartAlpha, -127, 2, 80) + EVT_CALL(SetPartAlpha, ACTOR_SELF, 2, 80) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetPartJumpGravity, -127, 2, EVT_FLOAT(0.1)) - EVT_CALL(JumpPartTo, -127, 2, LVar0, LVar1, LVar2, 10, 1) - EVT_CALL(SetPartFlagBits, -127, 2, 1, 1) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.1)) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 10, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, 1, TRUE) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 10, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -786,14 +786,14 @@ EvtScript N(80230914) = { EVT_SET(LVar0, 80) EVT_LOOP(30) EVT_ADD(LVar0, 2) - EVT_CALL(ModifyActorDecoration, -127, 1, 0, 80, LVar0, 0, 0) + EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 0, 80, LVar0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedIdle) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_LINEAR) EVT_WAIT(10000) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 10, BS_FLAGS1_10) @@ -811,13 +811,13 @@ EvtScript N(80230914) = { EvtScript N(takeTurn_80230B20) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(GetActorHP, -127, LVar0) + EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_IF_LT(LVar0, 0) EVT_EXEC_WAIT(N(80230240)) EVT_ELSE - EVT_CALL(GetActorHP, 0, LVar0) + EVT_CALL(GetActorHP, ACTOR_PLAYER, LVar0) EVT_IF_GT(LVar0, 20) EVT_CALL(RandInt, 100, LVar0) EVT_SWITCH(LVar0) @@ -859,14 +859,14 @@ EvtScript N(nextTurn_80230D44) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_WAIT(10) - EVT_CALL(ActorSpeak, 131118, -127, 1, 10616841, 10616837) - EVT_CALL(SetActorVar, -127, 0, 1) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_002E, ACTOR_SELF, 1, 0x00A20009, 0x00A20005) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_Cough) EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_OpenMouth) @@ -874,7 +874,7 @@ EvtScript N(nextTurn_80230D44) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, 0x13, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) EVT_SET(LVar0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_Still) EVT_LOOP(15) @@ -894,7 +894,7 @@ EvtScript N(nextTurn_80230D44) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 3) EVT_LOOP(3) - EVT_CALL(PlayEffect, 0x1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD @@ -915,34 +915,34 @@ EvtScript N(nextTurn_80230D44) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedRun) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedUppercut) EVT_WAIT(2) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 1) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_GOLDEN_FLAMES) EVT_WAIT(1) - EVT_CALL(ModifyActorDecoration, -127, 1, 0, 50, 50, 0, 0) + EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 0, 50, 50, 0, 0) EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedIdle) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131128, -127, 1, 10616842, 10616838) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0038, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006) EVT_END_IF EVT_CASE_EQ(12) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, 0x351000) EVT_BREAK_SWITCH EVT_END_IF - EVT_CALL(GetActorHP, -127, LVar0) - EVT_CALL(GetEnemyMaxHP, -127, LVar1) + EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) + EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) EVT_DIV(LVar1, 2) EVT_IF_LE(LVar0, LVar1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131131, -127, 1, 10616842, 10616838) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_003B, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006) EVT_BREAK_SWITCH EVT_END_IF EVT_CALL(GetPlayerHP, LVar0) EVT_IF_LE(LVar0, 10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131133, -127, 1, 10616842, 10616838) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_003D, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006) EVT_BREAK_SWITCH EVT_END_IF EVT_END_SWITCH @@ -960,10 +960,10 @@ EvtScript N(handleEvent_80231408) = { EVT_END_IF EVT_CALL(GetBattleFlags, LVar0) EVT_IF_FLAG(LVar0, BS_FLAGS1_200 | BS_FLAGS1_40) - EVT_CALL(GetLastDamage, -127, LVar0) + EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_GT(LVar0, 0) - EVT_CALL(SetActorVar, -127, 2, 1) - EVT_CALL(AddActorVar, -127, 3, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) + EVT_CALL(AddActorVar, ACTOR_SELF, 3, 1) EVT_END_IF EVT_END_IF EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) @@ -973,9 +973,9 @@ EvtScript N(handleEvent_80231408) = { EVT_CASE_OR_EQ(11) EVT_CASE_OR_EQ(25) EVT_CASE_OR_EQ(31) - EVT_CALL(GetActorVar, -127, 2, LVarA) - EVT_CALL(GetActorVar, -127, 3, LVarB) - EVT_CALL(SetActorVar, -127, 2, 0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVarA) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVarB) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, 0x3F1000) EVT_BREAK_SWITCH @@ -997,13 +997,13 @@ EvtScript N(handleEvent_80231408) = { EVT_IF_GT(LVarB, 2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131130, -127, 1, 10616842, 10616838) - EVT_CALL(SetActorVar, -127, 3, 0) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_003A, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0) EVT_END_IF EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(ActorSpeak, 131129, -127, 1, 10616842, 10616838) + EVT_CALL(ActorSpeak, MSG_MAC_Gate_0039, ACTOR_SELF, 1, 0x00A2000A, 0x00A20006) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) diff --git a/src/battle/area/mac/stage/mac_01.c b/src/battle/area/mac/stage/mac_01.c index 1b6984bf18..2841ba941d 100644 --- a/src/battle/area/mac/stage/mac_01.c +++ b/src/battle/area/mac/stage/mac_01.c @@ -1,33 +1,34 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/mac_bt01_shape.h" #define NAMESPACE b_area_mac_mac_01 -#include "common/UnkModelStuff2.inc.c" +#include "battle/common/stage/WaterEffects.inc.c" -EvtScript N(beforeBattle_802327F4) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_THREAD - EVT_SET(LVar0, 44) - EVT_EXEC(N(script2)) + EVT_SET(LVar0, MODEL_nami4) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_WAIT(5) - EVT_SET(LVar0, 47) - EVT_EXEC(N(script2)) + EVT_SET(LVar0, MODEL_nami3) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_WAIT(5) - EVT_SET(LVar0, 46) - EVT_EXEC(N(script2)) + EVT_SET(LVar0, MODEL_nami2) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_WAIT(5) - EVT_SET(LVar0, 45) - EVT_EXEC(N(script2)) + EVT_SET(LVar0, MODEL_nami1) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_END_THREAD - EVT_SET(LVar0, 40) - EVT_EXEC(N(script1)) + EVT_SET(LVar0, MODEL_o391) + EVT_EXEC(N(EVS_AnimateFishModel)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_802328F0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -37,6 +38,6 @@ Stage NAMESPACE = { .shape = "mac_bt01_shape", .hit = "mac_bt01_hit", .bg = "nok_bg", - .preBattle = &N(beforeBattle_802327F4), - .postBattle = &N(afterBattle_802328F0), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/mac/stage/mac_02.c b/src/battle/area/mac/stage/mac_02.c index ffc9de74dc..049cac0ed0 100644 --- a/src/battle/area/mac/stage/mac_02.c +++ b/src/battle/area/mac/stage/mac_02.c @@ -1,18 +1,19 @@ #include "common.h" #include "battle/battle.h" #include "script_api/battle.h" +#include "mapfs/mac_bt02_shape.h" #define NAMESPACE b_area_mac_mac_02 -EvtScript N(beforeBattle_80232930) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_CALL(EnableBattleFloorReflections, TRUE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8023297C) = { +EvtScript N(EVS_PostBattle) = { EVT_CALL(EnableBattleFloorReflections, FALSE) EVT_RETURN EVT_END @@ -22,6 +23,6 @@ Stage NAMESPACE = { .texture = "mac_tex", .shape = "mac_bt02_shape", .hit = "mac_bt02_hit", - .preBattle = &N(beforeBattle_80232930), - .postBattle = &N(afterBattle_8023297C), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/mim/actor/forest_fuzzy.c b/src/battle/area/mim/actor/forest_fuzzy.c index 25a2401707..c020ef6d75 100644 --- a/src/battle/area/mim/actor/forest_fuzzy.c +++ b/src/battle/area/mim/actor/forest_fuzzy.c @@ -65,7 +65,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 6, .partCount = ARRAY_COUNT(N(partsTable_80218478)), .partsData = N(partsTable_80218478), - .takeTurnScript = &N(init_80218510), + .initScript = &N(init_80218510), .statusTable = N(statusTable_802183CC), .escapeChance = 40, .airLiftChance = 90, @@ -362,7 +362,7 @@ EvtScript N(80219054) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -394,7 +394,7 @@ EvtScript N(80219054) = { EVT_END_IF EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03000C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Bite) EVT_WAIT(21) @@ -434,7 +434,7 @@ EvtScript N(80219054) = { EVT_END_THREAD EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_ADD(LVar0, LVar3) EVT_CALL(SetEnemyHP, ACTOR_SELF, LVar0) @@ -512,7 +512,7 @@ EvtScript N(8021A0D4) = { 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) @@ -528,7 +528,7 @@ EvtScript N(8021A0D4) = { 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 @@ -579,7 +579,7 @@ EvtScript N(8021A0D4) = { EvtScript N(8021A45C) = { EVT_SET(LVar9, 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -604,7 +604,7 @@ EvtScript N(8021A45C) = { 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 diff --git a/src/battle/area/mim/actor/piranha_plant.c b/src/battle/area/mim/actor/piranha_plant.c index 27b24d6897..6db6d2afa9 100644 --- a/src/battle/area/mim/actor/piranha_plant.c +++ b/src/battle/area/mim/actor/piranha_plant.c @@ -86,7 +86,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 5, .partCount = ARRAY_COUNT(N(partsTable_8021D44C)), .partsData = N(partsTable_8021D44C), - .takeTurnScript = &N(init_8021D498), + .initScript = &N(init_8021D498), .statusTable = N(statusTable_8021D3A0), .escapeChance = 70, .airLiftChance = 20, @@ -118,7 +118,7 @@ EvtScript N(idle_8021D4E4) = { EvtScript N(8021D4F4) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_DIG) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SmallPiranha_Anim04) EVT_WAIT(10) @@ -128,7 +128,7 @@ EvtScript N(8021D4F4) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_SURFACE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SmallPiranha_Anim03) EVT_WAIT(10) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_RETURN EVT_END }; @@ -203,7 +203,7 @@ EvtScript N(handleEvent_8021D60C) = { EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 35) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_END_THREAD EVT_LOOP(40) @@ -232,7 +232,7 @@ EvtScript N(handleEvent_8021D60C) = { EVT_EXEC_WAIT(DoNormalHit) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_DIG) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SmallPiranha_Anim04) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_WAIT(8) EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -262,7 +262,7 @@ EvtScript N(takeTurn_8021DCD4) = { EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SmallPiranha_Anim04) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) @@ -277,7 +277,7 @@ EvtScript N(takeTurn_8021DCD4) = { EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_DIG) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SmallPiranha_Anim04) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_WAIT(8) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -300,13 +300,13 @@ EvtScript N(takeTurn_8021DCD4) = { EVT_END_IF EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, FALSE, FALSE) EVT_LABEL(123) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_SURFACE) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SmallPiranha_Anim03) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SmallPiranha_Anim05) diff --git a/src/battle/area/mim/stage/mim_01.c b/src/battle/area/mim/stage/mim_01.c index ad38c685e5..ddbda9569d 100644 --- a/src/battle/area/mim/stage/mim_01.c +++ b/src/battle/area/mim/stage/mim_01.c @@ -1,18 +1,19 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/mim_bt01_shape.h" #define NAMESPACE b_area_mim_mim_01 #include "common/UnkFogFunc2.inc.c" -EvtScript N(beforeBattle_8021E450) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_CALL(N(UnkFogFunc2)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8021E47C) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -21,6 +22,6 @@ Stage NAMESPACE = { .texture = "mim_tex", .shape = "mim_bt01_shape", .hit = "mim_bt01_hit", - .preBattle = &N(beforeBattle_8021E450), - .postBattle = &N(afterBattle_8021E47C), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c index 264b117096..d2be16ea11 100644 --- a/src/battle/area/nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -198,7 +198,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 70, .partCount = ARRAY_COUNT(N(partsTable_80227AB4)), .partsData = N(partsTable_80227AB4), - .takeTurnScript = &N(init_80227C20), + .initScript = &N(init_80227C20), .statusTable = N(statusTable_80227A08), .escapeChance = 0, .airLiftChance = 0, @@ -221,16 +221,16 @@ extern EvtScript N(nextTurn_80227D2C); EvtScript N(init_80227C20) = { EVT_CALL(func_8027D434, -127, 3, 70) - EVT_CALL(SetPartSize, -127, 3, 30, 30) + EVT_CALL(SetPartSize, ACTOR_SELF, 3, 30, 30) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80228A7C))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80227DD4))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80227E08))) - EVT_CALL(BindNextTurn, -127, EVT_PTR(N(nextTurn_80227D2C))) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 4653084) - EVT_CALL(SetActorVar, -127, 2, 0) - EVT_CALL(SetActorVar, -127, 3, 20) - EVT_CALL(SetActorVar, -127, 4, 2) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_80227D2C))) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0x0047001C) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, 20) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) EVT_RETURN EVT_END }; @@ -241,7 +241,7 @@ EvtScript N(nextTurn_80227D2C) = { EVT_CALL(GetBattlePhase, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(10) - EVT_CALL(SetActorVar, -127, 4, 2) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -273,25 +273,25 @@ EvtScript N(handleEvent_80227E08) = { EVT_CASE_EQ(56) EVT_CASE_EQ(9) EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoNormalHit) EVT_CASE_EQ(10) EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoNormalHit) - EVT_CALL(SetActorVar, -127, 4, 2) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) EVT_CASE_EQ(32) EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(14) - EVT_CALL(SetActorVar, -127, 4, 2) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET(LVar0, 1) EVT_SET(LVar1, 4653077) @@ -304,7 +304,7 @@ EvtScript N(handleEvent_80227E08) = { EVT_EXEC_WAIT(DoBurnHit) EVT_END_IF EVT_CASE_EQ(36) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET(LVar0, 1) EVT_SET(LVar1, 4653077) @@ -321,56 +321,56 @@ EvtScript N(handleEvent_80227E08) = { EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(11) - EVT_CALL(SetActorVar, -127, 4, 2) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoNormalHit) EVT_ELSE EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(N(8022B158)) EVT_END_IF EVT_CASE_EQ(33) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoNormalHit) EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_ELSE EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(N(8022B204)) EVT_RETURN EVT_END_IF EVT_CASE_EQ(47) EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoJumpBack) EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoReturnHome) EVT_CASE_EQ(38) EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoJumpBack) EVT_SET_CONST(LVar0, 0x00000001) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(23) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim09) @@ -381,8 +381,8 @@ EvtScript N(handleEvent_80227E08) = { EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_CASE_EQ(25) - EVT_CALL(SetActorVar, -127, 4, 2) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim09) @@ -399,7 +399,7 @@ EvtScript N(handleEvent_80227E08) = { EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_CASE_EQ(31) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET(LVar1, 4653057) EVT_ELSE @@ -411,7 +411,7 @@ EvtScript N(handleEvent_80227E08) = { EVT_EXEC_WAIT(N(8022AD84)) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CASE_EQ(49) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim01) EVT_SET_CONST(LVar0, 0x00000001) @@ -422,34 +422,34 @@ EvtScript N(handleEvent_80227E08) = { EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_CASE_EQ(13) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim12) EVT_EXEC_WAIT(DoNormalHit) EVT_RETURN EVT_END_IF - EVT_CALL(GetActorVar, -127, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_IF_GT(LVar0, 0) EVT_SUB(LVar0, 1) - EVT_CALL(SetActorVar, -127, 4, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, LVar0) EVT_END_IF EVT_CALL(func_80269E80, LVar0) EVT_IF_EQ(LVar0, 22) - EVT_CALL(SetActorVar, -127, 4, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 0) EVT_END_IF - EVT_CALL(GetActorVar, -127, 4, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(GetBattleFlags, LVarD) EVT_IF_FLAG(LVarD, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(SetActorVar, -127, 4, 2) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) EVT_END_IF EVT_EXEC_WAIT(N(flipOver_KentC)) EVT_ELSE EVT_CALL(GetBattleFlags, LVarD) EVT_IF_FLAG(LVarD, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(SetActorVar, -127, 4, 2) - EVT_CALL(GetLastDamage, -127, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) + EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_GT(LVar0, 0) EVT_SET_CONST(LVar0, 0x00000001) EVT_SET_CONST(LVar1, ANIM_KentCKoopa_Anim1C) @@ -484,8 +484,8 @@ EvtScript N(handleEvent_80227E08) = { #include "common/UnkBattleFunc1.inc.c" EvtScript N(takeTurn_80228A7C) = { - EVT_CALL(SetActorVar, -127, 4, 2) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 4, 2) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) @@ -494,16 +494,16 @@ EvtScript N(takeTurn_80228A7C) = { EVT_CALL(SetBattleCamOffsetZ, 20) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 25) - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_SUB(LVar0, 1) - EVT_CALL(SetActorVar, -127, 2, LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_GT(LVar0, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 36) EVT_ADD(LVar1, 18) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_LOOP(5) - EVT_CALL(PlayEffect, 0x28, 1, LVar0, LVar1, LVar2, 1, 225, 10, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SWEAT, 1, LVar0, LVar1, LVar2, 1, 225, 10, 0) EVT_WAIT(5) EVT_END_LOOP EVT_WAIT(30) @@ -519,7 +519,7 @@ EvtScript N(takeTurn_80228A7C) = { EVT_ADD(LVar1, 18) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_LOOP(5) - EVT_CALL(PlayEffect, 0x28, 1, LVar0, LVar1, LVar2, 1, 225, 10, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SWEAT, 1, LVar0, LVar1, LVar2, 1, 225, 10, 0) EVT_WAIT(5) EVT_END_LOOP EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) @@ -532,9 +532,9 @@ EvtScript N(takeTurn_80228A7C) = { EVT_WAIT(3) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x80000) - EVT_CALL(SetActorRotationOffset, -127, 0, 27, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 27, 0) EVT_ELSE - EVT_CALL(SetActorRotationOffset, -127, 0, 10, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 10, 0) EVT_END_IF EVT_SET(LVar0, 0) EVT_LOOP(5) @@ -550,23 +550,23 @@ EvtScript N(takeTurn_80228A7C) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, 0x80000) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_END_IF EVT_WAIT(3) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim0C) EVT_WAIT(10) - EVT_CALL(SetDefenseTable, -127, 1, EVT_PTR(N(defenseTable_802279DC))) - EVT_CALL(SetEnemyTargetOffset, -127, 1, 0, 60) - EVT_CALL(SetPartFlagBits, -127, 3, 131072, 1) - EVT_CALL(SetPartFlagBits, -127, 3, 8388608, 0) - EVT_CALL(SetPartFlags, ACTOR_SELF, 2, 131076) - EVT_CALL(SetPartFlags, ACTOR_SELF, 1, 8388612) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_802279DC))) + EVT_CALL(SetEnemyTargetOffset, ACTOR_SELF, 1, 0, 60) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 0x00020000, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 0x00800000, FALSE) + EVT_CALL(SetPartFlags, ACTOR_SELF, 2, 0x00020004) + EVT_CALL(SetPartFlags, ACTOR_SELF, 1, 0x00800004) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80227968))) EVT_CALL(N(UnkBattleFunc1), -26, 38, 2, 63) - EVT_CALL(SetActorVar, -127, 0, 0) - EVT_CALL(SetActorVar, -127, 1, 4653084) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0x0047001C) EVT_END_IF EVT_END_IF EVT_CALL(RandInt, 100, LVar0) @@ -599,13 +599,13 @@ EvtScript N(shellToss_KentC) = { EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 4) - EVT_CALL(PlayEffect, 0x1D, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(3) - EVT_CALL(PlayEffect, 0x1D, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(2) - EVT_CALL(PlayEffect, 0x1D, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD - EVT_CALL(SetActorSounds, -127, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_370) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim0A) EVT_WAIT(10) @@ -630,7 +630,7 @@ EvtScript N(shellToss_KentC) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(StopSound, 880) + EVT_CALL(StopSound, SOUND_370) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim0C) EVT_WAIT(8) EVT_CALL(YieldTurn) @@ -640,7 +640,7 @@ EvtScript N(shellToss_KentC) = { EVT_RETURN EVT_CASE_DEFAULT EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) - EVT_IF_NOT_FLAG(LVar0, 0x435D000) + EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_TRANSPARENT | STATUS_FLAGS_IMMOBILIZED) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002B) EVT_END_IF @@ -653,7 +653,7 @@ EvtScript N(shellToss_KentC) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) - EVT_IF_NOT_FLAG(LVar3, 0x80000) + EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_ADD(LVar0, 32) EVT_ELSE EVT_ADD(LVar0, 12) @@ -676,7 +676,7 @@ EvtScript N(shellToss_KentC) = { EVT_CALL(MoveBattleCamOver, 50) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) - EVT_IF_NOT_FLAG(LVar0, 0x435D000) + EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_TRANSPARENT | STATUS_FLAGS_IMMOBILIZED) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002B) EVT_END_IF EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -731,7 +731,7 @@ EvtScript N(shellToss_KentC) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(StopSound, 880) + EVT_CALL(StopSound, SOUND_370) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim0C) EVT_WAIT(8) EVT_CALL(YieldTurn) @@ -757,7 +757,7 @@ EvtScript N(shellToss_KentC) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, 0x80000) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_ADD(LVar0, 16) @@ -767,7 +767,7 @@ EvtScript N(shellToss_KentC) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, 0x80000) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_ADD(LVar0, 10) @@ -777,11 +777,11 @@ EvtScript N(shellToss_KentC) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, 0x80000) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(StopSound, 880) + EVT_CALL(StopSound, SOUND_370) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim0C) EVT_WAIT(8) EVT_CALL(YieldTurn) @@ -841,7 +841,7 @@ EvtScript N(tackle_KentC) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, 0x80000) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_SUB(LVar0, 15) @@ -853,7 +853,7 @@ EvtScript N(tackle_KentC) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, 0x80000) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim01) @@ -865,7 +865,7 @@ EvtScript N(tackle_KentC) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, 0x80000) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_WAIT(8) @@ -883,8 +883,8 @@ EvtScript N(tackle_KentC) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim04) - EVT_CALL(SetPartYaw, -127, 1, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(SetPartYaw, ACTOR_SELF, 1, 180) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim01) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) @@ -929,7 +929,7 @@ EvtScript N(tackle_KentC) = { EVT_IF_NOT_FLAG(LVar0, 0x100000) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarE) EVT_IF_NOT_FLAG(LVarE, 0x80000) - EVT_CALL(LandJump, -127) + EVT_CALL(LandJump, ACTOR_SELF) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EC) EVT_END_IF EVT_END_IF @@ -939,7 +939,7 @@ EvtScript N(tackle_KentC) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, 0x80000) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_THREAD @@ -957,7 +957,7 @@ EvtScript N(tackle_KentC) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, 0x80000) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim01) @@ -969,7 +969,7 @@ EvtScript N(tackle_KentC) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, 0x80000) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_WAIT(8) @@ -997,20 +997,20 @@ EvtScript N(8022AD84) = { }; EvtScript N(flipOver_KentC) = { - EVT_CALL(SetEnemyTargetOffset, -127, 1, 0, 40) - EVT_CALL(SetDefenseTable, -127, 1, EVT_PTR(N(defenseTable_802279F0))) + EVT_CALL(SetEnemyTargetOffset, ACTOR_SELF, 1, 0, 40) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_802279F0))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802279B4))) EVT_CALL(N(UnkBattleFunc1), -24, 47, 23, 37) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim1C) - EVT_CALL(SetActorVar, -127, 0, 1) - EVT_CALL(SetActorVar, -127, 1, 4653074) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0x00470012) EVT_THREAD EVT_WAIT(4) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, 0x80000) - EVT_CALL(SetActorRotationOffset, -127, 0, 35, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 35, 0) EVT_ELSE - EVT_CALL(SetActorRotationOffset, -127, 0, 14, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 14, 0) EVT_END_IF EVT_SET(LVar0, 0) EVT_LOOP(5) @@ -1028,23 +1028,23 @@ EvtScript N(flipOver_KentC) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, 0x80000) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) EVT_END_IF EVT_END_THREAD EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim1D) EVT_WAIT(1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim1E) - EVT_CALL(SetPartFlagBits, -127, 3, 131072, 0) - EVT_CALL(SetPartFlagBits, -127, 3, 8388608, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 0x00020000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 0x00800000, TRUE) EVT_CALL(SetPartFlags, ACTOR_SELF, 2, 4) - EVT_CALL(SetPartFlags, ACTOR_SELF, 1, 131076) - EVT_CALL(SetActorVar, -127, 2, 1) + EVT_CALL(SetPartFlags, ACTOR_SELF, 1, 0x00020004) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_WAIT(8) EVT_RETURN EVT_END @@ -1093,8 +1093,8 @@ EvtScript N(8022B2E8) = { EVT_IF_FLAG(LVar3, 0x80000) EVT_RETURN EVT_END_IF - EVT_CALL(GetActorVar, -127, 3, LVar3) - EVT_CALL(GetLastDamage, -127, LVar4) + EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar3) + EVT_CALL(GetLastDamage, ACTOR_SELF, LVar4) EVT_IF_GT(LVar4, LVar3) EVT_SET(LVar4, LVar3) EVT_END_IF @@ -1104,7 +1104,7 @@ EvtScript N(8022B2E8) = { EVT_IF_GT(LVar4, 0) EVT_THREAD EVT_SUB(LVar3, LVar4) - EVT_CALL(SetActorVar, -127, 3, LVar3) + EVT_CALL(SetActorVar, ACTOR_SELF, 3, LVar3) EVT_SET(LVar5, 4) EVT_LOOP(LVar4) EVT_EXEC(N(8022B444)) @@ -1149,22 +1149,22 @@ API_CALLABLE(func_80218DF8_48DF98) { EvtScript N(8022B444) = { - EVT_CALL(PlaySoundAtPart, -127, LVar5, 530) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar5, SOUND_212) EVT_CALL(GetActorPos, ACTOR_SELF, LVar6, LVar7, LVar8) EVT_CALL(SetPartPos, ACTOR_SELF, LVar5, LVar6, 35, LVar8) EVT_CALL(func_80218C74_48DE14, LVar6, LVar8, LVar0, LVar1, LVar2, LVar3) - EVT_CALL(SetPartFlagBits, -127, LVar5, 1, 0) - EVT_CALL(SetPartJumpGravity, -127, LVar5, EVT_FLOAT(1.0)) - EVT_CALL(JumpPartTo, -127, LVar5, LVar0, 0, LVar1, 18, 1) - EVT_CALL(JumpPartTo, -127, LVar5, LVar2, 0, LVar3, 9, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar5, 1, FALSE) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar5, EVT_FLOAT(1.0)) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar5, LVar0, 0, LVar1, 18, TRUE) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar5, LVar2, 0, LVar3, 9, TRUE) EVT_WAIT(10) EVT_LOOP(10) - EVT_CALL(SetPartFlagBits, -127, LVar5, 1, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar5, 1, FALSE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, -127, LVar5, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar5, 1, TRUE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtPart, -127, LVar5, 529) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar5, SOUND_211) EVT_CALL(AddCoin, 1) EVT_RETURN EVT_END diff --git a/src/battle/area/nok/stage/nok_01.c b/src/battle/area/nok/stage/nok_01.c index 1b1f691aef..654305b72b 100644 --- a/src/battle/area/nok/stage/nok_01.c +++ b/src/battle/area/nok/stage/nok_01.c @@ -3,58 +3,4 @@ #define NAMESPACE b_area_nok_nok_01 -EvtScript N(8022B5F0) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(TranslateModel, LVarA, 0, 2, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 2, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(beforeBattle_8022B6F8) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SET(LVar0, 19) - EVT_EXEC(N(8022B5F0)) - EVT_SET(LVar0, 20) - EVT_EXEC(N(8022B5F0)) - EVT_SET(LVar0, 21) - EVT_EXEC(N(8022B5F0)) - EVT_SET(LVar0, 22) - EVT_EXEC(N(8022B5F0)) - EVT_SET(LVar0, 23) - EVT_EXEC(N(8022B5F0)) - EVT_SET(LVar0, 24) - EVT_EXEC(N(8022B5F0)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_8022B7C0) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_8022B7D0)[] = { - 0x0000001E, 0x0000001D, 0x0000001C, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "nok_tex", - .shape = "nok_bt01_shape", - .hit = "nok_bt01_hit", - .bg = "nok_bg", - .preBattle = &N(beforeBattle_8022B6F8), - .postBattle = &N(afterBattle_8022B7C0), - .foregroundModelList = N(foregroundModelList_8022B7D0), -}; +#include "battle/common/stage/nok_01.inc.c" diff --git a/src/battle/area/nok/stage/nok_02.c b/src/battle/area/nok/stage/nok_02.c index 28fcbca678..6c58b2c6b6 100644 --- a/src/battle/area/nok/stage/nok_02.c +++ b/src/battle/area/nok/stage/nok_02.c @@ -1,71 +1,75 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/nok_bt02_shape.h" #define NAMESPACE b_area_nok_nok_02 -EvtScript N(8022B810) = { +EvtScript N(EVS_AnimateFlower) = { EVT_SET(LVarA, LVar0) EVT_LABEL(0) - EVT_CALL(TranslateModel, LVarA, 0, 2, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 2, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) + EVT_CALL(TranslateModel, LVarA, 0, 2, 0) + EVT_WAIT(5) + EVT_CALL(TranslateModel, LVarA, 0, 0, 0) + EVT_WAIT(5) + EVT_CALL(TranslateModel, LVarA, 0, 2, 0) + EVT_WAIT(5) + EVT_CALL(TranslateModel, LVarA, 0, 0, 0) + EVT_WAIT(5) + EVT_CALL(RandInt, 30, LVar0) + EVT_ADD(LVar0, 30) + EVT_WAIT(LVar0) + EVT_GOTO(0) EVT_RETURN EVT_END }; -EvtScript N(beforeBattle_8022B918) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_THREAD - EVT_SET(LVar0, 19) - EVT_EXEC(N(8022B810)) + EVT_SET(LVar0, MODEL_h1) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) - EVT_SET(LVar0, 20) - EVT_EXEC(N(8022B810)) + EVT_SET(LVar0, MODEL_h3) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) - EVT_SET(LVar0, 21) - EVT_EXEC(N(8022B810)) + EVT_SET(LVar0, MODEL_h4) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) - EVT_SET(LVar0, 22) - EVT_EXEC(N(8022B810)) + EVT_SET(LVar0, MODEL_h5) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) - EVT_SET(LVar0, 23) - EVT_EXEC(N(8022B810)) + EVT_SET(LVar0, MODEL_h6) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) - EVT_SET(LVar0, 24) - EVT_EXEC(N(8022B810)) + EVT_SET(LVar0, MODEL_h7) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) - EVT_SET(LVar0, 25) - EVT_EXEC(N(8022B810)) + EVT_SET(LVar0, MODEL_h9) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) - EVT_SET(LVar0, 26) - EVT_EXEC(N(8022B810)) + EVT_SET(LVar0, MODEL_h10) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) - EVT_SET(LVar0, 27) - EVT_EXEC(N(8022B810)) + EVT_SET(LVar0, MODEL_h11) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_WAIT(5) - EVT_SET(LVar0, 28) - EVT_EXEC(N(8022B810)) + EVT_SET(LVar0, MODEL_h12) + EVT_EXEC(N(EVS_AnimateFlower)) EVT_END_THREAD EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8022BACC) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_8022BADC)[] = { - 0x0000001F, 0x00000020, 0x0000001E, 0x00000000, +s32 N(ForegroundModels)[] = { + MODEL_ha3, + MODEL_hap, + MODEL_kusa3, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -73,7 +77,7 @@ Stage NAMESPACE = { .shape = "nok_bt02_shape", .hit = "nok_bt02_hit", .bg = "nok_bg", - .preBattle = &N(beforeBattle_8022B918), - .postBattle = &N(afterBattle_8022BACC), - .foregroundModelList = N(foregroundModelList_8022BADC), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/nok/stage/nok_03.c b/src/battle/area/nok/stage/nok_03.c index 5e87d52e23..d1067ab43f 100644 --- a/src/battle/area/nok/stage/nok_03.c +++ b/src/battle/area/nok/stage/nok_03.c @@ -1,21 +1,24 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/nok_bt03_shape.h" #define NAMESPACE b_area_nok_nok_03 -EvtScript N(beforeBattle_8022BB20) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8022BB40) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_8022BB50)[] = { - 0x0000000E, 0x0000000F, 0x00000000, +s32 N(ForegroundModels)[] = { + MODEL_ha3, + MODEL_hap, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -23,7 +26,7 @@ Stage NAMESPACE = { .shape = "nok_bt03_shape", .hit = "nok_bt03_hit", .bg = "nok_bg", - .preBattle = &N(beforeBattle_8022BB20), - .postBattle = &N(afterBattle_8022BB40), - .foregroundModelList = N(foregroundModelList_8022BB50), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/nok/stage/nok_04.c b/src/battle/area/nok/stage/nok_04.c index c40ace80db..1143e20409 100644 --- a/src/battle/area/nok/stage/nok_04.c +++ b/src/battle/area/nok/stage/nok_04.c @@ -1,21 +1,27 @@ #include "common.h" #include "battle/battle.h" +#include "mapfs/nok_bt04_shape.h" #define NAMESPACE b_area_nok_nok_04 -EvtScript N(beforeBattle_8022BB90) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8022BBB0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_8022BBC0)[] = { - 0x0000001B, 0x0000001A, 0x0000001D, 0x0000001C, 0x00000019, 0x00000000, +s32 N(ForegroundModels)[] = { + MODEL_ueki2, + MODEL_ueki1, + MODEL_kabu2, + MODEL_kabu1, + MODEL_kusa3, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -23,7 +29,7 @@ Stage NAMESPACE = { .shape = "nok_bt04_shape", .hit = "nok_bt04_hit", .bg = "nok_bg", - .preBattle = &N(beforeBattle_8022BB90), - .postBattle = &N(afterBattle_8022BBB0), - .foregroundModelList = N(foregroundModelList_8022BBC0), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/omo/actor/anti_guy.c b/src/battle/area/omo/actor/anti_guy.c index 9f31d9879a..d0a94edf27 100644 --- a/src/battle/area/omo/actor/anti_guy.c +++ b/src/battle/area/omo/actor/anti_guy.c @@ -67,7 +67,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 50, .partCount = ARRAY_COUNT(N(partsTable_802219C8)), .partsData = N(partsTable_802219C8), - .takeTurnScript = &N(init_80221A60), + .initScript = &N(init_80221A60), .statusTable = N(statusTable_8022191C), .escapeChance = 50, .airLiftChance = 0, diff --git a/src/battle/area/omo/actor/blue_shy_guy.c b/src/battle/area/omo/actor/blue_shy_guy.c index 248b434dd4..5d9e17c66f 100644 --- a/src/battle/area/omo/actor/blue_shy_guy.c +++ b/src/battle/area/omo/actor/blue_shy_guy.c @@ -68,7 +68,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(partsTable_8021ADD0)), .partsData = N(partsTable_8021ADD0), - .takeTurnScript = &N(init_8021AE68), + .initScript = &N(init_8021AE68), .statusTable = N(statusTable_8021AD24), .escapeChance = 60, .airLiftChance = 85, diff --git a/src/battle/area/omo/actor/green_shy_guy.c b/src/battle/area/omo/actor/green_shy_guy.c index dae1dae2ab..00def550e1 100644 --- a/src/battle/area/omo/actor/green_shy_guy.c +++ b/src/battle/area/omo/actor/green_shy_guy.c @@ -68,7 +68,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(partsTable_8021FED0)), .partsData = N(partsTable_8021FED0), - .takeTurnScript = &N(init_8021FF68), + .initScript = &N(init_8021FF68), .statusTable = N(statusTable_8021FE24), .escapeChance = 60, .airLiftChance = 85, diff --git a/src/battle/area/omo/actor/groove_guy.c b/src/battle/area/omo/actor/groove_guy.c index 264980a46a..e99013f8f3 100644 --- a/src/battle/area/omo/actor/groove_guy.c +++ b/src/battle/area/omo/actor/groove_guy.c @@ -93,7 +93,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(partsTable_80224AEC)), .partsData = N(partsTable_80224AEC), - .takeTurnScript = &N(init_80224B38), + .initScript = &N(init_80224B38), .statusTable = N(statusTable_80224A40), .escapeChance = 50, .airLiftChance = 85, diff --git a/src/battle/area/omo/actor/pink_shy_guy.c b/src/battle/area/omo/actor/pink_shy_guy.c index ea0d7d9045..1464e79b8e 100644 --- a/src/battle/area/omo/actor/pink_shy_guy.c +++ b/src/battle/area/omo/actor/pink_shy_guy.c @@ -68,7 +68,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(partsTable_8021E3D0)), .partsData = N(partsTable_8021E3D0), - .takeTurnScript = &N(init_8021E468), + .initScript = &N(init_8021E468), .statusTable = N(statusTable_8021E324), .escapeChance = 60, .airLiftChance = 85, diff --git a/src/battle/area/omo/actor/pyro_guy.c b/src/battle/area/omo/actor/pyro_guy.c index dad78c884a..52266a3fcf 100644 --- a/src/battle/area/omo/actor/pyro_guy.c +++ b/src/battle/area/omo/actor/pyro_guy.c @@ -86,7 +86,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(partsTable_8022CC34)), .partsData = N(partsTable_8022CC34), - .takeTurnScript = &N(init_8022CC80), + .initScript = &N(init_8022CC80), .statusTable = N(statusTable_8022CB88), .escapeChance = 60, .airLiftChance = 85, diff --git a/src/battle/area/omo/actor/sky_guy.c b/src/battle/area/omo/actor/sky_guy.c index 03839a1b97..7e39db2226 100644 --- a/src/battle/area/omo/actor/sky_guy.c +++ b/src/battle/area/omo/actor/sky_guy.c @@ -227,7 +227,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(partsTable_8022977C)), .partsData = N(partsTable_8022977C), - .takeTurnScript = &N(init_8022987C), + .initScript = &N(init_8022987C), .statusTable = N(statusTable_80229624), .escapeChance = 50, .airLiftChance = 90, diff --git a/src/battle/area/omo/actor/spy_guy.c b/src/battle/area/omo/actor/spy_guy.c index 3e7ffcfb4a..dbe51d5384 100644 --- a/src/battle/area/omo/actor/spy_guy.c +++ b/src/battle/area/omo/actor/spy_guy.c @@ -112,7 +112,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(partsTable_80227564)), .partsData = N(partsTable_80227564), - .takeTurnScript = &N(init_802275D4), + .initScript = &N(init_802275D4), .statusTable = N(statusTable_802274B8), .escapeChance = 50, .airLiftChance = 85, diff --git a/src/battle/area/omo/actor/yellow_shy_guy.c b/src/battle/area/omo/actor/yellow_shy_guy.c index 08e95d7fd7..1057ec3dae 100644 --- a/src/battle/area/omo/actor/yellow_shy_guy.c +++ b/src/battle/area/omo/actor/yellow_shy_guy.c @@ -68,7 +68,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(partsTable_8021C8D0)), .partsData = N(partsTable_8021C8D0), - .takeTurnScript = &N(init_8021C968), + .initScript = &N(init_8021C968), .statusTable = N(statusTable_8021C824), .escapeChance = 60, .airLiftChance = 85, diff --git a/src/battle/area/omo/stage/omo_01.c b/src/battle/area/omo/stage/omo_01.c index f7604cd5e3..96c3e9bd55 100644 --- a/src/battle/area/omo/stage/omo_01.c +++ b/src/battle/area/omo/stage/omo_01.c @@ -67,9 +67,9 @@ EvtScript N(updateModels) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_THREAD EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_SETF(LVar1, EVT_FLOAT(0.0)) @@ -88,7 +88,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -98,6 +98,6 @@ Stage NAMESPACE = { .shape = "omo_bt01_shape", .hit = "omo_bt01_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/omo/stage/omo_02.c b/src/battle/area/omo/stage/omo_02.c index e7170c0a3b..3984d5a52f 100644 --- a/src/battle/area/omo/stage/omo_02.c +++ b/src/battle/area/omo/stage/omo_02.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_omo_omo_02 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -20,6 +20,6 @@ Stage NAMESPACE = { .shape = "omo_bt02_shape", .hit = "omo_bt02_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/omo/stage/omo_03.c b/src/battle/area/omo/stage/omo_03.c index e65f939732..466839fee7 100644 --- a/src/battle/area/omo/stage/omo_03.c +++ b/src/battle/area/omo/stage/omo_03.c @@ -3,15 +3,15 @@ #define NAMESPACE b_area_omo_omo_03 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 18, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 18, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -21,6 +21,6 @@ Stage NAMESPACE = { .shape = "omo_bt03_shape", .hit = "omo_bt03_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/omo/stage/omo_03b.c b/src/battle/area/omo/stage/omo_03b.c index c070fe1c98..09c58a30ca 100644 --- a/src/battle/area/omo/stage/omo_03b.c +++ b/src/battle/area/omo/stage/omo_03b.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_omo_omo_03b -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -20,6 +20,6 @@ Stage NAMESPACE = { .shape = "omo_bt03_shape", .hit = "omo_bt03_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/omo/stage/omo_04.c b/src/battle/area/omo/stage/omo_04.c index fce20fc738..ad7fd46d30 100644 --- a/src/battle/area/omo/stage/omo_04.c +++ b/src/battle/area/omo/stage/omo_04.c @@ -9,9 +9,9 @@ extern Formation N(fromation_slot_machine); extern ActorBlueprint N(slot_machine_stop); extern ActorBlueprint N(slot_machine_start); -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_CALL(SetTexPanner, 29, TEX_PANNER_A) EVT_THREAD EVT_SET(LVarE, 0) @@ -25,13 +25,16 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_itigo, MODEL_kisya, MODEL_kusari, 0, +s32 N(ForegroundModels)[] = { + MODEL_itigo, + MODEL_kisya, + MODEL_kusari, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -39,9 +42,9 @@ Stage NAMESPACE = { .shape = "omo_bt04_shape", .hit = "omo_bt04_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), .stageEnemyCount = 4, .stageFormation = &N(fromation_slot_machine), }; diff --git a/src/battle/area/omo/stage/omo_05.c b/src/battle/area/omo/stage/omo_05.c index 1d9dd28bea..a5c4daf47f 100644 --- a/src/battle/area/omo/stage/omo_05.c +++ b/src/battle/area/omo/stage/omo_05.c @@ -4,22 +4,24 @@ #define NAMESPACE b_area_omo_omo_05 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 24, 0) - EVT_CALL(SetGroupEnabled, 28, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 24, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 28, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_itigo, MODEL_kisya, 0, +s32 N(ForegroundModels)[] = { + MODEL_itigo, + MODEL_kisya, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -27,7 +29,7 @@ Stage NAMESPACE = { .shape = "omo_bt05_shape", .hit = "omo_bt05_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/omo/stage/omo_05b.c b/src/battle/area/omo/stage/omo_05b.c index ab506182ef..14ea521017 100644 --- a/src/battle/area/omo/stage/omo_05b.c +++ b/src/battle/area/omo/stage/omo_05b.c @@ -4,22 +4,23 @@ #define NAMESPACE b_area_omo_omo_05b -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 35, 0) - EVT_CALL(SetGroupEnabled, 45, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 35, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 45, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_mae2, 0, +s32 N(ForegroundModels)[] = { + MODEL_mae2, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -27,7 +28,7 @@ Stage NAMESPACE = { .shape = "omo_bt05_shape", .hit = "omo_bt05_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/omo/stage/omo_06.c b/src/battle/area/omo/stage/omo_06.c index 534b75917d..7af5edb72c 100644 --- a/src/battle/area/omo/stage/omo_06.c +++ b/src/battle/area/omo/stage/omo_06.c @@ -9,7 +9,7 @@ EvtScript N(updateModels) = { EVT_SET(LVar9, LVar1) EVT_SET(LVar8, LVar2) EVT_LABEL(0) - EVT_CALL(MakeLerp, 0, LVar9, LVar8, 10) + EVT_CALL(MakeLerp, 0, LVar9, LVar8, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, 0, LVar0, 0) @@ -18,7 +18,7 @@ EvtScript N(updateModels) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(MakeLerp, LVar9, 0, LVar8, 10) + EVT_CALL(MakeLerp, LVar9, 0, LVar8, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, 0, LVar0, 0) @@ -32,9 +32,9 @@ EvtScript N(updateModels) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_THREAD EVT_SET(LVar0, 26) EVT_SET(LVar1, -50) @@ -50,13 +50,15 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_kuruma, MODEL_hosi, 0, +s32 N(ForegroundModels)[] = { + MODEL_kuruma, + MODEL_hosi, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -64,7 +66,7 @@ Stage NAMESPACE = { .shape = "omo_bt06_shape", .hit = "omo_bt06_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/omo/stage/omo_07.c b/src/battle/area/omo/stage/omo_07.c index 6217fc5ee1..e99e108e25 100644 --- a/src/battle/area/omo/stage/omo_07.c +++ b/src/battle/area/omo/stage/omo_07.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_omo_omo_07 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -19,6 +19,6 @@ Stage NAMESPACE = { .texture = "omo_tex", .shape = "omo_bt07_shape", .hit = "omo_bt07_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/omo2/actor/general_guy.c b/src/battle/area/omo2/actor/general_guy.c index b61029ca00..e31b42a190 100644 --- a/src/battle/area/omo2/actor/general_guy.c +++ b/src/battle/area/omo2/actor/general_guy.c @@ -90,7 +90,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 10, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -305,7 +305,7 @@ EvtScript N(attack_throw_bomb) = { EVT_WAIT(5) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206A) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim0B) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_open_hatch)) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GeneralGuy_Anim0B) @@ -315,17 +315,17 @@ EvtScript N(attack_throw_bomb) = { EVT_SUB(LVar2, 4) EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_GeneralGuyBomb_Anim00) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_GeneralGuy_Anim0A) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(6) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 8) EVT_ADD(LVar1, 20) EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_GeneralGuyBomb_Anim01) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) EVT_CASE_EQ(HIT_RESULT_MISS) @@ -336,10 +336,10 @@ EvtScript N(attack_throw_bomb) = { EVT_SUB(LVar0, 120) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(12.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.1)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206B) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -354,7 +354,7 @@ EvtScript N(attack_throw_bomb) = { EVT_SET(LVar1, -5) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(14.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.1)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 30, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 30, EASING_LINEAR) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -362,10 +362,10 @@ EvtScript N(attack_throw_bomb) = { EVT_SET(LVar1, -5) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(6.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(0.1)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 15, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 15, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206B) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -376,11 +376,11 @@ EvtScript N(attack_throw_bomb) = { 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.1)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 15, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 15, EASING_LINEAR) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 2, SOUND_BOMB_BLAST) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) @@ -392,7 +392,7 @@ EvtScript N(attack_throw_bomb) = { EVT_WAIT(30) EVT_IF_EQ(LVarF, HIT_RESULT_10) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206B) EVT_RETURN @@ -400,7 +400,7 @@ EvtScript N(attack_throw_bomb) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206B) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -423,7 +423,7 @@ EvtScript N(attack_lightning_shot) = { EVT_WAIT(40) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206A) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim0B) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_open_hatch)) EVT_WAIT(10) EVT_CALL(GetActorVar, ACTOR_ENEMY1, 7, LVar0) @@ -447,7 +447,7 @@ EvtScript N(attack_lightning_shot) = { EVT_WAIT(LVar0) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 40, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 40, 0) EVT_WAIT(40) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) @@ -457,7 +457,7 @@ EvtScript N(attack_lightning_shot) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, 0, LVar5) EVT_CALL(PlaySound, SOUND_2069) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_WAIT(12) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) @@ -466,7 +466,7 @@ EvtScript N(attack_lightning_shot) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_CALL(PlaySound, SOUND_2069) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 6, 0) EVT_WAIT(12) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -481,7 +481,7 @@ EvtScript N(attack_lightning_shot) = { EVT_END_IF EVT_CALL(N(UnfadeBackgroundToBlack)) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206B) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -493,7 +493,7 @@ EvtScript N(attack_lightning_shot) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, 0, LVar5) EVT_CALL(PlaySound, SOUND_2069) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_WAIT(12) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) @@ -501,7 +501,7 @@ EvtScript N(attack_lightning_shot) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, 0, LVar5) EVT_CALL(PlaySound, SOUND_2069) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 6, 0) EVT_WAIT(12) EVT_CALL(GetActorVar, ACTOR_ENEMY1, 7, LVar0) @@ -510,7 +510,7 @@ EvtScript N(attack_lightning_shot) = { EVT_END_IF EVT_CALL(N(UnfadeBackgroundToBlack)) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206B) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -522,7 +522,7 @@ EvtScript N(attack_lightning_shot) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_CALL(PlaySound, SOUND_2069) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_WAIT(12) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) @@ -535,7 +535,7 @@ EvtScript N(attack_lightning_shot) = { EVT_CALL(SetActorVar, ACTOR_ENEMY1, 6, 0) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206B) EVT_RETURN @@ -546,8 +546,8 @@ EvtScript N(attack_lightning_shot) = { EVT_CALL(GetModelCenter, 39) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) - EVT_CALL(PlaySound,SOUND_2069) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0, 0, 0, 0) + EVT_CALL(PlaySound, SOUND_2069) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 6, 0) EVT_WAIT(12) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -558,7 +558,7 @@ EvtScript N(attack_lightning_shot) = { EVT_END_IF EVT_CALL(N(UnfadeBackgroundToBlack)) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206B) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/area/omo2/actor/light_bulb.c b/src/battle/area/omo2/actor/light_bulb.c index ba86ee9ecd..a4045cbfbc 100644 --- a/src/battle/area/omo2/actor/light_bulb.c +++ b/src/battle/area/omo2/actor/light_bulb.c @@ -82,7 +82,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -381,8 +381,8 @@ API_CALLABLE(func_80218250_52B8F0) { EvtScript N(onDeath) = { EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, SOUND_3AE) EVT_CALL(func_80218250_52B8F0) - EVT_CALL(EnableModel, 39, 0) - EVT_CALL(EnableModel, 41, 0) + EVT_CALL(EnableModel, 39, FALSE) + EVT_CALL(EnableModel, 41, FALSE) EVT_CALL(GetActorVar, ACTOR_ENEMY1, 5, LVar0) EVT_IF_NE(LVar0, 0) EVT_CALL(RemoveEffect, LVar0) diff --git a/src/battle/area/omo2/actor/toy_tank.c b/src/battle/area/omo2/actor/toy_tank.c index 966feb7c57..2ca841d170 100644 --- a/src/battle/area/omo2/actor/toy_tank.c +++ b/src/battle/area/omo2/actor/toy_tank.c @@ -142,7 +142,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 30, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -176,11 +176,11 @@ EvtScript N(init) = { EVT_CALL(SetPartPos, ACTOR_SELF, 3, 80, 0, 0) EVT_CALL(LoadAnimatedModel, 0, EVT_PTR(toy_tank_model)) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_idle)) - EVT_CALL(EnableModel, 62, 0) + EVT_CALL(EnableModel, 62, FALSE) EVT_CALL(SetAnimatedModelRootPosition, 0, 200, 0, 0) - EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 3, 1, 1) + EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 3, 1, TRUE) EVT_CALL(GetModelCenter, 39) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), LVar5, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), LVar5, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 5, LVar5) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) @@ -233,7 +233,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(onHit)) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) EVT_CALL(SetEnemyTargetOffset, ACTOR_SELF, 2, 0, 35) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206B) EVT_CASE_OR_EQ(EVENT_HIT) @@ -241,7 +241,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(onHit)) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) EVT_CALL(SetEnemyTargetOffset, ACTOR_SELF, 2, 0, 35) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206B) EVT_END_CASE_GROUP @@ -249,7 +249,7 @@ EvtScript N(handleEvent) = { EVT_EXEC_WAIT(N(onHit)) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) EVT_CALL(SetEnemyTargetOffset, ACTOR_SELF, 2, 0, 35) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206B) EVT_CASE_EQ(EVENT_ZERO_DAMAGE) @@ -294,7 +294,7 @@ EvtScript N(takeTurn) = { EvtScript N(onHit) = { EVT_CALL(UseIdleAnimation, ACTOR_ENEMY0, FALSE) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim05) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetEnemyTargetOffset, ACTOR_SELF, 2, 0, 50) EVT_EXEC_WAIT(N(shake_tank)) EVT_CALL(GetActorVar, ACTOR_ENEMY0, 1, LVar0) @@ -712,15 +712,15 @@ EvtScript N(start_battle_with_tank) = { EVT_CALL(ActorSpeak, MSG_CH4_0071, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim00, ANIM_GeneralGuy_Anim00) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim05) EVT_CALL(EndActorSpeech, ACTOR_ENEMY0, 1, -1, -1) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_20000000, 0) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY2, 1, ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY1, 2, ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY1, ACTOR_FLAG_40000, 0) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_20000000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY2, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY1, 2, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY1, ACTOR_FLAG_40000, FALSE) EVT_CALL(HPBarToHome, ACTOR_ENEMY1) EVT_CALL(SetActorVar, ACTOR_ENEMY0, 0, 1) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) EVT_CALL(SetEnemyTargetOffset, ACTOR_SELF, 2, 0, 35) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_close_hatch)) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_206B) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -746,7 +746,7 @@ EvtScript N(onDeath) = { EVT_CALL(UseIdleAnimation, ACTOR_ENEMY0, FALSE) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim05) EVT_WAIT(15) - EVT_CALL(PlayEffect, EFFECT_EXPLOSION, 2, 102, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_EXPLOSION, 2, 102, 40, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_ENEMY0) @@ -778,20 +778,20 @@ EvtScript N(onDeath) = { EVT_CALL(SetGoalPos, ACTOR_ENEMY0, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_ENEMY0, 12, FALSE, TRUE, FALSE) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim07) - EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_ENEMY0, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 10) EVT_ADD(LVar1, 30) - EVT_CALL(PlayEffect, EFFECT_STARS_ORBITING, 0, LVar0, LVar1, LVar2, 20, 4, LVarF, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STARS_ORBITING, 0, LVar0, LVar1, LVar2, 20, 4, LVarF, 0) EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY0, SOUND_20E5) - EVT_CALL(DropStarPoints, 512) + EVT_CALL(DropStarPoints, ACTOR_ENEMY0) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(ActorExists, ACTOR_ENEMY2, LVar0) EVT_IF_NE(LVar0, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY2, ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY2, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_END_IF - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY0, ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY0, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN EVT_END diff --git a/src/battle/area/omo2/stage/omo_07.c b/src/battle/area/omo2/stage/omo_07.c index ed9454afdd..6a3cabf30e 100644 --- a/src/battle/area/omo2/stage/omo_07.c +++ b/src/battle/area/omo2/stage/omo_07.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_omo2_omo_07 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -19,6 +19,6 @@ Stage NAMESPACE = { .texture = "omo_tex", .shape = "omo_bt07_shape", .hit = "omo_bt07_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/omo2_1/actor/shy_squad.c b/src/battle/area/omo2_1/actor/shy_squad.c index a9a89a0b47..82f675c8d4 100644 --- a/src/battle/area/omo2_1/actor/shy_squad.c +++ b/src/battle/area/omo2_1/actor/shy_squad.c @@ -279,7 +279,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 15, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -949,14 +949,14 @@ EvtScript N(onHit) = { EVT_ADD(LVar0, LVar1) EVT_IF_NE(LVar0, 16) EVT_THREAD - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_20000000, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_20000000, TRUE) EVT_CALL(GetPartOffset, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3) EVT_CALL(GetPartMovementVar, ACTOR_SELF, LVar0, 2, LVar7) EVT_CALL(GetPartMovementVar, ACTOR_SELF, LVar0, 3, LVar8) EVT_ADD(LVar1, LVar7) EVT_ADD(LVar3, LVar8) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar0, EVT_FLOAT(0.5)) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, 0, LVar3, 15, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, 0, LVar3, 15, TRUE) EVT_CALL(func_80269E80, LVar5) EVT_SWITCH(LVar5) EVT_CASE_OR_EQ(10) @@ -978,14 +978,14 @@ EvtScript N(onHit) = { EVT_END_LOOP EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0) EVT_SET(LVar8, 0) EVT_LOOP(12) EVT_CALL(SetPartRotation, ACTOR_SELF, LVar0, LVar8, 0, 0) EVT_ADD(LVar8, 8) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(RemovePartShadow, ACTOR_SELF, LVar0) EVT_END_THREAD EVT_END_IF @@ -1046,7 +1046,7 @@ EvtScript N(kill_guy) = { EVT_ADD(LVar3, 8) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(RemovePartShadow, ACTOR_SELF, LVar0) EVT_RETURN EVT_END @@ -1075,7 +1075,7 @@ EvtScript N(onDeath) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(GetPartOffset, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_SET(LVar3, 0) @@ -1084,7 +1084,7 @@ EvtScript N(onDeath) = { EVT_ADD(LVar3, 8) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(RemovePartShadow, ACTOR_SELF, LVar0) EVT_EXEC_WAIT(N(next_phase)) EVT_CALL(RemoveActor, ACTOR_SELF) @@ -1108,7 +1108,7 @@ EvtScript N(attack) = { EVT_SUB(LVar0, LVar1) EVT_SWITCH(LVar0) EVT_CASE_EQ(1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, SOUND_20BA, SOUND_3B4) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4) EVT_CASE_LT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EB) EVT_CASE_DEFAULT @@ -1165,12 +1165,12 @@ EvtScript N(attack) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(ACTOR_VARS_GUYS_KILLED), LVar0) EVT_IF_LT(LVar0, 14) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 0, 0) EVT_THREAD EVT_LOOP(7) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 0, LVar0, LVar1, LVar2, 0, 0) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, 0, 0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD @@ -1183,8 +1183,8 @@ EvtScript N(attack) = { EVT_SUB(LVar0, LVar1) EVT_SWITCH(LVar0) EVT_CASE_EQ(1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, SOUND_20BA, SOUND_3B4) - 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_CASE_LT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EB) EVT_CASE_DEFAULT @@ -1218,9 +1218,9 @@ EvtScript N(attack) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, 1, LVar0) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar1, LVar2, LVar3) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 0, LVar1, LVar2, LVar3, 0, 0) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, LVar2, LVar3, 0, 0) EVT_WAIT(2) EVT_END_THREAD EVT_CALL(GetPlayerHP, LVar0) @@ -1242,8 +1242,8 @@ EvtScript N(attack) = { EVT_SUB(LVar0, LVar1) EVT_SWITCH(LVar0) EVT_CASE_EQ(1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, SOUND_20BA, SOUND_3B4) - 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_CASE_LT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EB) EVT_CASE_DEFAULT @@ -1308,8 +1308,8 @@ EvtScript N(flee) = { EVT_SUB(LVar0, LVar1) EVT_SWITCH(LVar0) EVT_CASE_EQ(1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, SOUND_20BA, SOUND_3B4) - 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_CASE_LT(4) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHY_GUY_SCREAMS3) EVT_CASE_DEFAULT @@ -1321,7 +1321,7 @@ EvtScript N(flee) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, TRUE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_1E2) - EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(2.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(2.5)) EVT_CALL(GetActorVar, ACTOR_SELF, N(ACTOR_VARS_GUYS_KILLED), LVar0) EVT_IF_LT(LVar0, 14) EVT_CALL(ActorSpeak, MSG_CH4_0067, ACTOR_ENEMY0, 1, -1, -1) @@ -1330,13 +1330,13 @@ EvtScript N(flee) = { EVT_END_IF EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_1E2) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(2.0)) EVT_WAIT(12) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_1E2) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(2.0)) EVT_END_THREAD EVT_CALL(EndActorSpeech, ACTOR_ENEMY0, 1, -1, -1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_WAIT(40) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_173) diff --git a/src/battle/area/omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c index c35717c82d..2aeeb5cd98 100644 --- a/src/battle/area/omo2_2/actor/stilt_guy.c +++ b/src/battle/area/omo2_2/actor/stilt_guy.c @@ -219,7 +219,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -241,7 +241,7 @@ EvtScript N(init) = { EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) - EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 4, 1, 1) + EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 4, 1, TRUE) EVT_CALL(SetPartSize, ACTOR_SELF, 1, 24, 30) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) @@ -285,7 +285,7 @@ EvtScript N(init) = { EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim02) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim0A) EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, 1, SOUND_GENERAL_WHISTLE) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 8, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 8, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(FallPartTo, ACTOR_SELF, 8, LVar0, -9, LVar2, 80) EVT_END_THREAD EVT_THREAD @@ -320,7 +320,7 @@ EvtScript N(init) = { EVT_SUB(LVar2, 13) EVT_CALL(SetPartPos, ACTOR_SELF, 7, LVar0, 200, LVar2) EVT_WAIT(15) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(FallPartTo, ACTOR_SELF, 7, LVar0, -9, LVar2, 80) EVT_END_THREAD EVT_THREAD @@ -355,7 +355,7 @@ EvtScript N(init) = { EVT_SUB(LVar2, 13) EVT_CALL(SetPartPos, ACTOR_SELF, 6, LVar0, 200, LVar2) EVT_WAIT(30) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(FallPartTo, ACTOR_SELF, 6, LVar0, -9, LVar2, 80) EVT_END_THREAD EVT_THREAD @@ -390,13 +390,13 @@ EvtScript N(init) = { EVT_SUB(LVar2, 13) EVT_CALL(SetPartPos, ACTOR_SELF, 5, LVar0, 200, LVar2) EVT_WAIT(45) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, 0) - EVT_CALL(FallPartTo, -127, 5, LVar0, -9, LVar2, 80) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, FALSE) + EVT_CALL(FallPartTo, ACTOR_SELF, 5, LVar0, -9, LVar2, 80) EVT_WAIT(15) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 8, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 8, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(GetPartOffset, ACTOR_SELF, 8, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 13) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, 0, LVar2) @@ -418,11 +418,11 @@ EvtScript N(init) = { EVT_CALL(SetAnimation, ACTOR_SELF, 5, ANIM_StiltGuyUnfold_Anim04) EVT_WAIT(5) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(HPBarToHome, ACTOR_SELF) @@ -689,7 +689,7 @@ EvtScript N(attack) = { EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(return_home)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 2, 0) @@ -785,7 +785,7 @@ EvtScript N(fallOff) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(shy_guy_idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(shy_guy_handleEvent))) 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_CALL(GetActorSize, ACTOR_SELF, LVar0, LVar1) @@ -797,8 +797,8 @@ EvtScript N(fallOff) = { EvtScript N(onDeath) = { EVT_EXEC_WAIT(D_8029AF08) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(GetActorVar, ACTOR_ENEMY1, 2, LVar0) EVT_ADD(LVar0, 1) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 2, LVar0) @@ -830,18 +830,18 @@ EvtScript N(shy_guy_on_spin_smash) = { EVT_EXEC_GET_TID(N(shy_guy_rotate), LVarE) EVT_CALL(GetPartEventFlags, ACTOR_SELF, LVar0, LVarA) EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1) - EVT_CALL(PlayerCreateTargetList, 65540) + EVT_CALL(PlayerCreateTargetList, 0x00010004) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerID, LVar1) EVT_CALL(GetOwnerTarget, LVar0, LVar9) EVT_IF_NE(LVar1, LVar0) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_GOTO(0) EVT_END_IF EVT_LABEL(1) EVT_ADD(LVarF, 1) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_EQ(LVar0, -1) EVT_GOTO(10) EVT_END_IF @@ -857,7 +857,7 @@ EvtScript N(shy_guy_on_spin_smash) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 0, FALSE, TRUE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -1071,9 +1071,9 @@ EvtScript N(shy_guy_attack1) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, SOUND_2EF, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, SOUND_20BA, SOUND_3B4) - 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(SetGoalToTarget, ACTOR_SELF) @@ -1095,7 +1095,7 @@ EvtScript N(shy_guy_attack1) = { 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, 1, 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) @@ -1112,8 +1112,8 @@ EvtScript N(shy_guy_attack1) = { EVT_WAIT(3) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, SOUND_20BA, SOUND_3B4) - 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(SetGoalToTarget, ACTOR_SELF) @@ -1164,8 +1164,8 @@ EvtScript N(shy_guy_attack2) = { 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, SOUND_20BA, SOUND_3B4) - 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(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_SUB(LVar0, 40) @@ -1206,7 +1206,7 @@ EvtScript N(shy_guy_attack2) = { 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, 1, 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) @@ -1281,7 +1281,7 @@ EvtScript N(shy_guy_attack2) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim11) diff --git a/src/battle/area/omo2_3/actor/shy_stack.c b/src/battle/area/omo2_3/actor/shy_stack.c index 15b04dc0f2..70402d68f7 100644 --- a/src/battle/area/omo2_3/actor/shy_stack.c +++ b/src/battle/area/omo2_3/actor/shy_stack.c @@ -242,7 +242,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 10, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -359,9 +359,9 @@ EvtScript N(init) = { EVT_END_THREAD EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 14, ANIM_ShyGuy_Red_Anim0A) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 14, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 14, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 14, EVT_FLOAT(1.0)) - EVT_CALL(SetPartSounds, ACTOR_SELF, 14, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 14, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(FallPartTo, ACTOR_SELF, 14, LVar0, 0, 0, 36) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 14, SOUND_2064) EVT_CALL(SetAnimation, ACTOR_SELF, 14, ANIM_ShyGuy_Red_Anim07) @@ -373,9 +373,9 @@ EvtScript N(init) = { EVT_THREAD EVT_WAIT(31) EVT_CALL(SetAnimation, ACTOR_SELF, 13, ANIM_ShyGuy_Red_Anim0A) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 13, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 13, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 13, EVT_FLOAT(1.0)) - EVT_CALL(SetPartSounds, ACTOR_SELF, 13, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 13, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(FallPartTo, ACTOR_SELF, 13, LVar0, 18, 0, 32) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 13, SOUND_2064) EVT_CALL(SetAnimation, ACTOR_SELF, 13, ANIM_ShyGuy_Red_Anim07) @@ -398,9 +398,9 @@ EvtScript N(init) = { EVT_THREAD EVT_WAIT(62) EVT_CALL(SetAnimation, ACTOR_SELF, 12, ANIM_ShyGuy_Red_Anim0A) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 12, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 12, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 12, EVT_FLOAT(1.0)) - EVT_CALL(SetPartSounds, ACTOR_SELF, 12, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 12, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(FallPartTo, ACTOR_SELF, 12, LVar0, 36, 0, 28) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 12, SOUND_2064) EVT_CALL(SetAnimation, ACTOR_SELF, 12, ANIM_ShyGuy_Red_Anim07) @@ -431,9 +431,9 @@ EvtScript N(init) = { EVT_THREAD EVT_WAIT(93) EVT_CALL(SetAnimation, ACTOR_SELF, 11, ANIM_ShyGuy_Red_Anim0A) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 11, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 11, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 11, EVT_FLOAT(1.0)) - EVT_CALL(SetPartSounds, ACTOR_SELF, 11, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 11, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(FallPartTo, ACTOR_SELF, 11, LVar0, 54, 0, 24) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 11, SOUND_2064) EVT_CALL(SetAnimation, ACTOR_SELF, 11, ANIM_ShyGuy_Red_Anim07) @@ -467,11 +467,11 @@ EvtScript N(init) = { EVT_WAIT(7) EVT_CALL(GetPartOffset, ACTOR_SELF, 14, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 11, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 12, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 13, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 14, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 11, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 12, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 13, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 14, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -483,21 +483,21 @@ EvtScript N(init) = { EVT_CALL(SetPartPos, ACTOR_SELF, 11, 200, 0, 47) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 14, ANIM_ShyGuy_Red_Anim04) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 14, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 14, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 14, EVT_FLOAT(4.0)) - EVT_CALL(RunPartTo, ACTOR_SELF, 14, 55, 0, 47, 0) - EVT_CALL(RunPartTo, ACTOR_SELF, 14, 50, 0, 0, 0) + EVT_CALL(RunPartTo, ACTOR_SELF, 14, 55, 0, 47, FALSE) + EVT_CALL(RunPartTo, ACTOR_SELF, 14, 50, 0, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 14, ANIM_ShyGuy_Red_Anim07) EVT_END_THREAD EVT_THREAD EVT_WAIT(31) EVT_CALL(SetAnimation, ACTOR_SELF, 13, ANIM_ShyGuy_Red_Anim04) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 13, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 13, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 13, EVT_FLOAT(4.0)) EVT_CALL(RunPartTo, ACTOR_SELF, 13, 55, 0, 47, 36) EVT_CALL(SetAnimation, ACTOR_SELF, 13, ANIM_ShyGuy_Red_Anim09) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 13, EVT_FLOAT(1.0)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 13, 50, 18, 0, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 13, 50, 18, 0, 20, TRUE) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 13, SOUND_2064) EVT_CALL(SetAnimation, ACTOR_SELF, 13, ANIM_ShyGuy_Red_Anim07) EVT_CALL(SetPartScale, ACTOR_SELF, 14, EVT_FLOAT(1.1), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) @@ -519,12 +519,12 @@ EvtScript N(init) = { EVT_THREAD EVT_WAIT(62) EVT_CALL(SetAnimation, ACTOR_SELF, 12, ANIM_ShyGuy_Red_Anim04) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 12, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 12, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 12, EVT_FLOAT(4.0)) EVT_CALL(RunPartTo, ACTOR_SELF, 12, 55, 0, 47, 36) EVT_CALL(SetAnimation, ACTOR_SELF, 12, ANIM_ShyGuy_Red_Anim09) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 12, EVT_FLOAT(1.0)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 12, 50, 36, 0, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 12, 50, 36, 0, 20, TRUE) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 12, SOUND_2064) EVT_CALL(SetAnimation, ACTOR_SELF, 12, ANIM_ShyGuy_Red_Anim07) EVT_CALL(SetPartScale, ACTOR_SELF, 14, EVT_FLOAT(1.1), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) @@ -565,13 +565,13 @@ EvtScript N(init) = { EVT_ADD(LVar1, -3) EVT_CALL(SetPartPos, ACTOR_SELF, 11, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim05) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 11, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 11, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_ADD(LVar0, -20) EVT_ADD(LVar1, 18) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 11, EVT_FLOAT(0.6)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 11, LVar0, LVar1, LVar2, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 11, LVar0, LVar1, LVar2, 20, TRUE) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 11, EVT_FLOAT(0.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 11, 50, 54, 0, 30, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 11, 50, 54, 0, 30, TRUE) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 11, SOUND_2064) EVT_CALL(SetAnimation, ACTOR_SELF, 11, ANIM_ShyGuy_Red_Anim07) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim04) @@ -606,11 +606,11 @@ EvtScript N(init) = { EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_GeneralGuy_Anim03) EVT_CALL(GetPartOffset, ACTOR_SELF, 14, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 11, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 12, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 13, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 14, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 11, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 12, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 13, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 14, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -882,18 +882,18 @@ EvtScript N(doSpinSmashHitLastGuy) = { EVT_EXEC_GET_TID(N(rotate), LVarE) EVT_CALL(GetPartEventFlags, ACTOR_SELF, LVar0, LVarA) EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1) - EVT_CALL(PlayerCreateTargetList, 65540) + EVT_CALL(PlayerCreateTargetList, 0x00010004) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerID, LVar1) EVT_CALL(GetOwnerTarget, LVar0, LVar9) EVT_IF_NE(LVar1, LVar0) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_GOTO(0) EVT_END_IF EVT_LABEL(1) EVT_ADD(LVarF, 1) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_EQ(LVar0, -1) EVT_GOTO(10) EVT_END_IF @@ -909,11 +909,11 @@ EvtScript N(doSpinSmashHitLastGuy) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 0, FALSE, TRUE, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_CALL(DispatchDamageEvent, LVar0, 1, 17) + EVT_CALL(DispatchDamageEvent, LVar0, 1, EVENT_SPIN_SMASH_LAUNCH_HIT) EVT_GOTO(1) EVT_LABEL(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -970,10 +970,10 @@ EvtScript N(fall_apart) = { EVT_CALL(SetActorVar, ACTOR_SELF, 5, ANIM_ShyStackGuy_Anim15) EVT_CALL(SetActorVar, ACTOR_SELF, 6, ANIM_ShyStackGuy_Anim1C) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) EVT_CALL(SetActorSize, ACTOR_SELF, 62, EVT_IGNORE_ARG) EVT_CALL(func_8026DA94, ACTOR_SELF, 0, -20, 0, -20) EVT_CALL(SetPartSize, ACTOR_SELF, 1, 57, 30) @@ -986,10 +986,10 @@ EvtScript N(fall_apart) = { EVT_CALL(SetActorVar, ACTOR_SELF, 5, ANIM_ShyStackGuy_Anim16) EVT_CALL(SetActorVar, ACTOR_SELF, 6, ANIM_ShyStackGuy_Anim1D) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations3))) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) EVT_CALL(SetActorSize, ACTOR_SELF, 44, EVT_IGNORE_ARG) EVT_CALL(func_8026DA94, ACTOR_SELF, 0, -40, 0, -40) EVT_CALL(SetPartSize, ACTOR_SELF, 1, 39, 30) @@ -1002,10 +1002,10 @@ EvtScript N(fall_apart) = { EVT_CALL(SetActorVar, ACTOR_SELF, 5, ANIM_ShyStackGuy_Anim17) EVT_CALL(SetActorVar, ACTOR_SELF, 6, ANIM_ShyStackGuy_Anim1E) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations4))) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_MULTI_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) EVT_CALL(SetActorSize, ACTOR_SELF, 26, EVT_IGNORE_ARG) EVT_CALL(func_8026DA94, ACTOR_SELF, 0, -60, 0, -60) EVT_CALL(SetPartSize, ACTOR_SELF, 1, 21, 30) @@ -1069,24 +1069,24 @@ EvtScript N(doSpinSmashHit) = { EVT_CALL(SetAnimation, ACTOR_SELF, 10, ANIM_ShyStackDamage_Anim00) EVT_CALL(SetPartPos, ACTOR_SELF, 10, LVar0, LVar1, LVar2) EVT_CALL(SetPartRotation, ACTOR_SELF, 10, 0, 0, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_EXEC_WAIT(N(fall_apart)) EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1) EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1) EVT_EXEC_WAIT(N(lower_actor_pos)) - EVT_CALL(PlayerCreateTargetList, 98308) + EVT_CALL(PlayerCreateTargetList, 0x00018004) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerID, LVar1) EVT_CALL(GetOwnerTarget, LVar0, LVar9) EVT_IF_NE(LVar1, LVar0) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_GOTO(0) EVT_END_IF EVT_LABEL(1) EVT_ADD(LVarF, 1) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_CALL(func_80231000_54CC70, EVT_PTR("T"), LVar0) EVT_IF_EQ(LVar0, -1) EVT_GOTO(10) @@ -1109,13 +1109,13 @@ EvtScript N(doSpinSmashHit) = { EVT_CALL(func_80231000_54CC70, EVT_PTR("TX"), LVar0) EVT_CALL(func_80231000_54CC70, EVT_PTR("TY"), LVar1) EVT_CALL(func_80231000_54CC70, EVT_PTR("TZ"), LVar2) - EVT_CALL(JumpPartTo, ACTOR_SELF, 10, LVar0, LVar1, LVar2, 0, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 10, LVar0, LVar1, LVar2, 0, TRUE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_CALL(DispatchDamageEvent, LVar0, 1, 17) + EVT_CALL(DispatchDamageEvent, LVar0, 1, EVENT_SPIN_SMASH_LAUNCH_HIT) EVT_GOTO(1) EVT_LABEL(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -1133,23 +1133,23 @@ EvtScript N(doSpinSmashHit) = { EVT_ELSE EVT_SET(LVar5, 0) EVT_END_IF - EVT_CALL(JumpPartTo, ACTOR_SELF, 10, LVar4, LVar1, LVar2, LVar5, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 10, LVar4, LVar1, LVar2, LVar5, TRUE) EVT_SUB(LVar4, 18) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 10, EVT_FLOAT(1.5)) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 10, EVT_FLOAT(3.0)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 10, LVar4, LVar1, LVar2, 12, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 10, LVar4, LVar1, LVar2, 12, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(GetPartOffset, ACTOR_SELF, 10, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 10, SOUND_DEATH) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_SET(LVar0, 0) EVT_LOOP(12) EVT_CALL(SetPartRotation, ACTOR_SELF, 10, LVar0, 0, 0) EVT_ADD(LVar0, 8) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_RETURN EVT_END }; @@ -1178,7 +1178,7 @@ EvtScript N(80235168) = { EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1) EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, 1, LVar1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_EXEC_WAIT(N(lower_actor_pos)) EVT_THREAD EVT_SET(LVar0, 0) @@ -1203,23 +1203,23 @@ EvtScript N(80235168) = { EVT_ELSE EVT_SET(LVar5, 0) EVT_END_IF - EVT_CALL(JumpPartTo, ACTOR_SELF, 10, LVar4, LVar1, LVar2, LVar5, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 10, LVar4, LVar1, LVar2, LVar5, TRUE) EVT_SET(LVar1, 0) EVT_SUB(LVar0, 10) - EVT_CALL(JumpPartTo, ACTOR_SELF, 10, LVar0, LVar1, LVar2, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 10, LVar0, LVar1, LVar2, 10, TRUE) EVT_WAIT(20) EVT_CALL(GetPartOffset, ACTOR_SELF, 10, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 10, SOUND_DEATH) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_SET(LVar0, 0) EVT_LOOP(12) EVT_CALL(SetPartRotation, ACTOR_SELF, 10, LVar0, 0, 0) EVT_ADD(LVar0, 8) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_BURN_HIT) @@ -1231,7 +1231,7 @@ EvtScript N(80235168) = { EVT_ADD(LVar1, LVar3) EVT_ADD(LVar2, 5) EVT_DIVF(LVar3, EVT_FLOAT(10.0)) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, LVar0) @@ -1385,10 +1385,10 @@ EvtScript N(launch_rock) = { EVT_SET(LVar2, 6) EVT_END_SWITCH EVT_END_IF - EVT_CALL(SetPartSounds, ACTOR_SELF, LVar2, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, LVar2, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(SetPartPos, ACTOR_SELF, LVar2, LVar3, LVar4, LVar5) EVT_CALL(SetAnimation, ACTOR_SELF, LVar2, ANIM_ShyStackRock_Anim00) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar6, LVar7, LVar8) @@ -1396,14 +1396,14 @@ EvtScript N(launch_rock) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar2, EVT_FLOAT(1.0)) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar2, LVar6, LVar7, LVar8, 9, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar2, LVar6, LVar7, LVar8, 9, TRUE) EVT_SUB(LVar6, 100) EVT_CALL(RandInt, 40, LVar9) EVT_SUB(LVar6, LVar9) EVT_ADD(LVar7, LVar9) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar2, EVT_FLOAT(0.8)) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar2, LVar6, LVar7, LVar8, 25, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar2, LVar6, LVar7, LVar8, 25, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CASE_EQ(1) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) @@ -1419,14 +1419,14 @@ EvtScript N(launch_rock) = { EVT_CALL(RandInt, 35, LVar9) EVT_ADD(LVar9, 30) EVT_SUB(LVar6, LVar9) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar2, LVar6, LVar7, LVar8, 9, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar2, LVar6, LVar7, LVar8, 9, TRUE) EVT_CALL(RandInt, 25, LVar9) EVT_ADD(LVar9, 45) EVT_SUB(LVar6, LVar9) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar2, LVar6, LVar7, LVar8, 8, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar2, LVar6, LVar7, LVar8, 8, TRUE) EVT_SUB(LVar6, 25) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar2, LVar6, LVar7, LVar8, 4, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar2, LVar6, LVar7, LVar8, 4, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_SWITCH EVT_RETURN EVT_END @@ -1434,7 +1434,7 @@ EvtScript N(launch_rock) = { EvtScript N(onDeath) = { EVT_EXEC_WAIT(D_8029AF08) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(GetActorVar, ACTOR_ENEMY1, 3, LVar0) EVT_ADD(LVar0, 1) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 3, LVar0) @@ -1460,7 +1460,7 @@ EvtScript N(onSpinSmashLaunchDeath) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_CALL(PlaySound, SOUND_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -1470,7 +1470,7 @@ EvtScript N(onSpinSmashLaunchDeath) = { EVT_ADD(LVar3, 8) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(GetActorVar, ACTOR_ENEMY1, 3, LVar0) EVT_ADD(LVar0, 1) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 3, LVar0) diff --git a/src/battle/area/omo2_4/actor/signal_guy.c b/src/battle/area/omo2_4/actor/signal_guy.c index d35d2b60d0..195251e3c8 100644 --- a/src/battle/area/omo2_4/actor/signal_guy.c +++ b/src/battle/area/omo2_4/actor/signal_guy.c @@ -65,7 +65,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -148,14 +148,14 @@ EvtScript N(handleEvent) = { EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 10) EVT_LOOP(4) - EVT_CALL(PlayEffect, EFFECT_SWEAT, 0, LVar0, LVar1, LVar2, 10, 45, 4, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SWEAT, 0, LVar0, LVar1, LVar2, 10, 45, 4, 0) EVT_WAIT(6) EVT_END_LOOP - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, SOUND_20BA, SOUND_3B4) - 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(SetAnimation, ACTOR_SELF, 1, ANIM_MarshalGuy_Anim0C) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 8) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_STEAM_EMITTER) EVT_CALL(SetGoalPos, ACTOR_SELF, -200, 0, 20) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, LVar0, 0) diff --git a/src/battle/area/omo2_5/actor/shy_squad_dup.c b/src/battle/area/omo2_5/actor/shy_squad_dup.c index f3f5839cc2..b3b7cf761b 100644 --- a/src/battle/area/omo2_5/actor/shy_squad_dup.c +++ b/src/battle/area/omo2_5/actor/shy_squad_dup.c @@ -255,7 +255,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 15, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -677,7 +677,7 @@ EvtScript N(displace_guy_2) = { EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1) EVT_CALL(GetPartOffset, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3) EVT_CALL(GetActorSize, ACTOR_SELF, LVar4, LVar5) - EVT_CALL(PlayEffect, EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LVar1, LVar2, LVar3, LVar5, LVar4, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LVar1, LVar2, LVar3, LVar5, LVar4, 0) EVT_CALL(SetPartDispOffset, ACTOR_SELF, LVar0, 0, 0, 0) EVT_CALL(SetPartDispOffset, ACTOR_SELF, LVar0, 0, 1, 0) EVT_WAIT(1) @@ -843,14 +843,14 @@ EvtScript N(onHit) = { EVT_ADD(LVar0, LVar1) EVT_IF_NE(LVar0, 16) EVT_THREAD - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_20000000, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_20000000, TRUE) EVT_CALL(GetPartOffset, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3) EVT_CALL(GetPartMovementVar, ACTOR_SELF, LVar0, 2, LVar7) EVT_CALL(GetPartMovementVar, ACTOR_SELF, LVar0, 3, LVar8) EVT_ADD(LVar1, LVar7) EVT_ADD(LVar3, LVar8) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar0, EVT_FLOAT(0.5)) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, 0, LVar3, 15, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, 0, LVar3, 15, TRUE) EVT_CALL(func_80269E80, LVar5) EVT_SWITCH(LVar5) EVT_CASE_OR_EQ(10) @@ -871,14 +871,14 @@ EvtScript N(onHit) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_SWITCH - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0) EVT_SET(LVar8, 0) EVT_LOOP(12) EVT_CALL(SetPartRotation, ACTOR_SELF, LVar0, LVar8, 0, 0) EVT_ADD(LVar8, 8) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(RemovePartShadow, ACTOR_SELF, LVar0) EVT_END_THREAD EVT_END_IF @@ -939,7 +939,7 @@ EvtScript N(80233E48) = { EVT_ADD(LVar3, 8) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(RemovePartShadow, ACTOR_SELF, LVar0) EVT_RETURN EVT_END @@ -968,7 +968,7 @@ EvtScript N(onDeath) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(GetPartOffset, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_SET(LVar3, 0) EVT_LOOP(12) @@ -976,7 +976,7 @@ EvtScript N(onDeath) = { EVT_ADD(LVar3, 8) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(RemovePartShadow, ACTOR_SELF, LVar0) EVT_WAIT(30) EVT_EXEC_WAIT(N(next_phase)) @@ -1114,12 +1114,12 @@ EvtScript N(attack) = { EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar0) EVT_IF_LT(LVar0, 14) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 0, 0) EVT_THREAD EVT_LOOP(7) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 0, LVar0, LVar1, LVar2, 0, 0) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, 0, 0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD @@ -1151,9 +1151,9 @@ EvtScript N(attack) = { EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, 1, LVar0) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar1, LVar2, LVar3) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 0, LVar1, LVar2, LVar3, 0, 0) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, LVar2, LVar3, 0, 0) EVT_WAIT(2) EVT_END_THREAD EVT_CALL(GetPlayerHP, LVar0) diff --git a/src/battle/area/omo2_6/actor/shy_guy_dup.c b/src/battle/area/omo2_6/actor/shy_guy_dup.c index 475cf61367..955268ebc3 100644 --- a/src/battle/area/omo2_6/actor/shy_guy_dup.c +++ b/src/battle/area/omo2_6/actor/shy_guy_dup.c @@ -160,7 +160,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 10, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, diff --git a/src/battle/area/omo3/actor/big_lantern_ghost.c b/src/battle/area/omo3/actor/big_lantern_ghost.c index 91ea573d19..ccf5a4fc1f 100644 --- a/src/battle/area/omo3/actor/big_lantern_ghost.c +++ b/src/battle/area/omo3/actor/big_lantern_ghost.c @@ -112,7 +112,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 40, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -292,7 +292,7 @@ EvtScript N(init) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_SPEAK_FLAGS), 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_MOVE_ID), N(MOVE_HEAVY_JUMP)) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LIGHT_BEAM_COUNTER), 0) - EVT_CALL(PlayEffect, EFFECT_BULB_GLOW, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), LVar0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_EFFECT), LVar0) EVT_CALL(N(init_overlay)) EVT_EXEC(N(updateEffectThread)) @@ -546,7 +546,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BigLanternGhost_Anim01) EVT_WAIT(8) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 999, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_3E7, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(6) @@ -564,7 +564,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37D) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_SUB(LVar0, 15) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -601,7 +601,7 @@ EvtScript N(attackHeavyJump) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37D) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(SetBattleCamZoom, 320) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -672,13 +672,13 @@ EvtScript N(attackLightBeam) = { EVT_ADD(LVar2, 2) EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlayEffect, EFFECT_LIGHT_RAYS, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), LVarB, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), LVarB, 0) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarB) EVT_END_THREAD EVT_THREAD EVT_WAIT(1) - EVT_CALL(PlayEffect, EFFECT_RADIATING_ENERGY_ORB, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIATING_ENERGY_ORB, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 30, 0) EVT_END_THREAD EVT_WAIT(5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) @@ -853,11 +853,11 @@ EvtScript N(setGhostNoTarget) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_LANTERN_BRIGHTNESS), LVar0) EVT_SWITCH(LVar0) EVT_CASE_LT(5) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CASE_LT(8) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_CASE_DEFAULT - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_END_SWITCH EVT_RETURN EVT_END diff --git a/src/battle/area/omo3/stage/omo_01.c b/src/battle/area/omo3/stage/omo_01.c index a921689a76..1fda713945 100644 --- a/src/battle/area/omo3/stage/omo_01.c +++ b/src/battle/area/omo3/stage/omo_01.c @@ -67,9 +67,9 @@ EvtScript N(updateModels) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_THREAD EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_SETF(LVar1, EVT_FLOAT(0.0)) @@ -88,7 +88,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -98,6 +98,6 @@ Stage NAMESPACE = { .shape = "omo_bt01_shape", .hit = "omo_bt01_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/omo3/stage/omo_02.c b/src/battle/area/omo3/stage/omo_02.c index 1bec5f1813..70b502eefe 100644 --- a/src/battle/area/omo3/stage/omo_02.c +++ b/src/battle/area/omo3/stage/omo_02.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_omo3_omo_02 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -20,6 +20,6 @@ Stage NAMESPACE = { .shape = "omo_bt02_shape", .hit = "omo_bt02_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/omo3/stage/omo_03.c b/src/battle/area/omo3/stage/omo_03.c index e869ca376c..66d940f395 100644 --- a/src/battle/area/omo3/stage/omo_03.c +++ b/src/battle/area/omo3/stage/omo_03.c @@ -3,15 +3,15 @@ #define NAMESPACE b_area_omo3_omo_03 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 18, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 18, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -21,6 +21,6 @@ Stage NAMESPACE = { .shape = "omo_bt03_shape", .hit = "omo_bt03_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/omo3/stage/omo_03b.c b/src/battle/area/omo3/stage/omo_03b.c index be31f41cec..9c5de836b2 100644 --- a/src/battle/area/omo3/stage/omo_03b.c +++ b/src/battle/area/omo3/stage/omo_03b.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_omo3_omo_03b -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -20,6 +20,6 @@ Stage NAMESPACE = { .shape = "omo_bt03_shape", .hit = "omo_bt03_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/omo3/stage/omo_04.c b/src/battle/area/omo3/stage/omo_04.c index fda3f4a34a..fad5c15ca0 100644 --- a/src/battle/area/omo3/stage/omo_04.c +++ b/src/battle/area/omo3/stage/omo_04.c @@ -9,9 +9,9 @@ extern Formation N(fromation_slot_machine); extern ActorBlueprint N(slot_machine_stop); extern ActorBlueprint N(slot_machine_start); -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_CALL(SetTexPanner, 29, TEX_PANNER_A) EVT_THREAD EVT_SET(LVarE, 0) @@ -25,13 +25,16 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_itigo, MODEL_kisya, MODEL_kusari, 0, +s32 N(ForegroundModels)[] = { + MODEL_itigo, + MODEL_kisya, + MODEL_kusari, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -39,9 +42,9 @@ Stage NAMESPACE = { .shape = "omo_bt04_shape", .hit = "omo_bt04_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), .stageEnemyCount = 4, .stageFormation = &N(fromation_slot_machine), }; diff --git a/src/battle/area/omo3/stage/omo_05.c b/src/battle/area/omo3/stage/omo_05.c index 54385be9c0..8007d57ad5 100644 --- a/src/battle/area/omo3/stage/omo_05.c +++ b/src/battle/area/omo3/stage/omo_05.c @@ -4,22 +4,24 @@ #define NAMESPACE b_area_omo3_omo_05 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 24, 0) - EVT_CALL(SetGroupEnabled, 28, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 24, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 28, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_itigo, MODEL_kisya, 0, +s32 N(ForegroundModels)[] = { + MODEL_itigo, + MODEL_kisya, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -27,7 +29,7 @@ Stage NAMESPACE = { .shape = "omo_bt05_shape", .hit = "omo_bt05_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/omo3/stage/omo_05b.c b/src/battle/area/omo3/stage/omo_05b.c index 1822d6a6bc..b91e6a4023 100644 --- a/src/battle/area/omo3/stage/omo_05b.c +++ b/src/battle/area/omo3/stage/omo_05b.c @@ -4,22 +4,23 @@ #define NAMESPACE b_area_omo3_omo_05b -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 35, 0) - EVT_CALL(SetGroupEnabled, 45, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 35, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 45, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_mae2, 0, +s32 N(ForegroundModels)[] = { + MODEL_mae2, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -27,7 +28,7 @@ Stage NAMESPACE = { .shape = "omo_bt05_shape", .hit = "omo_bt05_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/omo3/stage/omo_06.c b/src/battle/area/omo3/stage/omo_06.c index 9d9ff64a8c..a078d62450 100644 --- a/src/battle/area/omo3/stage/omo_06.c +++ b/src/battle/area/omo3/stage/omo_06.c @@ -9,7 +9,7 @@ EvtScript N(updateModels) = { EVT_SET(LVar9, LVar1) EVT_SET(LVar8, LVar2) EVT_LABEL(0) - EVT_CALL(MakeLerp, 0, LVar9, LVar8, 10) + EVT_CALL(MakeLerp, 0, LVar9, LVar8, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, 0, LVar0, 0) @@ -18,7 +18,7 @@ EvtScript N(updateModels) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(MakeLerp, LVar9, 0, LVar8, 10) + EVT_CALL(MakeLerp, LVar9, 0, LVar8, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateGroup, LVarA, 0, LVar0, 0) @@ -32,9 +32,9 @@ EvtScript N(updateModels) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_THREAD EVT_SET(LVar0, 26) EVT_SET(LVar1, -50) @@ -50,13 +50,15 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_kuruma, MODEL_hosi, 0, +s32 N(ForegroundModels)[] = { + MODEL_kuruma, + MODEL_hosi, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -64,7 +66,7 @@ Stage NAMESPACE = { .shape = "omo_bt06_shape", .hit = "omo_bt06_hit", .bg = "omo_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/omo3/stage/omo_07.c b/src/battle/area/omo3/stage/omo_07.c index 0e89403708..c633f6b995 100644 --- a/src/battle/area/omo3/stage/omo_07.c +++ b/src/battle/area/omo3/stage/omo_07.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_omo3_omo_07 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -19,6 +19,6 @@ Stage NAMESPACE = { .texture = "omo_tex", .shape = "omo_bt07_shape", .hit = "omo_bt07_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/pra/actor/albino_dino.c b/src/battle/area/pra/actor/albino_dino.c index 50678d0840..de76ab41db 100644 --- a/src/battle/area/pra/actor/albino_dino.c +++ b/src/battle/area/pra/actor/albino_dino.c @@ -77,7 +77,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 40, .airLiftChance = 15, @@ -221,9 +221,9 @@ EvtScript N(stamp) = { EVT_ELSE EVT_ADD(LVar0, -20) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 25, 8, 45, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 25, 8, 45, 20, 0) EVT_IF_GT(LVarA, 3) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) EVT_SET(LVarA, 0) EVT_END_IF EVT_ADD(LVarA, 1) @@ -270,7 +270,7 @@ EvtScript N(takeTurn) = { EVT_END_IF EVT_WAIT(40) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -290,7 +290,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(12.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(1.5)) EVT_END_THREAD EVT_KILL_THREAD(LVar9) EVT_WAIT(2) @@ -307,7 +307,7 @@ EvtScript N(takeTurn) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FD) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_AlbinoDino_Anim03) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(returnHome)) diff --git a/src/battle/area/pra/stage/pra_01.c b/src/battle/area/pra/stage/pra_01.c index 6db7da08ad..f845bc700f 100644 --- a/src/battle/area/pra/stage/pra_01.c +++ b/src/battle/area/pra/stage/pra_01.c @@ -5,28 +5,31 @@ #define NAMESPACE b_area_pra_pra_01 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_CALL(EnableBattleFloorReflections, TRUE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o383, MODEL_o384, MODEL_o385, 0, +s32 N(ForegroundModels)[] = { + MODEL_o383, + MODEL_o384, + MODEL_o385, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "pra_tex", .shape = "pra_bt01_shape", .hit = "pra_bt01_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/pra/stage/pra_02.c b/src/battle/area/pra/stage/pra_02.c index 683a76c7be..cbe0653233 100644 --- a/src/battle/area/pra/stage/pra_02.c +++ b/src/battle/area/pra/stage/pra_02.c @@ -58,9 +58,9 @@ EvtScript N(80231CFC) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_CALL(EnableBattleFloorReflections, TRUE) EVT_SET(LVar0, 17) EVT_SET(LVar1, 0) @@ -76,20 +76,23 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o383, MODEL_o384, MODEL_o385, 0, +s32 N(ForegroundModels)[] = { + MODEL_o383, + MODEL_o384, + MODEL_o385, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "pra_tex", .shape = "pra_bt02_shape", .hit = "pra_bt02_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/pra/stage/pra_03.c b/src/battle/area/pra/stage/pra_03.c index 3e283f31d6..1e2c0e4add 100644 --- a/src/battle/area/pra/stage/pra_03.c +++ b/src/battle/area/pra/stage/pra_03.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_pra_pra_03 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -19,6 +19,6 @@ Stage NAMESPACE = { .texture = "pra_tex", .shape = "pra_bt03_shape", .hit = "pra_bt03_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/pra/stage/pra_03b.c b/src/battle/area/pra/stage/pra_03b.c index 16b0242c3a..8ea0207f58 100644 --- a/src/battle/area/pra/stage/pra_03b.c +++ b/src/battle/area/pra/stage/pra_03b.c @@ -3,15 +3,15 @@ #define NAMESPACE b_area_pra_pra_03b -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 33, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 33, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -20,6 +20,6 @@ Stage NAMESPACE = { .texture = "pra_tex", .shape = "pra_bt03_shape", .hit = "pra_bt03_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/pra/stage/pra_03c.c b/src/battle/area/pra/stage/pra_03c.c index 42003dd67b..95532635a8 100644 --- a/src/battle/area/pra/stage/pra_03c.c +++ b/src/battle/area/pra/stage/pra_03c.c @@ -3,16 +3,16 @@ #define NAMESPACE b_area_pra_pra_03c -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 33, 0) - EVT_CALL(SetGroupEnabled, 38, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 33, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 38, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -21,6 +21,6 @@ Stage NAMESPACE = { .texture = "pra_tex", .shape = "pra_bt03_shape", .hit = "pra_bt03_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/pra/stage/pra_04.c b/src/battle/area/pra/stage/pra_04.c index ceea623109..ca37fb8f70 100644 --- a/src/battle/area/pra/stage/pra_04.c +++ b/src/battle/area/pra/stage/pra_04.c @@ -1,10 +1,11 @@ #include "common.h" #include "battle/battle.h" #include "script_api/battle.h" +#include "mapfs/pra_bt04_shape.h" #define NAMESPACE b_area_pra_pra_04 -EvtScript N(802320D0) = { +EvtScript N(EVS_TexPan_Glass) = { EVT_SET(LVarA, LVar1) EVT_SET(LVarB, LVar2) EVT_SET(LVarC, LVar3) @@ -12,7 +13,7 @@ EvtScript N(802320D0) = { EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, LVarA, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, LVarA, TEX_PANNER_MAIN, LVar0, LVar1) EVT_ADD(LVar0, LVarB) EVT_ADD(LVar1, LVarC) EVT_WAIT(1) @@ -29,8 +30,8 @@ EvtScript N(802321A0) = { EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, LVarA, 0, LVar0, 0) - EVT_CALL(SetTexPanOffset, LVarA, 1, LVar1, 0) + EVT_CALL(SetTexPanOffset, LVarA, TEX_PANNER_MAIN, LVar0, 0) + EVT_CALL(SetTexPanOffset, LVarA, TEX_PANNER_AUX, LVar1, 0) EVT_ADD(LVar0, LVarB) EVT_ADD(LVar1, LVarC) EVT_WAIT(1) @@ -47,8 +48,8 @@ EvtScript N(8023228C) = { EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, LVarA, 0, 0, LVar0) - EVT_CALL(SetTexPanOffset, LVarA, 1, 0, LVar1) + EVT_CALL(SetTexPanOffset, LVarA, TEX_PANNER_MAIN, 0, LVar0) + EVT_CALL(SetTexPanOffset, LVarA, TEX_PANNER_AUX, 0, LVar1) EVT_ADD(LVar0, LVarB) EVT_ADD(LVar1, LVarC) EVT_WAIT(1) @@ -57,25 +58,25 @@ EvtScript N(8023228C) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_SET(LVar0, 1) - EVT_SET(LVar1, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_SET(LVar0, MODEL_kira1) + EVT_SET(LVar1, TEX_PANNER_0) EVT_SET(LVar2, 3000) EVT_SET(LVar3, 0) - EVT_EXEC(N(802320D0)) - EVT_SET(LVar0, 0) - EVT_SET(LVar1, 1) + EVT_EXEC(N(EVS_TexPan_Glass)) + EVT_SET(LVar0, MODEL_kira2) + EVT_SET(LVar1, TEX_PANNER_1) EVT_SET(LVar2, 3000) EVT_SET(LVar3, 0) - EVT_EXEC(N(802320D0)) + EVT_EXEC(N(EVS_TexPan_Glass)) EVT_CALL(EnableBattleFloorReflections, TRUE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -84,6 +85,6 @@ Stage NAMESPACE = { .texture = "pra_tex", .shape = "pra_bt04_shape", .hit = "pra_bt04_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/pra2/actor/crystal_bit.c b/src/battle/area/pra2/actor/crystal_bit.c index c63b68835e..de90fce150 100644 --- a/src/battle/area/pra2/actor/crystal_bit.c +++ b/src/battle/area/pra2/actor/crystal_bit.c @@ -147,7 +147,7 @@ ActorBlueprint N(1) = { .maxHP = 1, .partCount = ARRAY_COUNT(N(parts_1)), .partsData = N(parts_1), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -170,7 +170,7 @@ ActorBlueprint N(2) = { .maxHP = 1, .partCount = ARRAY_COUNT(N(parts_2)), .partsData = N(parts_2), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -193,7 +193,7 @@ ActorBlueprint N(3) = { .maxHP = 1, .partCount = ARRAY_COUNT(N(parts_3)), .partsData = N(parts_3), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -240,7 +240,7 @@ API_CALLABLE(UpdateCrystalBitEffect) { } EvtScript N(idle) = { - EVT_CALL(PlayEffect, EFFECT_MISC_PARTICLES, 1, NPC_DISPOSE_LOCATION, 24, 24, EVT_FLOAT(1.0), 5, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 1, NPC_DISPOSE_LOCATION, 24, 24, EVT_FLOAT(1.0), 5, 0, 0, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVarF) EVT_CHILD_THREAD EVT_CALL(UpdateCrystalBitEffect, LVarF) diff --git a/src/battle/area/pra2/actor/crystal_king.c b/src/battle/area/pra2/actor/crystal_king.c index 1e1866f546..c2beaf4f09 100644 --- a/src/battle/area/pra2/actor/crystal_king.c +++ b/src/battle/area/pra2/actor/crystal_king.c @@ -118,7 +118,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 70, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -330,10 +330,10 @@ EvtScript N(FlyWithClones) = { EvtScript N(RemoveClone) = { EVT_CALL(EnableActorBlur, LVar9, 1) - EVT_CALL(SetActorFlagBits, LVar9, ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetActorFlagBits, LVar9, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_THREAD EVT_CALL(GetActorPartOpacity, LVar9, 1, LVar3) - EVT_CALL(MakeLerp, LVar3, 0, 20, 1) + EVT_CALL(MakeLerp, LVar3, 0, 20, EASING_QUADRATIC_IN) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(SetPartAlpha, LVar9, 1, LVar0) @@ -343,7 +343,7 @@ EvtScript N(RemoveClone) = { EVT_END_IF EVT_END_THREAD EVT_THREAD - EVT_CALL(MakeLerp, 100, 200, 20, 1) + EVT_CALL(MakeLerp, 100, 200, 20, EASING_QUADRATIC_IN) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar8) @@ -363,7 +363,7 @@ EvtScript N(RemoveClone) = { EVT_ELSE EVT_CALL(SetActorRotationOffset, LVar9, 0, 10, 0) EVT_END_IF - EVT_CALL(MakeLerp, 3600, 0, 25, 1) + EVT_CALL(MakeLerp, 0x00000E10, 0, 25, EASING_QUADRATIC_IN) EVT_LABEL(2) EVT_CALL(UpdateLerp) EVT_CALL(SetActorRotation, LVar9, 0, 0, LVar0) @@ -447,14 +447,14 @@ EvtScript N(OnHit) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 150, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.7)) EVT_END_THREAD EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_WAIT(15) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_END_IF EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) @@ -486,21 +486,21 @@ EvtScript N(OnDeath) = { EVT_CALL(ActorExists, LVar0, LVar1) EVT_IF_EQ(LVar1, TRUE) EVT_CALL(func_80269EAC, 0) - EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_CALL(DispatchEvent, LVar0, EVENT_DEATH) EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_BIT2_ID), LVar0) EVT_CALL(ActorExists, LVar0, LVar1) EVT_IF_EQ(LVar1, TRUE) EVT_CALL(func_80269EAC, 0) - EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_CALL(DispatchEvent, LVar0, EVENT_DEATH) EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_BIT3_ID), LVar0) EVT_CALL(ActorExists, LVar0, LVar1) EVT_IF_EQ(LVar1, TRUE) EVT_CALL(func_80269EAC, 0) - EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_CALL(DispatchEvent, LVar0, EVENT_DEATH) EVT_END_IF EVT_RETURN @@ -770,7 +770,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim09) EVT_EXEC_WAIT(DoRecover) - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x8002, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_LE(LVar0, 1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_CrystalKing_Anim0E) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) @@ -788,7 +788,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_SWAP_PARTNER) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 20, 0) EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(GetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0) @@ -851,7 +851,7 @@ EvtScript N(takeTurn) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_PHASE), LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(N(PHASE_BEGIN)) - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x8002, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_LE(LVar0, 1) EVT_EXEC_WAIT(N(SummonCrystalBits)) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_PHASE), N(PHASE_SUMMONED_BITS)) @@ -863,7 +863,7 @@ EvtScript N(takeTurn) = { EVT_EXEC_WAIT(N(SummonCrystalBits)) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_PHASE), N(PHASE_SUMMONED_BITS)) EVT_CASE_EQ(N(PHASE_SUMMONED_BITS)) - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x8002, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_LE(LVar0, 1) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_FROZEN) @@ -899,7 +899,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0) EVT_END_IF EVT_CASE_EQ(N(PHASE_SUMMONED_CLONES)) - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x8002, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_LE(LVar0, 1) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_FROZEN) @@ -913,7 +913,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_PHASE), N(PHASE_ATTACKED_WITH_CLONES)) EVT_END_IF EVT_CASE_EQ(N(PHASE_ATTACKED_WITH_CLONES)) - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x8002, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_GT(LVar0, 1) EVT_EXEC_WAIT(N(AttackIcyBreathWithClones)) EVT_RETURN @@ -942,12 +942,12 @@ EvtScript N(AttackIcyBreath) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_ADD(LVar2, -5) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 20, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 8) EVT_ADD(LVar2, -2) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 8, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 8, 0) EVT_END_IF EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -965,18 +965,18 @@ EvtScript N(AttackIcyBreath) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -15) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(180.0), EVT_FLOAT(2.0), EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(180.0), EVT_FLOAT(2.0), EVT_FLOAT(0.5), 30, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -6) EVT_ADD(LVar1, 8) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(180.0), EVT_FLOAT(2.0), EVT_FLOAT(0.2), 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(180.0), EVT_FLOAT(2.0), EVT_FLOAT(0.2), 30, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_END_IF EVT_CALL(N(StartRumbleWithParams), 70, 60) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 30, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 30, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_WAIT(30) EVT_CALL(StopSound, SOUND_35D) @@ -994,18 +994,18 @@ EvtScript N(AttackIcyBreath) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -15) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(180.0), EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(180.0), EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -6) EVT_ADD(LVar1, 8) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(180.0), EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(180.0), EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_END_IF EVT_CALL(N(StartRumbleWithParams), 70, 100) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 50, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 50, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_WAIT(60) EVT_CALL(StopSound, SOUND_35D) @@ -1039,12 +1039,12 @@ EvtScript N(AttackIceBolt) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_ADD(LVar2, -5) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 20, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 8) EVT_ADD(LVar2, -2) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 8, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 8, 0) EVT_END_IF EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -1080,12 +1080,12 @@ EvtScript N(AttackIceBolt) = { EVT_ADD(LVar0, LVar3) EVT_ADD(LVar1, LVar4) EVT_ADD(LVar2, LVar5) - EVT_CALL(PlayEffect, EFFECT_MISC_PARTICLES, 1, LVar0, LVar1, LVar2, 20, -20, EVT_FLOAT(1.0), 5, 30, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 1, LVar0, LVar1, LVar2, 20, -20, EVT_FLOAT(1.0), 5, 30, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_WAIT(3) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 20, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 20, 0) EVT_CALL(func_802182E4_660A34, LVarF) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_CrystalKing_Anim15) @@ -1120,12 +1120,12 @@ EvtScript N(AttackIceBolt) = { EVT_ADD(LVar0, LVar3) EVT_ADD(LVar1, LVar4) EVT_ADD(LVar2, LVar5) - EVT_CALL(PlayEffect, EFFECT_MISC_PARTICLES, 1, LVar0, LVar1, LVar2, 20, -20, EVT_FLOAT(1.0), 5, 30, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 1, LVar0, LVar1, LVar2, 20, -20, EVT_FLOAT(1.0), 5, 30, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_WAIT(3) - EVT_CALL(PlayEffect, EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 20, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 20, 0) EVT_CALL(func_802182E4_660A34, LVarF) EVT_WAIT(7) EVT_THREAD @@ -1140,7 +1140,7 @@ EvtScript N(AttackIceBolt) = { EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_COLD_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(2.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_COLD_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(2.0), 30, 0) EVT_CALL(func_80218344_660A94, LVarF) EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -1197,7 +1197,7 @@ ActorBlueprint N(clone) = { .maxHP = 70, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(clone_init), + .initScript = &N(clone_init), .statusTable = N(clone_statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -1227,16 +1227,16 @@ EvtScript N(MakeIllusions) = { EVT_WAIT(15) EVT_CALL(GetActorHP, ACTOR_SELF, LVarA) EVT_CALL(SummonEnemy, EVT_PTR(N(clone_formation)), 0) - EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_CLONE1_ID), LVar0) - EVT_CALL(SetPartEventBits, LVar0, 1, ACTOR_EVENT_FLAG_ILLUSORY, 1) + EVT_CALL(SetPartEventBits, LVar0, 1, ACTOR_EVENT_FLAG_ILLUSORY, TRUE) EVT_CALL(SetEnemyHP, LVar0, LVarA) EVT_CALL(CopyStatusEffects, ACTOR_SELF, LVar0) EVT_CALL(CopyBuffs, ACTOR_SELF, LVar0) EVT_CALL(SummonEnemy, EVT_PTR(N(clone_formation)), 0) - EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_CLONE2_ID), LVar0) - EVT_CALL(SetPartEventBits, LVar0, 1, ACTOR_EVENT_FLAG_ILLUSORY, 1) + EVT_CALL(SetPartEventBits, LVar0, 1, ACTOR_EVENT_FLAG_ILLUSORY, TRUE) EVT_CALL(SetEnemyHP, LVar0, LVarA) EVT_CALL(CopyStatusEffects, ACTOR_SELF, LVar0) EVT_CALL(CopyBuffs, ACTOR_SELF, LVar0) @@ -1246,7 +1246,7 @@ EvtScript N(MakeIllusions) = { EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E7) EVT_CALL(GetActorPos, ACTOR_SELF, LVar7, LVar8, LVar9) - EVT_CALL(MakeLerp, 0, 41, 30, 11) + EVT_CALL(MakeLerp, 0, 41, 30, EASING_SIN_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) EVT_ADD(LVar0, LVar8) @@ -1256,11 +1256,11 @@ EvtScript N(MakeIllusions) = { EVT_GOTO(10) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_CrystalKing_Anim09) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE1_ID), LVar0) - EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_FLYING, 1) + EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_FLYING, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE2_ID), LVar0) - EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_FLYING, 1) + EVT_CALL(SetActorFlagBits, LVar0, ACTOR_FLAG_FLYING, TRUE) EVT_EXEC_GET_TID(N(FlyWithClones), LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLY_THREAD_ID), LVar0) EVT_END_IF @@ -1290,7 +1290,7 @@ EvtScript N(MakeIllusions) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE2_ID), LVar0) EVT_CALL(EnableActorBlur, LVar0, 1) EVT_THREAD - EVT_CALL(MakeLerp, 0, 6840, 210, 10) + EVT_CALL(MakeLerp, 0, 0x00001AB8, 210, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(SetActorYaw, ACTOR_SELF, LVar0) @@ -1303,7 +1303,7 @@ EvtScript N(MakeIllusions) = { EVT_GOTO(0) EVT_END_IF EVT_END_THREAD - EVT_CALL(MakeLerp, 255, 128, 30, 10) + EVT_CALL(MakeLerp, 255, 128, 30, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, LVar0) @@ -1335,9 +1335,9 @@ EvtScript N(MakeIllusions) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE2_ID), LVarB) EVT_SET(LVarC, ACTOR_SELF) EVT_END_SWITCH - EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, 0) - EVT_CALL(SetActorFlagBits, LVarB, ACTOR_FLAG_NO_SHADOW, 0) - EVT_CALL(SetActorFlagBits, LVarC, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, FALSE) + EVT_CALL(SetActorFlagBits, LVarB, ACTOR_FLAG_NO_SHADOW, FALSE) + EVT_CALL(SetActorFlagBits, LVarC, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 150) EVT_THREAD @@ -1451,7 +1451,7 @@ EvtScript N(CrystalBitAppear) = { EVT_WAIT(30) EVT_CALL(EnableActorBlur, LVar0, 1) EVT_SET(LVar9, LVar0) - EVT_CALL(MakeLerp, 0, 255, 90, 0) + EVT_CALL(MakeLerp, 0, 255, 90, EASING_LINEAR) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(SetPartAlpha, LVar9, 1, LVar0) @@ -1461,7 +1461,7 @@ EvtScript N(CrystalBitAppear) = { EVT_END_IF EVT_END_THREAD EVT_SETF(LVar5, EVT_FLOAT(0.0)) - EVT_CALL(MakeLerp, 0, 2880, 120, 11) + EVT_CALL(MakeLerp, 0, 0x00000B40, 120, EASING_SIN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(GetActorPos, ACTOR_SELF, LVar2, LVar3, LVar4) @@ -1574,28 +1574,28 @@ EvtScript N(AttackIcyBreathWithClones) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_ADD(LVar2, -5) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 20, 0) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_ADD(LVar2, -5) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 20, 0) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_ADD(LVar2, -5) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 20, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 8) EVT_ADD(LVar2, -2) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 8, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 8, 0) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 8) EVT_ADD(LVar2, -2) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 8, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 8, 0) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 8) EVT_ADD(LVar2, -2) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 8, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 8, 0) EVT_END_IF EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -1618,40 +1618,40 @@ EvtScript N(AttackIcyBreathWithClones) = { EVT_END_IF EVT_CALL(N(StartRumbleWithParams), 100, 60) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 30, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 30, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar9) EVT_IF_NOT_FLAG(LVar9, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -15) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 30, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -15) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 30, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -15) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 30, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -6) EVT_ADD(LVar1, 8) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(0.4), 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(0.4), 30, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -6) EVT_ADD(LVar1, 8) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(0.4), 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(0.4), 30, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -6) EVT_ADD(LVar1, 8) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(0.4), 30, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(0.4), 30, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_END_IF EVT_WAIT(30) @@ -1677,40 +1677,40 @@ EvtScript N(AttackIcyBreathWithClones) = { EVT_END_IF EVT_CALL(N(StartRumbleWithParams), 100, 120) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 60, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 60, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar9) EVT_IF_NOT_FLAG(LVar9, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -15) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -15) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -15) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -6) EVT_ADD(LVar1, 8) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -6) EVT_ADD(LVar1, 8) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -6) EVT_ADD(LVar1, 8) - EVT_CALL(PlayEffect, EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_HUFF_PUFF_BREATH, 0, LVar0, LVar1, LVar2, LVar3, EVT_FLOAT(2.0), EVT_FLOAT(1.0), 60, 0) EVT_CALL(func_80218280_6609D0, LVarF) EVT_END_IF EVT_WAIT(60) @@ -1753,7 +1753,7 @@ EvtScript N(MoveBitToTarget) = { EVT_ADD(LVar4, 8) EVT_END_IF EVT_CALL(func_8021848C_660BDC, LVarB, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5) - EVT_CALL(LoadPath, 30, LVarB, 3, 1) + EVT_CALL(LoadPath, 30, LVarB, 3, EASING_QUADRATIC_IN) EVT_LABEL(0) EVT_CALL(GetNextPathPos) EVT_CALL(SetActorPos, LVarA, LVar1, LVar2, LVar3) @@ -1761,8 +1761,8 @@ EvtScript N(MoveBitToTarget) = { EVT_IF_EQ(LVar0, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_RETURN EVT_END }; @@ -1770,8 +1770,8 @@ EvtScript N(MoveBitToTarget) = { EvtScript N(RemoveCrystalBit) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3D9) EVT_SET(LVarA, LVar0) - EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_INVISIBLE, 0) - EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -150, 0, 0) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1787,13 +1787,13 @@ EvtScript N(RemoveCrystalBit) = { EVT_ADD(LVar3, LVar0) EVT_ADD(LVar4, LVar1) EVT_ADD(LVar5, LVar2) - EVT_CALL(PlayEffect, EFFECT_MISC_PARTICLES, 1, LVar3, LVar4, LVar5, 20, -20, EVT_FLOAT(1.0), 5, 30, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 1, LVar3, LVar4, LVar5, 20, -20, EVT_FLOAT(1.0), 5, 30, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetActorSpeed, LVarA, EVT_FLOAT(16.0)) EVT_CALL(SetGoalPos, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, LVarA, 0, 0, 0) + EVT_CALL(FlyToGoal, LVarA, 0, 0, EASING_LINEAR) EVT_CALL(GetActorVar, LVarA, 0, LVarF) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveActor, LVarA) @@ -1804,8 +1804,8 @@ EvtScript N(RemoveCrystalBit) = { EvtScript N(AttackWithCrystalBit) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3D9) EVT_SET(LVarA, LVar0) - EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_INVISIBLE, 0) - EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -1820,13 +1820,13 @@ EvtScript N(AttackWithCrystalBit) = { EVT_ADD(LVar3, LVar0) EVT_ADD(LVar4, LVar1) EVT_ADD(LVar5, LVar2) - EVT_CALL(PlayEffect, EFFECT_MISC_PARTICLES, 1, LVar3, LVar4, LVar5, 20, -20, EVT_FLOAT(1.0), 5, 30, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 1, LVar3, LVar4, LVar5, 20, -20, EVT_FLOAT(1.0), 5, 30, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetActorSpeed, LVarA, EVT_FLOAT(16.0)) EVT_CALL(SetGoalPos, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, LVarA, 0, 0, 0) + EVT_CALL(FlyToGoal, LVarA, 0, 0, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_ICE | DAMAGE_TYPE_NO_CONTACT, 0, 0, 4, 0) EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.0)) @@ -1853,7 +1853,7 @@ EvtScript N(NormalAttack) = { EVT_WAIT(20) EVT_CALL(N(StartRumbleWithParams), 70, 60) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 30, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 30, EVT_FLOAT(0.2)) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3AF) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_BIT1_ID), LVar0) @@ -2034,23 +2034,23 @@ EvtScript N(Heal) = { EVT_IF_EQ(LocalFlag(0), 0) EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, ACTOR_SELF, 20, 0) + EVT_CALL(HealActor, ACTOR_SELF, 20, FALSE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_ELSE EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, ACTOR_SELF, 20, 1) + EVT_CALL(HealActor, ACTOR_SELF, 20, TRUE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, LVarA, 20, 1) + EVT_CALL(HealActor, LVarA, 20, TRUE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, LVarB, 20, 1) + EVT_CALL(HealActor, LVarB, 20, TRUE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_CALL(SetAnimation, LVarA, 1, ANIM_CrystalKing_Anim09) diff --git a/src/battle/area/pra2/stage/sam_04.c b/src/battle/area/pra2/stage/sam_04.c index a62fa00e74..07f0918f71 100644 --- a/src/battle/area/pra2/stage/sam_04.c +++ b/src/battle/area/pra2/stage/sam_04.c @@ -3,21 +3,21 @@ #define NAMESPACE b_area_pra2_sam_04 -#include "common/UnkModelStuff.inc.c" +#include "battle/common/stage/sam_Snowflakes.inc.c" void func_802189E0_661130(void) { enable_background_wave(); } -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_EXEC(N(UnkModelStuffScript1)) + EVT_EXEC(N(EVS_SpawnSnowfall)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -27,6 +27,6 @@ Stage NAMESPACE = { .shape = "sam_bt04_shape", .hit = "sam_bt04_hit", .bg = "sam_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/pra3/stage/pra_01.c b/src/battle/area/pra3/stage/pra_01.c index dc4d8cd6c1..0deb60a85c 100644 --- a/src/battle/area/pra3/stage/pra_01.c +++ b/src/battle/area/pra3/stage/pra_01.c @@ -5,28 +5,31 @@ #define NAMESPACE b_area_pra3_pra_01 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_CALL(EnableBattleFloorReflections, TRUE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o383, MODEL_o384, MODEL_o385, 0, +s32 N(ForegroundModels)[] = { + MODEL_o383, + MODEL_o384, + MODEL_o385, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "pra_tex", .shape = "pra_bt01_shape", .hit = "pra_bt01_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/pra3/stage/pra_02.c b/src/battle/area/pra3/stage/pra_02.c index c6bc4d63da..4eaf6aeba3 100644 --- a/src/battle/area/pra3/stage/pra_02.c +++ b/src/battle/area/pra3/stage/pra_02.c @@ -58,9 +58,9 @@ EvtScript N(80231CFC) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_CALL(EnableBattleFloorReflections, TRUE) EVT_SET(LVar0, 17) EVT_SET(LVar1, 0) @@ -76,20 +76,23 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_o383, MODEL_o384, MODEL_o385, 0, +s32 N(ForegroundModels)[] = { + MODEL_o383, + MODEL_o384, + MODEL_o385, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "pra_tex", .shape = "pra_bt02_shape", .hit = "pra_bt02_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/pra3/stage/pra_03.c b/src/battle/area/pra3/stage/pra_03.c index 26aa7ebda4..5795c8afec 100644 --- a/src/battle/area/pra3/stage/pra_03.c +++ b/src/battle/area/pra3/stage/pra_03.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_pra3_pra_03 -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -19,6 +19,6 @@ Stage NAMESPACE = { .texture = "pra_tex", .shape = "pra_bt03_shape", .hit = "pra_bt03_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/pra3/stage/pra_03b.c b/src/battle/area/pra3/stage/pra_03b.c index e631f76e8d..be591405cf 100644 --- a/src/battle/area/pra3/stage/pra_03b.c +++ b/src/battle/area/pra3/stage/pra_03b.c @@ -3,15 +3,15 @@ #define NAMESPACE b_area_pra3_pra_03b -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 33, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 33, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -20,6 +20,6 @@ Stage NAMESPACE = { .texture = "pra_tex", .shape = "pra_bt03_shape", .hit = "pra_bt03_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/pra3/stage/pra_03c.c b/src/battle/area/pra3/stage/pra_03c.c index 9f6ceb1910..65ee39e751 100644 --- a/src/battle/area/pra3/stage/pra_03c.c +++ b/src/battle/area/pra3/stage/pra_03c.c @@ -3,16 +3,16 @@ #define NAMESPACE b_area_pra3_pra_03c -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetGroupEnabled, 33, 0) - EVT_CALL(SetGroupEnabled, 38, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 33, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 38, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -21,6 +21,6 @@ Stage NAMESPACE = { .texture = "pra_tex", .shape = "pra_bt03_shape", .hit = "pra_bt03_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/pra3/stage/pra_04.c b/src/battle/area/pra3/stage/pra_04.c index 71c9532264..b2bb344c80 100644 --- a/src/battle/area/pra3/stage/pra_04.c +++ b/src/battle/area/pra3/stage/pra_04.c @@ -57,9 +57,9 @@ EvtScript N(8023228C) = { EVT_END }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 1) EVT_SET(LVar1, 0) EVT_SET(LVar2, 3000) @@ -75,7 +75,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -84,6 +84,6 @@ Stage NAMESPACE = { .texture = "pra_tex", .shape = "pra_bt04_shape", .hit = "pra_bt04_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/sam/actor/frost_piranha.c b/src/battle/area/sam/actor/frost_piranha.c index 6e06d659ed..31b636e411 100644 --- a/src/battle/area/sam/actor/frost_piranha.c +++ b/src/battle/area/sam/actor/frost_piranha.c @@ -80,7 +80,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 10, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 70, .airLiftChance = 20, @@ -257,7 +257,7 @@ EvtScript N(attack_bite) = { EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Frost_Anim18) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_WAIT(8) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -280,7 +280,7 @@ EvtScript N(attack_bite) = { EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_SURFACE) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Frost_Anim17) EVT_WAIT(8) EVT_ELSE @@ -325,7 +325,7 @@ EvtScript N(attack_bite) = { EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_DIG) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Frost_Anim18) EVT_WAIT(10) @@ -335,12 +335,12 @@ EvtScript N(attack_bite) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_SURFACE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Frost_Anim17) EVT_WAIT(10) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_ELSE EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(return_home)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) @@ -369,7 +369,7 @@ EvtScript N(attack_bite) = { EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_DIG) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Frost_Anim18) EVT_WAIT(10) @@ -379,7 +379,7 @@ EvtScript N(attack_bite) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_SURFACE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Frost_Anim17) EVT_WAIT(10) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_ELSE EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_EXEC_WAIT(N(return_home)) @@ -450,7 +450,7 @@ EvtScript N(attack_icy_breath) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(return_home)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) diff --git a/src/battle/area/sam/actor/gulpit.c b/src/battle/area/sam/actor/gulpit.c index fe81304d9e..80e53c2463 100644 --- a/src/battle/area/sam/actor/gulpit.c +++ b/src/battle/area/sam/actor/gulpit.c @@ -110,7 +110,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 12, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 60, .airLiftChance = 50, @@ -288,7 +288,7 @@ EvtScript N(attack_lick) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -354,14 +354,14 @@ EvtScript N(attack_rock) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Gulpit_Anim0A) EVT_SET(LVarA, 3) EVT_END_SWITCH - EVT_CALL(SetPartSounds, ACTOR_SELF, LVarA, 2, 985, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, LVarA, ACTOR_SOUND_JUMP, 985, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVar9, LVar0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVarA, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVarA, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_ADD(LVar2, 2) @@ -371,14 +371,14 @@ EvtScript N(attack_rock) = { EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, LVarA, EVT_FLOAT(14.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVarA, EVT_FLOAT(0.01)) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVarA, LVar0, LVar1, LVar2, 0, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVarA, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVarA, LVar0, LVar1, LVar2, 0, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVarA, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_IF_EQ(LVar9, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_WAIT(15) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -386,7 +386,7 @@ EvtScript N(attack_rock) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVarA, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVarA, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_ADD(LVar2, 2) @@ -395,7 +395,7 @@ EvtScript N(attack_rock) = { EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, LVarA, EVT_FLOAT(14.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVarA, EVT_FLOAT(0.01)) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVarA, LVar0, LVar1, LVar2, 0, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVarA, LVar0, LVar1, LVar2, 0, TRUE) EVT_SWITCH(LVarA) EVT_CASE_EQ(2) EVT_WAIT(2) @@ -412,8 +412,8 @@ EvtScript N(attack_rock) = { EVT_CALL(GetPartOffset, ACTOR_SELF, LVarA, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -100) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVarA, EVT_FLOAT(1.0)) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVarA, LVar0, LVar1, LVar2, 25, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVarA, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVarA, LVar0, LVar1, LVar2, 25, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVarA, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(10) EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(returnHome)) @@ -437,7 +437,7 @@ EvtScript N(takeTurn) = { EVT_RETURN EVT_END_IF EVT_SET(LVarA, 0) - EVT_CALL(EnemyCreateTargetList, 65538) + EVT_CALL(EnemyCreateTargetList, 0x00010002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -453,7 +453,7 @@ EvtScript N(takeTurn) = { EVT_SET(LVarD, LVar0) EVT_END_SWITCH EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/area/sam/actor/gulpit_rocks.c b/src/battle/area/sam/actor/gulpit_rocks.c index b14a059a83..7a9e33a798 100644 --- a/src/battle/area/sam/actor/gulpit_rocks.c +++ b/src/battle/area/sam/actor/gulpit_rocks.c @@ -73,7 +73,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 1, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 100, @@ -157,7 +157,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar2, ANIM_Gulpit_Anim12) EVT_EXEC_WAIT(N(setAnim)) EVT_EXEC_WAIT(DoNormalHit) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) @@ -166,7 +166,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Gulpit_Anim13) EVT_END_SWITCH EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, 0, 0) EVT_WAIT(30) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN diff --git a/src/battle/area/sam/stage/sam_01.c b/src/battle/area/sam/stage/sam_01.c index 64639de523..1664ac9b97 100644 --- a/src/battle/area/sam/stage/sam_01.c +++ b/src/battle/area/sam/stage/sam_01.c @@ -5,39 +5,41 @@ #define NAMESPACE b_area_sam_sam_01 -#include "common/UnkModelStuff.inc.c" +#include "battle/common/stage/sam_Snowflakes.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_EXEC(N(UnkModelStuffScript1)) + EVT_EXEC(N(EVS_SpawnSnowfall)) EVT_THREAD EVT_SET(LVar0, 22) EVT_SET(LVar1, 1) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) EVT_SET(LVar0, 20) EVT_SET(LVar1, 3) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) EVT_SET(LVar0, 18) EVT_SET(LVar1, 4) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) EVT_SET(LVar0, 16) EVT_SET(LVar1, 2) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_END_THREAD EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - -1, MODEL_saku, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_saku, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -45,7 +47,7 @@ Stage NAMESPACE = { .shape = "sam_bt01_shape", .hit = "sam_bt01_hit", .bg = "yki_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/sam/stage/sam_02.c b/src/battle/area/sam/stage/sam_02.c index bdbc8466be..64f7f61dd9 100644 --- a/src/battle/area/sam/stage/sam_02.c +++ b/src/battle/area/sam/stage/sam_02.c @@ -5,41 +5,43 @@ #define NAMESPACE b_area_sam_sam_02 -#include "common/UnkModelStuff.inc.c" +#include "battle/common/stage/sam_Snowflakes.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetGroupEnabled, 10, 0) - EVT_CALL(SetGroupEnabled, 12, 0) + EVT_CALL(SetGroupVisibility, 10, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 12, MODEL_GROUP_HIDDEN) EVT_THREAD EVT_SET(LVar0, 18) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) EVT_SET(LVar0, 20) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) EVT_SET(LVar0, 22) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) EVT_SET(LVar0, 24) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_END_THREAD - EVT_EXEC(N(UnkModelStuffScript1)) + EVT_EXEC(N(EVS_SpawnSnowfall)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - -1, MODEL_kouri1, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_kouri1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -47,7 +49,7 @@ Stage NAMESPACE = { .shape = "sam_bt02_shape", .hit = "sam_bt02_hit", .bg = "yki_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/sam/stage/sam_02b.c b/src/battle/area/sam/stage/sam_02b.c index fa31142698..82dced6c69 100644 --- a/src/battle/area/sam/stage/sam_02b.c +++ b/src/battle/area/sam/stage/sam_02b.c @@ -5,24 +5,26 @@ #define NAMESPACE b_area_sam_sam_02b -#include "common/UnkModelStuff.inc.c" +#include "battle/common/stage/sam_Snowflakes.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetGroupEnabled, 3, 0) - EVT_CALL(SetGroupEnabled, 26, 0) - EVT_EXEC(N(UnkModelStuffScript1)) + EVT_CALL(SetGroupVisibility, 3, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 26, MODEL_GROUP_HIDDEN) + EVT_EXEC(N(EVS_SpawnSnowfall)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - -1, MODEL_kouri1, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_kouri1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -30,7 +32,7 @@ Stage NAMESPACE = { .shape = "sam_bt02_shape", .hit = "sam_bt02_hit", .bg = "yki_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/sam/stage/sam_02c.c b/src/battle/area/sam/stage/sam_02c.c index af0b47c6e1..fb21afe97d 100644 --- a/src/battle/area/sam/stage/sam_02c.c +++ b/src/battle/area/sam/stage/sam_02c.c @@ -5,25 +5,27 @@ #define NAMESPACE b_area_sam_sam_02c -#include "common/UnkModelStuff.inc.c" +#include "battle/common/stage/sam_Snowflakes.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetGroupEnabled, 3, 0) - EVT_CALL(SetGroupEnabled, 10, 0) - EVT_CALL(SetGroupEnabled, 26, 0) - EVT_EXEC(N(UnkModelStuffScript1)) + EVT_CALL(SetGroupVisibility, 3, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 10, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 26, MODEL_GROUP_HIDDEN) + EVT_EXEC(N(EVS_SpawnSnowfall)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - -1, MODEL_kouri1, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_kouri1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -31,7 +33,7 @@ Stage NAMESPACE = { .shape = "sam_bt02_shape", .hit = "sam_bt02_hit", .bg = "yki_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/sam/stage/sam_02d.c b/src/battle/area/sam/stage/sam_02d.c index 0f5004e336..fdd45898af 100644 --- a/src/battle/area/sam/stage/sam_02d.c +++ b/src/battle/area/sam/stage/sam_02d.c @@ -5,26 +5,28 @@ #define NAMESPACE b_area_sam_sam_02d -#include "common/UnkModelStuff.inc.c" +#include "battle/common/stage/sam_Snowflakes.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetGroupEnabled, 3, 0) - EVT_CALL(SetGroupEnabled, 10, 0) - EVT_CALL(SetGroupEnabled, 12, 0) - EVT_CALL(SetGroupEnabled, 26, 0) - EVT_EXEC(N(UnkModelStuffScript1)) + EVT_CALL(SetGroupVisibility, 3, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 10, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 12, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 26, MODEL_GROUP_HIDDEN) + EVT_EXEC(N(EVS_SpawnSnowfall)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - -1, MODEL_kouri1, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_kouri1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -32,7 +34,7 @@ Stage NAMESPACE = { .shape = "sam_bt02_shape", .hit = "sam_bt02_hit", .bg = "yki_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/sam/stage/sam_03.c b/src/battle/area/sam/stage/sam_03.c index 95d03c2c1f..fc495a42dd 100644 --- a/src/battle/area/sam/stage/sam_03.c +++ b/src/battle/area/sam/stage/sam_03.c @@ -5,43 +5,45 @@ #define NAMESPACE b_area_sam_sam_03 -#include "common/UnkModelStuff.inc.c" +#include "battle/common/stage/sam_Snowflakes.inc.c" void func_8021AE70_626A10(void) { enable_background_wave(); } -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_THREAD EVT_SET(LVar0, 16) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) EVT_SET(LVar0, 25) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript4)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_NoSpin)) EVT_WAIT(5) EVT_SET(LVar0, 22) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript4)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_NoSpin)) EVT_WAIT(5) EVT_SET(LVar0, 19) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript4)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_NoSpin)) EVT_END_THREAD - EVT_EXEC(N(UnkModelStuffScript1)) + EVT_EXEC(N(EVS_SpawnSnowfall)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - -1, MODEL_o278, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_o278, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -49,7 +51,7 @@ Stage NAMESPACE = { .shape = "sam_bt03_shape", .hit = "sam_bt03_hit", .bg = "sam_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/sam2/actor/monstar.c b/src/battle/area/sam2/actor/monstar.c index d1d16b79c3..6a4e71e1a3 100644 --- a/src/battle/area/sam2/actor/monstar.c +++ b/src/battle/area/sam2/actor/monstar.c @@ -85,7 +85,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 20, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -194,7 +194,7 @@ EvtScript N(idle) = { EVT_END_CHILD_THREAD EVT_LABEL(0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(MakeLerp, 0, 10, 30, 10) + EVT_CALL(MakeLerp, 0, 10, 30, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_ADD(LVar0, LVar3) @@ -209,7 +209,7 @@ EvtScript N(idle) = { EVT_GOTO(1) EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar2, LVar3, LVar4) - EVT_CALL(MakeLerp, 0, -10, 30, 10) + EVT_CALL(MakeLerp, 0, -10, 30, EASING_COS_IN_OUT) EVT_LABEL(3) EVT_CALL(UpdateLerp) EVT_ADD(LVar0, LVar3) @@ -331,7 +331,7 @@ EvtScript N(unused) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 40) EVT_SUB(LVar2, 5) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 10, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 300, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 10, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 300, 0) EVT_WAIT(75) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) @@ -362,7 +362,7 @@ EvtScript N(attack) = { EVT_END_THREAD EVT_THREAD EVT_CALL(N(UnkBackgroundFunc3)) - EVT_CALL(MakeLerp, 0, 200, 60, 1) + EVT_CALL(MakeLerp, 0, 200, 60, EASING_QUADRATIC_IN) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -405,7 +405,7 @@ EvtScript N(attack) = { EVT_SET(LVar4, LVar2) EVT_CALL(RandInt, 10, LVar5) EVT_ADD(LVar5, 10) - EVT_CALL(PlayEffect, EFFECT_STAR, LVar0, LVar1, 240, LVar2, LVar3, 0, LVar4, LVar5, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STAR, LVar0, LVar1, 240, LVar2, LVar3, 0, LVar4, LVar5, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD @@ -415,7 +415,7 @@ EvtScript N(attack) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) EVT_ADD(LVar2, 5) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 11, LVar0, LVar1, LVar2, EVT_FLOAT(0.8), 160, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 11, LVar0, LVar1, LVar2, EVT_FLOAT(0.8), 160, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Monstar_Release) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 0, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -425,7 +425,7 @@ EvtScript N(attack) = { EVT_WAIT(170) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Monstar_Idle1) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) - EVT_CALL(MakeLerp, 200, 0, 60, 0) + EVT_CALL(MakeLerp, 200, 0, 60, EASING_LINEAR) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -451,7 +451,7 @@ EvtScript N(attack) = { EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Monstar_Idle1) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) - EVT_CALL(MakeLerp, 200, 0, 60, 0) + EVT_CALL(MakeLerp, 200, 0, 60, EASING_LINEAR) EVT_LABEL(2) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -543,7 +543,7 @@ EvtScript N(OnDeath) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) EVT_ADD(LVar2, 10) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) EVT_CALL(DropStarPoints, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -643,7 +643,7 @@ EvtScript N(OnBurn) = { EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_END_IF EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_END_SWITCH diff --git a/src/battle/area/sam2/stage/sam_01.c b/src/battle/area/sam2/stage/sam_01.c index 08b58c7038..5ac6ff3f9a 100644 --- a/src/battle/area/sam2/stage/sam_01.c +++ b/src/battle/area/sam2/stage/sam_01.c @@ -5,39 +5,41 @@ #define NAMESPACE b_area_sam2_sam_01 -#include "common/UnkModelStuff.inc.c" +#include "battle/common/stage/sam_Snowflakes.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_EXEC(N(UnkModelStuffScript1)) + EVT_EXEC(N(EVS_SpawnSnowfall)) EVT_THREAD EVT_SET(LVar0, 22) EVT_SET(LVar1, 1) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) EVT_SET(LVar0, 20) EVT_SET(LVar1, 3) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) EVT_SET(LVar0, 18) EVT_SET(LVar1, 4) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) EVT_SET(LVar0, 16) EVT_SET(LVar1, 2) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_END_THREAD EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - -1, MODEL_saku, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_saku, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -45,7 +47,7 @@ Stage NAMESPACE = { .shape = "sam_bt01_shape", .hit = "sam_bt01_hit", .bg = "yki_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/sam2/stage/sam_02.c b/src/battle/area/sam2/stage/sam_02.c index aa11aee6bc..13ffb5e284 100644 --- a/src/battle/area/sam2/stage/sam_02.c +++ b/src/battle/area/sam2/stage/sam_02.c @@ -5,41 +5,43 @@ #define NAMESPACE b_area_sam2_sam_02 -#include "common/UnkModelStuff.inc.c" +#include "battle/common/stage/sam_Snowflakes.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetGroupEnabled, 10, 0) - EVT_CALL(SetGroupEnabled, 12, 0) + EVT_CALL(SetGroupVisibility, 10, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 12, MODEL_GROUP_HIDDEN) EVT_THREAD EVT_SET(LVar0, 18) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) EVT_SET(LVar0, 20) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) EVT_SET(LVar0, 22) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) EVT_SET(LVar0, 24) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_END_THREAD - EVT_EXEC(N(UnkModelStuffScript1)) + EVT_EXEC(N(EVS_SpawnSnowfall)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - -1, MODEL_kouri1, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_kouri1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -47,7 +49,7 @@ Stage NAMESPACE = { .shape = "sam_bt02_shape", .hit = "sam_bt02_hit", .bg = "yki_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/sam2/stage/sam_02b.c b/src/battle/area/sam2/stage/sam_02b.c index 49ef4455af..8a66b86bf2 100644 --- a/src/battle/area/sam2/stage/sam_02b.c +++ b/src/battle/area/sam2/stage/sam_02b.c @@ -5,24 +5,26 @@ #define NAMESPACE b_area_sam2_sam_02b -#include "common/UnkModelStuff.inc.c" +#include "battle/common/stage/sam_Snowflakes.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetGroupEnabled, 3, 0) - EVT_CALL(SetGroupEnabled, 26, 0) - EVT_EXEC(N(UnkModelStuffScript1)) + EVT_CALL(SetGroupVisibility, 3, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 26, MODEL_GROUP_HIDDEN) + EVT_EXEC(N(EVS_SpawnSnowfall)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - -1, MODEL_kouri1, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_kouri1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -30,7 +32,7 @@ Stage NAMESPACE = { .shape = "sam_bt02_shape", .hit = "sam_bt02_hit", .bg = "yki_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/sam2/stage/sam_02c.c b/src/battle/area/sam2/stage/sam_02c.c index d2450cdc7a..fc6acb7901 100644 --- a/src/battle/area/sam2/stage/sam_02c.c +++ b/src/battle/area/sam2/stage/sam_02c.c @@ -5,25 +5,27 @@ #define NAMESPACE b_area_sam2_sam_02c -#include "common/UnkModelStuff.inc.c" +#include "battle/common/stage/sam_Snowflakes.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetGroupEnabled, 3, 0) - EVT_CALL(SetGroupEnabled, 10, 0) - EVT_CALL(SetGroupEnabled, 26, 0) - EVT_EXEC(N(UnkModelStuffScript1)) + EVT_CALL(SetGroupVisibility, 3, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 10, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 26, MODEL_GROUP_HIDDEN) + EVT_EXEC(N(EVS_SpawnSnowfall)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - -1, MODEL_kouri1, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_kouri1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -31,7 +33,7 @@ Stage NAMESPACE = { .shape = "sam_bt02_shape", .hit = "sam_bt02_hit", .bg = "yki_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/sam2/stage/sam_02d.c b/src/battle/area/sam2/stage/sam_02d.c index c298b2ece2..53c3caccc0 100644 --- a/src/battle/area/sam2/stage/sam_02d.c +++ b/src/battle/area/sam2/stage/sam_02d.c @@ -5,26 +5,28 @@ #define NAMESPACE b_area_sam2_sam_02d -#include "common/UnkModelStuff.inc.c" +#include "battle/common/stage/sam_Snowflakes.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetGroupEnabled, 3, 0) - EVT_CALL(SetGroupEnabled, 10, 0) - EVT_CALL(SetGroupEnabled, 12, 0) - EVT_CALL(SetGroupEnabled, 26, 0) - EVT_EXEC(N(UnkModelStuffScript1)) + EVT_CALL(SetGroupVisibility, 3, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 10, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 12, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 26, MODEL_GROUP_HIDDEN) + EVT_EXEC(N(EVS_SpawnSnowfall)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - -1, MODEL_kouri1, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_kouri1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -32,7 +34,7 @@ Stage NAMESPACE = { .shape = "sam_bt02_shape", .hit = "sam_bt02_hit", .bg = "yki_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/sam2/stage/sam_03.c b/src/battle/area/sam2/stage/sam_03.c index d4635590a0..1e76412baf 100644 --- a/src/battle/area/sam2/stage/sam_03.c +++ b/src/battle/area/sam2/stage/sam_03.c @@ -5,43 +5,45 @@ #define NAMESPACE b_area_sam2_sam_03 -#include "common/UnkModelStuff.inc.c" +#include "battle/common/stage/sam_Snowflakes.inc.c" void func_80219E40_63F020(void) { enable_background_wave(); } -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_THREAD EVT_SET(LVar0, 16) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript3)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_RandomSpin)) EVT_WAIT(5) EVT_SET(LVar0, 25) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript4)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_NoSpin)) EVT_WAIT(5) EVT_SET(LVar0, 22) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript4)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_NoSpin)) EVT_WAIT(5) EVT_SET(LVar0, 19) EVT_SET(LVar1, 0) - EVT_EXEC(N(UnkModelStuffScript4)) + EVT_EXEC(N(EVS_AnimateHangingSnowflake_NoSpin)) EVT_END_THREAD - EVT_EXEC(N(UnkModelStuffScript1)) + EVT_EXEC(N(EVS_SpawnSnowfall)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - -1, MODEL_o278, 0, +s32 N(ForegroundModels)[] = { + -1, + MODEL_o278, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -49,7 +51,7 @@ Stage NAMESPACE = { .shape = "sam_bt03_shape", .hit = "sam_bt03_hit", .bg = "sam_bg", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/sbk/stage/sbk_02.c b/src/battle/area/sbk/stage/sbk_02.c index c432a71123..538be27d1d 100644 --- a/src/battle/area/sbk/stage/sbk_02.c +++ b/src/battle/area/sbk/stage/sbk_02.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_sbk_sbk_02 -#include "common/UnkFloatFunc3.inc.c" +#include "common/UpdateSunPos.inc.c" #include "common/GetModelPos.inc.c" @@ -19,7 +19,7 @@ EvtScript N(8021F720) = { EVT_IF_GT(LVar7, 3599) EVT_SUB(LVar7, 3600) EVT_END_IF - EVT_CALL(N(UnkFloatFunc3), LVar7, LVar0, LVar1, LVar2) + EVT_CALL(N(UpdateSunPos), LVar7, LVar0, LVar1, LVar2) EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_GOTO(0) @@ -27,7 +27,7 @@ EvtScript N(8021F720) = { EVT_END }; -EvtScript N(beforeBattle_8021F800) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_SET(LVar0, 1) EVT_SET(LVar1, 0) @@ -38,18 +38,22 @@ EvtScript N(beforeBattle_8021F800) = { EVT_SET(LVar0, 5) EVT_SET(LVar1, 240) EVT_EXEC(N(8021F720)) - EVT_PLAY_EFFECT(EFFECT_SUN) + EVT_PLAY_EFFECT(EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8021F8E8) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_8021F8F8)[] = { - 0x00000028, 0x00000027, 0x00000026, 0x00000025, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x00000028, + 0x00000027, + 0x00000026, + 0x00000025, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -57,7 +61,7 @@ Stage NAMESPACE = { .shape = "sbk_bt02_shape", .hit = "sbk_bt02_hit", .bg = "sbk_bg", - .preBattle = &N(beforeBattle_8021F800), - .postBattle = &N(afterBattle_8021F8E8), - .foregroundModelList = N(foregroundModelList_8021F8F8), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/tik/actor/dark_koopa.c b/src/battle/area/tik/actor/dark_koopa.c index 3b15838655..90043a0a79 100644 --- a/src/battle/area/tik/actor/dark_koopa.c +++ b/src/battle/area/tik/actor/dark_koopa.c @@ -74,7 +74,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 60, .airLiftChance = 85, @@ -311,7 +311,7 @@ EvtScript N(idle) = { EVT_CASE_EQ(1) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_THREAD - EVT_CALL(MakeLerp, 720, 0, 30, 10) + EVT_CALL(MakeLerp, 720, 0, 30, EASING_COS_IN_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) EVT_CALL(SetActorYaw, ACTOR_SELF, LVar0) @@ -326,7 +326,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_END_THREAD EVT_WAIT(8) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, 7) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, ACTOR_DECORATION_WHIRLWIND) EVT_WAIT(15) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 1) EVT_WAIT(8) @@ -399,7 +399,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Hurt) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD @@ -584,11 +584,11 @@ EvtScript N(attackShellToss) = { EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 4) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(3) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellSpin) @@ -596,7 +596,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -631,7 +631,7 @@ EvtScript N(attackShellToss) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Panic) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) @@ -711,17 +711,17 @@ EvtScript N(attackDizzyTornado) = { EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 4) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(3) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2026) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, 7) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, ACTOR_DECORATION_WHIRLWIND) EVT_WAIT(40) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -738,7 +738,7 @@ EvtScript N(attackDizzyTornado) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Panic) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) @@ -758,7 +758,7 @@ EvtScript N(attackDizzyTornado) = { EVT_THREAD EVT_CALL(WasStatusInflicted, ACTOR_SELF, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(MakeLerp, 0, 1080, 30, 10) + EVT_CALL(MakeLerp, 0, 0x00000438, 30, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(SetActorYaw, ACTOR_PLAYER, LVar0) @@ -796,18 +796,18 @@ EvtScript N(standUp) = { EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 9, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_WAIT(30) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(0.5)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_WAIT(20) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(0.5)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ToppleStruggle) @@ -831,8 +831,8 @@ EvtScript N(standUp) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) 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(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, FALSE) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(2) diff --git a/src/battle/area/tik/actor/dark_paratroopa.c b/src/battle/area/tik/actor/dark_paratroopa.c index 3ac90ac7b7..23073ccbea 100644 --- a/src/battle/area/tik/actor/dark_paratroopa.c +++ b/src/battle/area/tik/actor/dark_paratroopa.c @@ -137,7 +137,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 50, .airLiftChance = 90, @@ -244,7 +244,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_step))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) EVT_LOOP(20) EVT_LABEL(1) @@ -261,7 +261,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_step))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations2))) EVT_LOOP(40) EVT_LABEL(2) @@ -282,7 +282,7 @@ EvtScript N(returnHome) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Idle) EVT_RETURN EVT_END @@ -400,7 +400,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Idle) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Run) EVT_SET_CONST(LVar2, ANIM_ParaTroopa_Dark_Hurt) @@ -435,7 +435,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 30, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -16, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -16, EASING_LINEAR) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_B) EVT_WAIT(5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) @@ -444,23 +444,23 @@ EvtScript N(takeTurn) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(AddGoalPos, ACTOR_SELF, 6, 6, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(6) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 25) EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_ShellDive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -502,7 +502,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -513,20 +513,20 @@ EvtScript N(takeTurn) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(AddGoalPos, ACTOR_SELF, 6, 6, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(6) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_ShellDive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) @@ -552,7 +552,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, -10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Idle) EVT_END_THREAD - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 30, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 30, EASING_LINEAR) EVT_WAIT(10) EVT_CALL(YieldTurn) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) @@ -576,7 +576,7 @@ EvtScript N(fall) = { EVT_SUB(LVar2, 2) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Hurt) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarA) EVT_IF_EQ(LVarA, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -586,20 +586,20 @@ EvtScript N(fall) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 128, 7) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.3)) EVT_END_THREAD - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_LOOP(10) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) @@ -608,18 +608,18 @@ EvtScript N(fall) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_THREAD EVT_LOOP(10) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 150, 7) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.3)) EVT_END_THREAD - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF EVT_CALL(GetIndexFromHome, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) @@ -627,12 +627,12 @@ EvtScript N(fall) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Idle) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_koopa))) EVT_CALL(BindNextTurn, ACTOR_SELF, 0) EVT_EXEC_WAIT(N(init_koopa)) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_DARK_KOOPA) - 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_IF_NE(LVarA, 0) @@ -861,7 +861,7 @@ EvtScript N(idle_koopa) = { EVT_CASE_EQ(1) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_THREAD - EVT_CALL(MakeLerp, 720, 0, 30, 10) + EVT_CALL(MakeLerp, 720, 0, 30, EASING_COS_IN_OUT) EVT_LABEL(10) EVT_CALL(UpdateLerp) EVT_CALL(SetActorYaw, ACTOR_SELF, LVar0) @@ -876,7 +876,7 @@ EvtScript N(idle_koopa) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_END_THREAD EVT_WAIT(8) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, 7) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, ACTOR_DECORATION_WHIRLWIND) EVT_WAIT(15) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 1) EVT_WAIT(8) @@ -949,7 +949,7 @@ EvtScript N(handleEvent_koopa) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_flipped))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Hurt) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD @@ -1134,11 +1134,11 @@ EvtScript N(koopa_attackShellToss) = { EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 4) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(3) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellSpin) @@ -1146,7 +1146,7 @@ EvtScript N(koopa_attackShellToss) = { EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -1181,7 +1181,7 @@ EvtScript N(koopa_attackShellToss) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Panic) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) @@ -1261,17 +1261,17 @@ EvtScript N(koopa_attackDizzyTornado) = { EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 4) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(3) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2026) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, 7) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, ACTOR_DECORATION_WHIRLWIND) EVT_WAIT(40) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -1288,7 +1288,7 @@ EvtScript N(koopa_attackDizzyTornado) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Panic) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) @@ -1308,7 +1308,7 @@ EvtScript N(koopa_attackDizzyTornado) = { EVT_THREAD EVT_CALL(WasStatusInflicted, ACTOR_SELF, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(MakeLerp, 0, 1080, 30, 10) + EVT_CALL(MakeLerp, 0, 0x00000438, 30, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(SetActorYaw, ACTOR_PLAYER, LVar0) @@ -1346,18 +1346,18 @@ EvtScript N(koopa_standUp) = { EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 9, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_WAIT(30) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(0.5)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_WAIT(20) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(0.5)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ToppleStruggle) @@ -1381,8 +1381,8 @@ EvtScript N(koopa_standUp) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) 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(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, FALSE) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(2) diff --git a/src/battle/area/tik/actor/gloomba.c b/src/battle/area/tik/actor/gloomba.c index b95022129a..e48b47e668 100644 --- a/src/battle/area/tik/actor/gloomba.c +++ b/src/battle/area/tik/actor/gloomba.c @@ -64,7 +64,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 70, .airLiftChance = 90, @@ -371,7 +371,7 @@ EvtScript N(takeTurn) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) diff --git a/src/battle/area/tik/actor/paragloomba.c b/src/battle/area/tik/actor/paragloomba.c index 7c88e0f333..7cf17ae1e5 100644 --- a/src/battle/area/tik/actor/paragloomba.c +++ b/src/battle/area/tik/actor/paragloomba.c @@ -140,7 +140,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 65, .airLiftChance = 95, @@ -218,7 +218,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_step))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -232,7 +232,7 @@ EvtScript N(idle) = { EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations))) EVT_LOOP(40) EVT_LABEL(2) @@ -252,7 +252,7 @@ EvtScript N(returnHome) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dark_Idle) EVT_RETURN EVT_END @@ -347,7 +347,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_Paragoomba_Dark_Idle) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_Dark_Run) EVT_SET_CONST(LVar2, ANIM_Paragoomba_Dark_Hurt) @@ -382,7 +382,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -394,7 +394,7 @@ EvtScript N(takeTurn) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dark_Dive) @@ -402,14 +402,14 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) EVT_SET(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dark_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_THREAD EVT_LOOP(4) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DF) @@ -417,7 +417,7 @@ EvtScript N(takeTurn) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dark_Miss) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 2, EVT_FLOAT(3.0)) EVT_WAIT(10) EVT_IF_EQ(LVarA, 5) @@ -444,7 +444,7 @@ EvtScript N(takeTurn) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dark_Dive) @@ -452,11 +452,11 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dark_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_END_SWITCH EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) @@ -468,7 +468,7 @@ EvtScript N(takeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dark_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(5) EVT_CALL(YieldTurn) @@ -501,7 +501,7 @@ EvtScript N(fall) = { EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Dark_Hurt) EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) @@ -509,42 +509,42 @@ EvtScript N(fall) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 100, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.3)) EVT_END_THREAD - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar3) EVT_IF_EQ(LVar3, 15) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Dark_Hurt) EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar4, 10) EVT_ADD(LVar5, 5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0) EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_LOOP(10) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(GetIndexFromHome, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) EVT_CALL(SetGoalToIndex, ACTOR_SELF, LVar0) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Dark_Idle) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_gloomba))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_GLOOMBA) EVT_EXEC_WAIT(N(init_gloomba)) - 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_RETURN @@ -842,7 +842,7 @@ EvtScript N(takeTurn_gloomba) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) diff --git a/src/battle/area/tik/actor/spiked_gloomba.c b/src/battle/area/tik/actor/spiked_gloomba.c index 4532d93ea0..ea2cce43e7 100644 --- a/src/battle/area/tik/actor/spiked_gloomba.c +++ b/src/battle/area/tik/actor/spiked_gloomba.c @@ -65,7 +65,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 65, .airLiftChance = 90, @@ -286,7 +286,7 @@ EvtScript N(handleEvent) = { EVT_ELSE EVT_ADD(LVar1, 26) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_CASE_DEFAULT EVT_END_SWITCH @@ -387,7 +387,7 @@ EvtScript N(takeTurn) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) diff --git a/src/battle/area/tik/stage/tik_01.c b/src/battle/area/tik/stage/tik_01.c index d1f624ea7b..80dcbde5f5 100644 --- a/src/battle/area/tik/stage/tik_01.c +++ b/src/battle/area/tik/stage/tik_01.c @@ -75,10 +75,10 @@ EvtScript N(80230498) = { EVT_ADD(LVarA, 4) EVT_SET(LVarB, ArrayVar(0)) EVT_SET(LVarC, ArrayVar(1)) - EVT_CALL(EnableModel, LVar1, 1) - EVT_CALL(EnableModel, LVar4, 1) - EVT_CALL(EnableModel, LVar7, 1) - EVT_CALL(EnableModel, LVarA, 1) + EVT_CALL(EnableModel, LVar1, TRUE) + EVT_CALL(EnableModel, LVar4, TRUE) + EVT_CALL(EnableModel, LVar7, TRUE) + EVT_CALL(EnableModel, LVarA, TRUE) EVT_LOOP(5) EVT_ADD(LVar0, 1) EVT_ADD(LVar2, 1) @@ -119,10 +119,10 @@ EvtScript N(80230498) = { EVT_CALL(ScaleModel, LVarA, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(EnableModel, LVar1, 0) - EVT_CALL(EnableModel, LVar4, 0) - EVT_CALL(EnableModel, LVar7, 0) - EVT_CALL(EnableModel, LVarA, 0) + EVT_CALL(EnableModel, LVar1, FALSE) + EVT_CALL(EnableModel, LVar4, FALSE) + EVT_CALL(EnableModel, LVar7, FALSE) + EVT_CALL(EnableModel, LVarA, FALSE) EVT_RETURN EVT_END }; @@ -140,8 +140,8 @@ EvtScript N(80230968) = { EVT_CALL(RandInt, 200, LVar0) EVT_ADD(LVar0, 50) EVT_WAIT(LVar0) - EVT_CALL(EnableModel, ArrayVar(5), 1) - EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), 1) + EVT_CALL(EnableModel, ArrayVar(5), TRUE) + EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), EASING_QUADRATIC_IN) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, ArrayVar(5), ArrayVar(0), LVar0, ArrayVar(1)) @@ -154,7 +154,7 @@ EvtScript N(80230968) = { EVT_GOTO(1) EVT_END_IF EVT_LABEL(10) - EVT_CALL(EnableModel, ArrayVar(5), 0) + EVT_CALL(EnableModel, ArrayVar(5), FALSE) EVT_EXEC_WAIT(N(80230498)) EVT_GOTO(0) EVT_RETURN @@ -190,7 +190,7 @@ EvtScript N(80230B30) = { EVT_ADD(LVarF, 5) EVT_END_LOOP EVT_END_LOOP - EVT_CALL(EnableModel, 16, 0) + EVT_CALL(EnableModel, 16, FALSE) EVT_RETURN EVT_END }; @@ -199,9 +199,9 @@ s32 N(80230CEC)[] = { 1, -100, -50, 200, 100, 200, 0, 60, 4, }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 13) EVT_SET(LVar1, 0) EVT_SET(LVar2, 0) @@ -213,7 +213,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -222,6 +222,6 @@ Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt01_shape", .hit = "tik_bt01_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/tik/stage/tik_02.c b/src/battle/area/tik/stage/tik_02.c index de12f9838e..542550db56 100644 --- a/src/battle/area/tik/stage/tik_02.c +++ b/src/battle/area/tik/stage/tik_02.c @@ -75,10 +75,10 @@ EvtScript N(80231098) = { EVT_ADD(LVarA, 4) EVT_SET(LVarB, ArrayVar(0)) EVT_SET(LVarC, ArrayVar(1)) - EVT_CALL(EnableModel, LVar1, 1) - EVT_CALL(EnableModel, LVar4, 1) - EVT_CALL(EnableModel, LVar7, 1) - EVT_CALL(EnableModel, LVarA, 1) + EVT_CALL(EnableModel, LVar1, TRUE) + EVT_CALL(EnableModel, LVar4, TRUE) + EVT_CALL(EnableModel, LVar7, TRUE) + EVT_CALL(EnableModel, LVarA, TRUE) EVT_LOOP(5) EVT_ADD(LVar0, 1) EVT_ADD(LVar2, 1) @@ -119,10 +119,10 @@ EvtScript N(80231098) = { EVT_CALL(ScaleModel, LVarA, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(EnableModel, LVar1, 0) - EVT_CALL(EnableModel, LVar4, 0) - EVT_CALL(EnableModel, LVar7, 0) - EVT_CALL(EnableModel, LVarA, 0) + EVT_CALL(EnableModel, LVar1, FALSE) + EVT_CALL(EnableModel, LVar4, FALSE) + EVT_CALL(EnableModel, LVar7, FALSE) + EVT_CALL(EnableModel, LVarA, FALSE) EVT_RETURN EVT_END }; @@ -140,8 +140,8 @@ EvtScript N(80231568) = { EVT_CALL(RandInt, 200, LVar0) EVT_ADD(LVar0, 50) EVT_WAIT(LVar0) - EVT_CALL(EnableModel, ArrayVar(5), 1) - EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), 1) + EVT_CALL(EnableModel, ArrayVar(5), TRUE) + EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), EASING_QUADRATIC_IN) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, ArrayVar(5), ArrayVar(0), LVar0, ArrayVar(1)) @@ -154,7 +154,7 @@ EvtScript N(80231568) = { EVT_GOTO(1) EVT_END_IF EVT_LABEL(10) - EVT_CALL(EnableModel, ArrayVar(5), 0) + EVT_CALL(EnableModel, ArrayVar(5), FALSE) EVT_EXEC_WAIT(N(80231098)) EVT_GOTO(0) EVT_RETURN @@ -190,7 +190,7 @@ EvtScript N(80231730) = { EVT_ADD(LVarF, 5) EVT_END_LOOP EVT_END_LOOP - EVT_CALL(EnableModel, 16, 0) + EVT_CALL(EnableModel, 16, FALSE) EVT_RETURN EVT_END }; @@ -199,9 +199,9 @@ s32 N(802318EC)[] = { 1, -100, -50, 200, 100, 200, 0, 60, 4, }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, N(802318EC)) EVT_EXEC(N(80231730)) EVT_SET(LVar0, 14) @@ -213,7 +213,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -222,6 +222,6 @@ Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt02_shape", .hit = "tik_bt02_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/tik/stage/tik_03.c b/src/battle/area/tik/stage/tik_03.c index 01a21e8b54..c623cd98dc 100644 --- a/src/battle/area/tik/stage/tik_03.c +++ b/src/battle/area/tik/stage/tik_03.c @@ -22,10 +22,10 @@ EvtScript N(802319F0) = { EVT_ADD(LVarA, 4) EVT_SET(LVarB, ArrayVar(0)) EVT_SET(LVarC, ArrayVar(1)) - EVT_CALL(EnableModel, LVar1, 1) - EVT_CALL(EnableModel, LVar4, 1) - EVT_CALL(EnableModel, LVar7, 1) - EVT_CALL(EnableModel, LVarA, 1) + EVT_CALL(EnableModel, LVar1, TRUE) + EVT_CALL(EnableModel, LVar4, TRUE) + EVT_CALL(EnableModel, LVar7, TRUE) + EVT_CALL(EnableModel, LVarA, TRUE) EVT_LOOP(5) EVT_ADD(LVar0, 1) EVT_ADD(LVar2, 1) @@ -66,10 +66,10 @@ EvtScript N(802319F0) = { EVT_CALL(ScaleModel, LVarA, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(EnableModel, LVar1, 0) - EVT_CALL(EnableModel, LVar4, 0) - EVT_CALL(EnableModel, LVar7, 0) - EVT_CALL(EnableModel, LVarA, 0) + EVT_CALL(EnableModel, LVar1, FALSE) + EVT_CALL(EnableModel, LVar4, FALSE) + EVT_CALL(EnableModel, LVar7, FALSE) + EVT_CALL(EnableModel, LVarA, FALSE) EVT_RETURN EVT_END }; @@ -87,8 +87,8 @@ EvtScript N(80231EC0) = { EVT_CALL(RandInt, 200, LVar0) EVT_ADD(LVar0, 50) EVT_WAIT(LVar0) - EVT_CALL(EnableModel, ArrayVar(5), 1) - EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), 1) + EVT_CALL(EnableModel, ArrayVar(5), TRUE) + EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), EASING_QUADRATIC_IN) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, ArrayVar(5), ArrayVar(0), LVar0, ArrayVar(1)) @@ -101,7 +101,7 @@ EvtScript N(80231EC0) = { EVT_GOTO(1) EVT_END_IF EVT_LABEL(10) - EVT_CALL(EnableModel, ArrayVar(5), 0) + EVT_CALL(EnableModel, ArrayVar(5), FALSE) EVT_EXEC_WAIT(N(802319F0)) EVT_GOTO(0) EVT_RETURN @@ -137,7 +137,7 @@ EvtScript N(80232088) = { EVT_ADD(LVarF, 5) EVT_END_LOOP EVT_END_LOOP - EVT_CALL(EnableModel, 18, 0) + EVT_CALL(EnableModel, 18, FALSE) EVT_RETURN EVT_END }; @@ -146,16 +146,16 @@ s32 N(80232244)[] = { 1, -100, -50, 200, 100, 200, 0, 60, 4, }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, N(80232244)) EVT_EXEC(N(80232088)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -164,7 +164,7 @@ Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt03_shape", .hit = "tik_bt03_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/tik/stage/tik_04.c b/src/battle/area/tik/stage/tik_04.c index c0b90d2645..c875251456 100644 --- a/src/battle/area/tik/stage/tik_04.c +++ b/src/battle/area/tik/stage/tik_04.c @@ -3,20 +3,20 @@ #define NAMESPACE b_area_tik_tik_04 -#include "common/UnkModelStuff2.inc.c" +#include "battle/common/stage/WaterEffects.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_THREAD EVT_SET(LVar0, 15) - EVT_EXEC(N(script2)) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_WAIT(5) EVT_SET(LVar0, 16) - EVT_EXEC(N(script2)) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_WAIT(5) EVT_SET(LVar0, 17) - EVT_EXEC(N(script2)) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_END_THREAD EVT_THREAD EVT_WAIT(5) @@ -37,7 +37,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -46,8 +46,8 @@ Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt04_shape", .hit = "tik_bt04_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/tik/stage/tik_05.c b/src/battle/area/tik/stage/tik_05.c index 637eafaa3c..e3eebe860d 100644 --- a/src/battle/area/tik/stage/tik_05.c +++ b/src/battle/area/tik/stage/tik_05.c @@ -6,9 +6,9 @@ #include "world/common/atomic/TexturePan.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_CALL(SetTexPanner, MODEL_taki1, TEX_PANNER_1) EVT_CALL(EnableTexPanning, MODEL_taki1, TRUE) EVT_THREAD @@ -31,21 +31,22 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_taki1, 0, +s32 N(ForegroundModels)[] = { + MODEL_taki1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt05_shape", .hit = "tik_bt05_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/tik2/actor/blooper.c b/src/battle/area/tik2/actor/blooper.c index d4ba4c511c..46228526e5 100644 --- a/src/battle/area/tik2/actor/blooper.c +++ b/src/battle/area/tik2/actor/blooper.c @@ -33,7 +33,7 @@ EvtScript N(FloatToPos) = { EVT_MULF(LVar9, EVT_FLOAT(0.33)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar7, LVar8, LVar9) - EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) @@ -56,7 +56,7 @@ EvtScript N(FloatToPos) = { EVT_MULF(LVar9, EVT_FLOAT(0.33)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar7, LVar8, LVar9) - EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) @@ -67,7 +67,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) EVT_RETURN EVT_END }; @@ -186,7 +186,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 30, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -234,7 +234,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, 11) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, EASING_SIN_OUT) EVT_LABEL(11) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, STATUS_FLAG_SLEEP | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) @@ -255,7 +255,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, 11) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, EASING_SIN_OUT) EVT_WAIT(3) EVT_LABEL(12) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -270,7 +270,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN @@ -523,7 +523,7 @@ EvtScript N(attackInkBlast) = { EVT_MULF(LVar9, EVT_FLOAT(0.5)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar7, LVar8, LVar9) - EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) @@ -534,14 +534,14 @@ EvtScript N(attackInkBlast) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim03) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_SUB(LVarB, 30) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.2)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) - EVT_CALL(FlyToGoal, ACTOR_SELF, 16, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 16, 0, EASING_LINEAR) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 40, 0) diff --git a/src/battle/area/tik2/actor/blooper_baby.c b/src/battle/area/tik2/actor/blooper_baby.c index 387f3b576d..f40541e27a 100644 --- a/src/battle/area/tik2/actor/blooper_baby.c +++ b/src/battle/area/tik2/actor/blooper_baby.c @@ -35,7 +35,7 @@ EvtScript N(FloatToPos) = { EVT_MULF(LVar9, EVT_FLOAT(0.33)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar7, LVar8, LVar9) - EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BabyBlooper_Anim00) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BabyBlooper_Anim01) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) @@ -58,7 +58,7 @@ EvtScript N(FloatToPos) = { EVT_MULF(LVar9, EVT_FLOAT(0.33)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar7, LVar8, LVar9) - EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BabyBlooper_Anim00) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BabyBlooper_Anim01) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) @@ -69,7 +69,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35F) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) EVT_RETURN EVT_END }; @@ -186,7 +186,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 6, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -220,7 +220,7 @@ EvtScript N(init) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 8, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 8, 0, EASING_LINEAR) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35F) EVT_CALL(N(StartRumbleWithParams), 80, 20) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) @@ -229,7 +229,7 @@ EvtScript N(init) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 12, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, 12, -2, EASING_CUBIC_OUT) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(HPBarToHome, ACTOR_SELF) @@ -258,7 +258,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, 11) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, EASING_SIN_OUT) EVT_LABEL(11) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, STATUS_FLAG_SLEEP | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) @@ -279,7 +279,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, 11) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, EASING_SIN_OUT) EVT_WAIT(3) EVT_LABEL(12) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -294,7 +294,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN @@ -467,13 +467,13 @@ EvtScript N(takeTurn) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BabyBlooper_Anim08) - EVT_CALL(ShowMessageBox, 49, 32767) - EVT_CALL(ShowActionHud, 1) + EVT_CALL(ShowMessageBox, BTL_MSG_31, 0x00007FFF) + EVT_CALL(ShowActionHud, TRUE) EVT_CALL(LoadActionCommand, ACTION_COMMAND_STOP_LEECH) EVT_CALL(action_command_stop_leech_init) EVT_CALL(SetupMashMeter, 1, 15, 0, 0, 0, 0) EVT_WAIT(10) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(action_command_stop_leech_start, 0, 32767, 3) EVT_LOOP(5) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) @@ -571,7 +571,7 @@ EvtScript N(takeTurn) = { EVT_END_THREAD EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0) EVT_CALL(GetEnemyMaxHP, ACTOR_SELF, LVar1) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_ADD(LVar0, LVar3) diff --git a/src/battle/area/tik2/actor/electro_blooper.c b/src/battle/area/tik2/actor/electro_blooper.c index 1b2af93f96..70bb7e4cef 100644 --- a/src/battle/area/tik2/actor/electro_blooper.c +++ b/src/battle/area/tik2/actor/electro_blooper.c @@ -34,7 +34,7 @@ EvtScript N(FloatToPos) = { EVT_MULF(LVar9, EVT_FLOAT(0.33)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar7, LVar8, LVar9) - EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) @@ -57,7 +57,7 @@ EvtScript N(FloatToPos) = { EVT_MULF(LVar9, EVT_FLOAT(0.33)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar7, LVar8, LVar9) - EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) @@ -68,7 +68,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) EVT_RETURN EVT_END }; @@ -217,7 +217,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 50, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -336,7 +336,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, 11) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, EASING_SIN_OUT) EVT_LABEL(11) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, STATUS_FLAG_SLEEP | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) @@ -357,7 +357,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, 11) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, EASING_SIN_OUT) EVT_WAIT(3) EVT_LABEL(12) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -372,7 +372,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN @@ -526,7 +526,7 @@ EvtScript N(electricCharge) = { EVT_CALL(N(FadeBackgroundToBlack)) EVT_CALL(N(StartRumbleWithParams), 70, 80) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 40, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 40, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim09) EVT_WAIT(10) @@ -783,7 +783,7 @@ EvtScript N(attackInkBlast) = { EVT_MULF(LVar9, EVT_FLOAT(0.5)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar7, LVar8, LVar9) - EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) @@ -794,14 +794,14 @@ EvtScript N(attackInkBlast) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim03) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_SUB(LVarB, 30) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.2)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) - EVT_CALL(FlyToGoal, ACTOR_SELF, 16, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 16, 0, EASING_LINEAR) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 40, 0) @@ -861,7 +861,7 @@ EvtScript N(charge) = { EVT_ADD(LVar1, 18) EVT_SETF(LVar3, EVT_FLOAT(0.64)) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, LVar3, -1, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, LVar3, -1, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 1, LVarF) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35C) EVT_CALL(SetPartEventFlags, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000 | ACTOR_EVENT_FLAG_ELECTRIFIED) diff --git a/src/battle/area/tik2/actor/super_blooper.c b/src/battle/area/tik2/actor/super_blooper.c index ee14b8cdef..bc194c40fe 100644 --- a/src/battle/area/tik2/actor/super_blooper.c +++ b/src/battle/area/tik2/actor/super_blooper.c @@ -35,7 +35,7 @@ EvtScript N(FloatToPos) = { EVT_MULF(LVar9, EVT_FLOAT(0.33)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar7, LVar8, LVar9) - EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) @@ -58,7 +58,7 @@ EvtScript N(FloatToPos) = { EVT_MULF(LVar9, EVT_FLOAT(0.33)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar7, LVar8, LVar9) - EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) @@ -69,7 +69,7 @@ EvtScript N(FloatToPos) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) EVT_RETURN EVT_END }; @@ -221,7 +221,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 70, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -291,7 +291,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, 11) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, EASING_SIN_OUT) EVT_LABEL(11) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, STATUS_FLAG_SLEEP | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) @@ -312,7 +312,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, 11) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 0, EASING_SIN_OUT) EVT_WAIT(3) EVT_LABEL(12) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -327,7 +327,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_WAIT(1) EVT_GOTO(0) EVT_RETURN @@ -601,7 +601,7 @@ EvtScript N(attackInkBlast) = { EVT_MULF(LVar9, EVT_FLOAT(0.5)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar7, LVar8, LVar9) - EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) @@ -612,14 +612,14 @@ EvtScript N(attackInkBlast) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, 5) + EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim03) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_SUB(LVarB, 30) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.2)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) - EVT_CALL(FlyToGoal, ACTOR_SELF, 16, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 16, 0, EASING_LINEAR) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 40, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -40) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DE) @@ -676,7 +676,7 @@ EvtScript N(makeBabies) = { EVT_CALL(N(FadeBackgroundToBlack)) EVT_CALL(N(StartRumbleWithParams), 50, 20) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -687,7 +687,7 @@ EvtScript N(makeBabies) = { EVT_WAIT(15) EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(0.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(0.4)) EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -698,7 +698,7 @@ EvtScript N(makeBabies) = { EVT_WAIT(15) EVT_CALL(N(StartRumbleWithParams), 150, 20) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_H) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -746,7 +746,7 @@ EvtScript N(getEnraged) = { EVT_CALL(N(FadeBackgroundToBlack)) EVT_CALL(N(StartRumbleWithParams), 70, 80) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 40, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 40, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim09) EVT_WAIT(10) @@ -875,7 +875,7 @@ EvtScript N(enrage) = { EVT_CALL(func_8026EBF8, ACTOR_SELF, 1, 0, 2, 0, 6, 12, 6, 0, 0) EVT_CALL(func_8026EA7C, ACTOR_SELF, 1, 15) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_enraged))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, TRUE) EVT_RETURN EVT_END }; @@ -884,7 +884,7 @@ EvtScript N(unEnrage) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(func_8026ED20, ACTOR_SELF, 1, 0) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, FALSE) EVT_RETURN EVT_END }; diff --git a/src/battle/area/tik2/stage/tik_01.c b/src/battle/area/tik2/stage/tik_01.c index efb16c8e91..13d77814bf 100644 --- a/src/battle/area/tik2/stage/tik_01.c +++ b/src/battle/area/tik2/stage/tik_01.c @@ -75,10 +75,10 @@ EvtScript N(80230498) = { EVT_ADD(LVarA, 4) EVT_SET(LVarB, ArrayVar(0)) EVT_SET(LVarC, ArrayVar(1)) - EVT_CALL(EnableModel, LVar1, 1) - EVT_CALL(EnableModel, LVar4, 1) - EVT_CALL(EnableModel, LVar7, 1) - EVT_CALL(EnableModel, LVarA, 1) + EVT_CALL(EnableModel, LVar1, TRUE) + EVT_CALL(EnableModel, LVar4, TRUE) + EVT_CALL(EnableModel, LVar7, TRUE) + EVT_CALL(EnableModel, LVarA, TRUE) EVT_LOOP(5) EVT_ADD(LVar0, 1) EVT_ADD(LVar2, 1) @@ -119,10 +119,10 @@ EvtScript N(80230498) = { EVT_CALL(ScaleModel, LVarA, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(EnableModel, LVar1, 0) - EVT_CALL(EnableModel, LVar4, 0) - EVT_CALL(EnableModel, LVar7, 0) - EVT_CALL(EnableModel, LVarA, 0) + EVT_CALL(EnableModel, LVar1, FALSE) + EVT_CALL(EnableModel, LVar4, FALSE) + EVT_CALL(EnableModel, LVar7, FALSE) + EVT_CALL(EnableModel, LVarA, FALSE) EVT_RETURN EVT_END }; @@ -140,8 +140,8 @@ EvtScript N(80230968) = { EVT_CALL(RandInt, 200, LVar0) EVT_ADD(LVar0, 50) EVT_WAIT(LVar0) - EVT_CALL(EnableModel, ArrayVar(5), 1) - EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), 1) + EVT_CALL(EnableModel, ArrayVar(5), TRUE) + EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), EASING_QUADRATIC_IN) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, ArrayVar(5), ArrayVar(0), LVar0, ArrayVar(1)) @@ -154,7 +154,7 @@ EvtScript N(80230968) = { EVT_GOTO(1) EVT_END_IF EVT_LABEL(10) - EVT_CALL(EnableModel, ArrayVar(5), 0) + EVT_CALL(EnableModel, ArrayVar(5), FALSE) EVT_EXEC_WAIT(N(80230498)) EVT_GOTO(0) EVT_RETURN @@ -190,7 +190,7 @@ EvtScript N(80230B30) = { EVT_ADD(LVarF, 5) EVT_END_LOOP EVT_END_LOOP - EVT_CALL(EnableModel, 16, 0) + EVT_CALL(EnableModel, 16, FALSE) EVT_RETURN EVT_END }; @@ -199,9 +199,9 @@ s32 N(80230CEC)[] = { 1, -100, -50, 200, 100, 200, 0, 60, 4, }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 13) EVT_SET(LVar1, 0) EVT_SET(LVar2, 0) @@ -213,7 +213,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -222,6 +222,6 @@ Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt01_shape", .hit = "tik_bt01_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/tik2/stage/tik_02.c b/src/battle/area/tik2/stage/tik_02.c index fea4aa9bd7..89e522e4c5 100644 --- a/src/battle/area/tik2/stage/tik_02.c +++ b/src/battle/area/tik2/stage/tik_02.c @@ -75,10 +75,10 @@ EvtScript N(80231098) = { EVT_ADD(LVarA, 4) EVT_SET(LVarB, ArrayVar(0)) EVT_SET(LVarC, ArrayVar(1)) - EVT_CALL(EnableModel, LVar1, 1) - EVT_CALL(EnableModel, LVar4, 1) - EVT_CALL(EnableModel, LVar7, 1) - EVT_CALL(EnableModel, LVarA, 1) + EVT_CALL(EnableModel, LVar1, TRUE) + EVT_CALL(EnableModel, LVar4, TRUE) + EVT_CALL(EnableModel, LVar7, TRUE) + EVT_CALL(EnableModel, LVarA, TRUE) EVT_LOOP(5) EVT_ADD(LVar0, 1) EVT_ADD(LVar2, 1) @@ -119,10 +119,10 @@ EvtScript N(80231098) = { EVT_CALL(ScaleModel, LVarA, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(EnableModel, LVar1, 0) - EVT_CALL(EnableModel, LVar4, 0) - EVT_CALL(EnableModel, LVar7, 0) - EVT_CALL(EnableModel, LVarA, 0) + EVT_CALL(EnableModel, LVar1, FALSE) + EVT_CALL(EnableModel, LVar4, FALSE) + EVT_CALL(EnableModel, LVar7, FALSE) + EVT_CALL(EnableModel, LVarA, FALSE) EVT_RETURN EVT_END }; @@ -140,8 +140,8 @@ EvtScript N(80231568) = { EVT_CALL(RandInt, 200, LVar0) EVT_ADD(LVar0, 50) EVT_WAIT(LVar0) - EVT_CALL(EnableModel, ArrayVar(5), 1) - EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), 1) + EVT_CALL(EnableModel, ArrayVar(5), TRUE) + EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), EASING_QUADRATIC_IN) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, ArrayVar(5), ArrayVar(0), LVar0, ArrayVar(1)) @@ -154,7 +154,7 @@ EvtScript N(80231568) = { EVT_GOTO(1) EVT_END_IF EVT_LABEL(10) - EVT_CALL(EnableModel, ArrayVar(5), 0) + EVT_CALL(EnableModel, ArrayVar(5), FALSE) EVT_EXEC_WAIT(N(80231098)) EVT_GOTO(0) EVT_RETURN @@ -190,7 +190,7 @@ EvtScript N(80231730) = { EVT_ADD(LVarF, 5) EVT_END_LOOP EVT_END_LOOP - EVT_CALL(EnableModel, 16, 0) + EVT_CALL(EnableModel, 16, FALSE) EVT_RETURN EVT_END }; @@ -199,9 +199,9 @@ s32 N(802318EC)[] = { 1, -100, -50, 200, 100, 200, 0, 60, 4, }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, N(802318EC)) EVT_EXEC(N(80231730)) EVT_SET(LVar0, 14) @@ -213,7 +213,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -222,6 +222,6 @@ Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt02_shape", .hit = "tik_bt02_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/tik2/stage/tik_03.c b/src/battle/area/tik2/stage/tik_03.c index 57ec6c3569..5bd130fe75 100644 --- a/src/battle/area/tik2/stage/tik_03.c +++ b/src/battle/area/tik2/stage/tik_03.c @@ -22,10 +22,10 @@ EvtScript N(802319F0) = { EVT_ADD(LVarA, 4) EVT_SET(LVarB, ArrayVar(0)) EVT_SET(LVarC, ArrayVar(1)) - EVT_CALL(EnableModel, LVar1, 1) - EVT_CALL(EnableModel, LVar4, 1) - EVT_CALL(EnableModel, LVar7, 1) - EVT_CALL(EnableModel, LVarA, 1) + EVT_CALL(EnableModel, LVar1, TRUE) + EVT_CALL(EnableModel, LVar4, TRUE) + EVT_CALL(EnableModel, LVar7, TRUE) + EVT_CALL(EnableModel, LVarA, TRUE) EVT_LOOP(5) EVT_ADD(LVar0, 1) EVT_ADD(LVar2, 1) @@ -66,10 +66,10 @@ EvtScript N(802319F0) = { EVT_CALL(ScaleModel, LVarA, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(EnableModel, LVar1, 0) - EVT_CALL(EnableModel, LVar4, 0) - EVT_CALL(EnableModel, LVar7, 0) - EVT_CALL(EnableModel, LVarA, 0) + EVT_CALL(EnableModel, LVar1, FALSE) + EVT_CALL(EnableModel, LVar4, FALSE) + EVT_CALL(EnableModel, LVar7, FALSE) + EVT_CALL(EnableModel, LVarA, FALSE) EVT_RETURN EVT_END }; @@ -87,8 +87,8 @@ EvtScript N(80231EC0) = { EVT_CALL(RandInt, 200, LVar0) EVT_ADD(LVar0, 50) EVT_WAIT(LVar0) - EVT_CALL(EnableModel, ArrayVar(5), 1) - EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), 1) + EVT_CALL(EnableModel, ArrayVar(5), TRUE) + EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), EASING_QUADRATIC_IN) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, ArrayVar(5), ArrayVar(0), LVar0, ArrayVar(1)) @@ -101,7 +101,7 @@ EvtScript N(80231EC0) = { EVT_GOTO(1) EVT_END_IF EVT_LABEL(10) - EVT_CALL(EnableModel, ArrayVar(5), 0) + EVT_CALL(EnableModel, ArrayVar(5), FALSE) EVT_EXEC_WAIT(N(802319F0)) EVT_GOTO(0) EVT_RETURN @@ -137,7 +137,7 @@ EvtScript N(80232088) = { EVT_ADD(LVarF, 5) EVT_END_LOOP EVT_END_LOOP - EVT_CALL(EnableModel, 18, 0) + EVT_CALL(EnableModel, 18, FALSE) EVT_RETURN EVT_END }; @@ -146,16 +146,16 @@ s32 N(80232244)[] = { 1, -100, -50, 200, 100, 200, 0, 60, 4, }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, N(80232244)) EVT_EXEC(N(80232088)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -164,7 +164,7 @@ Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt03_shape", .hit = "tik_bt03_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/tik2/stage/tik_04.c b/src/battle/area/tik2/stage/tik_04.c index fafb5490ec..de941620f1 100644 --- a/src/battle/area/tik2/stage/tik_04.c +++ b/src/battle/area/tik2/stage/tik_04.c @@ -3,20 +3,20 @@ #define NAMESPACE b_area_tik2_tik_04 -#include "common/UnkModelStuff2.inc.c" +#include "battle/common/stage/WaterEffects.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_THREAD EVT_SET(LVar0, 15) - EVT_EXEC(N(script2)) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_WAIT(5) EVT_SET(LVar0, 16) - EVT_EXEC(N(script2)) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_WAIT(5) EVT_SET(LVar0, 17) - EVT_EXEC(N(script2)) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_END_THREAD EVT_THREAD EVT_WAIT(5) @@ -37,7 +37,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -46,8 +46,8 @@ Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt04_shape", .hit = "tik_bt04_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/tik2/stage/tik_05.c b/src/battle/area/tik2/stage/tik_05.c index f3fa4ba794..ce10b26776 100644 --- a/src/battle/area/tik2/stage/tik_05.c +++ b/src/battle/area/tik2/stage/tik_05.c @@ -6,9 +6,9 @@ #include "world/common/atomic/TexturePan.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_CALL(SetTexPanner, MODEL_taki1, TEX_PANNER_1) EVT_CALL(EnableTexPanning, MODEL_taki1, TRUE) EVT_THREAD @@ -31,21 +31,22 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_taki1, 0, +s32 N(ForegroundModels)[] = { + MODEL_taki1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt05_shape", .hit = "tik_bt05_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/tik3/stage/tik_01.c b/src/battle/area/tik3/stage/tik_01.c index a5cf07e7e6..c858f1de23 100644 --- a/src/battle/area/tik3/stage/tik_01.c +++ b/src/battle/area/tik3/stage/tik_01.c @@ -75,10 +75,10 @@ EvtScript N(80230498) = { EVT_ADD(LVarA, 4) EVT_SET(LVarB, ArrayVar(0)) EVT_SET(LVarC, ArrayVar(1)) - EVT_CALL(EnableModel, LVar1, 1) - EVT_CALL(EnableModel, LVar4, 1) - EVT_CALL(EnableModel, LVar7, 1) - EVT_CALL(EnableModel, LVarA, 1) + EVT_CALL(EnableModel, LVar1, TRUE) + EVT_CALL(EnableModel, LVar4, TRUE) + EVT_CALL(EnableModel, LVar7, TRUE) + EVT_CALL(EnableModel, LVarA, TRUE) EVT_LOOP(5) EVT_ADD(LVar0, 1) EVT_ADD(LVar2, 1) @@ -119,10 +119,10 @@ EvtScript N(80230498) = { EVT_CALL(ScaleModel, LVarA, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(EnableModel, LVar1, 0) - EVT_CALL(EnableModel, LVar4, 0) - EVT_CALL(EnableModel, LVar7, 0) - EVT_CALL(EnableModel, LVarA, 0) + EVT_CALL(EnableModel, LVar1, FALSE) + EVT_CALL(EnableModel, LVar4, FALSE) + EVT_CALL(EnableModel, LVar7, FALSE) + EVT_CALL(EnableModel, LVarA, FALSE) EVT_RETURN EVT_END }; @@ -140,8 +140,8 @@ EvtScript N(80230968) = { EVT_CALL(RandInt, 200, LVar0) EVT_ADD(LVar0, 50) EVT_WAIT(LVar0) - EVT_CALL(EnableModel, ArrayVar(5), 1) - EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), 1) + EVT_CALL(EnableModel, ArrayVar(5), TRUE) + EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), EASING_QUADRATIC_IN) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, ArrayVar(5), ArrayVar(0), LVar0, ArrayVar(1)) @@ -154,7 +154,7 @@ EvtScript N(80230968) = { EVT_GOTO(1) EVT_END_IF EVT_LABEL(10) - EVT_CALL(EnableModel, ArrayVar(5), 0) + EVT_CALL(EnableModel, ArrayVar(5), FALSE) EVT_EXEC_WAIT(N(80230498)) EVT_GOTO(0) EVT_RETURN @@ -190,7 +190,7 @@ EvtScript N(80230B30) = { EVT_ADD(LVarF, 5) EVT_END_LOOP EVT_END_LOOP - EVT_CALL(EnableModel, 16, 0) + EVT_CALL(EnableModel, 16, FALSE) EVT_RETURN EVT_END }; @@ -199,9 +199,9 @@ s32 N(80230CEC)[] = { 1, -100, -50, 200, 100, 200, 0, 60, 4, }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 13) EVT_SET(LVar1, 0) EVT_SET(LVar2, 0) @@ -213,7 +213,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -222,6 +222,6 @@ Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt01_shape", .hit = "tik_bt01_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/tik3/stage/tik_02.c b/src/battle/area/tik3/stage/tik_02.c index 25de47b51e..3a7c1cd854 100644 --- a/src/battle/area/tik3/stage/tik_02.c +++ b/src/battle/area/tik3/stage/tik_02.c @@ -75,10 +75,10 @@ EvtScript N(80231098) = { EVT_ADD(LVarA, 4) EVT_SET(LVarB, ArrayVar(0)) EVT_SET(LVarC, ArrayVar(1)) - EVT_CALL(EnableModel, LVar1, 1) - EVT_CALL(EnableModel, LVar4, 1) - EVT_CALL(EnableModel, LVar7, 1) - EVT_CALL(EnableModel, LVarA, 1) + EVT_CALL(EnableModel, LVar1, TRUE) + EVT_CALL(EnableModel, LVar4, TRUE) + EVT_CALL(EnableModel, LVar7, TRUE) + EVT_CALL(EnableModel, LVarA, TRUE) EVT_LOOP(5) EVT_ADD(LVar0, 1) EVT_ADD(LVar2, 1) @@ -119,10 +119,10 @@ EvtScript N(80231098) = { EVT_CALL(ScaleModel, LVarA, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(EnableModel, LVar1, 0) - EVT_CALL(EnableModel, LVar4, 0) - EVT_CALL(EnableModel, LVar7, 0) - EVT_CALL(EnableModel, LVarA, 0) + EVT_CALL(EnableModel, LVar1, FALSE) + EVT_CALL(EnableModel, LVar4, FALSE) + EVT_CALL(EnableModel, LVar7, FALSE) + EVT_CALL(EnableModel, LVarA, FALSE) EVT_RETURN EVT_END }; @@ -140,8 +140,8 @@ EvtScript N(80231568) = { EVT_CALL(RandInt, 200, LVar0) EVT_ADD(LVar0, 50) EVT_WAIT(LVar0) - EVT_CALL(EnableModel, ArrayVar(5), 1) - EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), 1) + EVT_CALL(EnableModel, ArrayVar(5), TRUE) + EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), EASING_QUADRATIC_IN) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, ArrayVar(5), ArrayVar(0), LVar0, ArrayVar(1)) @@ -154,7 +154,7 @@ EvtScript N(80231568) = { EVT_GOTO(1) EVT_END_IF EVT_LABEL(10) - EVT_CALL(EnableModel, ArrayVar(5), 0) + EVT_CALL(EnableModel, ArrayVar(5), FALSE) EVT_EXEC_WAIT(N(80231098)) EVT_GOTO(0) EVT_RETURN @@ -190,7 +190,7 @@ EvtScript N(80231730) = { EVT_ADD(LVarF, 5) EVT_END_LOOP EVT_END_LOOP - EVT_CALL(EnableModel, 16, 0) + EVT_CALL(EnableModel, 16, FALSE) EVT_RETURN EVT_END }; @@ -199,9 +199,9 @@ s32 N(802318EC)[] = { 1, -100, -50, 200, 100, 200, 0, 60, 4, }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, N(802318EC)) EVT_EXEC(N(80231730)) EVT_SET(LVar0, 14) @@ -213,7 +213,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -222,6 +222,6 @@ Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt02_shape", .hit = "tik_bt02_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/tik3/stage/tik_03.c b/src/battle/area/tik3/stage/tik_03.c index d64fee274a..87af11e79a 100644 --- a/src/battle/area/tik3/stage/tik_03.c +++ b/src/battle/area/tik3/stage/tik_03.c @@ -22,10 +22,10 @@ EvtScript N(802319F0) = { EVT_ADD(LVarA, 4) EVT_SET(LVarB, ArrayVar(0)) EVT_SET(LVarC, ArrayVar(1)) - EVT_CALL(EnableModel, LVar1, 1) - EVT_CALL(EnableModel, LVar4, 1) - EVT_CALL(EnableModel, LVar7, 1) - EVT_CALL(EnableModel, LVarA, 1) + EVT_CALL(EnableModel, LVar1, TRUE) + EVT_CALL(EnableModel, LVar4, TRUE) + EVT_CALL(EnableModel, LVar7, TRUE) + EVT_CALL(EnableModel, LVarA, TRUE) EVT_LOOP(5) EVT_ADD(LVar0, 1) EVT_ADD(LVar2, 1) @@ -66,10 +66,10 @@ EvtScript N(802319F0) = { EVT_CALL(ScaleModel, LVarA, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(EnableModel, LVar1, 0) - EVT_CALL(EnableModel, LVar4, 0) - EVT_CALL(EnableModel, LVar7, 0) - EVT_CALL(EnableModel, LVarA, 0) + EVT_CALL(EnableModel, LVar1, FALSE) + EVT_CALL(EnableModel, LVar4, FALSE) + EVT_CALL(EnableModel, LVar7, FALSE) + EVT_CALL(EnableModel, LVarA, FALSE) EVT_RETURN EVT_END }; @@ -87,8 +87,8 @@ EvtScript N(80231EC0) = { EVT_CALL(RandInt, 200, LVar0) EVT_ADD(LVar0, 50) EVT_WAIT(LVar0) - EVT_CALL(EnableModel, ArrayVar(5), 1) - EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), 1) + EVT_CALL(EnableModel, ArrayVar(5), TRUE) + EVT_CALL(MakeLerp, ArrayVar(2), ArrayVar(3), ArrayVar(4), EASING_QUADRATIC_IN) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, ArrayVar(5), ArrayVar(0), LVar0, ArrayVar(1)) @@ -101,7 +101,7 @@ EvtScript N(80231EC0) = { EVT_GOTO(1) EVT_END_IF EVT_LABEL(10) - EVT_CALL(EnableModel, ArrayVar(5), 0) + EVT_CALL(EnableModel, ArrayVar(5), FALSE) EVT_EXEC_WAIT(N(802319F0)) EVT_GOTO(0) EVT_RETURN @@ -137,7 +137,7 @@ EvtScript N(80232088) = { EVT_ADD(LVarF, 5) EVT_END_LOOP EVT_END_LOOP - EVT_CALL(EnableModel, 18, 0) + EVT_CALL(EnableModel, 18, FALSE) EVT_RETURN EVT_END }; @@ -146,16 +146,16 @@ s32 N(80232244)[] = { 1, -100, -50, 200, 100, 200, 0, 60, 4, }; -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, N(80232244)) EVT_EXEC(N(80232088)) EVT_RETURN EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -164,7 +164,7 @@ Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt03_shape", .hit = "tik_bt03_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/tik3/stage/tik_04.c b/src/battle/area/tik3/stage/tik_04.c index e862a8315a..d1c256c8a3 100644 --- a/src/battle/area/tik3/stage/tik_04.c +++ b/src/battle/area/tik3/stage/tik_04.c @@ -3,20 +3,20 @@ #define NAMESPACE b_area_tik3_tik_04 -#include "common/UnkModelStuff2.inc.c" +#include "battle/common/stage/WaterEffects.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_THREAD EVT_SET(LVar0, 15) - EVT_EXEC(N(script2)) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_WAIT(5) EVT_SET(LVar0, 16) - EVT_EXEC(N(script2)) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_WAIT(5) EVT_SET(LVar0, 17) - EVT_EXEC(N(script2)) + EVT_EXEC(N(EVS_AnimateWaveModel)) EVT_END_THREAD EVT_THREAD EVT_WAIT(5) @@ -37,7 +37,7 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -46,8 +46,8 @@ Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt04_shape", .hit = "tik_bt04_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/tik3/stage/tik_05.c b/src/battle/area/tik3/stage/tik_05.c index b4473819f3..1dd890a5a6 100644 --- a/src/battle/area/tik3/stage/tik_05.c +++ b/src/battle/area/tik3/stage/tik_05.c @@ -6,9 +6,9 @@ #include "world/common/atomic/TexturePan.inc.c" -EvtScript N(beforeBattle) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_CALL(SetTexPanner, MODEL_taki1, TEX_PANNER_1) EVT_CALL(EnableTexPanning, MODEL_taki1, TRUE) EVT_THREAD @@ -31,21 +31,22 @@ EvtScript N(beforeBattle) = { EVT_END }; -EvtScript N(afterBattle) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList)[] = { - MODEL_taki1, 0, +s32 N(ForegroundModels)[] = { + MODEL_taki1, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "tik_tex", .shape = "tik_bt05_shape", .hit = "tik_bt05_hit", - .preBattle = &N(beforeBattle), - .postBattle = &N(afterBattle), - .foregroundModelList = N(foregroundModelList), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/trd_part_1/actor/bill_blaster.c b/src/battle/area/trd_part_1/actor/bill_blaster.c index 030cb4053e..39fc6dabc3 100644 --- a/src/battle/area/trd_part_1/actor/bill_blaster.c +++ b/src/battle/area/trd_part_1/actor/bill_blaster.c @@ -75,7 +75,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 4, .partCount = ARRAY_COUNT(N(partsTable_80219DD8)), .partsData = N(partsTable_80219DD8), - .takeTurnScript = &N(init_80219E6C), + .initScript = &N(init_80219E6C), .statusTable = N(statusTable_80219D2C), .escapeChance = 0, .airLiftChance = 20, @@ -212,7 +212,7 @@ EvtScript N(8021A2BC) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BillBlaster_Anim02) EVT_WAIT(13) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(StartRumble, 9) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2C8) @@ -220,8 +220,8 @@ EvtScript N(8021A2BC) = { EVT_SUB(LVar0, 33) EVT_ADD(LVar1, 19) EVT_ADD(LVar2, 3) - EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 2, 5, 0, 2, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 2, 5, 2, 2, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 2, 5, 0, 2, 0) + EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 2, 5, 2, 2, 0) EVT_WAIT(2) EVT_CALL(func_80218000_4A10A0) EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_8021A4E8)), 0) diff --git a/src/battle/area/trd_part_1/actor/bob_omb.c b/src/battle/area/trd_part_1/actor/bob_omb.c index 84a2e46b5b..b7f77472a2 100644 --- a/src/battle/area/trd_part_1/actor/bob_omb.c +++ b/src/battle/area/trd_part_1/actor/bob_omb.c @@ -111,7 +111,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 3, .partCount = ARRAY_COUNT(N(partsTable_8021A70C)), .partsData = N(partsTable_8021A70C), - .takeTurnScript = &N(init_8021A758), + .initScript = &N(init_8021A758), .statusTable = N(statusTable_8021A5B4), .escapeChance = 70, .airLiftChance = 90, @@ -157,7 +157,7 @@ EvtScript N(ignite) = { EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021A55C))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021B4A8))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_CONTACT, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_CONTACT, TRUE) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021A660))) EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, 0x80000001) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Bobomb_Anim05) @@ -178,11 +178,11 @@ EvtScript N(8021A9C8) = { EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021ACE8))) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021A510))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_CONTACT, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_CONTACT, FALSE) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021A5B4))) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 0, 0) EVT_CALL(StopLoopingSoundAtActor, ACTOR_SELF, 0) EVT_CALL(func_8026ED20, ACTOR_SELF, 1, 0) EVT_RETURN @@ -203,17 +203,17 @@ EvtScript N(8021AB54) = { EVT_EXEC_WAIT(N(8021AAE8)) EVT_CALL(StartRumble, 11) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.75)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(4.5)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.75)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(4.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0) EVT_ADD(LVar1, 20) EVT_ADD(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_EXPLOSION, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_EXPLOSION, 0, LVar0, LVar1, LVar2, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOMB_BLAST) EVT_RETURN EVT_END @@ -550,7 +550,7 @@ EvtScript N(tackleAttack) = { EVT_CALL(YieldTurn) 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Bobomb_Anim06) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -567,7 +567,7 @@ EvtScript N(tackleAttack) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Bobomb_Anim14) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorSize, ACTOR_SELF, LVar3, LVar4) - EVT_CALL(PlayEffect, EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LVar0, LVar1, LVar2, LVar4, LVar3, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LVar0, LVar1, LVar2, LVar4, LVar3, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_SHOCK) EVT_WAIT(20) EVT_EXEC_WAIT(N(8021AB54)) diff --git a/src/battle/area/trd_part_1/actor/bullet_bill.c b/src/battle/area/trd_part_1/actor/bullet_bill.c index 1db2bde317..028afad526 100644 --- a/src/battle/area/trd_part_1/actor/bullet_bill.c +++ b/src/battle/area/trd_part_1/actor/bullet_bill.c @@ -61,7 +61,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 2, .partCount = ARRAY_COUNT(N(partsTable_80219018)), .partsData = N(partsTable_80219018), - .takeTurnScript = &N(init_80219088), + .initScript = &N(init_80219088), .statusTable = N(statusTable_80218F6C), .escapeChance = 50, .airLiftChance = 100, @@ -116,7 +116,7 @@ EvtScript N(init_80219088) = { EVT_CALL(SetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(CopyStatusEffects, LVar0, ACTOR_SELF) EVT_CALL(CopyBuffs, LVar0, ACTOR_SELF) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(GetActorPos, LVar0, LVar1, LVarB, LVarC) EVT_SUB(LVar1, 90) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.01)) @@ -291,14 +291,14 @@ EvtScript N(takeTurn_802197C0) = { EvtScript N(80219BE0) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0) EVT_ADD(LVar1, 16) EVT_ADD(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_BLAST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BLAST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 30, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2078) EVT_CALL(StartRumble, 11) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_RETURN EVT_END diff --git a/src/battle/area/trd_part_1/stage/trd_00.c b/src/battle/area/trd_part_1/stage/trd_00.c index d4a531bfa6..6c87462806 100644 --- a/src/battle/area/trd_part_1/stage/trd_00.c +++ b/src/battle/area/trd_part_1/stage/trd_00.c @@ -3,27 +3,28 @@ #define NAMESPACE b_area_trd_part_1_trd_00 -EvtScript N(beforeBattle_80224B70) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80224BAC) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80224BBC)[] = { - 0x00000009, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x00000009, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt00_shape", .hit = "trd_bt00_hit", - .preBattle = &N(beforeBattle_80224B70), - .postBattle = &N(afterBattle_80224BAC), - .foregroundModelList = N(foregroundModelList_80224BBC), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/trd_part_1/stage/trd_01.c b/src/battle/area/trd_part_1/stage/trd_01.c index 2584ccd861..46faec353a 100644 --- a/src/battle/area/trd_part_1/stage/trd_01.c +++ b/src/battle/area/trd_part_1/stage/trd_01.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_trd_part_1_trd_01 -EvtScript N(beforeBattle_80222AE0) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80222B1C) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -19,6 +19,6 @@ Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt01_shape", .hit = "trd_bt01_hit", - .preBattle = &N(beforeBattle_80222AE0), - .postBattle = &N(afterBattle_80222B1C), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_1/stage/trd_02.c b/src/battle/area/trd_part_1/stage/trd_02.c index 677909fe52..22c47ee095 100644 --- a/src/battle/area/trd_part_1/stage/trd_02.c +++ b/src/battle/area/trd_part_1/stage/trd_02.c @@ -100,10 +100,10 @@ EvtScript N(80222C78) = { EVT_END }; -EvtScript N(beforeBattle_80223224) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(EnableModel, 12, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, 12, FALSE) EVT_THREAD EVT_SET(LVar0, 19) EVT_EXEC(N(80222C78)) @@ -121,20 +121,21 @@ EvtScript N(beforeBattle_80223224) = { EVT_END }; -EvtScript N(afterBattle_80223318) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80223328)[] = { - 0x00000016, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x00000016, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt02_shape", .hit = "trd_bt02_hit", - .preBattle = &N(beforeBattle_80223224), - .postBattle = &N(afterBattle_80223318), - .foregroundModelList = N(foregroundModelList_80223328), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/trd_part_1/stage/trd_02b.c b/src/battle/area/trd_part_1/stage/trd_02b.c index bc198c3ee4..42aa4b582a 100644 --- a/src/battle/area/trd_part_1/stage/trd_02b.c +++ b/src/battle/area/trd_part_1/stage/trd_02b.c @@ -100,12 +100,12 @@ EvtScript N(80223478) = { EVT_END }; -EvtScript N(beforeBattle_80223A24) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(EnableModel, 22, 0) - EVT_CALL(EnableModel, 9, 0) - EVT_CALL(EnableModel, 10, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, 22, FALSE) + EVT_CALL(EnableModel, 9, FALSE) + EVT_CALL(EnableModel, 10, FALSE) EVT_THREAD EVT_SET(LVar0, 19) EVT_EXEC(N(80223478)) @@ -123,7 +123,7 @@ EvtScript N(beforeBattle_80223A24) = { EVT_END }; -EvtScript N(afterBattle_80223B40) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -132,6 +132,6 @@ Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt02_shape", .hit = "trd_bt02_hit", - .preBattle = &N(beforeBattle_80223A24), - .postBattle = &N(afterBattle_80223B40), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_1/stage/trd_02c.c b/src/battle/area/trd_part_1/stage/trd_02c.c index 5e01d3f1d9..80db44661c 100644 --- a/src/battle/area/trd_part_1/stage/trd_02c.c +++ b/src/battle/area/trd_part_1/stage/trd_02c.c @@ -3,29 +3,30 @@ #define NAMESPACE b_area_trd_part_1_trd_02c -EvtScript N(beforeBattle_80224BF0) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(EnableModel, 26, 0) - EVT_CALL(EnableModel, 2, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, 26, FALSE) + EVT_CALL(EnableModel, 2, FALSE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80224C54) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80224C64)[] = { - 0x00000016, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x00000016, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt02_shape", .hit = "trd_bt02_hit", - .preBattle = &N(beforeBattle_80224BF0), - .postBattle = &N(afterBattle_80224C54), - .foregroundModelList = N(foregroundModelList_80224C64), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/trd_part_1/stage/trd_02d.c b/src/battle/area/trd_part_1/stage/trd_02d.c index 01d9dfbe2e..17c21b3392 100644 --- a/src/battle/area/trd_part_1/stage/trd_02d.c +++ b/src/battle/area/trd_part_1/stage/trd_02d.c @@ -100,33 +100,34 @@ EvtScript N(80224DB8) = { EVT_END }; -EvtScript N(beforeBattle_80225364) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(EnableModel, 19, 0) - EVT_CALL(EnableModel, 17, 0) - EVT_CALL(EnableModel, 15, 0) - EVT_CALL(EnableModel, 13, 0) - EVT_CALL(EnableModel, 9, 0) - EVT_CALL(EnableModel, 10, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, 19, FALSE) + EVT_CALL(EnableModel, 17, FALSE) + EVT_CALL(EnableModel, 15, FALSE) + EVT_CALL(EnableModel, 13, FALSE) + EVT_CALL(EnableModel, 9, FALSE) + EVT_CALL(EnableModel, 10, FALSE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80225418) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80225428)[] = { - 0x00000016, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x00000016, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt02_shape", .hit = "trd_bt02_hit", - .preBattle = &N(beforeBattle_80225364), - .postBattle = &N(afterBattle_80225418), - .foregroundModelList = N(foregroundModelList_80225428), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/trd_part_1/stage/trd_03.c b/src/battle/area/trd_part_1/stage/trd_03.c index cd7e370a09..b6fceb47ae 100644 --- a/src/battle/area/trd_part_1/stage/trd_03.c +++ b/src/battle/area/trd_part_1/stage/trd_03.c @@ -5,7 +5,7 @@ #include "world/common/todo/clouds.inc.c" -EvtScript N(beforeBattle_80223F08) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_SET(LVar0, 4) EVT_SET(LVar2, 0) @@ -19,13 +19,16 @@ EvtScript N(beforeBattle_80223F08) = { EVT_END }; -EvtScript N(afterBattle_80223FA0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80223FB0)[] = { - 0x0000000F, 0x0000000E, 0x0000000D, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x0000000F, + 0x0000000E, + 0x0000000D, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -33,7 +36,7 @@ Stage NAMESPACE = { .shape = "trd_bt03_shape", .hit = "trd_bt03_hit", .bg = "nok_bg", - .preBattle = &N(beforeBattle_80223F08), - .postBattle = &N(afterBattle_80223FA0), - .foregroundModelList = N(foregroundModelList_80223FB0), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/trd_part_1/stage/trd_04.c b/src/battle/area/trd_part_1/stage/trd_04.c index e0ea8eea57..302d03d0a5 100644 --- a/src/battle/area/trd_part_1/stage/trd_04.c +++ b/src/battle/area/trd_part_1/stage/trd_04.c @@ -56,9 +56,9 @@ EvtScript N(802241AC) = { EVT_END }; -EvtScript N(beforeBattle_80224298) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 13) EVT_SET(LVar1, 0) EVT_SET(LVar2, 40) @@ -68,20 +68,21 @@ EvtScript N(beforeBattle_80224298) = { EVT_END }; -EvtScript N(afterBattle_80224320) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80224330)[] = { - 0x0000000D, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x0000000D, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt04_shape", .hit = "trd_bt04_hit", - .preBattle = &N(beforeBattle_80224298), - .postBattle = &N(afterBattle_80224320), - .foregroundModelList = N(foregroundModelList_80224330), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/trd_part_1/stage/trd_05.c b/src/battle/area/trd_part_1/stage/trd_05.c index 6843004acc..edd99efeb8 100644 --- a/src/battle/area/trd_part_1/stage/trd_05.c +++ b/src/battle/area/trd_part_1/stage/trd_05.c @@ -100,9 +100,9 @@ EvtScript N(80224478) = { EVT_END }; -EvtScript N(beforeBattle_80224A24) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_THREAD EVT_SET(LVar0, 27) EVT_EXEC(N(80224478)) @@ -124,7 +124,7 @@ EvtScript N(beforeBattle_80224A24) = { EVT_END }; -EvtScript N(afterBattle_80224B30) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -134,6 +134,6 @@ Stage NAMESPACE = { .shape = "trd_bt05_shape", .hit = "trd_bt05_hit", .bg = "nok_bg", - .preBattle = &N(beforeBattle_80224A24), - .postBattle = &N(afterBattle_80224B30), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_1/stage/trd_05b.c b/src/battle/area/trd_part_1/stage/trd_05b.c index 8565ca998a..3e40bac03f 100644 --- a/src/battle/area/trd_part_1/stage/trd_05b.c +++ b/src/battle/area/trd_part_1/stage/trd_05b.c @@ -100,24 +100,24 @@ EvtScript N(80225578) = { EVT_END }; -EvtScript N(beforeBattle_80225B24) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(EnableModel, 16, 0) - EVT_CALL(EnableModel, 17, 0) - EVT_CALL(EnableModel, 2, 0) - EVT_CALL(EnableModel, 4, 0) - EVT_CALL(EnableModel, 6, 0) - EVT_CALL(EnableModel, 20, 0) - EVT_CALL(EnableModel, 18, 0) - EVT_CALL(EnableModel, 19, 0) - EVT_CALL(EnableModel, 25, 0) - EVT_CALL(EnableModel, 27, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, 16, FALSE) + EVT_CALL(EnableModel, 17, FALSE) + EVT_CALL(EnableModel, 2, FALSE) + EVT_CALL(EnableModel, 4, FALSE) + EVT_CALL(EnableModel, 6, FALSE) + EVT_CALL(EnableModel, 20, FALSE) + EVT_CALL(EnableModel, 18, FALSE) + EVT_CALL(EnableModel, 19, FALSE) + EVT_CALL(EnableModel, 25, FALSE) + EVT_CALL(EnableModel, 27, FALSE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80225C28) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -126,6 +126,6 @@ Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt05_shape", .hit = "trd_bt05_hit", - .preBattle = &N(beforeBattle_80225B24), - .postBattle = &N(afterBattle_80225C28), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_1/stage/trd_05c.c b/src/battle/area/trd_part_1/stage/trd_05c.c index e1054e9c30..829e7db86c 100644 --- a/src/battle/area/trd_part_1/stage/trd_05c.c +++ b/src/battle/area/trd_part_1/stage/trd_05c.c @@ -100,15 +100,15 @@ EvtScript N(80225D78) = { EVT_END }; -EvtScript N(beforeBattle_80226324) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(EnableModel, 10, 0) - EVT_CALL(EnableModel, 15, 0) - EVT_CALL(EnableModel, 20, 0) - EVT_CALL(EnableModel, 18, 0) - EVT_CALL(EnableModel, 19, 0) - EVT_CALL(EnableModel, 25, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, 10, FALSE) + EVT_CALL(EnableModel, 15, FALSE) + EVT_CALL(EnableModel, 20, FALSE) + EVT_CALL(EnableModel, 18, FALSE) + EVT_CALL(EnableModel, 19, FALSE) + EVT_CALL(EnableModel, 25, FALSE) EVT_SET(LVar0, 27) EVT_EXEC(N(80225D78)) EVT_THREAD @@ -125,7 +125,7 @@ EvtScript N(beforeBattle_80226324) = { EVT_END }; -EvtScript N(afterBattle_80226470) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -134,6 +134,6 @@ Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt05_shape", .hit = "trd_bt05_hit", - .preBattle = &N(beforeBattle_80226324), - .postBattle = &N(afterBattle_80226470), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_1/stage/trd_05d.c b/src/battle/area/trd_part_1/stage/trd_05d.c index 55e031ccb1..3d61891e64 100644 --- a/src/battle/area/trd_part_1/stage/trd_05d.c +++ b/src/battle/area/trd_part_1/stage/trd_05d.c @@ -100,16 +100,16 @@ EvtScript N(802265C8) = { EVT_END }; -EvtScript N(beforeBattle_80226B74) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(EnableModel, 10, 0) - EVT_CALL(EnableModel, 15, 0) - EVT_CALL(EnableModel, 16, 0) - EVT_CALL(EnableModel, 17, 0) - EVT_CALL(EnableModel, 25, 0) - EVT_CALL(EnableModel, 14, 0) - EVT_CALL(EnableModel, 27, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, 10, FALSE) + EVT_CALL(EnableModel, 15, FALSE) + EVT_CALL(EnableModel, 16, FALSE) + EVT_CALL(EnableModel, 17, FALSE) + EVT_CALL(EnableModel, 25, FALSE) + EVT_CALL(EnableModel, 14, FALSE) + EVT_CALL(EnableModel, 27, FALSE) EVT_THREAD EVT_SET(LVar0, 6) EVT_EXEC(N(802265C8)) @@ -124,7 +124,7 @@ EvtScript N(beforeBattle_80226B74) = { EVT_END }; -EvtScript N(afterBattle_80226CB8) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -133,6 +133,6 @@ Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt05_shape", .hit = "trd_bt05_hit", - .preBattle = &N(beforeBattle_80226B74), - .postBattle = &N(afterBattle_80226CB8), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_1/stage/trd_05e.c b/src/battle/area/trd_part_1/stage/trd_05e.c index 4b8e0fae30..cec4113c7b 100644 --- a/src/battle/area/trd_part_1/stage/trd_05e.c +++ b/src/battle/area/trd_part_1/stage/trd_05e.c @@ -100,22 +100,22 @@ EvtScript N(80226E08) = { EVT_END }; -EvtScript N(beforeBattle_802273B4) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(EnableModel, 27, 0) - EVT_CALL(EnableModel, 2, 0) - EVT_CALL(EnableModel, 4, 0) - EVT_CALL(EnableModel, 6, 0) - EVT_CALL(EnableModel, 20, 0) - EVT_CALL(EnableModel, 18, 0) - EVT_CALL(EnableModel, 19, 0) - EVT_CALL(EnableModel, 25, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, 27, FALSE) + EVT_CALL(EnableModel, 2, FALSE) + EVT_CALL(EnableModel, 4, FALSE) + EVT_CALL(EnableModel, 6, FALSE) + EVT_CALL(EnableModel, 20, FALSE) + EVT_CALL(EnableModel, 18, FALSE) + EVT_CALL(EnableModel, 19, FALSE) + EVT_CALL(EnableModel, 25, FALSE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80227490) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -124,6 +124,6 @@ Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt05_shape", .hit = "trd_bt05_hit", - .preBattle = &N(beforeBattle_802273B4), - .postBattle = &N(afterBattle_80227490), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_1/stage/trd_05f.c b/src/battle/area/trd_part_1/stage/trd_05f.c index f3613adf39..33d042d8aa 100644 --- a/src/battle/area/trd_part_1/stage/trd_05f.c +++ b/src/battle/area/trd_part_1/stage/trd_05f.c @@ -100,24 +100,24 @@ EvtScript N(802275E8) = { EVT_END }; -EvtScript N(beforeBattle_80227B94) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 27) EVT_EXEC(N(802275E8)) - EVT_CALL(EnableModel, 2, 0) - EVT_CALL(EnableModel, 4, 0) - EVT_CALL(EnableModel, 6, 0) - EVT_CALL(EnableModel, 20, 0) - EVT_CALL(EnableModel, 18, 0) - EVT_CALL(EnableModel, 19, 0) - EVT_CALL(EnableModel, 25, 0) - EVT_CALL(EnableModel, 15, 0) + EVT_CALL(EnableModel, 2, FALSE) + EVT_CALL(EnableModel, 4, FALSE) + EVT_CALL(EnableModel, 6, FALSE) + EVT_CALL(EnableModel, 20, FALSE) + EVT_CALL(EnableModel, 18, FALSE) + EVT_CALL(EnableModel, 19, FALSE) + EVT_CALL(EnableModel, 25, FALSE) + EVT_CALL(EnableModel, 15, FALSE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80227C8C) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -126,6 +126,6 @@ Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt05_shape", .hit = "trd_bt05_hit", - .preBattle = &N(beforeBattle_80227B94), - .postBattle = &N(afterBattle_80227C8C), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; 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 index 8ae2b7e2b2..01da8d321f 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 @@ -70,7 +70,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 5, .partCount = ARRAY_COUNT(N(partsTable_8022B564)), .partsData = N(partsTable_8022B564), - .takeTurnScript = &N(init_8022DC2C), + .initScript = &N(init_8022DC2C), .statusTable = N(statusTable_8022B4B8), .escapeChance = 0, .airLiftChance = 0, @@ -271,15 +271,15 @@ EvtScript N(8022B6E8) = { EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.8)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) EVT_END_THREAD EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim0C) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B6DC))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) @@ -310,7 +310,7 @@ EvtScript N(8022B6E8) = { EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.8)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) EVT_END_THREAD EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -319,13 +319,13 @@ EvtScript N(8022B6E8) = { EVT_ADDF(LVar1, LVar3) EVT_ADDF(LVar2, EVT_FLOAT(5.0)) EVT_DIVF(LVar3, EVT_FLOAT(10.0)) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim0C) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B6DC))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) @@ -344,14 +344,14 @@ EvtScript N(8022B6E8) = { EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(12) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_THREAD EVT_SET(LVar0, 0) @@ -374,7 +374,7 @@ EvtScript N(8022B6E8) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022B4A0))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B5B0))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim04) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF EVT_CASE_DEFAULT EVT_WAIT(20) @@ -429,7 +429,7 @@ EvtScript N(8022B6E8) = { EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) EVT_SWITCH(LVar0) @@ -443,7 +443,7 @@ EvtScript N(8022B6E8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 15, 0) @@ -497,7 +497,7 @@ EvtScript N(8022B6E8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 22) EVT_ADD(LVar1, 19) - 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_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim04) EVT_WAIT(20) @@ -521,11 +521,11 @@ EvtScript N(8022B6E8) = { EVT_CASE_EQ(6) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_END_SWITCH - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 15, 0) @@ -621,13 +621,13 @@ EvtScript N(8022B6E8) = { EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 15, 0) @@ -656,7 +656,7 @@ EvtScript N(8022B6E8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 22) EVT_ADD(LVar1, 19) - 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_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim03) EVT_CALL(SetGoalToHome, ACTOR_SELF) @@ -678,7 +678,7 @@ EvtScript N(init_8022DC2C) = { EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) EVT_RETURN diff --git a/src/battle/area/trd_part_2/actor/fake_bowser.c b/src/battle/area/trd_part_2/actor/fake_bowser.c index 1fdcda5923..f69bdfd437 100644 --- a/src/battle/area/trd_part_2/actor/fake_bowser.c +++ b/src/battle/area/trd_part_2/actor/fake_bowser.c @@ -214,7 +214,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 10, .partCount = ARRAY_COUNT(N(partsTable_8021A748)), .partsData = N(partsTable_8021A748), - .takeTurnScript = &N(init_8021A968), + .initScript = &N(init_8021A968), .statusTable = N(statusTable_8021A690), .escapeChance = 0, .airLiftChance = 0, @@ -252,7 +252,7 @@ EvtScript N(init_8021A968) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetPartTargetFlagBits, -127, 2, 4, 1) + EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 2, 4, TRUE) EVT_RETURN EVT_END }; @@ -402,9 +402,9 @@ EvtScript N(8021B0E4) = { EVT_CALL(N(StartRumbleWithParams), 256, 30) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(ShakeCam, 1, 0, 20, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 20, EVT_FLOAT(3.0)) EVT_END_THREAD - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 5, LVar0, LVar1, LVar2) EVT_CALL(SetPartDispOffset, ACTOR_SELF, 5, 0, -60, 0) EVT_SET(LVar1, 60) @@ -423,40 +423,40 @@ EvtScript N(8021B0E4) = { EVT_SET(LVar1, -200) EVT_ADD(LVar2, 100) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 5, EVT_FLOAT(0.5)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 60, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 60, TRUE) EVT_WAIT(30) EVT_CALL(PlaySoundAtModel, 15, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT(20) EVT_CALL(PlaySoundAtModel, 11, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 150, 20) EVT_WAIT(30) EVT_CALL(PlaySoundAtModel, 9, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT(30) EVT_CALL(PlaySoundAtModel, 31, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.7)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 70, 20) EVT_WAIT(20) EVT_CALL(PlaySoundAtModel, 25, SOUND_1E2, SOUND_SPACE_MODE_0) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 100, 20) EVT_WAIT(20) @@ -464,12 +464,12 @@ EvtScript N(8021B0E4) = { EVT_CALL(N(StartRumbleWithParams), 60, 20) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.6)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.6)) EVT_END_THREAD EVT_WAIT(20) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 30, 20) EVT_RETURN @@ -657,7 +657,7 @@ EvtScript N(8021BC88) = { EvtScript N(8021BD6C) = { EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) EVT_CALL(SetPartDispOffset, ACTOR_SELF, 3, 0, -30, 0) EVT_SET(LVar1, 30) @@ -676,14 +676,14 @@ EvtScript N(8021BD6C) = { EVT_SET(LVar1, -200) EVT_SUB(LVar2, 200) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(0.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 80, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 80, TRUE) EVT_RETURN EVT_END }; EvtScript N(8021BF14) = { EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 4, LVar0, LVar1, LVar2) EVT_CALL(SetPartDispOffset, ACTOR_SELF, 4, 0, -24, 0) EVT_SET(LVar1, 24) @@ -703,7 +703,7 @@ EvtScript N(8021BF14) = { EVT_SET(LVar1, -200) EVT_ADD(LVar2, 150) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 4, EVT_FLOAT(0.5)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 4, LVar0, LVar1, LVar2, 60, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 4, LVar0, LVar1, LVar2, 60, TRUE) EVT_RETURN EVT_END }; @@ -843,7 +843,7 @@ EvtScript N(8021C594) = { EvtScript N(8021C67C) = { EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 10, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 10, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 10, LVar0, LVar1, LVar2) EVT_THREAD @@ -860,7 +860,7 @@ EvtScript N(8021C67C) = { EVT_SET(LVar1, -200) EVT_SUB(LVar2, 200) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 10, EVT_FLOAT(0.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 10, LVar0, LVar1, LVar2, 80, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 10, LVar0, LVar1, LVar2, 80, TRUE) EVT_RETURN EVT_END }; @@ -932,7 +932,7 @@ EvtScript N(8021C9A4) = { EvtScript N(8021CAE4) = { EVT_CALL(GetPartRotation, ACTOR_SELF, 6, LVar2, LVar3, LVar4) - EVT_CALL(MakeLerp, LVar4, 0, 20, 0) + EVT_CALL(MakeLerp, LVar4, 0, 20, EASING_LINEAR) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(SetPartRotation, ACTOR_SELF, 6, EVT_FLOAT(0.0), EVT_FLOAT(0.0), LVar0) @@ -946,7 +946,7 @@ EvtScript N(8021CAE4) = { EvtScript N(8021CB98) = { EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 6, LVar0, LVar1, LVar2) EVT_CALL(SetPartDispOffset, ACTOR_SELF, 6, 0, -60, 0) EVT_SET(LVar1, 60) @@ -966,14 +966,14 @@ EvtScript N(8021CB98) = { EVT_SET(LVar1, -200) EVT_ADD(LVar2, 100) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.6)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 80, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 80, TRUE) EVT_RETURN EVT_END }; EvtScript N(8021CD50) = { EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 11, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 11, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 11, LVar0, LVar1, LVar2) EVT_CALL(SetPartDispOffset, ACTOR_SELF, 11, 0, -60, 0) EVT_SET(LVar1, 60) @@ -982,7 +982,7 @@ EvtScript N(8021CD50) = { EVT_SET(LVar1, -200) EVT_SUB(LVar2, 200) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 11, EVT_FLOAT(0.4)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 11, LVar0, LVar1, LVar2, 80, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 11, LVar0, LVar1, LVar2, 80, TRUE) EVT_RETURN EVT_END }; @@ -1032,7 +1032,7 @@ EvtScript N(8021CF4C) = { EvtScript N(8021D054) = { EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 8, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 8, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 8, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 8, LVar0, LVar1, LVar2) EVT_THREAD @@ -1049,14 +1049,14 @@ EvtScript N(8021D054) = { EVT_SET(LVar1, -200) EVT_ADD(LVar2, 100) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 8, EVT_FLOAT(0.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 8, LVar0, LVar1, LVar2, 80, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 8, LVar0, LVar1, LVar2, 80, TRUE) EVT_RETURN EVT_END }; EvtScript N(8021D1CC) = { EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 9, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 9, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 9, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 9, LVar0, LVar1, LVar2) EVT_THREAD @@ -1073,7 +1073,7 @@ EvtScript N(8021D1CC) = { EVT_SET(LVar1, -200) EVT_SUB(LVar2, 100) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 9, EVT_FLOAT(0.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 9, LVar0, LVar1, LVar2, 80, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 9, LVar0, LVar1, LVar2, 80, TRUE) EVT_WAIT(100) EVT_RETURN EVT_END @@ -1081,7 +1081,7 @@ EvtScript N(8021D1CC) = { EvtScript N(8021D350) = { EVT_USE_ARRAY(D_80235FC0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 7, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 7, LVar0, LVar1, LVar2) EVT_CALL(SetPartDispOffset, ACTOR_SELF, 7, 0, -30, 0) EVT_SET(LVar1, 30) @@ -1101,7 +1101,7 @@ EvtScript N(8021D350) = { EVT_SET(LVar1, -200) EVT_ADD(LVar2, 200) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 7, EVT_FLOAT(0.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 7, LVar0, LVar1, LVar2, 80, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 7, LVar0, LVar1, LVar2, 80, TRUE) EVT_RETURN EVT_END }; @@ -1163,51 +1163,51 @@ EvtScript N(idle_8021D508) = { EVT_CALL(RotateGroup, 24, LVar0, 1, 0, 0) EVT_CALL(RotateGroup, 24, LVar1, 0, 1, 0) EVT_CALL(RotateGroup, 24, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 15, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 16, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 17, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 18, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 19, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 20, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 21, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 22, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 23, MODEL_FLAG_FLAG_40, 1) + EVT_CALL(SetModelFlags, 15, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 16, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 17, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 18, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 19, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 20, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 21, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 22, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 23, MODEL_FLAG_FLAG_40, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) EVT_CALL(TranslateGroup, 34, LVar0, LVar1, LVar2) EVT_CALL(GetPartRotation, ACTOR_SELF, 3, LVar0, LVar1, LVar2) EVT_CALL(RotateGroup, 34, LVar0, 1, 0, 0) EVT_CALL(RotateGroup, 34, LVar1, 0, 1, 0) EVT_CALL(RotateGroup, 34, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 31, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 32, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 33, MODEL_FLAG_FLAG_40, 1) + EVT_CALL(SetModelFlags, 31, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 32, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 33, MODEL_FLAG_FLAG_40, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 4, LVar0, LVar1, LVar2) EVT_CALL(TranslateGroup, 30, LVar0, LVar1, LVar2) EVT_CALL(GetPartRotation, ACTOR_SELF, 4, LVar0, LVar1, LVar2) EVT_CALL(RotateGroup, 30, LVar0, 1, 0, 0) EVT_CALL(RotateGroup, 30, LVar1, 0, 1, 0) EVT_CALL(RotateGroup, 30, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 25, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 26, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 27, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 28, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 29, MODEL_FLAG_FLAG_40, 1) + EVT_CALL(SetModelFlags, 25, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 26, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 27, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 28, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 29, MODEL_FLAG_FLAG_40, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 6, LVar0, LVar1, LVar2) EVT_CALL(TranslateGroup, 14, LVar0, LVar1, LVar2) EVT_CALL(GetPartRotation, ACTOR_SELF, 6, LVar0, LVar1, LVar2) EVT_CALL(RotateGroup, 14, LVar0, 1, 0, 0) EVT_CALL(RotateGroup, 14, LVar1, 0, 1, 0) EVT_CALL(RotateGroup, 14, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 11, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 12, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 13, MODEL_FLAG_FLAG_40, 1) + EVT_CALL(SetModelFlags, 11, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 12, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 13, MODEL_FLAG_FLAG_40, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 7, LVar0, LVar1, LVar2) EVT_CALL(TranslateGroup, 10, LVar0, LVar1, LVar2) EVT_CALL(GetPartRotation, ACTOR_SELF, 7, LVar0, LVar1, LVar2) EVT_CALL(RotateGroup, 10, LVar0, 1, 0, 0) EVT_CALL(RotateGroup, 10, LVar1, 0, 1, 0) EVT_CALL(RotateGroup, 10, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 9, MODEL_FLAG_FLAG_40, 1) + EVT_CALL(SetModelFlags, 9, MODEL_FLAG_FLAG_40, TRUE) EVT_SET(LVar0, ArrayVar(0)) EVT_IF_EQ(LVar0, 9) EVT_CALL(GetPartPos, ACTOR_SELF, 8, LVar0, LVar1, LVar2) @@ -1221,7 +1221,7 @@ EvtScript N(idle_8021D508) = { EVT_CALL(RotateGroup, 44, LVar0, 1, 0, 0) EVT_CALL(RotateGroup, 44, LVar1, 0, 1, 0) EVT_CALL(RotateGroup, 44, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 43, MODEL_FLAG_FLAG_40, 1) + EVT_CALL(SetModelFlags, 43, MODEL_FLAG_FLAG_40, TRUE) EVT_SET(LVar0, ArrayVar(0)) EVT_IF_EQ(LVar0, 9) EVT_CALL(GetPartPos, ACTOR_SELF, 9, LVar0, LVar1, LVar2) @@ -1235,25 +1235,25 @@ EvtScript N(idle_8021D508) = { EVT_CALL(RotateGroup, 46, LVar0, 1, 0, 0) EVT_CALL(RotateGroup, 46, LVar1, 0, 1, 0) EVT_CALL(RotateGroup, 46, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 45, MODEL_FLAG_FLAG_40, 1) + EVT_CALL(SetModelFlags, 45, MODEL_FLAG_FLAG_40, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 11, LVar0, LVar1, LVar2) EVT_CALL(TranslateGroup, 38, LVar0, LVar1, LVar2) EVT_CALL(GetPartRotation, ACTOR_SELF, 11, LVar0, LVar1, LVar2) EVT_CALL(RotateGroup, 38, LVar0, 1, 0, 0) EVT_CALL(RotateGroup, 38, LVar1, 0, 1, 0) EVT_CALL(RotateGroup, 38, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 35, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 36, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 37, MODEL_FLAG_FLAG_40, 1) + EVT_CALL(SetModelFlags, 35, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 36, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 37, MODEL_FLAG_FLAG_40, TRUE) EVT_CALL(GetPartPos, ACTOR_SELF, 10, LVar0, LVar1, LVar2) EVT_CALL(TranslateGroup, 42, LVar0, LVar1, LVar2) EVT_CALL(GetPartRotation, ACTOR_SELF, 10, LVar0, LVar1, LVar2) EVT_CALL(RotateGroup, 42, LVar0, 1, 0, 0) EVT_CALL(RotateGroup, 42, LVar1, 0, 1, 0) EVT_CALL(RotateGroup, 42, LVar2, 0, 0, 1) - EVT_CALL(SetModelFlags, 39, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 40, MODEL_FLAG_FLAG_40, 1) - EVT_CALL(SetModelFlags, 41, MODEL_FLAG_FLAG_40, 1) + EVT_CALL(SetModelFlags, 39, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 40, MODEL_FLAG_FLAG_40, TRUE) + EVT_CALL(SetModelFlags, 41, MODEL_FLAG_FLAG_40, TRUE) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_IF_NOT_FLAG(LVar0, 2) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) @@ -1299,31 +1299,31 @@ EvtScript N(8021E3A0) = { EVT_WAIT(LVar3) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -8) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LVar0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, 98, 0, 0, 0, 0) EVT_CALL(RandInt, LVarA, LVar3) EVT_ADD(LVar3, 1) EVT_WAIT(LVar3) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -12) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LVar0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, 23, 0, 0, 0, 0) EVT_CALL(RandInt, LVarA, LVar3) EVT_ADD(LVar3, 1) EVT_WAIT(LVar3) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -47) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LVar0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, 70, 0, 0, 0, 0) EVT_CALL(RandInt, LVarA, LVar3) EVT_ADD(LVar3, 1) EVT_WAIT(LVar3) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LVar0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, 22, 0, 0, 0, 0) EVT_CALL(RandInt, LVarA, LVar3) EVT_ADD(LVar3, 1) EVT_WAIT(LVar3) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -19) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LVar0, 59, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, 59, 33, 0, 0, 0) EVT_RETURN EVT_END }; @@ -1364,11 +1364,11 @@ EvtScript N(handleEvent_8021E6F0) = { EVT_ADDF(LVar1, LVar3) EVT_ADDF(LVar2, EVT_FLOAT(5.0)) EVT_DIVF(LVar3, EVT_FLOAT(10.0)) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_WAIT(5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_END_IF - EVT_CALL(ActorSpeak, MSG_CH1_0106, ACTOR_SELF, 1, -00001, -00001) + EVT_CALL(ActorSpeak, MSG_CH1_0106, ACTOR_SELF, 1, -1, -1) EVT_WAIT(30) EVT_SET(ArrayVar(0), 8) EVT_LABEL(20) @@ -1397,9 +1397,9 @@ EvtScript N(handleEvent_8021E6F0) = { EVT_ADDF(LVar1, LVar3) EVT_ADDF(LVar2, EVT_FLOAT(5.0)) EVT_DIVF(LVar3, EVT_FLOAT(10.0)) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_WAIT(5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_END_CASE_GROUP EVT_CASE_DEFAULT EVT_END_SWITCH @@ -1493,34 +1493,34 @@ EvtScript N(takeTurn_8021EC98) = { EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(ActorSpeak, MSG_CH1_00FE, ACTOR_SELF, 1, -00001, -00001) + EVT_CALL(ActorSpeak, MSG_CH1_00FE, ACTOR_SELF, 1, -1, -1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_CASE_EQ(1) - EVT_CALL(ActorSpeak, MSG_CH1_00FF, ACTOR_SELF, 1, -00001, -00001) + EVT_CALL(ActorSpeak, MSG_CH1_00FF, ACTOR_SELF, 1, -1, -1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) EVT_CASE_EQ(2) - EVT_CALL(ActorSpeak, MSG_CH1_0100, ACTOR_SELF, 1, -00001, -00001) + EVT_CALL(ActorSpeak, MSG_CH1_0100, ACTOR_SELF, 1, -1, -1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, 85, 81, 0) EVT_CALL(SetBattleCamOffsetZ, 0) EVT_CALL(SetBattleCamZoom, 249) EVT_CALL(MoveBattleCamOver, 10) EVT_WAIT(10) - EVT_CALL(ActorSpeak, MSG_CH1_0101, ACTOR_SELF, 1, -00001, -00001) + EVT_CALL(ActorSpeak, MSG_CH1_0101, ACTOR_SELF, 1, -1, -1) EVT_WAIT(10) - EVT_CALL(ActorSpeak, MSG_CH1_0102, ACTOR_SELF, 1, -00001, -00001) + EVT_CALL(ActorSpeak, MSG_CH1_0102, ACTOR_SELF, 1, -1, -1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 3) EVT_CASE_EQ(3) - EVT_CALL(ActorSpeak, MSG_CH1_0103, ACTOR_SELF, 1, -00001, -00001) + EVT_CALL(ActorSpeak, MSG_CH1_0103, ACTOR_SELF, 1, -1, -1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, 85, 81, 0) EVT_CALL(SetBattleCamOffsetZ, 0) EVT_CALL(SetBattleCamZoom, 249) EVT_CALL(MoveBattleCamOver, 10) EVT_WAIT(10) - EVT_CALL(ActorSpeak, MSG_CH1_0104, ACTOR_SELF, 1, -00001, -00001) + EVT_CALL(ActorSpeak, MSG_CH1_0104, ACTOR_SELF, 1, -1, -1) EVT_WAIT(10) - EVT_CALL(ActorSpeak, MSG_CH1_0105, ACTOR_SELF, 1, -00001, -00001) + EVT_CALL(ActorSpeak, MSG_CH1_0105, ACTOR_SELF, 1, -1, -1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) EVT_END_SWITCH EVT_CALL(func_802535B4, 1) @@ -1543,7 +1543,7 @@ EvtScript N(nextTurn_8021F410) = { EVT_CALL(SetBattleCamZoom, 461) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) - EVT_CALL(ActorSpeak, MSG_CH1_00FD, ACTOR_SELF, 1, -00001, -00001) + EVT_CALL(ActorSpeak, MSG_CH1_00FD, ACTOR_SELF, 1, -1, -1) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20FD) EVT_WAIT(22) @@ -1552,7 +1552,7 @@ EvtScript N(nextTurn_8021F410) = { EVT_SET(ArrayVar(0), 6) EVT_WAIT(30) EVT_SET(ArrayVar(0), 0) - EVT_CALL(EndActorSpeech, ACTOR_SELF, 1, -00001, -00001) + EVT_CALL(EndActorSpeech, ACTOR_SELF, 1, -1, -1) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_OR_CONST(LVar0, 0x8) EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) @@ -1578,7 +1578,7 @@ EvtScript N(8021F630) = { EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_KoopaBros_Green_Anim1C) EVT_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY0, EVT_FLOAT(0.4)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY0, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_ENEMY0, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetGoalPos, ACTOR_ENEMY0, -300, 250, 0) EVT_CALL(JumpToGoal, ACTOR_ENEMY0, 50, FALSE, TRUE, FALSE) EVT_END_THREAD @@ -1588,7 +1588,7 @@ EvtScript N(8021F630) = { EVT_CALL(SetAnimation, ACTOR_ENEMY1, 1, ANIM_KoopaBros_Yellow_Anim1C) EVT_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY1, EVT_FLOAT(0.4)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY1, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_ENEMY1, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetGoalPos, ACTOR_ENEMY1, -200, 250, 0) EVT_CALL(JumpToGoal, ACTOR_ENEMY1, 50, FALSE, TRUE, FALSE) EVT_END_THREAD @@ -1598,7 +1598,7 @@ EvtScript N(8021F630) = { EVT_CALL(SetAnimation, ACTOR_ENEMY2, 1, ANIM_KoopaBros_Black_Anim1C) EVT_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY2, EVT_FLOAT(0.4)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY2, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_ENEMY2, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetGoalPos, ACTOR_ENEMY2, 0, 250, 0) EVT_CALL(JumpToGoal, ACTOR_ENEMY2, 50, FALSE, TRUE, FALSE) EVT_END_THREAD @@ -1608,40 +1608,40 @@ EvtScript N(8021F630) = { EVT_CALL(SetAnimation, ACTOR_ENEMY3, 1, ANIM_KoopaBros_Red_Anim1C) EVT_THREAD EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY3, EVT_FLOAT(0.4)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY3, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_ENEMY3, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetGoalPos, ACTOR_ENEMY3, 150, 250, 0) EVT_CALL(JumpToGoal, ACTOR_ENEMY3, 50, FALSE, TRUE, FALSE) EVT_END_THREAD EVT_WAIT(100) EVT_WAIT(100) - EVT_CALL(EnableGroup, 24, 0) - EVT_CALL(EnableGroup, 14, 0) - EVT_CALL(EnableGroup, 10, 0) - EVT_CALL(EnableGroup, 34, 0) - EVT_CALL(EnableGroup, 30, 0) - EVT_CALL(EnableGroup, 44, 0) - EVT_CALL(EnableGroup, 46, 0) - EVT_CALL(EnableGroup, 38, 0) - EVT_CALL(EnableGroup, 42, 0) + EVT_CALL(EnableGroup, 24, FALSE) + EVT_CALL(EnableGroup, 14, FALSE) + EVT_CALL(EnableGroup, 10, FALSE) + EVT_CALL(EnableGroup, 34, FALSE) + EVT_CALL(EnableGroup, 30, FALSE) + EVT_CALL(EnableGroup, 44, FALSE) + EVT_CALL(EnableGroup, 46, FALSE) + EVT_CALL(EnableGroup, 38, FALSE) + EVT_CALL(EnableGroup, 42, FALSE) EVT_THREAD EVT_WAIT(23) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY0, 0x301) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY0, SOUND_301) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, 0x301) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_301) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, 0x301) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, SOUND_301) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY3, 0x301) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY3, SOUND_301) EVT_END_THREAD EVT_THREAD EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_KoopaBros_Green_Anim12) EVT_CALL(SetActorPos, ACTOR_ENEMY0, 20, 250, 0) EVT_CALL(SetGoalPos, ACTOR_ENEMY0, 20, 0, 0) EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY0, EVT_FLOAT(1.5)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY0, 2, 0, 0) - EVT_CALL(FallToGoal, 512, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY0, 0x3E9) - EVT_CALL(ResetActorSounds, ACTOR_ENEMY0, 2) + EVT_CALL(SetActorSounds, ACTOR_ENEMY0, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(FallToGoal, ACTOR_ENEMY0, 30) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY0, SOUND_3E9) + EVT_CALL(ResetActorSounds, ACTOR_ENEMY0, ACTOR_SOUND_JUMP) EVT_CALL(ForceHomePos, ACTOR_ENEMY0, 20, 0, 0) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_KoopaBros_Green_Anim05) EVT_END_THREAD @@ -1651,10 +1651,10 @@ EvtScript N(8021F630) = { EVT_CALL(SetActorPos, ACTOR_ENEMY1, 60, 250, -5) EVT_CALL(SetGoalPos, ACTOR_ENEMY1, 60, 0, -5) EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY1, EVT_FLOAT(1.5)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY1, 2, 0, 0) - EVT_CALL(FallToGoal, 513, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, 0x3E9) - EVT_CALL(ResetActorSounds, ACTOR_ENEMY1, 2) + EVT_CALL(SetActorSounds, ACTOR_ENEMY1, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(FallToGoal, ACTOR_ENEMY1, 30) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_3E9) + EVT_CALL(ResetActorSounds, ACTOR_ENEMY1, ACTOR_SOUND_JUMP) EVT_CALL(ForceHomePos, ACTOR_ENEMY1, 60, 0, -5) EVT_CALL(SetAnimation, ACTOR_ENEMY1, 1, ANIM_KoopaBros_Yellow_Anim05) EVT_END_THREAD @@ -1664,10 +1664,10 @@ EvtScript N(8021F630) = { EVT_CALL(SetActorPos, ACTOR_ENEMY2, 100, 250, -10) EVT_CALL(SetGoalPos, ACTOR_ENEMY2, 100, 0, -10) EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY2, EVT_FLOAT(1.5)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY2, 2, 0, 0) - EVT_CALL(FallToGoal, 514, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, 0x3E9) - EVT_CALL(ResetActorSounds, ACTOR_ENEMY2, 2) + EVT_CALL(SetActorSounds, ACTOR_ENEMY2, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(FallToGoal, ACTOR_ENEMY2, 30) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, SOUND_3E9) + EVT_CALL(ResetActorSounds, ACTOR_ENEMY2, ACTOR_SOUND_JUMP) EVT_CALL(ForceHomePos, ACTOR_ENEMY2, 100, 0, -10) EVT_CALL(SetAnimation, ACTOR_ENEMY2, 1, ANIM_KoopaBros_Black_Anim05) EVT_END_THREAD @@ -1677,10 +1677,10 @@ EvtScript N(8021F630) = { EVT_CALL(SetActorPos, ACTOR_ENEMY3, 140, 250, -15) EVT_CALL(SetGoalPos, ACTOR_ENEMY3, 140, 0, -15) EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY3, EVT_FLOAT(1.5)) - EVT_CALL(SetActorSounds, ACTOR_ENEMY3, 2, 0, 0) - EVT_CALL(FallToGoal, 515, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY3, 0x3E9) - EVT_CALL(ResetActorSounds, ACTOR_ENEMY3, 2) + EVT_CALL(SetActorSounds, ACTOR_ENEMY3, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(FallToGoal, ACTOR_ENEMY3, 30) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY3, SOUND_3E9) + EVT_CALL(ResetActorSounds, ACTOR_ENEMY3, ACTOR_SOUND_JUMP) EVT_CALL(ForceHomePos, ACTOR_ENEMY3, 140, 0, -15) EVT_CALL(SetAnimation, ACTOR_ENEMY3, 1, ANIM_KoopaBros_Red_Anim05) EVT_END_THREAD @@ -1697,58 +1697,58 @@ EvtScript N(8021F630) = { EVT_ADD(LVar0, 7) EVT_ADD(LVar1, 28) EVT_ADD(LVar2, 5) - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY0, 0x20F3) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY0, SOUND_20F3) EVT_CALL(SetAnimation, ACTOR_ENEMY1, 1, ANIM_KoopaBros_Yellow_Anim1A) EVT_WAIT(5) EVT_CALL(GetActorPos, ACTOR_ENEMY1, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 7) EVT_ADD(LVar1, 28) EVT_ADD(LVar2, 5) - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, 0x20F3) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_20F3) EVT_CALL(SetAnimation, ACTOR_ENEMY2, 1, ANIM_KoopaBros_Black_Anim1A) EVT_WAIT(5) EVT_CALL(GetActorPos, ACTOR_ENEMY2, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 7) EVT_ADD(LVar1, 28) EVT_ADD(LVar2, 5) - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, 0x20F3) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, SOUND_20F3) EVT_CALL(SetAnimation, ACTOR_ENEMY3, 1, ANIM_KoopaBros_Red_Anim1A) EVT_WAIT(5) EVT_CALL(GetActorPos, ACTOR_ENEMY3, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 7) EVT_ADD(LVar1, 28) EVT_ADD(LVar2, 5) - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY3, 0x20F3) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY3, SOUND_20F3) EVT_WAIT(30) EVT_CALL(func_80218350_4B1540) - EVT_CALL(ActorSpeak, MSG_CH1_0107, ACTOR_ENEMY1, 1, -00001, -00001) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000 | ACTOR_FLAG_NO_DMG_APPLY, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, 1) + EVT_CALL(ActorSpeak, MSG_CH1_0107, ACTOR_ENEMY1, 1, -1, -1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000 | ACTOR_FLAG_NO_DMG_APPLY, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_80224D84))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_802239BC))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_802242FC))) EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_80225438))) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY0, ACTOR_FLAG_40000, 0) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY0, ACTOR_FLAG_40000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY0, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_CALL(HPBarToHome, ACTOR_ENEMY0) EVT_CALL(SetAnimation, ACTOR_ENEMY0, 1, ANIM_KoopaBros_Green_Anim04) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY1, ACTOR_FLAG_40000, 0) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY1, 1, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY1, ACTOR_FLAG_40000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY1, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_CALL(HPBarToHome, ACTOR_ENEMY1) EVT_CALL(SetAnimation, ACTOR_ENEMY1, 1, ANIM_KoopaBros_Yellow_Anim04) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY2, ACTOR_FLAG_40000, 0) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY2, 1, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY2, ACTOR_FLAG_40000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY2, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_CALL(HPBarToHome, ACTOR_ENEMY2) EVT_CALL(SetAnimation, ACTOR_ENEMY2, 1, ANIM_KoopaBros_Black_Anim04) - EVT_CALL(SetActorFlagBits, ACTOR_ENEMY3, ACTOR_FLAG_40000, 0) - EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, 1, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetActorFlagBits, ACTOR_ENEMY3, ACTOR_FLAG_40000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_ENEMY3, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_CALL(HPBarToHome, ACTOR_ENEMY3) EVT_CALL(SetAnimation, ACTOR_ENEMY3, 1, ANIM_KoopaBros_Red_Anim04) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 3) @@ -1879,7 +1879,7 @@ EvtScript N(80220588) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(func_8021837C_4B156C, LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, 0x3E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -1905,15 +1905,15 @@ EvtScript N(80220588) = { EVT_CASE_EQ(ACTOR_ENEMY3) EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim1B) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, LVarA, 0x20F3) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_20F3) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 22) EVT_ADD(LVar1, 19) - 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_WAIT(20) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_IF_NOT_FLAG(LVar0, 2) - EVT_CALL(ActorSpeak, MSG_CH1_010A, LVarA, 1, -00001, -00001) + EVT_CALL(ActorSpeak, MSG_CH1_010A, LVarA, 1, -1, -1) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_OR_CONST(LVar0, 0x2) EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) @@ -1929,8 +1929,8 @@ EvtScript N(80220588) = { EVT_CASE_EQ(ACTOR_ENEMY3) EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim04) EVT_END_SWITCH - EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_40000, 1) - EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_40000, TRUE) + EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(HPBarToHome, LVarA) EVT_CALL(SetActorVar, LVarA, 1, 3) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) @@ -1977,8 +1977,8 @@ EvtScript N(80220588) = { EVT_CASE_EQ(ACTOR_ENEMY3) EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim05) EVT_END_SWITCH - EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_40000, 1) - EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_40000, TRUE) + EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(HPBarToHome, LVarA) EVT_CALL(SetActorVar, LVarA, 1, 6) EVT_END_IF @@ -2029,7 +2029,7 @@ EvtScript N(80220588) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(func_8021837C_4B156C, LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, 0x3E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -2043,8 +2043,8 @@ EvtScript N(80220588) = { EVT_CASE_EQ(ACTOR_ENEMY3) EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim05) EVT_END_SWITCH - EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_40000, 1) - EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_40000, TRUE) + EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(HPBarToHome, LVarA) EVT_CALL(SetActorVar, LVarA, 1, 5) EVT_END_IF @@ -2095,7 +2095,7 @@ EvtScript N(80220588) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(func_8021837C_4B156C, LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, 0x3E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -2109,8 +2109,8 @@ EvtScript N(80220588) = { EVT_CASE_EQ(ACTOR_ENEMY3) EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim05) EVT_END_SWITCH - EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_40000, 1) - EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_40000, TRUE) + EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(HPBarToHome, LVarA) EVT_CALL(SetActorVar, LVarA, 1, 4) EVT_END_IF @@ -2222,7 +2222,7 @@ EvtScript N(80221DB4) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(func_8021837C_4B156C, LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, 0x3E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -2247,14 +2247,14 @@ EvtScript N(80221DB4) = { EVT_CASE_EQ(ACTOR_ENEMY3) EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim1B) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, LVarA, 0x20F3) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_20F3) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 22) EVT_ADD(LVar1, 19) - 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_WAIT(30) - EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_40000, 1) - EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_40000, TRUE) + EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(HPBarToHome, LVarA) EVT_CALL(SetActorVar, LVarA, 1, 3) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) @@ -2304,7 +2304,7 @@ EvtScript N(80221DB4) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(func_8021837C_4B156C, LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, 0x3E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -2329,8 +2329,8 @@ EvtScript N(80221DB4) = { EVT_CASE_EQ(ACTOR_ENEMY3) EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_Anim05) EVT_END_SWITCH - EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_40000, 1) - EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_40000, TRUE) + EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(HPBarToHome, LVarA) EVT_CALL(SetActorVar, LVarA, 1, 4) EVT_END_SWITCH @@ -2340,7 +2340,7 @@ EvtScript N(80221DB4) = { EvtScript N(80222C44) = { EVT_SET(LVarA, 0) - EVT_CALL(PlayerCreateTargetList, 32770) + EVT_CALL(PlayerCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -2354,7 +2354,7 @@ EvtScript N(80222C44) = { EVT_ADD(LVarA, 1) EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -2371,7 +2371,7 @@ EvtScript N(80222C44) = { EVT_SET(LocalFlag(0), 0) EVT_SET(LVarB, LVarA) EVT_SUB(LVarB, 1) - EVT_CALL(PlayerCreateTargetList, 32770) + EVT_CALL(PlayerCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(1) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -2385,7 +2385,7 @@ EvtScript N(80222C44) = { EVT_SUB(LVarB, 1) EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(1) EVT_END_IF @@ -2397,8 +2397,8 @@ EvtScript N(80222C44) = { EVT_GOTO(2) EVT_END_IF EVT_CALL(func_802535B4, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_POPUP, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_POPUP, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_SET(LVar0, LVarA) EVT_MUL(LVar0, 18) EVT_ADD(LVar0, 20) @@ -2417,7 +2417,7 @@ EvtScript N(80222C44) = { EvtScript N(802230E8) = { EVT_SET(LVarA, 0) - EVT_CALL(PlayerCreateTargetList, 32770) + EVT_CALL(PlayerCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -2428,7 +2428,7 @@ EvtScript N(802230E8) = { EVT_ADD(LVarA, 1) EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -2457,7 +2457,7 @@ EvtScript N(802230E8) = { EVT_ADD(LVar0, 1) EVT_END_LOOP EVT_SET(LVar2, 0) - EVT_CALL(PlayerCreateTargetList, 32770) + EVT_CALL(PlayerCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(1) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -2467,7 +2467,7 @@ EvtScript N(802230E8) = { EVT_EXEC(N(80221DB4)) EVT_ADD(LVar2, 1) EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(1) EVT_END_IF @@ -2479,8 +2479,8 @@ EvtScript N(802230E8) = { EVT_GOTO(2) EVT_END_IF EVT_CALL(func_802535B4, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_POPUP, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_POPUP, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_SET(LVar0, LVarA) EVT_MUL(LVar0, 18) EVT_ADD(LVar0, 20) @@ -2527,9 +2527,9 @@ EvtScript N(80223718) = { EVT_SET(LVarA, 6) EVT_END_IF EVT_EXEC_WAIT(N(80223870)) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_AND_CONST(LVar0, -17) EVT_CALL(SetActorVar, ACTOR_ENEMY4, 0, LVar0) 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 index 644fa1b878..e7f70862d2 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 @@ -70,7 +70,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 5, .partCount = ARRAY_COUNT(N(partsTable_80225624)), .partsData = N(partsTable_80225624), - .takeTurnScript = &N(init_80227CEC), + .initScript = &N(init_80227CEC), .statusTable = N(statusTable_80225578), .escapeChance = 0, .airLiftChance = 0, @@ -271,15 +271,15 @@ EvtScript N(802257A8) = { EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.8)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) EVT_END_THREAD EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim0C) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022579C))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) @@ -310,7 +310,7 @@ EvtScript N(802257A8) = { EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.8)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) EVT_END_THREAD EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -319,13 +319,13 @@ EvtScript N(802257A8) = { EVT_ADDF(LVar1, LVar3) EVT_ADDF(LVar2, EVT_FLOAT(5.0)) EVT_DIVF(LVar3, EVT_FLOAT(10.0)) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim0C) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022579C))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) @@ -344,14 +344,14 @@ EvtScript N(802257A8) = { EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(12) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_THREAD EVT_SET(LVar0, 0) @@ -374,7 +374,7 @@ EvtScript N(802257A8) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80225560))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80225670))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim04) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF EVT_CASE_DEFAULT EVT_WAIT(20) @@ -429,7 +429,7 @@ EvtScript N(802257A8) = { EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) EVT_SWITCH(LVar0) @@ -443,17 +443,17 @@ EvtScript N(802257A8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD - EVT_CALL(SetPartRotationOffset, -127, 1, 0, 15, 0) + EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 15, 0) EVT_SET(LVar0, 0) EVT_LOOP(40) EVT_SUB(LVar0, 45) EVT_CALL(SetPartRotation, ACTOR_SELF, 1, 0, 0, LVar0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartRotationOffset, -127, 1, 0, 0, 0) + EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 0, 0) EVT_CALL(SetPartRotation, ACTOR_SELF, 1, 0, 0, 0) EVT_END_THREAD EVT_CALL(GetActorVar, ACTOR_ENEMY4, 4, LVar1) @@ -497,7 +497,7 @@ EvtScript N(802257A8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 22) EVT_ADD(LVar1, 19) - 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_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim04) EVT_WAIT(20) @@ -521,21 +521,21 @@ EvtScript N(802257A8) = { EVT_CASE_EQ(6) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_END_SWITCH - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD - EVT_CALL(SetPartRotationOffset, -127, 1, 0, 15, 0) + EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 15, 0) EVT_SET(LVar0, 0) EVT_LOOP(40) EVT_SUB(LVar0, 45) EVT_CALL(SetPartRotation, ACTOR_SELF, 1, 0, 0, LVar0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartRotationOffset, -127, 1, 0, 0, 0) + EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 0, 0) EVT_CALL(SetPartRotation, ACTOR_SELF, 1, 0, 0, 0) EVT_END_THREAD EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) @@ -621,23 +621,23 @@ EvtScript N(802257A8) = { EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD - EVT_CALL(SetPartRotationOffset, -127, 1, 0, 15, 0) + EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 15, 0) EVT_SET(LVar0, 0) EVT_LOOP(40) EVT_SUB(LVar0, 45) EVT_CALL(SetPartRotation, ACTOR_SELF, 1, 0, 0, LVar0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartRotationOffset, -127, 1, 0, 0, 0) + EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 0, 0) EVT_CALL(SetPartRotation, ACTOR_SELF, 1, 0, 0, 0) EVT_END_THREAD EVT_CALL(GetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -656,7 +656,7 @@ EvtScript N(802257A8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 22) EVT_ADD(LVar1, 19) - 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_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim03) EVT_CALL(SetGoalToHome, ACTOR_SELF) @@ -678,7 +678,7 @@ EvtScript N(init_80227CEC) = { EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) EVT_RETURN 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 index ede1f33c74..ad6e05366a 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 @@ -70,7 +70,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 5, .partCount = ARRAY_COUNT(N(partsTable_802285C4)), .partsData = N(partsTable_802285C4), - .takeTurnScript = &N(init_8022AC8C), + .initScript = &N(init_8022AC8C), .statusTable = N(statusTable_80228518), .escapeChance = 0, .airLiftChance = 0, @@ -271,15 +271,15 @@ EvtScript N(80228748) = { EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.8)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) EVT_END_THREAD EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim0C) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022873C))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) @@ -310,7 +310,7 @@ EvtScript N(80228748) = { EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.8)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) EVT_END_THREAD EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -319,13 +319,13 @@ EvtScript N(80228748) = { EVT_ADDF(LVar1, LVar3) EVT_ADDF(LVar2, EVT_FLOAT(5.0)) EVT_DIVF(LVar3, EVT_FLOAT(10.0)) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim0C) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022873C))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) @@ -344,14 +344,14 @@ EvtScript N(80228748) = { EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(12) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_THREAD EVT_SET(LVar0, 0) @@ -374,7 +374,7 @@ EvtScript N(80228748) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80228500))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80228610))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim04) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF EVT_CASE_DEFAULT EVT_WAIT(20) @@ -429,7 +429,7 @@ EvtScript N(80228748) = { EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) EVT_SWITCH(LVar0) @@ -443,7 +443,7 @@ EvtScript N(80228748) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 15, 0) @@ -497,7 +497,7 @@ EvtScript N(80228748) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 22) EVT_ADD(LVar1, 19) - 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_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim04) EVT_WAIT(20) @@ -521,11 +521,11 @@ EvtScript N(80228748) = { EVT_CASE_EQ(6) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_END_SWITCH - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 15, 0) @@ -621,13 +621,13 @@ EvtScript N(80228748) = { EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 15, 0) @@ -656,7 +656,7 @@ EvtScript N(80228748) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 22) EVT_ADD(LVar1, 19) - 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_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim03) EVT_CALL(SetGoalToHome, ACTOR_SELF) @@ -678,7 +678,7 @@ EvtScript N(init_8022AC8C) = { EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) EVT_RETURN 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 index b91b09bb8f..b456e2ef69 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 @@ -70,7 +70,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 5, .partCount = ARRAY_COUNT(N(partsTable_8022E504)), .partsData = N(partsTable_8022E504), - .takeTurnScript = &N(init_80230BCC), + .initScript = &N(init_80230BCC), .statusTable = N(statusTable_8022E458), .escapeChance = 0, .airLiftChance = 0, @@ -271,15 +271,15 @@ EvtScript N(8022E688) = { EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.8)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) EVT_END_THREAD EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim0C) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E67C))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) @@ -310,7 +310,7 @@ EvtScript N(8022E688) = { EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.8)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.8)) EVT_END_THREAD EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -319,13 +319,13 @@ EvtScript N(8022E688) = { EVT_ADDF(LVar1, LVar3) EVT_ADDF(LVar2, EVT_FLOAT(5.0)) EVT_DIVF(LVar3, EVT_FLOAT(10.0)) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim0C) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E67C))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) @@ -344,14 +344,14 @@ EvtScript N(8022E688) = { EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 2, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(12) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_THREAD EVT_SET(LVar0, 0) @@ -374,7 +374,7 @@ EvtScript N(8022E688) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022E440))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E550))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim04) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF EVT_CASE_DEFAULT EVT_WAIT(20) @@ -429,7 +429,7 @@ EvtScript N(8022E688) = { EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 3, LVar0) EVT_SWITCH(LVar0) @@ -443,7 +443,7 @@ EvtScript N(8022E688) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 15, 0) @@ -497,7 +497,7 @@ EvtScript N(8022E688) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 22) EVT_ADD(LVar1, 19) - 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_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim04) EVT_WAIT(20) @@ -521,11 +521,11 @@ EvtScript N(8022E688) = { EVT_CASE_EQ(6) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_END_SWITCH - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 15, 0) @@ -621,13 +621,13 @@ EvtScript N(8022E688) = { EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 0) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_THREAD EVT_CALL(SetPartRotationOffset, ACTOR_SELF, 1, 0, 15, 0) @@ -656,7 +656,7 @@ EvtScript N(8022E688) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 22) EVT_ADD(LVar1, 19) - 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_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim03) EVT_CALL(SetGoalToHome, ACTOR_SELF) @@ -678,7 +678,7 @@ EvtScript N(init_80230BCC) = { EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) EVT_RETURN diff --git a/src/battle/area/trd_part_2/stage/trd_00.c b/src/battle/area/trd_part_2/stage/trd_00.c index adaa203ab4..de7fa31589 100644 --- a/src/battle/area/trd_part_2/stage/trd_00.c +++ b/src/battle/area/trd_part_2/stage/trd_00.c @@ -3,27 +3,28 @@ #define NAMESPACE b_area_trd_part_2_trd_00 -EvtScript N(beforeBattle_802313E0) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8023141C) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_8023142C)[] = { - 0x00000009, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x00000009, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt00_shape", .hit = "trd_bt00_hit", - .preBattle = &N(beforeBattle_802313E0), - .postBattle = &N(afterBattle_8023141C), - .foregroundModelList = N(foregroundModelList_8023142C), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/trd_part_2/stage/trd_01.c b/src/battle/area/trd_part_2/stage/trd_01.c index 218705672d..7d908131d5 100644 --- a/src/battle/area/trd_part_2/stage/trd_01.c +++ b/src/battle/area/trd_part_2/stage/trd_01.c @@ -3,14 +3,14 @@ #define NAMESPACE b_area_trd_part_2_trd_01 -EvtScript N(beforeBattle_80231460) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_8023149C) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -19,6 +19,6 @@ Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt01_shape", .hit = "trd_bt01_hit", - .preBattle = &N(beforeBattle_80231460), - .postBattle = &N(afterBattle_8023149C), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_2/stage/trd_02.c b/src/battle/area/trd_part_2/stage/trd_02.c index 502a34a28e..ce92b0593d 100644 --- a/src/battle/area/trd_part_2/stage/trd_02.c +++ b/src/battle/area/trd_part_2/stage/trd_02.c @@ -100,10 +100,10 @@ EvtScript N(802315F8) = { EVT_END }; -EvtScript N(beforeBattle_80231BA4) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(EnableModel, 12, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, 12, FALSE) EVT_THREAD EVT_SET(LVar0, 19) EVT_EXEC(N(802315F8)) @@ -121,20 +121,21 @@ EvtScript N(beforeBattle_80231BA4) = { EVT_END }; -EvtScript N(afterBattle_80231C98) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80231CA8)[] = { - 0x00000016, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x00000016, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt02_shape", .hit = "trd_bt02_hit", - .preBattle = &N(beforeBattle_80231BA4), - .postBattle = &N(afterBattle_80231C98), - .foregroundModelList = N(foregroundModelList_80231CA8), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/trd_part_2/stage/trd_02b.c b/src/battle/area/trd_part_2/stage/trd_02b.c index 754a5c4613..7068443502 100644 --- a/src/battle/area/trd_part_2/stage/trd_02b.c +++ b/src/battle/area/trd_part_2/stage/trd_02b.c @@ -100,12 +100,12 @@ EvtScript N(80231DF8) = { EVT_END }; -EvtScript N(beforeBattle_802323A4) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(EnableModel, 22, 0) - EVT_CALL(EnableModel, 9, 0) - EVT_CALL(EnableModel, 10, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, 22, FALSE) + EVT_CALL(EnableModel, 9, FALSE) + EVT_CALL(EnableModel, 10, FALSE) EVT_THREAD EVT_SET(LVar0, 19) EVT_EXEC(N(80231DF8)) @@ -123,7 +123,7 @@ EvtScript N(beforeBattle_802323A4) = { EVT_END }; -EvtScript N(afterBattle_802324C0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -132,6 +132,6 @@ Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt02_shape", .hit = "trd_bt02_hit", - .preBattle = &N(beforeBattle_802323A4), - .postBattle = &N(afterBattle_802324C0), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_2/stage/trd_03.c b/src/battle/area/trd_part_2/stage/trd_03.c index 92e1670b84..4d33de99cd 100644 --- a/src/battle/area/trd_part_2/stage/trd_03.c +++ b/src/battle/area/trd_part_2/stage/trd_03.c @@ -5,7 +5,7 @@ #include "world/common/todo/clouds.inc.c" -EvtScript N(beforeBattle_80232888) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_SET(LVar0, 4) EVT_SET(LVar2, 0) @@ -19,13 +19,16 @@ EvtScript N(beforeBattle_80232888) = { EVT_END }; -EvtScript N(afterBattle_80232920) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80232930)[] = { - 0x0000000F, 0x0000000E, 0x0000000D, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x0000000F, + 0x0000000E, + 0x0000000D, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { @@ -33,7 +36,7 @@ Stage NAMESPACE = { .shape = "trd_bt03_shape", .hit = "trd_bt03_hit", .bg = "nok_bg", - .preBattle = &N(beforeBattle_80232888), - .postBattle = &N(afterBattle_80232920), - .foregroundModelList = N(foregroundModelList_80232930), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/trd_part_2/stage/trd_04.c b/src/battle/area/trd_part_2/stage/trd_04.c index bd78afaefe..29f37b61ff 100644 --- a/src/battle/area/trd_part_2/stage/trd_04.c +++ b/src/battle/area/trd_part_2/stage/trd_04.c @@ -56,9 +56,9 @@ EvtScript N(80232B2C) = { EVT_END }; -EvtScript N(beforeBattle_80232C18) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 13) EVT_SET(LVar1, 0) EVT_SET(LVar2, 40) @@ -68,20 +68,21 @@ EvtScript N(beforeBattle_80232C18) = { EVT_END }; -EvtScript N(afterBattle_80232CA0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; -s32 N(foregroundModelList_80232CB0)[] = { - 0x0000000D, 0x00000000, +s32 N(ForegroundModels)[] = { + 0x0000000D, + STAGE_MODEL_LIST_END }; Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt04_shape", .hit = "trd_bt04_hit", - .preBattle = &N(beforeBattle_80232C18), - .postBattle = &N(afterBattle_80232CA0), - .foregroundModelList = N(foregroundModelList_80232CB0), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), }; diff --git a/src/battle/area/trd_part_2/stage/trd_05.c b/src/battle/area/trd_part_2/stage/trd_05.c index d39bbe8cb5..d7df772be3 100644 --- a/src/battle/area/trd_part_2/stage/trd_05.c +++ b/src/battle/area/trd_part_2/stage/trd_05.c @@ -100,9 +100,9 @@ EvtScript N(80232DF8) = { EVT_END }; -EvtScript N(beforeBattle_802333A4) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_THREAD EVT_SET(LVar0, 27) EVT_EXEC(N(80232DF8)) @@ -124,7 +124,7 @@ EvtScript N(beforeBattle_802333A4) = { EVT_END }; -EvtScript N(afterBattle_802334B0) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -134,6 +134,6 @@ Stage NAMESPACE = { .shape = "trd_bt05_shape", .hit = "trd_bt05_hit", .bg = "nok_bg", - .preBattle = &N(beforeBattle_802333A4), - .postBattle = &N(afterBattle_802334B0), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_2/stage/trd_05b.c b/src/battle/area/trd_part_2/stage/trd_05b.c index 8aeba42f6e..48ecab5c07 100644 --- a/src/battle/area/trd_part_2/stage/trd_05b.c +++ b/src/battle/area/trd_part_2/stage/trd_05b.c @@ -100,24 +100,24 @@ EvtScript N(80233608) = { EVT_END }; -EvtScript N(beforeBattle_80233BB4) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(EnableModel, 16, 0) - EVT_CALL(EnableModel, 17, 0) - EVT_CALL(EnableModel, 2, 0) - EVT_CALL(EnableModel, 4, 0) - EVT_CALL(EnableModel, 6, 0) - EVT_CALL(EnableModel, 20, 0) - EVT_CALL(EnableModel, 18, 0) - EVT_CALL(EnableModel, 19, 0) - EVT_CALL(EnableModel, 25, 0) - EVT_CALL(EnableModel, 27, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, 16, FALSE) + EVT_CALL(EnableModel, 17, FALSE) + EVT_CALL(EnableModel, 2, FALSE) + EVT_CALL(EnableModel, 4, FALSE) + EVT_CALL(EnableModel, 6, FALSE) + EVT_CALL(EnableModel, 20, FALSE) + EVT_CALL(EnableModel, 18, FALSE) + EVT_CALL(EnableModel, 19, FALSE) + EVT_CALL(EnableModel, 25, FALSE) + EVT_CALL(EnableModel, 27, FALSE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80233CB8) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -126,6 +126,6 @@ Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt05_shape", .hit = "trd_bt05_hit", - .preBattle = &N(beforeBattle_80233BB4), - .postBattle = &N(afterBattle_80233CB8), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_2/stage/trd_05c.c b/src/battle/area/trd_part_2/stage/trd_05c.c index abe97d15b7..e99500ded0 100644 --- a/src/battle/area/trd_part_2/stage/trd_05c.c +++ b/src/battle/area/trd_part_2/stage/trd_05c.c @@ -100,15 +100,15 @@ EvtScript N(80233E08) = { EVT_END }; -EvtScript N(beforeBattle_802343B4) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(EnableModel, 10, 0) - EVT_CALL(EnableModel, 15, 0) - EVT_CALL(EnableModel, 20, 0) - EVT_CALL(EnableModel, 18, 0) - EVT_CALL(EnableModel, 19, 0) - EVT_CALL(EnableModel, 25, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, 10, FALSE) + EVT_CALL(EnableModel, 15, FALSE) + EVT_CALL(EnableModel, 20, FALSE) + EVT_CALL(EnableModel, 18, FALSE) + EVT_CALL(EnableModel, 19, FALSE) + EVT_CALL(EnableModel, 25, FALSE) EVT_SET(LVar0, 27) EVT_EXEC(N(80233E08)) EVT_THREAD @@ -125,7 +125,7 @@ EvtScript N(beforeBattle_802343B4) = { EVT_END }; -EvtScript N(afterBattle_80234500) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -134,6 +134,6 @@ Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt05_shape", .hit = "trd_bt05_hit", - .preBattle = &N(beforeBattle_802343B4), - .postBattle = &N(afterBattle_80234500), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_2/stage/trd_05d.c b/src/battle/area/trd_part_2/stage/trd_05d.c index ee61a9ae46..6addfb55b1 100644 --- a/src/battle/area/trd_part_2/stage/trd_05d.c +++ b/src/battle/area/trd_part_2/stage/trd_05d.c @@ -100,16 +100,16 @@ EvtScript N(80234658) = { EVT_END }; -EvtScript N(beforeBattle_80234C04) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(EnableModel, 10, 0) - EVT_CALL(EnableModel, 15, 0) - EVT_CALL(EnableModel, 16, 0) - EVT_CALL(EnableModel, 17, 0) - EVT_CALL(EnableModel, 25, 0) - EVT_CALL(EnableModel, 14, 0) - EVT_CALL(EnableModel, 27, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, 10, FALSE) + EVT_CALL(EnableModel, 15, FALSE) + EVT_CALL(EnableModel, 16, FALSE) + EVT_CALL(EnableModel, 17, FALSE) + EVT_CALL(EnableModel, 25, FALSE) + EVT_CALL(EnableModel, 14, FALSE) + EVT_CALL(EnableModel, 27, FALSE) EVT_THREAD EVT_SET(LVar0, 6) EVT_EXEC(N(80234658)) @@ -124,7 +124,7 @@ EvtScript N(beforeBattle_80234C04) = { EVT_END }; -EvtScript N(afterBattle_80234D48) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -133,6 +133,6 @@ Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt05_shape", .hit = "trd_bt05_hit", - .preBattle = &N(beforeBattle_80234C04), - .postBattle = &N(afterBattle_80234D48), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_2/stage/trd_05e.c b/src/battle/area/trd_part_2/stage/trd_05e.c index 11bfd23cc9..4b7d042e64 100644 --- a/src/battle/area/trd_part_2/stage/trd_05e.c +++ b/src/battle/area/trd_part_2/stage/trd_05e.c @@ -100,22 +100,22 @@ EvtScript N(80234E98) = { EVT_END }; -EvtScript N(beforeBattle_80235444) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(EnableModel, 27, 0) - EVT_CALL(EnableModel, 2, 0) - EVT_CALL(EnableModel, 4, 0) - EVT_CALL(EnableModel, 6, 0) - EVT_CALL(EnableModel, 20, 0) - EVT_CALL(EnableModel, 18, 0) - EVT_CALL(EnableModel, 19, 0) - EVT_CALL(EnableModel, 25, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, 27, FALSE) + EVT_CALL(EnableModel, 2, FALSE) + EVT_CALL(EnableModel, 4, FALSE) + EVT_CALL(EnableModel, 6, FALSE) + EVT_CALL(EnableModel, 20, FALSE) + EVT_CALL(EnableModel, 18, FALSE) + EVT_CALL(EnableModel, 19, FALSE) + EVT_CALL(EnableModel, 25, FALSE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80235520) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -124,6 +124,6 @@ Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt05_shape", .hit = "trd_bt05_hit", - .preBattle = &N(beforeBattle_80235444), - .postBattle = &N(afterBattle_80235520), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_2/stage/trd_05f.c b/src/battle/area/trd_part_2/stage/trd_05f.c index 7b098e6cf9..192c19fa97 100644 --- a/src/battle/area/trd_part_2/stage/trd_05f.c +++ b/src/battle/area/trd_part_2/stage/trd_05f.c @@ -100,24 +100,24 @@ EvtScript N(80235678) = { EVT_END }; -EvtScript N(beforeBattle_80235C24) = { +EvtScript N(EVS_PreBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_CALL(SetCamBGColor, 1, 0, 0, 0) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) EVT_SET(LVar0, 27) EVT_EXEC(N(80235678)) - EVT_CALL(EnableModel, 2, 0) - EVT_CALL(EnableModel, 4, 0) - EVT_CALL(EnableModel, 6, 0) - EVT_CALL(EnableModel, 20, 0) - EVT_CALL(EnableModel, 18, 0) - EVT_CALL(EnableModel, 19, 0) - EVT_CALL(EnableModel, 25, 0) - EVT_CALL(EnableModel, 15, 0) + EVT_CALL(EnableModel, 2, FALSE) + EVT_CALL(EnableModel, 4, FALSE) + EVT_CALL(EnableModel, 6, FALSE) + EVT_CALL(EnableModel, 20, FALSE) + EVT_CALL(EnableModel, 18, FALSE) + EVT_CALL(EnableModel, 19, FALSE) + EVT_CALL(EnableModel, 25, FALSE) + EVT_CALL(EnableModel, 15, FALSE) EVT_RETURN EVT_END }; -EvtScript N(afterBattle_80235D1C) = { +EvtScript N(EVS_PostBattle) = { EVT_RETURN EVT_END }; @@ -126,6 +126,6 @@ Stage NAMESPACE = { .texture = "trd_tex", .shape = "trd_bt05_shape", .hit = "trd_bt05_hit", - .preBattle = &N(beforeBattle_80235C24), - .postBattle = &N(afterBattle_80235D1C), + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), }; diff --git a/src/battle/area/trd_part_3/actor/eldstar.c b/src/battle/area/trd_part_3/actor/eldstar.c index 64d94f4bde..b5cb8b0322 100644 --- a/src/battle/area/trd_part_3/actor/eldstar.c +++ b/src/battle/area/trd_part_3/actor/eldstar.c @@ -71,7 +71,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(ActorParts)), .partsData = N(ActorParts), - .takeTurnScript = &N(EVS_Init), + .initScript = &N(EVS_Init), .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, @@ -202,7 +202,7 @@ EvtScript N(EVS_TakeTurn) = { }; EvtScript N(EVS_ManageTutorial) = { - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_TUTORIAL_BATTLE, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_TUTORIAL_BATTLE, TRUE) EVT_CALL(func_80218158_4CF308) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MENU) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) @@ -212,7 +212,7 @@ EvtScript N(EVS_ManageTutorial) = { EVT_THREAD EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalPos, ACTOR_SELF, -110, 100, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_END_THREAD @@ -223,7 +223,7 @@ EvtScript N(EVS_ManageTutorial) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(ActorSpeak, MSG_CH1_0115, ACTOR_SELF, 1, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) @@ -247,7 +247,7 @@ EvtScript N(EVS_ManageTutorial) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_THREAD EVT_CALL(N(func_80218170_4CF320)) EVT_END_THREAD @@ -262,7 +262,7 @@ EvtScript N(EVS_ManageTutorial) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, 255) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_CALL(ActorSpeak, MSG_CH1_0117, ACTOR_SELF, 1, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) @@ -273,7 +273,7 @@ EvtScript N(EVS_ManageTutorial) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) EVT_CALL(ActorSpeak, MSG_CH1_0118, ACTOR_SELF, 1, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) - EVT_CALL(SetBattleState, 6) + EVT_CALL(SetBattleState, BATTLE_STATE_END_TURN) EVT_CALL(WaitForState, BATTLE_STATE_BEGIN_TURN) EVT_WAIT(20) EVT_CALL(ActorSpeak, MSG_CH1_0119, ACTOR_SELF, 1, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) @@ -282,7 +282,7 @@ EvtScript N(EVS_ManageTutorial) = { EVT_THREAD EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalPos, ACTOR_SELF, -110, 100, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_END_THREAD @@ -295,7 +295,7 @@ EvtScript N(EVS_ManageTutorial) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(ActorSpeak, MSG_CH1_011A, ACTOR_SELF, 1, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) @@ -315,7 +315,7 @@ EvtScript N(EVS_ManageTutorial) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_THREAD EVT_CALL(N(func_80218170_4CF320)) EVT_END_THREAD @@ -330,7 +330,7 @@ EvtScript N(EVS_ManageTutorial) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetPartAlpha, ACTOR_SELF, 1, 255) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_CALL(ActorSpeak, MSG_CH1_011C, ACTOR_SELF, 1, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) diff --git a/src/battle/area/trd_part_3/stage/nok_01.c b/src/battle/area/trd_part_3/stage/nok_01.c index ad107fdd00..3e0734134c 100644 --- a/src/battle/area/trd_part_3/stage/nok_01.c +++ b/src/battle/area/trd_part_3/stage/nok_01.c @@ -3,58 +3,4 @@ #define NAMESPACE b_area_trd_part_3_nok_01 -EvtScript N(80218DD0) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(TranslateModel, LVarA, 0, 2, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 2, 0) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, 0, 0, 0) - EVT_WAIT(5) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(beforeBattle_80218ED8) = { - EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SET(LVar0, 19) - EVT_EXEC(N(80218DD0)) - EVT_SET(LVar0, 20) - EVT_EXEC(N(80218DD0)) - EVT_SET(LVar0, 21) - EVT_EXEC(N(80218DD0)) - EVT_SET(LVar0, 22) - EVT_EXEC(N(80218DD0)) - EVT_SET(LVar0, 23) - EVT_EXEC(N(80218DD0)) - EVT_SET(LVar0, 24) - EVT_EXEC(N(80218DD0)) - EVT_RETURN - EVT_END -}; - -EvtScript N(afterBattle_80218FA0) = { - EVT_RETURN - EVT_END -}; - -s32 N(foregroundModelList_80218FB0)[] = { - 0x0000001E, 0x0000001D, 0x0000001C, 0x00000000, -}; - -Stage NAMESPACE = { - .texture = "nok_tex", - .shape = "nok_bt01_shape", - .hit = "nok_bt01_hit", - .bg = "nok_bg", - .preBattle = &N(beforeBattle_80218ED8), - .postBattle = &N(afterBattle_80218FA0), - .foregroundModelList = N(foregroundModelList_80218FB0), -}; +#include "battle/common/stage/nok_01.inc.c" diff --git a/src/battle/battle.h b/src/battle/battle.h index 07ddd490f9..d7a8795485 100644 --- a/src/battle/battle.h +++ b/src/battle/battle.h @@ -4,6 +4,9 @@ #include "common.h" #include "message_ids.h" +// Terminates foreground model lists +#define STAGE_MODEL_LIST_END 0 + enum BattleAreaIDs { BTL_AREA_KMR_1 = 0x00, BTL_AREA_KMR_2 = 0x01, @@ -310,7 +313,7 @@ typedef struct ActorBlueprint { /* 0x08 */ s16 partCount; /* 0x0A */ char unk_0A[2]; /* 0x0C */ struct ActorPartBlueprint* partsData; - /* 0x10 */ EvtScript* takeTurnScript; + /* 0x10 */ EvtScript* initScript; /* 0x14 */ s32* statusTable; /* 0x18 */ u8 escapeChance; /* 0x19 */ u8 airLiftChance; diff --git a/src/battle/common/actor/bandit.inc.c b/src/battle/common/actor/bandit.inc.c index d1900608f7..1a2e0d16ba 100644 --- a/src/battle/common/actor/bandit.inc.c +++ b/src/battle/common/actor/bandit.inc.c @@ -123,7 +123,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 5, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 40, .airLiftChance = 90, @@ -146,7 +146,7 @@ ActorBlueprint N(coin) = { .maxHP = 5, .partCount = ARRAY_COUNT(N(parts_coin)), .partsData = N(parts_coin), - .takeTurnScript = &N(init_coin), + .initScript = &N(init_coin), .statusTable = N(statusTable), .escapeChance = 40, .airLiftChance = 90, @@ -202,12 +202,12 @@ EvtScript N(dropCoin) = { EVT_CASE_EQ(1) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, FALSE) EVT_CALL(SummonEnemy, EVT_PTR(N(formation_coin)), 0) EVT_SET(LVarA, LVar0) EVT_CALL(GetPartOffset, ACTOR_SELF, 2, LVar1, LVar2, LVar3) EVT_CALL(SetActorPos, LVarA, LVar1, LVar2, LVar3) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_CALL(SetActorVar, LVarA, 1, LVar0) EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.0)) @@ -215,7 +215,7 @@ EvtScript N(dropCoin) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_ADD(LVar2, 30) EVT_CALL(SetActorPos, LVarA, LVar1, LVar2, LVar3) - EVT_CALL(SetActorSounds, LVarA, 2, 0, 0) + EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(AddVectorPolar, LVar1, LVar3, EVT_FLOAT(40.0), LVar0) EVT_CALL(SetGoalPos, LVarA, LVar1, 0, LVar3) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, TRUE, FALSE) @@ -284,8 +284,8 @@ EvtScript N(dropCoin) = { EVT_CALL(SetGoalToTarget, LVarA) EVT_CALL(JumpToGoal, LVarA, 15, FALSE, FALSE, FALSE) EVT_CALL(GetGoalPos, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMALL_GOLD_SPARKLE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, LVarA, 0x211) + EVT_PLAY_EFFECT(EFFECT_SMALL_GOLD_SPARKLE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 0, 0) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_211) EVT_CALL(GetActorVar, LVarA, 1, LVar0) EVT_CALL(AddCoin, LVar0) EVT_CALL(RemoveActor, LVarA) @@ -494,7 +494,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, 300, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_BATTLE_FLED, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_BATTLE_FLED, TRUE) EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN @@ -524,7 +524,7 @@ EvtScript N(takeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 35, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C2) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -552,7 +552,7 @@ EvtScript N(takeTurn) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Bandit_Anim07) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -640,14 +640,14 @@ EvtScript N(takeTurn) = { EVT_MUL(LVar0, -1) EVT_CALL(AddCoin, LVar0) EVT_THREAD - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(1.0)) EVT_ADD(LVarB, 30) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVarA, LVarB, LVarC, 22, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 0) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVarA, LVarB, LVarC, 22, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, FALSE) EVT_END_THREAD EVT_THREAD EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) diff --git a/src/battle/common/actor/buzzy_beetle.inc.c b/src/battle/common/actor/buzzy_beetle.inc.c index 0ca55b16c2..f4e5344034 100644 --- a/src/battle/common/actor/buzzy_beetle.inc.c +++ b/src/battle/common/actor/buzzy_beetle.inc.c @@ -71,7 +71,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 3, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 60, .airLiftChance = 75, @@ -135,7 +135,7 @@ EvtScript N(init) = { EVT_CALL(N(UnkBattleFunc1), -10, 0, 10, 0) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_ceiling))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_ceiling))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, FALSE) EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) @@ -143,8 +143,8 @@ EvtScript N(init) = { 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))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_END_IF EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -169,17 +169,17 @@ EvtScript N(fallOff) = { 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))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BuzzyBeetle_Anim08) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 24) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) @@ -287,7 +287,7 @@ EvtScript N(handleEvent_ceiling) = { EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CASE_EQ(EVENT_SCARE_AWAY) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BuzzyBeetle_Anim11) EVT_SET_CONST(LVar2, ANIM_BuzzyBeetle_Anim13) @@ -374,7 +374,7 @@ EvtScript N(handleEvent) = { 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))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BuzzyBeetle_Anim07) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD @@ -453,7 +453,7 @@ EvtScript N(handleEvent) = { EVT_ELSE EVT_ADD(LVar1, 24) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) @@ -553,8 +553,8 @@ EvtScript N(takeTurn_ceiling) = { 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))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) EVT_CALL(SetGoalToIndex, ACTOR_SELF, LVar0) @@ -582,7 +582,7 @@ EvtScript N(takeTurn_ceiling) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BuzzyBeetle_Anim0E) EVT_WAIT(8) EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 769, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_F) @@ -627,7 +627,7 @@ EvtScript N(takeTurn_ceiling) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BuzzyBeetle_Anim04) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BuzzyBeetle_Anim01) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) @@ -692,12 +692,12 @@ EvtScript N(takeTurn) = { EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 9, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_SET_CONST(LVar0, 1) @@ -711,7 +711,7 @@ EvtScript N(takeTurn) = { 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))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, FALSE) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -726,16 +726,16 @@ EvtScript N(takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BuzzyBeetle_Anim06) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(10) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BuzzyBeetle_Anim05) EVT_WAIT(20) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -766,7 +766,7 @@ EvtScript N(takeTurn) = { EVT_WAIT(15) EVT_CALL(YieldTurn) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 200) diff --git a/src/battle/common/actor/bzzap.inc.c b/src/battle/common/actor/bzzap.inc.c index c0bb404d9a..0b717a5d4e 100644 --- a/src/battle/common/actor/bzzap.inc.c +++ b/src/battle/common/actor/bzzap.inc.c @@ -133,7 +133,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 3, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 40, .airLiftChance = 95, @@ -202,7 +202,7 @@ EvtScript N(returnHome) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Bzzap_Anim03) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_RETURN EVT_END }; @@ -287,7 +287,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_Bzzap_Anim01) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Bzzap_Anim03) EVT_SET_CONST(LVar2, ANIM_Bzzap_Anim06) @@ -328,7 +328,7 @@ EvtScript N(attackThornStab) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 52, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 12) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_COS_IN) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -341,7 +341,7 @@ EvtScript N(attackThornStab) = { EVT_ADD(LVar2, 1) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20CA) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Bzzap_Anim04) @@ -353,7 +353,7 @@ EvtScript N(attackThornStab) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -369,7 +369,7 @@ EvtScript N(attackThornStab) = { EVT_ADD(LVar2, 1) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20CA) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Bzzap_Anim04) @@ -398,17 +398,17 @@ EvtScript N(8021B77C) = { EVT_ADD(LVarA, 200) EVT_ADD(LVarB, 100) EVT_CALL(SetPartPos, ACTOR_SELF, LVar9, LVarA, LVarB, LVarC) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar9, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar9, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, LVar9, ANIM_Bzzap_Anim03) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_ADD(LVarB, 50) EVT_SUB(LVarC, 30) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, LVar9, EVT_FLOAT(6.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar9, EVT_FLOAT(1.0)) - EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVarA, LVarB, LVarC, 0, -10, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVarA, LVarB, LVarC, 0, -10, EASING_LINEAR) EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_CALL(GetPartOffset, ACTOR_SELF, LVar9, LVar6, LVar7, LVar8) - EVT_CALL(MakeLerp, 90, 450, 50, 0) + EVT_CALL(MakeLerp, 90, 450, 50, EASING_LINEAR) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(N(AddVecXZ), LVar3, LVar5, 30, LVar0, LVar6, LVar8) @@ -436,10 +436,10 @@ EvtScript N(8021B77C) = { EVT_ADD(LVarC, 30) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, LVar9, EVT_FLOAT(6.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar9, EVT_FLOAT(1.0)) - EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVarA, LVarB, LVarC, 0, -10, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVarA, LVarB, LVarC, 0, -10, EASING_LINEAR) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) EVT_CALL(GetPartOffset, ACTOR_SELF, LVar9, LVar6, LVar7, LVar8) - EVT_CALL(MakeLerp, -90, -720, 100, 0) + EVT_CALL(MakeLerp, -90, -720, 100, EASING_LINEAR) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(N(AddVecXZ), LVar3, LVar5, 30, LVar0, LVar6, LVar8) @@ -464,11 +464,11 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) - EVT_CALL(SetPartSounds, ACTOR_SELF, 2, 1, 0, 0) - EVT_CALL(SetPartSounds, ACTOR_SELF, 3, 1, 0, 0) - EVT_CALL(SetPartSounds, ACTOR_SELF, 4, 1, 0, 0) - EVT_CALL(SetPartSounds, ACTOR_SELF, 5, 1, 0, 0) - EVT_CALL(SetPartSounds, ACTOR_SELF, 6, 1, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 2, ACTOR_SOUND_FLY, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 3, ACTOR_SOUND_FLY, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 4, ACTOR_SOUND_FLY, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 5, ACTOR_SOUND_FLY, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 6, ACTOR_SOUND_FLY, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20CC) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Bzzap_Anim05) @@ -508,16 +508,16 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -30, -20, 1) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(3.0)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, -10, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Bzzap_Anim03) EVT_CALL(SetPartYaw, ACTOR_SELF, 2, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 100) EVT_ADD(LVar2, 100) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) - EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 10, 0) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) + EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 10, EASING_LINEAR) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 2, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_WAIT(11) EVT_THREAD @@ -527,16 +527,16 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -30, -20, 1) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 3, EVT_FLOAT(3.0)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, -10, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_Bzzap_Anim03) EVT_CALL(SetPartYaw, ACTOR_SELF, 3, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 100) EVT_ADD(LVar2, 100) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 3, 0, 2) - EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 10, 0) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 3, 0, ACTOR_DECORATION_SWEAT) + EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 10, EASING_LINEAR) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 3, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_WAIT(11) EVT_THREAD @@ -546,16 +546,16 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -30, -20, 1) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 4, EVT_FLOAT(3.0)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 4, LVar0, LVar1, LVar2, 0, -10, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 4, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 4, ANIM_Bzzap_Anim03) EVT_CALL(SetPartYaw, ACTOR_SELF, 4, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 100) EVT_ADD(LVar2, 100) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 4, 0, 2) - EVT_CALL(FlyPartTo, ACTOR_SELF, 4, LVar0, LVar1, LVar2, 0, 10, 0) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 4, 0, ACTOR_DECORATION_SWEAT) + EVT_CALL(FlyPartTo, ACTOR_SELF, 4, LVar0, LVar1, LVar2, 0, 10, EASING_LINEAR) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 4, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_WAIT(11) EVT_THREAD @@ -565,16 +565,16 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -30, -20, 1) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 5, EVT_FLOAT(3.0)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 0, -10, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 5, ANIM_Bzzap_Anim03) EVT_CALL(SetPartYaw, ACTOR_SELF, 5, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 100) EVT_ADD(LVar2, 100) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 5, 0, 2) - EVT_CALL(FlyPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 0, 10, 0) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 5, 0, ACTOR_DECORATION_SWEAT) + EVT_CALL(FlyPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 0, 10, EASING_LINEAR) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 5, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_WAIT(11) EVT_THREAD @@ -584,16 +584,16 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -30, -20, 1) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(3.0)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, -10, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 6, ANIM_Bzzap_Anim03) EVT_CALL(SetPartYaw, ACTOR_SELF, 6, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 100) EVT_ADD(LVar2, 100) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 6, 0, 2) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 10, 0) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 6, 0, ACTOR_DECORATION_SWEAT) + EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 10, EASING_LINEAR) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 6, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_WAIT(11) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) @@ -602,7 +602,7 @@ EvtScript N(attackSwarmSting) = { EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_WAIT(30) - EVT_CALL(StopSound, 856) + EVT_CALL(StopSound, SOUND_358) EVT_CALL(YieldTurn) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -616,7 +616,7 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -10, -10, 1) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 2, EVT_FLOAT(3.0)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, -10, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 1, BS_FLAGS1_10) @@ -625,8 +625,8 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 100) EVT_ADD(LVar2, 100) - EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 10, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(FlyPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 0, 10, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_WAIT(11) EVT_THREAD @@ -636,7 +636,7 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -10, -10, 1) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 3, EVT_FLOAT(3.0)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, -10, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 1, BS_FLAGS1_40) @@ -645,8 +645,8 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 100) EVT_ADD(LVar2, 100) - EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 10, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 10, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_WAIT(11) EVT_THREAD @@ -656,7 +656,7 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -10, -10, 1) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 4, EVT_FLOAT(3.0)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 4, LVar0, LVar1, LVar2, 0, -10, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 4, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 1, BS_FLAGS1_40) @@ -665,8 +665,8 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 100) EVT_ADD(LVar2, 100) - EVT_CALL(FlyPartTo, ACTOR_SELF, 4, LVar0, LVar1, LVar2, 0, 10, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(FlyPartTo, ACTOR_SELF, 4, LVar0, LVar1, LVar2, 0, 10, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_WAIT(11) EVT_THREAD @@ -676,7 +676,7 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -10, -10, 1) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 5, EVT_FLOAT(3.0)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 0, -10, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 1, BS_FLAGS1_40) @@ -685,8 +685,8 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 100) EVT_ADD(LVar2, 100) - EVT_CALL(FlyPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 0, 10, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(FlyPartTo, ACTOR_SELF, 5, LVar0, LVar1, LVar2, 0, 10, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_WAIT(11) EVT_WAIT(1) @@ -696,7 +696,7 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -10, -10, 1) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(3.0)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, -10, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) @@ -709,9 +709,9 @@ EvtScript N(attackSwarmSting) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 100) EVT_ADD(LVar2, 100) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 10, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(StopSound, 856) + EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 10, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(StopSound, SOUND_358) EVT_CALL(YieldTurn) EVT_END_CASE_GROUP EVT_END_SWITCH diff --git a/src/battle/common/actor/clubba.inc.c b/src/battle/common/actor/clubba.inc.c index 135063c303..8f7112f7a9 100644 --- a/src/battle/common/actor/clubba.inc.c +++ b/src/battle/common/actor/clubba.inc.c @@ -73,7 +73,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 60, .airLiftChance = 60, @@ -245,7 +245,7 @@ EvtScript N(takeTurn) = { EVT_CALL(YieldTurn) 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleClubba_Anim02) EVT_EXEC_WAIT(DoReturnHome) @@ -268,7 +268,7 @@ EvtScript N(takeTurn) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_WAIT(19) diff --git a/src/battle/common/actor/duplighost.inc.c b/src/battle/common/actor/duplighost.inc.c index 29f2f95bb0..47bdfb4b31 100644 --- a/src/battle/common/actor/duplighost.inc.c +++ b/src/battle/common/actor/duplighost.inc.c @@ -85,7 +85,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 15, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 50, .airLiftChance = 80, @@ -245,7 +245,7 @@ EvtScript N(attack) = { EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Duplighost_Anim07) EVT_WAIT(20) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 715, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2CB, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -264,11 +264,11 @@ EvtScript N(attack) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Duplighost_Anim02) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_WAIT(15) EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -294,7 +294,7 @@ EvtScript N(attack) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Duplighost_Anim09) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) @@ -337,7 +337,7 @@ EvtScript N(OnHitElectric) = { EVT_ADD(LVar1, 3) EVT_ADD(LVar2, 5) EVT_LOOP(3) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD @@ -347,12 +347,12 @@ EvtScript N(OnHitElectric) = { EVT_CALL(CopyBuffs, ACTOR_SELF, LVarA) EVT_CALL(GetActorPos, ACTOR_SELF, LVarB, LVarC, LVarD) EVT_CALL(SetActorPos, LVarA, LVarB, LVarC, LVarD) - EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_MULTI_TARGET, 1) - EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_NO_DMG_APPLY, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_NO_DMG_APPLY, FALSE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(SetActorVar, LVarA, 8, 2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations2))) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Duplighost_Anim0A) EVT_WAIT(30) @@ -361,10 +361,10 @@ EvtScript N(OnHitElectric) = { EVT_IF_GT(LVarC, 0) EVT_SET(LVarC, 0) EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(0.5)) - EVT_CALL(SetActorSounds, LVarA, 2, 769, 0) + EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(SetGoalPos, LVarA, LVarB, LVarC, LVarD) EVT_CALL(JumpToGoal, LVarA, 15, FALSE, TRUE, FALSE) - EVT_CALL(ResetActorSounds, LVarA, 2) + EVT_CALL(ResetActorSounds, LVarA, ACTOR_SOUND_JUMP) EVT_CALL(SetGoalPos, LVarA, LVarB, LVarC, LVarD) EVT_CALL(JumpToGoal, LVarA, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, LVarA, LVarB, LVarC, LVarD) @@ -406,7 +406,7 @@ EvtScript N(OnShockHit) = { EVT_ADD(LVar1, 3) EVT_ADD(LVar2, 5) EVT_LOOP(3) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD @@ -416,12 +416,12 @@ EvtScript N(OnShockHit) = { EVT_CALL(CopyBuffs, ACTOR_SELF, LVarA) EVT_CALL(GetActorPos, ACTOR_SELF, LVarB, LVarC, LVarD) EVT_CALL(SetActorPos, LVarA, LVarB, LVarC, LVarD) - EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_MULTI_TARGET, 1) - EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_NO_DMG_APPLY, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_NO_DMG_APPLY, FALSE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(SetActorVar, LVarA, 8, 3) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar9, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar9, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations2))) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Duplighost_Anim0A) EVT_WAIT(15) @@ -439,7 +439,7 @@ EvtScript N(OnShockHit) = { EVT_CALL(SetGoalPos, LVarA, LVarB, LVarC, LVarD) EVT_CALL(JumpToGoal, LVarA, 5, FALSE, TRUE, FALSE) EVT_WAIT(20) - EVT_CALL(AddActorDecoration, LVarA, 1, 0, 2) + EVT_CALL(AddActorDecoration, LVarA, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorYaw, LVarA, 180) EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations3))) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Duplighost_Anim04) @@ -620,9 +620,9 @@ EvtScript N(copyPartner) = { EVT_ADD(LVar1, 20) EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar1, LVar2, LVar3, 40, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar1, LVar2, LVar3, 40, 0) EVT_CALL(N(UnkBackgroundFunc3)) - EVT_CALL(MakeLerp, 0, 200, 20, 0) + EVT_CALL(MakeLerp, 0, 200, 20, EASING_LINEAR) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -660,16 +660,16 @@ EvtScript N(copyPartner) = { EVT_ADD(LVar1, 3) EVT_ADD(LVar2, 5) EVT_LOOP(3) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0) EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD EVT_WAIT(5) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorPos, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW | ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_CALL(SetEnemyHP, LVarA, LVar0) EVT_CALL(CopyBuffs, ACTOR_SELF, LVarA) @@ -680,7 +680,7 @@ EvtScript N(copyPartner) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) EVT_THREAD - EVT_CALL(MakeLerp, 200, 0, 20, 0) + EVT_CALL(MakeLerp, 200, 0, 20, EASING_LINEAR) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(N(SetBackgroundAlpha), LVar0) @@ -689,7 +689,7 @@ EvtScript N(copyPartner) = { EVT_GOTO(1) EVT_END_IF EVT_END_THREAD - EVT_CALL(SetActorSounds, LVarA, 2, 0, 0) + EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_SWITCH(LVar5) EVT_CASE_EQ(8) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) @@ -709,7 +709,7 @@ EvtScript N(copyPartner) = { EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVarA, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, LVarA) - EVT_CALL(ResetActorSounds, LVarA, 2) + EVT_CALL(ResetActorSounds, LVarA, ACTOR_SOUND_JUMP) EVT_WAIT(20) EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index b3aa9f24f9..f8f760ef61 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -111,7 +111,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 10, .partCount = ARRAY_COUNT(N(partsTable_8021AD80)), .partsData = N(partsTable_8021AD80), - .takeTurnScript = &N(init_8021AEB4), + .initScript = &N(init_8021AEB4), .statusTable = N(statusTable_8021ACD4), .escapeChance = 60, .airLiftChance = 80, @@ -153,19 +153,19 @@ EvtScript N(init_8021AEB4) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8021D284))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8021B07C))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021B8BC))) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetActorVar, -127, 0, 1) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CASE_EQ(1) - EVT_CALL(SetActorVar, -127, 0, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_END_SWITCH - EVT_CALL(SetPartScale, -127, 2, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) - EVT_CALL(SetPartScale, -127, 3, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) - EVT_CALL(SetPartScale, -127, 4, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) - EVT_CALL(SetPartScale, -127, 5, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) - EVT_CALL(SetActorVar, -127, 1, 0) - EVT_CALL(SetActorVar, -127, 2, 0) + EVT_CALL(SetPartScale, ACTOR_SELF, 2, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) + EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) + EVT_CALL(SetPartScale, ACTOR_SELF, 4, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) + EVT_CALL(SetPartScale, ACTOR_SELF, 5, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 5) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -176,10 +176,10 @@ EvtScript N(init_8021AEB4) = { EvtScript N(idle_8021B07C) = { EVT_LABEL(0) - EVT_CALL(MakeLerp, 0, 10, 25, 10) + EVT_CALL(MakeLerp, 0, 10, 25, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) - EVT_CALL(GetHomePos, -127, LVar2, LVar3, LVar4) + EVT_CALL(GetHomePos, ACTOR_SELF, LVar2, LVar3, LVar4) EVT_ADD(LVar0, LVar3) EVT_CALL(SetActorPos, ACTOR_SELF, LVar2, LVar0, LVar4) EVT_IF_EQ(LVar1, 1) @@ -189,16 +189,16 @@ EvtScript N(idle_8021B07C) = { EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) EVT_GOTO(11) EVT_END_IF - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_EQ(LVar0, 1) EVT_GOTO(11) EVT_END_IF EVT_GOTO(1) EVT_END_IF - EVT_CALL(MakeLerp, 10, 0, 25, 10) + EVT_CALL(MakeLerp, 10, 0, 25, EASING_COS_IN_OUT) EVT_LABEL(2) EVT_CALL(UpdateLerp) - EVT_CALL(GetHomePos, -127, LVar2, LVar3, LVar4) + EVT_CALL(GetHomePos, ACTOR_SELF, LVar2, LVar3, LVar4) EVT_ADD(LVar0, LVar3) EVT_CALL(SetActorPos, ACTOR_SELF, LVar2, LVar0, LVar4) EVT_IF_EQ(LVar1, 1) @@ -208,7 +208,7 @@ EvtScript N(idle_8021B07C) = { EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) EVT_GOTO(22) EVT_END_IF - EVT_CALL(GetActorVar, -127, 2, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) EVT_IF_EQ(LVar0, 1) EVT_GOTO(22) EVT_END_IF @@ -228,14 +228,14 @@ EvtScript N(8021B2FC) = { EVT_THREAD EVT_CALL(N(UnkSfxFunc)) EVT_END_THREAD - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Blue_Anim01) EVT_RETURN EVT_END }; EvtScript N(8021B398) = { - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar5) @@ -251,7 +251,7 @@ EvtScript N(8021B398) = { 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 @@ -283,11 +283,11 @@ Formation N(specialFormation_8021B5A0) = { }; EvtScript N(split) = { - EVT_CALL(GetLastDamage, -127, LVar0) + EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_EQ(LVar0, 0) EVT_RETURN EVT_END_IF - EVT_CALL(GetActorHP, -127, LVar0) + EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_IF_LE(LVar0, 0) EVT_RETURN EVT_END_IF @@ -295,7 +295,7 @@ EvtScript N(split) = { EVT_IF_FLAG(LVar0, 0x20000000) EVT_RETURN EVT_END_IF - EVT_CALL(GetActorVar, -127, 1, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_GE(LVar0, 2) EVT_RETURN EVT_END_IF @@ -307,7 +307,7 @@ EvtScript N(split) = { EVT_CASE_OR_EQ(3) EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_8021B5A0)), 0) EVT_CALL(SetActorVar, LVar0, 2, 1) - EVT_CALL(GetActorHP, -127, LVarB) + EVT_CALL(GetActorHP, ACTOR_SELF, LVarB) EVT_CALL(SetEnemyHP, LVar0, LVarB) EVT_CALL(GetActorPos, ACTOR_SELF, LVarB, LVarC, LVarD) EVT_CALL(SetActorPos, LVar0, LVarB, LVarC, LVarD) @@ -317,14 +317,14 @@ EvtScript N(split) = { EVT_CALL(SetActorJumpGravity, LVar0, EVT_FLOAT(1.2)) EVT_CALL(JumpToGoal, LVar0, 20, FALSE, TRUE, FALSE) EVT_CALL(HPBarToHome, LVar0) - EVT_CALL(GetActorVar, -127, 1, LVar1) + EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) EVT_CALL(SetActorVar, LVar0, 1, 1) EVT_CASE_EQ(1) EVT_CALL(SetActorVar, LVar0, 1, 2) EVT_END_SWITCH - EVT_CALL(SetActorVar, -127, 1, 3) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, 3) EVT_CALL(SetActorVar, LVar0, 2, 0) EVT_END_CASE_GROUP EVT_CASE_DEFAULT @@ -458,7 +458,7 @@ EvtScript N(8021BE64) = { EVT_THREAD EVT_CALL(N(UnkSfxFunc)) EVT_END_THREAD - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Blue_Anim01) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, 16) EVT_SWITCH(LVar0) @@ -488,7 +488,7 @@ EvtScript N(8021BE64) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 3, FALSE, TRUE, FALSE) EVT_WAIT(14) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_EXEC_WAIT(N(8021B2FC)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -530,17 +530,17 @@ EvtScript N(8021C454) = { EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, 0x80000) - EVT_CALL(SetPartScale, -127, LVar6, EVT_FLOAT(0.2), EVT_FLOAT(0.2), EVT_FLOAT(0.2)) + EVT_CALL(SetPartScale, ACTOR_SELF, LVar6, EVT_FLOAT(0.2), EVT_FLOAT(0.2), EVT_FLOAT(0.2)) EVT_ELSE - EVT_CALL(SetPartScale, -127, LVar6, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) + EVT_CALL(SetPartScale, ACTOR_SELF, LVar6, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(0.5)) EVT_END_IF EVT_CALL(SetPartPos, ACTOR_SELF, LVar6, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, -127, LVar6, 1, 0) - EVT_CALL(SetPartMoveSpeed, -127, LVar6, EVT_FLOAT(8.0)) - EVT_CALL(SetPartJumpGravity, -127, LVar6, EVT_FLOAT(0.01)) - EVT_CALL(SetPartSounds, -127, LVar6, 2, 720, 0) - EVT_CALL(JumpPartTo, -127, LVar6, LVar3, LVar4, LVar5, 0, 0) - EVT_CALL(SetPartFlagBits, -127, LVar6, 1, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar6, 1, FALSE) + EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, LVar6, EVT_FLOAT(8.0)) + EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar6, EVT_FLOAT(0.01)) + EVT_CALL(SetPartSounds, ACTOR_SELF, LVar6, ACTOR_SOUND_JUMP, 720, 0) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar6, LVar3, LVar4, LVar5, 0, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar6, 1, TRUE) EVT_END_THREAD EVT_WAIT(3) EVT_ADD(LVar6, 1) @@ -551,7 +551,7 @@ EvtScript N(8021C454) = { EvtScript N(8021C5F8) = { EVT_EXEC(N(8021C454)) - EVT_CALL(GetDistanceToGoal, -127, LVar0) + EVT_CALL(GetDistanceToGoal, ACTOR_SELF, LVar0) EVT_DIVF(LVar0, EVT_FLOAT(8.0)) EVT_ADD(LVar0, 1) EVT_WAIT(LVar0) @@ -567,7 +567,7 @@ EvtScript N(8021C654) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(GetActorVar, -127, 0, LVarA) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarA) EVT_IF_EQ(LVarA, 1) EVT_ADD(LVar0, 100) EVT_SET(LVar1, 5) @@ -581,7 +581,7 @@ EvtScript N(8021C654) = { EVT_THREAD EVT_CALL(N(UnkSfxFunc)) EVT_END_THREAD - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Blue_Anim01) EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Blue_Anim05) @@ -606,7 +606,7 @@ EvtScript N(8021C654) = { EVT_END_IF EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_EXEC_WAIT(N(8021B2FC)) EVT_WAIT(20) @@ -657,23 +657,23 @@ EvtScript N(8021CBC8) = { EVT_THREAD EVT_CALL(N(UnkSfxFunc)) EVT_END_THREAD - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_SIN_OUT) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, 16) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(6) EVT_CASE_OR_EQ(5) EVT_SET(LVarA, LVar0) EVT_WAIT(10) - EVT_CALL(SetActorSounds, -127, 2, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2CF) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2CF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Blue_Anim04) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) - EVT_CALL(ResetActorSounds, -127, 2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2EF) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) @@ -681,13 +681,13 @@ EvtScript N(8021CBC8) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Blue_Anim04) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_IF_EQ(LVarA, 5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_EXEC_WAIT(N(8021B2FC)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -698,25 +698,25 @@ EvtScript N(8021CBC8) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_WAIT(5) - EVT_CALL(SetActorSounds, -127, 2, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2CF) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2CF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBubble_Blue_Anim04) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) - EVT_CALL(ResetActorSounds, -127, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_SET(LVarA, LVar0) EVT_SET(LVarB, LVar1) EVT_SET(LVarC, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) @@ -724,7 +724,7 @@ EvtScript N(8021CBC8) = { EVT_CASE_OR_EQ(2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(20) EVT_EXEC_WAIT(N(8021B2FC)) EVT_END_CASE_GROUP @@ -738,7 +738,7 @@ EvtScript N(8021CBC8) = { EvtScript N(takeTurn_8021D284) = { EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, 1) - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(1) EVT_EXEC_WAIT(N(8021BE64)) @@ -747,7 +747,7 @@ EvtScript N(takeTurn_8021D284) = { EVT_END_SWITCH EVT_RETURN EVT_END_IF - EVT_CALL(GetActorVar, -127, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(1) EVT_CALL(GetStatusFlags, ACTOR_PARTNER, LVar0) diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c index 99e4f46dca..c34bee0cec 100644 --- a/src/battle/common/actor/fuzzy.inc.c +++ b/src/battle/common/actor/fuzzy.inc.c @@ -60,7 +60,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 3, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 50, .airLiftChance = 95, @@ -295,7 +295,7 @@ EvtScript N(takeTurn) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -355,7 +355,7 @@ EvtScript N(takeTurn) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(GetLastDamage, 0, LVar3) + EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) @@ -369,14 +369,14 @@ EvtScript N(takeTurn) = { EVT_END_THREAD EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_ADD(LVar0, LVar3) EVT_CALL(SetEnemyHP, ACTOR_SELF, LVar0) EVT_END_IF EVT_THREAD EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.6), EVT_FLOAT(0.6), EVT_FLOAT(1.0)) - EVT_CALL(SetActorRotationOffset, -127, 0, 10, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 10, 0) EVT_WAIT(1) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 330) EVT_WAIT(1) @@ -420,7 +420,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 30) EVT_WAIT(1) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetActorRotationOffset, -127, 0, 0, 0) + EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_END_THREAD EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 30) diff --git a/src/battle/common/actor/ghost_bombette.inc.c b/src/battle/common/actor/ghost_bombette.inc.c index 7abab07eeb..5f267c4a9b 100644 --- a/src/battle/common/actor/ghost_bombette.inc.c +++ b/src/battle/common/actor/ghost_bombette.inc.c @@ -70,7 +70,7 @@ ActorBlueprint N(bombette) = { .maxHP = 15, .partCount = ARRAY_COUNT(N(bombette_parts)), .partsData = N(bombette_parts), - .takeTurnScript = &N(bombette_init), + .initScript = &N(bombette_init), .statusTable = N(bombette_statusTable), .escapeChance = 50, .airLiftChance = 80, @@ -101,17 +101,17 @@ EvtScript N(bombette_idle) = { EvtScript N(bombette_playEffects) = { EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.75)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(4.5)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.75)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(4.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0) EVT_ADD(LVar1, 20) EVT_ADD(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_EXPLOSION, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_EXPLOSION, 0, LVar0, LVar1, LVar2, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOMB_BLAST) EVT_RETURN EVT_END @@ -255,7 +255,7 @@ EvtScript N(bombette_takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBombette_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBombette_Brace) EVT_WAIT(15) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2020) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) diff --git a/src/battle/common/actor/ghost_bow.inc.c b/src/battle/common/actor/ghost_bow.inc.c index 46c4cad689..9392eb9f1b 100644 --- a/src/battle/common/actor/ghost_bow.inc.c +++ b/src/battle/common/actor/ghost_bow.inc.c @@ -82,7 +82,7 @@ ActorBlueprint N(bow) = { .maxHP = 15, .partCount = ARRAY_COUNT(N(bow_parts)), .partsData = N(bow_parts), - .takeTurnScript = &N(bow_init), + .initScript = &N(bow_init), .statusTable = N(bow_statusTable), .escapeChance = 50, .airLiftChance = 80, @@ -245,7 +245,7 @@ EvtScript N(bow_takeTurn) = { EVT_ELSE EVT_CALL(AddGoalPos, ACTOR_SELF, 10, -10, 0) EVT_END_IF - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Idle) EVT_END_THREAD EVT_WAIT(15) @@ -286,7 +286,7 @@ EvtScript N(bow_takeTurn) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Injured) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 3) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SEEING_STARS) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Idle) @@ -304,7 +304,7 @@ EvtScript N(bow_takeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Idle) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_VANISH) EVT_CALL(YieldTurn) @@ -355,10 +355,10 @@ EvtScript N(bow_takeTurn) = { EVT_WAIT(2) EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.2)) + 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, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.2)) EVT_END_THREAD EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) EVT_SWITCH(LVar9) @@ -396,7 +396,7 @@ EvtScript N(bow_takeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBow_Idle) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_VANISH) EVT_CALL(YieldTurn) diff --git a/src/battle/common/actor/ghost_goombario.inc.c b/src/battle/common/actor/ghost_goombario.inc.c index 5adf923486..8767ac382e 100644 --- a/src/battle/common/actor/ghost_goombario.inc.c +++ b/src/battle/common/actor/ghost_goombario.inc.c @@ -92,7 +92,7 @@ ActorBlueprint N(goombario) = { .maxHP = 15, .partCount = ARRAY_COUNT(N(goombario_parts)), .partsData = N(goombario_parts), - .takeTurnScript = &N(goombario_init), + .initScript = &N(goombario_init), .statusTable = N(goombario_statusTable), .escapeChance = 50, .airLiftChance = 80, @@ -346,7 +346,7 @@ EvtScript N(goombario_attack) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 5) EVT_CALL(SetJumpAnimations, ACTOR_SELF, 1, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_200D) EVT_CALL(N(UnkFunc62), LVarA, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) @@ -357,7 +357,7 @@ EvtScript N(goombario_attack) = { EVT_CALL(SetJumpAnimations, ACTOR_SELF, 1, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(ActorJumpToPos)) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -493,14 +493,14 @@ EvtScript N(goombario_tattle) = { EVT_WAIT(10) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4, TRUE) EVT_CALL(N(UnkEffect6CFunc), LVar5) EVT_WAIT(12) EVT_CALL(func_802535B4, 0) - EVT_CALL(SetCamEnabled, 2, 1) - EVT_CALL(SetCamFlag80, 2, 0) - EVT_CALL(SetCamPerspective, 2, 6, 25, 16, 1024) - EVT_CALL(SetCamViewport, 2, 37, 95, 138, 99) + EVT_CALL(SetCamEnabled, CAM_TATTLE, TRUE) + EVT_CALL(SetCamFlag80, CAM_TATTLE, FALSE) + EVT_CALL(SetCamPerspective, CAM_TATTLE, 6, 25, 16, 1024) + EVT_CALL(SetCamViewport, CAM_TATTLE, 37, 95, 138, 99) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 8) @@ -511,16 +511,16 @@ EvtScript N(goombario_tattle) = { EVT_CALL(func_802CABE8, 2, 0, LVar3, 100, 4) EVT_WAIT(2) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_282) - EVT_CALL(SetCamFlag80, 2, 1) + EVT_CALL(SetCamFlag80, CAM_TATTLE, TRUE) EVT_WAIT(10) EVT_CALL(ActorSpeak, MSG_EnemyTattle_Mario, ACTOR_SELF, 1, ANIM_BattleGoombario_Talk, ANIM_BattleGoombario_Idle) EVT_CALL(N(UnkTattleEffectFunc2), LVar5) EVT_WAIT(12) - EVT_CALL(SetCamEnabled, 2, 0) + EVT_CALL(SetCamEnabled, CAM_TATTLE, FALSE) EVT_WAIT(32) EVT_CALL(func_802535B4, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN diff --git a/src/battle/common/actor/ghost_kooper.inc.c b/src/battle/common/actor/ghost_kooper.inc.c index 11e2cddce6..54ff304c37 100644 --- a/src/battle/common/actor/ghost_kooper.inc.c +++ b/src/battle/common/actor/ghost_kooper.inc.c @@ -88,7 +88,7 @@ ActorBlueprint N(kooper) = { .maxHP = 15, .partCount = ARRAY_COUNT(N(kooper_parts)), .partsData = N(kooper_parts), - .takeTurnScript = &N(kooper_init), + .initScript = &N(kooper_init), .statusTable = N(kooper_statusTable), .escapeChance = 50, .airLiftChance = 80, @@ -339,13 +339,13 @@ EvtScript N(kooper_takeTurn) = { EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 4, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_WAIT(30) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_WAIT(20) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) @@ -405,33 +405,33 @@ EvtScript N(kooper_takeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CASE_EQ(20) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_LT(40) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_ShellSpinSlower) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(12.0)) EVT_CASE_EQ(40) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_LT(50) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_ShellSpinFaster) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(14.0)) EVT_CASE_EQ(50) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_LT(60) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_ShellSpinFastest) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_CASE_EQ(60) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_END_SWITCH EVT_WAIT(1) EVT_END_LOOP EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_200A) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 15) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, 5) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, ACTOR_DECORATION_GREY_SMOKE_TRAIL) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) @@ -454,7 +454,7 @@ EvtScript N(kooper_takeTurn) = { EVT_END_LOOP EVT_WAIT(5) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 16, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 16, 4, 0, 10, 0) EVT_LOOP(5) EVT_ADD(LVar0, -12) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) diff --git a/src/battle/common/actor/ghost_lakilester.inc.c b/src/battle/common/actor/ghost_lakilester.inc.c index fbb1d467a3..8b0713155e 100644 --- a/src/battle/common/actor/ghost_lakilester.inc.c +++ b/src/battle/common/actor/ghost_lakilester.inc.c @@ -87,7 +87,7 @@ ActorBlueprint N(lakilester) = { .maxHP = 15, .partCount = ARRAY_COUNT(N(lakilester_parts)), .partsData = N(lakilester_parts), - .takeTurnScript = &N(lakilester_init), + .initScript = &N(lakilester_init), .statusTable = N(lakilester_statusTable), .escapeChance = 50, .airLiftChance = 80, @@ -173,7 +173,7 @@ EvtScript N(lakilester_handleEvent) = { EVT_EXEC_WAIT(DoJumpBack) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_EXEC_WAIT(N(OnDeath)) EVT_SET_CONST(LVar0, 1) @@ -237,7 +237,7 @@ EvtScript N(lakilester_takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, 20, 30, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Idle) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) @@ -254,7 +254,7 @@ EvtScript N(lakilester_takeTurn) = { EVT_END_IF EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_BattleLakilester_Spiny) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_LiftSpiny) EVT_LOOP(4) @@ -280,7 +280,7 @@ EvtScript N(lakilester_takeTurn) = { EVT_ADD(LVar2, 5) EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2C5) EVT_THREAD EVT_LOOP(15) @@ -302,7 +302,7 @@ EvtScript N(lakilester_takeTurn) = { EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_ThrowSpiny) EVT_WAIT(3) - EVT_CALL(SetPartSounds, ACTOR_SELF, 3, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 3, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_201B) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -315,11 +315,11 @@ EvtScript N(lakilester_takeTurn) = { EVT_CALL(RandInt, 100, LVar3) EVT_SUB(LVar3, 50) EVT_ADD(LVar0, LVar3) - EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, 0, LVar2, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, 0, LVar2, 20, TRUE) EVT_THREAD EVT_ADD(LVar0, -50) - EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, 0, LVar2, 15, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, 0, LVar2, 15, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -330,7 +330,7 @@ EvtScript N(lakilester_takeTurn) = { EVT_CALL(MoveBattleCamOver, 60) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -340,11 +340,11 @@ EvtScript N(lakilester_takeTurn) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(1.5)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 20, TRUE) EVT_THREAD EVT_ADD(LVar0, -50) - EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, 0, LVar2, 15, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 3, LVar0, 0, LVar2, 15, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar9) EVT_SWITCH(LVar9) @@ -367,7 +367,7 @@ EvtScript N(lakilester_takeTurn) = { EVT_CALL(MoveBattleCamOver, 8) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleLakilester_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/common/actor/ghost_parakarry.inc.c b/src/battle/common/actor/ghost_parakarry.inc.c index e93d807b9e..200328e329 100644 --- a/src/battle/common/actor/ghost_parakarry.inc.c +++ b/src/battle/common/actor/ghost_parakarry.inc.c @@ -82,7 +82,7 @@ ActorBlueprint N(parakarry) = { .maxHP = 15, .partCount = ARRAY_COUNT(N(parakarry_parts)), .partsData = N(parakarry_parts), - .takeTurnScript = &N(parakarry_init), + .initScript = &N(parakarry_init), .statusTable = N(parakarry_statusTable), .escapeChance = 50, .airLiftChance = 80, @@ -237,27 +237,27 @@ EvtScript N(parakarry_doTakeTurn) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 20, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Still) EVT_WAIT(3) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_B) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2004) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_FlyFast) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 10, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_LINEAR) EVT_WAIT(2) EVT_THREAD EVT_WAIT(3) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_PreDive) EVT_END_THREAD EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 15, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -20, 6) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -20, EASING_QUARTIC_OUT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2005) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_LINEAR) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -269,7 +269,7 @@ EvtScript N(parakarry_doTakeTurn) = { EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -40, 10, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 10, -20, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 10, -20, EASING_QUADRATIC_OUT) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -281,7 +281,7 @@ EvtScript N(parakarry_doTakeTurn) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -324,7 +324,7 @@ EvtScript N(parakarry_doTakeTurn) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleParakarry_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/common/actor/ghost_sushie.inc.c b/src/battle/common/actor/ghost_sushie.inc.c index 42f132f020..85a90867ec 100644 --- a/src/battle/common/actor/ghost_sushie.inc.c +++ b/src/battle/common/actor/ghost_sushie.inc.c @@ -70,7 +70,7 @@ ActorBlueprint N(sushie) = { .maxHP = 15, .partCount = ARRAY_COUNT(N(sushie_parts)), .partsData = N(sushie_parts), - .takeTurnScript = &N(sushie_init), + .initScript = &N(sushie_init), .statusTable = N(sushie_statusTable), .escapeChance = 50, .airLiftChance = 80, @@ -293,7 +293,7 @@ EvtScript N(sushie_takeTurn) = { EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.5), EVT_FLOAT(1.5), EVT_FLOAT(1.5)) EVT_END_SWITCH EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_THREAD @@ -383,7 +383,7 @@ EvtScript N(sushie_takeTurn) = { EVT_CALL(SetPartScale, ACTOR_SELF, 1, EVT_FLOAT(1.8), EVT_FLOAT(1.8), EVT_FLOAT(1.8)) EVT_END_SWITCH EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_THREAD diff --git a/src/battle/common/actor/ghost_watt.inc.c b/src/battle/common/actor/ghost_watt.inc.c index 36d977c7c1..5c723dd5ad 100644 --- a/src/battle/common/actor/ghost_watt.inc.c +++ b/src/battle/common/actor/ghost_watt.inc.c @@ -218,7 +218,7 @@ ActorBlueprint N(watt) = { .maxHP = 15, .partCount = ARRAY_COUNT(N(watt_parts)), .partsData = N(watt_parts), - .takeTurnScript = &N(watt_init), + .initScript = &N(watt_init), .statusTable = N(watt_statusTable), .escapeChance = 50, .airLiftChance = 80, @@ -351,16 +351,16 @@ EvtScript N(watt_takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Run) EVT_CALL(N(UnkWattEffectFunc5), 1) EVT_CALL(AddGoalPos, ACTOR_SELF, 15, -10, 5) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Idle) EVT_CALL(N(UnkWattEffectFunc5), 0) EVT_WAIT(5) EVT_CALL(N(UnkWattEffectFunc3), 0) EVT_CALL(AddGoalPos, ACTOR_SELF, 25, 20, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -20, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -20, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Strain) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_COS_IN_OUT) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -372,7 +372,7 @@ EvtScript N(watt_takeTurn) = { EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -40, 10, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 10, -20, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 10, -20, EASING_QUADRATIC_OUT) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -383,7 +383,7 @@ EvtScript N(watt_takeTurn) = { EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Idle) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -399,11 +399,11 @@ EvtScript N(watt_takeTurn) = { EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 4) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 8, LVar0, LVar1, LVar2, EVT_FLOAT(0.52), LVarA, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 8, LVar0, LVar1, LVar2, EVT_FLOAT(0.52), LVarA, 0) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 12) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 8, LVar0, LVar1, LVar2, EVT_FLOAT(1.3), LVarA, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 8, LVar0, LVar1, LVar2, EVT_FLOAT(1.3), LVarA, 0) EVT_END_IF EVT_CALL(N(UnkBackgroundFunc3)) EVT_SET(LVar9, 0) @@ -443,12 +443,12 @@ EvtScript N(watt_takeTurn) = { EVT_CALL(N(UnkWattEffectFunc4), 1) EVT_CALL(N(UnkWattEffectFunc3), 1) EVT_CALL(AddGoalPos, ACTOR_SELF, 25, 10, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -10, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -10, EASING_COS_IN_OUT) EVT_WAIT(15) EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleWatt_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH diff --git a/src/battle/common/actor/goomba.inc.c b/src/battle/common/actor/goomba.inc.c index 450ac8c7f5..1a37de26fc 100644 --- a/src/battle/common/actor/goomba.inc.c +++ b/src/battle/common/actor/goomba.inc.c @@ -58,7 +58,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 2, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 90, .airLiftChance = 100, @@ -369,7 +369,7 @@ EvtScript N(takeTurn) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) diff --git a/src/battle/common/actor/gray_magikoopa.inc.c b/src/battle/common/actor/gray_magikoopa.inc.c index 6d213f8db5..366aae2132 100644 --- a/src/battle/common/actor/gray_magikoopa.inc.c +++ b/src/battle/common/actor/gray_magikoopa.inc.c @@ -136,7 +136,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 11, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 40, .airLiftChance = 80, @@ -159,7 +159,7 @@ ActorBlueprint N(flying) = { .maxHP = 11, .partCount = ARRAY_COUNT(N(parts_flying)), .partsData = N(parts_flying), - .takeTurnScript = &N(init_flying), + .initScript = &N(init_flying), .statusTable = N(statusTable_flying), .escapeChance = 40, .airLiftChance = 95, @@ -351,12 +351,12 @@ EvtScript N(knockOff) = { EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) EVT_END_IF - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) @@ -368,7 +368,7 @@ EvtScript N(knockOff) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 150, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.7)) EVT_END_THREAD EVT_CALL(GetLastEvent, ACTOR_SELF, LVar3) EVT_IF_EQ(LVar3, EVENT_15) @@ -376,26 +376,26 @@ EvtScript N(knockOff) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar4, 10) EVT_ADD(LVar5, 5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0) EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Gray_Anim01) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_GRAY_MAGIKOOPA) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 32) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) @@ -480,7 +480,7 @@ EvtScript N(handleEvent_flying) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Gray_Anim01) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Gray_Anim01) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CASE_EQ(EVENT_RECOVER_STATUS) @@ -544,7 +544,7 @@ EvtScript N(attackMagicBlast) = { EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Gray_Anim02) EVT_WAIT(30) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) @@ -575,7 +575,7 @@ EvtScript N(attackMagicBlast) = { EVT_END_IF EVT_WAIT(14) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 2, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -643,7 +643,7 @@ EvtScript N(attackWandStrike) = { EVT_END_IF EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -673,7 +673,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Gray_Anim01) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -703,7 +703,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Gray_Anim01) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -782,7 +782,7 @@ EvtScript N(init_flying) = { EvtScript N(takeTurn) = { EVT_SET(LocalFlag(0), 0) EVT_LABEL(10) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -799,7 +799,7 @@ EvtScript N(takeTurn) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -808,7 +808,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(flee)) EVT_RETURN @@ -844,12 +844,12 @@ EvtScript N(takeTurn) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -858,12 +858,12 @@ EvtScript N(takeTurn) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) diff --git a/src/battle/common/actor/green_magikoopa.inc.c b/src/battle/common/actor/green_magikoopa.inc.c index 1ee4f679a2..d6615c8db4 100644 --- a/src/battle/common/actor/green_magikoopa.inc.c +++ b/src/battle/common/actor/green_magikoopa.inc.c @@ -138,7 +138,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 11, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 40, .airLiftChance = 80, @@ -161,7 +161,7 @@ ActorBlueprint N(flying) = { .maxHP = 11, .partCount = ARRAY_COUNT(N(parts_flying)), .partsData = N(parts_flying), - .takeTurnScript = &N(init_flying), + .initScript = &N(init_flying), .statusTable = N(statusTable_flying), .escapeChance = 40, .airLiftChance = 95, @@ -353,12 +353,12 @@ EvtScript N(knockOff) = { EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) EVT_END_IF - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) @@ -370,7 +370,7 @@ EvtScript N(knockOff) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 150, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.7)) EVT_END_THREAD EVT_CALL(GetLastEvent, ACTOR_SELF, LVar3) EVT_IF_EQ(LVar3, EVENT_15) @@ -378,26 +378,26 @@ EvtScript N(knockOff) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar4, 10) EVT_ADD(LVar5, 5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0) EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Green_Anim01) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_GREEN_MAGIKOOPA) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 32) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) @@ -482,7 +482,7 @@ EvtScript N(handleEvent_flying) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Green_Anim01) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Green_Anim01) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CASE_EQ(EVENT_RECOVER_STATUS) @@ -546,7 +546,7 @@ EvtScript N(attackMagicBlast) = { EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Green_Anim02) EVT_WAIT(30) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) @@ -577,7 +577,7 @@ EvtScript N(attackMagicBlast) = { EVT_END_IF EVT_WAIT(14) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 2, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -645,7 +645,7 @@ EvtScript N(attackWandStrike) = { EVT_END_IF EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -675,7 +675,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Green_Anim01) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -705,7 +705,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Green_Anim01) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -784,7 +784,7 @@ EvtScript N(init_flying) = { EvtScript N(takeTurn) = { EVT_SET(LocalFlag(0), 0) EVT_LABEL(10) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -801,7 +801,7 @@ EvtScript N(takeTurn) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -810,7 +810,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(flee)) EVT_RETURN @@ -846,12 +846,12 @@ EvtScript N(takeTurn) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -860,12 +860,12 @@ EvtScript N(takeTurn) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) diff --git a/src/battle/common/actor/hammer_bro.inc.c b/src/battle/common/actor/hammer_bro.inc.c index bc7dbd427b..e1567db0d2 100644 --- a/src/battle/common/actor/hammer_bro.inc.c +++ b/src/battle/common/actor/hammer_bro.inc.c @@ -138,7 +138,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 12, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 30, .airLiftChance = 75, @@ -304,7 +304,7 @@ EvtScript N(attackHammerThrow) = { EVT_GOTO(0) EVT_END_CHILD_THREAD EVT_CALL(SetPartPos, ACTOR_SELF, 2, 0, 50, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HammerBros_Anim0C) EVT_GOTO(100) EVT_END_IF @@ -324,7 +324,7 @@ EvtScript N(attackHammerThrow) = { EVT_CALL(SetPartPos, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HammerBros_Anim0C) EVT_WAIT(8) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_LABEL(100) EVT_THREAD EVT_WAIT(15) @@ -341,27 +341,27 @@ EvtScript N(attackHammerThrow) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetPartSounds, ACTOR_SELF, 2, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 2, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 2, SOUND_2E9) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) EVT_SET(LVar1, 10) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(1.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 15, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 15, TRUE) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_SUB(LVar0, 40) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 15, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 15, TRUE) EVT_SUB(LVar0, 30) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 10, TRUE) EVT_SUB(LVar0, 20) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 5, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 5, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(15) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -369,12 +369,12 @@ EvtScript N(attackHammerThrow) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(SetPartSounds, ACTOR_SELF, 2, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 2, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 2, SOUND_2E9) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 2, EVT_FLOAT(1.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 15, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 15, TRUE) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_CHANCE(STATUS_FLAG_SHRINK, 3, 50), 5, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) @@ -383,12 +383,12 @@ EvtScript N(attackHammerThrow) = { EVT_CALL(GetPartOffset, ACTOR_SELF, 2, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 50) EVT_SET(LVar1, 10) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 20, TRUE) EVT_SUB(LVar0, 30) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 10, TRUE) EVT_SUB(LVar0, 20) - EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 5, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 2, LVar0, LVar1, LVar2, 5, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(20) EVT_CALL(YieldTurn) EVT_END_CASE_GROUP @@ -404,8 +404,8 @@ EvtScript N(hammerMiss) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HammerBros_Anim02) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HammerBros_Anim0C) EVT_WAIT(4) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, 0) - EVT_CALL(SetPartSounds, ACTOR_SELF, LVar0, 2, 0, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetPartSounds, ACTOR_SELF, LVar0, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar0, SOUND_2E9) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar1, LVar2, LVar3) @@ -415,15 +415,15 @@ EvtScript N(hammerMiss) = { EVT_SUB(LVar5, LVar4) EVT_ADD(LVar1, LVar5) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar0, EVT_FLOAT(1.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 15, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 15, TRUE) EVT_SUB(LVar1, 50) EVT_SET(LVar2, 10) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 20, TRUE) EVT_SUB(LVar1, 30) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 10, TRUE) EVT_SUB(LVar1, 20) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 5, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 5, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_RETURN EVT_END }; @@ -433,21 +433,21 @@ EvtScript N(hammerHit) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HammerBros_Anim02) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HammerBros_Anim0C) EVT_WAIT(4) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, 0) - EVT_CALL(SetPartSounds, ACTOR_SELF, LVar0, 2, 0, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetPartSounds, ACTOR_SELF, LVar0, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar0, SOUND_2E9) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar0, EVT_FLOAT(1.3)) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 15, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 15, TRUE) EVT_SUB(LVar1, 50) EVT_SET(LVar2, 10) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 20, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 20, TRUE) EVT_SUB(LVar1, 30) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 10, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 10, TRUE) EVT_SUB(LVar1, 20) - EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 5, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3, 5, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_RETURN EVT_END }; @@ -519,7 +519,7 @@ EvtScript N(attackHammerSurge) = { EVT_END_IF EVT_WAIT(15) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index 67e50e9d06..dccccff1b4 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -68,7 +68,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 4, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 70, .airLiftChance = 90, @@ -286,7 +286,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Hurt) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) @@ -448,18 +448,18 @@ EvtScript N(takeTurn) = { EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 9, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_WAIT(30) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_WAIT(20) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ToppleStruggle) EVT_SET(LVar0, 0) @@ -485,8 +485,8 @@ EvtScript N(takeTurn) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) 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(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, FALSE) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -500,11 +500,11 @@ EvtScript N(takeTurn) = { EVT_CHILD_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 4) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(3) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_CHILD_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellSpin) @@ -512,7 +512,7 @@ EvtScript N(takeTurn) = { EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -554,7 +554,7 @@ EvtScript N(takeTurn) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Panic) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) diff --git a/src/battle/common/actor/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c index e2db7ac7fe..d1df661d2f 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -162,7 +162,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 50, .airLiftChance = 75, @@ -404,8 +404,8 @@ EvtScript N(handleEvent) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) 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(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim0B) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD @@ -456,14 +456,14 @@ EvtScript N(handleEvent) = { EVT_IF_EQ(LVar0, N(STATE_CHARGED)) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_NOT_FLAG(LVarA, STATUS_FLAG_DEFENSE_BOOST | STATUS_FLAG_ATTACK_BOOST) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_END_IF - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Koopatrol_Anim08) EVT_EXEC_WAIT(DoImmune) @@ -518,7 +518,7 @@ EvtScript N(handleEvent) = { EVT_IF_EQ(LocalFlag(0), 0) EVT_ADD(LVar1, 42) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_CASE_EQ(EVENT_DEATH) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_STATE), LVar0) @@ -643,18 +643,18 @@ EvtScript N(attackShellToss) = { EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIPPED), LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_WAIT(15) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_WAIT(10) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim0F) EVT_SET(LVar0, 0) @@ -680,8 +680,8 @@ EvtScript N(attackShellToss) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) 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_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, FALSE) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -696,11 +696,11 @@ EvtScript N(attackShellToss) = { EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 4) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(3) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim06) @@ -708,7 +708,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 4, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -750,7 +750,7 @@ EvtScript N(attackShellToss) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim16) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -814,7 +814,7 @@ EvtScript N(attackShellMissile) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim15) EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -830,16 +830,16 @@ EvtScript N(attackShellMissile) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA) EVT_CALL(N(StartRumbleWithParams), 128, 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(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim06) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_charged))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_charged))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_CHARGED)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_charged))) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, TRUE) EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -856,7 +856,7 @@ EvtScript N(attackShellMissile) = { EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 4, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -882,7 +882,7 @@ EvtScript N(attackShellMissile) = { EVT_THREAD EVT_LOOP(30) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -895,11 +895,11 @@ EvtScript N(attackShellMissile) = { EVT_IF_NOT_FLAG(LVarA, STATUS_FLAG_DEFENSE_BOOST | STATUS_FLAG_ATTACK_BOOST) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_END_IF - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(YieldTurn) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetActorPos, ACTOR_SELF, 300, 0, 0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) @@ -907,7 +907,7 @@ EvtScript N(attackShellMissile) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) EVT_WAIT(10) @@ -919,7 +919,7 @@ EvtScript N(attackShellMissile) = { EVT_THREAD EVT_LOOP(30) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2, 0, 0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -960,7 +960,7 @@ EvtScript N(attackShellMissile) = { EVT_IF_NOT_FLAG(LVarA, STATUS_FLAG_DEFENSE_BOOST | STATUS_FLAG_ATTACK_BOOST) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_END_IF - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetActorPos, ACTOR_SELF, 300, 0, 0) EVT_SET_CONST(LVar0, 1) @@ -969,7 +969,7 @@ EvtScript N(attackShellMissile) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim01) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) EVT_END_CASE_GROUP @@ -981,7 +981,7 @@ EvtScript N(attackShellMissile) = { }; EvtScript N(findTarget) = { - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(1) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -993,7 +993,7 @@ EvtScript N(findTarget) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(1) EVT_END_IF @@ -1001,7 +1001,7 @@ EvtScript N(findTarget) = { 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, LVar1) @@ -1017,7 +1017,7 @@ EvtScript N(findTarget) = { 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 @@ -1076,7 +1076,7 @@ EvtScript N(summonFriend) = { EVT_THREAD EVT_WAIT(8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - 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_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim16) @@ -1090,7 +1090,7 @@ EvtScript N(summonFriend) = { EVT_CALL(SetActorPos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(SetGoalToIndex, LVar0, LVarA) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_20D3) - EVT_CALL(SetActorSounds, LVar0, 0, 0, 0) + EVT_CALL(SetActorSounds, LVar0, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(SetAnimation, LVar0, 1, ANIM_Koopatrol_Anim06) EVT_CALL(SetActorSpeed, LVar0, EVT_FLOAT(6.0)) EVT_CALL(RunToGoal, LVar0, 0, FALSE) @@ -1135,7 +1135,7 @@ EvtScript N(summonFriend) = { EvtScript N(findPlacesToSummon) = { EVT_SET(LVar9, 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -1170,7 +1170,7 @@ EvtScript N(findPlacesToSummon) = { 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 diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index ac79bc79ae..f2416ae6bd 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -164,7 +164,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 11, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 40, .airLiftChance = 80, @@ -187,7 +187,7 @@ ActorBlueprint N(flying) = { .maxHP = 11, .partCount = ARRAY_COUNT(N(parts_flying)), .partsData = N(parts_flying), - .takeTurnScript = &N(init_flying), + .initScript = &N(init_flying), .statusTable = N(statusTable_flying), .escapeChance = 40, .airLiftChance = 85, @@ -315,12 +315,12 @@ EvtScript N(knockOff) = { EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) EVT_END_IF - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) @@ -332,7 +332,7 @@ EvtScript N(knockOff) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 150, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.7)) EVT_END_THREAD EVT_CALL(GetLastEvent, ACTOR_SELF, LVar3) EVT_IF_EQ(LVar3, EVENT_15) @@ -340,26 +340,26 @@ EvtScript N(knockOff) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar4, 10) EVT_ADD(LVar5, 5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0) EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim01) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_MAGIKOOPA) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 32) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) @@ -488,16 +488,16 @@ EvtScript N(removeClone) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_CLONE_ID), -1) EVT_CALL(GetActorFlags, ACTOR_SELF, LVarA) EVT_IF_FLAG(LVarA, ACTOR_FLAG_FLYING) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, FALSE) EVT_ELSE - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, FALSE) EVT_END_IF EVT_CALL(GetActorPos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(RemoveActor, LVar0) EVT_THREAD EVT_ADD(LVar3, 2) EVT_LOOP(2) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD @@ -728,7 +728,7 @@ EvtScript N(handleEvent_flying) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Anim01) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Anim01) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CASE_EQ(EVENT_RECOVER_STATUS) @@ -808,12 +808,12 @@ EvtScript N(healOne) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -822,12 +822,12 @@ EvtScript N(healOne) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) @@ -847,7 +847,7 @@ EvtScript N(healOne) = { EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, LVarB, 5, 0) + EVT_CALL(HealActor, LVarB, 5, FALSE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_CALL(WaitForBuffDone) @@ -888,12 +888,12 @@ EvtScript N(healAll) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -902,12 +902,12 @@ EvtScript N(healAll) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) @@ -918,7 +918,7 @@ EvtScript N(healAll) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Anim01) EVT_END_IF EVT_WAIT(5) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_SET(LocalFlag(0), 0) @@ -940,11 +940,11 @@ EvtScript N(healAll) = { EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, LVar0, 3, 1) + EVT_CALL(HealActor, LVar0, 3, TRUE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -993,7 +993,7 @@ EvtScript N(attackMagicBlast) = { EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 17) EVT_ADD(LVar1, 33) - EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim02) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1005,14 +1005,14 @@ EvtScript N(attackMagicBlast) = { EVT_SUB(LVar0, 17) EVT_ADD(LVar1, 33) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_ELSE EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(SetAnimation, LVarA, 1, ANIM_FlyingMagikoopa_Anim02) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) - EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Anim02) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1024,7 +1024,7 @@ EvtScript N(attackMagicBlast) = { EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_END_IF EVT_WAIT(30) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar9, 0, 0, 1, BS_FLAGS1_10) @@ -1176,7 +1176,7 @@ EvtScript N(attackMagicBlast) = { }; EvtScript N(findPlaceForClone) = { - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -1192,7 +1192,7 @@ EvtScript N(findPlaceForClone) = { EVT_CASE_EQ(3) EVT_SET(LocalFlag(14), 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 @@ -1349,7 +1349,7 @@ ActorBlueprint N(clone) = { .maxHP = 11, .partCount = ARRAY_COUNT(N(parts_clone)), .partsData = N(parts_clone), - .takeTurnScript = &N(init_clone), + .initScript = &N(init_clone), .statusTable = N(statusTable_clone), .escapeChance = 40, .airLiftChance = 0, @@ -1372,7 +1372,7 @@ ActorBlueprint N(clone_flying) = { .maxHP = 11, .partCount = ARRAY_COUNT(N(parts_clone_flying)), .partsData = N(parts_clone_flying), - .takeTurnScript = &N(init_clone_flying), + .initScript = &N(init_clone_flying), .statusTable = N(statusTable_clone_flying), .escapeChance = 40, .airLiftChance = 0, @@ -1399,7 +1399,7 @@ Formation N(formation_clone_flying) = { }; EvtScript N(makeClone) = { - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(flee)) EVT_RETURN @@ -1439,7 +1439,7 @@ EvtScript N(makeClone) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 23) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) EVT_WAIT(10) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(EnableIdleScript, LVar9, 1) @@ -1453,20 +1453,20 @@ EvtScript N(makeClone) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST4) EVT_CALL(PlaySoundAtActor, LVar9, SOUND_SPELL_CAST4) - EVT_CALL(SetPartFlagBits, LVar9, 1, ACTOR_PART_FLAG_MULTI_TARGET, 0) + EVT_CALL(SetPartFlagBits, LVar9, 1, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) EVT_CALL(RandInt, 1000, LVar0) EVT_IF_LT(LVar0, 500) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_EXEC_WAIT(N(findPlaceForClone)) EVT_CALL(SetGoalToIndex, ACTOR_SELF, LVar0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_ELSE EVT_CALL(SetActorSpeed, LVar9, EVT_FLOAT(2.0)) EVT_EXEC_WAIT(N(findPlaceForClone)) EVT_CALL(SetGoalToIndex, LVar9, LVar0) - EVT_CALL(FlyToGoal, LVar9, 0, 0, 0) + EVT_CALL(FlyToGoal, LVar9, 0, 0, EASING_LINEAR) EVT_END_IF - EVT_CALL(SetPartFlagBits, LVar9, 1, ACTOR_PART_FLAG_MULTI_TARGET, 1) + EVT_CALL(SetPartFlagBits, LVar9, 1, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_CALL(SetEnemyHP, LVar9, LVar0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1476,9 +1476,9 @@ EvtScript N(makeClone) = { EVT_CALL(ForceHomePos, LVar9, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, LVar9) EVT_IF_EQ(LocalFlag(0), 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_400000, TRUE) EVT_ELSE - EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_400000, TRUE) EVT_END_IF EVT_IF_EQ(LocalFlag(0), 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Anim01) @@ -1498,7 +1498,7 @@ EvtScript N(makeClone) = { EvtScript N(boostAttack) = { EVT_SET(LocalFlag(0), 0) EVT_LABEL(10) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -1515,7 +1515,7 @@ EvtScript N(boostAttack) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -1524,7 +1524,7 @@ EvtScript N(boostAttack) = { EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(flee)) EVT_RETURN @@ -1558,12 +1558,12 @@ EvtScript N(boostAttack) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1572,12 +1572,12 @@ EvtScript N(boostAttack) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) @@ -1610,7 +1610,7 @@ EvtScript N(boostAttack) = { EvtScript N(boostDefense) = { EVT_SET(LocalFlag(0), 0) EVT_LABEL(10) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -1627,7 +1627,7 @@ EvtScript N(boostDefense) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -1636,7 +1636,7 @@ EvtScript N(boostDefense) = { EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(flee)) EVT_RETURN @@ -1670,12 +1670,12 @@ EvtScript N(boostDefense) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1684,12 +1684,12 @@ EvtScript N(boostDefense) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) @@ -1722,7 +1722,7 @@ EvtScript N(boostDefense) = { EvtScript N(electrify) = { EVT_SET(LocalFlag(0), 0) EVT_LABEL(10) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -1739,7 +1739,7 @@ EvtScript N(electrify) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -1748,7 +1748,7 @@ EvtScript N(electrify) = { EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(flee)) EVT_RETURN @@ -1782,12 +1782,12 @@ EvtScript N(electrify) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1796,12 +1796,12 @@ EvtScript N(electrify) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) @@ -1839,7 +1839,7 @@ EvtScript N(electrify) = { EvtScript N(makeTransparent) = { EVT_SET(LocalFlag(0), 0) EVT_LABEL(10) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -1856,7 +1856,7 @@ EvtScript N(makeTransparent) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -1865,7 +1865,7 @@ EvtScript N(makeTransparent) = { EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(flee)) EVT_RETURN @@ -1899,12 +1899,12 @@ EvtScript N(makeTransparent) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1913,12 +1913,12 @@ EvtScript N(makeTransparent) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) @@ -1959,7 +1959,7 @@ EvtScript N(takeTurn) = { EVT_GOTO(20) EVT_END_IF EVT_SET(LVarA, 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_SET(LocalFlag(0), 0) @@ -1985,7 +1985,7 @@ EvtScript N(takeTurn) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -1993,7 +1993,7 @@ EvtScript N(takeTurn) = { EVT_GOTO(10) EVT_END_IF EVT_SET(LVarA, 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(1) EVT_SET(LocalFlag(0), 0) @@ -2019,7 +2019,7 @@ EvtScript N(takeTurn) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(1) EVT_END_IF @@ -2027,7 +2027,7 @@ EvtScript N(takeTurn) = { EVT_GOTO(10) EVT_END_IF EVT_SET(LVarA, 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(2) EVT_SET(LocalFlag(0), 0) @@ -2053,7 +2053,7 @@ EvtScript N(takeTurn) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(2) EVT_END_IF @@ -2062,7 +2062,7 @@ EvtScript N(takeTurn) = { EVT_END_IF EVT_GOTO(20) EVT_LABEL(10) - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(flee)) EVT_RETURN @@ -2097,7 +2097,7 @@ EvtScript N(takeTurn) = { EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_HEAL_ONE_COUNTER), LVar0) EVT_IF_LT(LVar0, 2) EVT_SETF(LVar9, EVT_FLOAT(100.0)) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(11) EVT_SET(LocalFlag(0), 0) @@ -2119,7 +2119,7 @@ EvtScript N(takeTurn) = { EVT_SET(LVarB, LVar0) EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(11) EVT_END_IF diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index 96029bf0bb..cdb856730f 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -79,7 +79,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 60, .airLiftChance = 90, @@ -131,7 +131,7 @@ EvtScript N(returnHome) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MediGuy_Anim03) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MediGuy_Anim01) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_RETURN @@ -221,7 +221,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_MediGuy_Anim01) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_MediGuy_Anim03) EVT_SET_CONST(LVar2, ANIM_MediGuy_Anim0B) @@ -263,7 +263,7 @@ EvtScript N(flyingAttack) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 12) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_COS_IN) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -276,7 +276,7 @@ EvtScript N(flyingAttack) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F9) EVT_THREAD EVT_WAIT(5) @@ -295,14 +295,14 @@ EvtScript N(flyingAttack) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MediGuy_Anim05) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_WAIT(30) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) @@ -322,7 +322,7 @@ EvtScript N(flyingAttack) = { EVT_SET(LVarA, LVar0) EVT_SET(LVarB, LVar1) EVT_SET(LVarC, LVar2) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F9) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -330,7 +330,7 @@ EvtScript N(flyingAttack) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MediGuy_Anim05) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) @@ -367,8 +367,8 @@ EvtScript N(healOneAlly) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MediGuy_Anim05) EVT_ADD(LVar2, 50) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 1, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_RECOVER, 2, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar1, LVar2, LVar3, 10, 0) + EVT_PLAY_EFFECT(EFFECT_RECOVER, 2, LVar1, LVar2, LVar3, 0, 0) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MediGuy_Anim01) EVT_WAIT(10) @@ -386,7 +386,7 @@ EvtScript N(healOneAlly) = { EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, LVarA, LVar4, 0) + EVT_CALL(HealActor, LVarA, LVar4, FALSE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_CALL(WaitForBuffDone) @@ -408,7 +408,7 @@ EvtScript N(findTargetsToHeal) = { EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_RETURN EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/common/actor/monty_mole.inc.c b/src/battle/common/actor/monty_mole.inc.c index 13490d777b..2caf72a23e 100644 --- a/src/battle/common/actor/monty_mole.inc.c +++ b/src/battle/common/actor/monty_mole.inc.c @@ -86,7 +86,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 3, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 80, .airLiftChance = 70, @@ -162,7 +162,7 @@ ActorBlueprint N(hole) = { .maxHP = 5, .partCount = ARRAY_COUNT(N(parts_hole)), .partsData = N(parts_hole), - .takeTurnScript = &N(init_hole), + .initScript = &N(init_hole), .statusTable = NULL, .escapeChance = 80, .airLiftChance = 0, @@ -206,7 +206,7 @@ EvtScript N(init) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_RETURN EVT_END }; @@ -300,7 +300,7 @@ EvtScript N(handleEvent) = { EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MontyMole_Anim08) EVT_WAIT(15) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TARGET_ONLY | ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TARGET_ONLY | ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_hole))) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) @@ -365,7 +365,7 @@ EvtScript N(takeTurn) = { EVT_ADD(LVar1, 20) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) @@ -373,7 +373,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_IF EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 3, SOUND_MOLE_THROW) - EVT_CALL(SetPartSounds, ACTOR_SELF, 3, 1, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 3, ACTOR_SOUND_FLY, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -387,8 +387,8 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 3, EVT_FLOAT(12.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(0.1)) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_MontyMole_Anim0F) - EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 30, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 30, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -404,7 +404,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 3, EVT_FLOAT(12.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(0.1)) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_MontyMole_Anim0F) - EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 20, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 20, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) @@ -415,11 +415,11 @@ EvtScript N(takeTurn) = { EVT_SET(LVar1, 0) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 3, EVT_FLOAT(6.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 3, EVT_FLOAT(0.1)) - EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 25, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 25, EASING_LINEAR) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 3, EVT_FLOAT(4.0)) EVT_SUB(LVar0, 20) - EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 21, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(FlyPartTo, ACTOR_SELF, 3, LVar0, LVar1, LVar2, 0, 21, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index 6dd645fad7..5cb9be0652 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -129,7 +129,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 2, .partCount = ARRAY_COUNT(N(partsTable_8021B280)), .partsData = N(partsTable_8021B280), - .takeTurnScript = &N(init_8021B3E8), + .initScript = &N(init_8021B3E8), .statusTable = N(statusTable_8021B1D4), .escapeChance = 90, .airLiftChance = 100, @@ -211,7 +211,7 @@ EvtScript N(idle_8021B434) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021B384))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -225,7 +225,7 @@ EvtScript N(idle_8021B434) = { EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021B338))) EVT_LOOP(40) EVT_LABEL(2) @@ -245,7 +245,7 @@ EvtScript N(8021B6F0) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Idle) EVT_RETURN EVT_END @@ -342,7 +342,7 @@ EvtScript N(handleEvent_8021B768) = { EVT_SET_CONST(LVar1, ANIM_Paragoomba_Idle) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_Run) EVT_SET_CONST(LVar2, ANIM_Paragoomba_Hurt) @@ -377,7 +377,7 @@ EvtScript N(takeTurn_8021BD5C) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -389,7 +389,7 @@ EvtScript N(takeTurn_8021BD5C) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dive) @@ -397,14 +397,14 @@ EvtScript N(takeTurn_8021BD5C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) EVT_SET(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 4) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_THREAD EVT_LOOP(4) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DF) @@ -412,7 +412,7 @@ EvtScript N(takeTurn_8021BD5C) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Miss) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 2, EVT_FLOAT(3.0)) EVT_WAIT(10) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) @@ -439,7 +439,7 @@ EvtScript N(takeTurn_8021BD5C) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dive) @@ -447,11 +447,11 @@ EvtScript N(takeTurn_8021BD5C) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Dive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_END_SWITCH EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) @@ -463,7 +463,7 @@ EvtScript N(takeTurn_8021BD5C) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Run) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(5) EVT_CALL(YieldTurn) @@ -498,7 +498,7 @@ EvtScript N(8021C574) = { EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hurt) EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 769, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) @@ -506,42 +506,42 @@ EvtScript N(8021C574) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 100, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.3)) EVT_END_THREAD - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar3) EVT_IF_EQ(LVar3, EVENT_15) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hurt) EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar4, 10) EVT_ADD(LVar5, 5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0) EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_LOOP(10) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(GetIndexFromHome, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) EVT_CALL(SetGoalToIndex, ACTOR_SELF, LVar0) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Idle) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021B128))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_GOOMBA) EVT_EXEC_WAIT(N(8021CB94)) - 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_RETURN @@ -846,7 +846,7 @@ EvtScript N(takeTurn_8021D6E8) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index 1572060908..88132ddb4e 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -125,7 +125,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 4, .partCount = ARRAY_COUNT(N(partsTable_8021EC6C)), .partsData = N(partsTable_8021EC6C), - .takeTurnScript = &N(init_8021EE0C), + .initScript = &N(init_8021EE0C), .statusTable = N(statusTable_8021EBC0), .escapeChance = 60, .airLiftChance = 95, @@ -237,7 +237,7 @@ EvtScript N(idle_8021EF5C) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021ED4C))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021ED00))) EVT_LOOP(20) EVT_LABEL(1) @@ -254,7 +254,7 @@ EvtScript N(idle_8021EF5C) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021ED4C))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, 0) + EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021ED00))) EVT_LOOP(40) EVT_LABEL(2) @@ -275,7 +275,7 @@ EvtScript N(8021F26C) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Idle) EVT_RETURN EVT_END @@ -395,7 +395,7 @@ EvtScript N(handleEvent_8021F2EC) = { EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Idle) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Run) EVT_SET_CONST(LVar2, ANIM_ParaTroopa_Hurt) @@ -430,7 +430,7 @@ EvtScript N(takeTurn_8021FA24) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 30, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -16, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -16, EASING_LINEAR) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_B) EVT_WAIT(5) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) @@ -439,23 +439,23 @@ EvtScript N(takeTurn_8021FA24) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(AddGoalPos, ACTOR_SELF, 6, 6, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(6) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 25) EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_ShellDive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -497,7 +497,7 @@ EvtScript N(takeTurn_8021FA24) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_EXEC_WAIT(N(8021F26C)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -508,20 +508,20 @@ EvtScript N(takeTurn_8021FA24) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(AddGoalPos, ACTOR_SELF, 6, 6, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(6) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_ShellDive) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SWITCH(LVar0) @@ -547,7 +547,7 @@ EvtScript N(takeTurn_8021FA24) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, -10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Idle) EVT_END_THREAD - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 30, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 30, EASING_LINEAR) EVT_WAIT(10) EVT_CALL(YieldTurn) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) @@ -573,7 +573,7 @@ EvtScript N(802204DC) = { EVT_SUB(LVar2, 2) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Hurt) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 769, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarA) EVT_IF_EQ(LVarA, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -583,20 +583,20 @@ EvtScript N(802204DC) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 128, 7) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.3)) EVT_END_THREAD - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_LOOP(10) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) @@ -605,18 +605,18 @@ EvtScript N(802204DC) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_THREAD EVT_LOOP(10) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 150, 7) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.3)) EVT_END_THREAD - EVT_CALL(ResetActorSounds, ACTOR_SELF, 2) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF EVT_CALL(GetIndexFromHome, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) @@ -624,12 +624,12 @@ EvtScript N(802204DC) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Idle) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021EB14))) EVT_CALL(BindNextTurn, ACTOR_SELF, 0) EVT_EXEC_WAIT(N(80220B84)) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_KOOPA_TROOPA) - 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_IF_NE(LVarA, 0) @@ -843,7 +843,7 @@ EvtScript N(handleEvent_80221228) = { EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220B38))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Hurt) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) @@ -1005,18 +1005,18 @@ EvtScript N(takeTurn_80221DAC) = { EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 9, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_WAIT(30) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(3.0)) EVT_WAIT(20) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ToppleStruggle) EVT_SET(LVar0, 0) @@ -1042,8 +1042,8 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8021EAD0))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) 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(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, FALSE) + EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -1057,11 +1057,11 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CHILD_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 4) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(3) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_CHILD_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellSpin) @@ -1069,7 +1069,7 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -1111,7 +1111,7 @@ EvtScript N(takeTurn_80221DAC) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Panic) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) diff --git a/src/battle/common/actor/pokey.inc.c b/src/battle/common/actor/pokey.inc.c index 8cc8a3a2b8..b04658da64 100644 --- a/src/battle/common/actor/pokey.inc.c +++ b/src/battle/common/actor/pokey.inc.c @@ -144,7 +144,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 4, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 70, .airLiftChance = 90, @@ -446,7 +446,7 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_ADDF(LVar3, LVar0) EVT_ADDF(LVar4, LVar1) - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar3, LVar4, LVar5, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar3, LVar4, LVar5, 20, 0) EVT_WAIT(30) EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) @@ -508,7 +508,7 @@ EvtScript N(timberAttack) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Pokey_Anim06) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_342) - EVT_CALL(MakeLerp, 0, -40, 20, 10) + EVT_CALL(MakeLerp, 0, -40, 20, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) @@ -520,7 +520,7 @@ EvtScript N(timberAttack) = { EVT_WAIT(3) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2ED) EVT_END_CHILD_THREAD - EVT_CALL(MakeLerp, -40, 90, 5, 1) + EVT_CALL(MakeLerp, -40, 90, 5, EASING_QUADRATIC_IN) EVT_LABEL(3) EVT_CALL(UpdateLerp) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) @@ -533,7 +533,7 @@ EvtScript N(timberAttack) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(MakeLerp, 90, 0, 5, 0) + EVT_CALL(MakeLerp, 90, 0, 5, EASING_LINEAR) EVT_LABEL(4) EVT_CALL(UpdateLerp) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) @@ -546,7 +546,7 @@ EvtScript N(timberAttack) = { EVT_END_IF EVT_CALL(YieldTurn) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_PARTS_THROWN), LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) @@ -589,7 +589,7 @@ EvtScript N(timberAttack) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(MakeLerp, 90, 0, 10, 0) + EVT_CALL(MakeLerp, 90, 0, 10, EASING_LINEAR) EVT_LABEL(5) EVT_CALL(UpdateLerp) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) @@ -629,7 +629,7 @@ EvtScript N(timberAttack) = { EvtScript N(calcSummonChance) = { EVT_SET(LVar9, 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -647,7 +647,7 @@ EvtScript N(calcSummonChance) = { 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 @@ -706,7 +706,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 1) EVT_END_IF - EVT_CALL(SetPartSounds, ACTOR_SELF, 6, 2, 0, 0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 6, ACTOR_SOUND_JUMP, 0, 0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, 6, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -714,7 +714,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartScale, ACTOR_SELF, 6, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(1.0)) EVT_END_IF EVT_CHILD_THREAD - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 6, LVar0, LVar1, LVar2) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(2.2)) @@ -729,7 +729,7 @@ EvtScript N(takeTurn) = { EVT_ADD(LVar1, 15) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(1.2)) EVT_END_IF - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 15, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 15, TRUE) EVT_CASE_EQ(1) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_ADD(LVar1, 20) @@ -737,7 +737,7 @@ EvtScript N(takeTurn) = { EVT_ADD(LVar1, 8) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(1.2)) EVT_END_IF - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 15, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 15, TRUE) EVT_CASE_EQ(2) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_ADD(LVar1, 8) @@ -745,7 +745,7 @@ EvtScript N(takeTurn) = { EVT_ADD(LVar1, 3) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(1.2)) EVT_END_IF - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 15, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 15, TRUE) EVT_CASE_EQ(3) EVT_END_SWITCH EVT_END_CHILD_THREAD @@ -778,8 +778,8 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(20.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.1)) EVT_CALL(SetAnimation, ACTOR_SELF, 6, ANIM_Pokey_Anim16) - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_UNK), LVar1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, LVar1) EVT_RETURN @@ -791,7 +791,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(20.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.1)) EVT_CALL(SetAnimation, ACTOR_SELF, 6, ANIM_Pokey_Anim16) - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, TRUE) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_CHANCE(STATUS_FLAG_POISON, 3, 0), 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_UNK), LVar1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, LVar1) @@ -803,14 +803,14 @@ EvtScript N(takeTurn) = { 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(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 25, EASING_LINEAR) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(4.0)) EVT_SUB(LVar0, 24) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 21, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 21, EASING_LINEAR) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(3.0)) EVT_SUB(LVar0, 20) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 20, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 20, EASING_LINEAR) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -833,7 +833,7 @@ EvtScript N(findPlaceForSummon) = { 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) @@ -849,7 +849,7 @@ EvtScript N(findPlaceForSummon) = { 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 @@ -888,7 +888,7 @@ EvtScript N(unearthFriend) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Pokey_Anim04) - EVT_CALL(MakeLerp, 0, -20, 20, 10) + EVT_CALL(MakeLerp, 0, -20, 20, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) @@ -900,7 +900,7 @@ EvtScript N(unearthFriend) = { EVT_WAIT(8) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_344) EVT_END_CHILD_THREAD - EVT_CALL(MakeLerp, -20, 30, 20, 10) + EVT_CALL(MakeLerp, -20, 30, 20, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) @@ -912,7 +912,7 @@ EvtScript N(unearthFriend) = { EVT_WAIT(6) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_345) EVT_END_CHILD_THREAD - EVT_CALL(MakeLerp, 30, -40, 20, 10) + EVT_CALL(MakeLerp, 30, -40, 20, EASING_COS_IN_OUT) EVT_LABEL(2) EVT_CALL(UpdateLerp) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) @@ -924,7 +924,7 @@ EvtScript N(unearthFriend) = { EVT_WAIT(4) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EE) EVT_END_CHILD_THREAD - EVT_CALL(MakeLerp, -40, 90, 10, 10) + EVT_CALL(MakeLerp, -40, 90, 10, EASING_COS_IN_OUT) EVT_LABEL(3) EVT_CALL(UpdateLerp) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) @@ -936,7 +936,7 @@ EvtScript N(unearthFriend) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_346) EVT_CALL(StartRumble, 9) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(SummonEnemy, EVT_PTR(N(summon_formation)), 0) EVT_SET(LVarB, LVar0) @@ -945,7 +945,7 @@ EvtScript N(unearthFriend) = { EVT_SUB(LVar1, 80) EVT_CALL(SetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_CHILD_THREAD - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 2, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 2, LVar0, 0, LVar2, 0) EVT_CALL(UseIdleAnimation, LVarB, FALSE) EVT_CALL(SetAnimation, LVarB, 1, ANIM_Pokey_Anim0C) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) @@ -969,7 +969,7 @@ EvtScript N(unearthFriend) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) EVT_SET(LVarA, LVar0) - EVT_CALL(MakeLerp, 90, -30, 7, 4) + EVT_CALL(MakeLerp, 90, -30, 7, EASING_QUADRATIC_OUT) EVT_LABEL(4) EVT_CALL(UpdateLerp) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) @@ -978,7 +978,7 @@ EvtScript N(unearthFriend) = { EVT_GOTO(4) EVT_END_IF EVT_WAIT(20) - EVT_CALL(MakeLerp, -30, 0, 10, 10) + EVT_CALL(MakeLerp, -30, 0, 10, EASING_COS_IN_OUT) EVT_LABEL(5) EVT_CALL(UpdateLerp) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, LVar0) @@ -997,8 +997,8 @@ EvtScript N(unearthFriend) = { EvtScript N(attackHeadDive) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 748, 748) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 748, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_2EC, SOUND_2EC) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EC, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) @@ -1067,7 +1067,7 @@ EvtScript N(attackHeadDive) = { EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) @@ -1168,10 +1168,10 @@ EvtScript N(afterPartThrown) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN), ANIM_Pokey_Anim1A) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN2), ANIM_Pokey_Anim1B) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_3bodyParts))) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_PARTS_THROWN), 1) EVT_CALL(SetActorSize, ACTOR_SELF, 62, EVT_IGNORE_ARG) EVT_CALL(SetPartSize, ACTOR_SELF, 1, 62, EVT_IGNORE_ARG) @@ -1185,10 +1185,10 @@ EvtScript N(afterPartThrown) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN), ANIM_Pokey_Anim1C) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN2), ANIM_Pokey_Anim1D) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_2bodyParts))) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_PARTS_THROWN), 2) EVT_CALL(SetActorSize, ACTOR_SELF, 44, EVT_IGNORE_ARG) EVT_CALL(SetPartSize, ACTOR_SELF, 1, 44, EVT_IGNORE_ARG) @@ -1200,10 +1200,10 @@ EvtScript N(afterPartThrown) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN), ANIM_Pokey_Anim1E) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN2), ANIM_Pokey_Anim1F) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_1bodyPart))) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_MULTI_TARGET, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_PARTS_THROWN), 3) EVT_CALL(SetActorSize, ACTOR_SELF, 26, EVT_IGNORE_ARG) EVT_CALL(SetPartSize, ACTOR_SELF, 1, 26, EVT_IGNORE_ARG) @@ -1259,7 +1259,7 @@ EvtScript N(bounceOnHit) = { EvtScript N(doSpinSmashHit) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 6, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, 6, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -1274,18 +1274,18 @@ EvtScript N(doSpinSmashHit) = { EVT_WAIT(4) EVT_EXEC_WAIT(N(bounceOnHit)) EVT_END_CHILD_THREAD - EVT_CALL(EnemyCreateTargetList, 98308) + EVT_CALL(EnemyCreateTargetList, 0x00018004) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerID, LVar1) EVT_CALL(GetOwnerTarget, LVar0, LVar9) EVT_IF_NE(LVar1, LVar0) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_GOTO(0) EVT_END_IF EVT_LABEL(1) EVT_ADD(LVarF, 1) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_EQ(LVar0, -1) EVT_GOTO(10) EVT_END_IF @@ -1301,21 +1301,21 @@ EvtScript N(doSpinSmashHit) = { EVT_SET(LVar1, 0) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.1)) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(7.0)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 0, TRUE) EVT_CHILD_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_END_CHILD_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_CALL(DispatchDamageEvent, LVar0, 1, 17) + EVT_CALL(DispatchDamageEvent, LVar0, 1, EVENT_SPIN_SMASH_LAUNCH_HIT) EVT_GOTO(1) EVT_LABEL(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, 6, EVT_FLOAT(0.1)) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(6.0)) - EVT_CALL(JumpPartTo, ACTOR_SELF, 6, 296, 0, 0, 0, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(JumpPartTo, ACTOR_SELF, 6, 296, 0, 0, 0, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_RETURN EVT_END }; @@ -1348,22 +1348,22 @@ EvtScript N(onHit) = { EVT_IF_NE(LVarA, 3) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 6, LVar0, LVar1, LVar2) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, 6, EVT_FLOAT(6.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 30) EVT_SET(LVar1, 0) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 10, 18, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 10, 18, EASING_LINEAR) EVT_ADD(LVar0, 20) - EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 8, 10, 0) + EVT_CALL(FlyPartTo, ACTOR_SELF, 6, LVar0, LVar1, LVar2, 8, 10, EASING_LINEAR) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 6, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_ELSE EVT_WAIT(30) EVT_END_IF @@ -1378,7 +1378,7 @@ EvtScript N(onHit) = { EVT_ADD(LVar1, LVar3) EVT_ADD(LVar2, 5) EVT_DIVF(LVar3, EVT_FLOAT(10.0)) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN2), LVar1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, LVar1) @@ -1403,7 +1403,7 @@ EvtScript N(flee) = { EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1) EVT_WAIT(20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) - EVT_CALL(FallToGoal, -127, 10) + EVT_CALL(FallToGoal, ACTOR_SELF, 10) EVT_WAIT(20) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_WAIT(5) @@ -1425,7 +1425,7 @@ EvtScript N(flee) = { EVT_CHILD_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_LOOP(LVar6) - EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 2, LVarA, 0, LVarC, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 2, LVarA, 0, LVarC, 0) EVT_WAIT(10) EVT_END_LOOP EVT_END_CHILD_THREAD @@ -1433,7 +1433,7 @@ EvtScript N(flee) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_SUB(LVar4, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(8) EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) diff --git a/src/battle/common/actor/putrid_piranha.inc.c b/src/battle/common/actor/putrid_piranha.inc.c index 8a7164ea3b..9c289e56a2 100644 --- a/src/battle/common/actor/putrid_piranha.inc.c +++ b/src/battle/common/actor/putrid_piranha.inc.c @@ -76,7 +76,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 12, .partCount = ARRAY_COUNT(N(partsTable_8021B1AC)), .partsData = N(partsTable_8021B1AC), - .takeTurnScript = &N(init_8021B1F8), + .initScript = &N(init_8021B1F8), .statusTable = N(statusTable_8021B100), .escapeChance = 60, .airLiftChance = 20, @@ -247,7 +247,7 @@ EvtScript N(bite) = { EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Putrid_Anim18) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_WAIT(8) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -270,7 +270,7 @@ EvtScript N(bite) = { EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_SURFACE) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Putrid_Anim17) EVT_WAIT(8) EVT_ELSE @@ -316,7 +316,7 @@ EvtScript N(bite) = { EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_DIG) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Putrid_Anim18) EVT_WAIT(10) @@ -326,12 +326,12 @@ EvtScript N(bite) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_SURFACE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Putrid_Anim17) EVT_WAIT(10) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_ELSE EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(8021B354)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) @@ -360,7 +360,7 @@ EvtScript N(bite) = { EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_DIG) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Putrid_Anim18) EVT_WAIT(10) @@ -370,7 +370,7 @@ EvtScript N(bite) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BURROW_SURFACE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LargePiranha_Putrid_Anim17) EVT_WAIT(10) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, FALSE) EVT_ELSE EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(8021B354)) @@ -441,7 +441,7 @@ EvtScript N(breath) = { EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(8021B354)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) diff --git a/src/battle/common/actor/red_magikoopa.inc.c b/src/battle/common/actor/red_magikoopa.inc.c index 106e9b4bea..70f51affd9 100644 --- a/src/battle/common/actor/red_magikoopa.inc.c +++ b/src/battle/common/actor/red_magikoopa.inc.c @@ -136,7 +136,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 11, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 40, .airLiftChance = 80, @@ -159,7 +159,7 @@ ActorBlueprint N(flying) = { .maxHP = 11, .partCount = ARRAY_COUNT(N(parts_flying)), .partsData = N(parts_flying), - .takeTurnScript = &N(init_flying), + .initScript = &N(init_flying), .statusTable = N(statusTable_flying), .escapeChance = 40, .airLiftChance = 95, @@ -351,12 +351,12 @@ EvtScript N(knockOff) = { EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) EVT_END_IF - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) @@ -368,7 +368,7 @@ EvtScript N(knockOff) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 150, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.7)) EVT_END_THREAD EVT_CALL(GetLastEvent, ACTOR_SELF, LVar3) EVT_IF_EQ(LVar3, EVENT_15) @@ -376,26 +376,26 @@ EvtScript N(knockOff) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar4, 10) EVT_ADD(LVar5, 5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0) EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Red_Anim01) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_RED_MAGIKOOPA) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 32) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) @@ -480,7 +480,7 @@ EvtScript N(handleEvent_flying) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Red_Anim01) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Red_Anim01) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CASE_EQ(EVENT_RECOVER_STATUS) @@ -544,7 +544,7 @@ EvtScript N(attackMagicBlast) = { EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Red_Anim02) EVT_WAIT(30) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) @@ -575,7 +575,7 @@ EvtScript N(attackMagicBlast) = { EVT_END_IF EVT_WAIT(14) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 2, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -643,7 +643,7 @@ EvtScript N(attackWandStrike) = { EVT_END_IF EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -673,7 +673,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Red_Anim01) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -703,7 +703,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Red_Anim01) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -782,7 +782,7 @@ EvtScript N(init_flying) = { EvtScript N(takeTurn) = { EVT_SET(LocalFlag(0), 0) EVT_LABEL(10) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -799,7 +799,7 @@ EvtScript N(takeTurn) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -808,7 +808,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(flee)) EVT_RETURN @@ -844,12 +844,12 @@ EvtScript N(takeTurn) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -858,12 +858,12 @@ EvtScript N(takeTurn) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 5, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) diff --git a/src/battle/common/actor/red_shy_guy.inc.c b/src/battle/common/actor/red_shy_guy.inc.c index 07a3c3e19f..cc8c1eb63a 100644 --- a/src/battle/common/actor/red_shy_guy.inc.c +++ b/src/battle/common/actor/red_shy_guy.inc.c @@ -62,7 +62,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 7, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 60, .airLiftChance = 85, @@ -245,9 +245,9 @@ EvtScript N(bumpAttack) = { 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(SetGoalToTarget, ACTOR_SELF) @@ -269,7 +269,7 @@ EvtScript N(bumpAttack) = { 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, 1, 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) @@ -286,8 +286,8 @@ EvtScript N(bumpAttack) = { 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(SetGoalToTarget, ACTOR_SELF) @@ -338,8 +338,8 @@ EvtScript N(acrobaticAttack) = { 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(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, 1, ANIM_ShyGuy_Red_Anim04) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_SUB(LVar0, 40) @@ -380,7 +380,7 @@ EvtScript N(acrobaticAttack) = { 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, 1, 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) @@ -455,7 +455,7 @@ EvtScript N(acrobaticAttack) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_ShyGuy_Red_Anim11) diff --git a/src/battle/common/actor/slot_machine.inc.c b/src/battle/common/actor/slot_machine.inc.c index cc3cdbe3fe..e37a4081ae 100644 --- a/src/battle/common/actor/slot_machine.inc.c +++ b/src/battle/common/actor/slot_machine.inc.c @@ -65,7 +65,7 @@ ActorBlueprint N(slot_machine_stop) = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -88,7 +88,7 @@ ActorBlueprint N(slot_machine_start) = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -149,7 +149,7 @@ EvtScript N(init) = { EvtScript N(idle) = { EVT_USE_ARRAY(N(slot_machine_buffer)) - EVT_CALL(EnableTexPanning, 45, 1) + EVT_CALL(EnableTexPanning, 45, TRUE) EVT_SET(LVarE, 0) EVT_SET(LVarF, 0) EVT_LABEL(0) @@ -290,37 +290,37 @@ EvtScript N(idle) = { EVT_SWITCH(LVarA) EVT_CASE_EQ(0) EVT_LOOP(10) - EVT_CALL(MakeItemEntity, ITEM_COIN, -7, 105, -74, 26, 0) + EVT_CALL(MakeItemEntity, ITEM_COIN, -7, 105, -74, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_SMALL, 0) EVT_CALL(N(Add1Coin)) EVT_WAIT(1) - EVT_CALL(MakeItemEntity, ITEM_COIN, 17, 105, -74, 26, 0) + EVT_CALL(MakeItemEntity, ITEM_COIN, 17, 105, -74, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_SMALL, 0) EVT_CALL(N(Add1Coin)) EVT_WAIT(1) - EVT_CALL(MakeItemEntity, ITEM_COIN, 42, 105, -74, 26, 0) + EVT_CALL(MakeItemEntity, ITEM_COIN, 42, 105, -74, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_SMALL, 0) EVT_CALL(N(Add1Coin)) EVT_WAIT(10) EVT_END_LOOP EVT_CASE_EQ(1) EVT_LOOP(10) - EVT_CALL(MakeItemEntity, ITEM_COIN, -7, 105, -74, 26, 0) + EVT_CALL(MakeItemEntity, ITEM_COIN, -7, 105, -74, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_SMALL, 0) EVT_CALL(N(Add1Coin)) EVT_WAIT(1) - EVT_CALL(MakeItemEntity, ITEM_COIN, 17, 105, -74, 26, 0) + EVT_CALL(MakeItemEntity, ITEM_COIN, 17, 105, -74, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_SMALL, 0) EVT_CALL(N(Add1Coin)) EVT_WAIT(1) - EVT_CALL(MakeItemEntity, ITEM_COIN, 42, 105, -74, 26, 0) + EVT_CALL(MakeItemEntity, ITEM_COIN, 42, 105, -74, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_SMALL, 0) EVT_CALL(N(Add1Coin)) EVT_WAIT(10) EVT_END_LOOP EVT_CASE_EQ(2) EVT_LOOP(10) - EVT_CALL(MakeItemEntity, ITEM_COIN, -7, 105, -74, 26, 0) + EVT_CALL(MakeItemEntity, ITEM_COIN, -7, 105, -74, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_SMALL, 0) EVT_CALL(N(Add1Coin)) EVT_WAIT(1) - EVT_CALL(MakeItemEntity, ITEM_COIN, 17, 105, -74, 26, 0) + EVT_CALL(MakeItemEntity, ITEM_COIN, 17, 105, -74, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_SMALL, 0) EVT_CALL(N(Add1Coin)) EVT_WAIT(1) - EVT_CALL(MakeItemEntity, ITEM_COIN, 42, 105, -74, 26, 0) + EVT_CALL(MakeItemEntity, ITEM_COIN, 42, 105, -74, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_SMALL, 0) EVT_CALL(N(Add1Coin)) EVT_WAIT(10) EVT_END_LOOP diff --git a/src/battle/common/actor/spike_top.inc.c b/src/battle/common/actor/spike_top.inc.c index 09485693ba..1de2587cb6 100644 --- a/src/battle/common/actor/spike_top.inc.c +++ b/src/battle/common/actor/spike_top.inc.c @@ -71,7 +71,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 4, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 60, .airLiftChance = 70, @@ -135,7 +135,7 @@ EvtScript N(init) = { EVT_CALL(N(UnkBattleFunc1), -10, 0, 10, 0) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(spikeTop_TakeTurn_Ceiling))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(spikeTop_HandleEvent_Ceiling))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, FALSE) EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) @@ -143,8 +143,8 @@ EvtScript N(init) = { 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))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_END_IF EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -169,17 +169,17 @@ EvtScript N(spikeTop_FallDown) = { 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))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikeTop_Anim15) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 24) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) @@ -287,7 +287,7 @@ EvtScript N(spikeTop_HandleEvent_Ceiling) = { EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CASE_EQ(EVENT_SCARE_AWAY) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_SpikeTop_Anim09) EVT_SET_CONST(LVar2, ANIM_SpikeTop_Anim14) @@ -375,8 +375,8 @@ EvtScript N(spikeTop_HandleEvent_Floor) = { 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))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikeTop_Anim13) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD @@ -455,7 +455,7 @@ EvtScript N(spikeTop_HandleEvent_Floor) = { EVT_ELSE EVT_ADD(LVar1, 24) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) @@ -556,8 +556,8 @@ EvtScript N(spikeTop_TakeTurn_Ceiling) = { 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))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) EVT_CALL(SetGoalToIndex, ACTOR_SELF, LVar0) @@ -585,7 +585,7 @@ EvtScript N(spikeTop_TakeTurn_Ceiling) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikeTop_Anim01) EVT_WAIT(8) EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_SELF, 2, SOUND_301, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_F) @@ -630,7 +630,7 @@ EvtScript N(spikeTop_TakeTurn_Ceiling) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikeTop_Anim08) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikeTop_Anim03) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) @@ -695,12 +695,12 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { EVT_SUB(LVar0, 1) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 9, LVar0) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_ELSE - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_SET_CONST(LVar0, 1) @@ -714,8 +714,8 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { 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))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 0) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, FALSE) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -730,16 +730,16 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikeTop_Anim0F) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(10) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikeTop_Anim0A) EVT_WAIT(20) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -770,7 +770,7 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { EVT_WAIT(15) EVT_CALL(YieldTurn) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 200) diff --git a/src/battle/common/actor/spiked_goomba.inc.c b/src/battle/common/actor/spiked_goomba.inc.c index 00edea7ad9..eccfdc4ef7 100644 --- a/src/battle/common/actor/spiked_goomba.inc.c +++ b/src/battle/common/actor/spiked_goomba.inc.c @@ -59,7 +59,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 2, .partCount = ARRAY_COUNT(N(partsTable_8021E468)), .partsData = N(partsTable_8021E468), - .takeTurnScript = &N(init_8021E54C), + .initScript = &N(init_8021E54C), .statusTable = N(statusTable_8021E3BC), .escapeChance = 90, .airLiftChance = 95, @@ -284,7 +284,7 @@ EvtScript N(handleEvent_8021E874) = { EVT_ELSE EVT_ADD(LVar1, 26) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_CASE_DEFAULT EVT_END_SWITCH @@ -385,7 +385,7 @@ EvtScript N(takeTurn_8021F1BC) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(2.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) diff --git a/src/battle/common/actor/spiny.inc.c b/src/battle/common/actor/spiny.inc.c index febd537f7f..babff68496 100644 --- a/src/battle/common/actor/spiny.inc.c +++ b/src/battle/common/actor/spiny.inc.c @@ -110,7 +110,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 5, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 60, .airLiftChance = 75, @@ -143,14 +143,14 @@ EvtScript N(idle) = { EvtScript N(returnHome) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Lakitu_Anim0C) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Spiny_Anim1A) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Spiny_Anim01) @@ -244,8 +244,8 @@ EvtScript N(handleEvent) = { EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_200000, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_200000, FALSE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, TRUE) EVT_USE_BUF(N(bounceArray)) EVT_LOOP(19) EVT_BUF_READ1(LVar0) @@ -287,7 +287,7 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_ADD(LVar1, 22) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 20, 0) EVT_WAIT(20) EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) @@ -369,12 +369,12 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_GT(LVar0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Spiny_Anim14) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_ELSE EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Spiny_Anim14) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(20) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_SET_CONST(LVar0, 1) @@ -384,8 +384,8 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) - EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_200000, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 0) + EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_200000, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, FALSE) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -407,20 +407,20 @@ EvtScript N(takeTurn) = { EVT_END_IF EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(10) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_WAIT(5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Lakitu_Anim0C) EVT_WAIT(10) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, 2, SOUND_2C7) - EVT_CALL(SetActorSounds, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetPartSounds, ACTOR_SELF, 2, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetPartSounds, ACTOR_SELF, 2, ACTOR_SOUND_WALK, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 4, BS_FLAGS1_10) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -450,7 +450,7 @@ EvtScript N(takeTurn) = { EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) diff --git a/src/battle/common/actor/swooper.inc.c b/src/battle/common/actor/swooper.inc.c index 15a7fe9238..5fd72cae39 100644 --- a/src/battle/common/actor/swooper.inc.c +++ b/src/battle/common/actor/swooper.inc.c @@ -61,7 +61,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 4, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 50, .airLiftChance = 100, @@ -127,8 +127,8 @@ EvtScript N(returnHome) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, -24, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 1) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, TRUE) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim0C) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -139,7 +139,7 @@ EvtScript N(returnHome) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim02) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_END_SWITCH EVT_RETURN EVT_END @@ -211,7 +211,7 @@ EvtScript N(hadleEvent_flying) = { EVT_SET_CONST(LVar1, ANIM_Swooper_Anim02) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim02) EVT_SET_CONST(LVar2, ANIM_Swooper_Anim15) @@ -239,7 +239,7 @@ EvtScript N(knockDown) = { EVT_IF_LE(LVar0, 0) EVT_RETURN EVT_END_IF - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim02) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -270,7 +270,7 @@ EvtScript N(knockDown) = { 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))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_RETURN @@ -391,7 +391,7 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flying))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim02) EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0) @@ -401,8 +401,8 @@ EvtScript N(handleEvent) = { EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CASE_EQ(EVENT_SCARE_AWAY) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -24, 0) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Anim02) @@ -436,7 +436,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) EVT_END_IF EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -456,7 +456,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim06) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(10.0)) EVT_WAIT(15) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) @@ -466,7 +466,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(YieldTurn) 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -492,7 +492,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim06) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -500,7 +500,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim02) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(10) EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(returnHome)) @@ -523,7 +523,7 @@ EvtScript N(takeTurn) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim02) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 24) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -541,7 +541,7 @@ EvtScript N(takeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim06) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -40, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -40, EASING_LINEAR) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(10.0)) EVT_WAIT(15) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) @@ -551,7 +551,7 @@ EvtScript N(takeTurn) = { EVT_CALL(YieldTurn) 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -574,7 +574,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim06) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -40, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -40, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -582,7 +582,7 @@ EvtScript N(takeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim02) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(10) EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(returnHome)) diff --git a/src/battle/common/actor/swoopula.inc.c b/src/battle/common/actor/swoopula.inc.c index b83209bcd4..f2f601b126 100644 --- a/src/battle/common/actor/swoopula.inc.c +++ b/src/battle/common/actor/swoopula.inc.c @@ -64,7 +64,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 8, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 30, .airLiftChance = 95, @@ -128,8 +128,8 @@ EvtScript N(returnHome) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, -24, 0) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 1) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, TRUE) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim0C) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -140,7 +140,7 @@ EvtScript N(returnHome) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim02) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_END_SWITCH EVT_RETURN EVT_END @@ -212,7 +212,7 @@ EvtScript N(hadleEvent_flying) = { EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim02) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim02) EVT_SET_CONST(LVar2, ANIM_Swooper_Gray_Anim15) @@ -242,7 +242,7 @@ EvtScript N(knockDown) = { EVT_IF_LE(LVar0, 0) EVT_RETURN EVT_END_IF - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim02) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -273,7 +273,7 @@ EvtScript N(knockDown) = { 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))) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_RETURN @@ -394,7 +394,7 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flying))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim02) EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0) @@ -404,8 +404,8 @@ EvtScript N(handleEvent) = { EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CASE_EQ(EVENT_SCARE_AWAY) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -24, 0) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Swooper_Gray_Anim02) @@ -441,7 +441,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) EVT_END_IF EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 2, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -461,7 +461,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim06) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(10.0)) EVT_WAIT(15) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) @@ -471,7 +471,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(YieldTurn) 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -498,7 +498,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -4, -8, -15) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim06) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_RETURN @@ -549,13 +549,13 @@ EvtScript N(takeTurn_flying) = { EVT_WAIT(30) EVT_END_LOOP EVT_ELSE - EVT_CALL(ShowMessageBox, 49, 32767) - EVT_CALL(ShowActionHud, 1) + EVT_CALL(ShowMessageBox, BTL_MSG_31, 0x00007FFF) + EVT_CALL(ShowActionHud, TRUE) EVT_CALL(LoadActionCommand, ACTION_COMMAND_STOP_LEECH) EVT_CALL(action_command_stop_leech_init) EVT_CALL(SetupMashMeter, 1, 30, 0, 0, 0, 0) EVT_WAIT(10) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(action_command_stop_leech_start, 0, 32767, 3) EVT_SET(LVarD, 0) EVT_LOOP(5) @@ -835,7 +835,7 @@ EvtScript N(takeTurn_flying) = { EVT_END_THREAD EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_ADD(LVar0, LVar3) EVT_CALL(SetEnemyHP, ACTOR_SELF, LVar0) @@ -872,7 +872,7 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim02) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(10) EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(returnHome)) @@ -895,7 +895,7 @@ EvtScript N(takeTurn) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim02) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HP_OFFSET_BELOW, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 24) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -913,7 +913,7 @@ EvtScript N(takeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim06) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -40, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -40, EASING_LINEAR) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(10.0)) EVT_WAIT(15) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) @@ -923,7 +923,7 @@ EvtScript N(takeTurn) = { EVT_CALL(YieldTurn) 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_EXEC_WAIT(N(returnHome)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -947,7 +947,7 @@ EvtScript N(takeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -4, -8, -15) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim06) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -40, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -40, EASING_LINEAR) EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_RETURN @@ -999,13 +999,13 @@ EvtScript N(takeTurn) = { EVT_WAIT(30) EVT_END_LOOP EVT_ELSE - EVT_CALL(ShowMessageBox, 49, 32767) - EVT_CALL(ShowActionHud, 1) + EVT_CALL(ShowMessageBox, BTL_MSG_31, 0x00007FFF) + EVT_CALL(ShowActionHud, TRUE) EVT_CALL(LoadActionCommand, ACTION_COMMAND_STOP_LEECH) EVT_CALL(action_command_stop_leech_init) EVT_CALL(SetupMashMeter, 1, 30, 0, 0, 0, 0) EVT_WAIT(10) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(action_command_stop_leech_start, 0, 32767, 3) EVT_SET(LVarD, 0) EVT_LOOP(5) @@ -1140,7 +1140,7 @@ EvtScript N(takeTurn) = { EVT_END_THREAD EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RECOVER, 0, LVar0, LVar1, LVar2, LVar3, 0) EVT_CALL(GetActorHP, ACTOR_SELF, LVar0) EVT_ADD(LVar0, LVar3) EVT_CALL(SetEnemyHP, ACTOR_SELF, LVar0) @@ -1177,7 +1177,7 @@ EvtScript N(takeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim02) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(10) EVT_CALL(YieldTurn) EVT_EXEC_WAIT(N(returnHome)) diff --git a/src/battle/common/actor/whacka.inc.c b/src/battle/common/actor/whacka.inc.c index de37ad48c5..75b78494f2 100644 --- a/src/battle/common/actor/whacka.inc.c +++ b/src/battle/common/actor/whacka.inc.c @@ -75,7 +75,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -107,8 +107,8 @@ EvtScript N(init) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(N(IsHitEightTimes)) EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_DISABLED | ACTOR_FLAG_NO_ATTACK | ACTOR_FLAG_NO_DMG_APPLY, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_DISABLED | ACTOR_FLAG_NO_ATTACK | ACTOR_FLAG_NO_DMG_APPLY, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_END_IF EVT_RETURN EVT_END @@ -292,7 +292,7 @@ EvtScript N(spawnWhackasBump) = { EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 20) EVT_ADD(LVar2, 10) - EVT_CALL(MakeItemEntity, ITEM_WHACKAS_BUMP, LVar0, LVar1, LVar2, 12, 0) + EVT_CALL(MakeItemEntity, ITEM_WHACKAS_BUMP, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_FALL_SPAWN_ALWAYS, 0) EVT_END_THREAD EVT_RETURN EVT_END @@ -306,10 +306,10 @@ EvtScript N(die) = { EVT_WAIT(40) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_NE(LVar0, 0) - EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_DROP_WHACKA_BUMP, 1) + EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_DROP_WHACKA_BUMP, TRUE) EVT_END_IF - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_DISABLED | ACTOR_FLAG_NO_ATTACK | ACTOR_FLAG_NO_DMG_APPLY, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_DISABLED | ACTOR_FLAG_NO_ATTACK | ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_CALL(RemoveActor, ACTOR_SELF) EVT_RETURN EVT_END diff --git a/src/battle/common/actor/white_clubba.inc.c b/src/battle/common/actor/white_clubba.inc.c index 364450cf88..51c764f39e 100644 --- a/src/battle/common/actor/white_clubba.inc.c +++ b/src/battle/common/actor/white_clubba.inc.c @@ -75,7 +75,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 12, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 50, .airLiftChance = 50, @@ -246,7 +246,7 @@ EvtScript N(takeTurn) = { 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, 1, 0, ACTOR_DECORATION_SWEAT) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_BattleClubba_Frost_Anim02) EVT_EXEC_WAIT(DoReturnHome) @@ -282,7 +282,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD EVT_GOTO(100) EVT_LABEL(50) // swift club attack @@ -295,7 +295,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD EVT_CALL(GetActorHP, ACTOR_PLAYER, LVar0) EVT_IF_EQ(LVar0, 0) @@ -310,7 +310,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_40) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD EVT_CALL(GetActorHP, ACTOR_PLAYER, LVar0) EVT_IF_EQ(LVar0, 0) @@ -325,7 +325,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD EVT_LABEL(100) EVT_SWITCH(LVar0) diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c index ed26889c6b..9f779f513b 100644 --- a/src/battle/common/actor/white_magikoopa.inc.c +++ b/src/battle/common/actor/white_magikoopa.inc.c @@ -133,7 +133,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 11, .partCount = ARRAY_COUNT(N(partsTable_80223C90)), .partsData = N(partsTable_80223C90), - .takeTurnScript = &N(init_80225F58), + .initScript = &N(init_80225F58), .statusTable = N(statusTable_80223B38), .escapeChance = 40, .airLiftChance = 80, @@ -156,7 +156,7 @@ ActorBlueprint N(flying) = { .maxHP = 11, .partCount = ARRAY_COUNT(N(partsTable_80223CB4)), .partsData = N(partsTable_80223CB4), - .takeTurnScript = &N(init_80225FBC), + .initScript = &N(init_80225FBC), .statusTable = N(statusTable_80223BE4), .escapeChance = 40, .airLiftChance = 95, @@ -356,12 +356,12 @@ EvtScript N(knockOff) = { EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) EVT_END_IF - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) @@ -373,7 +373,7 @@ EvtScript N(knockOff) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 150, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.7)) EVT_END_THREAD EVT_CALL(GetLastEvent, ACTOR_SELF, LVar3) EVT_IF_EQ(LVar3, EVENT_15) @@ -381,26 +381,26 @@ EvtScript N(knockOff) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar4, 10) EVT_ADD(LVar5, 5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0) EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_White_Anim01) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80223E24))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_WHITE_MAGIKOOPA) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_80223B38))) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 32) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) @@ -485,7 +485,7 @@ EvtScript N(handleEvent_80224A44) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_White_Anim01) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_White_Anim01) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CASE_EQ(EVENT_RECOVER_STATUS) @@ -549,7 +549,7 @@ EvtScript N(wMagikoopa_ShapeSpell) = { EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_White_Anim02) EVT_WAIT(30) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) @@ -580,7 +580,7 @@ EvtScript N(wMagikoopa_ShapeSpell) = { EVT_END_IF EVT_WAIT(14) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 2, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -648,7 +648,7 @@ EvtScript N(wMagikoopa_WandStrike) = { EVT_END_IF EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -678,7 +678,7 @@ EvtScript N(wMagikoopa_WandStrike) = { EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_White_Anim01) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -708,7 +708,7 @@ EvtScript N(wMagikoopa_WandStrike) = { EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_White_Anim01) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -779,7 +779,7 @@ EvtScript N(init_80225FBC) = { EvtScript N(healOne) = { EVT_SET(LVar8, 0) EVT_SET(LVar9, 9999) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -811,7 +811,7 @@ EvtScript N(healOne) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -820,7 +820,7 @@ EvtScript N(healOne) = { EVT_END_IF EVT_SET(LVar8, 0) EVT_SET(LVar9, 9999) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(1) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -862,14 +862,14 @@ EvtScript N(healOne) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(1) EVT_END_IF EVT_IF_NE(LVar8, ACTOR_PLAYER) EVT_GOTO(100) EVT_END_IF - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(2) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -892,7 +892,7 @@ EvtScript N(healOne) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(2) EVT_END_IF @@ -902,7 +902,7 @@ EvtScript N(healOne) = { EVT_SET(LVar8, -127) EVT_GOTO(100) EVT_END_IF - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(3) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -916,7 +916,7 @@ EvtScript N(healOne) = { EVT_END_IF EVT_RETURN EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(3) EVT_END_IF @@ -956,12 +956,12 @@ EvtScript N(healOne) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -970,12 +970,12 @@ EvtScript N(healOne) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) @@ -988,14 +988,14 @@ EvtScript N(healOne) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, LVar8, 0x206D) - EVT_CALL(PlaySoundAtActor, LVar8, 0x214) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_206D) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_214) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, LVar8, SOUND_25C) EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, LVar8, 5, 0) + EVT_CALL(HealActor, LVar8, 5, FALSE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_CALL(WaitForBuffDone) @@ -1042,12 +1042,12 @@ EvtScript N(healAll) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1056,12 +1056,12 @@ EvtScript N(healAll) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 7, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) @@ -1072,7 +1072,7 @@ EvtScript N(healAll) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_White_Anim01) EVT_END_IF EVT_WAIT(5) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_SET(LocalFlag(0), 0) @@ -1087,18 +1087,18 @@ EvtScript N(healAll) = { EVT_IF_EQ(LocalFlag(0), 0) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, LVar0, 0x206D) - EVT_CALL(PlaySoundAtActor, LVar0, 0x214) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_206D) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_214) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_25C) EVT_END_THREAD EVT_THREAD EVT_CALL(func_8026BF48, 1) - EVT_CALL(HealActor, LVar0, 3, 1) + EVT_CALL(HealActor, LVar0, 3, TRUE) EVT_CALL(func_8026BF48, 0) EVT_END_THREAD EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -1114,14 +1114,14 @@ EvtScript N(healAll) = { }; EvtScript N(takeTurn_802274E4) = { - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(run_away)) EVT_RETURN EVT_END_IF EVT_SET(LVarA, 0) EVT_SET(LVarB, 0) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_SET(LocalFlag(0), 0) @@ -1141,7 +1141,7 @@ EvtScript N(takeTurn_802274E4) = { EVT_END_IF EVT_ADD(LVarB, 1) EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/common/actor/yellow_magikoopa.inc.c b/src/battle/common/actor/yellow_magikoopa.inc.c index a4ef69dcb5..3edefb85d8 100644 --- a/src/battle/common/actor/yellow_magikoopa.inc.c +++ b/src/battle/common/actor/yellow_magikoopa.inc.c @@ -135,7 +135,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 11, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 40, .airLiftChance = 80, @@ -158,7 +158,7 @@ ActorBlueprint N(flying) = { .maxHP = 11, .partCount = ARRAY_COUNT(N(parts_flying)), .partsData = N(parts_flying), - .takeTurnScript = &N(init_flying), + .initScript = &N(init_flying), .statusTable = N(statusTable_flying), .escapeChance = 40, .airLiftChance = 95, @@ -350,12 +350,12 @@ EvtScript N(knockOff) = { EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) EVT_END_IF - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, 0) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, 1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_MULTI_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar2, 1) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) @@ -367,7 +367,7 @@ EvtScript N(knockOff) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(N(StartRumbleWithParams), 150, 10) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.7)) EVT_END_THREAD EVT_CALL(GetLastEvent, ACTOR_SELF, LVar3) EVT_IF_EQ(LVar3, EVENT_15) @@ -375,26 +375,26 @@ EvtScript N(knockOff) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar4, 10) EVT_ADD(LVar5, 5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 10, 0) EVT_END_IF EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_LOOP(20) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Yellow_Anim01) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_YELLOW_MAGIKOOPA) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 32) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_1000, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0) EVT_MOD(LVar0, 4) @@ -479,7 +479,7 @@ EvtScript N(handleEvent_flying) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Yellow_Anim01) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) - EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 0) + EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Yellow_Anim01) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CASE_EQ(EVENT_RECOVER_STATUS) @@ -543,7 +543,7 @@ EvtScript N(attackMagicBlast) = { EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_END_IF - EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Yellow_Anim02) EVT_WAIT(30) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) @@ -574,7 +574,7 @@ EvtScript N(attackMagicBlast) = { EVT_END_IF EVT_WAIT(14) EVT_CALL(YieldTurn) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, 2) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 2, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 2, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -642,7 +642,7 @@ EvtScript N(attackWandStrike) = { EVT_END_IF EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -672,7 +672,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Yellow_Anim01) - EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -702,7 +702,7 @@ EvtScript N(attackWandStrike) = { EVT_CALL(YieldTurn) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Magikoopa_Yellow_Anim01) - EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -781,7 +781,7 @@ EvtScript N(init_flying) = { EvtScript N(takeTurn) = { EVT_SET(LocalFlag(0), 0) EVT_LABEL(10) - EVT_CALL(EnemyCreateTargetList, 32770) + EVT_CALL(EnemyCreateTargetList, 0x00008002) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -798,7 +798,7 @@ EvtScript N(takeTurn) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF @@ -807,7 +807,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetBattleVar, 2, -1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(CountPlayerTargets, ACTOR_SELF, 32770, LVar0) + EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0) EVT_IF_EQ(LVar0, 1) EVT_EXEC_WAIT(N(flee)) EVT_RETURN @@ -843,12 +843,12 @@ EvtScript N(takeTurn) = { EVT_SUB(LVar0, 6) EVT_ADD(LVar1, 12) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 16) EVT_ADD(LVar1, 31) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_ELSE EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -857,12 +857,12 @@ EvtScript N(takeTurn) = { EVT_SUB(LVar0, 12) EVT_ADD(LVar1, 14) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.12), 30, 0) EVT_ELSE EVT_SUB(LVar0, 30) EVT_ADD(LVar1, 36) EVT_SUB(LVar2, 2) - EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.3), 30, 0) EVT_END_IF EVT_END_IF EVT_WAIT(30) diff --git a/src/battle/common/move/ItemRefund.inc.c b/src/battle/common/move/ItemRefund.inc.c index 9aa2727aec..720eeec31d 100644 --- a/src/battle/common/move/ItemRefund.inc.c +++ b/src/battle/common/move/ItemRefund.inc.c @@ -27,7 +27,7 @@ API_CALLABLE(N(GiveRefund)) { posX = player->currentPos.x; posZ = player->currentPos.z; - make_item_entity(ITEM_COIN, posX, posY, posZ, 0x17, 1 + 3 * i, facingAngleSign, 0); + make_item_entity(ITEM_COIN, posX, posY, posZ, ITEM_SPAWN_MODE_TOSS_FADE1, 1 + 3 * i, facingAngleSign, 0); add_coins(1); facingAngleSign += 30.0f; diff --git a/src/battle/common/move/JumpSupport.inc.c b/src/battle/common/move/JumpSupport.inc.c index 34ece3ef6c..810335bf7b 100644 --- a/src/battle/common/move/JumpSupport.inc.c +++ b/src/battle/common/move/JumpSupport.inc.c @@ -102,7 +102,7 @@ EvtScript N(EVS_JumpSupport_D) = { EvtScript N(EVS_JumpSupport_E) = { EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(func_802693F0) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) @@ -131,7 +131,7 @@ EvtScript N(EVS_JumpSupport_E) = { EvtScript N(EVS_JumpSupport_F) = { EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(func_802693F0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -160,7 +160,7 @@ EvtScript N(EVS_JumpSupport_F) = { EvtScript N(EVS_JumpSupport_G) = { EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_29) EVT_CALL(func_802693F0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -189,7 +189,7 @@ EvtScript N(EVS_JumpSupport_G) = { EvtScript N(EVS_JumpSupport_H) = { EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(func_802693F0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -218,7 +218,7 @@ EvtScript N(EVS_JumpSupport_H) = { EvtScript N(EVS_JumpSupport_I) = { EVT_CALL(func_80276EFC) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, FALSE) EVT_CALL(EnablePlayerBlur, -1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(func_802693F0) @@ -232,18 +232,18 @@ EvtScript N(EVS_JumpSupport_I) = { 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_CALL(ShakeCam, CAM_BATTLE, 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_CALL(ShakeCam, CAM_BATTLE, 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_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(1.0)) EVT_END_CHILD_THREAD EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(func_80273444, 4, 0, 2) @@ -258,14 +258,14 @@ EvtScript N(EVS_JumpSupport_J) = { 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_CALL(ShakeCam, CAM_BATTLE, 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(SetBattleFlagBits, BS_FLAGS1_100, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(func_802693F0) EVT_CALL(EnablePlayerBlur, -1) diff --git a/src/battle/common/move/StarBeamSupport.inc.c b/src/battle/common/move/StarBeamSupport.inc.c index 78284f320c..81536922d3 100644 --- a/src/battle/common/move/StarBeamSupport.inc.c +++ b/src/battle/common/move/StarBeamSupport.inc.c @@ -118,34 +118,34 @@ EvtScript N(beforeUsePower) = { EvtScript N(802A2C20) = { EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) EVT_CALL(PlaySound, SOUND_2041) - EVT_CALL(CreateNpc, 100, LVar0) + EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) - EVT_CALL(SetNpcPos, 100, -75, 150, 0) - EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(SetNpcFlagBits, NPC_BTL_SPIRIT, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) + EVT_CALL(SetNpcPos, NPC_BTL_SPIRIT, -75, 150, 0) + EVT_CALL(SetNpcDecoration, NPC_BTL_SPIRIT, 0, NPC_DECORATION_WHITE_GLOW_BEHIND) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_SET(LVar0, 0) EVT_LOOP(8) EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_THREAD EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 30, 0, 10) - EVT_CALL(SetForegroundModelsVisible, 1) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetForegroundModelsVisible, TRUE) EVT_RETURN EVT_END }; @@ -158,64 +158,64 @@ EvtScript N(802A2E2C) = { EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_END_IF EVT_RETURN EVT_END @@ -246,16 +246,16 @@ EvtScript N(afterUsePower) = { EvtScript N(802A33A8) = { EVT_THREAD - EVT_CALL(PlayEffect, EFFECT_SHIMMER_BURST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 100, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 100, 0) EVT_WAIT(5) - EVT_CALL(PlayEffect, EFFECT_SHIMMER_BURST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 100, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 100, 0) EVT_IF_EQ(LVarA, 1) EVT_WAIT(5) - EVT_CALL(PlayEffect, EFFECT_SHIMMER_BURST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 100, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 100, 0) EVT_END_IF EVT_END_THREAD EVT_WAIT(20) - EVT_CALL(PlayEffect, EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) EVT_RETURN EVT_END }; diff --git a/src/battle/common/move/UseItem.inc.c b/src/battle/common/move/UseItem.inc.c index 62b1c5c9a2..e730a37207 100644 --- a/src/battle/common/move/UseItem.inc.c +++ b/src/battle/common/move/UseItem.inc.c @@ -16,8 +16,8 @@ EvtScript N(UseItemWithEffect) = { EVT_SET(LVar3, LVar1) EVT_ADD(LVar3, 10) EVT_ADD(LVar3, 2) - EVT_CALL(PlayEffect, 0x33, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(MakeItemEntity, LVarA, LVar0, LVar1, LVar2, 1, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 30, 0) + EVT_CALL(MakeItemEntity, LVarA, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVarA, LVar0) EVT_CALL(N(GiveRefund)) EVT_WAIT(LVar0) @@ -33,8 +33,8 @@ EvtScript N(UseItemWithEffect) = { EVT_SET(LVar3, LVar1) EVT_ADD(LVar3, 10) EVT_ADD(LVar3, 2) - EVT_CALL(PlayEffect, 0x33, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(MakeItemEntity, LVarA, LVar0, LVar1, LVar2, 1, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 1, LVar0, LVar3, LVar2, EVT_FLOAT(1.0), 30, 0) + EVT_CALL(MakeItemEntity, LVarA, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVarA, LVar0) EVT_WAIT(15) EVT_CALL(RemoveItemEntity, LVarA) @@ -53,7 +53,7 @@ EvtScript N(UseItem) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 45) - EVT_CALL(MakeItemEntity, LVarA, LVar0, LVar1, LVar2, 1, 0) + EVT_CALL(MakeItemEntity, LVarA, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVarE, LVar0) EVT_CALL(N(GiveRefund)) EVT_WAIT(LVar0) diff --git a/src/common/UnkModelStuff2.inc.c b/src/battle/common/stage/WaterEffects.inc.c similarity index 64% rename from src/common/UnkModelStuff2.inc.c rename to src/battle/common/stage/WaterEffects.inc.c index 2f59d9a314..69f865c526 100644 --- a/src/common/UnkModelStuff2.inc.c +++ b/src/battle/common/stage/WaterEffects.inc.c @@ -1,6 +1,13 @@ #include "common.h" -API_CALLABLE(N(UnkFloatFunc005)) { +enum { + FISH_STATE_INIT = 0, + FISH_STATE_1 = 1, + FISH_STATE_2 = 2, + FISH_STATE_3 = 3, +}; + +API_CALLABLE(N(UpdateAnimatedFish)) { Bytecode* args = script->ptrReadPos; #ifdef AVOID_UB f32 vt0 = 0.0f; @@ -21,12 +28,12 @@ API_CALLABLE(N(UnkFloatFunc005)) { f64 temp_f20_2; f64 temp_f20_3; f64 temp_f20_4; - s32 temp_s1; + s32 state; - script->functionTemp[0] = temp_s1 = evt_get_variable(script, *args++); + script->functionTemp[0] = state = evt_get_variable(script, *args++); - switch (temp_s1) { - case 0: + switch (state) { + case FISH_STATE_INIT: vt0 = 142.0f; vt1 = 0.0f; vt2 = -118.0f; @@ -38,9 +45,9 @@ API_CALLABLE(N(UnkFloatFunc005)) { script->varTable[8] = 3; script->varTable[9] = 0; script->varTable[11] = 0; - script->functionTemp[0] = 1; + script->functionTemp[0] = FISH_STATE_1; break; - case 3: + case FISH_STATE_3: vt0 = 91.0f; vt1 = 0.0f; vt2 = -118.0f; @@ -52,9 +59,9 @@ API_CALLABLE(N(UnkFloatFunc005)) { script->varTable[8] = 3; script->varTable[9] = 0; script->varTable[11] = 0; - script->functionTemp[0] = 1; + script->functionTemp[0] = FISH_STATE_1; break; - case 1: + case FISH_STATE_1: script->varTable[9] += script->varTable[8]; if (script->varTable[9] > 45) { script->varTable[9] = 45; @@ -73,7 +80,7 @@ API_CALLABLE(N(UnkFloatFunc005)) { script->varTable[11] = 1; } break; - case 2: + case FISH_STATE_2: script->varTable[9] += script->varTable[8]; if (script->varTable[9] > 90) { script->varTable[9] = 90; @@ -99,101 +106,101 @@ API_CALLABLE(N(UnkFloatFunc005)) { return ApiStatus_DONE2; } -EvtScript N(script1) = { +EvtScript N(EVS_AnimateFishModel) = { EVT_SET(LVarA, LVar0) EVT_LABEL(0) - EVT_CALL(N(UnkFloatFunc005), 0) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) - EVT_WAIT(1) - EVT_LOOP(0) - EVT_CALL(N(UnkFloatFunc005), 1) + EVT_CALL(N(UpdateAnimatedFish), FISH_STATE_INIT) EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) EVT_WAIT(1) - EVT_IF_EQ(LVarB, 1) - EVT_BREAK_LOOP + EVT_LOOP(0) + EVT_CALL(N(UpdateAnimatedFish), FISH_STATE_1) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVarB, 1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(RotateModel, LVarA, -7, 0, 0, 1) + EVT_WAIT(5) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(RotateModel, LVarA, -27, 0, 0, 1) + EVT_WAIT(2) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(RotateModel, LVarA, -5, 0, 0, 1) + EVT_WAIT(3) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) + EVT_WAIT(5) + EVT_LOOP(0) + EVT_CALL(N(UpdateAnimatedFish), FISH_STATE_2) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVarB, 2) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(RandInt, 80, LVarB) + EVT_ADD(LVarB, 30) + EVT_LOOP(LVarB) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(RandInt, 5, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_GOTO(0) EVT_END_IF - EVT_END_LOOP - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(RotateModel, LVarA, -7, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(RotateModel, LVarA, -27, 0, 0, 1) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(RotateModel, LVarA, -5, 0, 0, 1) - EVT_WAIT(3) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) - EVT_WAIT(5) - EVT_LOOP(0) - EVT_CALL(N(UnkFloatFunc005), 2) + EVT_CALL(N(UpdateAnimatedFish), FISH_STATE_3) EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) EVT_WAIT(1) - EVT_IF_EQ(LVarB, 2) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_CALL(RandInt, 80, LVarB) - EVT_ADD(LVarB, 30) - EVT_LOOP(LVarB) + EVT_LOOP(0) + EVT_CALL(N(UpdateAnimatedFish), FISH_STATE_1) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVarB, 1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(RotateModel, LVarA, -7, 0, 0, 1) + EVT_WAIT(5) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(RotateModel, LVarA, -27, 0, 0, 1) + EVT_WAIT(2) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(RotateModel, LVarA, -5, 0, 0, 1) + EVT_WAIT(3) EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(RandInt, 5, LVar0) - EVT_IF_NE(LVar0, 0) + EVT_WAIT(5) + EVT_LOOP(0) + EVT_CALL(N(UpdateAnimatedFish), FISH_STATE_2) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVarB, 2) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(RandInt, 80, LVarB) + EVT_ADD(LVarB, 30) + EVT_LOOP(LVarB) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) + EVT_WAIT(1) + EVT_END_LOOP EVT_GOTO(0) - EVT_END_IF - EVT_CALL(N(UnkFloatFunc005), 3) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) - EVT_WAIT(1) - EVT_LOOP(0) - EVT_CALL(N(UnkFloatFunc005), 1) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) - EVT_WAIT(1) - EVT_IF_EQ(LVarB, 1) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(RotateModel, LVarA, -7, 0, 0, 1) - EVT_WAIT(5) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(RotateModel, LVarA, -27, 0, 0, 1) - EVT_WAIT(2) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(RotateModel, LVarA, -5, 0, 0, 1) - EVT_WAIT(3) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) - EVT_WAIT(5) - EVT_LOOP(0) - EVT_CALL(N(UnkFloatFunc005), 2) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) - EVT_WAIT(1) - EVT_IF_EQ(LVarB, 2) - EVT_BREAK_LOOP - EVT_END_IF - EVT_END_LOOP - EVT_CALL(RandInt, 80, LVarB) - EVT_ADD(LVarB, 30) - EVT_LOOP(LVarB) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(RotateModel, LVarA, -20, 0, 0, 1) - EVT_WAIT(1) - EVT_END_LOOP - EVT_GOTO(0) EVT_RETURN EVT_END }; -EvtScript N(script2) = { +EvtScript N(EVS_AnimateWaveModel) = { EVT_SET(LVarA, LVar0) EVT_LOOP(0) EVT_CALL(TranslateModel, LVarA, 1, 0, 0) @@ -256,47 +263,47 @@ EvtScript N(script3) = { EVT_SET(LVar5, 5) EVT_USE_BUF(EVT_PTR(N(intTable_8021CD64))) EVT_LABEL(0) - EVT_BUF_READ1(LVar1) - EVT_IF_EQ(LVar1, 255) - EVT_USE_BUF(EVT_PTR(N(intTable_8021CD64))) EVT_BUF_READ1(LVar1) - EVT_END_IF - EVT_SET(LVar0, LVar5) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, 0) - EVT_WAIT(1) - EVT_ADD(LVar5, 1) - EVT_SET(LVarC, LVarB) - EVT_SUB(LVarC, 20) - EVT_IF_GT(LVar5, LVarC) - EVT_GOTO(1) - EVT_END_IF - EVT_SET(LVar0, LVar5) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, 0) - EVT_WAIT(1) - EVT_ADD(LVar5, 1) - EVT_SET(LVarC, LVarB) - EVT_SUB(LVarC, 20) - EVT_IF_GT(LVar5, LVarC) - EVT_GOTO(1) - EVT_END_IF - EVT_GOTO(0) - EVT_LABEL(1) - EVT_SET(LVar2, 0) - EVT_LOOP(20) - EVT_ADD(LVar5, 1) - EVT_SUB(LVar1, 2) + EVT_IF_EQ(LVar1, 255) + EVT_USE_BUF(EVT_PTR(N(intTable_8021CD64))) + EVT_BUF_READ1(LVar1) + EVT_END_IF EVT_SET(LVar0, LVar5) EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, 0) EVT_WAIT(1) - EVT_END_LOOP - EVT_SUB(LVar5, 280) - EVT_SET(LVar1, 0) - EVT_GOTO(0) + EVT_ADD(LVar5, 1) + EVT_SET(LVarC, LVarB) + EVT_SUB(LVarC, 20) + EVT_IF_GT(LVar5, LVarC) + EVT_GOTO(1) + EVT_END_IF + EVT_SET(LVar0, LVar5) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, 0) + EVT_WAIT(1) + EVT_ADD(LVar5, 1) + EVT_SET(LVarC, LVarB) + EVT_SUB(LVarC, 20) + EVT_IF_GT(LVar5, LVarC) + EVT_GOTO(1) + EVT_END_IF + EVT_GOTO(0) + EVT_LABEL(1) + EVT_SET(LVar2, 0) + EVT_LOOP(20) + EVT_ADD(LVar5, 1) + EVT_SUB(LVar1, 2) + EVT_SET(LVar0, LVar5) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_SUB(LVar5, 280) + EVT_SET(LVar1, 0) + EVT_GOTO(0) EVT_RETURN EVT_END }; -EvtScript N(script4) = { +EvtScript N(EVS_AnimateFlotsam) = { EVT_SET(LVarA, LVar0) EVT_LOOP(0) EVT_CALL(TranslateModel, LVarA, 0, 0, 0) diff --git a/src/battle/common/stage/flo_01.inc.c b/src/battle/common/stage/flo_01.inc.c new file mode 100644 index 0000000000..e09805b46a --- /dev/null +++ b/src/battle/common/stage/flo_01.inc.c @@ -0,0 +1,46 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/flo_bt01_shape.h" +#include "effects.h" + +#include "flo_RandomFlowers.inc.c" +#include "common/MakeSun.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, 37, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, 28, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, 22, MODEL_GROUP_HIDDEN) + EVT_EXEC(N(EVS_RandomFlowers_Background)) + EVT_EXEC_WAIT(N(MakeSun)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + -1, + MODEL_o400, + MODEL_o401, + MODEL_o407, + MODEL_o411, + MODEL_o422, + MODEL_o423, + MODEL_o424, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "flo_tex", + .shape = "flo_bt01_shape", + .hit = "flo_bt01_hit", + .bg = "fla_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/flo_01b.inc.c b/src/battle/common/stage/flo_01b.inc.c new file mode 100644 index 0000000000..522606da9c --- /dev/null +++ b/src/battle/common/stage/flo_01b.inc.c @@ -0,0 +1,44 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/flo_bt01_shape.h" +#include "effects.h" + +#include "flo_RandomFlowers.inc.c" +#include "common/MakeSun.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, MODEL_dai_03, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_dai_04, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_dai_05, MODEL_GROUP_HIDDEN) + EVT_EXEC(N(EVS_RandomFlowers_Background)) + EVT_EXEC_WAIT(N(MakeSun)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + -1, + MODEL_kuki, + MODEL_hana1, + MODEL_mae1, + MODEL_mae2, + MODEL_mae3, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "flo_tex", + .shape = "flo_bt01_shape", + .hit = "flo_bt01_hit", + .bg = "fla_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/flo_01c.inc.c b/src/battle/common/stage/flo_01c.inc.c new file mode 100644 index 0000000000..b9b888f8e3 --- /dev/null +++ b/src/battle/common/stage/flo_01c.inc.c @@ -0,0 +1,46 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/flo_bt01_shape.h" +#include "effects.h" + +#include "flo_RandomFlowers.inc.c" +#include "common/MakeSun.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, MODEL_dai_03, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_dai_04, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_dai_05, MODEL_GROUP_VISIBLE) + EVT_EXEC(N(EVS_RandomFlowers_Background)) + EVT_EXEC(N(EVS_RandomFlowers_Foreground)) + EVT_EXEC_WAIT(N(MakeSun)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + -1, + MODEL_o381, + MODEL_o382, + MODEL_o388, + MODEL_o389, + MODEL_o390, + MODEL_o383, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "flo_tex", + .shape = "flo_bt01_shape", + .hit = "flo_bt01_hit", + .bg = "fla_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/flo_02.inc.c b/src/battle/common/stage/flo_02.inc.c new file mode 100644 index 0000000000..5ac2875b1e --- /dev/null +++ b/src/battle/common/stage/flo_02.inc.c @@ -0,0 +1,41 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/flo_bt02_shape.h" +#include "effects.h" + +#include "flo_RandomFlowers.inc.c" +#include "common/MakeSun.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, MODEL_dai_05, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_0809, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_16, MODEL_GROUP_HIDDEN) + EVT_EXEC(N(EVS_RandomFlowers_FarBack)) + EVT_EXEC_WAIT(N(MakeSun)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + -1, + MODEL_o403, + MODEL_o404, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "flo_tex", + .shape = "flo_bt02_shape", + .hit = "flo_bt02_hit", + .bg = "fla_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/flo_02b.inc.c b/src/battle/common/stage/flo_02b.inc.c new file mode 100644 index 0000000000..f86b330c7e --- /dev/null +++ b/src/battle/common/stage/flo_02b.inc.c @@ -0,0 +1,46 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/flo_bt02_shape.h" +#include "effects.h" + +#include "flo_RandomFlowers.inc.c" +#include "common/MakeSun.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, MODEL_dai_05, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_0809, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_16, MODEL_GROUP_HIDDEN) + EVT_EXEC(N(EVS_RandomFlowers_FarBack)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, 0, SURFACE_TYPE_FLOWERS) + EVT_EXEC_WAIT(N(MakeSun)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + -1, + MODEL_8hana4, + MODEL_8hana5, + MODEL_8hana6, + MODEL_8hana1, + MODEL_8hana1, + MODEL_8hana3, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "flo_tex", + .shape = "flo_bt02_shape", + .hit = "flo_bt02_hit", + .bg = "fla_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/flo_02c.inc.c b/src/battle/common/stage/flo_02c.inc.c new file mode 100644 index 0000000000..b84f8eb553 --- /dev/null +++ b/src/battle/common/stage/flo_02c.inc.c @@ -0,0 +1,42 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/flo_bt02_shape.h" +#include "effects.h" + +#include "flo_RandomFlowers.inc.c" +#include "common/MakeSun.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, MODEL_dai_05, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_0809, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g90, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_16, MODEL_GROUP_VISIBLE) + EVT_EXEC(N(EVS_RandomFlowers_FarBack)) + EVT_EXEC_WAIT(N(MakeSun)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + -1, + MODEL_o403, + MODEL_o404, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "flo_tex", + .shape = "flo_bt02_shape", + .hit = "flo_bt02_hit", + .bg = "fla_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/flo_03.inc.c b/src/battle/common/stage/flo_03.inc.c new file mode 100644 index 0000000000..3ed5f43ca3 --- /dev/null +++ b/src/battle/common/stage/flo_03.inc.c @@ -0,0 +1,198 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/flo_bt03_shape.h" + +EvtScript N(EVS_AnimateVines) = { + EVT_SET(LVarA, LVar0) + EVT_USE_BUF(LVarA) + EVT_LOOP(0) + EVT_BUF_READ1(LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_CALL(SetTexPanner, LVar0, TEX_PANNER_E) + EVT_BUF_READ1(LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_CALL(SetTexPanner, LVar0, TEX_PANNER_F) + EVT_END_LOOP + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_LABEL(0) + EVT_LABEL(0) + EVT_ADD(LVar0, -140) + EVT_IF_LT(LVar0, 0) + EVT_ADD(LVar0, 0x10000) + EVT_END_IF + EVT_CALL(SetTexPanOffset, TEX_PANNER_E, TEX_PANNER_MAIN, LVar0, 0) + EVT_ADD(LVar1, -200) + EVT_IF_LT(LVar1, 0) + EVT_ADD(LVar1, 0x10000) + EVT_END_IF + EVT_CALL(SetTexPanOffset, TEX_PANNER_F, TEX_PANNER_MAIN, LVar1, 0) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +#include "common/MakeSun.inc.c" +#include "common/CosInterpMinMax.inc.c" + +EvtScript N(EVS_AnimateSmokePuff) = { + EVT_CALL(EnableModel, LVarF, TRUE) + EVT_SET(LVarE, 159) + EVT_LOOP(LVarE) + EVT_ADDF(LVar3, 0) + EVT_ADDF(LVar4, EVT_FLOAT(0.0)) + EVT_SETF(LVar5, EVT_FLOAT(0.01)) + EVT_ADDF(LVar0, LVar3) + EVT_ADDF(LVar1, LVar4) + EVT_ADDF(LVar2, LVar5) + EVT_MULF(LVar6, EVT_FLOAT(1.01)) + EVT_ADDF(LVar7, EVT_FLOAT(0.01)) + EVT_SETF(LVar8, LVar6) + EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 15, 0, 0) + EVT_ADDF(LVar8, LVarA) + EVT_SETF(LVar9, LVar7) + EVT_CALL(N(CosInterpMinMax), LVarE, LVarA, EVT_FLOAT(0.0), EVT_FLOAT(0.203), 20, 0, 90) + EVT_ADDF(LVar9, LVarA) + EVT_SETF(LVarA, LVar0) + EVT_MULF(LVarA, EVT_FLOAT(10.0)) + EVT_CALL(TranslateModel, LVarF, LVar0, LVar1, LVar2) + EVT_CALL(ScaleModel, LVarF, LVar8, LVar9, 1) + EVT_CALL(RotateModel, LVarF, LVarA, 0, 0, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(EnableModel, LVarF, FALSE) + EVT_RETURN + EVT_END +}; + +s32 N(VineModels)[] = { + MODEL_o419, + MODEL_o420, + MODEL_o422, + STAGE_MODEL_LIST_END +}; + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_SET(LVar0, N(VineModels)) + EVT_EXEC(N(EVS_AnimateVines)) + EVT_CALL(SetTexPanner, MODEL_piko4, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_piko5, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_piko1, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_piko2, TEX_PANNER_4) + EVT_CALL(SetTexPanner, MODEL_piko3, TEX_PANNER_5) + EVT_CALL(SetTexPanner, MODEL_piko6, TEX_PANNER_6) + EVT_CALL(SetTexPanner, MODEL_piko7, TEX_PANNER_7) + EVT_THREAD + EVT_SET(LVarE, 1) + EVT_SET(LVarF, 0) + EVT_LOOP(0) + EVT_ADDF(LVarF, LVarE) + EVT_IF_GE(LVarF, 1080) + EVT_SET(LVarF, 0) + EVT_END_IF + EVT_SET(LVar0, LVarF) + EVT_DIV(LVar0, 9) + EVT_MOD(LVar0, 2) + EVT_MUL(LVar0, 0x4000) + EVT_SET(LVar1, LVarF) + EVT_DIV(LVar1, 4) + EVT_MOD(LVar1, 2) + EVT_MUL(LVar1, 0x4000) + EVT_SET(LVar2, LVarF) + EVT_DIV(LVar2, 5) + EVT_MOD(LVar2, 2) + EVT_MUL(LVar2, 0x4000) + EVT_SET(LVar3, LVarF) + EVT_DIV(LVar3, 6) + EVT_MOD(LVar3, 2) + EVT_MUL(LVar3, 0x4000) + EVT_SET(LVar4, LVarF) + EVT_DIV(LVar4, 2) + EVT_MOD(LVar4, 2) + EVT_MUL(LVar4, 0x4000) + EVT_SET(LVar5, LVarF) + EVT_DIV(LVar5, 8) + EVT_MOD(LVar5, 2) + EVT_MUL(LVar5, 0x4000) + EVT_SET(LVar6, LVarF) + EVT_DIV(LVar6, 8) + EVT_MOD(LVar6, 2) + EVT_MUL(LVar6, 0x8000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar1, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, LVar2, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_MAIN, LVar3, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_5, TEX_PANNER_MAIN, LVar4, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_6, TEX_PANNER_MAIN, LVar5, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_7, TEX_PANNER_MAIN, LVar6, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_SET(LVar0, 0) + // create 16 smoke models + EVT_LOOP(16) + EVT_SET(LVar1, LVar0) + EVT_ADD(LVar1, CLONED_MODEL(0)) + EVT_ADD(LVar0, 1) + EVT_CALL(CloneModel, MODEL_o454, LVar1) + EVT_CALL(EnableModel, LVar1, FALSE) + EVT_END_LOOP + // hide the original + EVT_CALL(EnableModel, MODEL_o454, FALSE) + // animate them + EVT_SET(LVarE, 0) + EVT_LOOP(0) + EVT_SETF(LVar0, EVT_FLOAT(106.0)) + EVT_SETF(LVar1, EVT_FLOAT(94.0)) + EVT_SETF(LVar2, EVT_FLOAT(-91.0)) + EVT_CALL(RandInt, 100, LVar3) + EVT_ADDF(LVar3, -50) + EVT_DIVF(LVar3, EVT_FLOAT(200.0)) + EVT_SETF(LVar4, EVT_FLOAT(1.0)) + EVT_SETF(LVar5, 0) + EVT_SETF(LVar6, EVT_FLOAT(0.296)) + EVT_SETF(LVar7, EVT_FLOAT(0.296)) + EVT_SET(LVarF, LVarE) + EVT_ADD(LVarF, CLONED_MODEL(0)) + EVT_EXEC(N(EVS_AnimateSmokePuff)) + EVT_ADD(LVarE, 1) + EVT_IF_GE(LVarE, 16) + EVT_SET(LVarE, 0) + EVT_END_IF + EVT_WAIT(10) + EVT_END_LOOP + EVT_END_THREAD + EVT_EXEC_WAIT(N(MakeSun)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundVineModels)[] = { + -1, + MODEL_o411, + MODEL_o415, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "flo_tex", + .shape = "flo_bt03_shape", + .hit = "flo_bt03_hit", + .bg = "fla_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundVineModels), +}; diff --git a/src/battle/common/stage/flo_04.inc.c b/src/battle/common/stage/flo_04.inc.c new file mode 100644 index 0000000000..93d75a0ef4 --- /dev/null +++ b/src/battle/common/stage/flo_04.inc.c @@ -0,0 +1,91 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/flo_bt04_shape.h" + +#include "common/CosInterpMinMax.inc.c" + +EvtScript N(EVS_AnimateCloud) = { + EVT_SET(LVarA, LVar0) + EVT_SET(LVarF, 0) + EVT_LOOP(0) + EVT_CALL(N(CosInterpMinMax), LVarF, LVar0, EVT_FLOAT(0.968), EVT_FLOAT(1.031), 15, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVarF, LVar1, EVT_FLOAT(1.031), EVT_FLOAT(0.968), 15, 0, 0) + EVT_CALL(ScaleModel, LVarA, LVar1, LVar0, 1) + EVT_ADD(LVarF, 1) + EVT_IF_GE(LVarF, 30) + EVT_SET(LVarF, 0) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +#include "common/MakeSun.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_SET(LVar0, MODEL_o412) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_SET(LVar0, MODEL_o413) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_SET(LVar0, MODEL_o414) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_SET(LVar0, MODEL_o415) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_SET(LVar0, MODEL_o419) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_THREAD + EVT_SET(LVar0, MODEL_o431) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_SET(LVar0, MODEL_o432) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_b2_2) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_SET(LVar0, MODEL_b2_1) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_b1_2) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_SET(LVar0, MODEL_b1_1) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_SET(LVar0, MODEL_b1_3) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_o433) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_SET(LVar0, MODEL_o434) + EVT_EXEC(N(EVS_AnimateCloud)) + EVT_END_THREAD + EVT_CALL(CloneModel, MODEL_o427, CLONED_MODEL(0)) + EVT_CALL(EnableModel, CLONED_MODEL(0), FALSE) + EVT_CALL(TranslateModel, CLONED_MODEL(0), 0, 9, 0) + EVT_CALL(ParentColliderToModel, 0, CLONED_MODEL(0)) + EVT_EXEC_WAIT(N(MakeSun)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + -1, + MODEL_o431, + MODEL_o419, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "flo_tex", + .shape = "flo_bt04_shape", + .hit = "flo_bt04_hit", + .bg = "sra_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/flo_05.inc.c b/src/battle/common/stage/flo_05.inc.c new file mode 100644 index 0000000000..d81b379c77 --- /dev/null +++ b/src/battle/common/stage/flo_05.inc.c @@ -0,0 +1,27 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/flo_bt05_shape.h" + +#include "common/MakeSun.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_EXEC_WAIT(N(MakeSun)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "flo_tex", + .shape = "flo_bt05_shape", + .hit = "flo_bt05_hit", + .bg = "fla_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/flo_06.inc.c b/src/battle/common/stage/flo_06.inc.c new file mode 100644 index 0000000000..3f0e37dddc --- /dev/null +++ b/src/battle/common/stage/flo_06.inc.c @@ -0,0 +1,27 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/flo_bt06_shape.h" + +#include "common/MakeSun.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_EXEC_WAIT(N(MakeSun)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "flo_tex", + .shape = "flo_bt06_shape", + .hit = "flo_bt06_hit", + .bg = "fla_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/flo_RandomFlowers.inc.c b/src/battle/common/stage/flo_RandomFlowers.inc.c new file mode 100644 index 0000000000..1d166a5f94 --- /dev/null +++ b/src/battle/common/stage/flo_RandomFlowers.inc.c @@ -0,0 +1,65 @@ +#include "common.h" +#include "effects.h" + +EvtScript N(EVS_RandomFlowers_Background) = { + EVT_LABEL(0) + // posX range: 125 to 375 + EVT_CALL(RandInt, 250, LVar0) + EVT_SUB(LVar0, 125) + // posY: 0 + EVT_SET(LVar1, 0) + // posZ range: -100 to -60 + EVT_CALL(RandInt, 40, LVar2) + EVT_SUB(LVar2, 100) + EVT_CALL(RandInt, 30, LVar3) + EVT_ADD(LVar3, 90) + EVT_PLAY_EFFECT(EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0) + EVT_CALL(RandInt, 20, LVar0) + EVT_ADD(LVar0, 20) + EVT_WAIT(LVar0) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RandomFlowers_Foreground) = { + EVT_LABEL(0) + // posX range: 125 to 375 + EVT_CALL(RandInt, 250, LVar0) + EVT_SUB(LVar0, 125) + // posY: 0 + EVT_SET(LVar1, 0) + // posZ range: 71 to 121 + EVT_CALL(RandInt, 50, LVar2) + EVT_ADD(LVar2, 71) + EVT_CALL(RandInt, 30, LVar3) + EVT_ADD(LVar3, 90) + EVT_PLAY_EFFECT(EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0) + EVT_CALL(RandInt, 30, LVar0) + EVT_ADD(LVar0, 20) + EVT_WAIT(LVar0) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RandomFlowers_FarBack) = { + EVT_LABEL(0) + // posX range: 125 to 375 + EVT_CALL(RandInt, 250, LVar0) + EVT_SUB(LVar0, 125) + // posY: 50 + EVT_SET(LVar1, 50) + // posZ range: -124 to -84 + EVT_CALL(RandInt, 40, LVar2) + EVT_ADD(LVar2, -124) + EVT_CALL(RandInt, 30, LVar3) + EVT_ADD(LVar3, 90) + EVT_PLAY_EFFECT(EFFECT_FLOATING_FLOWER, LVar0, LVar1, LVar2, LVar3, 0, 0) + EVT_CALL(RandInt, 30, LVar0) + EVT_ADD(LVar0, 20) + EVT_WAIT(LVar0) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/common/stage/isk_00.inc.c b/src/battle/common/stage/isk_00.inc.c new file mode 100644 index 0000000000..6b79ee8d60 --- /dev/null +++ b/src/battle/common/stage/isk_00.inc.c @@ -0,0 +1,21 @@ +#include "common.h" +#include "battle/battle.h" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "isk_tex", + .shape = "isk_bt00_shape", //@bug this does not exist! + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/isk_01.inc.c b/src/battle/common/stage/isk_01.inc.c new file mode 100644 index 0000000000..4e78cd6acd --- /dev/null +++ b/src/battle/common/stage/isk_01.inc.c @@ -0,0 +1,23 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/isk_bt01_shape.h" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "isk_tex", + .shape = "isk_bt01_shape", + .hit = "isk_bt01_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/isk_02.inc.c b/src/battle/common/stage/isk_02.inc.c new file mode 100644 index 0000000000..c223afad11 --- /dev/null +++ b/src/battle/common/stage/isk_02.inc.c @@ -0,0 +1,31 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/isk_bt02_shape.h" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_BTL_ISK) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_o398, + MODEL_o397, + MODEL_o399, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "isk_tex", + .shape = "isk_bt02_shape", + .hit = "isk_bt02_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/isk_02b.inc.c b/src/battle/common/stage/isk_02b.inc.c new file mode 100644 index 0000000000..6abb7e5f4a --- /dev/null +++ b/src/battle/common/stage/isk_02b.inc.c @@ -0,0 +1,37 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/isk_bt02_shape.h" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, MODEL_o365, FALSE) + EVT_CALL(EnableModel, MODEL_o366, FALSE) + EVT_CALL(EnableModel, MODEL_o367, FALSE) + EVT_CALL(EnableModel, MODEL_o389, FALSE) + EVT_CALL(EnableModel, MODEL_o390, FALSE) + EVT_CALL(EnableModel, MODEL_o391, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_o398, + MODEL_o397, + MODEL_o399, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "isk_tex", + .shape = "isk_bt02_shape", + .hit = "isk_bt02_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/isk_02c.inc.c b/src/battle/common/stage/isk_02c.inc.c new file mode 100644 index 0000000000..d6ef2eb2a0 --- /dev/null +++ b/src/battle/common/stage/isk_02c.inc.c @@ -0,0 +1,33 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/isk_bt02_shape.h" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(EnableModel, MODEL_kai2, FALSE) + EVT_CALL(EnableModel, MODEL_kai1, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_o398, + MODEL_o397, + MODEL_o399, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "isk_tex", + .shape = "isk_bt02_shape", + .hit = "isk_bt02_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/isk_03.inc.c b/src/battle/common/stage/isk_03.inc.c new file mode 100644 index 0000000000..6d068cce64 --- /dev/null +++ b/src/battle/common/stage/isk_03.inc.c @@ -0,0 +1,24 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/isk_bt03_shape.h" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "isk_tex", + .shape = "isk_bt03_shape", + .hit = "isk_bt03_hit", + .bg = "sbk3_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/isk_03b.inc.c b/src/battle/common/stage/isk_03b.inc.c new file mode 100644 index 0000000000..24830cc4d0 --- /dev/null +++ b/src/battle/common/stage/isk_03b.inc.c @@ -0,0 +1,23 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/isk_bt03_shape.h" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "isk_tex", + .shape = "isk_bt03_shape", + .hit = "isk_bt03_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/isk_04.inc.c b/src/battle/common/stage/isk_04.inc.c new file mode 100644 index 0000000000..95c7333f26 --- /dev/null +++ b/src/battle/common/stage/isk_04.inc.c @@ -0,0 +1,48 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/isk_bt04_shape.h" +#include "effects.h" + +BSS EffectInstance* N(TorchFlameL); +BSS EffectInstance* N(TorchFlameR); + +API_CALLABLE(N(CreateTorchFX)) { + fx_flame(1, -133.0f, 72.0f, -143.0f, 0.3f, &N(TorchFlameL)); + fx_flame(1, 129.0f, 72.0f, -143.0f, 0.3f, &N(TorchFlameR)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DeleteTorchFX)) { + remove_effect(N(TorchFlameL)); + remove_effect(N(TorchFlameR)); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(N(CreateTorchFX)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_CALL(N(DeleteTorchFX)) + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_o500, + MODEL_o501, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "isk_tex", + .shape = "isk_bt04_shape", + .hit = "isk_bt04_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/isk_05.inc.c b/src/battle/common/stage/isk_05.inc.c new file mode 100644 index 0000000000..c2e9bdf4cc --- /dev/null +++ b/src/battle/common/stage/isk_05.inc.c @@ -0,0 +1,41 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/isk_bt05_shape.h" +#include "effects.h" + +BSS EffectInstance* N(TorchFlameL); +BSS EffectInstance* N(TorchFlameR); + +API_CALLABLE(N(CreateTorchFX)) { + fx_flame(1, -90.0f, 45.0f, -146.0f, 0.25f, &N(TorchFlameL)); + fx_flame(1, 80.0f, 45.0f, -146.0f, 0.25f, &N(TorchFlameR)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DeleteTorchFX)) { + remove_effect(N(TorchFlameL)); + remove_effect(N(TorchFlameR)); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(N(CreateTorchFX)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_CALL(N(DeleteTorchFX)) + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "isk_tex", + .shape = "isk_bt05_shape", + .hit = "isk_bt05_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/isk_06.inc.c b/src/battle/common/stage/isk_06.inc.c new file mode 100644 index 0000000000..a4f3b4d604 --- /dev/null +++ b/src/battle/common/stage/isk_06.inc.c @@ -0,0 +1,38 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/isk_bt06_shape.h" +#include "effects.h" + +BSS EffectInstance* N(TorchFlame); + +API_CALLABLE(N(CreateTorchFX)) { + fx_flame(1, -110.0f, 80.0f, -146.0f, 0.3f, &N(TorchFlame)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DeleteTorchFX)) { + remove_effect(N(TorchFlame)); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(N(CreateTorchFX)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_CALL(N(DeleteTorchFX)) + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "isk_tex", + .shape = "isk_bt06_shape", + .hit = "isk_bt06_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/isk_06b.inc.c b/src/battle/common/stage/isk_06b.inc.c new file mode 100644 index 0000000000..3e6f664572 --- /dev/null +++ b/src/battle/common/stage/isk_06b.inc.c @@ -0,0 +1,39 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/isk_bt06_shape.h" +#include "effects.h" + +BSS EffectInstance* N(TorchFlame); + +API_CALLABLE(N(CreateTorchFX)) { + fx_flame(1, -110.0f, 80.0f, -146.0, 0.3f, &N(TorchFlame)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DeleteTorchFX)) { + remove_effect(N(TorchFlame)); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(N(CreateTorchFX)) + EVT_CALL(EnableModel, MODEL_kesu, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_CALL(N(DeleteTorchFX)) + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "isk_tex", + .shape = "isk_bt06_shape", + .hit = "isk_bt06_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/isk_07.inc.c b/src/battle/common/stage/isk_07.inc.c new file mode 100644 index 0000000000..6657228558 --- /dev/null +++ b/src/battle/common/stage/isk_07.inc.c @@ -0,0 +1,38 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/isk_bt07_shape.h" +#include "effects.h" + +BSS EffectInstance* N(TorchFlame); + +API_CALLABLE(N(CreateTorchFX)) { + fx_flame(1, 110.0f, 80.0f, -146.0f, 0.3f, &N(TorchFlame)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DeleteTorchFX)) { + remove_effect(N(TorchFlame)); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(N(CreateTorchFX)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_CALL(N(DeleteTorchFX)) + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "isk_tex", + .shape = "isk_bt07_shape", + .hit = "isk_bt07_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/isk_08.inc.c b/src/battle/common/stage/isk_08.inc.c new file mode 100644 index 0000000000..14f17aff01 --- /dev/null +++ b/src/battle/common/stage/isk_08.inc.c @@ -0,0 +1,38 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/isk_bt06_shape.h" +#include "effects.h" + +BSS EffectInstance* N(TorchFlame); + +API_CALLABLE(N(CreateTorchFX)) { + fx_flame(1, 0, 72.0f, -146.0, 0.3f, &N(TorchFlame)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DeleteTorchFX)) { + remove_effect(N(TorchFlame)); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(N(CreateTorchFX)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_CALL(N(DeleteTorchFX)) + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "isk_tex", + .shape = "isk_bt08_shape", + .hit = "isk_bt08_hit", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/jan_00.inc.c b/src/battle/common/stage/jan_00.inc.c new file mode 100644 index 0000000000..bae5a701be --- /dev/null +++ b/src/battle/common/stage/jan_00.inc.c @@ -0,0 +1,34 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/jan_bt00_shape.h" +#include "effects.h" + +#include "jan_BeachEffects.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_SET(LVar0, MODEL_g88) + EVT_EXEC(N(EVS_AnimatePalmLeaves)) + EVT_SET(LVar0, MODEL_g89) + EVT_EXEC(N(EVS_AnimatePalmLeaves)) + EVT_SET(LVar0, MODEL_g86) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_PLAY_EFFECT(EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "jan_tex", + .shape = "jan_bt00_shape", + .hit = "jan_bt00_hit", + .bg = "yos_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/jan_01.inc.c b/src/battle/common/stage/jan_01.inc.c new file mode 100644 index 0000000000..6087291acb --- /dev/null +++ b/src/battle/common/stage/jan_01.inc.c @@ -0,0 +1,44 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/jan_bt01_shape.h" + +#include "jan_BeachEffects.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, MODEL_g18, MODEL_GROUP_HIDDEN) + EVT_THREAD + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_o55) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_o54) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_o53) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_o85, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "jan_tex", + .shape = "jan_bt01_shape", + .hit = "jan_bt01_hit", + .bg = "yos_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/jan_01b.inc.c b/src/battle/common/stage/jan_01b.inc.c new file mode 100644 index 0000000000..63494594e5 --- /dev/null +++ b/src/battle/common/stage/jan_01b.inc.c @@ -0,0 +1,44 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/jan_bt01_shape.h" + +#include "jan_BeachEffects.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, MODEL_g17, MODEL_GROUP_HIDDEN) + EVT_THREAD + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_o55) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_o54) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_WAIT(5) + EVT_SET(LVar0, MODEL_o53) + EVT_EXEC(N(EVS_AnimateWave)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_o85, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "jan_tex", + .shape = "jan_bt01_shape", + .hit = "jan_bt01_hit", + .bg = "yos_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/jan_02.inc.c b/src/battle/common/stage/jan_02.inc.c new file mode 100644 index 0000000000..cd20c8a159 --- /dev/null +++ b/src/battle/common/stage/jan_02.inc.c @@ -0,0 +1,32 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/jan_bt02_shape.h" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_o64, + MODEL_o65, + MODEL_o66, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "jan_tex", + .shape = "jan_bt02_shape", + .hit = "jan_bt02_hit", + .bg = "yos_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/jan_03.inc.c b/src/battle/common/stage/jan_03.inc.c new file mode 100644 index 0000000000..9eb50e3643 --- /dev/null +++ b/src/battle/common/stage/jan_03.inc.c @@ -0,0 +1,33 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/jan_bt03_shape.h" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, MODEL_g2, MODEL_GROUP_HIDDEN) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_o91, + MODEL_o90, + MODEL_o86, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "jan_tex", + .shape = "jan_bt03_shape", + .hit = "jan_bt03_hit", + .bg = "jan_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/jan_03b.inc.c b/src/battle/common/stage/jan_03b.inc.c new file mode 100644 index 0000000000..e77dc414f4 --- /dev/null +++ b/src/battle/common/stage/jan_03b.inc.c @@ -0,0 +1,33 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/jan_bt03_shape.h" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, MODEL_g39, MODEL_GROUP_HIDDEN) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_o91, + MODEL_o90, + MODEL_o86, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "jan_tex", + .shape = "jan_bt03_shape", + .hit = "jan_bt03_hit", + .bg = "jan_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/jan_04.inc.c b/src/battle/common/stage/jan_04.inc.c new file mode 100644 index 0000000000..54d0051215 --- /dev/null +++ b/src/battle/common/stage/jan_04.inc.c @@ -0,0 +1,31 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/jan_bt04_shape.h" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, MODEL_g111, MODEL_GROUP_HIDDEN) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_o31, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "jan_tex", + .shape = "jan_bt04_shape", + .hit = "jan_bt04_hit", + .bg = "jan_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/jan_04b.inc.c b/src/battle/common/stage/jan_04b.inc.c new file mode 100644 index 0000000000..87e8f51b05 --- /dev/null +++ b/src/battle/common/stage/jan_04b.inc.c @@ -0,0 +1,31 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/jan_bt04_shape.h" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamBGColor, CAM_BATTLE, 0, 0, 0) + EVT_CALL(SetGroupVisibility, MODEL_g2, MODEL_GROUP_HIDDEN) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_o31, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "jan_tex", + .shape = "jan_bt04_shape", + .hit = "jan_bt04_hit", + .bg = "jan_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/jan_BeachEffects.inc.c b/src/battle/common/stage/jan_BeachEffects.inc.c new file mode 100644 index 0000000000..b9610fe113 --- /dev/null +++ b/src/battle/common/stage/jan_BeachEffects.inc.c @@ -0,0 +1,98 @@ +#include "common.h" + +EvtScript N(EVS_AnimatePalmLeaves) = { + EVT_SET(LVarA, LVar0) + EVT_LABEL(0) + EVT_CALL(RotateGroup, LVarA, 2, 0, 0, 1) + EVT_WAIT(5) + EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) + EVT_WAIT(5) + EVT_CALL(RotateGroup, LVarA, -2, 0, 0, 1) + EVT_WAIT(5) + EVT_CALL(RotateGroup, LVarA, 1, 0, 0, 1) + EVT_WAIT(5) + EVT_CALL(RandInt, 30, LVar0) + EVT_ADD(LVar0, 30) + EVT_WAIT(LVar0) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_AnimateWave) = { + EVT_SET(LVarA, LVar0) + EVT_LOOP(0) + EVT_CALL(TranslateModel, LVarA, 1, 0, 0) + EVT_WAIT(2) + EVT_CALL(TranslateModel, LVarA, 1, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(-0.5), 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 1, -1, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), -1, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 2, -1, 0) + EVT_WAIT(2) + EVT_CALL(TranslateModel, LVarA, 2, -1, 0) + EVT_WAIT(2) + EVT_CALL(TranslateModel, LVarA, 2, -1, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), EVT_FLOAT(-1.5), 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 3, -2, 0) + EVT_WAIT(2) + EVT_CALL(TranslateModel, LVarA, 3, -2, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 3, -3, 0) + EVT_WAIT(2) + EVT_CALL(TranslateModel, LVarA, 3, -3, 0) + EVT_WAIT(2) + EVT_CALL(TranslateModel, LVarA, 3, -3, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 3, EVT_FLOAT(-2.5), 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 3, -2, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(2.5), -2, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 2, -2, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 2, EVT_FLOAT(-1.5), 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 2, -1, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(1.5), EVT_FLOAT(-0.5), 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 1, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 1, EVT_FLOAT(0.5), 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 1, 1, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(0.5), 1, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 0, 1, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 1, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, -1, 1, 0) + EVT_WAIT(2) + EVT_CALL(TranslateModel, LVarA, -1, 1, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, -1, EVT_FLOAT(0.5), 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, -1, 0, 0) + EVT_WAIT(2) + EVT_CALL(TranslateModel, LVarA, -1, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, EVT_FLOAT(-0.5), 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 0, 0, 0) + EVT_WAIT(2) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; diff --git a/src/battle/common/stage/kkj_02.inc.c b/src/battle/common/stage/kkj_02.inc.c new file mode 100644 index 0000000000..bb723d2177 --- /dev/null +++ b/src/battle/common/stage/kkj_02.inc.c @@ -0,0 +1,73 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/kkj_bt02_shape.h" + +#include "world/common/util/SetLightningBoltPurple.inc.c" + +s32 N(RandomBoltPositions)[][7] = { + { -22, 190, -91, -88, 21, -91, 60 }, + { -1, 190, -91, 88, 24, -91, 10 }, + { -67, 190, -91, -122, 10, -91, 90 }, + { 57, 190, -91, -4, 17, -91, 60 }, +}; + +EvtScript N(EVS_RandomBolts) = { + EVT_LABEL(0) + EVT_USE_BUF(N(RandomBoltPositions)) + EVT_LOOP(ARRAY_COUNT(N(RandomBoltPositions))) + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_BUF_READ3(LVar3, LVar4, LVar5) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 8, 0) + EVT_CALL(N(SetLightningBoltPurple)) + EVT_BUF_READ1(LVar0) + EVT_WAIT(LVar0) + EVT_END_LOOP + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +s32 N(CirculatingBoltPositions)[][7] = { + { -121, 33, -104, -24, 41, -104, 5 }, + { 36, 41, -104, 128, 34, -104, 30 }, + { 146, 1, 113, 38, -15, 121, 5 }, + { -66, -10, 115, -155, 1, 97, 90 }, +}; + +EvtScript N(EVS_CirculatingBolts) = { + EVT_LABEL(0) + EVT_USE_BUF(N(CirculatingBoltPositions)) + EVT_LOOP(ARRAY_COUNT(N(CirculatingBoltPositions))) + EVT_BUF_READ3(LVar0, LVar1, LVar2) + EVT_BUF_READ3(LVar3, LVar4, LVar5) + EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 1, 5, 0) + EVT_CALL(N(SetLightningBoltPurple)) + EVT_BUF_READ1(LVar0) + EVT_WAIT(LVar0) + EVT_END_LOOP + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_EXEC(N(EVS_RandomBolts)) + EVT_EXEC(N(EVS_CirculatingBolts)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "kkj_tex", + .shape = "kkj_bt02_shape", + .hit = "kkj_bt02_hit", + .bg = "kpa_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/kmr_02.inc.c b/src/battle/common/stage/kmr_02.inc.c new file mode 100644 index 0000000000..e1a39298d1 --- /dev/null +++ b/src/battle/common/stage/kmr_02.inc.c @@ -0,0 +1,21 @@ +#include "common.h" +#include "battle/battle.h" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +Stage NAMESPACE = { + .texture = "kmr_tex", + .shape = "kmr_bt02_shape", //@bug does not exist + .bg = "kmr_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), +}; diff --git a/src/battle/common/stage/kmr_03.inc.c b/src/battle/common/stage/kmr_03.inc.c new file mode 100644 index 0000000000..56b6a7ab17 --- /dev/null +++ b/src/battle/common/stage/kmr_03.inc.c @@ -0,0 +1,38 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/kmr_bt03_shape.h" + +#include "world/common/todo/clouds.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SET(LVar0, 1) + EVT_SET(LVar2, 0) + EVT_EXEC(N(clouds1)) + EVT_SET(LVar0, 4) + EVT_SET(LVar2, 70) + EVT_EXEC(N(clouds1)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_n2, + MODEL_m4, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "kmr_tex", + .shape = "kmr_bt03_shape", + .hit = "kmr_bt03_hit", + .bg = "kmr_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/kmr_04.inc.c b/src/battle/common/stage/kmr_04.inc.c new file mode 100644 index 0000000000..48f7e9f348 --- /dev/null +++ b/src/battle/common/stage/kmr_04.inc.c @@ -0,0 +1,38 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/kmr_bt04_shape.h" + +#include "world/common/todo/clouds.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SET(LVar0, 1) + EVT_SET(LVar2, 0) + EVT_EXEC(N(clouds1)) + EVT_SET(LVar0, 4) + EVT_SET(LVar2, 70) + EVT_EXEC(N(clouds1)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_m4, + MODEL_n2, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "kmr_tex", + .shape = "kmr_bt04_shape", + .hit = "kmr_bt04_hit", + .bg = "kmr_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/kmr_05.inc.c b/src/battle/common/stage/kmr_05.inc.c new file mode 100644 index 0000000000..64f83db48b --- /dev/null +++ b/src/battle/common/stage/kmr_05.inc.c @@ -0,0 +1,33 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/kmr_bt05_shape.h" + +#include "world/common/todo/clouds.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(EnableModel, MODEL_o302, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_n2, + MODEL_m4, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "kmr_tex", + .shape = "kmr_bt05_shape", + .hit = "kmr_bt05_hit", + .bg = "kmr_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/kmr_06.inc.c b/src/battle/common/stage/kmr_06.inc.c new file mode 100644 index 0000000000..ff28dd5ed9 --- /dev/null +++ b/src/battle/common/stage/kmr_06.inc.c @@ -0,0 +1,41 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/kmr_bt06_shape.h" + +#include "world/common/todo/clouds.inc.c" +#include "common/UnkFogFunc.inc.c" + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(N(UnkFogFunc)) + EVT_SET(LVar0, 1) + EVT_SET(LVar2, 0) + EVT_EXEC(N(clouds1)) + EVT_SET(LVar0, 4) + EVT_SET(LVar2, 70) + EVT_EXEC(N(clouds1)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_n2, + MODEL_o303, + MODEL_ha3, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "kmr_tex", + .shape = "kmr_bt06_shape", + .hit = "kmr_bt06_hit", + .bg = "kmr_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/nok_01.inc.c b/src/battle/common/stage/nok_01.inc.c new file mode 100644 index 0000000000..30fe0f84b0 --- /dev/null +++ b/src/battle/common/stage/nok_01.inc.c @@ -0,0 +1,62 @@ +#include "common.h" +#include "battle/battle.h" +#include "mapfs/nok_bt01_shape.h" + +EvtScript N(EVS_AnimateFlower) = { + EVT_SET(LVarA, LVar0) + EVT_LABEL(0) + EVT_CALL(TranslateModel, LVarA, 0, 2, 0) + EVT_WAIT(5) + EVT_CALL(TranslateModel, LVarA, 0, 0, 0) + EVT_WAIT(5) + EVT_CALL(TranslateModel, LVarA, 0, 2, 0) + EVT_WAIT(5) + EVT_CALL(TranslateModel, LVarA, 0, 0, 0) + EVT_WAIT(5) + EVT_CALL(RandInt, 30, LVar0) + EVT_ADD(LVar0, 30) + EVT_WAIT(LVar0) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PreBattle) = { + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SET(LVar0, MODEL_h1) + EVT_EXEC(N(EVS_AnimateFlower)) + EVT_SET(LVar0, MODEL_h2) + EVT_EXEC(N(EVS_AnimateFlower)) + EVT_SET(LVar0, MODEL_h3) + EVT_EXEC(N(EVS_AnimateFlower)) + EVT_SET(LVar0, MODEL_h5) + EVT_EXEC(N(EVS_AnimateFlower)) + EVT_SET(LVar0, MODEL_h7) + EVT_EXEC(N(EVS_AnimateFlower)) + EVT_SET(LVar0, MODEL_h8) + EVT_EXEC(N(EVS_AnimateFlower)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PostBattle) = { + EVT_RETURN + EVT_END +}; + +s32 N(ForegroundModels)[] = { + MODEL_ha3, + MODEL_hap, + MODEL_kusa3, + STAGE_MODEL_LIST_END +}; + +Stage NAMESPACE = { + .texture = "nok_tex", + .shape = "nok_bt01_shape", + .hit = "nok_bt01_hit", + .bg = "nok_bg", + .preBattle = &N(EVS_PreBattle), + .postBattle = &N(EVS_PostBattle), + .foregroundModelList = N(ForegroundModels), +}; diff --git a/src/battle/common/stage/sam_Snowflakes.inc.c b/src/battle/common/stage/sam_Snowflakes.inc.c new file mode 100644 index 0000000000..1b5182751c --- /dev/null +++ b/src/battle/common/stage/sam_Snowflakes.inc.c @@ -0,0 +1,109 @@ +#include "common.h" +#include "effects.h" + +u16 N(StarAnimPhases)[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; + +// unused +void N(build_gfx_star)(s32 index) { + Vtx* firstVertex; + Vtx* copiedVertices; + s32 numVertices; + s32 i; + s32 temp3; + + mdl_get_copied_vertices(index, &firstVertex, &copiedVertices, &numVertices); + + for (i = 0; i < numVertices; i++) { + Vtx* vtx = &copiedVertices[i]; + s16 temp1 = (sins(N(StarAnimPhases)[index] * (i % 3 + 1) + i) + 0x8000) / 2; + s32 temp2 = temp1 * 155; + vtx->v.cn[2] = temp2 / 0x8000 + 100; + vtx->v.cn[1] = temp2 / 0x8000 + 50; + + temp3 = sins(N(StarAnimPhases)[index] / 0x8000 * (((i / 2) % 3 + 1) << 15) + N(StarAnimPhases)[index] / 0x4000 * 0x8000 + i) + 0x8000; + vtx->v.cn[0] = vtx->v.cn[0] * temp3 / 0x10000; + } + + gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(index)); + N(StarAnimPhases)[index] += 0x253; +} + +API_CALLABLE(N(SpawnSnowfall)) { + fx_snowfall(0, 16); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetSnowflakePosition)) { + Bytecode* args = script->ptrReadPos; + s32 phase = evt_get_variable(script, *args++); + s32 posXInOut = *args++; + s32 posYInOut = *args++; + s32 posZInOut = *args++; + f32 posY = sin_rad(DEG_TO_RAD(phase / 10) * 8.0f) * 10.0f; + + evt_set_variable(script, posXInOut, 0); + evt_set_variable(script, posYInOut, posY); + evt_set_variable(script, posZInOut, 0); + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SpawnSnowfall) = { + EVT_CALL(N(SpawnSnowfall)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RandomlySpinSnowflake) = { + EVT_SET(LVarA, LVar0) + EVT_LABEL(0) + EVT_CALL(RandInt, 30, LVar0) + EVT_ADD(LVar0, 30) + EVT_WAIT(LVar0) + EVT_SET(LVar1, 0) + EVT_LOOP(10) + EVT_ADD(LVar1, 36) + EVT_CALL(RotateModel, LVarA, LVar1, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_AnimateHangingSnowflake_RandomSpin) = { + EVT_SET(LVarA, LVar0) // model + EVT_SET(LVarB, LVar1) + EVT_EXEC(N(EVS_RandomlySpinSnowflake)) + EVT_SET(LVar7, 0) + EVT_LABEL(0) + EVT_ADD(LVar7, 4) + EVT_IF_GT(LVar7, 3599) + EVT_SUB(LVar7, 3600) + EVT_END_IF + EVT_CALL(N(GetSnowflakePosition), LVar7, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_AnimateHangingSnowflake_NoSpin) = { + EVT_SET(LVarA, LVar0) + EVT_SET(LVar7, 0) + EVT_LABEL(0) + EVT_ADD(LVar7, 4) + EVT_IF_GT(LVar7, 3599) + EVT_SUB(LVar7, 3600) + EVT_END_IF + EVT_CALL(N(GetSnowflakePosition), LVar7, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; diff --git a/src/battle/move/hammer/auto_smash.c b/src/battle/move/hammer/auto_smash.c index 02f91d0550..343a8bcaee 100644 --- a/src/battle/move/hammer/auto_smash.c +++ b/src/battle/move/hammer/auto_smash.c @@ -9,7 +9,7 @@ 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(ShowActionHud, TRUE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) diff --git a/src/battle/move/hammer/hammer_charge_0.c b/src/battle/move/hammer/hammer_charge_0.c index bad6d86fe9..098cad7d8d 100644 --- a/src/battle/move/hammer/hammer_charge_0.c +++ b/src/battle/move/hammer/hammer_charge_0.c @@ -219,9 +219,9 @@ EvtScript N(EVS_802A3948) = { 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_CALL(ShowVariableMessageBox, BTL_MSG_04, 60, 1) EVT_ELSE - EVT_CALL(ShowMessageBox, 8, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) @@ -270,9 +270,9 @@ EvtScript N(EVS_802A3C90) = { 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_CALL(ShowVariableMessageBox, BTL_MSG_04, 60, 1) EVT_ELSE - EVT_CALL(ShowMessageBox, 8, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) @@ -321,9 +321,9 @@ EvtScript N(EVS_802A3FD8) = { 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_CALL(ShowVariableMessageBox, BTL_MSG_04, 60, 1) EVT_ELSE - EVT_CALL(ShowMessageBox, 8, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) diff --git a/src/battle/move/hammer/hammer_charge_1.c b/src/battle/move/hammer/hammer_charge_1.c index e94fc29e74..bc4ec879ea 100644 --- a/src/battle/move/hammer/hammer_charge_1.c +++ b/src/battle/move/hammer/hammer_charge_1.c @@ -231,7 +231,7 @@ EvtScript N(EVS_802A39C8) = { EVT_CALL(func_802A12FC_7598AC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) EVT_ELSE - EVT_CALL(ShowMessageBox, 8, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) @@ -283,7 +283,7 @@ EvtScript N(EVS_802A3D1C) = { EVT_CALL(func_802A12FC_7598AC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) EVT_ELSE - EVT_CALL(ShowMessageBox, 8, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) @@ -335,7 +335,7 @@ EvtScript N(EVS_802A4070) = { EVT_CALL(func_802A12FC_7598AC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) EVT_ELSE - EVT_CALL(ShowMessageBox, 8, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) diff --git a/src/battle/move/hammer/hammer_charge_2.c b/src/battle/move/hammer/hammer_charge_2.c index dde517b3b8..f7c2ed60fc 100644 --- a/src/battle/move/hammer/hammer_charge_2.c +++ b/src/battle/move/hammer/hammer_charge_2.c @@ -230,7 +230,7 @@ EvtScript N(EVS_802A39C8) = { EVT_CALL(func_802A12FC_75E8CC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) EVT_ELSE - EVT_CALL(ShowMessageBox, 8, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) @@ -280,7 +280,7 @@ EvtScript N(EVS_802A3CF4) = { EVT_CALL(func_802A12FC_75E8CC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) EVT_ELSE - EVT_CALL(ShowMessageBox, 8, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) @@ -330,7 +330,7 @@ EvtScript N(EVS_802A4020) = { EVT_CALL(func_802A12FC_75E8CC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) EVT_ELSE - EVT_CALL(ShowMessageBox, 8, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) diff --git a/src/battle/move/item/coconut.c b/src/battle/move/item/coconut.c index e3118314ec..d555dd2d60 100644 --- a/src/battle/move/item/coconut.c +++ b/src/battle/move/item/coconut.c @@ -83,7 +83,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 18) EVT_CALL(GetItemPower, ITEM_COCONUT, LVar3, LVar4) EVT_CALL(ApplyShrinkFromOwner, LVar3) - EVT_CALL(ItemDamageEnemy, LVar9, 0x18000000, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar9, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_ADD(LVar0, 60) EVT_ADD(LVar1, 0) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 16) diff --git a/src/battle/move/item/dizzy_dial.c b/src/battle/move/item/dizzy_dial.c index 7057bf4e90..fd53dc47ac 100644 --- a/src/battle/move/item/dizzy_dial.c +++ b/src/battle/move/item/dizzy_dial.c @@ -9,7 +9,7 @@ static s32 D_802A1CD0; #include "battle/common/move/ItemRefund.inc.c" void func_802A123C_727B4C(void) { - func_80138D88(0, 0, 0x140, 0xF0, 160.0f); + func_80138D88(0, 0, 320, 240, 160.0f); } API_CALLABLE(N(func_802A1270_727B80)) { @@ -67,12 +67,12 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(N(func_802A1270_727B80)) EVT_THREAD EVT_CALL(StartRumble, 8) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(4.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) + 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_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 10) @@ -81,16 +81,16 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemCheckHit, LVar0, 268435456, 0, LVar0, 0) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) EVT_IF_EQ(LVar0, 6) EVT_GOTO(1) EVT_END_IF EVT_CALL(GetItemPower, ITEM_DIZZY_DIAL, LVar0, LVar1) - EVT_CALL(MakeStatusField, LVar0, 262144, 100, LVar0) - EVT_CALL(ItemAfflictEnemy, LVar0, 1342177280, LVar0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(MakeStatusField, LVar0, STATUS_FLAG_DIZZY, 100, LVar0) + EVT_CALL(ItemAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_STATUS_ALWAYS_HITS, LVar0, 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_LABEL(1) EVT_WAIT(5) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/move/item/dusty_hammer.c b/src/battle/move/item/dusty_hammer.c index 1711d54d34..7fc9a51091 100644 --- a/src/battle/move/item/dusty_hammer.c +++ b/src/battle/move/item/dusty_hammer.c @@ -82,7 +82,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 18) EVT_CALL(GetItemPower, ITEM_DUSTY_HAMMER, LVar3, LVar4) EVT_CALL(ApplyShrinkFromOwner, LVar3) - EVT_CALL(ItemDamageEnemy, LVar9, 402653184, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar9, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_ADD(LVar0, 40) EVT_ADD(LVar1, 10) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 10) diff --git a/src/battle/move/item/egg_missile.c b/src/battle/move/item/egg_missile.c index 9677885f30..12d431ec20 100644 --- a/src/battle/move/item/egg_missile.c +++ b/src/battle/move/item/egg_missile.c @@ -152,18 +152,18 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 15) - EVT_CALL(SetAnimation, 0, 0, ANIM_Mario_Throw) - EVT_CALL(PlaySound, 1018) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Throw) + EVT_CALL(PlaySound, SOUND_THROW) EVT_WAIT(3) EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(N(EMS_EggMissile))) - EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) + 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(InitTargetIterator) - EVT_CALL(SetGoalToTarget, -127) - EVT_CALL(GetGoalPos, -127, LVar0, LVar1, LVar2) + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_THREAD EVT_SET(LVar0, 0) EVT_LOOP(18) @@ -180,13 +180,13 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(N(func_802A123C_71CF1C), LVar0, LVar1, LVar2) EVT_THREAD EVT_CALL(StartRumble, 5) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.75)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.2)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.45)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.75)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(1.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.45)) EVT_END_THREAD - EVT_CALL(GetItemPower, 200, LVar0, LVar1) - EVT_CALL(ItemDamageEnemy, LVar0, 402653698, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(GetItemPower, ITEM_EGG_MISSILE, LVar0, LVar1) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_FIRE | DAMAGE_TYPE_BLAST | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN EVT_END diff --git a/src/battle/move/item/electro_pop.c b/src/battle/move/item/electro_pop.c index 8118b31e5e..fd1cba7233 100644 --- a/src/battle/move/item/electro_pop.c +++ b/src/battle/move/item/electro_pop.c @@ -94,7 +94,7 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(EatItem)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) EVT_CALL(PlaySound, SOUND_379) EVT_CALL(GetItemPower, ITEM_VOLT_SHROOM, LVar0, LVar1) EVT_CALL(N(func_802A123C_7307DC)) @@ -115,7 +115,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, LVar3) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) EVT_WAIT(20) - EVT_CALL(ShowMessageBox, 16, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_10, 60) EVT_CALL(WaitForMessageBoxDone) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/fire_flower.c b/src/battle/move/item/fire_flower.c index dba3b9f25d..fddb0bdc02 100644 --- a/src/battle/move/item/fire_flower.c +++ b/src/battle/move/item/fire_flower.c @@ -82,16 +82,16 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemCheckHit, LVar0, 268435456, 0, LVar0, 0) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) EVT_IF_EQ(LVar0, 6) EVT_GOTO(1) EVT_END_IF EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetItemPower, ITEM_FIRE_FLOWER, LVar0, LVar1) - EVT_CALL(ItemDamageEnemy, LVar0, 939524098, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_FIRE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_LABEL(1) EVT_WAIT(5) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/move/item/food.c b/src/battle/move/item/food.c index 85969b0d08..192a701e3a 100644 --- a/src/battle/move/item/food.c +++ b/src/battle/move/item/food.c @@ -84,7 +84,7 @@ API_CALLABLE(N(func_802A15A0_733670)) { script->varTable[12] = item->potencyB; script->varTable[13] = 0; - if (item->typeFlags & 0x100) { + if (item->typeFlags & ITEM_TYPE_FLAG_USE_DRINK_ANIMATION) { script->varTable[13] = 1; } @@ -131,7 +131,7 @@ EvtScript N(EVS_FeedPartner) = { EVT_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 45) - EVT_CALL(MakeItemEntity, LVarE, LVar0, LVar1, LVar2, 1, 0) + EVT_CALL(MakeItemEntity, LVarE, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVarE, LVar0) EVT_LOOP(25) EVT_CALL(GetVirtualEntityPosition, LVarA, LVar0, LVar1, LVar2) diff --git a/src/battle/move/item/fright_jar.c b/src/battle/move/item/fright_jar.c index 537958309b..030be481ba 100644 --- a/src/battle/move/item/fright_jar.c +++ b/src/battle/move/item/fright_jar.c @@ -1,6 +1,7 @@ #include "common.h" #include "script_api/battle.h" #include "model.h" +#include "effects.h" #define NAMESPACE battle_item_fright_jar @@ -42,12 +43,12 @@ EvtScript N(EVS_UseItem) = { EVT_ADD(LVar1, 5) EVT_SETF(LVar3, EVT_FLOAT(0.7)) EVT_LOOP(5) - EVT_CALL(PlayEffect, 0x61, 0, LVar0, LVar1, LVar2, LVar3, 25, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FRIGHT_JAR, 0, LVar0, LVar1, LVar2, LVar3, 25, 0) EVT_ADD(LVar0, 5) EVT_ADDF(LVar3, EVT_FLOAT(0.15)) EVT_WAIT(7) EVT_END_LOOP - EVT_CALL(PlayEffect, 0x61, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FRIGHT_JAR, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 60, 0) EVT_WAIT(20) EVT_LOOP(4) EVT_CALL(AddBattleCamZoom, -100) @@ -62,14 +63,14 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemCheckHit, LVar0, 268435456, 0, LVar0, 0) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) EVT_IF_EQ(LVar0, 6) EVT_GOTO(1) EVT_END_IF EVT_CALL(func_80269EAC, 21) EVT_CALL(ItemSpookEnemy, LVar0, 1879052288, 0, 100, 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_LABEL(1) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/move/item/hustle_drink.c b/src/battle/move/item/hustle_drink.c index 122ad03bb5..c9b62a3006 100644 --- a/src/battle/move/item/hustle_drink.c +++ b/src/battle/move/item/hustle_drink.c @@ -1,5 +1,6 @@ #include "common.h" #include "script_api/battle.h" +#include "effects.h" #define NAMESPACE battle_item_hustle_drink @@ -105,8 +106,8 @@ EvtScript N(EVS_UseItem) = { EVT_END_THREAD EVT_LOOP(10) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_369) - EVT_CALL(PlayEffect, 0x6, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x6, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 0, LVar0, LVar1, LVar2, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, 0, 0) EVT_WAIT(4) EVT_END_LOOP EVT_WAIT(10) diff --git a/src/battle/move/item/insecticide_herb.c b/src/battle/move/item/insecticide_herb.c index efe1d34fb8..a0ca4dce7f 100644 --- a/src/battle/move/item/insecticide_herb.c +++ b/src/battle/move/item/insecticide_herb.c @@ -126,11 +126,11 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(SetVirtualEntityJumpGravity, LVarA, EVT_FLOAT(0.8)) EVT_ADD(LVar2, 5) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 18) - EVT_CALL(PlayEffect, 0x7, 3, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 3, LVar0, LVar1, LVar2, 0, 0, 0) EVT_SUB(LVar0, 10) - EVT_CALL(PlayEffect, 0x7, 3, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 3, LVar0, LVar1, LVar2, 0, 0, 0) EVT_ADD(LVar0, 20) - EVT_CALL(PlayEffect, 0x7, 3, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 3, LVar0, LVar1, LVar2, 0, 0, 0) EVT_THREAD EVT_CALL(N(func_802A12E0_72AA30), LVar0, LVar1, LVar2) EVT_WAIT(3) diff --git a/src/battle/move/item/life_shroom.c b/src/battle/move/item/life_shroom.c index 183807d37b..4eb72fbfdf 100644 --- a/src/battle/move/item/life_shroom.c +++ b/src/battle/move/item/life_shroom.c @@ -121,7 +121,7 @@ EvtScript N(script6) = { EVT_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 45) - EVT_CALL(MakeItemEntity, LVarE, LVar0, LVar1, LVar2, 1, 0) + EVT_CALL(MakeItemEntity, LVarE, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVarE, LVar0) EVT_LOOP(25) EVT_CALL(GetVirtualEntityPosition, LVarA, LVar0, LVar1, LVar2) diff --git a/src/battle/move/item/mushroom.c b/src/battle/move/item/mushroom.c index 0a40212600..a00a0d9bc4 100644 --- a/src/battle/move/item/mushroom.c +++ b/src/battle/move/item/mushroom.c @@ -120,7 +120,7 @@ EvtScript N(script6) = { EVT_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 45) - EVT_CALL(MakeItemEntity, LVarE, LVar0, LVar1, LVar2, 1, 0) + EVT_CALL(MakeItemEntity, LVarE, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVarE, LVar0) EVT_LOOP(25) EVT_CALL(GetVirtualEntityPosition, LVarA, LVar0, LVar1, LVar2) diff --git a/src/battle/move/item/mystery.c b/src/battle/move/item/mystery.c index c3e229092c..92c1599ff4 100644 --- a/src/battle/move/item/mystery.c +++ b/src/battle/move/item/mystery.c @@ -252,7 +252,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 150) EVT_CALL(SetVirtualEntityPosition, LVarA, LVar0, LVar1, LVar2) - EVT_CALL(SetOwnerTarget, 0, 0) + EVT_CALL(SetOwnerTarget, ACTOR_PLAYER, 0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_THREAD @@ -276,7 +276,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(func_802A188C_72CE3C), LVar0, LVar1, LVar2) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_SP_EVT_ACTIVE, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_SP_EVT_ACTIVE, TRUE) EVT_CALL(DispatchDamagePlayerEvent, 1, EVENT_HIT) EVT_RETURN EVT_END diff --git a/src/battle/move/item/pebble.c b/src/battle/move/item/pebble.c index ba69c6f6c2..2ef261db39 100644 --- a/src/battle/move/item/pebble.c +++ b/src/battle/move/item/pebble.c @@ -82,7 +82,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 18) EVT_CALL(GetItemPower, ITEM_PEBBLE, LVar3, LVar4) EVT_CALL(ApplyShrinkFromOwner, LVar3) - EVT_CALL(ItemDamageEnemy, LVar9, 402653184, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar9, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_ADD(LVar0, 60) EVT_ADD(LVar1, 0) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 16) diff --git a/src/battle/move/item/pow_block.c b/src/battle/move/item/pow_block.c index 5319317697..48cc2147e7 100644 --- a/src/battle/move/item/pow_block.c +++ b/src/battle/move/item/pow_block.c @@ -1,6 +1,7 @@ #include "common.h" #include "script_api/battle.h" #include "entity.h" +#include "effects.h" #define NAMESPACE battle_item_pow_block @@ -58,10 +59,10 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MakeEntity, EVT_PTR(Entity_PowBlock), -40, 60, 0, 0, MAKE_ENTITY_END) EVT_SET(LVarA, LVar0) EVT_CALL(N(func_802A1318_718B68)) - EVT_CALL(PlayEffect, 0x7, 2, -40, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 2, -30, 65, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 2, -40, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 2, -40, 55, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -40, 60, 20, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -30, 65, 20, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -40, 60, 20, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -40, 55, 20, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -70,22 +71,22 @@ EvtScript N(EVS_UseItem) = { EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_BLOCK) EVT_CALL(N(func_802A123C_718A8C)) - EVT_CALL(PlayEffect, 0x7, 2, -40, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 2, -30, 65, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 2, -40, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 2, -40, 55, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -40, 60, 20, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -30, 65, 20, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -40, 60, 20, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -40, 55, 20, 0, 0, 0) EVT_CALL(StartRumble, 4) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(6.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(5.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(4.0)) + 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(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2030) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.2)) + 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_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 30) @@ -104,23 +105,23 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemCheckHit, LVar0, 268435456, 0, LVar0, 0) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) EVT_IF_EQ(LVar0, 6) EVT_GOTO(1) EVT_END_IF EVT_CALL(GetItemPower, ITEM_POW_BLOCK, LVar3, LVar4) EVT_CALL(ApplyShrinkFromOwner, LVar3) EVT_CALL(func_80269EAC, 22) - EVT_CALL(ItemDamageEnemy, LVar0, 939525120, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_POW | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) EVT_LABEL(1) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlayEffect, 0x7, 2, -70, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 2, -60, 65, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 2, -70, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, 0x7, 2, -70, 55, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -70, 60, 20, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -60, 65, 20, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -70, 60, 20, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -70, 55, 20, 0, 0, 0) EVT_CALL(N(func_802A12E4_718B34)) EVT_WAIT(30) EVT_EXEC_WAIT(N(PlayerGoHome)) diff --git a/src/battle/move/item/repel_gel.c b/src/battle/move/item/repel_gel.c index 0d3cbc1aae..b412a585e3 100644 --- a/src/battle/move/item/repel_gel.c +++ b/src/battle/move/item/repel_gel.c @@ -1,5 +1,6 @@ #include "common.h" #include "script_api/battle.h" +#include "effects.h" #define NAMESPACE battle_item_repel_gel @@ -28,12 +29,12 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, 0x33, 3, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 3, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_376) EVT_CALL(GetItemPower, ITEM_REPEL_GEL, LVar0, LVar1) EVT_CALL(N(func_802A123C_72DDAC)) EVT_WAIT(20) - EVT_CALL(ShowMessageBox, 17, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_11, 60) EVT_CALL(WaitForMessageBoxDone) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/shooting_star.c b/src/battle/move/item/shooting_star.c index ea013e413c..8ef3171b0b 100644 --- a/src/battle/move/item/shooting_star.c +++ b/src/battle/move/item/shooting_star.c @@ -106,7 +106,7 @@ EvtScript N(EVS_UseItem) = { EVT_LOOP(5) EVT_WAIT(15) EVT_CALL(StartRumble, 8) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_LOOP EVT_END_THREAD EVT_WAIT(90) @@ -115,17 +115,17 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemCheckHit, LVar0, 268435456, 0, LVar0, 0) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) EVT_IF_EQ(LVar0, 6) EVT_GOTO(1) EVT_END_IF EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(func_802A1388_71DAF8), LVar0, LVar1, LVar2) EVT_CALL(GetItemPower, ITEM_SHOOTING_STAR, LVar0, LVar1) - EVT_CALL(ItemDamageEnemy, LVar0, 939524352, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_LABEL(1) EVT_WAIT(10) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/move/item/sleepy_sheep.c b/src/battle/move/item/sleepy_sheep.c index e52fd0f123..37ec01a769 100644 --- a/src/battle/move/item/sleepy_sheep.c +++ b/src/battle/move/item/sleepy_sheep.c @@ -106,7 +106,7 @@ API_CALLABLE(N(func_802A1740_71ED90)) { if (isInitialCall) { script->functionTemp[0] = 0; - script->functionTemp[1] = 0x5A; + script->functionTemp[1] = 90; } for (i = 0; i < player->targetListLength; i++) { @@ -297,28 +297,28 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_364) EVT_LOOP(7) EVT_CALL(StartRumble, 2) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.2)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.25)) + 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_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.5)) + 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.25)) EVT_WAIT(2) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.2)) + 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_LOOP EVT_END_THREAD EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 32) - EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 20, EMOTER_POS, LVar0, LVar1, LVar2, 10) + EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 20, EMOTER_POS, LVar0, LVar1, LVar2, 10) EVT_WAIT(30) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) @@ -371,7 +371,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(SetVirtualEntityScale, LVarA, EVT_FLOAT(0.711), EVT_FLOAT(0.711), EVT_FLOAT(0.711)) EVT_CALL(SetVirtualEntityMoveSpeed, LVarA, EVT_FLOAT(7.0)) EVT_CALL(SetVirtualEntityJumpGravity, LVarA, EVT_FLOAT(1.4)) - EVT_CALL(SetOwnerTarget, 0, 0) + EVT_CALL(SetOwnerTarget, ACTOR_PLAYER, 0) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 60) @@ -389,20 +389,20 @@ EvtScript N(EVS_UseItem) = { EVT_WAIT(1) EVT_CALL(SetActorScale, ACTOR_PLAYER, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(PlayEffect, 0x6, 3, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 0, 0) EVT_WAIT(2) EVT_CALL(SetVirtualEntityJumpGravity, LVarA, EVT_FLOAT(1.4)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 60) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 0) - EVT_CALL(PlayEffect, 0x6, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 2, LVar0, LVar1, LVar2, 0, 0) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) EVT_ADD(LVar0, 20) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 0) - EVT_CALL(PlayEffect, 0x6, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 2, LVar0, LVar1, LVar2, 0, 0) EVT_ADD(LVar0, 10) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 0) - EVT_CALL(PlayEffect, 0x6, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 2, LVar0, LVar1, LVar2, 0, 0) EVT_WAIT(5) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -416,16 +416,16 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemCheckHit, LVar0, 268435456, 0, LVar0, 0) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) EVT_IF_EQ(LVar0, 6) EVT_GOTO(1) EVT_END_IF EVT_CALL(GetItemPower, ITEM_SLEEPY_SHEEP, LVar0, LVar1) - EVT_CALL(MakeStatusField, LVar0, 4096, 100, LVar0) - EVT_CALL(ItemAfflictEnemy, LVar0, 1342177280, LVar0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(MakeStatusField, LVar0, STATUS_FLAG_SLEEP, 100, LVar0) + EVT_CALL(ItemAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_STATUS_ALWAYS_HITS, LVar0, 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_LABEL(1) EVT_WAIT(5) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/move/item/snowman_doll.c b/src/battle/move/item/snowman_doll.c index 94a283a1ac..359000280e 100644 --- a/src/battle/move/item/snowman_doll.c +++ b/src/battle/move/item/snowman_doll.c @@ -51,7 +51,7 @@ EvtScript N(EVS_UseItem) = { EVT_SET(LVar1, 170) EVT_CALL(RandInt, 50, LVar2) EVT_SUB(LVar2, 25) - EVT_CALL(PlayEffect, 0xE, LVar0, LVar1, LVar2, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNOWFLAKE, LVar0, LVar1, LVar2, 60, 0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD @@ -59,45 +59,45 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 50) EVT_WAIT(50) - EVT_CALL(PlayEffect, 0x60, 0, 0, 0, 20, EVT_FLOAT(1.0), 160, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNOWMAN_DOLL, 0, 0, 0, 20, EVT_FLOAT(1.0), 160, 0) EVT_THREAD EVT_WAIT(17) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_202E) EVT_CALL(StartRumble, 9) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(46) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_202E) EVT_CALL(StartRumble, 9) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(25) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_202E) EVT_CALL(StartRumble, 9) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(25) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_202E) EVT_CALL(StartRumble, 9) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_WAIT(15) EVT_CALL(StartRumble, 10) - 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, 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_WAIT(110) EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemCheckHit, LVar0, 268435456, 0, LVar0, 0) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) EVT_IF_EQ(LVar0, 6) EVT_GOTO(1) EVT_END_IF EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(func_802A123C_71C06C), LVar0, LVar1, LVar2) EVT_CALL(GetItemPower, ITEM_SNOWMAN_DOLL, LVar0, LVar1) - EVT_CALL(ItemDamageEnemy, LVar0, 939524104, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_ICE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_WAIT(5) EVT_LABEL(1) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/move/item/stop_watch.c b/src/battle/move/item/stop_watch.c index a2ee02e634..6fab2cd137 100644 --- a/src/battle/move/item/stop_watch.c +++ b/src/battle/move/item/stop_watch.c @@ -1,6 +1,7 @@ #include "common.h" #include "script_api/battle.h" #include "model.h" +#include "effects.h" #define NAMESPACE battle_item_stop_watch @@ -34,7 +35,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 20) EVT_END_THREAD EVT_CALL(N(FadeBackgroundToBlack)) - EVT_CALL(PlayEffect, 0x62, 0, 0, 0, 0, EVT_FLOAT(1.0), 200, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STOP_WATCH, 0, 0, 0, 0, EVT_FLOAT(1.0), 200, 0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_246) EVT_WAIT(200) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -42,16 +43,16 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemCheckHit, LVar0, 268435456, 0, LVar0, 0) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) EVT_IF_EQ(LVar0, 6) EVT_GOTO(1) EVT_END_IF EVT_CALL(GetItemPower, ITEM_STOP_WATCH, LVar0, LVar1) - EVT_CALL(MakeStatusField, LVar0, 2097152, 100, LVar0) - EVT_CALL(ItemAfflictEnemy, LVar0, 1342177280, LVar0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(MakeStatusField, LVar0, STATUS_FLAG_STOP, 100, LVar0) + EVT_CALL(ItemAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_STATUS_ALWAYS_HITS, LVar0, 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_LABEL(1) EVT_WAIT(5) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/move/item/strange_cake.c b/src/battle/move/item/strange_cake.c index c8a3845a40..cc901c4c02 100644 --- a/src/battle/move/item/strange_cake.c +++ b/src/battle/move/item/strange_cake.c @@ -273,28 +273,28 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) EVT_CALL(N(func_802A1A8C_731D8C)) - EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 25) EVT_CALL(N(ShowFlowerRecoveryFX), LVar0, LVar1, LVar2, LVar3) - EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, LVar3) EVT_CALL(N(AddFP), LVar3) EVT_WAIT(10) - EVT_CALL(SetAnimation, 0, 0, ANIM_Mario_ThumbsUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) EVT_WAIT(30) - EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, LVar3) - EVT_CALL(SetAnimation, 0, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) EVT_WAIT(20) - EVT_CALL(SetAnimation, 0, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) EVT_ELSE EVT_SET_CONST(LVarA, ITEM_STRANGE_CAKE) EVT_SET(LVar1, 0) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) - EVT_CALL(SetAnimation, 0, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) EVT_END_IF EVT_WAIT(10) EVT_THREAD @@ -318,39 +318,39 @@ EvtScript N(EVS_UseItem) = { }; EvtScript N(script7) = { - EVT_CALL(SetAnimation, 0, 0, ANIM_Mario_10002) - EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) EVT_CALL(N(func_802A1AD8_731DD8)) EVT_WAIT(20) - EVT_CALL(ShowMessageBox, 16, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_10, 60) EVT_CALL(WaitForMessageBoxDone) EVT_RETURN EVT_END }; EvtScript N(script8) = { - EVT_CALL(SetAnimation, 0, 0, ANIM_Mario_10002) - EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) EVT_CALL(N(func_802A1B14_731E14)) EVT_WAIT(20) - EVT_CALL(ShowMessageBox, 17, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_11, 60) EVT_CALL(WaitForMessageBoxDone) EVT_RETURN EVT_END }; EvtScript N(script9) = { - EVT_CALL(SetAnimation, 0, 0, ANIM_Mario_30004) - EVT_CALL(SetGoalToTarget, 0) - EVT_CALL(GetGoalPos, 0, LVar0, LVar1, LVar2) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30004) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_EXEC(DoSleepHit) EVT_CALL(N(func_802A1B68_731E68)) EVT_WAIT(20) - EVT_CALL(ShowMessageBox, 11, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_0B, 60) EVT_CALL(WaitForMessageBoxDone) EVT_RETURN EVT_END diff --git a/src/battle/move/item/super_soda.c b/src/battle/move/item/super_soda.c index 83b117a89f..8e3b311379 100644 --- a/src/battle/move/item/super_soda.c +++ b/src/battle/move/item/super_soda.c @@ -124,7 +124,7 @@ EvtScript N(script6) = { EVT_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 45) - EVT_CALL(MakeItemEntity, LVarE, LVar0, LVar1, LVar2, 1, 0) + EVT_CALL(MakeItemEntity, LVarE, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVarE, LVar0) EVT_LOOP(25) EVT_CALL(GetVirtualEntityPosition, LVarA, LVar0, LVar1, LVar2) diff --git a/src/battle/move/item/tasty_tonic.c b/src/battle/move/item/tasty_tonic.c index ce406117b4..d9451a6055 100644 --- a/src/battle/move/item/tasty_tonic.c +++ b/src/battle/move/item/tasty_tonic.c @@ -42,29 +42,29 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_IF_EQ(LVar0, 0) EVT_EXEC_WAIT(battle_item_tasty_tonic_DrinkItem) - EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) EVT_ADD(LVar2, 5) EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, 10) - EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(SetAnimation, 0, 0, 65586) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) EVT_WAIT(30) - EVT_CALL(SetAnimation, 0, 0, 65538) - EVT_CALL(GetActorPos, 0, LVar0, LVar1, LVar2) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 5) EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, 10) EVT_CALL(battle_item_tasty_tonic_func_802A123C_72223C, 0) EVT_WAIT(20) EVT_ELSE - EVT_CALL(GetActorPos, 256, LVar0, LVar1, LVar2) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) EVT_ADD(LVar2, 5) EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, 5) - EVT_CALL(GetActorPos, 256, LVar0, LVar1, LVar2) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_WAIT(30) - EVT_CALL(GetActorPos, 256, LVar0, LVar1, LVar2) + EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 5) EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, 5) EVT_CALL(battle_item_tasty_tonic_func_802A123C_72223C, 256) diff --git a/src/battle/move/item/thunder_bolt.c b/src/battle/move/item/thunder_bolt.c index a5cbc9d160..c4bd7ee4f2 100644 --- a/src/battle/move/item/thunder_bolt.c +++ b/src/battle/move/item/thunder_bolt.c @@ -64,25 +64,25 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 20) EVT_END_THREAD EVT_CALL(battle_item_thunder_bolt_FadeBackgroundToBlack) - EVT_CALL(PlaySound, 869) + EVT_CALL(PlaySound, SOUND_365) EVT_WAIT(10) EVT_CALL(InitTargetIterator) - EVT_CALL(SetGoalToTarget, -127) - EVT_CALL(ItemCheckHit, LVar0, 268435456, 0, LVar0, 0) + EVT_CALL(SetGoalToTarget, ACTOR_SELF) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) EVT_IF_EQ(LVar0, 6) EVT_GOTO(1) EVT_END_IF EVT_CALL(battle_item_thunder_bolt_func_802A123C_722D7C) EVT_WAIT(5) EVT_CALL(StartRumble, 10) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) - EVT_CALL(GetItemPower, 130, LVar0, LVar1) - EVT_CALL(ItemDamageEnemy, LVar0, 939524128, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(GetItemPower, ITEM_THUNDER_RAGE, LVar0, LVar1) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_LABEL(1) EVT_WAIT(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(SetAnimation, 0, 0, 65538) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) EVT_WAIT(30) EVT_CALL(battle_item_thunder_bolt_func_802A1420_722F60) EVT_EXEC_WAIT(battle_item_thunder_bolt_PlayerGoHome) diff --git a/src/battle/move/item/thunder_rage.c b/src/battle/move/item/thunder_rage.c index e1db641035..51bbe98a8b 100644 --- a/src/battle/move/item/thunder_rage.c +++ b/src/battle/move/item/thunder_rage.c @@ -68,20 +68,20 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemCheckHit, LVar0, 0x10000000, 0, LVar0, 0) + EVT_CALL(ItemCheckHit, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, LVar0, 0) EVT_IF_EQ(LVar0, 6) EVT_GOTO(1) EVT_END_IF EVT_CALL(N(func_802A1354_71B4F4)) EVT_WAIT(5) EVT_CALL(StartRumble, 10) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetItemPower, ITEM_THUNDER_RAGE, LVar0, LVar1) - EVT_CALL(ItemDamageEnemy, LVar0, 0x38000020, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_LABEL(1) EVT_WAIT(5) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/move/item/volt_shroom.c b/src/battle/move/item/volt_shroom.c index 542575719a..67cffeae34 100644 --- a/src/battle/move/item/volt_shroom.c +++ b/src/battle/move/item/volt_shroom.c @@ -1,5 +1,6 @@ #include "common.h" #include "script_api/battle.h" +#include "effects.h" #define NAMESPACE battle_item_volt_shroom @@ -27,12 +28,12 @@ EvtScript N(EVS_UseItem) = { EVT_ADD(LVar1, LVar3) EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_CALL(MultiplyByActorScale, LVar3) - EVT_CALL(PlayEffect, 0x57, 0, LVar0, LVar1, LVar2, LVar3, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, LVar3, 30, 0) EVT_CALL(PlaySound, SOUND_379) EVT_CALL(GetItemPower, ITEM_VOLT_SHROOM, LVar0, LVar1) EVT_CALL(N(func_802A123C_71AA2C)) EVT_WAIT(20) - EVT_CALL(ShowMessageBox, 16, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_10, 60) EVT_CALL(WaitForMessageBoxDone) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/jump/demo_power_bounce.c b/src/battle/move/jump/demo_power_bounce.c index 955a499216..f1d23e90d4 100644 --- a/src/battle/move/jump/demo_power_bounce.c +++ b/src/battle/move/jump/demo_power_bounce.c @@ -13,12 +13,6 @@ s32 N(DifficultyTable)[] = { 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; diff --git a/src/battle/move/jump/jump_charge_0.c b/src/battle/move/jump/jump_charge_0.c index 03de98ec27..f8ed4a33ce 100644 --- a/src/battle/move/jump/jump_charge_0.c +++ b/src/battle/move/jump/jump_charge_0.c @@ -84,9 +84,9 @@ EvtScript N(EVS_UseMove0) = { 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_CALL(ShowVariableMessageBox, BTL_MSG_06, 60, 1) EVT_ELSE - EVT_CALL(ShowMessageBox, 8, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) diff --git a/src/battle/move/jump/jump_charge_1.c b/src/battle/move/jump/jump_charge_1.c index dd9112a8d8..8f2c49f2a1 100644 --- a/src/battle/move/jump/jump_charge_1.c +++ b/src/battle/move/jump/jump_charge_1.c @@ -96,7 +96,7 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(N(func_802A133C_75CCBC)) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) EVT_ELSE - EVT_CALL(ShowMessageBox, 8, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) diff --git a/src/battle/move/jump/jump_charge_2.c b/src/battle/move/jump/jump_charge_2.c index 144f21a0d9..2e9cced075 100644 --- a/src/battle/move/jump/jump_charge_2.c +++ b/src/battle/move/jump/jump_charge_2.c @@ -95,7 +95,7 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(N(func_802A133C_761C5C)) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) EVT_ELSE - EVT_CALL(ShowMessageBox, 8, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) diff --git a/src/battle/move/star_power/chill_out.c b/src/battle/move/star_power/chill_out.c index 15fcf9a622..c054c55159 100644 --- a/src/battle/move/star_power/chill_out.c +++ b/src/battle/move/star_power/chill_out.c @@ -111,7 +111,7 @@ EvtScript N(802A18F0) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -119,11 +119,11 @@ EvtScript N(802A18F0) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -135,14 +135,14 @@ EvtScript N(802A18F0) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -166,7 +166,7 @@ EvtScript N(802A1C88) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -174,11 +174,11 @@ EvtScript N(802A1C88) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -190,14 +190,14 @@ EvtScript N(802A1C88) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -211,34 +211,34 @@ EvtScript N(802A1C88) = { EvtScript N(802A2020) = { EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, 0x2041) - EVT_CALL(CreateNpc, 100, LVar0) + EVT_CALL(PlaySound, SOUND_2041) + EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) - EVT_CALL(SetNpcPos, 100, -75, 150, 0) - EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(SetNpcFlagBits, NPC_BTL_SPIRIT, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) + EVT_CALL(SetNpcPos, NPC_BTL_SPIRIT, -75, 150, 0) + EVT_CALL(SetNpcDecoration, NPC_BTL_SPIRIT, 0, NPC_DECORATION_WHITE_GLOW_BEHIND) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_SET(LVar0, 0) EVT_LOOP(8) EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_THREAD EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 30, 0, 10) - EVT_CALL(SetForegroundModelsVisible, 1) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetForegroundModelsVisible, TRUE) EVT_RETURN EVT_END }; @@ -247,68 +247,68 @@ EvtScript N(802A222C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2047) + EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2045) + EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_END_IF EVT_RETURN EVT_END @@ -342,10 +342,10 @@ EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A18F0)) EVT_SET_CONST(LVar0, ANIM_BattleMuskular_Idle) EVT_EXEC_WAIT(N(802A2020)) - EVT_CALL(SetNpcAnimation, 100, ANIM_BattleMuskular_Shout) + EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleMuskular_Shout) EVT_WAIT(16) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) - EVT_CALL(PlaySound, 0x244) + EVT_CALL(PlaySound, SOUND_244) EVT_CALL(InitTargetIterator) EVT_LABEL(10) EVT_CALL(ItemCheckHit, LVar0, 0, 0, 0, 0) @@ -382,7 +382,7 @@ EvtScript N(EVS_UsePower) = { EVT_END_THREAD EVT_END_IF EVT_LABEL(11) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(10) EVT_END_IF @@ -390,7 +390,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(func_802A153C_79060C) EVT_WAIT(2) EVT_END_LOOP - EVT_CALL(ChooseNextTarget, -1, 0) + EVT_CALL(ChooseNextTarget, ITER_FIRST, 0) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(ItemCheckHit, LVar0, 0, 0, 0, 0) @@ -401,18 +401,18 @@ EvtScript N(EVS_UsePower) = { EVT_IF_EQ(LVar0, 1) EVT_CALL(func_802A16F4_7907C4) EVT_ELSE - EVT_CALL(PlayerDamageEnemy, LVar0, 0, 65535, 0, 0, BS_FLAGS1_FORCE_HIT_IMMUNE | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PlayerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 0, BS_FLAGS1_FORCE_HIT_IMMUNE | BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_IF EVT_LABEL(1) EVT_WAIT(5) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF EVT_WAIT(5) EVT_CALL(func_802A1528_7905F8) EVT_IF_EQ(LVar0, 1) - EVT_CALL(ShowMessageBox, 44, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_2C, 60) EVT_END_IF EVT_CALL(func_80276EFC) EVT_EXEC_WAIT(N(802A222C)) diff --git a/src/battle/move/star_power/focus.c b/src/battle/move/star_power/focus.c index da80f553db..c658a1d649 100644 --- a/src/battle/move/star_power/focus.c +++ b/src/battle/move/star_power/focus.c @@ -60,7 +60,7 @@ EvtScript N(802A1630) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -68,11 +68,11 @@ EvtScript N(802A1630) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -84,14 +84,14 @@ EvtScript N(802A1630) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -115,7 +115,7 @@ EvtScript N(802A19C8) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -123,11 +123,11 @@ EvtScript N(802A19C8) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -139,14 +139,14 @@ EvtScript N(802A19C8) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -160,34 +160,34 @@ EvtScript N(802A19C8) = { EvtScript N(802A1D60) = { EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, 0x2041) - EVT_CALL(CreateNpc, 100, LVar0) + EVT_CALL(PlaySound, SOUND_2041) + EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) - EVT_CALL(SetNpcPos, 100, -75, 150, 0) - EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(SetNpcFlagBits, NPC_BTL_SPIRIT, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) + EVT_CALL(SetNpcPos, NPC_BTL_SPIRIT, -75, 150, 0) + EVT_CALL(SetNpcDecoration, NPC_BTL_SPIRIT, 0, NPC_DECORATION_WHITE_GLOW_BEHIND) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_SET(LVar0, 0) EVT_LOOP(8) EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_THREAD EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 30, 0, 10) - EVT_CALL(SetForegroundModelsVisible, 1) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetForegroundModelsVisible, TRUE) EVT_RETURN EVT_END }; @@ -196,68 +196,68 @@ EvtScript N(802A1F6C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2047) + EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2045) + EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_END_IF EVT_RETURN EVT_END @@ -291,18 +291,18 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(func_802535B4, 1) EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) - EVT_CALL(PlaySound, 0x2053) + EVT_CALL(PlaySound, SOUND_2053) EVT_CALL(func_802A1518_78A378) EVT_WAIT(30) EVT_CALL(N(UnkBackgroundFunc)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(ShowMessageBox, 26, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_1A, 60) EVT_CASE_EQ(1) - EVT_CALL(ShowMessageBox, 27, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_1B, 60) EVT_CASE_EQ(2) - EVT_CALL(ShowMessageBox, 28, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_1C, 60) EVT_END_SWITCH EVT_CALL(WaitForMessageBoxDone) EVT_CALL(func_80276EFC) @@ -312,18 +312,18 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(PlayerRunToGoal, 0) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) EVT_ELSE - EVT_CALL(PlaySound, 0x2053) + EVT_CALL(PlaySound, SOUND_2053) EVT_CALL(func_802A15B0_78A410) EVT_WAIT(30) EVT_CALL(N(UnkBackgroundFunc)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(ShowMessageBox, 26, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_1A, 60) EVT_CASE_EQ(1) - EVT_CALL(ShowMessageBox, 27, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_1B, 60) EVT_CASE_EQ(2) - EVT_CALL(ShowMessageBox, 28, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_1C, 60) EVT_END_SWITCH EVT_CALL(WaitForMessageBoxDone) EVT_CALL(PartnerYieldTurn) diff --git a/src/battle/move/star_power/lullaby.c b/src/battle/move/star_power/lullaby.c index e569197731..990a16011a 100644 --- a/src/battle/move/star_power/lullaby.c +++ b/src/battle/move/star_power/lullaby.c @@ -46,7 +46,7 @@ EvtScript N(802A1620) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -54,11 +54,11 @@ EvtScript N(802A1620) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -70,14 +70,14 @@ EvtScript N(802A1620) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -101,7 +101,7 @@ EvtScript N(802A19B8) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -109,11 +109,11 @@ EvtScript N(802A19B8) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -125,14 +125,14 @@ EvtScript N(802A19B8) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -146,34 +146,34 @@ EvtScript N(802A19B8) = { EvtScript N(802A1D50) = { EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, 0x2041) - EVT_CALL(CreateNpc, 100, LVar0) + EVT_CALL(PlaySound, SOUND_2041) + EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) - EVT_CALL(SetNpcPos, 100, -75, 150, 0) - EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(SetNpcFlagBits, NPC_BTL_SPIRIT, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) + EVT_CALL(SetNpcPos, NPC_BTL_SPIRIT, -75, 150, 0) + EVT_CALL(SetNpcDecoration, NPC_BTL_SPIRIT, 0, NPC_DECORATION_WHITE_GLOW_BEHIND) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_SET(LVar0, 0) EVT_LOOP(8) EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_THREAD EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 30, 0, 10) - EVT_CALL(SetForegroundModelsVisible, 1) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetForegroundModelsVisible, TRUE) EVT_RETURN EVT_END }; @@ -182,68 +182,68 @@ EvtScript N(802A1F5C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2047) + EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2045) + EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_END_IF EVT_RETURN EVT_END @@ -276,11 +276,11 @@ EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A1620)) EVT_SET_CONST(LVar0, ANIM_BattleMamar_Idle) EVT_EXEC_WAIT(N(802A1D50)) - EVT_CALL(SetNpcAnimation, 100, ANIM_BattleMamar_Shout) + EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleMamar_Shout) EVT_WAIT(16) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_WAIT(15) - EVT_CALL(PlaySound, 0x3F4) + EVT_CALL(PlaySound, SOUND_3F4) EVT_CALL(func_802A1518_78D668) EVT_WAIT(30) EVT_CALL(InitTargetIterator) @@ -290,10 +290,10 @@ EvtScript N(EVS_UsePower) = { EVT_IF_EQ(LVar0, 6) EVT_GOTO(1) EVT_END_IF - EVT_CALL(ItemDamageEnemy, LVar0, 1879048192, 0x80001364, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, DMG_STATUS_CHANCE(STATUS_FLAG_SLEEP, 3, 100), 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_LABEL(1) EVT_WAIT(5) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/move/star_power/peach_beam.c b/src/battle/move/star_power/peach_beam.c index 39954782a6..aa97497c20 100644 --- a/src/battle/move/star_power/peach_beam.c +++ b/src/battle/move/star_power/peach_beam.c @@ -26,8 +26,8 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemDamageEnemy, LVar0, 1082130432, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_PEACH_BEAM | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/move/star_power/peach_focus.c b/src/battle/move/star_power/peach_focus.c index 1dde7d60c7..e5a638b5ad 100644 --- a/src/battle/move/star_power/peach_focus.c +++ b/src/battle/move/star_power/peach_focus.c @@ -1,5 +1,6 @@ #include "common.h" #include "script_api/battle.h" +#include "message_ids.h" #define NAMESPACE battle_move_peach_focus @@ -24,7 +25,7 @@ EvtScript N(802A1530) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -32,11 +33,11 @@ EvtScript N(802A1530) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -48,14 +49,14 @@ EvtScript N(802A1530) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -79,7 +80,7 @@ EvtScript N(802A18C8) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -87,11 +88,11 @@ EvtScript N(802A18C8) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -103,14 +104,14 @@ EvtScript N(802A18C8) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -124,34 +125,34 @@ EvtScript N(802A18C8) = { EvtScript N(802A1C60) = { EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, 0x2041) - EVT_CALL(CreateNpc, 100, LVar0) + EVT_CALL(PlaySound, SOUND_2041) + EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) - EVT_CALL(SetNpcPos, 100, -75, 150, 0) - EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(SetNpcFlagBits, NPC_BTL_SPIRIT, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) + EVT_CALL(SetNpcPos, NPC_BTL_SPIRIT, -75, 150, 0) + EVT_CALL(SetNpcDecoration, NPC_BTL_SPIRIT, 0, NPC_DECORATION_WHITE_GLOW_BEHIND) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_SET(LVar0, 0) EVT_LOOP(8) EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_THREAD EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 30, 0, 10) - EVT_CALL(SetForegroundModelsVisible, 1) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetForegroundModelsVisible, TRUE) EVT_RETURN EVT_END }; @@ -160,68 +161,68 @@ EvtScript N(802A1E6C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2047) + EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2045) + EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_END_IF EVT_RETURN EVT_END @@ -253,13 +254,13 @@ EvtScript N(802A22BC) = { EvtScript N(EVS_UsePower) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0A0003) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_A0003) 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(SetAnimation, ACTOR_PLAYER, 0, 0x0C000D) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_C000D) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -276,28 +277,28 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(SetBattleCamZoom, 213) EVT_CALL(MoveBattleCamOver, 60) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0D000F) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_D000F) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) - EVT_CALL(GetActorVar, 256, 0, LVar0) + EVT_CALL(GetActorVar, ACTOR_PARTNER, 0, LVar0) EVT_IF_EQ(LVar0, 0) - EVT_CALL(ActorSpeak, 1245334, 0, 0, 851983, 851983) + EVT_CALL(ActorSpeak, MSG_CH8_0096, ACTOR_PLAYER, 0, ANIM_Peach_D000F, ANIM_Peach_D000F) EVT_END_IF EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0A0001) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_A0001) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(PlaySound, 0x2053) + EVT_CALL(PlaySound, SOUND_2053) EVT_CALL(GetActorVar, ACTOR_PARTNER, 0, LVar0) EVT_ADD(LVar0, 1) EVT_CALL(SetActorVar, ACTOR_PARTNER, 0, LVar0) - EVT_CALL(ModifyActorDecoration, 256, 1, 0, LVar0, 0, 0, 0) + EVT_CALL(ModifyActorDecoration, ACTOR_PARTNER, 1, 0, LVar0, 0, 0, 0) EVT_CALL(GetActorVar, ACTOR_PARTNER, 1, LVar0) EVT_CALL(func_802A1518_79C4B8) EVT_WAIT(10) @@ -319,9 +320,9 @@ EvtScript N(EVS_UsePower) = { EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0A0003) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_A0003) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0A0002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_A0002) EVT_RETURN EVT_END }; diff --git a/src/battle/move/star_power/refresh.c b/src/battle/move/star_power/refresh.c index aac2edf92f..a0d9c15b41 100644 --- a/src/battle/move/star_power/refresh.c +++ b/src/battle/move/star_power/refresh.c @@ -133,7 +133,7 @@ EvtScript N(802A1A70) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -141,11 +141,11 @@ EvtScript N(802A1A70) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -157,14 +157,14 @@ EvtScript N(802A1A70) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -188,7 +188,7 @@ EvtScript N(802A1E08) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -196,11 +196,11 @@ EvtScript N(802A1E08) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -212,14 +212,14 @@ EvtScript N(802A1E08) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -233,34 +233,34 @@ EvtScript N(802A1E08) = { EvtScript N(802A21A0) = { EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, 0x2041) - EVT_CALL(CreateNpc, 100, LVar0) + EVT_CALL(PlaySound, SOUND_2041) + EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) - EVT_CALL(SetNpcPos, 100, -75, 150, 0) - EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(SetNpcFlagBits, NPC_BTL_SPIRIT, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) + EVT_CALL(SetNpcPos, NPC_BTL_SPIRIT, -75, 150, 0) + EVT_CALL(SetNpcDecoration, NPC_BTL_SPIRIT, 0, NPC_DECORATION_WHITE_GLOW_BEHIND) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_SET(LVar0, 0) EVT_LOOP(8) EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_THREAD EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 30, 0, 10) - EVT_CALL(SetForegroundModelsVisible, 1) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetForegroundModelsVisible, TRUE) EVT_RETURN EVT_END }; @@ -269,68 +269,68 @@ EvtScript N(802A23AC) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2047) + EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2045) + EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_END_IF EVT_RETURN EVT_END @@ -363,17 +363,17 @@ EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A1A70)) EVT_SET_CONST(LVar0, ANIM_BattleEldstar_Idle) EVT_EXEC_WAIT(N(802A21A0)) - EVT_CALL(SetNpcAnimation, 100, ANIM_BattleEldstar_Shout) + EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleEldstar_Shout) EVT_WAIT(16) EVT_THREAD EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_END_THREAD - EVT_CALL(PlaySound, 0x242) - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(PlaySound, SOUND_242) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_CALL(func_802A1518_78BB18, 100) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 35) diff --git a/src/battle/move/star_power/smooch.c b/src/battle/move/star_power/smooch.c index e42e342cd8..66a7014792 100644 --- a/src/battle/move/star_power/smooch.c +++ b/src/battle/move/star_power/smooch.c @@ -32,7 +32,7 @@ EvtScript N(802A1630) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -40,11 +40,11 @@ EvtScript N(802A1630) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -56,14 +56,14 @@ EvtScript N(802A1630) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -87,7 +87,7 @@ EvtScript N(802A19C8) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -95,11 +95,11 @@ EvtScript N(802A19C8) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -111,14 +111,14 @@ EvtScript N(802A19C8) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -132,34 +132,34 @@ EvtScript N(802A19C8) = { EvtScript N(802A1D60) = { EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, 0x2041) - EVT_CALL(CreateNpc, 100, LVar0) + EVT_CALL(PlaySound, SOUND_2041) + EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) - EVT_CALL(SetNpcPos, 100, -75, 150, 0) - EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(SetNpcFlagBits, NPC_BTL_SPIRIT, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) + EVT_CALL(SetNpcPos, NPC_BTL_SPIRIT, -75, 150, 0) + EVT_CALL(SetNpcDecoration, NPC_BTL_SPIRIT, 0, NPC_DECORATION_WHITE_GLOW_BEHIND) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_SET(LVar0, 0) EVT_LOOP(8) EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_THREAD EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 30, 0, 10) - EVT_CALL(SetForegroundModelsVisible, 1) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetForegroundModelsVisible, TRUE) EVT_RETURN EVT_END }; @@ -168,68 +168,68 @@ EvtScript N(802A1F6C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2047) + EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2045) + EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_END_IF EVT_RETURN EVT_END @@ -258,9 +258,12 @@ EvtScript N(802A23BC) = { EVT_END }; -s32 N(intTable_802A24E8)[] = { - 0x0000000F, 0x0000000F, 0xFFFFFFDF, 0x0000001B, 0xFFFFFFEA, 0xFFFFFFE6, 0x0000000A, 0xFFFFFFDD, - 0x00000023, 0x00000000, +Vec2i N(RecoverEffectPositions)[] = { + { 15, 15 }, + { -33, 27 }, + { -22, -26 }, + { 10, -35 }, + { 35, 0 }, }; EvtScript N(EVS_UsePower) = { @@ -270,43 +273,43 @@ EvtScript N(EVS_UsePower) = { EVT_WAIT(16) EVT_THREAD EVT_WAIT(10) - EVT_CALL(SetNpcRotation, 100, 0, 180, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, 180, 0) EVT_WAIT(1) - EVT_CALL(SetNpcRotation, 100, 0, 150, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, 150, 0) EVT_WAIT(1) - EVT_CALL(SetNpcRotation, 100, 0, 120, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, 120, 0) EVT_WAIT(1) - EVT_CALL(SetNpcRotation, 100, 0, 90, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, 90, 0) EVT_WAIT(1) - EVT_CALL(SetNpcRotation, 100, 0, 60, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, 60, 0) EVT_WAIT(1) - EVT_CALL(SetNpcRotation, 100, 0, 30, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, 30, 0) EVT_WAIT(1) - EVT_CALL(SetNpcRotation, 100, 0, 0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, 0, 0) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) EVT_ADD(LVar0, 30) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 20, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 20, 0, EASING_COS_IN_OUT) EVT_WAIT(15) - EVT_CALL(SetNpcAnimation, 100, ANIM_BattleMisstar_Idle) + EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleMisstar_Idle) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 15) EVT_ADD(LVar2, -5) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 10, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 10, 0, EASING_COS_IN_OUT) EVT_CALL(PlaySound, SOUND_245) EVT_THREAD - EVT_CALL(PlayEffect, 0x40, 2, LVar0, LVar1, LVar2, 1, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RECOVER, 2, LVar0, LVar1, LVar2, 1, 0) EVT_WAIT(2) - EVT_USE_BUF(EVT_PTR(N(intTable_802A24E8))) - EVT_LOOP(5) + EVT_USE_BUF(EVT_PTR(N(RecoverEffectPositions))) + EVT_LOOP(ARRAY_COUNT(N(RecoverEffectPositions))) EVT_BUF_READ2(LVar5, LVar6) EVT_SET(LVar3, LVar0) EVT_SET(LVar4, LVar1) EVT_ADD(LVar3, LVar5) EVT_ADD(LVar4, LVar6) - EVT_CALL(PlayEffect, 0x40, 2, LVar3, LVar4, LVar2, 1, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RECOVER, 2, LVar3, LVar4, LVar2, 1, 0) EVT_WAIT(2) EVT_END_LOOP EVT_END_THREAD @@ -318,9 +321,9 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_ADD(LVar0, 25) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 10, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 10, 0, EASING_COS_IN_OUT) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002E) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002E) EVT_WAIT(12) EVT_THREAD EVT_EXEC_WAIT(N(802A1F6C)) @@ -388,7 +391,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(N(UnkBackgroundFunc)) EVT_END_THREAD EVT_CALL(func_80276EFC) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, 0x160) + 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) diff --git a/src/battle/move/star_power/star_beam.c b/src/battle/move/star_power/star_beam.c index b4e991b28a..317b194679 100644 --- a/src/battle/move/star_power/star_beam.c +++ b/src/battle/move/star_power/star_beam.c @@ -27,8 +27,8 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemDamageEnemy, LVar0, 1077936128, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_REMOVE_BUFFS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/move/star_power/star_storm.c b/src/battle/move/star_power/star_storm.c index 8b6d4c5472..1a4b329da4 100644 --- a/src/battle/move/star_power/star_storm.c +++ b/src/battle/move/star_power/star_storm.c @@ -46,7 +46,7 @@ EvtScript N(802A16F0) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -54,11 +54,11 @@ EvtScript N(802A16F0) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -70,14 +70,14 @@ EvtScript N(802A16F0) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -101,7 +101,7 @@ EvtScript N(802A1A88) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -109,11 +109,11 @@ EvtScript N(802A1A88) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -125,14 +125,14 @@ EvtScript N(802A1A88) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -146,34 +146,34 @@ EvtScript N(802A1A88) = { EvtScript N(802A1E20) = { EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, 0x2041) - EVT_CALL(CreateNpc, 100, LVar0) + EVT_CALL(PlaySound, SOUND_2041) + EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) - EVT_CALL(SetNpcPos, 100, -75, 150, 0) - EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(SetNpcFlagBits, NPC_BTL_SPIRIT, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) + EVT_CALL(SetNpcPos, NPC_BTL_SPIRIT, -75, 150, 0) + EVT_CALL(SetNpcDecoration, NPC_BTL_SPIRIT, 0, NPC_DECORATION_WHITE_GLOW_BEHIND) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_SET(LVar0, 0) EVT_LOOP(8) EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_THREAD EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 30, 0, 10) - EVT_CALL(SetForegroundModelsVisible, 1) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetForegroundModelsVisible, TRUE) EVT_RETURN EVT_END }; @@ -182,68 +182,68 @@ EvtScript N(802A202C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2047) + EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2045) + EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_END_IF EVT_RETURN EVT_END @@ -276,7 +276,7 @@ EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A16F0)) EVT_SET_CONST(LVar0, ANIM_BattleSkolar_Idle) EVT_EXEC_WAIT(N(802A1E20)) - EVT_CALL(SetNpcAnimation, 100, ANIM_BattleSkolar_Shout) + EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleSkolar_Shout) EVT_WAIT(16) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_THREAD @@ -307,7 +307,7 @@ EvtScript N(EVS_UsePower) = { EVT_THREAD EVT_LOOP(10) EVT_WAIT(7) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_CALL(StartRumble, 8) EVT_END_LOOP EVT_END_THREAD @@ -321,10 +321,10 @@ EvtScript N(EVS_UsePower) = { EVT_END_IF EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(func_802A1628_78EDF8, LVar0, LVar1, LVar2) - EVT_CALL(ItemDamageEnemy, LVar0, 939524352, 0, 7, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 7, BS_FLAGS1_SP_EVT_ACTIVE) EVT_LABEL(1) EVT_WAIT(10) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/move/star_power/time_out.c b/src/battle/move/star_power/time_out.c index eb9edd776f..8d656dc84f 100644 --- a/src/battle/move/star_power/time_out.c +++ b/src/battle/move/star_power/time_out.c @@ -18,7 +18,7 @@ EvtScript N(802A1520) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -26,11 +26,11 @@ EvtScript N(802A1520) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -42,14 +42,14 @@ EvtScript N(802A1520) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -73,7 +73,7 @@ EvtScript N(802A18B8) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -81,11 +81,11 @@ EvtScript N(802A18B8) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -97,14 +97,14 @@ EvtScript N(802A18B8) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -118,34 +118,34 @@ EvtScript N(802A18B8) = { EvtScript N(802A1C50) = { EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, 0x2041) - EVT_CALL(CreateNpc, 100, LVar0) + EVT_CALL(PlaySound, SOUND_2041) + EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) - EVT_CALL(SetNpcPos, 100, -75, 150, 0) - EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(SetNpcFlagBits, NPC_BTL_SPIRIT, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) + EVT_CALL(SetNpcPos, NPC_BTL_SPIRIT, -75, 150, 0) + EVT_CALL(SetNpcDecoration, NPC_BTL_SPIRIT, 0, NPC_DECORATION_WHITE_GLOW_BEHIND) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_SET(LVar0, 0) EVT_LOOP(8) EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_THREAD EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 30, 0, 10) - EVT_CALL(SetForegroundModelsVisible, 1) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetForegroundModelsVisible, TRUE) EVT_RETURN EVT_END }; @@ -154,68 +154,68 @@ EvtScript N(802A1E5C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2047) + EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2045) + EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_END_IF EVT_RETURN EVT_END @@ -248,11 +248,11 @@ EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A1520)) EVT_SET_CONST(LVar0, ANIM_BattleKlevar_Idle) EVT_EXEC_WAIT(N(802A1C50)) - EVT_CALL(SetNpcAnimation, 100, ANIM_BattleKlevar_Shout) + EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleKlevar_Shout) EVT_WAIT(16) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(PlaySound, SOUND_246) - EVT_CALL(PlayEffect, 0x62, 0, 0, 0, 0, EVT_FLOAT(1.0), 200, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STOP_WATCH, 0, 0, 0, 0, EVT_FLOAT(1.0), 200, 0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_246) EVT_WAIT(200) EVT_CALL(InitTargetIterator) @@ -262,10 +262,10 @@ EvtScript N(EVS_UsePower) = { EVT_IF_EQ(LVar0, 6) EVT_GOTO(1) EVT_END_IF - EVT_CALL(ItemDamageEnemy, LVar0, 1879048192, 0x80200564, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, DMG_STATUS_CHANCE(STATUS_FLAG_STOP, 5, 100), 0, BS_FLAGS1_SP_EVT_ACTIVE) EVT_WAIT(5) EVT_LABEL(1) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/move/star_power/twink_dash.c b/src/battle/move/star_power/twink_dash.c index 5530334624..9146eaaae6 100644 --- a/src/battle/move/star_power/twink_dash.c +++ b/src/battle/move/star_power/twink_dash.c @@ -37,7 +37,7 @@ EvtScript N(802A15B0) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -45,11 +45,11 @@ EvtScript N(802A15B0) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -61,14 +61,14 @@ EvtScript N(802A15B0) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -92,7 +92,7 @@ EvtScript N(802A1948) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -100,11 +100,11 @@ EvtScript N(802A1948) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -116,14 +116,14 @@ EvtScript N(802A1948) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -137,34 +137,34 @@ EvtScript N(802A1948) = { EvtScript N(802A1CE0) = { EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, 0x2041) - EVT_CALL(CreateNpc, 100, LVar0) + EVT_CALL(PlaySound, SOUND_2041) + EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) - EVT_CALL(SetNpcPos, 100, -75, 150, 0) - EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(SetNpcFlagBits, NPC_BTL_SPIRIT, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) + EVT_CALL(SetNpcPos, NPC_BTL_SPIRIT, -75, 150, 0) + EVT_CALL(SetNpcDecoration, NPC_BTL_SPIRIT, 0, NPC_DECORATION_WHITE_GLOW_BEHIND) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_SET(LVar0, 0) EVT_LOOP(8) EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_THREAD EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 30, 0, 10) - EVT_CALL(SetForegroundModelsVisible, 1) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetForegroundModelsVisible, TRUE) EVT_RETURN EVT_END }; @@ -173,68 +173,68 @@ EvtScript N(802A1EEC) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2047) + EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2045) + EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_END_IF EVT_RETURN EVT_END @@ -266,7 +266,7 @@ EvtScript N(802A233C) = { EvtScript N(EVS_UsePower) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0C0010) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_C0010) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -278,22 +278,22 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0D000F) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_D000F) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0C000C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_C000C) EVT_CALL(func_802A1518_79DDB8) EVT_WAIT(10) EVT_CALL(N(UnkBackgroundFunc)) EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0A0003) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_A0003) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x0A0001) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Peach_A0001) EVT_RETURN EVT_END }; diff --git a/src/battle/move/star_power/up_and_away.c b/src/battle/move/star_power/up_and_away.c index 3835137913..947c4b3c0a 100644 --- a/src/battle/move/star_power/up_and_away.c +++ b/src/battle/move/star_power/up_and_away.c @@ -79,7 +79,7 @@ EvtScript N(802A16D0) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -87,11 +87,11 @@ EvtScript N(802A16D0) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -103,14 +103,14 @@ EvtScript N(802A16D0) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -134,7 +134,7 @@ EvtScript N(802A1A68) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) @@ -142,11 +142,11 @@ EvtScript N(802A1A68) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) EVT_WAIT(10) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x01002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -158,14 +158,14 @@ EvtScript N(802A1A68) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(N(UnkStarFunc), 4) EVT_WAIT(8) - EVT_CALL(PlaySound, 0x241) + EVT_CALL(PlaySound, SOUND_241) EVT_CALL(N(UnkStarFunc), 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(PlaySound, 0x2051) + EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(N(UnkStarFunc), 1) EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -179,34 +179,34 @@ EvtScript N(802A1A68) = { EvtScript N(802A1E00) = { EVT_WAIT(8) - EVT_CALL(SetForegroundModelsVisible, 0) + EVT_CALL(SetForegroundModelsVisible, FALSE) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_73) EVT_CALL(MoveBattleCamOver, 1) - EVT_CALL(PlaySound, 0x2041) - EVT_CALL(CreateNpc, 100, LVar0) + EVT_CALL(PlaySound, SOUND_2041) + EVT_CALL(CreateNpc, NPC_BTL_SPIRIT, LVar0) EVT_CALL(N(SetNpcCollision32)) - EVT_CALL(SetNpcFlagBits, 100, ((NPC_FLAG_IGNORE_CAMERA_FOR_YAW)), TRUE) - EVT_CALL(SetNpcPos, 100, -75, 150, 0) - EVT_CALL(SetNpcDecoration, 100, 0, 5) + EVT_CALL(SetNpcFlagBits, NPC_BTL_SPIRIT, NPC_FLAG_IGNORE_CAMERA_FOR_YAW, TRUE) + EVT_CALL(SetNpcPos, NPC_BTL_SPIRIT, -75, 150, 0) + EVT_CALL(SetNpcDecoration, NPC_BTL_SPIRIT, 0, NPC_DECORATION_WHITE_GLOW_BEHIND) EVT_CALL(N(UnkStarFunc3), -75, 167, 0) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_SET(LVar0, 0) EVT_LOOP(8) EVT_ADD(LVar0, 67) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) EVT_THREAD EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 50) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 30, 0, 10) - EVT_CALL(SetForegroundModelsVisible, 1) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetForegroundModelsVisible, TRUE) EVT_RETURN EVT_END }; @@ -215,68 +215,68 @@ EvtScript N(802A200C) = { EVT_CALL(GetOwnerID, LVarA) EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2047) + EVT_CALL(PlaySound, SOUND_2047) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(PlaySound, 0x2045) + EVT_CALL(PlaySound, SOUND_2045) EVT_THREAD EVT_LOOP(5) EVT_WAIT(6) - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc4), LVar0, LVar1, LVar2) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(EnableNpcBlur, 100, 1) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, TRUE) EVT_THREAD EVT_SET(LVar2, 0) EVT_SET(LVar3, 720) - EVT_CALL(MakeLerp, LVar2, LVar3, 30, 2) + EVT_CALL(MakeLerp, LVar2, LVar3, 30, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) - EVT_CALL(SetNpcRotation, 100, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_BTL_SPIRIT, 0, LVar0, 0) EVT_WAIT(1) EVT_IF_EQ(LVar1, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(GetNpcPos, 100, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 60) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_ADD(LVar1, 140) - EVT_CALL(NpcFlyTo, 100, LVar0, LVar1, LVar2, 15, 0, 10) + EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 15, 0, EASING_COS_IN_OUT) EVT_WAIT(10) - EVT_CALL(EnableNpcBlur, 100, 0) - EVT_CALL(DeleteNpc, 100) + EVT_CALL(EnableNpcBlur, NPC_BTL_SPIRIT, FALSE) + EVT_CALL(DeleteNpc, NPC_BTL_SPIRIT) EVT_END_IF EVT_RETURN EVT_END @@ -309,7 +309,7 @@ EvtScript N(EVS_UsePower) = { EVT_EXEC_WAIT(N(802A16D0)) EVT_SET_CONST(LVar0, ANIM_BattleKalmar_Idle) EVT_EXEC_WAIT(N(802A1E00)) - EVT_CALL(SetNpcAnimation, 100, ANIM_BattleKalmar_Shout) + EVT_CALL(SetNpcAnimation, NPC_BTL_SPIRIT, ANIM_BattleKalmar_Shout) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_WAIT(20) EVT_CALL(SetMotionBlurParams, 0, 0, 0, 320, 240, 128, 10) @@ -336,7 +336,7 @@ EvtScript N(EVS_UsePower) = { EVT_SWITCH(LVar0) EVT_CASE_GT(0) EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_CALL(DispatchEvent, LVar0, 61) + EVT_CALL(DispatchEvent, LVar0, EVENT_UP_AND_AWAY) EVT_CALL(SetActorRotationOffset, LVar0, 0, 10, 0) EVT_THREAD EVT_CALL(GetOwnerTarget, LVarB, LVar1) @@ -360,7 +360,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(SetVirtualEntityRotation, LVarA, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySound, 0x2052) + EVT_CALL(PlaySound, SOUND_2052) EVT_SET(LVar0, LVarD) EVT_SET(LVar1, LVarE) EVT_SET(LVar2, LVarF) @@ -374,9 +374,9 @@ EvtScript N(EVS_UsePower) = { EVT_END_LOOP EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySound, 0x2071) + EVT_CALL(PlaySound, SOUND_2071) EVT_CALL(GetOwnerTarget, LVarA, LVar1) - EVT_CALL(SetActorFlagBits, LVarA, 4, 1) + EVT_CALL(SetActorFlagBits, LVarA, 4, TRUE) EVT_SETF(LVar0, EVT_FLOAT(1.0)) EVT_LOOP(18) EVT_SUBF(LVar0, EVT_FLOAT(0.05)) @@ -386,20 +386,20 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(SetActorPos, LVarA, NPC_DISPOSE_LOCATION) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_LOOP(10) - EVT_CALL(PlayEffect, 0x11, 1, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar1, LVar2, 20, 0) EVT_ADD(LVar1, 30) EVT_WAIT(5) EVT_END_LOOP - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_STAR_POINTS_DROPPED, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_STAR_POINTS_DROPPED, TRUE) EVT_CALL(RemoveActor, LVarA) EVT_END_THREAD EVT_CASE_DEFAULT EVT_IF_EQ(LocalFlag(0), 0) - EVT_CALL(PlayerDamageEnemy, LVar0, 0, 65535, 0, 0, BS_FLAGS1_FORCE_HIT_IMMUNE | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PlayerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 0, BS_FLAGS1_FORCE_HIT_IMMUNE | BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_IF EVT_END_SWITCH EVT_WAIT(5) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index 4d5e94aaf2..bf71e6343d 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -313,7 +313,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -379,14 +379,14 @@ EvtScript N(handleEvent) = { EVT_SET(LVarA, 0) EVT_CALL(N(PlayExplosionFX), LVar0, LVar1, LVar2) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.8)) - EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(0.3)) - EVT_CALL(ShakeCam, 1, 0, 8, EVT_FLOAT(0.1)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.8)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 8, EVT_FLOAT(0.1)) EVT_END_THREAD EVT_THREAD EVT_SET(LVar0, 0) @@ -401,7 +401,7 @@ EvtScript N(handleEvent) = { EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 200) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, 0, EASING_LINEAR) EVT_WAIT(50) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -444,14 +444,14 @@ EvtScript N(handleEvent) = { EVT_SET(LVarA, 0) EVT_CALL(N(PlayExplosionFX), LVar0, LVar1, LVar2) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.8)) - EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(0.3)) - EVT_CALL(ShakeCam, 1, 0, 8, EVT_FLOAT(0.1)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.8)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 8, EVT_FLOAT(0.1)) EVT_END_THREAD EVT_THREAD EVT_SET(LVar0, 0) @@ -466,7 +466,7 @@ EvtScript N(handleEvent) = { EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 200) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, 0, EASING_LINEAR) EVT_WAIT(50) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -519,14 +519,14 @@ EvtScript N(handleEvent) = { EVT_SET(LVarA, 0) EVT_CALL(N(PlayExplosionFX), LVar0, LVar1, LVar2) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.8)) - EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(0.3)) - EVT_CALL(ShakeCam, 1, 0, 8, EVT_FLOAT(0.1)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.8)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 8, EVT_FLOAT(0.1)) EVT_END_THREAD EVT_THREAD EVT_SET(LVar0, 0) @@ -541,7 +541,7 @@ EvtScript N(handleEvent) = { EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 200) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, 0, EASING_LINEAR) EVT_WAIT(50) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -617,8 +617,8 @@ EvtScript N(celebrate) = { }; EvtScript N(executeAction) = { - EVT_CALL(ShowActionHud, 1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar0) EVT_CASE_EQ(8) @@ -717,7 +717,7 @@ EvtScript N(returnHome2) = { EVT_WAIT(1) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Idle) EVT_WAIT(8) - EVT_CALL(ResetActorSounds, ACTOR_PARTNER, 0) + EVT_CALL(ResetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(5.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Run) @@ -758,7 +758,7 @@ EvtScript N(returnHome) = { EVT_WAIT(1) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Idle) EVT_WAIT(8) - EVT_CALL(ResetActorSounds, ACTOR_PARTNER, 0) + EVT_CALL(ResetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(5.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Run) @@ -934,7 +934,7 @@ EvtScript N(bodySlam) = { EVT_CALL(AddGoalPos, ACTOR_PARTNER, -10, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_BodySlam) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(6.0)) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Idle) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) @@ -958,7 +958,7 @@ EvtScript N(bodySlam) = { EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(5.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Run) - EVT_CALL(ResetActorSounds, ACTOR_PARTNER, 0) + EVT_CALL(ResetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Idle) EVT_RETURN @@ -1124,80 +1124,80 @@ EvtScript N(bomb) = { EVT_CASE_EQ(MOVE_BOMB) EVT_IF_GT(LVarA, 0) EVT_CALL(StartRumble, 4) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.75)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(4.5)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(6.0)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(2.25)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.2)) - EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(0.45)) - EVT_CALL(ShakeCam, 1, 0, 8, EVT_FLOAT(0.15)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.75)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(4.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(6.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(2.25)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(1.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.45)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 8, EVT_FLOAT(0.15)) EVT_ELSE EVT_CALL(StartRumble, 4) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.4)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.6)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(2.4)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.6)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.2)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.6)) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(1.2)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.64)) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(0.24)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.08)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(2.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(1.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.64)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(0.24)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.08)) EVT_END_IF EVT_CASE_EQ(MOVE_POWER_BOMB) EVT_IF_GT(LVarA, 0) EVT_CALL(StartRumble, 5) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.75)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(4.5)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(6.0)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(2.25)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.2)) - EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(0.45)) - EVT_CALL(ShakeCam, 1, 0, 8, EVT_FLOAT(0.15)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.75)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(4.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(6.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(2.25)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(1.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.45)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 8, EVT_FLOAT(0.15)) EVT_ELSE EVT_CALL(StartRumble, 5) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.4)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.6)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(2.4)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.6)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.2)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.6)) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(1.2)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.64)) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(0.24)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.08)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(2.4)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.6)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(1.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.64)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(0.24)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.08)) EVT_END_IF EVT_CASE_EQ(MOVE_MEGA_BOMB) EVT_IF_GT(LVarA, 0) EVT_CALL(StartRumble, 6) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.0)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(4.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(6.0)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(4.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(8.0)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(4.0)) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.6)) - EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(0.6)) - EVT_CALL(ShakeCam, 1, 0, 8, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(6.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(8.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(1.6)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.6)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 8, EVT_FLOAT(0.2)) EVT_ELSE EVT_CALL(StartRumble, 6) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(4.0)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(2.0)) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.8)) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(0.3)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(0.1)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(2.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(1.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.8)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(0.3)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.1)) EVT_END_IF EVT_END_SWITCH EVT_END_THREAD @@ -1209,9 +1209,9 @@ EvtScript N(bomb) = { EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_WAIT(8) EVT_IF_GT(LVarA, 0) - EVT_CALL(PlayEffect, EFFECT_RED_IMPACT, 0, LVar0, 0, LVar2, 1, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RED_IMPACT, 0, LVar0, 0, LVar2, 1, 0, 0) EVT_ELSE - EVT_CALL(PlayEffect, EFFECT_RED_IMPACT, 1, LVar0, 0, LVar2, 1, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RED_IMPACT, 1, LVar0, 0, LVar2, 1, 0, 0) EVT_END_IF EVT_CASE_EQ(MOVE_MEGA_BOMB) EVT_SET(LVarA, 0) @@ -1261,7 +1261,7 @@ EvtScript N(bomb) = { EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS, 0, 0, LVarF, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_SWITCH EVT_LABEL(6) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(5) EVT_END_IF @@ -1284,7 +1284,7 @@ EvtScript N(bomb) = { EVT_END_SWITCH EVT_LABEL(11) EVT_WAIT(5) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(10) EVT_END_IF @@ -1315,7 +1315,7 @@ EvtScript N(bomb) = { EVT_SUB(LVar0, 50) EVT_ADD(LVar1, 200) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, 0, EASING_LINEAR) EVT_WAIT(50) EVT_CALL(PartnerYieldTurn) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) @@ -1365,16 +1365,16 @@ EvtScript N(firstStrikeBodySlam) = { EVT_CALL(MoveBattleCamOver, 8) EVT_THREAD EVT_CALL(StartRumble, 4) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.75)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(4.5)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 10, EVT_FLOAT(6.0)) - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) - EVT_CALL(ShakeCam, 1, 0, 3, EVT_FLOAT(2.25)) - EVT_CALL(ShakeCam, 1, 0, 4, EVT_FLOAT(1.2)) - EVT_CALL(ShakeCam, 1, 0, 6, EVT_FLOAT(0.45)) - EVT_CALL(ShakeCam, 1, 0, 8, EVT_FLOAT(0.15)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.75)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(4.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(6.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(2.25)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(1.2)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(0.45)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 8, EVT_FLOAT(0.15)) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_CANNON1) EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) @@ -1413,7 +1413,7 @@ EvtScript N(firstStrikeBodySlam) = { EVT_SUB(LVar0, 50) EVT_ADD(LVar1, 200) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, 0, EASING_LINEAR) EVT_WAIT(50) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index ba89a0e66e..8cc25efb65 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -207,7 +207,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -363,7 +363,7 @@ EvtScript N(nextTurn) = { }; EvtScript N(executeAction) = { - EVT_CALL(ShowActionHud, 1) + EVT_CALL(ShowActionHud, TRUE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar0) EVT_CASE_EQ(8) @@ -380,10 +380,10 @@ EvtScript N(executeAction) = { EVT_CASE_EQ(MOVE_SMACK3) EVT_EXEC_WAIT(N(smack)) EVT_CASE_EQ(MOVE_OUTTA_SIGHT) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_EXEC_WAIT(N(outtaSight)) EVT_CASE_EQ(MOVE_SPOOK) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_EXEC_WAIT(N(spook)) EVT_CASE_EQ(MOVE_FAN_SMACK) EVT_EXEC_WAIT(N(fanSmack)) @@ -407,7 +407,7 @@ EvtScript N(returnHome2) = { EVT_WAIT(10) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_APPEAR) EVT_SET(LVar0, 55) @@ -436,7 +436,7 @@ EvtScript N(returnHome) = { EVT_WAIT(10) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_APPEAR) EVT_SET(LVar0, 55) @@ -454,7 +454,7 @@ EvtScript N(80238EE0) = { EVT_CALL(PartnerYieldTurn) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) EVT_RETURN EVT_END @@ -485,7 +485,7 @@ EvtScript N(smack) = { EVT_SET(LVar0, LVarB) EVT_ADD(LVar0, -3) EVT_CALL(action_command_smack_start, 0, LVar0, 3, 0) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH) EVT_CALL(SetPartAlpha, ACTOR_PARTNER, -1, 55) @@ -494,7 +494,7 @@ EvtScript N(smack) = { EVT_THREAD EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Run) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -15, -10, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13) @@ -542,7 +542,7 @@ EvtScript N(smack) = { EVT_END_LOOP EVT_CALL(SetActorYaw, ACTOR_PARTNER, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Injured) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, 3) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, ACTOR_DECORATION_SEEING_STARS) EVT_WAIT(30) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) @@ -567,10 +567,10 @@ EvtScript N(smack) = { EVT_WAIT(2) EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.2)) + 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, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.2)) EVT_END_THREAD EVT_IF_EQ(LVarE, 1) EVT_CALL(N(GetBowSize)) @@ -580,7 +580,7 @@ EvtScript N(smack) = { EVT_CALL(AddBattleCamZoom, 25) EVT_CALL(MoveBattleCamOver, 5) EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_PARTNER, 3, SOUND_2019, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_HURT, SOUND_2019, 0) EVT_IF_EQ(LVarE, 1) EVT_IF_GT(LVarB, 99) EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarC, BS_FLAGS1_40 | BS_FLAGS1_10) @@ -622,7 +622,7 @@ EvtScript N(smack) = { EVT_END_IF EVT_WAIT(2) EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, 3, SOUND_2019, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_HURT, SOUND_2019, 0) EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) @@ -648,8 +648,8 @@ EvtScript N(smack) = { }; EvtScript N(outtaSight) = { - EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, 1) - EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_4000000, 0) + EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, TRUE) + EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_4000000, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, -129, 28, 0) EVT_CALL(SetBattleCamOffsetZ, 15) @@ -659,7 +659,7 @@ EvtScript N(outtaSight) = { EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 5) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, 0, EASING_COS_IN_OUT) EVT_END_THREAD EVT_SET(LVar0, 0) EVT_LOOP(10) @@ -672,7 +672,7 @@ EvtScript N(outtaSight) = { EVT_ADD(LVar0, -30) EVT_ADD(LVar1, 30) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 30, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 30, EASING_COS_IN_OUT) EVT_THREAD EVT_SET(LVar0, 180) EVT_LOOP(10) @@ -693,7 +693,7 @@ EvtScript N(outtaSight) = { EVT_CALL(N(ModifyBowPos), -10, 20) EVT_ADD(LVar2, 5) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, EASING_LINEAR) EVT_CALL(N(IsPartnerImmobile)) EVT_IF_EQ(LVar0, 0) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Crouch) @@ -709,7 +709,7 @@ EvtScript N(outtaSight) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(N(ApplyOuttaSight)) - EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, 0) + EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, FALSE) EVT_RETURN EVT_END }; @@ -739,7 +739,7 @@ EvtScript N(hidePlayer) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 40) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, EASING_COS_IN_OUT) EVT_CALL(N(RestorePlayerIdleAnimations)) EVT_WAIT(20) EVT_RETURN @@ -764,7 +764,7 @@ EvtScript N(spook) = { EVT_ADD(LVar0, 40) EVT_ADD(LVar1, 10) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, EASING_COS_IN_OUT) EVT_WAIT(15) EVT_CALL(UseBattleCamPresetImmediately, 19) EVT_THREAD @@ -917,8 +917,8 @@ EvtScript N(spook) = { EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 32) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.8), 45, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.8), 45, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 45, 0) EVT_WAIT(15) EVT_CALL(InitTargetIterator) EVT_CALL(GetActionResult, LVarF) @@ -937,7 +937,7 @@ EvtScript N(spook) = { EVT_END_SWITCH EVT_LABEL(10) EVT_WAIT(5) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_EQ(LVar0, -1) EVT_BREAK_LOOP EVT_END_IF @@ -997,7 +997,7 @@ EvtScript N(fanSmack) = { EVT_SET(LVar0, LVarB) EVT_ADD(LVar0, -3) EVT_CALL(action_command_smack_start, 0, LVar0, 3, 1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH) EVT_CALL(SetPartAlpha, ACTOR_PARTNER, -1, 55) @@ -1006,7 +1006,7 @@ EvtScript N(fanSmack) = { EVT_THREAD EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Run) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -25, -10, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 0, EASING_COS_IN_OUT) EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -1059,7 +1059,7 @@ EvtScript N(fanSmack) = { EVT_END_LOOP EVT_CALL(SetActorYaw, ACTOR_PARTNER, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Injured) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, 3) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, ACTOR_DECORATION_SEEING_STARS) EVT_WAIT(40) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) @@ -1084,10 +1084,10 @@ EvtScript N(fanSmack) = { EVT_WAIT(2) EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.2)) + 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, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.2)) EVT_END_THREAD EVT_IF_EQ(LVarE, 1) EVT_CALL(N(GetBowSize)) @@ -1098,8 +1098,8 @@ EvtScript N(fanSmack) = { EVT_CALL(MoveBattleCamOver, 5) EVT_END_IF EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_CONFETTI, 5, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 20, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, 3, 8218, 0) + EVT_PLAY_EFFECT(EFFECT_CONFETTI, 5, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 20, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_HURT, SOUND_201A, 0) EVT_IF_EQ(LVarE, 1) EVT_IF_GT(LVarB, 99) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_80, 0, LVarC, BS_FLAGS1_40 | BS_FLAGS1_10) @@ -1137,10 +1137,10 @@ EvtScript N(fanSmack) = { EVT_GOTO(0) EVT_LABEL(2) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 2, EVT_FLOAT(1.5)) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.5)) - EVT_CALL(ShakeCam, 1, 0, 1, EVT_FLOAT(0.2)) + 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, 1, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 1, EVT_FLOAT(0.2)) EVT_END_THREAD EVT_IF_EQ(LVarE, 1) EVT_CALL(N(GetBowSize)) @@ -1162,7 +1162,7 @@ EvtScript N(fanSmack) = { EVT_END_IF EVT_WAIT(2) EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, 3, 8218, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_HURT, SOUND_201A, 0) EVT_CALL(GetActionCommandResult, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 0d0ab6110e..7b21cd20a0 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -539,7 +539,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -570,7 +570,7 @@ EvtScript N(idle) = { }; EvtScript N(handleEvent) = { - EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, 0) + EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(CloseActionCommandInfo) EVT_CALL(GetLastEvent, ACTOR_PARTNER, LVar0) EVT_SWITCH(LVar0) @@ -632,7 +632,7 @@ EvtScript N(handleEvent) = { EVT_END_CASE_GROUP EVT_CASE_DEFAULT EVT_END_SWITCH - EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, 1) + EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_RETURN EVT_END }; @@ -667,8 +667,8 @@ EvtScript N(celebrate) = { EvtScript N(executeAction) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_CALL(ShowActionHud, 1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_SWITCH(LVar0) EVT_CASE_EQ(8) EVT_CALL(LoadStarPowerScript) @@ -711,14 +711,14 @@ EvtScript N(runAway) = { }; EvtScript N(runAwayFail) = { - EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, 0) + EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Run) EVT_CALL(SetActorYaw, ACTOR_PARTNER, 0) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle) - EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, 1) + EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_RETURN EVT_END }; @@ -728,38 +728,38 @@ EvtScript N(nextTurn) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(PHASE_PLAYER_BEGIN) EVT_IF_EQ(GF_Tutorial_SwapTurnOrder, 0) - EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, 0) + EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(10) - EVT_CALL(SetActorYaw, 0, 30) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) - EVT_CALL(SetActorYaw, 0, 60) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) EVT_WAIT(1) - EVT_CALL(SetActorYaw, 0, 90) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 90) EVT_WAIT(1) - EVT_CALL(SetActorYaw, 0, 120) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 120) EVT_WAIT(1) - EVT_CALL(SetActorYaw, 0, 150) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 150) EVT_WAIT(1) - EVT_CALL(SetActorYaw, 0, 180) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 180) EVT_WAIT(5) EVT_CALL(ActorSpeak, MSG_CH0_00BA, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Talk, ANIM_BattleGoombario_Idle) - EVT_CALL(SetActorYaw, 0, 150) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 150) EVT_WAIT(1) - EVT_CALL(SetActorYaw, 0, 120) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 120) EVT_WAIT(1) - EVT_CALL(SetActorYaw, 0, 90) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 90) EVT_WAIT(1) - EVT_CALL(SetActorYaw, 0, 60) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) EVT_WAIT(1) - EVT_CALL(SetActorYaw, 0, 30) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) - EVT_CALL(SetActorYaw, 0, 0) + EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) EVT_WAIT(5) EVT_SET(GF_Tutorial_SwapTurnOrder, 1) - EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, 1) + EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_END_IF EVT_END_SWITCH EVT_RETURN @@ -788,7 +788,7 @@ EvtScript N(returnHome) = { EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_PARTNER, EVT_FLOAT(1.2)) EVT_CALL(N(GetReturnMoveTime)) - EVT_CALL(JumpToGoal, ACTOR_PARTNER, LVar0, 0, 1, 0) + EVT_CALL(JumpToGoal, ACTOR_PARTNER, LVar0, FALSE, TRUE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleGoombario_PreHeadbonk) EVT_CALL(SetActorDispOffset, ACTOR_PARTNER, 0, 18, 0) EVT_WAIT(1) @@ -798,7 +798,7 @@ EvtScript N(returnHome) = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -10, 0, 0) - EVT_CALL(JumpToGoal, ACTOR_PARTNER, 6, 0, 0, 1) + EVT_CALL(JumpToGoal, ACTOR_PARTNER, 6, FALSE, FALSE, TRUE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleGoombario_PreHeadbonk) EVT_CALL(SetActorDispOffset, ACTOR_PARTNER, 0, 18, 0) @@ -852,7 +852,7 @@ EvtScript N(returnHome2) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_END_THREAD - EVT_CALL(JumpToGoal, ACTOR_PARTNER, LVar0, 0, 1, 0) + EVT_CALL(JumpToGoal, ACTOR_PARTNER, LVar0, FALSE, TRUE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleGoombario_PreHeadbonk) EVT_CALL(SetActorDispOffset, ACTOR_PARTNER, 0, 18, 0) EVT_WAIT(1) @@ -860,14 +860,14 @@ EvtScript N(returnHome2) = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -20, 0, 0) - EVT_CALL(JumpToGoal, ACTOR_PARTNER, 6, 0, 0, 1) + EVT_CALL(JumpToGoal, ACTOR_PARTNER, 6, FALSE, FALSE, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleGoombario_PreHeadbonk) EVT_CALL(SetActorDispOffset, ACTOR_PARTNER, 0, 18, 0) EVT_WAIT(1) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -10, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(JumpToGoal, ACTOR_PARTNER, 4, 0, 0, 1) + EVT_CALL(JumpToGoal, ACTOR_PARTNER, 4, FALSE, FALSE, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleGoombario_PreHeadbonk) EVT_CALL(SetActorDispOffset, ACTOR_PARTNER, 0, 18, 0) EVT_WAIT(1) @@ -946,7 +946,7 @@ EvtScript N(headbonk1) = { EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(OnMissHeadbonk)) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_162) EVT_WAIT(20) @@ -972,7 +972,7 @@ EvtScript N(headbonk1) = { EVT_ADD(LVar0, 1) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -993,7 +993,7 @@ EvtScript N(headbonk1) = { EVT_CALL(CloseActionCommandInfo) EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_CALL(ShowActionHud, 0) + EVT_CALL(ShowActionHud, FALSE) EVT_CALL(action_command_jump_start, 24, 3) EVT_SET(LVarA, 24) EVT_THREAD @@ -1020,7 +1020,7 @@ EvtScript N(headbonk1) = { EVT_CALL(N(StopChargeAndGet)) EVT_ADD(LVar0, 1) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(returnHome2)) EVT_RETURN @@ -1051,7 +1051,7 @@ EvtScript N(headbonk2) = { EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(OnMissHeadbonk)) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_162) EVT_WAIT(20) @@ -1077,7 +1077,7 @@ EvtScript N(headbonk2) = { EVT_ADD(LVar0, 2) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1098,7 +1098,7 @@ EvtScript N(headbonk2) = { EVT_CALL(CloseActionCommandInfo) EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_CALL(ShowActionHud, 0) + EVT_CALL(ShowActionHud, FALSE) EVT_CALL(action_command_jump_start, 24, 3) EVT_SET(LVarA, 24) EVT_THREAD @@ -1127,7 +1127,7 @@ EvtScript N(headbonk2) = { EVT_CALL(N(StopChargeAndGet)) EVT_ADD(LVar0, 2) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(returnHome2)) EVT_RETURN @@ -1158,7 +1158,7 @@ EvtScript N(headbonk3) = { EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(OnMissHeadbonk)) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_162) EVT_WAIT(20) @@ -1184,7 +1184,7 @@ EvtScript N(headbonk3) = { EVT_ADD(LVar0, 3) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1205,7 +1205,7 @@ EvtScript N(headbonk3) = { EVT_CALL(CloseActionCommandInfo) EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_CALL(ShowActionHud, 0) + EVT_CALL(ShowActionHud, FALSE) EVT_CALL(action_command_jump_start, 24, 3) EVT_SET(LVarA, 24) EVT_THREAD @@ -1243,7 +1243,7 @@ EvtScript N(headbonk3) = { EVT_CALL(N(StopChargeAndGet)) EVT_ADD(LVar0, 3) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(returnHome2)) EVT_RETURN @@ -1278,7 +1278,7 @@ EvtScript N(multibonk) = { EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(OnMissHeadbonk)) EVT_THREAD - EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_162) EVT_WAIT(20) @@ -1304,7 +1304,7 @@ EvtScript N(multibonk) = { EVT_ADD(LVar0, 3) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1392,19 +1392,19 @@ EvtScript N(multibonk) = { EVT_IF_EQ(LocalFlag(0), 0) EVT_CALL(N(GetChargeAmount)) EVT_ADD(LVar0, 3) - EVT_CALL(PartnerPowerBounceEnemy, LVar0, 1048704, 0, 0, LVar0, LVarD, BS_FLAGS1_40) + EVT_CALL(PartnerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, LVarD, BS_FLAGS1_40) EVT_ELSE EVT_CALL(N(StopChargeAndGet)) EVT_ADD(LVar0, 3) - EVT_CALL(PartnerPowerBounceEnemy, LVar0, 1048704, 0, 0, LVar0, LVarD, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, LVarD, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_IF EVT_CASE_DEFAULT EVT_CALL(N(StopChargeAndGet)) EVT_ADD(LVar0, 3) - EVT_CALL(PartnerPowerBounceEnemy, LVar0, 1048704, 0, 0, LVar0, LVarD, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, LVarD, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SET(LocalFlag(0), 0) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, 0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) EVT_CALL(func_80269550, LVarE) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1432,15 +1432,15 @@ EvtScript N(tattle) = { EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(6.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Run) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, 0) + EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle) EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4, TRUE) EVT_CALL(N(OpenTattleWindow)) EVT_WAIT(12) - EVT_CALL(SetCamEnabled, CAM_TATTLE, 1) - EVT_CALL(SetCamFlag80, CAM_TATTLE, 0) + EVT_CALL(SetCamEnabled, CAM_TATTLE, TRUE) + EVT_CALL(SetCamFlag80, CAM_TATTLE, FALSE) EVT_CALL(SetCamPerspective, CAM_TATTLE, 6, 25, 16, 1024) EVT_CALL(SetCamViewport, CAM_TATTLE, 137, 95, 138, 99) EVT_CALL(GetOwnerTarget, LVarA, LVarB) @@ -1452,16 +1452,16 @@ EvtScript N(tattle) = { EVT_CALL(func_802CABE8, CAM_TATTLE, 0, LVar3, 100, 4) EVT_WAIT(2) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_282) - EVT_CALL(SetCamFlag80, CAM_TATTLE, 1) + EVT_CALL(SetCamFlag80, CAM_TATTLE, TRUE) EVT_WAIT(10) EVT_CALL(N(GetTattleMessage)) EVT_CALL(ActorSpeak, LVar0, ACTOR_SELF, 1, ANIM_BattleGoombario_Talk, ANIM_BattleGoombario_Idle) EVT_CALL(N(CloseTattleWindow)) EVT_WAIT(12) - EVT_CALL(SetCamEnabled, CAM_TATTLE, 0) + EVT_CALL(SetCamEnabled, CAM_TATTLE, FALSE) EVT_WAIT(32) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4, FALSE) EVT_CALL(PartnerYieldTurn) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) @@ -1490,7 +1490,7 @@ EvtScript N(charge) = { EVT_ADD(LVar1, 15) EVT_ADD(LVar2, -5) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2003) - EVT_CALL(PlayEffect, EFFECT_ENERGY_ORB_WAVE, 9, LVar0, LVar1, LVar2, EVT_FLOAT(2.0), 20, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 9, LVar0, LVar1, LVar2, EVT_FLOAT(2.0), 20, 0) EVT_END_THREAD EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle) @@ -1508,22 +1508,22 @@ EvtScript N(charge) = { EVT_WAIT(4) EVT_CALL(SetActorJumpGravity, ACTOR_PARTNER, EVT_FLOAT(1.4)) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, ANIM_BattleGoombario_Jump, 1, ANIM_BattleGoombario_Jump, ANIM_BattleGoombario_Jump) + EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, ANIM_BattleGoombario_Jump, 0x00000001, ANIM_BattleGoombario_Jump, ANIM_BattleGoombario_Jump) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(JumpToGoal, ACTOR_PARTNER, 20, 1, 1, 0) + EVT_CALL(JumpToGoal, ACTOR_PARTNER, 20, TRUE, TRUE, FALSE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleGoombario_Idle) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar2) EVT_CASE_EQ(MOVE_TATTLE) - EVT_CALL(ShowMessageBox, 36, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_24, 60) EVT_CASE_EQ(MOVE_CHARGE) EVT_CALL(N(GetChargeMessage)) EVT_CALL(ShowMessageBox, LVar0, 60) EVT_CASE_EQ(MOVE_MULTIBONK) - EVT_CALL(ShowMessageBox, 36, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_24, 60) EVT_END_SWITCH EVT_ELSE - EVT_CALL(ShowMessageBox, 8, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_08, 60) EVT_END_IF EVT_LABEL(0) EVT_WAIT(1) diff --git a/src/battle/partner/goompa.c b/src/battle/partner/goompa.c index 93352c5739..e45d71d1ae 100644 --- a/src/battle/partner/goompa.c +++ b/src/battle/partner/goompa.c @@ -64,7 +64,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .spinSmashReq = 4, .powerBounceChance = 80, diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index 7e6cdb87f4..250f7ae30f 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -240,7 +240,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -394,8 +394,8 @@ EvtScript N(nextTurn) = { }; EvtScript N(executeAction) = { - EVT_CALL(ShowActionHud, 1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar0) EVT_CASE_EQ(8) @@ -452,7 +452,7 @@ EvtScript N(firstStrike) = { }; EvtScript N(returnHomeOnMiss) = { - EVT_CALL(ResetActorSounds, ACTOR_PARTNER, 0) + EVT_CALL(ResetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK) EVT_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) EVT_WAIT(30) @@ -485,7 +485,7 @@ EvtScript N(returnHomeOnMiss) = { }; EvtScript N(returnHome) = { - EVT_CALL(ResetActorSounds, ACTOR_PARTNER, 0) + EVT_CALL(ResetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_CALL(PartnerYieldTurn) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -567,22 +567,22 @@ EvtScript N(shellToss) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) EVT_CASE_EQ(20) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_LT(30) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlower) EVT_CASE_EQ(30) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_LT(40) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinFaster) EVT_CASE_EQ(40) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_LT(50) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinFastest) EVT_CASE_EQ(50) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_END_SWITCH EVT_ADD(LVar9, 1) EVT_CALL(GetActionResult, LVar0) @@ -622,10 +622,10 @@ EvtScript N(shellToss) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 15) EVT_EXEC_WAIT(N(getShellTossMoveTime)) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, 5) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, ACTOR_DECORATION_GREY_SMOKE_TRAIL) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, LVarA) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_10) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -644,7 +644,7 @@ EvtScript N(shellToss) = { EVT_END_LOOP EVT_WAIT(5) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 16, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 16, 4, 0, 10, 0) EVT_LOOP(5) EVT_ADD(LVar0, 12) EVT_CALL(SetActorRotation, ACTOR_PARTNER, 0, 0, LVar0) @@ -736,22 +736,22 @@ EvtScript N(powerShell) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) EVT_CASE_EQ(20) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_LT(30) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlower) EVT_CASE_EQ(30) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_LT(40) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinFaster) EVT_CASE_EQ(40) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_LT(50) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinFastest) EVT_CASE_EQ(50) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_END_SWITCH EVT_ADD(LVar9, 1) EVT_CALL(GetActionResult, LVar0) @@ -795,12 +795,12 @@ EvtScript N(powerShell) = { EVT_SET(LVarB, 260) EVT_DIVF(LVarB, LVarA) EVT_THREAD - EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 1, 5) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 1, ACTOR_DECORATION_GREY_SMOKE_TRAIL) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 260) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, LVarA) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 0, 1) @@ -837,7 +837,7 @@ EvtScript N(powerShell) = { EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) EVT_LABEL(12) - EVT_CALL(ChooseNextTarget, 0, LVar2) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar2) EVT_IF_NE(LVar2, -1) EVT_GOTO(10) EVT_END_IF @@ -896,7 +896,7 @@ EvtScript N(dizzyShell) = { EVT_SET(LVar9, 0) EVT_SET(LVarA, EVT_FLOAT(8.0)) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2026) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 1, 7) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 1, ACTOR_DECORATION_WHIRLWIND) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_SET(LVar9, 1) EVT_LOOP(LVarD) @@ -919,16 +919,16 @@ EvtScript N(dizzyShell) = { EVT_SWITCH(LVarD) EVT_CASE_EQ(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_EQ(20) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_EQ(40) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_CASE_EQ(60) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_END_SWITCH EVT_END_LOOP EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_290) @@ -937,13 +937,13 @@ EvtScript N(dizzyShell) = { EVT_SET(LVarB, 300) EVT_DIVF(LVarB, LVarA) EVT_THREAD - EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, 5) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, ACTOR_DECORATION_GREY_SMOKE_TRAIL) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 350) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, LVarA) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 0, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 0, 1) @@ -952,7 +952,7 @@ EvtScript N(dizzyShell) = { EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 40, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(12.0)) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, 0, 6) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, 0, EASING_QUARTIC_OUT) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_END_THREAD @@ -1006,7 +1006,7 @@ EvtScript N(dizzyShell) = { EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) EVT_LABEL(12) - EVT_CALL(ChooseNextTarget, 0, LVar2) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar2) EVT_IF_NE(LVar2, -1) EVT_GOTO(10) EVT_END_IF @@ -1066,9 +1066,9 @@ EvtScript N(fireShell) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200C) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_28E) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, 4) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 0, 0, ACTOR_DECORATION_RED_FLAMES) EVT_WAIT(1) - EVT_CALL(ModifyActorDecoration, 256, -1, 0, 10, 10, 255, 0) + EVT_CALL(ModifyActorDecoration, ACTOR_PARTNER, -1, 0, 10, 10, 255, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(func_8026EA7C, ACTOR_PARTNER, -1, 15) EVT_CALL(func_8026EBF8, ACTOR_PARTNER, -1, 0, 0, 1, 10, 1000, 10, 0, 0) @@ -1137,16 +1137,16 @@ EvtScript N(fireShell) = { EVT_SWITCH(LVarD) EVT_CASE_EQ(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar3, LVar4, LVar5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar3, LVar4, LVar5, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar3, LVar4, LVar5, 32, 4, 0, 10, 0) EVT_CASE_EQ(20) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar3, LVar4, LVar5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar3, LVar4, LVar5, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar3, LVar4, LVar5, 32, 4, 0, 10, 0) EVT_CASE_EQ(40) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar3, LVar4, LVar5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar3, LVar4, LVar5, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar3, LVar4, LVar5, 32, 4, 0, 10, 0) EVT_CASE_EQ(60) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar3, LVar4, LVar5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar3, LVar4, LVar5, 32, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar3, LVar4, LVar5, 32, 4, 0, 10, 0) EVT_END_SWITCH EVT_END_LOOP EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_28F) @@ -1172,26 +1172,26 @@ EvtScript N(fireShell) = { EVT_SET(LVarB, 350) EVT_DIVF(LVarB, LVarA) EVT_THREAD - EVT_CALL(AddActorDecoration, ACTOR_PARTNER, -1, 1, 6) + EVT_CALL(AddActorDecoration, ACTOR_PARTNER, -1, 1, ACTOR_DECORATION_FIRE_SMOKE_TRAIL) EVT_WAIT(1) EVT_SWITCH(LVarE) EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(1) - EVT_CALL(ModifyActorDecoration, 256, -1, 1, 50, 0, 0, 0) + EVT_CALL(ModifyActorDecoration, ACTOR_PARTNER, -1, 1, 50, 0, 0, 0) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) - EVT_CALL(ModifyActorDecoration, 256, -1, 1, 100, 0, 0, 0) + EVT_CALL(ModifyActorDecoration, ACTOR_PARTNER, -1, 1, 100, 0, 0, 0) EVT_END_CASE_GROUP EVT_CASE_EQ(4) - EVT_CALL(ModifyActorDecoration, 256, -1, 1, 300, 0, 0, 0) + EVT_CALL(ModifyActorDecoration, ACTOR_PARTNER, -1, 1, 300, 0, 0, 0) EVT_END_SWITCH EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 350) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, LVarA) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 0, 1) EVT_WAIT(20) @@ -1201,7 +1201,7 @@ EvtScript N(fireShell) = { EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 40, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(12.0)) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, 0, 6) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, 0, EASING_QUARTIC_OUT) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_END_THREAD @@ -1239,7 +1239,7 @@ EvtScript N(fireShell) = { EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) EVT_LABEL(12) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(10) EVT_END_IF @@ -1282,7 +1282,7 @@ EvtScript N(shellTossOnFirstStrike) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(16.0)) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, 0, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_10) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -1301,7 +1301,7 @@ EvtScript N(shellTossOnFirstStrike) = { EVT_END_LOOP EVT_WAIT(5) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar4, LVar5, LVar6) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 16, 4, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 16, 4, 0, 10, 0) EVT_LOOP(5) EVT_ADD(LVar0, 12) EVT_CALL(SetActorRotation, ACTOR_PARTNER, 0, 0, LVar0) diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index 082f62429c..3a9a9f60d8 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -161,7 +161,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -296,10 +296,10 @@ EvtScript N(runAwayFail) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) EVT_CALL(SetActorYaw, ACTOR_PARTNER, 0) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_RETURN EVT_END @@ -312,7 +312,7 @@ EvtScript N(nextTurn) = { EvtScript N(executeAction) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) - EVT_CALL(ShowActionHud, 1) + EVT_CALL(ShowActionHud, TRUE) EVT_SWITCH(LVar0) EVT_CASE_EQ(8) EVT_CALL(LoadStarPowerScript) @@ -322,18 +322,18 @@ EvtScript N(executeAction) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar2) EVT_CASE_EQ(MOVE_SPINY_FLIP1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_EXEC_WAIT(N(spinyFlip)) EVT_CASE_EQ(MOVE_SPINY_FLIP2) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_EXEC_WAIT(N(spinyFlip)) EVT_CASE_EQ(MOVE_SPINY_FLIP3) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_EXEC_WAIT(N(spinyFlip)) EVT_CASE_EQ(MOVE_SPINY_SURGE) EVT_EXEC_WAIT(N(spinySurge)) EVT_CASE_EQ(MOVE_CLOUD_NINE) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_EXEC_WAIT(N(cloudNine)) EVT_CASE_EQ(MOVE_HURRICANE) EVT_EXEC_WAIT(N(hurricane)) @@ -346,9 +346,9 @@ EvtScript N(returnHome2) = { EVT_CALL(PartnerYieldTurn) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 0, 10) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 0, EASING_COS_IN_OUT) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk) EVT_RETURN EVT_END }; @@ -357,9 +357,9 @@ EvtScript N(returnHome) = { EVT_CALL(PartnerYieldTurn) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 0, 10) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 0, EASING_COS_IN_OUT) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk) EVT_RETURN EVT_END }; @@ -814,13 +814,13 @@ EvtScript N(spinyFlip) = { EVT_THREAD EVT_CALL(N(SpinyFlipUpdatePopup)) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) EVT_ADD(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, 10) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Idle) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Idle) EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) @@ -834,9 +834,9 @@ EvtScript N(spinyFlip) = { EVT_ADD(LVar2, 5) EVT_CALL(SetPartPos, ACTOR_PARTNER, 2, LVar0, LVar1, LVar2) EVT_WAIT(1) - EVT_CALL(SetPartFlagBits, ACTOR_PARTNER, 2, ACTOR_PART_FLAG_INVISIBLE, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_BattleLakilester_Spiny) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_LiftSpiny) + EVT_CALL(SetPartFlagBits, ACTOR_PARTNER, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_BattleLakilester_Spiny) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_LiftSpiny) EVT_LOOP(4) EVT_ADD(LVar1, 6) EVT_CALL(SetPartPos, ACTOR_PARTNER, 2, LVar0, LVar1, LVar2) @@ -846,7 +846,7 @@ EvtScript N(spinyFlip) = { EVT_ADD(LVar0, 8) EVT_ADD(LVar1, 40) EVT_ADD(LVar2, 5) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 80, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 80, 0) EVT_CALL(SetActorVar, ACTOR_PARTNER, 0, 1) EVT_THREAD EVT_LOOP(40) @@ -876,23 +876,23 @@ EvtScript N(spinyFlip) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_201B) EVT_SWITCH(LVarF) EVT_CASE_EQ(-1) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_BattleLakilester_SpinySpin) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_BattleLakilester_SpinySpin) EVT_CALL(SetPartJumpGravity, ACTOR_PARTNER, 2, EVT_FLOAT(1.5)) EVT_SET(LVar0, LVar7) EVT_SET(LVar1, LVar8) EVT_SET(LVar2, LVar9) EVT_CALL(JumpPartTo, ACTOR_PARTNER, 2, LVar7, LVar8, LVar9, 20) - EVT_CALL(LandJumpPart, 256, 2) + EVT_CALL(LandJumpPart, ACTOR_PARTNER, 2) EVT_CASE_EQ(0) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_BattleLakilester_SpinySpin) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_BattleLakilester_SpinySpin) EVT_CALL(SetPartJumpGravity, ACTOR_PARTNER, 2, EVT_FLOAT(1.5)) EVT_SET(LVar0, LVar7) EVT_SET(LVar1, LVar8) EVT_SET(LVar2, LVar9) EVT_CALL(JumpPartTo, ACTOR_PARTNER, 2, LVar7, LVar8, LVar9, 20) - EVT_CALL(LandJumpPart, 256, 2) + EVT_CALL(LandJumpPart, ACTOR_PARTNER, 2) EVT_CASE_DEFAULT - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_BattleLakilester_SpinySpin) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_BattleLakilester_SpinySpin) EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetPartJumpGravity, ACTOR_PARTNER, 2, EVT_FLOAT(1.5)) EVT_CALL(JumpPartTo, ACTOR_PARTNER, 2, LVar0, LVar1, LVar2, 20) @@ -902,7 +902,7 @@ EvtScript N(spinyFlip) = { EVT_SET(LVar1, 0) EVT_CALL(SetPartJumpGravity, ACTOR_PARTNER, 2, EVT_FLOAT(1.5)) EVT_CALL(JumpPartTo, ACTOR_PARTNER, 2, LVar0, LVar1, LVar2, 15) - EVT_CALL(SetPartFlagBits, ACTOR_PARTNER, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_PARTNER, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar2) @@ -960,10 +960,10 @@ EvtScript N(spinySurge) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 60, 20, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, 10) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Idle) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Idle) EVT_WAIT(10) EVT_CALL(GetActorLevel, ACTOR_PARTNER, LVar0) EVT_SWITCH(LVar0) @@ -977,7 +977,7 @@ EvtScript N(spinySurge) = { EVT_SET(LVarB, LVarA) EVT_ADD(LVarB, -3) EVT_CALL(action_command_spiny_surge_start, 0, LVarB, 3) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(InitTargetIterator) EVT_CALL(SetActorVar, ACTOR_PARTNER, 0, 0) EVT_SET(LVar9, 0) @@ -991,19 +991,19 @@ EvtScript N(spinySurge) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(-1) EVT_SET(LVar9, 0) - EVT_CALL(SetPartFlagBits, ACTOR_PARTNER, 2, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Idle) + EVT_CALL(SetPartFlagBits, ACTOR_PARTNER, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Idle) EVT_CASE_EQ(1) EVT_IF_EQ(LVar9, 1) EVT_BREAK_SWITCH EVT_END_IF - EVT_CALL(SetPartFlagBits, ACTOR_PARTNER, 2, ACTOR_PART_FLAG_INVISIBLE, 0) + EVT_CALL(SetPartFlagBits, ACTOR_PARTNER, 2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 3) EVT_ADD(LVar1, 34) EVT_ADD(LVar2, 5) EVT_CALL(SetPartPos, ACTOR_PARTNER, 2, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_LiftSpiny) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_LiftSpiny) EVT_SET(LVar9, 1) EVT_CASE_EQ(2) EVT_IF_EQ(LVar9, 0) @@ -1018,7 +1018,7 @@ EvtScript N(spinySurge) = { EVT_END_IF EVT_CALL(N(ThrowSpinyFX)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_ThrowSpinyAlt) - EVT_CALL(SetPartFlagBits, ACTOR_PARTNER, 2, ACTOR_PART_FLAG_INVISIBLE, 1) + EVT_CALL(SetPartFlagBits, ACTOR_PARTNER, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CHILD_THREAD EVT_CALL(GetActorVar, ACTOR_PARTNER, 0, LVar0) EVT_ADD(LVar0, 1) @@ -1033,8 +1033,8 @@ EvtScript N(spinySurge) = { EVT_END_SWITCH EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPartFlagBits, ACTOR_PARTNER, 2, ACTOR_PART_FLAG_INVISIBLE, 1) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Idle) + EVT_CALL(SetPartFlagBits, ACTOR_PARTNER, 2, ACTOR_PART_FLAG_INVISIBLE, TRUE) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Idle) EVT_LOOP(0) EVT_CALL(GetActorVar, ACTOR_PARTNER, 0, LVar0) EVT_IF_EQ(LVar0, 0) @@ -1072,7 +1072,7 @@ EvtScript N(spinySurge) = { EVT_END_SWITCH EVT_WAIT(6) EVT_LABEL(12) - EVT_CALL(ChooseNextTarget, 0, LVar1) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar1) EVT_IF_NE(LVar1, -1) EVT_GOTO(0) EVT_END_IF @@ -1094,8 +1094,8 @@ EvtScript N(spinySurge) = { EvtScript N(cloudNine_normal) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_8, 0) - EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_8, FALSE) + EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, TRUE) EVT_CALL(LoadActionCommand, ACTION_COMMAND_WATER_BLOCK) EVT_CALL(action_command_water_block_init, 2) EVT_CALL(SetActionHudPrepareTime, 50) @@ -1112,7 +1112,7 @@ EvtScript N(cloudNine_normal) = { EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 40) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) EVT_END_THREAD EVT_WAIT(15) EVT_SET(LVar0, 0) @@ -1122,7 +1122,7 @@ EvtScript N(cloudNine_normal) = { EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_CloudNineBegin) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_CloudNineBegin) EVT_WAIT(5) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_CloudNineIdle) EVT_WAIT(15) @@ -1152,10 +1152,10 @@ EvtScript N(cloudNine_normal) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_201D) EVT_CALL(N(CloudNineFX)) EVT_CALL(N(ApplyCloudNine)) - EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_8000000, 1) + EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_8000000, TRUE) EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_CloudNineEnd) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_CloudNineEnd) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) EVT_LOOP(10) @@ -1168,7 +1168,7 @@ EvtScript N(cloudNine_normal) = { EVT_CALL(RandInt, 30, LVar6) EVT_SUB(LVar6, 15) EVT_ADD(LVar1, LVar6) - EVT_CALL(PlayEffect, EFFECT_FLOATING_CLOUD_PUFF, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 20, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FLOATING_CLOUD_PUFF, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 20, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -1176,7 +1176,7 @@ EvtScript N(cloudNine_normal) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerFallToGoal, 10) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ReadyJump) EVT_WAIT(7) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) @@ -1186,13 +1186,13 @@ EvtScript N(cloudNine_normal) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) EVT_CALL(PlayerRunToGoal, 0) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, 0) + EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, FALSE) EVT_END_THREAD EVT_THREAD EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 40) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) EVT_END_THREAD EVT_WAIT(15) EVT_SET(LVar0, 180) @@ -1205,10 +1205,10 @@ EvtScript N(cloudNine_normal) = { EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(10) EVT_IF_GT(LVarA, 0) - EVT_CALL(ShowMessageBox, 40, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_28, 60) EVT_CALL(WaitForMessageBoxDone) EVT_END_IF - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_8, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_8, TRUE) EVT_RETURN EVT_END }; @@ -1235,24 +1235,24 @@ EvtScript N(cloudNine_immobile) = { EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_CloudNineBegin) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_CloudNineBegin) EVT_WAIT(20) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 12) EVT_ADD(LVar1, -7) EVT_ADD(LVar2, 5) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, -10, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, -10, EASING_COS_IN_OUT) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 40) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PLAYER, 20, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PLAYER, 20, 0, EASING_COS_IN_OUT) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 40) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, EASING_COS_IN_OUT) EVT_CALL(action_command_water_block_start, 0, 97, 3) EVT_CALL(AddBattleCamZoom, -75) EVT_CALL(MoveBattleCamOver, 100) @@ -1268,7 +1268,7 @@ EvtScript N(cloudNine_immobile) = { EVT_CALL(N(ApplyCloudNine)) EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_CloudNineEnd) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_CloudNineEnd) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) EVT_LOOP(10) @@ -1281,7 +1281,7 @@ EvtScript N(cloudNine_immobile) = { EVT_CALL(RandInt, 30, LVar6) EVT_SUB(LVar6, 15) EVT_ADD(LVar1, LVar6) - EVT_CALL(PlayEffect, EFFECT_FLOATING_CLOUD_PUFF, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 20, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FLOATING_CLOUD_PUFF, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 20, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD @@ -1289,7 +1289,7 @@ EvtScript N(cloudNine_immobile) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(FallToGoal, ACTOR_PLAYER, 10) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk) EVT_THREAD EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) @@ -1299,7 +1299,7 @@ EvtScript N(cloudNine_immobile) = { EVT_END_THREAD EVT_THREAD EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, EASING_COS_IN_OUT) EVT_END_THREAD EVT_SET(LVar0, 180) EVT_LOOP(10) @@ -1312,7 +1312,7 @@ EvtScript N(cloudNine_immobile) = { EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(10) EVT_IF_GT(LVarA, 0) - EVT_CALL(ShowMessageBox, 40, 60) + EVT_CALL(ShowMessageBox, BTL_MSG_28, 60) EVT_CALL(WaitForMessageBoxDone) EVT_END_IF EVT_RETURN @@ -1694,14 +1694,14 @@ EvtScript N(hurricane) = { EVT_CALL(MoveBattleCamOver, 40) EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Run) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 40, 20, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, 10) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Idle) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Idle) EVT_WAIT(15) EVT_CALL(N(InitHurricane)) EVT_CALL(action_command_hurricane_start, 0, 147, 3, LVar0) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(SetActorRotationOffset, ACTOR_PARTNER, 0, 20, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, 35, 54, 0) @@ -1741,7 +1741,7 @@ EvtScript N(hurricane) = { EVT_SET(LVarA, LVar0) EVT_THREAD EVT_CALL(N(BlowTargetAway)) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_STAR_POINTS_DROPPED, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_STAR_POINTS_DROPPED, TRUE) EVT_CALL(RemoveActor, LVarA) EVT_END_THREAD EVT_ELSE @@ -1750,7 +1750,7 @@ EvtScript N(hurricane) = { EVT_END_IF EVT_END_IF EVT_LABEL(11) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(10) EVT_END_IF @@ -1758,7 +1758,7 @@ EvtScript N(hurricane) = { EVT_CALL(SetActorRotation, ACTOR_PARTNER, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_PARTNER, 0, 0, 0) EVT_EXEC_WAIT(N(returnHome)) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk) EVT_CALL(N(AllEnemiesBlownAway)) EVT_CALL(PartnerYieldTurn) EVT_RETURN diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index b1413515c5..80ba969b5b 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -672,7 +672,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -802,7 +802,7 @@ EvtScript N(celebrate) = { }; EvtScript N(executeAction) = { - EVT_CALL(ShowActionHud, 1) + EVT_CALL(ShowActionHud, TRUE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar0) EVT_CASE_EQ(8) @@ -813,22 +813,22 @@ EvtScript N(executeAction) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar2) EVT_CASE_EQ(MOVE_SKY_DIVE1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_SET(LVarE, 1) EVT_SET(LVarF, 2) EVT_EXEC_WAIT(N(skyDive)) EVT_CASE_EQ(MOVE_SKY_DIVE2) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_SET(LVarE, 2) EVT_SET(LVarF, 3) EVT_EXEC_WAIT(N(skyDive)) EVT_CASE_EQ(MOVE_SKY_DIVE3) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_SET(LVarE, 4) EVT_SET(LVarF, 5) EVT_EXEC_WAIT(N(skyDive)) EVT_CASE_EQ(MOVE_SHELL_SHOT) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_EXEC_WAIT(N(shellShot)) EVT_CASE_EQ(MOVE_AIR_LIFT) EVT_EXEC_WAIT(N(airLift)) @@ -889,7 +889,7 @@ EvtScript N(returnHome2) = { EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, -5, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, -5, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Walk) EVT_RETURN EVT_END @@ -914,7 +914,7 @@ EvtScript N(returnHome) = { EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, -5, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, -5, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Walk) EVT_RETURN EVT_END @@ -935,7 +935,7 @@ EvtScript N(skyDive) = { EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -20, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(5.0)) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, -10, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, -10, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Still) EVT_WAIT(3) EVT_CALL(action_command_jump_start, 32, 3) @@ -943,7 +943,7 @@ EvtScript N(skyDive) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_FlyFast) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 0, 10, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, 0, EASING_LINEAR) EVT_WAIT(2) EVT_CHILD_THREAD EVT_WAIT(3) @@ -951,13 +951,13 @@ EvtScript N(skyDive) = { EVT_END_CHILD_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -26, 25, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, -20, 6) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, -20, EASING_QUARTIC_OUT) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2005) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -10, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Dive) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, 0, EASING_LINEAR) EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_CHILD_THREAD @@ -966,13 +966,13 @@ EvtScript N(skyDive) = { EVT_END_CHILD_THREAD EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 40, 10, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -20, 4) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -20, EASING_QUADRATIC_OUT) EVT_WAIT(20) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, -5, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, -5, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Walk) EVT_RETURN EVT_END_IF @@ -1026,7 +1026,7 @@ EvtScript N(shellShot) = { EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ShellFlyFastest) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 7, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 7, 0, EASING_LINEAR) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) EVT_CASE_EQ(-1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) @@ -1035,7 +1035,7 @@ EvtScript N(shellShot) = { EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 50, -50, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ShellFlyFastest) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 7, 0, 100) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 7, 0, 0x00000064) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) EVT_CASE_EQ(0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) @@ -1044,7 +1044,7 @@ EvtScript N(shellShot) = { EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 50, 50, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ShellFlyFastest) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 7, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 7, 0, EASING_LINEAR) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) EVT_CASE_EQ(-2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) @@ -1053,7 +1053,7 @@ EvtScript N(shellShot) = { EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 40, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ShellFlyFastest) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 7, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 7, 0, EASING_LINEAR) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) EVT_END_SWITCH EVT_CALL(N(GetShellShotDamage)) @@ -1107,7 +1107,7 @@ EvtScript N(airLift) = { EVT_CALL(SetActionHudPrepareTime, LVar0) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(5.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, -4, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, -4, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Idle) EVT_WAIT(15) EVT_CALL(SetBattleCamOffsetZ, 0) @@ -1123,7 +1123,7 @@ EvtScript N(airLift) = { EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -10, 12) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -10, EASING_COS_IN) EVT_CALL(SetAnimationRate, ACTOR_PARTNER, 0, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Idle) EVT_WAIT(10) @@ -1132,7 +1132,7 @@ EvtScript N(airLift) = { EVT_CALL(SetAnimationRate, ACTOR_PARTNER, 0, EVT_FLOAT(1.0)) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, 0, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Walk) EVT_RETURN EVT_END_IF @@ -1141,7 +1141,7 @@ EvtScript N(airLift) = { EVT_CALL(N(AirLiftChance)) EVT_IF_NE(LVar0, -1) EVT_CALL(action_command_air_lift_start, 0, 87, 3, 0) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CHILD_THREAD EVT_WAIT(1) EVT_CALL(GetActionResult, LVar1) @@ -1174,7 +1174,7 @@ EvtScript N(airLift) = { EVT_CALL(N(CarryAway), LVar0) EVT_WAIT(30) EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_STAR_POINTS_DROPPED, 1) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_STAR_POINTS_DROPPED, TRUE) EVT_CALL(RemoveActor, LVar0) EVT_CASE_DEFAULT EVT_CALL(GetOwnerTarget, LVar0, LVar1) @@ -1183,7 +1183,7 @@ EvtScript N(airLift) = { EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, -10, 12) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, -10, EASING_COS_IN) EVT_CALL(SetAnimationRate, ACTOR_PARTNER, 0, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Idle) EVT_WAIT(10) @@ -1193,7 +1193,7 @@ EvtScript N(airLift) = { EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(12.0)) EVT_CALL(SetAnimationRate, ACTOR_PARTNER, 0, EVT_FLOAT(1.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, 0, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Walk) EVT_RETURN EVT_END @@ -1211,10 +1211,10 @@ EvtScript N(airRaid) = { EVT_ADD(LVar0, 70) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, -2, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, -2, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Idle) EVT_CALL(action_command_air_raid_start, 0, 90, 3) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_WAIT(2) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_PreDive) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -1222,7 +1222,7 @@ EvtScript N(airRaid) = { EVT_ADD(LVar1, 30) EVT_ADD(LVar2, 40) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -10, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -10, EASING_COS_IN_OUT) EVT_WAIT(2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) @@ -1231,14 +1231,14 @@ EvtScript N(airRaid) = { EVT_LOOP(5) EVT_WAIT(18) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 10, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 10, 0) EVT_END_LOOP EVT_END_CHILD_THREAD EVT_CHILD_THREAD EVT_LOOP(5) EVT_WAIT(18) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 1, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar1, LVar2, 40, 0) EVT_END_LOOP EVT_END_CHILD_THREAD EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ShellFlyFastest) @@ -1266,7 +1266,7 @@ EvtScript N(airRaid) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) EVT_WAIT(5) EVT_LABEL(11) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) EVT_GOTO(10) EVT_END_IF @@ -1283,7 +1283,7 @@ EvtScript N(airRaid) = { EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(12.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, 0, EASING_LINEAR) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Walk) EVT_END_CHILD_THREAD EVT_WAIT(20) diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index 4998699c6b..8ed07b0b66 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -446,7 +446,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -594,8 +594,8 @@ EvtScript N(nextTurn) = { }; EvtScript N(executeAction) = { - EVT_CALL(ShowActionHud, 1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar0) EVT_CASE_EQ(8) @@ -680,7 +680,7 @@ EvtScript N(restoreFromSquirt2) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Idle) EVT_RETURN EVT_END @@ -691,7 +691,7 @@ EvtScript N(restoreFromSquirt) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Idle) EVT_RETURN EVT_END @@ -990,7 +990,7 @@ EvtScript N(squirt) = { EVT_ADD(LVar1, 11) EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar3, LVar4, LVar5) EVT_CALL(N(GetSquirtTargetPos)) - EVT_CALL(PlayEffect, EFFECT_SQUIRT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, LVarE, 10, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SQUIRT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, LVarE, 10, 0) EVT_WAIT(20) EVT_EXEC_WAIT(N(restoreFromSquirt)) EVT_RETURN @@ -1003,7 +1003,7 @@ EvtScript N(squirt) = { EVT_ADD(LVar0, 10) EVT_ADD(LVar1, 11) EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar3, LVar4, LVar5) - EVT_CALL(PlayEffect, EFFECT_SQUIRT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, LVarE, 10, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SQUIRT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, LVarE, 10, 0) EVT_WAIT(10) EVT_CALL(GetActionResult, LVar0) EVT_CALL(N(GetSquirtDamage)) @@ -1077,25 +1077,25 @@ EvtScript N(waterBlock) = { EVT_WAIT(45) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 83) - EVT_CALL(PlayEffect, EFFECT_WATERFALL, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 50, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WATERFALL, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 50, 0) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2035) EVT_THREAD EVT_WAIT(20) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 100) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 50, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 50, 0) EVT_WAIT(5) EVT_SUB(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 50, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 50, 0) EVT_WAIT(5) EVT_SUB(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 50, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 50, 0) EVT_WAIT(5) EVT_SUB(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 50, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 50, 0) EVT_WAIT(5) EVT_SUB(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 50, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 50, 0) EVT_END_THREAD EVT_WAIT(40) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -1108,7 +1108,7 @@ EvtScript N(waterBlock) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 35) EVT_ADD(LVarF, 6) - EVT_CALL(PlayEffect, EFFECT_STAT_CHANGE, LVarF, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STAT_CHANGE, LVarF, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 60, 0) EVT_WAIT(4) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) @@ -1126,7 +1126,7 @@ EvtScript N(waterBlock) = { EVT_CALL(SetActorYaw, ACTOR_PARTNER, 0) EVT_IF_EQ(LVarA, 0) EVT_ELSE - EVT_CALL(ShowVariableMessageBox, 38, 60, LVarA) + EVT_CALL(ShowVariableMessageBox, BTL_MSG_26, 60, LVarA) EVT_END_IF EVT_CALL(WaitForMessageBoxDone) EVT_RETURN @@ -1211,7 +1211,7 @@ EvtScript N(tidalWave) = { EVT_END_SWITCH EVT_WAIT(5) EVT_LABEL(10) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_EQ(LVar0, -1) EVT_BREAK_LOOP EVT_END_IF diff --git a/src/battle/partner/twink.c b/src/battle/partner/twink.c index d60dc5c73c..d32202a8d1 100644 --- a/src/battle/partner/twink.c +++ b/src/battle/partner/twink.c @@ -85,7 +85,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -108,11 +108,11 @@ EvtScript N(init) = { EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn))) EVT_CALL(func_80238000_714CF0) EVT_IF_NE(LVar0, 1) - EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_ATTACK, 1) + EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_ATTACK, TRUE) EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) - EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 9) + EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_9) EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 0, 0, 0, 0, 0) EVT_RETURN EVT_END @@ -221,7 +221,7 @@ EvtScript N(nextTurn) = { EvtScript N(executeAction) = { EVT_CALL(EnableIdleScript, ACTOR_PARTNER, 0) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, 1, SOUND_207F, SOUND_2AA) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_207F, SOUND_2AA) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(InitTargetIterator) @@ -229,19 +229,19 @@ EvtScript N(executeAction) = { EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -20, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(4.0)) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, -10, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, -10, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_Twink_Idle) EVT_WAIT(3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_Twink_Cringe) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 0, 10, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, 0, EASING_LINEAR) EVT_WAIT(2) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, 1, 0, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_JUMP_3E2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -40, 15, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, -20, 6) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, -20, EASING_QUARTIC_OUT) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarF) EVT_IF_GT(LVarF, 1) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) @@ -250,7 +250,7 @@ EvtScript N(executeAction) = { EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -10, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_Twink_Angry) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, 0, EASING_LINEAR) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarF) EVT_IF_GT(LVarF, 0) EVT_CALL(PartnerDamageEnemy, LVar0, 0, 0, 0, LVarF, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) @@ -260,7 +260,7 @@ EvtScript N(executeAction) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 150, 100, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 20, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, 20, EASING_LINEAR) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -271,11 +271,11 @@ EvtScript N(executeAction) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetActorSounds, ACTOR_PARTNER, 1, SOUND_207F, SOUND_2AA) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_207F, SOUND_2AA) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_Twink_Angry) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, -20, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 0, -20, EASING_COS_IN_OUT) EVT_CALL(EnableIdleScript, ACTOR_PARTNER, 1) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_RETURN diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index edcffe6572..ed2e0c6cf4 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -503,7 +503,7 @@ ActorBlueprint NAMESPACE = { .maxHP = 99, .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), - .takeTurnScript = &N(init), + .initScript = &N(init), .statusTable = N(statusTable), .escapeChance = 0, .airLiftChance = 0, @@ -660,10 +660,10 @@ EvtScript N(runAwayFail) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) EVT_CALL(SetActorYaw, ACTOR_PARTNER, 0) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_CALL(N(WattFXSetEffect), 0) EVT_RETURN @@ -676,8 +676,8 @@ EvtScript N(nextTurn) = { }; EvtScript N(executeAction) = { - EVT_CALL(ShowActionHud, 1) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, 0) + EVT_CALL(ShowActionHud, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar0) EVT_CASE_EQ(8) @@ -707,9 +707,9 @@ EvtScript N(executeAction) = { EvtScript N(returnHome2) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_E) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, 10) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EVT_RETURN EVT_END }; @@ -717,9 +717,9 @@ EvtScript N(returnHome2) = { EvtScript N(returnHome) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, 10) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EVT_RETURN EVT_END }; @@ -727,14 +727,14 @@ EvtScript N(returnHome) = { EffectInstance* N(radialShimmer) = NULL; EvtScript N(dashToTarget) = { - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, 0) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, EASING_LINEAR) EVT_RETURN EVT_END }; EvtScript N(charge) = { - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) EVT_CALL(N(WattFXDisable)) EVT_CALL(PlayLoopingSoundAtActor, ACTOR_PARTNER, 0, SOUND_289) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) @@ -742,7 +742,7 @@ EvtScript N(charge) = { EVT_CALL(N(ElectroDashFX), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc3)) EVT_SET(LVar9, 0) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_StrainBigger) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_StrainBigger) EVT_LOOP(55) EVT_ADD(LVar9, 30) EVT_IF_GT(LVar9, 200) @@ -897,11 +897,11 @@ EvtScript N(electroDash) = { EVT_CALL(N(ElectroDashFXDisable)) EVT_CALL(StopLoopingSoundAtActor, ACTOR_PARTNER, 0) EVT_CALL(func_80269EAC, 19) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) EVT_CALL(func_8026EA7C, ACTOR_SELF, 1, 10) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -5, 0, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, 0, 0) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, 0, EASING_LINEAR) EVT_THREAD EVT_WAIT(2) EVT_CALL(N(SetBackgroundAlpha), 0) @@ -910,16 +910,16 @@ EvtScript N(electroDash) = { EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_THREAD EVT_WAIT(5) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 40, 10, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -20, 4) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -20, EASING_QUADRATIC_OUT) EVT_WAIT(20) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, 10) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EVT_RETURN EVT_END_IF EVT_CALL(N(WattFXEnable)) @@ -973,11 +973,11 @@ EvtScript N(powerShock) = { EVT_CALL(MoveBattleCamOver, 40) EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) EVT_CALL(N(WattFXSetEffect), 1) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -15, -10, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, 10) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_10) EVT_CALL(AddBattleCamZoom, -100) EVT_CALL(MoveBattleCamOver, 80) @@ -987,10 +987,10 @@ EvtScript N(powerShock) = { EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_ADD(LVar2, 5) - EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 75, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 75, 0) EVT_CALL(N(UnkBackgroundFunc3)) EVT_SET(LVar9, 0) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_StrainBigger) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_StrainBigger) EVT_CALL(func_8026EA7C, ACTOR_SELF, 1, 10) EVT_THREAD EVT_LOOP(75) @@ -1011,7 +1011,7 @@ EvtScript N(powerShock) = { EVT_END_LOOP EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 8) - EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.8), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.8), 30, 0) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) @@ -1042,7 +1042,7 @@ EvtScript N(powerShock) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EVT_END_THREAD EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_10) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -1061,10 +1061,10 @@ EvtScript N(powerShock) = { EVT_CALL(PartnerYieldTurn) EVT_IF_NE(LocalFlag(15), 1) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -25, 10, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, -10, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, -10, EASING_COS_IN_OUT) EVT_ELSE EVT_CALL(AddGoalPos, ACTOR_PARTNER, -25, -10, 0) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, -10, 10) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 15, -10, EASING_COS_IN_OUT) EVT_END_IF EVT_WAIT(30) EVT_SWITCH(LVar0) @@ -1085,7 +1085,7 @@ EvtScript N(8023AE8C) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_WATER_BLOCK) EVT_CALL(action_command_water_block_init, 1) EVT_CALL(SetActionHudPrepareTime, 0) - EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, 1) + EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) EVT_WAIT(5) @@ -1112,12 +1112,12 @@ EvtScript N(8023AE8C) = { EVT_CALL(func_8024ECF8, 0, 0, 1) EVT_THREAD EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) EVT_CALL(N(TurboChargeUnwindWatt), 0) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -10, 5) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -10, EASING_CUBIC_OUT) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EVT_WAIT(10) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) EVT_END_THREAD @@ -1153,15 +1153,15 @@ EvtScript N(8023AE8C) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 35) EVT_ADD(LVarF, 0) - EVT_CALL(PlayEffect, EFFECT_STAT_CHANGE, LVarF, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STAT_CHANGE, LVarF, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 60, 0) EVT_WAIT(4) EVT_END_IF EVT_IF_EQ(LVar0, 0) EVT_ELSE - EVT_CALL(ShowVariableMessageBox, 42, 60, LVarA) + EVT_CALL(ShowVariableMessageBox, BTL_MSG_2A, 60, LVarA) EVT_END_IF EVT_CALL(WaitForMessageBoxDone) - EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, 0) + EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, FALSE) EVT_RETURN EVT_END }; @@ -1195,12 +1195,12 @@ EvtScript N(8023B450) = { EVT_CALL(func_8024ECF8, 0, 0, 1) EVT_THREAD EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 1) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) EVT_CALL(N(TurboChargeUnwindWatt), 1) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -10, 5) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 10, -10, EASING_CUBIC_OUT) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EVT_WAIT(10) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, 0) EVT_END_THREAD @@ -1224,15 +1224,15 @@ EvtScript N(8023B450) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 35) EVT_ADD(LVarF, 0) - EVT_CALL(PlayEffect, EFFECT_STAT_CHANGE, LVarF, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 60, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_STAT_CHANGE, LVarF, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 60, 0) EVT_WAIT(4) EVT_END_IF EVT_IF_EQ(LVar0, 0) EVT_ELSE - EVT_CALL(ShowVariableMessageBox, 42, 60, LVarA) + EVT_CALL(ShowVariableMessageBox, BTL_MSG_2A, 60, LVarA) EVT_END_IF EVT_CALL(WaitForMessageBoxDone) - EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, 0) + EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, FALSE) EVT_RETURN EVT_END }; @@ -1263,10 +1263,10 @@ EvtScript N(megaShock) = { EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) EVT_ADD(LVar1, 30) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Run) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, 10) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) + EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, EASING_COS_IN_OUT) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EVT_CALL(N(UnkBackgroundFunc3)) EVT_SET(LVar9, 0) EVT_THREAD @@ -1281,14 +1281,14 @@ EvtScript N(megaShock) = { EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_ADD(LVar2, 5) - EVT_CALL(PlayEffect, EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 90, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 90, 0) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 12) - EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 8, LVar0, LVar1, LVar2, EVT_FLOAT(1.3), 90, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 8, LVar0, LVar1, LVar2, EVT_FLOAT(1.3), 90, 0) EVT_CALL(AddBattleCamZoom, -100) EVT_CALL(MoveBattleCamOver, 90) EVT_CALL(func_8024ECF8, 0, 0, 1) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_StrainBigger) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_StrainBigger) EVT_CALL(func_8026EA7C, ACTOR_SELF, 1, 10) EVT_CALL(N(WattFXDisable)) EVT_CALL(GetActionResult, LVar1) @@ -1308,17 +1308,17 @@ EvtScript N(megaShock) = { EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 12) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_28C) - EVT_CALL(PlayEffect, EFFECT_FLASHING_BOX_SHOCKWAVE, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FLASHING_BOX_SHOCKWAVE, 2, LVar0, LVar1, LVar2, 0, 0, 0) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2024) - EVT_CALL(PlayEffect, EFFECT_FLASHING_BOX_SHOCKWAVE, 2, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FLASHING_BOX_SHOCKWAVE, 2, LVar0, LVar1, LVar2, 0, 0, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_StrainBiggest) EVT_WAIT(5) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) + EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EVT_END_THREAD EVT_THREAD EVT_CALL(SetBattleCamZoom, 420) @@ -1352,7 +1352,7 @@ EvtScript N(megaShock) = { EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, DMG_STATUS_ALWAYS(STATUS_FLAG_PARALYZE, 3), LVarF, 0, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) EVT_END_IF EVT_LABEL(11) - EVT_CALL(ChooseNextTarget, 0, LVar0) + EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_EQ(LVar0, -1) EVT_BREAK_LOOP EVT_END_IF diff --git a/src/common/Set80071270_0_16.inc.c b/src/common/Set80071270_0_16.inc.c deleted file mode 100644 index eceb8b6322..0000000000 --- a/src/common/Set80071270_0_16.inc.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" -#include "effects.h" - -API_CALLABLE(N(Set80071270_0_16)) { - fx_snowfall(0, 0x10); - return ApiStatus_DONE2; -} diff --git a/src/common/Set80218630_Var0.inc.c b/src/common/Set80218630_Var0.inc.c deleted file mode 100644 index 57639ccd66..0000000000 --- a/src/common/Set80218630_Var0.inc.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" -#include "npc.h" - -extern s16 D_802809F8; - -API_CALLABLE(N(Set80218630_Var0)) { - D_802809F8 = script->varTable[0]; - return ApiStatus_DONE2; -} diff --git a/src/common/SetDemoBattleBeginDelay.inc.c b/src/common/SetDemoBattleBeginDelay.inc.c new file mode 100644 index 0000000000..aaaed3fab3 --- /dev/null +++ b/src/common/SetDemoBattleBeginDelay.inc.c @@ -0,0 +1,9 @@ +#include "common.h" +#include "npc.h" + +extern s16 DemoBattleBeginDelay; + +API_CALLABLE(N(SetDemoBattleBeginDelay)) { + DemoBattleBeginDelay = script->varTable[0]; + return ApiStatus_DONE2; +} diff --git a/src/common/UnkFloatFunc2.inc.c b/src/common/UnkFloatFunc2.inc.c deleted file mode 100644 index 1d70b62c4d..0000000000 --- a/src/common/UnkFloatFunc2.inc.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "common.h" -#include "npc.h" - -API_CALLABLE(N(UnkFloatFunc2)) { - Bytecode* args = script->ptrReadPos; - s32 var0 = evt_get_variable(script, *args++); - s32 a1 = *args++; - s32 a2 = *args++; - s32 a3 = *args++; - f32 temp = sin_rad(DEG_TO_RAD(var0 / 10) * 8.0f) * 10.0f; - - evt_set_variable(script, a1, 0); - evt_set_variable(script, a2, temp); - evt_set_variable(script, a3, 0); - - return ApiStatus_DONE2; -} diff --git a/src/common/UnkFloatFunc3.inc.c b/src/common/UnkFloatFunc3.inc.c deleted file mode 100644 index 5977969641..0000000000 --- a/src/common/UnkFloatFunc3.inc.c +++ /dev/null @@ -1,37 +0,0 @@ -#include "common.h" -#include "battle/battle.h" - -API_CALLABLE(N(UnkFloatFunc3)) { - Bytecode* args = script->ptrReadPos; - s32 destBytecode1; - s32 destBytecode2; - s32 destBytecode3; - f32 x; - f32 y; - f32 float3; - f32 angle; - // Seems to be necessary to get the stack allocations to line up. - s8 unused[0x40]; - - angle = evt_get_variable(script, *args++) / 10.0; - angle = angle * TAU; - angle = angle / 360.0f; - - destBytecode1 = *args++; - destBytecode2 = *args++; - destBytecode3 = *args++; - - x = sin_rad(angle) * 150.0f + 0.0f; - y = cos_rad(angle) * 150.0f + 0.0f; - float3 = -252.0f; - - x -= script->varTable[11]; - y -= script->varTable[12]; - float3 -= script->varTable[13]; - - evt_set_float_variable(script, destBytecode1, x); - evt_set_float_variable(script, destBytecode2, y); - evt_set_float_variable(script, destBytecode3, float3); - - return ApiStatus_DONE2; -} diff --git a/src/common/UnkModelStuff.inc.c b/src/common/UnkModelStuff.inc.c deleted file mode 100644 index 4f7cb4ef19..0000000000 --- a/src/common/UnkModelStuff.inc.c +++ /dev/null @@ -1,90 +0,0 @@ -#include "common.h" - -u16 N(UnkModelStuff_array)[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; - -void N(UnkModelStuff_func1)(s32 arg0) { - Vtx* firstVertex; - Vtx* copiedVertices; - s32 numVertices; - s32 i; - s32 temp3; - - mdl_get_copied_vertices(arg0, &firstVertex, &copiedVertices, &numVertices); - - for (i = 0; i < numVertices; i++) { - Vtx* vtx = &copiedVertices[i]; - s16 temp1 = (sins(N(UnkModelStuff_array)[arg0] * (i % 3 + 1) + i) + 0x8000) / 2; - s32 temp2 = temp1 * 155; - vtx->v.cn[2] = temp2 / 0x8000 + 100; - vtx->v.cn[1] = temp2 / 0x8000 + 50; - - temp3 = sins(N(UnkModelStuff_array)[arg0] / 0x8000 * (((i / 2) % 3 + 1) << 15) + N(UnkModelStuff_array)[arg0] / 0x4000 * 0x8000 + i) + 0x8000; - vtx->v.cn[0] = vtx->v.cn[0] * temp3 / 0x10000; - } - - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(arg0)); - N(UnkModelStuff_array)[arg0] += 0x253; -} - -#include "common/Set80071270_0_16.inc.c" -#include "common/UnkFloatFunc2.inc.c" - -EvtScript N(UnkModelStuffScript1) = { - EVT_CALL(N(Set80071270_0_16)) - EVT_LOOP(0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_RETURN - EVT_END -}; - -EvtScript N(UnkModelStuffScript2) = { - EVT_SET(LVarA, LVar0) - EVT_LABEL(0) - EVT_CALL(RandInt, 30, LVar0) - EVT_ADD(LVar0, 30) - EVT_WAIT(LVar0) - EVT_SET(LVar1, 0) - EVT_LOOP(10) - EVT_ADD(LVar1, 36) - EVT_CALL(RotateModel, LVarA, LVar1, 0, 1, 0) - EVT_WAIT(1) - EVT_END_LOOP - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(UnkModelStuffScript3) = { - EVT_SET(LVarA, LVar0) - EVT_SET(LVarB, LVar1) - EVT_EXEC(N(UnkModelStuffScript2)) - EVT_SET(LVar7, 0) - EVT_LABEL(0) - EVT_ADD(LVar7, 4) - EVT_IF_GT(LVar7, 3599) - EVT_SUB(LVar7, 3600) - EVT_END_IF - EVT_CALL(N(UnkFloatFunc2), LVar7, LVar0, LVar1, LVar2) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; - -EvtScript N(UnkModelStuffScript4) = { - EVT_SET(LVarA, LVar0) - EVT_SET(LVar7, 0) - EVT_LABEL(0) - EVT_ADD(LVar7, 4) - EVT_IF_GT(LVar7, 3599) - EVT_SUB(LVar7, 3600) - EVT_END_IF - EVT_CALL(N(UnkFloatFunc2), LVar7, LVar0, LVar1, LVar2) - EVT_CALL(TranslateModel, LVarA, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_GOTO(0) - EVT_RETURN - EVT_END -}; diff --git a/src/common/UpdateSunPos.inc.c b/src/common/UpdateSunPos.inc.c new file mode 100644 index 0000000000..ec837756c0 --- /dev/null +++ b/src/common/UpdateSunPos.inc.c @@ -0,0 +1,37 @@ +#include "common.h" +#include "battle/battle.h" + +API_CALLABLE(N(UpdateSunPos)) { + Bytecode* args = script->ptrReadPos; + s32 outPosX; + s32 outPosY; + s32 outPosZ; + f32 x; + f32 y; + f32 z; + f32 angle; + // Needed to make stack allocations line up + s8 unused[0x40]; + + angle = evt_get_variable(script, *args++) / 10.0; + angle = angle * TAU; + angle = angle / 360.0f; + + outPosX = *args++; + outPosY = *args++; + outPosZ = *args++; + + x = sin_rad(angle) * 150.0f + 0.0f; + y = cos_rad(angle) * 150.0f + 0.0f; + z = -252.0f; + + x -= script->varTable[11]; + y -= script->varTable[12]; + z -= script->varTable[13]; + + evt_set_float_variable(script, outPosX, x); + evt_set_float_variable(script, outPosY, y); + evt_set_float_variable(script, outPosZ, z); + + return ApiStatus_DONE2; +} diff --git a/src/effects/floating_flower.c b/src/effects/floating_flower.c index e7a47f7173..437b30cc3d 100644 --- a/src/effects/floating_flower.c +++ b/src/effects/floating_flower.c @@ -10,7 +10,7 @@ void floating_flower_update(EffectInstance* effect); void floating_flower_render(EffectInstance* effect); void floating_flower_appendGfx(void* effect); -void floating_flower_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { +void floating_flower_main(s32 type, f32 posX, f32 posY, f32 posZ, s32 duration) { EffectBlueprint bp; EffectInstance* effect; FloatingFlowerFXData* part; @@ -30,44 +30,44 @@ void floating_flower_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { ASSERT(effect->data.floatingFlower != NULL); - part->unk_00 = arg0; - part->unk_04 = arg1; - part->unk_0C = arg3; - part->unk_10 = 0.0f; - part->unk_14 = 0.0f; - part->unk_18 = 0; - part->unk_08 = arg2 + 10.0f; + part->type = type; + part->pos.x = posX; + part->pos.y = posY + 10.0f; + part->pos.z = posZ; + part->vel.x = 0.0f; + part->vel.y = 0.0f; + part->vel.z = 0.0f; - if (arg0 == 0) { - part->unk_18 = 0; - part->unk_24 = 0.0f; - part->unk_28 = 0.0f; - part->unk_1C = 0.12f; - part->unk_20 = -0.0152f; - part->unk_2C = 3.0f; + if (type == 0) { + part->vel.z = 0; + part->rot.x = 0.0f; + part->rot.y = 0.0f; + part->accelY = 0.12f; + part->jerkY = -0.0152f; + part->angularVel.x = 3.0f; if (D_E001A610 != 0) { phi_f6 = -10.0f; } else { phi_f6 = 10.0f; } - part->unk_30 = phi_f6; - part->unk_34 = arg4; + part->angularVel.y = phi_f6; + part->timeLeft = duration; } else { - part->unk_1C = 0.12f; - part->unk_20 = -0.0152f; - part->unk_24 = (shim_rand_int(1) * 30) - 15; - part->unk_28 = shim_rand_int(360); - part->unk_2C = 0; - part->unk_30 = (shim_rand_int(1) * 8) - 4; - part->unk_34 = arg4; - part->unk_38 = 0; + part->accelY = 0.12f; + part->jerkY = -0.0152f; + part->rot.x = (shim_rand_int(1) * 30) - 15; + part->rot.y = shim_rand_int(360); + part->angularVel.x = 0; + part->angularVel.y = (shim_rand_int(1) * 8) - 4; + part->timeLeft = duration; + part->lifetime = 0; part->unk_44 = shim_rand_int(10); part->unk_40 = shim_rand_int(20); part->unk_3C = (shim_rand_int(1) * 2) - 1; } D_E001A610++; - if (D_E001A610 >= 2) { + if (D_E001A610 > 1) { D_E001A610 = 0; } } @@ -77,52 +77,52 @@ void floating_flower_init(EffectInstance* effect) { void floating_flower_update(EffectInstance* effect) { FloatingFlowerFXData* data = effect->data.floatingFlower; - s32 unk_00 = data->unk_00; + s32 type = data->type; - if (data->unk_34 < 150) { - data->unk_10 -= 0.001; - data->unk_04 += data->unk_10; - data->unk_0C += data->unk_18; - data->unk_24 += data->unk_2C; - if (unk_00 == 0) { - if (data->unk_24 < 10.0f) { - data->unk_24 = 10.0f; - data->unk_2C = -data->unk_2C; + if (data->timeLeft < 150) { + data->vel.x -= 0.001; + data->pos.x += data->vel.x; + data->pos.z += data->vel.z; + data->rot.x += data->angularVel.x; + if (type == 0) { + if (data->rot.x < 10.0f) { + data->rot.x = 10.0f; + data->angularVel.x = -data->angularVel.x; } - if (data->unk_24 > 45.0f) { - data->unk_24 = 45.0f; - data->unk_2C = -data->unk_2C; + if (data->rot.x > 45.0f) { + data->rot.x = 45.0f; + data->angularVel.x = -data->angularVel.x; } } - data->unk_28 += data->unk_30; - if (unk_00 == 0) { - data->unk_14 = 1.4f; + data->rot.y += data->angularVel.y; + if (type == 0) { + data->vel.y = 1.4f; } else { - data->unk_14 = 1.0f; + data->vel.y = 1.0f; } } else { - data->unk_20 += 0.0007; - data->unk_1C += data->unk_20; - data->unk_14 += data->unk_1C; - if (data->unk_14 > 1.0f) { - data->unk_14 = 1.0f; + data->jerkY += 0.0007; + data->accelY += data->jerkY; + data->vel.y += data->accelY; + if (data->vel.y > 1.0f) { + data->vel.y = 1.0f; } } - if (unk_00 == 1) { + if (type == 1) { data->unk_40 += data->unk_3C; if (data->unk_40 >= 20) { data->unk_40 = 20; data->unk_3C = -1; } else if (data->unk_40 <= 0) { data->unk_40 = 0; - data->unk_3C = unk_00; + data->unk_3C = type; } } - data->unk_08 += data->unk_14; - data->unk_34 += -1; - data->unk_38 += 1; - if (data->unk_34 < 0) { + data->pos.y += data->vel.y; + data->timeLeft--; + data->lifetime++; + if (data->timeLeft < 0) { shim_remove_effect(effect); } } @@ -141,7 +141,7 @@ void floating_flower_render(EffectInstance* effect) { } void floating_flower_appendGfx(void* effect) { - Matrix4f sp20, other; + Matrix4f mtxTransform, mtxUnused; EffectInstance* effectTemp = effect; FloatingFlowerFXData* part = effectTemp->data.floatingFlower; u32 alpha; @@ -150,8 +150,8 @@ void floating_flower_appendGfx(void* effect) { gDPPipeSync(gMasterGfxPos++); gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); - shim_guPositionF(sp20, part->unk_24, part->unk_28, 0.0f, 1.0f, part->unk_04, part->unk_08, part->unk_0C); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + shim_guPositionF(mtxTransform, part->rot.x, part->rot.y, 0.0f, 1.0f, part->pos.x, part->pos.y, part->pos.z); + shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); a = alpha = 255; diff --git a/src/encounter.c b/src/encounter.c index 2548f148e4..fffcb97ceb 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -459,8 +459,9 @@ ApiStatus OnFleeBattleDrops(Evt* script, s32 isInitialCall) { if (rand_int(100) < 50) { if (playerData->coins != 0) { playerData->coins--; - make_item_entity_delayed(ITEM_COIN, playerStatus->position.x, playerStatus->position.y + playerStatus->colliderHeight, - playerStatus->position.z, 3, 0, 0); + make_item_entity_delayed(ITEM_COIN, playerStatus->position.x, + playerStatus->position.y + playerStatus->colliderHeight, playerStatus->position.z, + ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0, 0); } } script->functionTemp[2] = 0; diff --git a/src/entity/Block.c b/src/entity/Block.c index 2de45cd85b..3a9586cad2 100644 --- a/src/entity/Block.c +++ b/src/entity/Block.c @@ -258,14 +258,16 @@ void entity_MulticoinBlock_spawn_coin(Entity* entity) { itemSpawnMode = ITEM_SPAWN_MODE_ITEM_BLOCK_SPAWN_ALWAYS; flagIndex = 0; } - make_item_entity_nodelay(ITEM_COIN, entity->position.x, entity->position.y + 28.0, entity->position.z, itemSpawnMode, flagIndex); + make_item_entity_nodelay(ITEM_COIN, entity->position.x, entity->position.y + 28.0, entity->position.z, + itemSpawnMode, flagIndex); data->coinsLeft -= 1; } if ((data->coinsLeft == 0) || (data->timeLeft == 0)) { data->empty = TRUE; set_entity_commandlist(get_entity_by_index(create_entity(&Entity_InertYellowBlock, - (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, (s32)entity->rotation.y, MAKE_ENTITY_END)), Entity_CreatedInertBlock_Script); + (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, + (s32)entity->rotation.y, MAKE_ENTITY_END)), Entity_CreatedInertBlock_Script); entity->flags |= (ENTITY_FLAG_DISABLE_COLLISION | ENTITY_FLAG_PENDING_INSTANCE_DELETE); } } diff --git a/src/entity/Chest.c b/src/entity/Chest.c index 3ed2fa8948..5709ef9eda 100644 --- a/src/entity/Chest.c +++ b/src/entity/Chest.c @@ -385,7 +385,9 @@ void entity_GiantChest_give_equipment(Entity* entity) { data->itemEntityPos.x = entity->position.x + (sin_rad(angle) * 10.0f); data->itemEntityPos.y = entity->position.y; data->itemEntityPos.z = entity->position.z + (cos_rad(angle) * 10.0f); - data->itemEntityIndex = make_item_entity_nodelay(data->itemID, data->itemEntityPos.x, data->itemEntityPos.y, data->itemEntityPos.z, 1, -1); + data->itemEntityIndex = make_item_entity_nodelay(data->itemID, + data->itemEntityPos.x, data->itemEntityPos.y, data->itemEntityPos.z, + ITEM_SPAWN_MODE_DECORATION, -1); } flagIndex = data->gameFlagIndex; diff --git a/src/entity/HiddenPanel.c b/src/entity/HiddenPanel.c index 0228fd0e86..4345868f9a 100644 --- a/src/entity/HiddenPanel.c +++ b/src/entity/HiddenPanel.c @@ -128,7 +128,9 @@ void entity_HiddenPanel_flip_over(Entity* entity) { gPlayerStatusPtr->animFlags |= PA_FLAG_OPENED_HIDDEN_PANEL; if (data->needSpawnItem) { data->needSpawnItem = FALSE; - data->spawnedItemIndex = make_item_entity_nodelay(data->itemID, entity->position.x, entity->position.y + 2.0, entity->position.z, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, data->pickupVar); + data->spawnedItemIndex = make_item_entity_nodelay(data->itemID, + entity->position.x, entity->position.y + 2.0, entity->position.z, + ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, data->pickupVar); } entity->flags &= ~ENTITY_FLAG_HIDDEN; break; diff --git a/src/entity/ItemBlock.c b/src/entity/ItemBlock.c index fefc5276fd..7b63e30a94 100644 --- a/src/entity/ItemBlock.c +++ b/src/entity/ItemBlock.c @@ -67,12 +67,12 @@ void entity_ItemBlock_spawn_item(Entity* entity) { if (data->item == ITEM_COIN) { make_item_entity(ITEM_COIN, entity->position.x, entity->position.y + 28.0, entity->position.z, - ITEM_SPAWN_MODE_ITEM_BLOCK_COIN, 0, facingAngle, data->gameFlagIndex); + ITEM_SPAWN_MODE_ITEM_BLOCK_COIN, 0, facingAngle, data->gameFlagIndex); } else { facingAngle += 360; make_item_entity(data->item, entity->position.x, entity->position.y + 20.0, entity->position.z, - (gItemTable[data->item].typeFlags & ITEM_TYPE_FLAG_BADGE) ? ITEM_SPAWN_MODE_ITEM_BLOCK_BADGE : ITEM_SPAWN_MODE_ITEM_BLOCK_ITEM, - 0, facingAngle, data->gameFlagIndex); + (gItemTable[data->item].typeFlags & ITEM_TYPE_FLAG_BADGE) ? ITEM_SPAWN_MODE_ITEM_BLOCK_BADGE : ITEM_SPAWN_MODE_ITEM_BLOCK_ITEM, + 0, facingAngle, data->gameFlagIndex); } } diff --git a/src/entity/WoodenCrate.c b/src/entity/WoodenCrate.c index 5cf892d657..5a900582e0 100644 --- a/src/entity/WoodenCrate.c +++ b/src/entity/WoodenCrate.c @@ -251,8 +251,8 @@ void entity_WoodenCrate_shatter(Entity* entity, f32 arg1) { } if (flag) { - make_item_entity(data->itemID, entity->position.x, entity->position.y + 33.0, entity->position.z, 0xA, 0, - player_get_camera_facing_angle(), data->globalFlagIndex); + make_item_entity(data->itemID, entity->position.x, entity->position.y + 33.0, entity->position.z, + ITEM_SPAWN_MODE_ITEM_BLOCK_ITEM, 0, player_get_camera_facing_angle(), data->globalFlagIndex); } } } diff --git a/src/entity/jan_iwa/Plants2.c b/src/entity/jan_iwa/Plants2.c index a493baef06..13b9c993ea 100644 --- a/src/entity/jan_iwa/Plants2.c +++ b/src/entity/jan_iwa/Plants2.c @@ -87,7 +87,8 @@ void entity_TrumpetPlant_spawn_coin(Entity* entity) { } void entity_Munchlesia_init(Entity* entity) { - make_item_entity_nodelay(ITEM_COIN, entity->position.x, entity->position.y + 30.0f, entity->position.z, ITEM_SPAWN_MODE_FIXED_SPAWN_ALWAYS_NEVER_VANISH, 0); + make_item_entity_nodelay(ITEM_COIN, entity->position.x, entity->position.y + 30.0f, entity->position.z, + ITEM_SPAWN_MODE_FIXED_SPAWN_ALWAYS_NEVER_VANISH, 0); } void func_802BC050_E2E980(Entity* entity) { diff --git a/src/evt/map_api.c b/src/evt/map_api.c index f035f448d1..a418e86248 100644 --- a/src/evt/map_api.c +++ b/src/evt/map_api.c @@ -197,23 +197,23 @@ ApiStatus EnableTexPanning(Evt* script, s32 isInitialCall) { ApiStatus EnableModel(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 modelIndex = get_model_list_index_from_tree_index(evt_get_variable(script, *args++)); - Bytecode flag = evt_get_variable(script, *args++); + Bytecode enabled = evt_get_variable(script, *args++); Model* model = get_model_from_list_index(modelIndex); - if (flag != 0) { - model->flags &= ~MODEL_FLAG_ENABLED; + if (enabled) { + model->flags &= ~MODEL_FLAG_HIDDEN; } else { - model->flags |= MODEL_FLAG_ENABLED; + model->flags |= MODEL_FLAG_HIDDEN; } return ApiStatus_DONE2; } -ApiStatus SetGroupEnabled(Evt* script, s32 isInitialCall) { +ApiStatus SetGroupVisibility(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Bytecode var1 = evt_get_variable(script, *args++); - Bytecode var2 = evt_get_variable(script, *args++); + Bytecode groupModelID = evt_get_variable(script, *args++); + Bytecode enabled = evt_get_variable(script, *args++); - set_model_flags(var1, MODEL_FLAG_ENABLED, var2); + set_model_group_visibility(groupModelID, MODEL_FLAG_HIDDEN, enabled); return ApiStatus_DONE2; } @@ -483,9 +483,9 @@ ApiStatus EnableGroup(Evt* script, s32 isInitialCall) { for (index = transformGroup->minChildModelIndex; index <= transformGroup->maxChildModelIndex; index++) { Model* model = get_model_from_list_index(index); if (flagUnset) { - model->flags &= ~MODEL_FLAG_ENABLED; + model->flags &= ~MODEL_FLAG_HIDDEN; } else { - model->flags |= MODEL_FLAG_ENABLED; + model->flags |= MODEL_FLAG_HIDDEN; } } diff --git a/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c b/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c index 4950b3d2d9..6487572ea7 100644 --- a/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c +++ b/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c @@ -98,8 +98,8 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EVT_THREAD EVT_CALL(DisablePlayerPhysics, TRUE) EVT_WAIT(1) - EVT_CALL(SetGroupEnabled, MODEL_g96, 0) - EVT_CALL(SetGroupEnabled, MODEL_g87, 0) + EVT_CALL(SetGroupVisibility, MODEL_g96, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g87, MODEL_GROUP_HIDDEN) EVT_CALL(SetPlayerAnimation, ANIM_Mario_80013) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.5)) EVT_CALL(PlayerJump1, 121, 210, 0, 60) @@ -148,7 +148,7 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_SET(GB_StoryProgress, STORY_CH3_TUBBA_SMASHED_THE_BRIDGES) - EVT_CALL(SetGroupEnabled, MODEL_g240, 1) + EVT_CALL(SetGroupVisibility, MODEL_g240, MODEL_GROUP_VISIBLE) EVT_CALL(DeleteAnimatedModel, 0) EVT_THREAD EVT_WAIT(30) @@ -179,17 +179,17 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EvtScript N(EVS_SetupBridges) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH3_TUBBA_WOKE_UP) - EVT_CALL(SetGroupEnabled, MODEL_g240, 0) + EVT_CALL(SetGroupVisibility, MODEL_g240, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_after, COLLIDER_FLAGS_UPPER_MASK) EVT_CASE_EQ(STORY_CH3_TUBBA_WOKE_UP) - EVT_CALL(SetGroupEnabled, MODEL_g240, 0) + EVT_CALL(SetGroupVisibility, MODEL_g240, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_after, COLLIDER_FLAGS_UPPER_MASK) EVT_EXEC(N(EVS_Scene_TubbaSmashBridges)) EVT_CASE_LT(STORY_CH3_DEFEATED_TUBBA_BLUBBA) - EVT_CALL(SetGroupEnabled, MODEL_g340, 0) + EVT_CALL(SetGroupVisibility, MODEL_g340, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_before, COLLIDER_FLAGS_UPPER_MASK) EVT_CASE_DEFAULT - EVT_CALL(SetGroupEnabled, MODEL_g240, 0) + EVT_CALL(SetGroupVisibility, MODEL_g240, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_after, COLLIDER_FLAGS_UPPER_MASK) EVT_END_SWITCH EVT_RETURN diff --git a/src/world/area_dro/dro_01/dro_01_5_rooms.c b/src/world/area_dro/dro_01/dro_01_5_rooms.c index 93e2fd3595..c8ac6b4c9f 100644 --- a/src/world/area_dro/dro_01/dro_01_5_rooms.c +++ b/src/world/area_dro/dro_01/dro_01_5_rooms.c @@ -91,9 +91,9 @@ EvtScript N(EVS_SetWallRot_RightHouse) = { EvtScript N(EVS_RoomListener_LeftHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_ie_naka, TRUE) + EVT_CALL(SetGroupVisibility, MODEL_ie_naka, TRUE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_ie_naka, FALSE) + EVT_CALL(SetGroupVisibility, MODEL_ie_naka, FALSE) EVT_END_SWITCH EVT_RETURN EVT_END @@ -111,7 +111,7 @@ EvtScript N(EVS_RoomListener_Shop) = { EVT_SET(LVar0, -1) EVT_RETURN EVT_END_SWITCH - EVT_CALL(SetGroupEnabled, MODEL_mise_naka, 1) + EVT_CALL(SetGroupVisibility, MODEL_mise_naka, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) EVT_THREAD EVT_WAIT(45) @@ -119,7 +119,7 @@ EvtScript N(EVS_RoomListener_Shop) = { EVT_CALL(SetNpcYaw, NPC_Mouser_ShopOwner, 180) EVT_END_THREAD EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_mise_naka, 0) + EVT_CALL(SetGroupVisibility, MODEL_mise_naka, MODEL_GROUP_HIDDEN) EVT_SET(AB_DRO_SHOP_PREV1, 0) EVT_SET(AB_DRO_SHOP_PREV2, 0) EVT_END_SWITCH @@ -130,11 +130,11 @@ EvtScript N(EVS_RoomListener_Shop) = { EvtScript N(EVS_RoomListener_RightHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_ie2_naka, 1) + EVT_CALL(SetGroupVisibility, MODEL_ie2_naka, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) // do nothing EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_ie2_naka, 0) + EVT_CALL(SetGroupVisibility, MODEL_ie2_naka, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -218,7 +218,7 @@ EvtScript N(EVS_SwingSign_Shop) = { }; EvtScript N(EVS_OpenShopDoor) = { - EVT_CALL(SetGroupEnabled, MODEL_mise_naka, 1) + EVT_CALL(SetGroupVisibility, MODEL_mise_naka, MODEL_GROUP_VISIBLE) EVT_CALL(PlaySoundAtCollider, COLLIDER_em_1, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 100, 15, EASING_QUADRATIC_OUT) EVT_LABEL(10) @@ -242,7 +242,7 @@ EvtScript N(EVS_CloseShopDoor) = { EVT_GOTO(10) EVT_END_IF EVT_CALL(PlaySoundAtCollider, COLLIDER_em_1, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) - EVT_CALL(SetGroupEnabled, MODEL_mise_naka, 0) + EVT_CALL(SetGroupVisibility, MODEL_mise_naka, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; diff --git a/src/world/area_dro/dro_02/dro_02_4_rooms.c b/src/world/area_dro/dro_02/dro_02_4_rooms.c index f57a9a07c5..f5a26e5188 100644 --- a/src/world/area_dro/dro_02/dro_02_4_rooms.c +++ b/src/world/area_dro/dro_02/dro_02_4_rooms.c @@ -90,10 +90,10 @@ EvtScript N(EVS_SetupCamSpeed) = { EvtScript N(EVS_RoomListener_ToadHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_ie4_naka, 1) + EVT_CALL(SetGroupVisibility, MODEL_ie4_naka, MODEL_GROUP_VISIBLE) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_ie4_naka, 0) + EVT_CALL(SetGroupVisibility, MODEL_ie4_naka, MODEL_GROUP_HIDDEN) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.334)) EVT_END_SWITCH EVT_RETURN @@ -103,7 +103,7 @@ EvtScript N(EVS_RoomListener_ToadHouse) = { EvtScript N(EVS_RoomListener_Hideout) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_ie5_naka, 1) + EVT_CALL(SetGroupVisibility, MODEL_ie5_naka, MODEL_GROUP_VISIBLE) EVT_CALL(SetCamType, CAM_DEFAULT, 0, FALSE) EVT_CALL(SetCamDistance, CAM_DEFAULT, 260) EVT_CALL(SetCamPitch, CAM_DEFAULT, 22, -13) @@ -120,7 +120,7 @@ EvtScript N(EVS_RoomListener_Hideout) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_ie5_naka, 0) + EVT_CALL(SetGroupVisibility, MODEL_ie5_naka, MODEL_GROUP_HIDDEN) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.334)) EVT_END_SWITCH diff --git a/src/world/area_hos/hos_00/hos_00_2_main.c b/src/world/area_hos/hos_00/hos_00_2_main.c index 0fc833baa7..7b15ebe6d6 100644 --- a/src/world/area_hos/hos_00/hos_00_2_main.c +++ b/src/world/area_hos/hos_00/hos_00_2_main.c @@ -50,7 +50,7 @@ EvtScript N(EVS_EnterMap) = { EVT_END_IF EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, hos_00_ENTRY_3) - EVT_CALL(SetGroupEnabled, MODEL_g107, 0) + EVT_CALL(SetGroupVisibility, MODEL_g107, MODEL_GROUP_HIDDEN) EVT_EXEC(N(EVS_Scene_Wishing)) EVT_RETURN EVT_ELSE diff --git a/src/world/area_hos/hos_06/hos_06_4_rooms.c b/src/world/area_hos/hos_06/hos_06_4_rooms.c index 9fe355eaf9..c0e602f432 100644 --- a/src/world/area_hos/hos_06/hos_06_4_rooms.c +++ b/src/world/area_hos/hos_06/hos_06_4_rooms.c @@ -47,20 +47,20 @@ EvtScript N(EVS_DropDoor_House) = { EvtScript N(EVS_RoomListener_House) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_g29, 1) - EVT_CALL(SetGroupEnabled, MODEL_g81, 1) - EVT_CALL(SetGroupEnabled, MODEL_g51, 1) + EVT_CALL(SetGroupVisibility, MODEL_g29, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_g81, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_g51, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_ENTER_DONE) - EVT_CALL(SetGroupEnabled, MODEL_g1, 0) - EVT_CALL(SetGroupEnabled, MODEL_g35, 0) + EVT_CALL(SetGroupVisibility, MODEL_g1, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g35, MODEL_GROUP_HIDDEN) EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_g1, 1) - EVT_CALL(SetGroupEnabled, MODEL_g35, 1) + EVT_CALL(SetGroupVisibility, MODEL_g1, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_g35, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_g29, 0) - EVT_CALL(SetGroupEnabled, MODEL_g81, 0) - EVT_CALL(SetGroupEnabled, MODEL_g31, 0) - EVT_CALL(SetGroupEnabled, MODEL_g51, 0) + EVT_CALL(SetGroupVisibility, MODEL_g29, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g81, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g31, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g51, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -81,21 +81,21 @@ EvtScript N(EVS_SetDoorRot_Upstairs) = { EvtScript N(EVS_ManageUpstairsVisibility) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_IF_LT(LVar1, 100) - EVT_CALL(SetGroupEnabled, MODEL_g31, 0) - EVT_CALL(SetGroupEnabled, MODEL_g50, 1) + EVT_CALL(SetGroupVisibility, MODEL_g31, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g50, MODEL_GROUP_VISIBLE) EVT_ELSE - EVT_CALL(SetGroupEnabled, MODEL_g31, 1) - EVT_CALL(SetGroupEnabled, MODEL_g50, 0) + EVT_CALL(SetGroupVisibility, MODEL_g31, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_g50, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_RETURN EVT_END }; EvtScript N(EVS_SetupRooms) = { - EVT_CALL(SetGroupEnabled, MODEL_g29, 0) - EVT_CALL(SetGroupEnabled, MODEL_g81, 0) - EVT_CALL(SetGroupEnabled, MODEL_g31, 0) - EVT_CALL(SetGroupEnabled, MODEL_g51, 0) + EVT_CALL(SetGroupVisibility, MODEL_g29, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g81, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g31, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g51, MODEL_GROUP_HIDDEN) EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ManageUpstairsVisibility)), TRIGGER_FLOOR_TOUCH, COLLIDER_o92, 0, 0, 1) // front door EVT_CALL(CreateMapRoom, diff --git a/src/world/area_isk/isk_05/isk_05_1_main.c b/src/world/area_isk/isk_05/isk_05_1_main.c index 3265657c10..30022404c0 100644 --- a/src/world/area_isk/isk_05/isk_05_1_main.c +++ b/src/world/area_isk/isk_05/isk_05_1_main.c @@ -34,11 +34,11 @@ EvtScript N(EVS_Main) = { EVT_CALL(TranslateGroup, MODEL_g304, 0, 65, 0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) EVT_IF_EQ(GF_ISK05_Hammer2Block, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_wan1, 1) - EVT_CALL(SetGroupEnabled, MODEL_wan2, 0) + EVT_CALL(SetGroupVisibility, MODEL_wan1, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_wan2, MODEL_GROUP_HIDDEN) EVT_ELSE - EVT_CALL(SetGroupEnabled, MODEL_wan1, 0) - EVT_CALL(SetGroupEnabled, MODEL_wan2, 1) + EVT_CALL(SetGroupVisibility, MODEL_wan1, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_wan2, MODEL_GROUP_VISIBLE) EVT_END_IF EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) 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 612f74d14e..e5624b8b91 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 @@ -188,8 +188,8 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(SetGroupEnabled, MODEL_wan1, 0) - EVT_CALL(SetGroupEnabled, MODEL_wan2, 1) + EVT_CALL(SetGroupVisibility, MODEL_wan1, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_wan2, MODEL_GROUP_VISIBLE) EVT_THREAD EVT_WAIT(15) EVT_CALL(MakeLerp, 0, 360, 15, EASING_LINEAR) diff --git a/src/world/area_jan/jan_02/jan_02_2_main.c b/src/world/area_jan/jan_02/jan_02_2_main.c index 21ea56c82c..213dcbba65 100644 --- a/src/world/area_jan/jan_02/jan_02_2_main.c +++ b/src/world/area_jan/jan_02/jan_02_2_main.c @@ -15,12 +15,12 @@ API_CALLABLE(N(ManageBigPalmTreeVisibility)) { if (N(PrevPalmTreeVisibility) != 0) { if (currentFloor == COLLIDER_o327 || currentFloor == COLLIDER_o330) { - set_model_flags(MODEL_g70, MODEL_FLAG_ENABLED, FALSE); + set_model_group_visibility(MODEL_g70, MODEL_FLAG_HIDDEN, MODEL_GROUP_HIDDEN); N(PrevPalmTreeVisibility) = FALSE; } } else { if (currentFloor == COLLIDER_o319 || currentFloor == COLLIDER_o316) { - set_model_flags(MODEL_g70, MODEL_FLAG_ENABLED, TRUE); + set_model_group_visibility(MODEL_g70, MODEL_FLAG_HIDDEN, MODEL_GROUP_VISIBLE); N(PrevPalmTreeVisibility) = TRUE; } } diff --git a/src/world/area_jan/jan_03/jan_03_6_rooms.c b/src/world/area_jan/jan_03/jan_03_6_rooms.c index a3f7233018..3990134ea5 100644 --- a/src/world/area_jan/jan_03/jan_03_6_rooms.c +++ b/src/world/area_jan/jan_03/jan_03_6_rooms.c @@ -47,15 +47,15 @@ EvtScript N(EVS_SetWallRot_ToadHouse) = { EvtScript N(EVS_RoomListener_ToadHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_g73, 0) - EVT_CALL(SetGroupEnabled, MODEL_g97, 0) + EVT_CALL(SetGroupVisibility, MODEL_g73, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g97, MODEL_GROUP_HIDDEN) EVT_CASE_EQ(ROOM_UPDATE_ENTER_DONE) // do nothing EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) // do nothing EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_g73, 1) - EVT_CALL(SetGroupEnabled, MODEL_g97, 1) + EVT_CALL(SetGroupVisibility, MODEL_g73, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_g97, MODEL_GROUP_VISIBLE) EVT_END_SWITCH EVT_RETURN EVT_END diff --git a/src/world/area_jan/jan_22/jan_22_2_main.c b/src/world/area_jan/jan_22/jan_22_2_main.c index 7698543f1c..b0a5c2aaee 100644 --- a/src/world/area_jan/jan_22/jan_22_2_main.c +++ b/src/world/area_jan/jan_22/jan_22_2_main.c @@ -81,9 +81,9 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(D_8024202C_B861AC) = { EVT_IF_LT(GB_StoryProgress, STORY_CH5_ZIP_LINE_READY) - EVT_CALL(SetGroupEnabled, MODEL_g39, 0) - EVT_CALL(SetGroupEnabled, MODEL_g52, 0) - EVT_CALL(SetGroupEnabled, MODEL_g58, 0) + EVT_CALL(SetGroupVisibility, MODEL_g39, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g52, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g58, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g29, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g39, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g86, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_jan/jan_22/jan_22_3_npc.c b/src/world/area_jan/jan_22/jan_22_3_npc.c index 4ab8ce8920..790fa04d17 100644 --- a/src/world/area_jan/jan_22/jan_22_3_npc.c +++ b/src/world/area_jan/jan_22/jan_22_3_npc.c @@ -411,9 +411,9 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(SetSelfVar, 0, RAVEN_SCENE_FINISH_WORK) EVT_CASE_EQ(RAVEN_SCENE_FINISH_WORK) EVT_WAIT(20) - EVT_CALL(SetGroupEnabled, MODEL_g39, 1) - EVT_CALL(SetGroupEnabled, MODEL_g52, 1) - EVT_CALL(SetGroupEnabled, MODEL_g58, 1) + EVT_CALL(SetGroupVisibility, MODEL_g39, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_g52, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_g58, MODEL_GROUP_VISIBLE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_g29, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_g39, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_g86, COLLIDER_FLAGS_UPPER_MASK) 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 b3f78f9ed9..47b5db6d33 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 @@ -1437,8 +1437,8 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(N(func_8024295C_8B29CC), 0, 0, 0, 255, 0) EVT_CALL(N(func_80242F08_8B2F78)) EVT_CALL(N(func_80242BC0_8B2C30), 30, 30, 30, 0, 0, 0, 0) - EVT_CALL(SetGroupEnabled, MODEL_Root, 0) - EVT_CALL(SetGroupEnabled, MODEL_kinopi, 1) + EVT_CALL(SetGroupVisibility, MODEL_Root, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_kinopi, MODEL_GROUP_VISIBLE) EVT_CALL(EnableModel, MODEL_o561, FALSE) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(FullyRestoreHPandFP) @@ -1539,7 +1539,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_WAIT(110) EVT_CALL(SetPlayerAnimation, ANIM_Mario_80024) EVT_WAIT(30) - EVT_CALL(SetGroupEnabled, MODEL_Root, 1) + EVT_CALL(SetGroupVisibility, MODEL_Root, MODEL_GROUP_VISIBLE) EVT_CALL(N(func_80242F28_8B2F98)) EVT_CALL(EnableModel, MODEL_o561, FALSE) EVT_CALL(EnableGroup, MODEL_2, FALSE) diff --git a/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c b/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c index ca88001818..8868227f12 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c +++ b/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c @@ -54,7 +54,7 @@ EvtScript N(EVS_NpcAI_Goombario) = { EvtScript N(EVS_RoomListener_House) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_of, 1) + EVT_CALL(SetGroupVisibility, MODEL_of, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_ENTER_DONE) // do nothing EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) @@ -68,7 +68,7 @@ EvtScript N(EVS_RoomListener_House) = { EVT_END_IF EVT_END_IF EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_of, 0) + EVT_CALL(SetGroupVisibility, MODEL_of, MODEL_GROUP_HIDDEN) EVT_IF_EQ(GB_StoryProgress, STORY_CH0_MET_GOOMPA) EVT_IF_EQ(GF_KMR02_Met_Goompapa, TRUE) EVT_IF_EQ(GF_KMR02_Goombario_RelayedMessage, FALSE) @@ -103,7 +103,7 @@ EvtScript N(EVS_RoomListener_Verdana) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_DONE) EVT_WAIT(30) - EVT_CALL(SetGroupEnabled, MODEL_monohoshi, 0) + EVT_CALL(SetGroupVisibility, MODEL_monohoshi, MODEL_GROUP_HIDDEN) EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) EVT_IF_GT(GB_StoryProgress, STORY_CH0_GATE_CRUSHED) EVT_IF_LT(GB_StoryProgress, STORY_CH0_TWINK_GAVE_LUCKY_STAR) @@ -112,7 +112,7 @@ EvtScript N(EVS_RoomListener_Verdana) = { EVT_RETURN EVT_END_IF EVT_END_IF - EVT_CALL(SetGroupEnabled, MODEL_monohoshi, 1) + EVT_CALL(SetGroupVisibility, MODEL_monohoshi, MODEL_GROUP_VISIBLE) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 499, 0, -378) EVT_CALL(SetPanTarget, CAM_DEFAULT, 499, 70, -378) EVT_CALL(SetCamDistance, CAM_DEFAULT, 370) @@ -121,10 +121,10 @@ EvtScript N(EVS_RoomListener_Verdana) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) EVT_CASE_LT(STORY_CH0_FELL_OFF_CLIFF) - EVT_CALL(SetGroupEnabled, MODEL_monohoshi, 0) + EVT_CALL(SetGroupVisibility, MODEL_monohoshi, MODEL_GROUP_HIDDEN) EVT_CALL(DisablePlayerInput, TRUE) EVT_CASE_LT(STORY_CH0_TWINK_GAVE_LUCKY_STAR) - EVT_CALL(SetGroupEnabled, MODEL_monohoshi, 0) + EVT_CALL(SetGroupVisibility, MODEL_monohoshi, MODEL_GROUP_HIDDEN) EVT_CASE_GE(STORY_CH0_TWINK_GAVE_LUCKY_STAR) EVT_CALL(EnableModel, MODEL_o437, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o625, COLLIDER_FLAGS_UPPER_MASK) @@ -136,9 +136,9 @@ EvtScript N(EVS_RoomListener_Verdana) = { EVT_IF_EQ(GB_StoryProgress, STORY_CH0_GATE_CRUSHED) EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) EVT_LOOP(3) - EVT_CALL(SetGroupEnabled, MODEL_monohoshi, 1) + EVT_CALL(SetGroupVisibility, MODEL_monohoshi, MODEL_GROUP_VISIBLE) EVT_WAIT(10) - EVT_CALL(SetGroupEnabled, MODEL_monohoshi, 0) + EVT_CALL(SetGroupVisibility, MODEL_monohoshi, MODEL_GROUP_HIDDEN) EVT_WAIT(10) EVT_END_LOOP EVT_CALL(FadeOutMusic, 0, 0) @@ -229,7 +229,7 @@ EvtScript N(EVS_SetupRooms) = { EVT_PTR(N(InsideNPCs_House))) EVT_SET(LVar0, ROOM_UPDATE_EXIT_END) EVT_EXEC(N(EVS_RoomListener_House)) - EVT_CALL(SetGroupEnabled, MODEL_monohoshi, 0) + EVT_CALL(SetGroupVisibility, MODEL_monohoshi, MODEL_GROUP_HIDDEN) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_02/kmr_02_6_rooms_2.c b/src/world/area_kmr/kmr_02/kmr_02_6_rooms_2.c index 306c12b9a9..cae2a023c5 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_6_rooms_2.c +++ b/src/world/area_kmr/kmr_02/kmr_02_6_rooms_2.c @@ -20,7 +20,7 @@ EvtScript N(EVS_SetWallRot_ToadHouse) = { EvtScript N(EVS_RoomListener_ToadHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_kino_in, 1) + EVT_CALL(SetGroupVisibility, MODEL_kino_in, MODEL_GROUP_VISIBLE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o767, COLLIDER_FLAGS_UPPER_MASK) EVT_CASE_EQ(ROOM_UPDATE_ENTER_DONE) // do nothing @@ -33,7 +33,7 @@ EvtScript N(EVS_RoomListener_ToadHouse) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_kino_in, 0) + EVT_CALL(SetGroupVisibility, MODEL_kino_in, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_o422, TRUE) EVT_CALL(EnableModel, MODEL_o424, TRUE) EVT_END_SWITCH @@ -42,7 +42,7 @@ EvtScript N(EVS_RoomListener_ToadHouse) = { }; EvtScript N(EVS_SetWallsDown_ToadHouse) = { - EVT_CALL(SetGroupEnabled, MODEL_kino_in, 1) + EVT_CALL(SetGroupVisibility, MODEL_kino_in, MODEL_GROUP_VISIBLE) EVT_CALL(RotateModel, MODEL_k_k_1, 180, 0, 1, 0) EVT_CALL(RotateModel, MODEL_k_k_2, 180, 0, 1, 0) EVT_CALL(RotateModel, MODEL_k_k_3, 180, 0, 1, 0) @@ -85,7 +85,7 @@ EvtScript N(EVS_SetupToadHouse) = { EVT_CALL(RotateModel, MODEL_o320, 180, 0, 1, 0) EVT_CALL(GetEntryID, LVar0) EVT_IF_NE(LVar0, kmr_02_ENTRY_5) - EVT_CALL(SetGroupEnabled, MODEL_kino_in, 0) + EVT_CALL(SetGroupVisibility, MODEL_kino_in, MODEL_GROUP_HIDDEN) EVT_END_IF // toad house EVT_CALL(CreateMapRoom, diff --git a/src/world/area_kmr/kmr_11/kmr_11_2_main.c b/src/world/area_kmr/kmr_11/kmr_11_2_main.c index c987530e50..5d12d57616 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_2_main.c +++ b/src/world/area_kmr/kmr_11/kmr_11_2_main.c @@ -109,9 +109,9 @@ EvtScript N(EVS_Main) = { EVT_IF_LT(GB_StoryProgress, STORY_CH0_HIT_GATEHOUSE_SWITCH) EVT_CALL(EnableModel, MODEL_bb, FALSE) EVT_ELSE - EVT_CALL(SetGroupEnabled, MODEL_ue, 0) - EVT_CALL(SetGroupEnabled, MODEL_sotokabe, 0) - EVT_CALL(SetGroupEnabled, MODEL_tobira, 0) + EVT_CALL(SetGroupVisibility, MODEL_ue, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_sotokabe, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_tobira, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_b1, FALSE) EVT_CALL(EnableModel, MODEL_b2, FALSE) EVT_CALL(EnableModel, MODEL_b3, FALSE) @@ -139,7 +139,7 @@ EvtScript N(EVS_Main) = { EVT_END_IF EVT_SET(LVar0, EVT_PTR(N(SearchBush_SwitchBush))) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Scripted)), TRIGGER_WALL_PRESS_A, COLLIDER_kusa4, 1, 0) - EVT_CALL(SetGroupEnabled, MODEL_event_cam, 0) + EVT_CALL(SetGroupVisibility, MODEL_event_cam, MODEL_GROUP_HIDDEN) EVT_CALL(TranslateGroup, MODEL_g172, NPC_DISPOSE_LOCATION) EVT_CALL(TranslateGroup, MODEL_g173, NPC_DISPOSE_LOCATION) EVT_IF_GE(GB_StoryProgress, STORY_CH0_HIT_GATEHOUSE_SWITCH) diff --git a/src/world/area_kpa/kpa_133/kpa_133_5_water.c b/src/world/area_kpa/kpa_133/kpa_133_5_water.c index 52a31e8e8a..3d17c4a3b7 100644 --- a/src/world/area_kpa/kpa_133/kpa_133_5_water.c +++ b/src/world/area_kpa/kpa_133/kpa_133_5_water.c @@ -5,7 +5,7 @@ EvtScript N(EVS_SetWaterLevel) = { EVT_CALL(SetRenderMode, MODEL_sui, RENDER_MODE_SURFACE_XLU_LAYER2) EVT_SWITCH(GB_KPA_WaterLevel) EVT_CASE_EQ(0) - EVT_CALL(SetGroupEnabled, MODEL_suimen, 0) + EVT_CALL(SetGroupVisibility, MODEL_suimen, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o358, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o405, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o414, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_kpa/kpa_134/kpa_134_3_chains.c b/src/world/area_kpa/kpa_134/kpa_134_3_chains.c index 3cb81c99f0..cab33beaeb 100644 --- a/src/world/area_kpa/kpa_134/kpa_134_3_chains.c +++ b/src/world/area_kpa/kpa_134/kpa_134_3_chains.c @@ -16,7 +16,7 @@ EvtScript N(EVS_SetupChains) = { EVT_CALL(TranslateModel, MODEL_o505, 0, 0, 0) EVT_SWITCH(GB_KPA_WaterLevel) EVT_CASE_EQ(0) - EVT_CALL(SetGroupEnabled, MODEL_suimen, 0) + EVT_CALL(SetGroupVisibility, MODEL_suimen, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_hidari, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) @@ -146,7 +146,7 @@ EvtScript N(EVS_LowerWaterLevel0) = { EVT_GOTO(15) EVT_END_IF EVT_END_THREAD - EVT_CALL(SetGroupEnabled, MODEL_sui1, 1) + EVT_CALL(SetGroupVisibility, MODEL_sui1, MODEL_GROUP_VISIBLE) EVT_CALL(EnableModel, MODEL_o385, TRUE) EVT_CALL(PlaySound, SOUND_80000053) EVT_CALL(MakeLerp, 120, 20, 120, EASING_LINEAR) @@ -160,7 +160,7 @@ EvtScript N(EVS_LowerWaterLevel0) = { EVT_END_IF EVT_CALL(PlaySound, SOUND_22B | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(func_802D62E4, SOUND_22B) - EVT_CALL(SetGroupEnabled, MODEL_sui1, 0) + EVT_CALL(SetGroupVisibility, MODEL_sui1, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_s_sui, FALSE) EVT_CALL(EnableModel, MODEL_o385, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_hidari, COLLIDER_FLAGS_UPPER_MASK) @@ -238,7 +238,7 @@ EvtScript N(EVS_RaiseWaterLevel1) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(SetGroupEnabled, MODEL_sui1, 1) + EVT_CALL(SetGroupVisibility, MODEL_sui1, MODEL_GROUP_VISIBLE) EVT_CALL(EnableModel, MODEL_o385, TRUE) EVT_CALL(EnableModel, MODEL_o389, TRUE) EVT_CALL(MakeLerp, 20, 120, 180, EASING_LINEAR) @@ -395,7 +395,7 @@ EvtScript N(EVS_LowerWaterLevel1) = { EVT_GOTO(15) EVT_END_IF EVT_END_THREAD - EVT_CALL(SetGroupEnabled, MODEL_sui1, 1) + EVT_CALL(SetGroupVisibility, MODEL_sui1, MODEL_GROUP_VISIBLE) EVT_CALL(PlaySound, SOUND_80000053) EVT_CALL(MakeLerp, 220, 120, 120, EASING_LINEAR) EVT_LABEL(30) @@ -482,7 +482,7 @@ EvtScript N(EVS_RaiseWaterLevel2) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(20) EVT_END_IF - EVT_CALL(SetGroupEnabled, MODEL_sui1, 1) + EVT_CALL(SetGroupVisibility, MODEL_sui1, MODEL_GROUP_VISIBLE) EVT_CALL(EnableModel, MODEL_o389, TRUE) EVT_CALL(MakeLerp, 120, 220, 180, EASING_LINEAR) EVT_LABEL(30) diff --git a/src/world/area_kpa/kpa_17/kpa_17_3_main.c b/src/world/area_kpa/kpa_17/kpa_17_3_main.c index f57468242c..6c8c30df7c 100644 --- a/src/world/area_kpa/kpa_17/kpa_17_3_main.c +++ b/src/world/area_kpa/kpa_17/kpa_17_3_main.c @@ -51,7 +51,7 @@ EvtScript N(EVS_Main) = { EVT_IF_EQ(GF_KPA17_BombedWall, FALSE) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BlastWall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Wall)), 1, 0) EVT_ELSE - EVT_CALL(SetGroupEnabled, MODEL_g296, 0) + EVT_CALL(SetGroupVisibility, MODEL_g296, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitte, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF EVT_EXEC(N(EVS_SetupMusic)) diff --git a/src/world/area_kpa/kpa_50/kpa_50_2_main.c b/src/world/area_kpa/kpa_50/kpa_50_2_main.c index 0c781dce97..4454aed39b 100644 --- a/src/world/area_kpa/kpa_50/kpa_50_2_main.c +++ b/src/world/area_kpa/kpa_50/kpa_50_2_main.c @@ -32,8 +32,8 @@ EvtScript N(EVS_Main) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_SETUP_CAMERA_DEFAULT() EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) - EVT_CALL(SetGroupEnabled, MODEL_dw1, 0) - EVT_CALL(SetGroupEnabled, MODEL_dw2, 0) + EVT_CALL(SetGroupVisibility, MODEL_dw1, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_dw2, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) EVT_EXEC(N(EVS_EnterMap)) EVT_WAIT(1) diff --git a/src/world/area_kzn/kzn_06/kzn_06_3_extra.c b/src/world/area_kzn/kzn_06/kzn_06_3_extra.c index e4fec02bb9..e356d3db71 100644 --- a/src/world/area_kzn/kzn_06/kzn_06_3_extra.c +++ b/src/world/area_kzn/kzn_06/kzn_06_3_extra.c @@ -26,7 +26,7 @@ API_CALLABLE(N(AdjustFog)) { Model* mdl = get_model_from_list_index(treeIndex); set_mdl_custom_gfx_set(mdl, -1, FOG_MODE_3); if (mode) { - mdl->flags &= ~MODEL_FLAG_ENABLED; + mdl->flags &= ~MODEL_FLAG_HIDDEN; } } script->functionTemp[0] = duration; @@ -47,7 +47,7 @@ API_CALLABLE(N(AdjustFog)) { Model* mdl = get_model_from_list_index(treeIndex); set_mdl_custom_gfx_set(mdl, -1, FOG_MODE_0); if (!mode) { - mdl->flags |= MODEL_FLAG_ENABLED; + mdl->flags |= MODEL_FLAG_HIDDEN; } } return ApiStatus_DONE1; diff --git a/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c b/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c index 9f683ac750..8921b9a07f 100644 --- a/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c +++ b/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c @@ -85,7 +85,7 @@ EvtScript N(EVS_SpinyTromp_ShakeCam) = { EvtScript N(EVS_SetupSpinyTromp) = { EVT_SET_GROUP(EVT_GROUP_EF) - EVT_CALL(SetGroupEnabled, MODEL_goron, 0) + EVT_CALL(SetGroupVisibility, MODEL_goron, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_me, FALSE) EVT_CALL(TranslateGroup, MODEL_goron, 0, 0, 0) EVT_CALL(RotateGroup, MODEL_goron, 0, 0, 0, 1) @@ -107,7 +107,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(InterruptUsePartner) - EVT_CALL(SetGroupEnabled, MODEL_goron, 1) + EVT_CALL(SetGroupVisibility, MODEL_goron, MODEL_GROUP_VISIBLE) EVT_CALL(EnableModel, MODEL_me, TRUE) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(LVar0, UNK_FUNC_50_LVar1) @@ -243,7 +243,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_ADD(LVar7, 7) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetGroupEnabled, MODEL_goron, 0) + EVT_CALL(SetGroupVisibility, MODEL_goron, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_me, FALSE) EVT_WAIT(10) EVT_IF_EQ(AF_KZN_TrompHitPlayer, FALSE) diff --git a/src/world/area_kzn/kzn_17/kzn_17_4_tromp.c b/src/world/area_kzn/kzn_17/kzn_17_4_tromp.c index a66be2b233..40f6dc530d 100644 --- a/src/world/area_kzn/kzn_17/kzn_17_4_tromp.c +++ b/src/world/area_kzn/kzn_17/kzn_17_4_tromp.c @@ -48,7 +48,7 @@ EvtScript N(EVS_SpinyTromp_ShakeCam) = { EvtScript N(EVS_SetupSpinyTromp) = { EVT_SET_GROUP(EVT_GROUP_EF) EVT_IF_GE(GB_StoryProgress, STORY_CH5_HIDDEN_PASSAGE_OPEN) - EVT_CALL(SetGroupEnabled, MODEL_goron, 0) + EVT_CALL(SetGroupVisibility, MODEL_goron, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_me, FALSE) EVT_CALL(EnableModel, MODEL_mae, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_gogo, COLLIDER_FLAGS_UPPER_MASK) @@ -144,7 +144,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_SET(GB_StoryProgress, STORY_CH5_HIDDEN_PASSAGE_OPEN) EVT_WAIT(50) EVT_CALL(StopSound, SOUND_8000001B) - EVT_CALL(SetGroupEnabled, MODEL_goron, 0) + EVT_CALL(SetGroupVisibility, MODEL_goron, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_me, FALSE) EVT_KILL_THREAD(LVarA) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) diff --git a/src/world/area_mac/mac_00/mac_00_4_rooms.c b/src/world/area_mac/mac_00/mac_00_4_rooms.c index c7241e8886..73ca113472 100644 --- a/src/world/area_mac/mac_00/mac_00_4_rooms.c +++ b/src/world/area_mac/mac_00/mac_00_4_rooms.c @@ -40,10 +40,10 @@ EvtScript N(EVS_DropDoor_RussHouse) = { EvtScript N(EVS_RoomListener_RussHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_intel_inn, 1) + EVT_CALL(SetGroupVisibility, MODEL_intel_inn, MODEL_GROUP_VISIBLE) EVT_SET(MF_MusicMixTrigger1, TRUE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_intel_inn, 0) + EVT_CALL(SetGroupVisibility, MODEL_intel_inn, MODEL_GROUP_HIDDEN) EVT_SET(MF_MusicMixTrigger1, FALSE) EVT_END_SWITCH EVT_RETURN @@ -74,12 +74,12 @@ EvtScript N(EVS_SetWallRot_Shop) = { EvtScript N(EVS_RoomListener_Shop) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_shop_in, 1) + EVT_CALL(SetGroupVisibility, MODEL_shop_in, MODEL_GROUP_VISIBLE) EVT_CALL(EnableModel, MODEL_o375, FALSE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) // do nothing EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_shop_in, 0) + EVT_CALL(SetGroupVisibility, MODEL_shop_in, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_o375, TRUE) EVT_END_SWITCH EVT_RETURN @@ -112,10 +112,10 @@ EvtScript N(EVS_DropDoor_Dojo) = { EvtScript N(EVS_RoomListener_Dojo) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_minka_inn, 1) + EVT_CALL(SetGroupVisibility, MODEL_minka_inn, MODEL_GROUP_VISIBLE) EVT_SET(MF_MusicMixTrigger2, TRUE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_minka_inn, 0) + EVT_CALL(SetGroupVisibility, MODEL_minka_inn, MODEL_GROUP_HIDDEN) EVT_CALL(EnableMusicProximityMix, 0) EVT_SET(MF_MusicMixTrigger2, FALSE) EVT_END_SWITCH @@ -152,10 +152,10 @@ EvtScript N(EVS_RoomListener_Waterfront) = { EVT_EXEC(N(EVS_WaterfrontHouse_DoorLocked)) EVT_SET(LVar0, -1) EVT_CASE_DEFAULT - EVT_CALL(SetGroupEnabled, MODEL_minka2_inn, 1) + EVT_CALL(SetGroupVisibility, MODEL_minka2_inn, MODEL_GROUP_VISIBLE) EVT_END_SWITCH EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_minka2_inn, 0) + EVT_CALL(SetGroupVisibility, MODEL_minka2_inn, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c b/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c index 21e5048161..a5f39b72d1 100644 --- a/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c +++ b/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c @@ -193,7 +193,7 @@ EvtScript N(EVS_ShyGuy_StealDictionary) = { EVT_CALL(ShowMessageAtScreenPos, MSG_MAC_Gate_0009, 160, 40) EVT_EXEC(N(EVS_ManageCarriedDictionary)) EVT_THREAD - EVT_CALL(SetGroupEnabled, MODEL_intel_inn, 1) + EVT_CALL(SetGroupVisibility, MODEL_intel_inn, MODEL_GROUP_VISIBLE) EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit3, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_SET(LVar0, 0) EVT_LOOP(10) @@ -207,7 +207,7 @@ EvtScript N(EVS_ShyGuy_StealDictionary) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit3, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) - EVT_CALL(SetGroupEnabled, MODEL_intel_inn, 0) + EVT_CALL(SetGroupVisibility, MODEL_intel_inn, MODEL_GROUP_HIDDEN) EVT_END_THREAD EVT_WAIT(5) EVT_CALL(SetNpcSpeed, NPC_ShyGuyThief, 10) diff --git a/src/world/area_mac/mac_01/mac_01_4_rooms.c b/src/world/area_mac/mac_01/mac_01_4_rooms.c index 63dfd3c090..9b2492f1c3 100644 --- a/src/world/area_mac/mac_01/mac_01_4_rooms.c +++ b/src/world/area_mac/mac_01/mac_01_4_rooms.c @@ -65,10 +65,10 @@ EvtScript N(EVS_DropDoor_PostOffice) = { EvtScript N(EVS_RoomListener_PostOffice) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_yubin_in, 1) + EVT_CALL(SetGroupVisibility, MODEL_yubin_in, MODEL_GROUP_VISIBLE) EVT_EXEC_WAIT(N(EVS_Scene_MailbagTheft)) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_yubin_in, 0) + EVT_CALL(SetGroupVisibility, MODEL_yubin_in, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -113,10 +113,10 @@ EvtScript N(EVS_SetWallRot_ToadHouse) = { EvtScript N(EVS_RoomListener_ToadHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_kino_in, 1) + EVT_CALL(SetGroupVisibility, MODEL_kino_in, MODEL_GROUP_VISIBLE) EVT_SET(MF_InsideToadHouse, TRUE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_kino_in, 0) + EVT_CALL(SetGroupVisibility, MODEL_kino_in, MODEL_GROUP_HIDDEN) EVT_SET(MF_InsideToadHouse, FALSE) EVT_END_SWITCH EVT_RETURN @@ -161,14 +161,14 @@ EvtScript N(EVS_RoomListener_MerlonHouse) = { EVT_SET(LVar0, -1) EVT_RETURN EVT_END_SWITCH - EVT_CALL(SetGroupEnabled, MODEL_dr_in, 1) + EVT_CALL(SetGroupVisibility, MODEL_dr_in, MODEL_GROUP_VISIBLE) EVT_SET(MF_MusicMixTrigger1, TRUE) EVT_CASE_EQ(ROOM_UPDATE_ENTER_DONE) // do nothing EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) // do nothing EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_dr_in, 0) + EVT_CALL(SetGroupVisibility, MODEL_dr_in, MODEL_GROUP_HIDDEN) EVT_SET(MF_MusicMixTrigger1, FALSE) EVT_END_SWITCH EVT_RETURN diff --git a/src/world/area_mac/mac_01/mac_01_9_npc.c b/src/world/area_mac/mac_01/mac_01_9_npc.c index 220c6683dd..d8156e993c 100644 --- a/src/world/area_mac/mac_01/mac_01_9_npc.c +++ b/src/world/area_mac/mac_01/mac_01_9_npc.c @@ -389,7 +389,7 @@ EvtScript N(EVS_MerlonShooAway) = { EvtScript N(EVS_MerlonBargeOut) = { EVT_CALL(ShowMessageAtScreenPos, MSG_MAC_Plaza_0020, 160, 40) - EVT_CALL(SetGroupEnabled, MODEL_dr_in, 1) + EVT_CALL(SetGroupVisibility, MODEL_dr_in, MODEL_GROUP_VISIBLE) EVT_THREAD EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitd, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, -80, 15, EASING_COS_FAST_OVERSHOOT) @@ -855,14 +855,14 @@ EvtScript N(EVS_NpcInteract_Merlon) = { EVT_CALL(SetNpcSpeed, NPC_Merlon, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_Merlon, -170, -225, 0) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) - EVT_CALL(SetGroupEnabled, MODEL_dr_in, 1) + EVT_CALL(SetGroupVisibility, MODEL_dr_in, MODEL_GROUP_VISIBLE) EVT_EXEC_WAIT(N(D_8024E740_80EFC0)) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Walk) EVT_CALL(SetNpcSpeed, NPC_Merlon, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_Merlon, -265, -300, 0) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) EVT_EXEC_WAIT(N(D_8024E7F0_80F070)) - EVT_CALL(SetGroupEnabled, MODEL_dr_in, 0) + EVT_CALL(SetGroupVisibility, MODEL_dr_in, MODEL_GROUP_HIDDEN) EVT_SET(GF_MAC01_Merlon_HeardAboutDream, TRUE) EVT_CALL(InterpNpcYaw, NPC_Merlon, 133, 0) EVT_CALL(SetNpcPos, NPC_Merlon, -337, 20, -360) diff --git a/src/world/area_mac/mac_02/mac_02_3_rooms.c b/src/world/area_mac/mac_02/mac_02_3_rooms.c index d209398020..1ea54bc0a1 100644 --- a/src/world/area_mac/mac_02/mac_02_3_rooms.c +++ b/src/world/area_mac/mac_02/mac_02_3_rooms.c @@ -45,10 +45,10 @@ EvtScript N(EVS_SetWallRot_TayceT) = { EvtScript N(EVS_RoomListener_TayceT) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_cook_in, 1) + EVT_CALL(SetGroupVisibility, MODEL_cook_in, MODEL_GROUP_VISIBLE) EVT_SET(MF_MusicMixTrigger1, TRUE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_cook_in, 0) + EVT_CALL(SetGroupVisibility, MODEL_cook_in, MODEL_GROUP_HIDDEN) EVT_SET(MF_MusicMixTrigger1, FALSE) EVT_END_SWITCH EVT_RETURN @@ -77,14 +77,14 @@ EvtScript N(EVS_RoomListener_BlueHouse) = { EVT_SET(LVar0, -1) EVT_RETURN EVT_END_IF - EVT_CALL(SetGroupEnabled, MODEL_souko_in, 1) + EVT_CALL(SetGroupVisibility, MODEL_souko_in, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) EVT_IF_EQ(GF_MAC02_UnlockedHouse, FALSE) EVT_SET(LVar0, -1) EVT_RETURN EVT_END_IF EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_souko_in, 0) + EVT_CALL(SetGroupVisibility, MODEL_souko_in, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -126,7 +126,7 @@ EvtScript N(EVS_SetupRooms) = { EVT_IF_EQ(LVar0, mac_02_ENTRY_5) EVT_SET(LVar0, 3) EVT_EXEC(N(EVS_RoomListener_TayceT)) - EVT_CALL(SetGroupEnabled, MODEL_souko_in, 1) + EVT_CALL(SetGroupVisibility, MODEL_souko_in, MODEL_GROUP_VISIBLE) EVT_CALL(N(InitEntryFromTunnels)) EVT_SET(LVar0, 90) EVT_CALL(RotateModel, MODEL_sk1, LVar0, 0, 0, 1) diff --git a/src/world/area_mac/mac_04/mac_04_3_rooms.c b/src/world/area_mac/mac_04/mac_04_3_rooms.c index 1d81cccb12..acd1288cbf 100644 --- a/src/world/area_mac/mac_04/mac_04_3_rooms.c +++ b/src/world/area_mac/mac_04/mac_04_3_rooms.c @@ -255,7 +255,7 @@ EvtScript N(EVS_SetupRooms) = { EVT_CALL(GetEntryID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_RANGE(mac_04_ENTRY_2, mac_04_ENTRY_3) - EVT_CALL(SetGroupEnabled, MODEL_heiho_in, 1) + EVT_CALL(SetGroupVisibility, MODEL_heiho_in, MODEL_GROUP_VISIBLE) EVT_CALL(N(InitEntryFromToybox)) EVT_SET(LVar0, 90) EVT_CALL(RotateModel, MODEL_hk1, LVar0, 0, 0, -1) diff --git a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c index 6a5e78cde2..5aa7069822 100644 --- a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c +++ b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c @@ -676,7 +676,7 @@ API_CALLABLE(N(RunMinigame)) { npc->jumpScale = 1.1f; data->box[i].stateTimer = 0; model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); - model->flags &= ~MODEL_FLAG_ENABLED; + model->flags &= ~MODEL_FLAG_HIDDEN; if (!(model->flags & MODEL_FLAG_HAS_TRANSFORM_APPLIED)) { guTranslateF(model->transformMatrix, npc->pos.x, npc->pos.y, npc->pos.z); model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; @@ -708,7 +708,7 @@ API_CALLABLE(N(RunMinigame)) { data->box[i].state = BOX_STATE_PEACH_IDLE; data->box[i].stateTimer = rand_int(330) + 90; disable_npc_shadow(npc); - model->flags |= MODEL_FLAG_ENABLED; + model->flags |= MODEL_FLAG_HIDDEN; } break; case BOX_STATE_PEACH_HIT: @@ -717,7 +717,7 @@ API_CALLABLE(N(RunMinigame)) { enable_npc_shadow(npc); npc->duration = 0; data->box[i].state = BOX_STATE_PEACH_EMERGE; - model->flags &= ~MODEL_FLAG_ENABLED; + model->flags &= ~MODEL_FLAG_HIDDEN; // fallthrough case BOX_STATE_PEACH_EMERGE: hittingPeachBlock = TRUE; @@ -734,7 +734,7 @@ API_CALLABLE(N(RunMinigame)) { if (npc->duration >= 30) { data->box[i].state = BOX_STATE_PEACH_DONE; disable_npc_shadow(npc); - model->flags |= MODEL_FLAG_ENABLED; + model->flags |= MODEL_FLAG_HIDDEN; } break; case BOX_STATE_PEACH_DONE: diff --git a/src/world/area_mim/mim_09/mim_09_4_hint.c b/src/world/area_mim/mim_09/mim_09_4_hint.c index badcec28c7..4a61e13097 100644 --- a/src/world/area_mim/mim_09/mim_09_4_hint.c +++ b/src/world/area_mim/mim_09/mim_09_4_hint.c @@ -58,7 +58,7 @@ EvtScript N(EVS_FlowersGentleRocking) = { EvtScript N(EVS_InspectBush) = { EVT_IF_EQ(MV_FoundHint, FALSE) EVT_SET(MV_FoundHint, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_hana, 1) + EVT_CALL(SetGroupVisibility, MODEL_hana, MODEL_GROUP_VISIBLE) EVT_CALL(PlaySound, SOUND_205D) EVT_CALL(MakeLerp, 10, 100, 30, EASING_LINEAR) EVT_LABEL(0) @@ -85,7 +85,7 @@ EvtScript N(EVS_InspectBush) = { EvtScript N(EVS_SetupExitHint) = { EVT_SET(MV_FoundHint, 0) - EVT_CALL(SetGroupEnabled, MODEL_hana, 0) + EVT_CALL(SetGroupVisibility, MODEL_hana, MODEL_GROUP_HIDDEN) EVT_CALL(SetTexPanner, MODEL_o465, TEX_PANNER_0) EVT_CALL(SetTexPanner, MODEL_o467, TEX_PANNER_0) EVT_CALL(SetTexPanner, MODEL_o469, TEX_PANNER_0) diff --git a/src/world/area_nok/nok_01/nok_01_6_rooms.c b/src/world/area_nok/nok_01/nok_01_6_rooms.c index cbd41b281b..cc0d682a72 100644 --- a/src/world/area_nok/nok_01/nok_01_6_rooms.c +++ b/src/world/area_nok/nok_01/nok_01_6_rooms.c @@ -179,9 +179,9 @@ EvtScript N(EVS_DropDoor_BeachHouse) = { EvtScript N(EVS_RoomListener_ToadHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_g111, 1) + EVT_CALL(SetGroupVisibility, MODEL_g111, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_g111, 0) + EVT_CALL(SetGroupVisibility, MODEL_g111, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -190,10 +190,10 @@ EvtScript N(EVS_RoomListener_ToadHouse) = { EvtScript N(EVS_RoomListener_Shop) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_g114, 1) + EVT_CALL(SetGroupVisibility, MODEL_g114, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_g114, 0) + EVT_CALL(SetGroupVisibility, MODEL_g114, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -202,7 +202,7 @@ EvtScript N(EVS_RoomListener_Shop) = { EvtScript N(EVS_RoomListener_BeachHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_g79, 1) + EVT_CALL(SetGroupVisibility, MODEL_g79, MODEL_GROUP_VISIBLE) EVT_CALL(N(SetRadioVolumeMax), AB_NOK_0) EVT_EXEC(N(EVS_80242C38)) EVT_CASE_EQ(ROOM_UPDATE_ENTER_DONE) @@ -211,7 +211,7 @@ EvtScript N(EVS_RoomListener_BeachHouse) = { EVT_CALL(N(SetRadioVolumeMute), AB_NOK_0) EVT_EXEC(N(EVS_80242DE0)) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_g79, 0) + EVT_CALL(SetGroupVisibility, MODEL_g79, MODEL_GROUP_HIDDEN) EVT_CALL(N(func_80242898_9C7C78)) EVT_END_SWITCH EVT_RETURN diff --git a/src/world/area_nok/nok_02/nok_02_4_rooms.c b/src/world/area_nok/nok_02/nok_02_4_rooms.c index 0599033d65..eb3b2706c3 100644 --- a/src/world/area_nok/nok_02/nok_02_4_rooms.c +++ b/src/world/area_nok/nok_02/nok_02_4_rooms.c @@ -217,7 +217,7 @@ EvtScript N(EVS_RoomListener_KooperHouse) = { EVT_SET(LVar0, ROOM_UPDATE_REQUEST_CANCEL) EVT_RETURN EVT_END_IF - EVT_CALL(SetGroupEnabled, MODEL_g111, 1) + EVT_CALL(SetGroupVisibility, MODEL_g111, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_ENTER_DONE) EVT_EXEC(N(EVS_FuzzyBoss_PlayerEntersKoopersHouse)) EVT_SET(AF_NOK_10, TRUE) @@ -225,7 +225,7 @@ EvtScript N(EVS_RoomListener_KooperHouse) = { EVT_SET(AF_NOK_10, FALSE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) EVT_SET(AF_NOK_12, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_g111, 0) + EVT_CALL(SetGroupVisibility, MODEL_g111, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -234,13 +234,13 @@ EvtScript N(EVS_RoomListener_KooperHouse) = { EvtScript N(EVS_RoomListener_KoloradoHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_g45, 1) + EVT_CALL(SetGroupVisibility, MODEL_g45, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_ENTER_DONE) // do nothing EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) // do nothing EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_g45, 0) + EVT_CALL(SetGroupVisibility, MODEL_g45, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -249,13 +249,13 @@ EvtScript N(EVS_RoomListener_KoloradoHouse) = { EvtScript N(EVS_RoomListener_KootHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) - EVT_CALL(SetGroupEnabled, MODEL_g63, 1) + EVT_CALL(SetGroupVisibility, MODEL_g63, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_ENTER_DONE) // do nothing EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) // do nothing EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) - EVT_CALL(SetGroupEnabled, MODEL_g63, 0) + EVT_CALL(SetGroupVisibility, MODEL_g63, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END diff --git a/src/world/area_nok/nok_02/nok_02_6_npc.c b/src/world/area_nok/nok_02/nok_02_6_npc.c index 39e6ec0cab..da9b1fb5ef 100644 --- a/src/world/area_nok/nok_02/nok_02_6_npc.c +++ b/src/world/area_nok/nok_02/nok_02_6_npc.c @@ -62,7 +62,7 @@ EvtScript N(EVS_NpcInteract_Kooper) = { EVT_CALL(SetCamPitch, CAM_DEFAULT, 17, EVT_FLOAT(-5.5)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, 4) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_CALL(SetGroupEnabled, MODEL_g111, 1) + EVT_CALL(SetGroupVisibility, MODEL_g111, MODEL_GROUP_VISIBLE) EVT_THREAD EVT_WAIT(10) EVT_CALL(PlaySoundAt, SOUND_BASIC_DOOR_OPEN, 0, 0, 0, -180) @@ -108,7 +108,7 @@ EvtScript N(EVS_NpcInteract_Kooper) = { EVT_GOTO(20) EVT_END_IF EVT_CALL(PlaySoundAt, SOUND_BASIC_DOOR_CLOSE, 0, 0, 0, -180) - EVT_CALL(SetGroupEnabled, MODEL_g111, 0) + EVT_CALL(SetGroupVisibility, MODEL_g111, MODEL_GROUP_HIDDEN) EVT_END_THREAD EVT_CALL(NpcMoveTo, NPC_Kooper, 25, -130, 10) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Idle) diff --git a/src/world/area_nok/nok_12/nok_12_4_bridge.c b/src/world/area_nok/nok_12/nok_12_4_bridge.c index a7e8d67988..23313d9ff2 100644 --- a/src/world/area_nok/nok_12/nok_12_4_bridge.c +++ b/src/world/area_nok/nok_12/nok_12_4_bridge.c @@ -95,7 +95,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_SET(GB_StoryProgress, STORY_CH1_MADE_FIRST_BRIDGE) - EVT_CALL(SetGroupEnabled, MODEL_off, 0) + EVT_CALL(SetGroupVisibility, MODEL_off, MODEL_GROUP_HIDDEN) EVT_UNBIND EVT_RETURN EVT_END @@ -108,7 +108,7 @@ EvtScript N(EVS_SetupBridge) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o204, COLLIDER_FLAGS_UPPER_MASK) EVT_RETURN EVT_END_IF - EVT_CALL(SetGroupEnabled, MODEL_off, 0) + EVT_CALL(SetGroupVisibility, MODEL_off, MODEL_GROUP_HIDDEN) EVT_CALL(RotateModel, MODEL_o97, 90, -1, 0, 0) EVT_CALL(RotateModel, MODEL_o95, 90, -1, 0, 0) EVT_CALL(RotateModel, MODEL_o94, 90, -1, 0, 0) diff --git a/src/world/area_omo/omo_05/omo_05_2_main.c b/src/world/area_omo/omo_05/omo_05_2_main.c index 93b48d4ee8..c24baf8f24 100644 --- a/src/world/area_omo/omo_05/omo_05_2_main.c +++ b/src/world/area_omo/omo_05/omo_05_2_main.c @@ -21,7 +21,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_SetupGizmos)) EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_popo, 0) + EVT_CALL(SetGroupVisibility, MODEL_popo, MODEL_GROUP_HIDDEN) EVT_IF_GE(GB_StoryProgress, STORY_CH4_GAVE_CAKE_TO_GOURMET_GUY) EVT_CALL(RotateModel, MODEL_o331, 105, 0, 1, 0) EVT_CALL(RotateModel, MODEL_o332, 105, 0, 1, 0) diff --git a/src/world/area_omo/omo_08/omo_08_3_boxes.c b/src/world/area_omo/omo_08/omo_08_3_boxes.c index 96267d20cb..ba1fce9806 100644 --- a/src/world/area_omo/omo_08/omo_08_3_boxes.c +++ b/src/world/area_omo/omo_08/omo_08_3_boxes.c @@ -408,7 +408,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_WAIT(10) EVT_THREAD EVT_CALL(GetModelCenter, MODEL_b1_1) - EVT_CALL(SetGroupEnabled, MODEL_b1, 0) + EVT_CALL(SetGroupVisibility, MODEL_b1, MODEL_GROUP_HIDDEN) EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_2098, SOUND_SPACE_MODE_0) EVT_LOOP(4) EVT_SET(LVar3, 20) @@ -430,7 +430,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_WAIT(30) EVT_THREAD EVT_CALL(GetModelCenter, MODEL_b2_1) - EVT_CALL(SetGroupEnabled, MODEL_b2, 0) + EVT_CALL(SetGroupVisibility, MODEL_b2, MODEL_GROUP_HIDDEN) EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_2098, SOUND_SPACE_MODE_0) EVT_LOOP(4) EVT_SET(LVar3, 20) @@ -452,7 +452,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_WAIT(30) EVT_THREAD EVT_CALL(GetModelCenter, MODEL_b3_1) - EVT_CALL(SetGroupEnabled, MODEL_b3, 0) + EVT_CALL(SetGroupVisibility, MODEL_b3, MODEL_GROUP_HIDDEN) EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_2098, SOUND_SPACE_MODE_0) EVT_LOOP(4) EVT_SET(LVar3, 20) @@ -474,7 +474,7 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_WAIT(30) EVT_THREAD EVT_CALL(GetModelCenter, MODEL_b4_1) - EVT_CALL(SetGroupEnabled, MODEL_b4, 0) + EVT_CALL(SetGroupVisibility, MODEL_b4, MODEL_GROUP_HIDDEN) EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_2098, SOUND_SPACE_MODE_0) EVT_LOOP(4) EVT_SET(LVar3, 20) @@ -724,7 +724,7 @@ EvtScript N(EVS_SetupBoxes) = { EVT_SET(LVar0, EVT_PTR(N(BlueBoxInfo))) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_HitBox)), TRIGGER_WALL_HAMMER, COLLIDER_o918, 1, 0) EVT_ELSE - EVT_CALL(SetGroupEnabled, MODEL_box, 0) + EVT_CALL(SetGroupVisibility, MODEL_box, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o907, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o911, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o915, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_omo/omo_17/omo_17_1_main.c b/src/world/area_omo/omo_17/omo_17_1_main.c index d797e53033..426148c20e 100644 --- a/src/world/area_omo/omo_17/omo_17_1_main.c +++ b/src/world/area_omo/omo_17/omo_17_1_main.c @@ -28,7 +28,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_EnterTrain)) EVT_WAIT(3) EVT_CASE_DEFAULT - EVT_CALL(SetGroupEnabled, MODEL_popo, 0) + EVT_CALL(SetGroupVisibility, MODEL_popo, MODEL_GROUP_HIDDEN) EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_WAIT(1) diff --git a/src/world/area_pra/pra_02/pra_02_2_main.c b/src/world/area_pra/pra_02/pra_02_2_main.c index 09e80c8307..1afdcb7e3b 100644 --- a/src/world/area_pra/pra_02/pra_02_2_main.c +++ b/src/world/area_pra/pra_02/pra_02_2_main.c @@ -328,10 +328,10 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_IF_EQ(GF_PRA02_DoorColorToggle, FALSE) EVT_SET(MV_WallPosOffset, 0) - EVT_CALL(SetGroupEnabled, MODEL_g308, 0) + EVT_CALL(SetGroupVisibility, MODEL_g308, MODEL_GROUP_HIDDEN) EVT_ELSE EVT_SET(MV_WallPosOffset, -250) - EVT_CALL(SetGroupEnabled, MODEL_g307, 0) + EVT_CALL(SetGroupVisibility, MODEL_g307, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_EXEC(N(EVS_UpdateShiftingWallPos)) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ManagePoundableSwitch)), TRIGGER_FLOOR_TOUCH, COLLIDER_o1342, 1, 0) diff --git a/src/world/area_pra/pra_02/pra_02_4_entity.c b/src/world/area_pra/pra_02/pra_02_4_entity.c index c267cecef7..499d0ec648 100644 --- a/src/world/area_pra/pra_02/pra_02_4_entity.c +++ b/src/world/area_pra/pra_02/pra_02_4_entity.c @@ -121,12 +121,12 @@ EvtScript N(EVS_ManagePoundableSwitch) = { EVT_END_IF EVT_WAIT(10) EVT_IF_EQ(GF_PRA02_DoorColorToggle, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_g307, 0) - EVT_CALL(SetGroupEnabled, MODEL_g308, 1) + EVT_CALL(SetGroupVisibility, MODEL_g307, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g308, MODEL_GROUP_VISIBLE) EVT_EXEC_WAIT(N(EVS_RaisePoundableSwitch)) EVT_ELSE - EVT_CALL(SetGroupEnabled, MODEL_g307, 1) - EVT_CALL(SetGroupEnabled, MODEL_g308, 0) + EVT_CALL(SetGroupVisibility, MODEL_g307, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_g308, MODEL_GROUP_HIDDEN) EVT_EXEC_WAIT(N(EVS_RaisePoundableSwitch)) EVT_END_IF EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_pra/pra_18/pra_18_2_main.c b/src/world/area_pra/pra_18/pra_18_2_main.c index cce7377f4a..d52f5e972d 100644 --- a/src/world/area_pra/pra_18/pra_18_2_main.c +++ b/src/world/area_pra/pra_18/pra_18_2_main.c @@ -120,21 +120,21 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_SetupMusic)) EVT_IF_GE(GB_StoryProgress, STORY_CH7_DEFEATED_CLUBBAS) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1174, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetGroupEnabled, MODEL_g298, 0) + EVT_CALL(SetGroupVisibility, MODEL_g298, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1175, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetGroupEnabled, MODEL_g296, 0) + EVT_CALL(SetGroupVisibility, MODEL_g296, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1176, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetGroupEnabled, MODEL_g297, 0) + EVT_CALL(SetGroupVisibility, MODEL_g297, MODEL_GROUP_HIDDEN) EVT_ELSE EVT_SWITCH(GB_PRA18_ClubbasDefeated) EVT_CASE_EQ(1) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1176, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetGroupEnabled, MODEL_g297, 0) + EVT_CALL(SetGroupVisibility, MODEL_g297, MODEL_GROUP_HIDDEN) EVT_CASE_EQ(2) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1175, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetGroupEnabled, MODEL_g296, 0) + EVT_CALL(SetGroupVisibility, MODEL_g296, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1176, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetGroupEnabled, MODEL_g297, 0) + EVT_CALL(SetGroupVisibility, MODEL_g297, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_END_IF EVT_EXEC(N(EVS_EnterMap)) diff --git a/src/world/area_pra/pra_18/pra_18_3_npc.c b/src/world/area_pra/pra_18/pra_18_3_npc.c index 4c86d2a796..3e7d07545c 100644 --- a/src/world/area_pra/pra_18/pra_18_3_npc.c +++ b/src/world/area_pra/pra_18/pra_18_3_npc.c @@ -168,9 +168,9 @@ EvtScript N(EVS_NpcDefeat_Clubba_01) = { EVT_WAIT(50) EVT_LOOP(10) EVT_WAIT(2) - EVT_CALL(SetGroupEnabled, MODEL_g297, 1) + EVT_CALL(SetGroupVisibility, MODEL_g297, MODEL_GROUP_VISIBLE) EVT_WAIT(2) - EVT_CALL(SetGroupEnabled, MODEL_g297, 0) + EVT_CALL(SetGroupVisibility, MODEL_g297, MODEL_GROUP_HIDDEN) EVT_END_LOOP EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1176, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(GB_PRA18_ClubbasDefeated, 1) @@ -194,9 +194,9 @@ EvtScript N(EVS_NpcDefeat_Clubba_02) = { EVT_WAIT(50) EVT_LOOP(10) EVT_WAIT(2) - EVT_CALL(SetGroupEnabled, MODEL_g296, 1) + EVT_CALL(SetGroupVisibility, MODEL_g296, MODEL_GROUP_VISIBLE) EVT_WAIT(2) - EVT_CALL(SetGroupEnabled, MODEL_g296, 0) + EVT_CALL(SetGroupVisibility, MODEL_g296, MODEL_GROUP_HIDDEN) EVT_END_LOOP EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1175, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(GB_PRA18_ClubbasDefeated, 2) @@ -220,9 +220,9 @@ EvtScript N(EVS_NpcDefeat_Clubba_03) = { EVT_WAIT(50) EVT_LOOP(10) EVT_WAIT(2) - EVT_CALL(SetGroupEnabled, MODEL_g298, 1) + EVT_CALL(SetGroupVisibility, MODEL_g298, MODEL_GROUP_VISIBLE) EVT_WAIT(2) - EVT_CALL(SetGroupEnabled, MODEL_g298, 0) + EVT_CALL(SetGroupVisibility, MODEL_g298, MODEL_GROUP_HIDDEN) EVT_END_LOOP EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1174, COLLIDER_FLAGS_UPPER_MASK) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_33_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittne, 1, 0) diff --git a/src/world/area_pra/pra_31/pra_31_4_puzzle.c b/src/world/area_pra/pra_31/pra_31_4_puzzle.c index 4e6e365cf3..d6807ed3b5 100644 --- a/src/world/area_pra/pra_31/pra_31_4_puzzle.c +++ b/src/world/area_pra/pra_31/pra_31_4_puzzle.c @@ -331,10 +331,10 @@ EvtScript N(EVS_Scene_PuzzleSolved) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_THREAD EVT_WAIT(45) - EVT_CALL(SetGroupEnabled, MODEL_g255, 1) - EVT_CALL(SetGroupEnabled, MODEL_g262, 1) - EVT_CALL(SetGroupEnabled, MODEL_g264, 1) - EVT_CALL(SetGroupEnabled, MODEL_g265, 1) + EVT_CALL(SetGroupVisibility, MODEL_g255, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_g262, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_g264, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_g265, MODEL_GROUP_VISIBLE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o1071, COLLIDER_FLAGS_UPPER_MASK) EVT_END_THREAD EVT_THREAD @@ -565,17 +565,17 @@ EvtScript N(EVS_SetupPuzzle) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PushStatue_03)), TRIGGER_WALL_PUSH, COLLIDER_s03e, 1, 0) EVT_IF_GE(GB_StoryProgress, STORY_CH7_SOLVED_ALBINO_DINO_PUZZLE) EVT_CALL(PlayModelAnimation, MDL_ANIMATOR_0, EVT_PTR(N(AS_Stairs_InitializeAfter))) - EVT_CALL(SetGroupEnabled, MODEL_no, 0) - EVT_CALL(SetGroupEnabled, MODEL_kage_yuka, 1) + EVT_CALL(SetGroupVisibility, MODEL_no, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_kage_yuka, MODEL_GROUP_VISIBLE) EVT_ELSE EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o1071, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(PlayModelAnimation, MDL_ANIMATOR_0, EVT_PTR(N(AS_Stairs_InitializeBefore))) - EVT_CALL(SetGroupEnabled, MODEL_g255, 0) - EVT_CALL(SetGroupEnabled, MODEL_g262, 0) - EVT_CALL(SetGroupEnabled, MODEL_g264, 0) - EVT_CALL(SetGroupEnabled, MODEL_g265, 0) - EVT_CALL(SetGroupEnabled, MODEL_no, 1) - EVT_CALL(SetGroupEnabled, MODEL_kage_yuka, 0) + EVT_CALL(SetGroupVisibility, MODEL_g255, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g262, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g264, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g265, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_no, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_kage_yuka, MODEL_GROUP_HIDDEN) EVT_EXEC(N(EVS_Scene_PuzzleSolved)) EVT_END_IF EVT_RETURN diff --git a/src/world/area_sam/sam_01/sam_01_3_rooms.c b/src/world/area_sam/sam_01/sam_01_3_rooms.c index 5b0700ee46..68401618c4 100644 --- a/src/world/area_sam/sam_01/sam_01_3_rooms.c +++ b/src/world/area_sam/sam_01/sam_01_3_rooms.c @@ -9,10 +9,10 @@ EvtScript N(EVS_SetDoorRot_MayorFoyer) = { EvtScript N(EVS_SetWallRot_MayorFoyer) = { EVT_CALL(RotateGroup, MODEL_s_mae, LVar0, 1, 0, 0) EVT_IF_GT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_s_mae, 0) + EVT_CALL(SetGroupVisibility, MODEL_s_mae, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_IF_LT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_s_mae, 1) + EVT_CALL(SetGroupVisibility, MODEL_s_mae, MODEL_GROUP_VISIBLE) EVT_END_IF EVT_RETURN EVT_END @@ -30,7 +30,7 @@ EvtScript N(EVS_RoomListener_MayorFoyer) = { EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) EVT_SET(AF_SAM_04, TRUE) EVT_SET(AF_SAM_Snowing, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_s_naisou, 1) + EVT_CALL(SetGroupVisibility, MODEL_s_naisou, MODEL_GROUP_VISIBLE) EVT_IF_GE(GB_StoryProgress, STORY_CH7_MAYOR_MURDER_SOLVED) EVT_CALL(SetNpcPos, NPC_MayorPenguin, -275, 0, -200) EVT_CALL(InterpNpcYaw, NPC_MayorPenguin, 180, 0) @@ -40,7 +40,7 @@ EvtScript N(EVS_RoomListener_MayorFoyer) = { EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) EVT_SET(AF_SAM_04, FALSE) EVT_SET(AF_SAM_Snowing, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_s_naisou, 0) + EVT_CALL(SetGroupVisibility, MODEL_s_naisou, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -113,10 +113,10 @@ EvtScript N(EVS_SetWallRot_MiddleHouse) = { EVT_CALL(RotateGroup, MODEL_f_ue, LVar0, 0, 0, -1) EVT_CALL(RotateGroup, MODEL_f_sita, LVar0, 0, 0, 1) EVT_IF_GT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_f_sita, 0) + EVT_CALL(SetGroupVisibility, MODEL_f_sita, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_IF_LT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_f_sita, 1) + EVT_CALL(SetGroupVisibility, MODEL_f_sita, MODEL_GROUP_VISIBLE) EVT_END_IF EVT_RETURN EVT_END @@ -127,14 +127,14 @@ EvtScript N(EVS_RoomListener_MiddleHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) EVT_SET(AF_SAM_Snowing, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_f_naiso, 1) + EVT_CALL(SetGroupVisibility, MODEL_f_naiso, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_ENTER_DONE) // do nothing EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) // do nothing EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) EVT_SET(AF_SAM_Snowing, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_f_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_f_naiso, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -156,10 +156,10 @@ EvtScript N(EVS_SetWallRot_RightHouse) = { EVT_CALL(RotateGroup, MODEL_m_ue, LVar0, 0, 0, 1) EVT_CALL(RotateGroup, MODEL_m_mae, LVar0, 0, 0, -1) EVT_IF_GT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_m_mae, 0) + EVT_CALL(SetGroupVisibility, MODEL_m_mae, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_IF_LT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_m_mae, 1) + EVT_CALL(SetGroupVisibility, MODEL_m_mae, MODEL_GROUP_VISIBLE) EVT_END_IF EVT_RETURN EVT_END @@ -170,10 +170,10 @@ EvtScript N(EVS_RoomListener_UpperRightHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) EVT_SET(AF_SAM_Snowing, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_m_naiso, 1) + EVT_CALL(SetGroupVisibility, MODEL_m_naiso, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) EVT_SET(AF_SAM_Snowing, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_m_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_m_naiso, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -184,10 +184,10 @@ EvtScript N(EVS_RoomListener_LowerRightHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) EVT_SET(AF_SAM_Snowing, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_m_naiso, 1) + EVT_CALL(SetGroupVisibility, MODEL_m_naiso, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) EVT_SET(AF_SAM_Snowing, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_m_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_m_naiso, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -258,12 +258,12 @@ EvtScript N(EVS_SetupMayorRooms) = { }; EvtScript N(EVS_SetupRooms) = { - EVT_CALL(SetGroupEnabled, MODEL_s_naisou, 0) + EVT_CALL(SetGroupVisibility, MODEL_s_naisou, MODEL_GROUP_HIDDEN) EVT_IF_NE(GB_StoryProgress, STORY_CH7_SPOKE_WITH_HERRINGWAY) EVT_EXEC_WAIT(N(EVS_SetupMayorRooms)) EVT_END_IF // upper middle house - EVT_CALL(SetGroupEnabled, MODEL_f_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_f_naiso, MODEL_GROUP_HIDDEN) EVT_CALL(CreateMapRoom, PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_RIGHT_HINGE_OPENS_OUT), EVT_PTR(N(EVS_SetDoorRot_MiddleHouse)), @@ -275,7 +275,7 @@ EvtScript N(EVS_SetupRooms) = { MODEL_f2, EVT_PTR(N(InteriorNPCs_MiddleHouse))) // lower right house - EVT_CALL(SetGroupEnabled, MODEL_m_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_m_naiso, MODEL_GROUP_HIDDEN) EVT_CALL(CreateMapRoom, PACK_ROOM_FLAGS(VIS_GROUP_1, ROOM_DOOR_LEFT_HINGE_OPENS_OUT), EVT_PTR(N(EVS_SetDoorRot_UpperRightHouse)), @@ -287,7 +287,7 @@ EvtScript N(EVS_SetupRooms) = { MODEL_min, EVT_PTR(N(InteriorNPCs_RightHouse))) // upper right house - EVT_CALL(SetGroupEnabled, MODEL_m_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_m_naiso, MODEL_GROUP_HIDDEN) EVT_CALL(CreateMapRoom, PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_RIGHT_HINGE_OPENS_OUT), EVT_PTR(N(EVS_SetDoorRot_LowerRightHouse)), diff --git a/src/world/area_sam/sam_02/sam_02_3_rooms.c b/src/world/area_sam/sam_02/sam_02_3_rooms.c index 2a3a7bb427..cf5dcb45ab 100644 --- a/src/world/area_sam/sam_02/sam_02_3_rooms.c +++ b/src/world/area_sam/sam_02/sam_02_3_rooms.c @@ -9,10 +9,10 @@ EvtScript N(EVS_SetDoorRot_LeftHouse) = { EvtScript N(EVS_SetWallRot_LeftHouse) = { EVT_CALL(RotateGroup, MODEL_mc_sita, LVar0, 1, 0, 0) EVT_IF_GT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_mc_sita, 0) + EVT_CALL(SetGroupVisibility, MODEL_mc_sita, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_IF_LT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_mc_sita, 1) + EVT_CALL(SetGroupVisibility, MODEL_mc_sita, MODEL_GROUP_VISIBLE) EVT_END_IF EVT_RETURN EVT_END @@ -28,10 +28,10 @@ EvtScript N(EVS_RoomListener_LeftHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) EVT_SET(AF_SAM_Snowing, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_m_naiso, 1) + EVT_CALL(SetGroupVisibility, MODEL_m_naiso, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) EVT_SET(AF_SAM_Snowing, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_m_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_m_naiso, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -47,10 +47,10 @@ EvtScript N(EVS_SetWallRot_Shop) = { EVT_CALL(RotateGroup, MODEL_t_ue, LVar0, 0, 0, 1) EVT_CALL(RotateGroup, MODEL_t_sita, LVar0, 0, 0, -1) EVT_IF_GT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_t_sita, 0) + EVT_CALL(SetGroupVisibility, MODEL_t_sita, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_IF_LT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_t_sita, 1) + EVT_CALL(SetGroupVisibility, MODEL_t_sita, MODEL_GROUP_VISIBLE) EVT_END_IF EVT_RETURN EVT_END @@ -60,7 +60,7 @@ EvtScript N(EVS_RoomListener_Shop) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) EVT_SET(AF_SAM_Snowing, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_t_naiso, 1) + EVT_CALL(SetGroupVisibility, MODEL_t_naiso, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH7_MAYOR_MURDER_MYSTERY) @@ -69,7 +69,7 @@ EvtScript N(EVS_RoomListener_Shop) = { EVT_END_SWITCH EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) EVT_SET(AF_SAM_Snowing, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_t_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_t_naiso, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -85,10 +85,10 @@ EvtScript N(EVS_SetWallRot_ToadHouse) = { EVT_CALL(RotateGroup, MODEL_mk_ue, LVar0, 0, 0, 1) EVT_CALL(RotateGroup, MODEL_mk_sita, LVar0, 0, 0, -1) EVT_IF_GT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_mk_sita, 0) + EVT_CALL(SetGroupVisibility, MODEL_mk_sita, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_IF_LT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_mk_sita, 1) + EVT_CALL(SetGroupVisibility, MODEL_mk_sita, MODEL_GROUP_VISIBLE) EVT_END_IF EVT_RETURN EVT_END @@ -98,10 +98,10 @@ EvtScript N(EVS_RoomListener_ToadHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) EVT_SET(AF_SAM_Snowing, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_k_naisou, 1) + EVT_CALL(SetGroupVisibility, MODEL_k_naisou, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) EVT_SET(AF_SAM_Snowing, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_k_naisou, 0) + EVT_CALL(SetGroupVisibility, MODEL_k_naisou, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -124,7 +124,7 @@ s32 N(InteriorNPCs_ToadHouse)[] = { EvtScript N(EVS_SetupRooms) = { // left house - EVT_CALL(SetGroupEnabled, MODEL_m_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_m_naiso, MODEL_GROUP_HIDDEN) EVT_CALL(CreateMapRoom, PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_LEFT_HINGE_OPENS_OUT), EVT_PTR(N(EVS_SetDoorRot_LeftHouse)), @@ -136,7 +136,7 @@ EvtScript N(EVS_SetupRooms) = { MODEL_min, EVT_PTR(N(InteriorNPCs_LeftHouse))) // shop - EVT_CALL(SetGroupEnabled, MODEL_t_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_t_naiso, MODEL_GROUP_HIDDEN) EVT_CALL(CreateMapRoom, PACK_ROOM_FLAGS(VIS_GROUP_1, ROOM_DOOR_LEFT_HINGE_OPENS_OUT), EVT_PTR(N(EVS_SetDoorRot_Shop)), @@ -148,7 +148,7 @@ EvtScript N(EVS_SetupRooms) = { MODEL_ten, EVT_PTR(N(InteriorNPCs_Shop))) // toad house - EVT_CALL(SetGroupEnabled, MODEL_k_naisou, 0) + EVT_CALL(SetGroupVisibility, MODEL_k_naisou, MODEL_GROUP_HIDDEN) EVT_CALL(CreateMapRoom, PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_LEFT_HINGE_OPENS_OUT), EVT_PTR(N(EVS_SetDoorRot_ToadHouse)), diff --git a/src/world/area_sam/sam_06/sam_06_3_rooms.c b/src/world/area_sam/sam_06/sam_06_3_rooms.c index 739e350fc0..4e00b2749f 100644 --- a/src/world/area_sam/sam_06/sam_06_3_rooms.c +++ b/src/world/area_sam/sam_06/sam_06_3_rooms.c @@ -10,10 +10,10 @@ EvtScript N(EVS_SetWallRot_ToadHouse) = { EVT_CALL(RotateGroup, MODEL_khm_yane, LVar0, 0, 0, 1) EVT_CALL(RotateGroup, MODEL_khm_sita, LVar0, 0, 0, -1) EVT_IF_GT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_khm_sita, 0) + EVT_CALL(SetGroupVisibility, MODEL_khm_sita, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_IF_LT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_khm_sita, 1) + EVT_CALL(SetGroupVisibility, MODEL_khm_sita, MODEL_GROUP_VISIBLE) EVT_END_IF EVT_RETURN EVT_END @@ -23,10 +23,10 @@ EvtScript N(EVS_RoomListener_ToadHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) EVT_SET(AF_SAM_Snowing, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_kh_naiso, 1) + EVT_CALL(SetGroupVisibility, MODEL_kh_naiso, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) EVT_SET(AF_SAM_Snowing, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_kh_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_kh_naiso, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -42,10 +42,10 @@ EvtScript N(EVS_SetWallRot_MerleHouse) = { EVT_CALL(RotateGroup, MODEL_km_yane, LVar0, 0, 0, 1) EVT_CALL(RotateGroup, MODEL_km_sita, LVar0, 0, 0, -1) EVT_IF_GT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_km_sita, 0) + EVT_CALL(SetGroupVisibility, MODEL_km_sita, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_IF_LT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_km_sita, 1) + EVT_CALL(SetGroupVisibility, MODEL_km_sita, MODEL_GROUP_VISIBLE) EVT_END_IF EVT_RETURN EVT_END @@ -55,7 +55,7 @@ EvtScript N(EVS_RoomListener_MerleHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) EVT_SET(AF_SAM_Snowing, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_k_naiso, 1) + EVT_CALL(SetGroupVisibility, MODEL_k_naiso, MODEL_GROUP_VISIBLE) EVT_CALL(EnableModel, MODEL_k_naiso, TRUE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_BEGIN) EVT_IF_LT(GB_StoryProgress, STORY_CH7_GOT_SNOWMAN_SCARF) @@ -63,7 +63,7 @@ EvtScript N(EVS_RoomListener_MerleHouse) = { EVT_END_IF EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) EVT_SET(AF_SAM_Snowing, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_k_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_k_naiso, MODEL_GROUP_HIDDEN) EVT_IF_LT(GB_StoryProgress, STORY_CH7_GOT_SNOWMAN_SCARF) EVT_EXEC_WAIT(N(EVS_Scene_Merle_OneLastThing)) EVT_END_IF @@ -82,16 +82,16 @@ EvtScript N(EVS_SetWallRot_CookHouse) = { EVT_CALL(RotateGroup, MODEL_hm_yane, LVar0, 0, 0, 1) EVT_CALL(RotateGroup, MODEL_hm_sita, LVar0, 0, 0, -1) EVT_IF_GT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_hm_sita, 0) - EVT_CALL(SetGroupEnabled, MODEL_hm_yane, 0) + EVT_CALL(SetGroupVisibility, MODEL_hm_sita, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_hm_yane, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_h_yuki1, FALSE) EVT_CALL(EnableModel, MODEL_h_yuki2, FALSE) EVT_CALL(EnableModel, MODEL_hm_entotu, FALSE) EVT_CALL(EnableModel, MODEL_hm_ento2, FALSE) EVT_END_IF EVT_IF_LT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_hm_sita, 1) - EVT_CALL(SetGroupEnabled, MODEL_hm_yane, 1) + EVT_CALL(SetGroupVisibility, MODEL_hm_sita, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_hm_yane, MODEL_GROUP_VISIBLE) EVT_CALL(EnableModel, MODEL_h_yuki1, TRUE) EVT_CALL(EnableModel, MODEL_h_yuki2, TRUE) EVT_CALL(EnableModel, MODEL_hm_entotu, TRUE) @@ -105,10 +105,10 @@ EvtScript N(EVS_RoomListener_CookHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) EVT_SET(AF_SAM_Snowing, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_h_naiso, 1) + EVT_CALL(SetGroupVisibility, MODEL_h_naiso, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) EVT_SET(AF_SAM_Snowing, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_h_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_h_naiso, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -134,7 +134,7 @@ s32 N(InteriorNPCs_CookHouse)[] = { EvtScript N(EVS_SetupRooms) = { // toad house - EVT_CALL(SetGroupEnabled, MODEL_kh_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_kh_naiso, MODEL_GROUP_HIDDEN) EVT_CALL(CreateMapRoom, PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_LEFT_HINGE_OPENS_OUT), EVT_PTR(N(EVS_SetDoorRot_ToadHouse)), @@ -146,7 +146,7 @@ EvtScript N(EVS_SetupRooms) = { MODEL_kinohuse, EVT_PTR(N(InteriorNPCs_ToadHouse))) // merle's house - EVT_CALL(SetGroupEnabled, MODEL_k_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_k_naiso, MODEL_GROUP_HIDDEN) EVT_CALL(CreateMapRoom, PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_LEFT_HINGE_OPENS_OUT), EVT_PTR(N(EVS_SetDoorRot_MerleHouse)), @@ -158,7 +158,7 @@ EvtScript N(EVS_SetupRooms) = { MODEL_k, EVT_PTR(N(InteriorNPCs_MerleHouse))) // cooking house - EVT_CALL(SetGroupEnabled, MODEL_h_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_h_naiso, MODEL_GROUP_HIDDEN) EVT_CALL(CreateMapRoom, PACK_ROOM_FLAGS(VIS_GROUP_0, ROOM_DOOR_LEFT_HINGE_OPENS_OUT), EVT_PTR(N(EVS_SetDoorRot_CookHouse)), 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 649b957f7e..d1262a176c 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 @@ -333,7 +333,7 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = { EVT_END_THREAD EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, 15, -90, 0) - EVT_CALL(SetGroupEnabled, MODEL_k_naiso, 1) + EVT_CALL(SetGroupVisibility, MODEL_k_naiso, MODEL_GROUP_VISIBLE) EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 10, EASING_QUADRATIC_OUT) EVT_LABEL(70) @@ -344,7 +344,7 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = { EVT_GOTO(70) EVT_END_IF EVT_SET(AF_SAM_Snowing, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_k_naiso, 1) + EVT_CALL(SetGroupVisibility, MODEL_k_naiso, MODEL_GROUP_VISIBLE) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_Merle_Walk) EVT_CALL(SetNpcSpeed, NPC_Merle, EVT_FLOAT(4.0)) @@ -375,7 +375,7 @@ EvtScript N(EVS_Scene_Merle_EnterHouse) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(71) EVT_END_IF - EVT_CALL(SetGroupEnabled, MODEL_km_sita, 0) + EVT_CALL(SetGroupVisibility, MODEL_km_sita, MODEL_GROUP_HIDDEN) EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(PlayerMoveTo, 0, -240, 0) @@ -488,8 +488,8 @@ EvtScript N(EVS_Scene_Merle_OneLastThing) = { EVT_END_THREAD EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, 0, -100, 0) - EVT_CALL(SetGroupEnabled, MODEL_k_naiso, 1) - EVT_CALL(SetGroupEnabled, MODEL_km_sita, 1) + EVT_CALL(SetGroupVisibility, MODEL_k_naiso, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_km_sita, MODEL_GROUP_VISIBLE) EVT_CALL(SetNpcPos, NPC_Merle, 0, 90, -180) EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 10, EASING_QUADRATIC_IN) @@ -513,7 +513,7 @@ EvtScript N(EVS_Scene_Merle_OneLastThing) = { EVT_GOTO(1) EVT_END_IF EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) - EVT_CALL(SetGroupEnabled, MODEL_k_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_k_naiso, MODEL_GROUP_HIDDEN) EVT_CALL(GetNpcPos, NPC_Merle, LVar0, LVar1, LVar2) EVT_CALL(PlayerFaceNpc, NPC_Merle, FALSE) EVT_CALL(DisablePartnerAI, 0) @@ -526,7 +526,7 @@ EvtScript N(EVS_Scene_Merle_OneLastThing) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_Merle, ANIM_Merle_Talk, ANIM_Merle_Idle, 0, MSG_CH7_00F3) - EVT_CALL(SetGroupEnabled, MODEL_k_naiso, 1) + EVT_CALL(SetGroupVisibility, MODEL_k_naiso, MODEL_GROUP_VISIBLE) EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 90, 10, EASING_QUADRATIC_IN) EVT_LABEL(2) @@ -552,7 +552,7 @@ EvtScript N(EVS_Scene_Merle_OneLastThing) = { EVT_GOTO(3) EVT_END_IF EVT_CALL(PlaySoundAtCollider, COLLIDER_k_d1, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) - EVT_CALL(SetGroupEnabled, MODEL_k_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_k_naiso, MODEL_GROUP_HIDDEN) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) diff --git a/src/world/area_sam/sam_07/sam_07_4_frozen_pit.c b/src/world/area_sam/sam_07/sam_07_4_frozen_pit.c index b7a4f42d91..f253358be3 100644 --- a/src/world/area_sam/sam_07/sam_07_4_frozen_pit.c +++ b/src/world/area_sam/sam_07/sam_07_4_frozen_pit.c @@ -141,9 +141,9 @@ EvtScript N(EVS_BreakIce) = { EVT_CALL(PlaySoundAtCollider, COLLIDER_o116, SOUND_396, 0) EVT_CALL(N(AnimateIceShattering)) EVT_LOOP(10) - EVT_CALL(SetGroupEnabled, MODEL_move1, 1) + EVT_CALL(SetGroupVisibility, MODEL_move1, MODEL_GROUP_VISIBLE) EVT_WAIT(1) - EVT_CALL(SetGroupEnabled, MODEL_move1, 0) + EVT_CALL(SetGroupVisibility, MODEL_move1, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_m1_yuka, TRUE) EVT_CALL(EnableModel, MODEL_m1_kabe, TRUE) EVT_WAIT(1) @@ -251,7 +251,7 @@ EvtScript N(EVS_SetupPit) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Blast_FragileIce)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Ice)), 1, 0) EVT_ELSE EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o116, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetGroupEnabled, MODEL_move1, 0) + EVT_CALL(SetGroupVisibility, MODEL_move1, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_m1_yuka, TRUE) EVT_CALL(EnableModel, MODEL_m1_kabe, TRUE) EVT_CALL(EnableModel, MODEL_o135, TRUE) diff --git a/src/world/area_sam/sam_10/sam_10_4_stairs.c b/src/world/area_sam/sam_10/sam_10_4_stairs.c index 3ef6f709d8..11d20a926b 100644 --- a/src/world/area_sam/sam_10/sam_10_4_stairs.c +++ b/src/world/area_sam/sam_10/sam_10_4_stairs.c @@ -119,9 +119,9 @@ EvtScript N(EVS_ItemPrompt_StarStoneSocket) = { EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, 240, -20, -166, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, 280, -20, -166, 0) EVT_WAIT(20) - EVT_CALL(SetGroupEnabled, MODEL_move1, 0) - EVT_CALL(SetGroupEnabled, MODEL_move2, 1) - EVT_CALL(SetGroupEnabled, MODEL_move3, 0) + EVT_CALL(SetGroupVisibility, MODEL_move1, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_move2, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_move3, MODEL_GROUP_HIDDEN) EVT_CALL(PlaySound, SOUND_80000040) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 600, EVT_FLOAT(0.15)) @@ -195,9 +195,9 @@ EvtScript N(EVS_ItemPrompt_StarStoneSocket) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_m2_kabe, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_m2_yuka, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_move2, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetGroupEnabled, MODEL_move1, 0) - EVT_CALL(SetGroupEnabled, MODEL_move2, 0) - EVT_CALL(SetGroupEnabled, MODEL_move3, 1) + EVT_CALL(SetGroupVisibility, MODEL_move1, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_move2, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_move3, MODEL_GROUP_VISIBLE) EVT_SET(GB_StoryProgress, STORY_CH7_RAISED_FROZEN_STAIRS) EVT_CALL(DisablePlayerInput, FALSE) EVT_UNBIND @@ -243,8 +243,8 @@ EvtScript N(EVS_SetupStairs) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deilie, SURFACE_TYPE_SNOW) EVT_CALL(ParentColliderToModel, COLLIDER_o61, MODEL_kouri) EVT_IF_LT(GB_StoryProgress, STORY_CH7_RAISED_FROZEN_STAIRS) - EVT_CALL(SetGroupEnabled, MODEL_move2, 0) - EVT_CALL(SetGroupEnabled, MODEL_move3, 0) + EVT_CALL(SetGroupVisibility, MODEL_move2, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_move3, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_m2_kabe, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_m2_yuka, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_move2, COLLIDER_FLAGS_UPPER_MASK) @@ -259,8 +259,8 @@ EvtScript N(EVS_SetupStairs) = { EVT_CALL(TranslateGroup, MODEL_g51, 0, 0, -23) EVT_CALL(UpdateColliderTransform, COLLIDER_o61) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o89, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetGroupEnabled, MODEL_move1, 0) - EVT_CALL(SetGroupEnabled, MODEL_move2, 0) + EVT_CALL(SetGroupVisibility, MODEL_move1, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_move2, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_m1_kabe, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF EVT_IF_GE(GB_StoryProgress, STORY_CH7_GOT_STAR_STONE) diff --git a/src/world/area_sam/sam_11/sam_11_3_rooms.c b/src/world/area_sam/sam_11/sam_11_3_rooms.c index 62a493a348..ec64c2d800 100644 --- a/src/world/area_sam/sam_11/sam_11_3_rooms.c +++ b/src/world/area_sam/sam_11/sam_11_3_rooms.c @@ -10,12 +10,12 @@ EvtScript N(EVS_SetWallRot_LeftHouse) = { EVT_CALL(RotateGroup, MODEL_g_ue, LVar0, 1, 0, 0) EVT_CALL(RotateGroup, MODEL_g_sita, LVar0, 1, 0, 0) EVT_IF_GT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_g_ue, 0) - EVT_CALL(SetGroupEnabled, MODEL_g_sita, 0) + EVT_CALL(SetGroupVisibility, MODEL_g_ue, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_g_sita, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_IF_LT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_g_ue, 1) - EVT_CALL(SetGroupEnabled, MODEL_g_sita, 1) + EVT_CALL(SetGroupVisibility, MODEL_g_ue, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_g_sita, MODEL_GROUP_VISIBLE) EVT_END_IF EVT_RETURN EVT_END @@ -35,7 +35,7 @@ EvtScript N(EVS_RoomListener_LeftHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) EVT_SET(AF_SAM_Snowing, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_g_naiso, 1) + EVT_CALL(SetGroupVisibility, MODEL_g_naiso, MODEL_GROUP_VISIBLE) EVT_IF_LT(GB_StoryProgress, STORY_CH7_SPOKE_WITH_HERRINGWAY) EVT_ELSE EVT_CALL(EnableModel, MODEL_ana, FALSE) @@ -65,7 +65,7 @@ EvtScript N(EVS_RoomListener_LeftHouse) = { EVT_END_IF EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) EVT_SET(AF_SAM_Snowing, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_g_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_g_naiso, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_gn_dan1, TRUE) EVT_IF_EQ(GB_StoryProgress, STORY_CH7_SPOKE_WITH_HERRINGWAY) EVT_IF_EQ(GF_SAM11_LeftHerringwaysHouse, FALSE) @@ -89,12 +89,12 @@ EvtScript N(EVS_SetWallRot_RightHouse) = { EVT_CALL(RotateGroup, MODEL_s_ue, LVar0, 1, 0, 0) EVT_CALL(RotateGroup, MODEL_s_sita, LVar0, 1, 0, 0) EVT_IF_GT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_s_ue, 0) - EVT_CALL(SetGroupEnabled, MODEL_s_sita, 0) + EVT_CALL(SetGroupVisibility, MODEL_s_ue, MODEL_GROUP_HIDDEN) + EVT_CALL(SetGroupVisibility, MODEL_s_sita, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_IF_LT(LVar0, 89) - EVT_CALL(SetGroupEnabled, MODEL_s_ue, 1) - EVT_CALL(SetGroupEnabled, MODEL_s_sita, 1) + EVT_CALL(SetGroupVisibility, MODEL_s_ue, MODEL_GROUP_VISIBLE) + EVT_CALL(SetGroupVisibility, MODEL_s_sita, MODEL_GROUP_VISIBLE) EVT_END_IF EVT_RETURN EVT_END @@ -147,10 +147,10 @@ EvtScript N(EVS_RoomListener_RightHouse) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_SET(AF_SAM_Snowing, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_s_naiso, 1) + EVT_CALL(SetGroupVisibility, MODEL_s_naiso, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(3) EVT_SET(AF_SAM_Snowing, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_s_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_s_naiso, MODEL_GROUP_HIDDEN) EVT_END_SWITCH EVT_RETURN EVT_END @@ -184,7 +184,7 @@ EvtScript N(EVS_SetupLockedHouse) = { }; EvtScript N(EVS_SetupRooms) = { - EVT_CALL(SetGroupEnabled, MODEL_g_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_g_naiso, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_gn_dan1, TRUE) // lower left house EVT_CALL(CreateMapRoom, @@ -197,7 +197,7 @@ EvtScript N(EVS_SetupRooms) = { COLLIDER_o590, MODEL_gon, EVT_PTR(N(InteriorNPCs_LeftHouse))) - EVT_CALL(SetGroupEnabled, MODEL_s_naiso, 0) + EVT_CALL(SetGroupVisibility, MODEL_s_naiso, MODEL_GROUP_HIDDEN) EVT_IF_EQ(GF_SAM11_UnlockedDoor, TRUE) EVT_EXEC_WAIT(N(EVS_SetupLockedHouse)) EVT_ELSE diff --git a/src/world/area_sam/sam_11/sam_11_6_pond.c b/src/world/area_sam/sam_11/sam_11_6_pond.c index 4969802dd9..67a4442961 100644 --- a/src/world/area_sam/sam_11/sam_11_6_pond.c +++ b/src/world/area_sam/sam_11/sam_11_6_pond.c @@ -340,7 +340,7 @@ EvtScript N(EVS_DamageFrozenPond_After) = { EVT_CALL(PlaySoundAt, SOUND_38B, 0, 0, 60, 220) EVT_CALL(N(SpawnIceShards)) EVT_CALL(EnableModel, MODEL_ice03, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_ice04, 1) + EVT_CALL(SetGroupVisibility, MODEL_ice04, MODEL_GROUP_VISIBLE) EVT_CALL(EnableGroup, MODEL_sui, TRUE) EVT_CALL(EnableGroup, MODEL_g279, TRUE) EVT_CALL(EnableTexPanning, MODEL_o583, TRUE) @@ -353,7 +353,7 @@ EvtScript N(EVS_DamageFrozenPond_After) = { EVT_END_THREAD EVT_EXEC(N(EVS_LoadPondAnimation)) EVT_WAIT(60) - EVT_CALL(SetGroupEnabled, MODEL_ice04, 0) + EVT_CALL(SetGroupVisibility, MODEL_ice04, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ike, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilitp, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o657, COLLIDER_FLAGS_UPPER_MASK) @@ -445,7 +445,7 @@ EvtScript N(EVS_SetupPond) = { EVT_CALL(EnableModel, MODEL_ice01, FALSE) EVT_CALL(EnableModel, MODEL_ice02, FALSE) EVT_CALL(EnableModel, MODEL_ice03, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_ice04, 0) + EVT_CALL(SetGroupVisibility, MODEL_ice04, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o657, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o658, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o660, COLLIDER_FLAGS_UPPER_MASK) @@ -465,7 +465,7 @@ EvtScript N(EVS_SetupPond) = { EVT_CALL(EnableModel, MODEL_ice03, TRUE) EVT_CASE_EQ(3) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ike, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetGroupEnabled, MODEL_ice04, 1) + EVT_CALL(SetGroupVisibility, MODEL_ice04, MODEL_GROUP_VISIBLE) EVT_CASE_EQ(4) EVT_CALL(EnableGroup, MODEL_sui, TRUE) EVT_CALL(EnableGroup, MODEL_g279, TRUE) diff --git a/src/world/area_sbk/sbk_02/sbk_02_2_main.c b/src/world/area_sbk/sbk_02/sbk_02_2_main.c index d668422d60..b0578337ec 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_2_main.c +++ b/src/world/area_sbk/sbk_02/sbk_02_2_main.c @@ -42,7 +42,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_IF_LT(GB_StoryProgress, STORY_CH2_UNCOVERED_DRY_DRY_RUINS) - EVT_PLAY_EFFECT(EFFECT_SUN) + EVT_PLAY_EFFECT(EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0) EVT_SET(MV_Unk_00, LVarF) EVT_END_IF EVT_IF_EQ(GB_StoryProgress, STORY_CH2_BEGAN_PEACH_MISSION) diff --git a/src/world/area_trd/trd_00/trd_00_1_main.c b/src/world/area_trd/trd_00/trd_00_1_main.c index a269116b32..ca0046eb06 100644 --- a/src/world/area_trd/trd_00/trd_00_1_main.c +++ b/src/world/area_trd/trd_00/trd_00_1_main.c @@ -134,10 +134,10 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_SetupMusic)) EVT_WAIT(1) EVT_IF_EQ(GF_TRD05_BombedWall, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_g21, 0) + EVT_CALL(SetGroupVisibility, MODEL_g21, MODEL_GROUP_HIDDEN) EVT_ELSE EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt5, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetGroupEnabled, MODEL_ana, 0) + EVT_CALL(SetGroupVisibility, MODEL_ana, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_EXEC(N(EVS_EnterMap)) EVT_CALL(GetEntryID, LVar0) diff --git a/src/world/area_trd/trd_01/trd_01_1_main.c b/src/world/area_trd/trd_01/trd_01_1_main.c index 75992c7ea3..64b773c66f 100644 --- a/src/world/area_trd/trd_01/trd_01_1_main.c +++ b/src/world/area_trd/trd_01/trd_01_1_main.c @@ -59,7 +59,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o162, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetGroupEnabled, MODEL_move_saku, 0) + EVT_CALL(SetGroupVisibility, MODEL_move_saku, MODEL_GROUP_HIDDEN) EVT_CALL(PlaySound, SOUND_80000006) EVT_CHILD_THREAD EVT_SET_GROUP(EVT_GROUP_00) @@ -325,7 +325,7 @@ EvtScript N(EVS_Main) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_RaiseStairs)), TRIGGER_AREA_FLAG_SET, AF_TRD01_RaiseStairs, 0, 0) EVT_ELSE EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o162, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(SetGroupEnabled, MODEL_move_saku, 0) + EVT_CALL(SetGroupVisibility, MODEL_move_saku, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_CALL(EnableModel, MODEL_sui1, FALSE) EVT_CALL(EnableModel, MODEL_sui2, FALSE) diff --git a/src/world/area_trd/trd_02/trd_02_1_main.c b/src/world/area_trd/trd_02/trd_02_1_main.c index 92737cbec1..4aff850fc6 100644 --- a/src/world/area_trd/trd_02/trd_02_1_main.c +++ b/src/world/area_trd/trd_02/trd_02_1_main.c @@ -58,7 +58,7 @@ EvtScript N(EVS_Scene_LowerStairs) = { EVT_SUSPEND_GROUP(EVT_GROUP_01) EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(30) - EVT_CALL(SetGroupEnabled, MODEL_move_saku, 0) + EVT_CALL(SetGroupVisibility, MODEL_move_saku, MODEL_GROUP_HIDDEN) EVT_CALL(PlaySound, SOUND_80000004) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.7)) @@ -129,9 +129,9 @@ EvtScript N(D_8024241C_9A33FC) = { EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 17, 11, 1, 10, 30) EVT_CALL(EnableModel, MODEL_anaaki, TRUE) EVT_LOOP(10) - EVT_CALL(SetGroupEnabled, MODEL_g14, 1) + EVT_CALL(SetGroupVisibility, MODEL_g14, MODEL_GROUP_VISIBLE) EVT_WAIT(1) - EVT_CALL(SetGroupEnabled, MODEL_g14, 0) + EVT_CALL(SetGroupVisibility, MODEL_g14, MODEL_GROUP_HIDDEN) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tta, COLLIDER_FLAGS_UPPER_MASK) @@ -165,7 +165,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(EnableModel, MODEL_anaaki, FALSE) EVT_BIND_TRIGGER(EVT_PTR(N(D_8024241C_9A33FC)), TRIGGER_POINT_BOMB, EVT_PTR(N(D_8024240C_9A33EC)), 1, 0) EVT_ELSE - EVT_CALL(SetGroupEnabled, MODEL_g14, 0) + EVT_CALL(SetGroupVisibility, MODEL_g14, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tta, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF EVT_EXEC(N(EVS_SetupMusic)) @@ -185,7 +185,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(UpdateColliderTransform, COLLIDER_o55) EVT_CALL(UpdateColliderTransform, COLLIDER_o54) EVT_CALL(UpdateColliderTransform, COLLIDER_o65) - EVT_CALL(SetGroupEnabled, MODEL_move_saku, 0) + EVT_CALL(SetGroupVisibility, MODEL_move_saku, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_EXEC(N(EVS_EnterMap)) EVT_WAIT(1) diff --git a/src/world/area_trd/trd_03/trd_03_1_main.c b/src/world/area_trd/trd_03/trd_03_1_main.c index 0ad07b30e2..af0da5fd9d 100644 --- a/src/world/area_trd/trd_03/trd_03_1_main.c +++ b/src/world/area_trd/trd_03/trd_03_1_main.c @@ -88,9 +88,9 @@ EvtScript N(EVS_BombWall_MiddleCell) = { EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 40, 10, 1, 10, 30) EVT_CALL(EnableModel, MODEL_nk2, TRUE) EVT_LOOP(10) - EVT_CALL(SetGroupEnabled, MODEL_ana2, 1) + EVT_CALL(SetGroupVisibility, MODEL_ana2, MODEL_GROUP_VISIBLE) EVT_WAIT(1) - EVT_CALL(SetGroupEnabled, MODEL_ana2, 0) + EVT_CALL(SetGroupVisibility, MODEL_ana2, MODEL_GROUP_HIDDEN) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit2, COLLIDER_FLAGS_UPPER_MASK) @@ -105,9 +105,9 @@ EvtScript N(EVS_BombWall_RightCell) = { EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 43, 10, 1, 10, 30) EVT_CALL(EnableModel, MODEL_nk3, TRUE) EVT_LOOP(10) - EVT_CALL(SetGroupEnabled, MODEL_ana3, 1) + EVT_CALL(SetGroupVisibility, MODEL_ana3, MODEL_GROUP_VISIBLE) EVT_WAIT(1) - EVT_CALL(SetGroupEnabled, MODEL_ana3, 0) + EVT_CALL(SetGroupVisibility, MODEL_ana3, MODEL_GROUP_HIDDEN) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit3, COLLIDER_FLAGS_UPPER_MASK) @@ -210,7 +210,7 @@ EvtScript N(EVS_Main) = { EVT_IF_EQ(GF_TRD02_BombedWall, FALSE) EVT_CALL(EnableModel, MODEL_nk1, FALSE) EVT_ELSE - EVT_CALL(SetGroupEnabled, MODEL_ana1, 0) + EVT_CALL(SetGroupVisibility, MODEL_ana1, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit1, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF @@ -218,7 +218,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(EnableModel, MODEL_nk2, FALSE) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BombWall_MiddleCell)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_MiddleCell)), 1, 0) EVT_ELSE - EVT_CALL(SetGroupEnabled, MODEL_ana2, 0) + EVT_CALL(SetGroupVisibility, MODEL_ana2, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit2, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt2, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF @@ -226,7 +226,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(EnableModel, MODEL_nk3, FALSE) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BombWall_RightCell)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_RightCell)), 1, 0) EVT_ELSE - EVT_CALL(SetGroupEnabled, MODEL_ana3, 0) + EVT_CALL(SetGroupVisibility, MODEL_ana3, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilit3, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt3, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF diff --git a/src/world/area_trd/trd_05/trd_05_1_main.c b/src/world/area_trd/trd_05/trd_05_1_main.c index 2bc86f1f76..2d9c7b50c1 100644 --- a/src/world/area_trd/trd_05/trd_05_1_main.c +++ b/src/world/area_trd/trd_05/trd_05_1_main.c @@ -63,11 +63,11 @@ EvtScript N(EVS_BombWall) = { EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 29, 0, 1, 10, 30) EVT_SET_GROUP(EVT_GROUP_00) EVT_SUSPEND_GROUP(EVT_GROUP_01) - EVT_CALL(SetGroupEnabled, MODEL_ana2, 1) + EVT_CALL(SetGroupVisibility, MODEL_ana2, MODEL_GROUP_VISIBLE) EVT_LOOP(10) - EVT_CALL(SetGroupEnabled, MODEL_ana3, 1) + EVT_CALL(SetGroupVisibility, MODEL_ana3, MODEL_GROUP_VISIBLE) EVT_WAIT(1) - EVT_CALL(SetGroupEnabled, MODEL_ana3, 0) + EVT_CALL(SetGroupVisibility, MODEL_ana3, MODEL_GROUP_HIDDEN) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) @@ -101,17 +101,17 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_IF_EQ(GF_TRD05_BombedWall, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_ana2, 0) + EVT_CALL(SetGroupVisibility, MODEL_ana2, MODEL_GROUP_HIDDEN) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BombWall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Wall)), 1, 0) EVT_ELSE - EVT_CALL(SetGroupEnabled, MODEL_ana3, 0) + EVT_CALL(SetGroupVisibility, MODEL_ana3, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF EVT_EXEC(N(EVS_SetupMusic)) EVT_EXEC(N(EVS_TexPan_Water)) EVT_CALL(EnableModel, MODEL_o95, FALSE) EVT_CALL(EnableModel, MODEL_o96, FALSE) - EVT_CALL(SetGroupEnabled, MODEL_kesu, 0) + EVT_CALL(SetGroupVisibility, MODEL_kesu, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o103, COLLIDER_FLAGS_UPPER_MASK) EVT_IF_LT(GB_StoryProgress, STORY_CH1_KOOPA_BROS_SET_TRAP) EVT_WAIT(10) diff --git a/src/world/area_trd/trd_05/trd_05_3_trap.c b/src/world/area_trd/trd_05/trd_05_3_trap.c index 4940ebee26..b56c3902a9 100644 --- a/src/world/area_trd/trd_05/trd_05_3_trap.c +++ b/src/world/area_trd/trd_05/trd_05_3_trap.c @@ -291,7 +291,7 @@ EvtScript N(EVS_OnHitTrapTrigger) = { EVT_CALL(EnableModel, MODEL_o101, FALSE) EVT_CALL(EnableModel, MODEL_o95, TRUE) EVT_CALL(EnableModel, MODEL_o96, TRUE) - EVT_CALL(SetGroupEnabled, MODEL_kesu, 1) + EVT_CALL(SetGroupVisibility, MODEL_kesu, MODEL_GROUP_VISIBLE) EVT_CALL(PlaySound, SOUND_2091) EVT_CALL(MakeLerp, 0, 90, 30, EASING_COS_SLOW_OVERSHOOT) EVT_LABEL(0) diff --git a/src/world/area_trd/trd_06/trd_06_1_main.c b/src/world/area_trd/trd_06/trd_06_1_main.c index 722780e115..c4b2bec138 100644 --- a/src/world/area_trd/trd_06/trd_06_1_main.c +++ b/src/world/area_trd/trd_06/trd_06_1_main.c @@ -47,11 +47,11 @@ BombTrigger N(BombPos_CellWall) = { EvtScript N(EVS_BombWall_Cell) = { EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, TRUE) EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 19, 19, 1, 10, 30) - EVT_CALL(SetGroupEnabled, MODEL_ana, 1) + EVT_CALL(SetGroupVisibility, MODEL_ana, MODEL_GROUP_VISIBLE) EVT_LOOP(10) - EVT_CALL(SetGroupEnabled, MODEL_ana2, 1) + EVT_CALL(SetGroupVisibility, MODEL_ana2, MODEL_GROUP_VISIBLE) EVT_WAIT(1) - EVT_CALL(SetGroupEnabled, MODEL_ana2, 0) + EVT_CALL(SetGroupVisibility, MODEL_ana2, MODEL_GROUP_HIDDEN) EVT_WAIT(1) EVT_END_LOOP EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitse, COLLIDER_FLAGS_UPPER_MASK) @@ -143,7 +143,7 @@ EvtScript N(EVS_Main) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH1_DEFEATED_KOOPA_BROS) EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(NpcGroup_Prisoners))) - EVT_CALL(SetGroupEnabled, MODEL_g27, 0) + EVT_CALL(SetGroupVisibility, MODEL_g27, MODEL_GROUP_HIDDEN) EVT_CASE_LT(STORY_CH1_DEFEATED_JR_TROOPA) EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(NpcGroup_KoopaBros))) EVT_END_SWITCH @@ -155,14 +155,14 @@ EvtScript N(EVS_Main) = { EVT_IF_LE(LVar0, trd_06_ENTRY_1) EVT_IF_EQ(GF_TRD06_BombedWall, FALSE) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BombWall_Cell)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_CellWall)), 1, 0) - EVT_CALL(SetGroupEnabled, MODEL_ana, 0) + EVT_CALL(SetGroupVisibility, MODEL_ana, MODEL_GROUP_HIDDEN) EVT_ELSE - EVT_CALL(SetGroupEnabled, MODEL_ana2, 0) + EVT_CALL(SetGroupVisibility, MODEL_ana2, MODEL_GROUP_HIDDEN) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitse, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttse, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF EVT_ELSE - EVT_CALL(SetGroupEnabled, MODEL_ana, 0) + EVT_CALL(SetGroupVisibility, MODEL_ana, MODEL_GROUP_HIDDEN) EVT_END_IF EVT_EXEC(N(EVS_SetupMusic)) EVT_EXEC(N(EVS_TexPan_Water)) diff --git a/src/world/common/todo/HeartPlant_SpawnHeart.inc.c b/src/world/common/todo/HeartPlant_SpawnHeart.inc.c index c012f23a3e..be156289ab 100644 --- a/src/world/common/todo/HeartPlant_SpawnHeart.inc.c +++ b/src/world/common/todo/HeartPlant_SpawnHeart.inc.c @@ -5,7 +5,8 @@ API_CALLABLE(N(HeartPlant_SpawnHeart)) { Npc* npc = get_npc_unsafe(enemy->npcID); if ((enemy->varTable[0] < 5) && (rand_int(1000) > 300)) { - make_item_entity_nodelay(ITEM_HEART, npc->pos.x, npc->pos.y + npc->collisionHeight, npc->pos.z + 5.0, 3, 0); + make_item_entity_nodelay(ITEM_HEART, npc->pos.x, npc->pos.y + npc->collisionHeight, npc->pos.z + 5.0, + ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0); enemy->varTable[0] += 1; } return ApiStatus_DONE2; diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_4_tromp.c b/src/world/dead/area_kzn/kzn_17/kzn_17_4_tromp.c index 3527f261b4..4bdc75c3d4 100644 --- a/src/world/dead/area_kzn/kzn_17/kzn_17_4_tromp.c +++ b/src/world/dead/area_kzn/kzn_17/kzn_17_4_tromp.c @@ -48,7 +48,7 @@ EvtScript N(EVS_SpinyTromp_ShakeCam) = { EvtScript N(EVS_SetupSpinyTromp) = { EVT_SET_GROUP(EVT_GROUP_EF) EVT_IF_GE(GB_StoryProgress, STORY_CH5_HIDDEN_PASSAGE_OPEN) - EVT_CALL(SetGroupEnabled, MODEL_goron, 0) + EVT_CALL(SetGroupVisibility, MODEL_goron, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_me, FALSE) EVT_CALL(EnableModel, MODEL_mae, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_gogo, COLLIDER_FLAGS_UPPER_MASK) @@ -144,7 +144,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_SET(GB_StoryProgress, STORY_CH5_HIDDEN_PASSAGE_OPEN) EVT_WAIT(50) EVT_CALL(StopSound, SOUND_8000001B) - EVT_CALL(SetGroupEnabled, MODEL_goron, 0) + EVT_CALL(SetGroupVisibility, MODEL_goron, MODEL_GROUP_HIDDEN) EVT_CALL(EnableModel, MODEL_me, FALSE) EVT_KILL_THREAD(LVarA) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index fe2124ec65..34c6aadd10 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -156,7 +156,7 @@ dead_SetPushBlock = 0x8028364C; dead_GetSelfAnimationFromTable = 0x800497E4; dead_SelfEnemyOverrideSyncPos = 0x80049630; dead_func_802CFD30 = 0x802DD290; -dead_SetGroupEnabled = 0x802D6788; +dead_SetGroupVisibility = 0x802D6788; dead_GetCamDistance = 0x802D9578; dead_GetCamPitch = 0x802D94E8; dead_GotoMapSpecial = 0x802D78CC; diff --git a/tools/splat_ext/pm_sprite_shading_profiles.py b/tools/splat_ext/pm_sprite_shading_profiles.py index b86bc09c7d..b5a4f30643 100644 --- a/tools/splat_ext/pm_sprite_shading_profiles.py +++ b/tools/splat_ext/pm_sprite_shading_profiles.py @@ -25,8 +25,8 @@ GROUPS = [ SpriteShadingGroup("ARN"), SpriteShadingGroup("DGB"), SpriteShadingGroup("KZN"), - SpriteShadingGroup("unused1"), - SpriteShadingGroup("unused2"), + SpriteShadingGroup("unused"), + SpriteShadingGroup("ISK_BTL"), ] @@ -124,8 +124,8 @@ def extract(input_data: bytes, endian: Literal["big", "little"] = "big") -> str: "KZN_22", "KZN_23", ], - ["UNUSED1_01"], - ["UNUSED2_01"], + ["UNUSED"], + ["BTL_ISK"], ] END = ">" if endian == "big" else "<" diff --git a/tools/star_rod_idx_to_c.py b/tools/star_rod_idx_to_c.py index 384cb8ceec..20e73c6db5 100755 --- a/tools/star_rod_idx_to_c.py +++ b/tools/star_rod_idx_to_c.py @@ -874,7 +874,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0, namespace out += INDENT + f".maxHP = {d[3]},\n" out += INDENT + f".partCount = ARRAY_COUNT({read_ptr(d[5], symbol_map)}),\n" out += INDENT + f".partsData = {read_ptr(d[5], symbol_map)},\n" - out += INDENT + f".takeTurnScript = {read_ptr(d[6], symbol_map)},\n" + out += INDENT + f".initScript = {read_ptr(d[6], symbol_map)},\n" out += INDENT + f".statusTable = {read_ptr(d[7], symbol_map)},\n" out += INDENT + f".escapeChance = {d[8]},\n" out += INDENT + f".airLiftChance = {d[9]},\n" diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 3f8f8aaad0..95687ce068 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -4029,7 +4029,7 @@ make_transform_group = 0x8011B37C; // type:func rom:0xB1A7C enable_transform_group = 0x8011B5D0; // type:func rom:0xB1CD0 disable_transform_group = 0x8011B660; // type:func rom:0xB1D60 clone_model = 0x8011B6F0; // type:func rom:0xB1DF0 -set_model_flags = 0x8011B7C0; // type:func rom:0xB1EC0 +set_model_group_visibility = 0x8011B7C0; // type:func rom:0xB1EC0 func_8011B950 = 0x8011B950; // type:func rom:0xB2050 func_8011BAE8 = 0x8011BAE8; // type:func rom:0xB21E8 enable_world_fog = 0x8011BB50; // type:func rom:0xB2250 @@ -5161,7 +5161,7 @@ SetModelTexVariant = 0x802C91A4; // type:func rom:0xEDB54 gHudElementsBattle = 0x80157460; // type:data rom:0xEDB60 EnableTexPanning = 0x802C9208; // type:func rom:0xEDBB8 EnableModel = 0x802C9288; // type:func rom:0xEDC38 -SetGroupEnabled = 0x802C9308; // type:func rom:0xEDCB8 +SetGroupVisibility = 0x802C9308; // type:func rom:0xEDCB8 SetTexPanOffset = 0x802C9364; // type:func rom:0xEDD14 SetCustomGfx = 0x802C9428; // type:func rom:0xEDDD8 SetCustomGfxBuilders = 0x802C94A0; // type:func rom:0xEDE50 @@ -6789,8 +6789,8 @@ SetFledBattleFlag = 0x80260DB8; // type:func rom:0x18F698 func_80260DD8 = 0x80260DD8; // type:func rom:0x18F6B8 func_80260E38 = 0x80260E38; // type:func rom:0x18F718 func_80260E5C = 0x80260E5C; // type:func rom:0x18F73C -base_GiveRefund = 0x80260E90; // type:func rom:0x18F770 -base_GiveRefundCleanup = 0x80261064; // type:func rom:0x18F944 +GiveRefund = 0x80260E90; // type:func rom:0x18F770 +GiveRefundCleanup = 0x80261064; // type:func rom:0x18F944 func_802610CC = 0x802610CC; // type:func rom:0x18F9AC func_80261164 = 0x80261164; // type:func rom:0x18FA44 ConsumeLifeShroom = 0x802611E8; // type:func rom:0x18FAC8 @@ -7233,7 +7233,7 @@ D_802809F0 = 0x802809F0; // type:data rom:0x1AF2D0 D_802809F4 = 0x802809F4; // type:data rom:0x1AF2D4 D_802809F5 = 0x802809F5; // type:data rom:0x1AF2D5 D_802809F6 = 0x802809F6; // type:data rom:0x1AF2D6 -D_802809F8 = 0x802809F8; // type:data rom:0x1AF2D8 +DemoBattleBeginDelay = 0x802809F8; // type:data rom:0x1AF2D8 gTattleBgTextureYOffset = 0x802809FA; // type:data rom:0x1AF2DA bHPDigitHudScripts = 0x802809FC; // type:data rom:0x1AF2DC BattleScreenFadeAmt = 0x80280A30; // type:data rom:0x1AF310 @@ -7282,13 +7282,13 @@ bActorMessages = 0x802838C4; // type:data rom:0x1B21A4 bPopupMessage = 0x802838F8; // type:data rom:0x1B21D8 D_80283D98 = 0x80283D98; // type:data rom:0x1B2678 gBattleDmaDest = 0x80284000; // rom:0x1B28E0 -MarioEnterStage = 0x80284A40; // rom:0x1B3320 -PeachEnterStage = 0x80284D04; // rom:0x1B35E4 -PlayerScriptDispatcher = 0x80284EBC; // rom:0x1B379C -PeachScriptDispatcher = 0x80285010; // rom:0x1B38F0 -HandleEvent_Player = 0x802852D4; // rom:0x1B3BB4 -DoDizzyAttack = 0x8028907C; // rom:0x1B795C -RegainAbility = 0x80289110; // rom:0x1B79F0 +EVS_MarioEnterStage = 0x80284A40; // rom:0x1B3320 +EVS_PeachEnterStage = 0x80284D04; // rom:0x1B35E4 +EVS_Mario_HandlePhase = 0x80284EBC; // rom:0x1B379C +EVS_Peach_HandlePhase = 0x80285010; // rom:0x1B38F0 +EVS_Player_HandleEvent = 0x802852D4; // rom:0x1B3BB4 +EVS_ApplyDizzyAttack = 0x8028907C; // rom:0x1B795C +EVS_PlayerRegainAbility = 0x80289110; // rom:0x1B79F0 ui_battle_menu_unused_png = 0x80289400; // rom:0x1B7CE0 ui_battle_menu_unused_pal = 0x80289600; // rom:0x1B7EE0 ui_battle_menu_unused_disabled_pal = 0x80289620; // rom:0x1B7F00 @@ -9422,36 +9422,36 @@ b_area_kmr_part_1_paragoomba_idle_8021CBE0 = 0x8021E5D0; // type:data rom:0x436F b_area_kmr_part_1_paragoomba_handleEvent_8021CEBC = 0x8021E8AC; // type:data rom:0x43724C b_area_kmr_part_1_paragoomba_sinTable = 0x8021EF6C; // type:data rom:0x43790C b_area_kmr_part_1_paragoomba_takeTurn_8021D6E8 = 0x8021F0D8; // type:data rom:0x437A78 -b_area_kmr_part_1_kmr_02_beforeBattle_8021FDA0 = 0x8021FDA0; // type:data rom:0x438740 -b_area_kmr_part_1_kmr_02_afterBattle_8021FDC0 = 0x8021FDC0; // type:data rom:0x438760 +b_area_kmr_part_1_kmr_02_EVS_PreBattle = 0x8021FDA0; // type:data rom:0x438740 +b_area_kmr_part_1_kmr_02_EVS_PostBattle = 0x8021FDC0; // type:data rom:0x438760 b_area_kmr_part_1_kmr_02 = 0x8021FDD0; // type:data rom:0x438770 b_area_kmr_part_1_kmr_03_clouds1 = 0x8021FE00; // type:data rom:0x4387A0 b_area_kmr_part_1_kmr_03_clouds2 = 0x8021FEF8; // type:data rom:0x438898 b_area_kmr_part_1_kmr_03_clouds3 = 0x80220030; // type:data rom:0x4389D0 -b_area_kmr_part_1_kmr_03_beforeBattle_80220188 = 0x80220188; // type:data rom:0x438B28 -b_area_kmr_part_1_kmr_03_afterBattle_80220200 = 0x80220200; // type:data rom:0x438BA0 -b_area_kmr_part_1_kmr_03_foregroundModelList_80220210 = 0x80220210; // type:data rom:0x438BB0 +b_area_kmr_part_1_kmr_03_EVS_PreBattle = 0x80220188; // type:data rom:0x438B28 +b_area_kmr_part_1_kmr_03_EVS_PostBattle = 0x80220200; // type:data rom:0x438BA0 +b_area_kmr_part_1_kmr_03_ForegroundModels = 0x80220210; // type:data rom:0x438BB0 b_area_kmr_part_1_kmr_03 = 0x8022021C; // type:data rom:0x438BBC b_area_kmr_part_1_kmr_04_clouds1 = 0x80220250; // type:data rom:0x438BF0 b_area_kmr_part_1_kmr_04_clouds2 = 0x80220348; // type:data rom:0x438CE8 b_area_kmr_part_1_kmr_04_clouds3 = 0x80220480; // type:data rom:0x438E20 -b_area_kmr_part_1_kmr_04_beforeBattle_802205D8 = 0x802205D8; // type:data rom:0x438F78 -b_area_kmr_part_1_kmr_04_afterBattle_80220650 = 0x80220650; // type:data rom:0x438FF0 -b_area_kmr_part_1_kmr_04_foregroundModelList_80220660 = 0x80220660; // type:data rom:0x439000 +b_area_kmr_part_1_kmr_04_EVS_PreBattle = 0x802205D8; // type:data rom:0x438F78 +b_area_kmr_part_1_kmr_04_EVS_PostBattle = 0x80220650; // type:data rom:0x438FF0 +b_area_kmr_part_1_kmr_04_ForegroundModels = 0x80220660; // type:data rom:0x439000 b_area_kmr_part_1_kmr_04 = 0x8022066C; // type:data rom:0x43900C b_area_kmr_part_1_kmr_05_clouds1 = 0x802206A0; // type:data rom:0x439040 b_area_kmr_part_1_kmr_05_clouds2 = 0x80220798; // type:data rom:0x439138 b_area_kmr_part_1_kmr_05_clouds3 = 0x802208D0; // type:data rom:0x439270 -b_area_kmr_part_1_kmr_05_beforeBattle_80220A28 = 0x80220A28; // type:data rom:0x4393C8 -b_area_kmr_part_1_kmr_05_afterBattle_80220A5C = 0x80220A5C; // type:data rom:0x4393FC -b_area_kmr_part_1_kmr_05_foregroundModelList_80220A6C = 0x80220A6C; // type:data rom:0x43940C +b_area_kmr_part_1_kmr_05_EVS_PreBattle = 0x80220A28; // type:data rom:0x4393C8 +b_area_kmr_part_1_kmr_05_EVS_PostBattle = 0x80220A5C; // type:data rom:0x4393FC +b_area_kmr_part_1_kmr_05_ForegroundModels = 0x80220A6C; // type:data rom:0x43940C b_area_kmr_part_1_kmr_05 = 0x80220A78; // type:data rom:0x439418 b_area_kmr_part_1_kmr_06_clouds1 = 0x80220AA0; // type:data rom:0x439440 b_area_kmr_part_1_kmr_06_clouds2 = 0x80220B98; // type:data rom:0x439538 b_area_kmr_part_1_kmr_06_clouds3 = 0x80220CD0; // type:data rom:0x439670 -b_area_kmr_part_1_kmr_06_beforeBattle_80220E28 = 0x80220E28; // type:data rom:0x4397C8 -b_area_kmr_part_1_kmr_06_afterBattle_80220EAC = 0x80220EAC; // type:data rom:0x43984C -b_area_kmr_part_1_kmr_06_foregroundModelList_80220EBC = 0x80220EBC; // type:data rom:0x43985C +b_area_kmr_part_1_kmr_06_EVS_PreBattle = 0x80220E28; // type:data rom:0x4397C8 +b_area_kmr_part_1_kmr_06_EVS_PostBattle = 0x80220EAC; // type:data rom:0x43984C +b_area_kmr_part_1_kmr_06_ForegroundModels = 0x80220EBC; // type:data rom:0x43985C b_area_kmr_part_1_kmr_06 = 0x80220ECC; // type:data rom:0x43986C b_area_kmr_part_2_blue_goomba_ArcsinDeg = 0x80218000; // type:func rom:0x439A90 b_area_kmr_part_2_blue_goomba_CalculateRotationZ = 0x8021818C; // type:func rom:0x439C1C @@ -9567,36 +9567,36 @@ b_area_kmr_part_2_goomnut_tree_D_80223D60_41D7F0 = 0x80223D60; // type:data rom: b_area_kmr_part_2_goomnut_tree_tree = 0x80223D7C; // type:data rom:0x44580C b_area_kmr_part_2_goomnut_tree_shake_goomnut_tree = 0x80223D90; // type:data rom:0x445820 b_area_kmr_part_2_goomnut_tree_80223DBC = 0x80223DBC; // type:data rom:0x44584C -b_area_kmr_part_2_kmr_02_beforeBattle_80224700 = 0x80224700; // type:data rom:0x446190 -b_area_kmr_part_2_kmr_02_afterBattle_80224720 = 0x80224720; // type:data rom:0x4461B0 +b_area_kmr_part_2_kmr_02_EVS_PreBattle = 0x80224700; // type:data rom:0x446190 +b_area_kmr_part_2_kmr_02_EVS_PostBattle = 0x80224720; // type:data rom:0x4461B0 b_area_kmr_part_2_kmr_02 = 0x80224730; // type:data rom:0x4461C0 b_area_kmr_part_2_kmr_03_clouds1 = 0x80224760; // type:data rom:0x4461F0 b_area_kmr_part_2_kmr_03_clouds2 = 0x80224858; // type:data rom:0x4462E8 b_area_kmr_part_2_kmr_03_clouds3 = 0x80224990; // type:data rom:0x446420 -b_area_kmr_part_2_kmr_03_beforeBattle_80224AE8 = 0x80224AE8; // type:data rom:0x446578 -b_area_kmr_part_2_kmr_03_afterBattle_80224B60 = 0x80224B60; // type:data rom:0x4465F0 -b_area_kmr_part_2_kmr_03_foregroundModelList_80224B70 = 0x80224B70; // type:data rom:0x446600 +b_area_kmr_part_2_kmr_03_EVS_PreBattle = 0x80224AE8; // type:data rom:0x446578 +b_area_kmr_part_2_kmr_03_EVS_PostBattle = 0x80224B60; // type:data rom:0x4465F0 +b_area_kmr_part_2_kmr_03_ForegroundModels = 0x80224B70; // type:data rom:0x446600 b_area_kmr_part_2_kmr_03 = 0x80224B7C; // type:data rom:0x44660C b_area_kmr_part_2_kmr_04_clouds1 = 0x80224BB0; // type:data rom:0x446640 b_area_kmr_part_2_kmr_04_clouds2 = 0x80224CA8; // type:data rom:0x446738 b_area_kmr_part_2_kmr_04_clouds3 = 0x80224DE0; // type:data rom:0x446870 -b_area_kmr_part_2_kmr_04_beforeBattle_80224F38 = 0x80224F38; // type:data rom:0x4469C8 -b_area_kmr_part_2_kmr_04_afterBattle_80224FB0 = 0x80224FB0; // type:data rom:0x446A40 -b_area_kmr_part_2_kmr_04_foregroundModelList_80224FC0 = 0x80224FC0; // type:data rom:0x446A50 +b_area_kmr_part_2_kmr_04_EVS_PreBattle = 0x80224F38; // type:data rom:0x4469C8 +b_area_kmr_part_2_kmr_04_EVS_PostBattle = 0x80224FB0; // type:data rom:0x446A40 +b_area_kmr_part_2_kmr_04_ForegroundModels = 0x80224FC0; // type:data rom:0x446A50 b_area_kmr_part_2_kmr_04 = 0x80224FCC; // type:data rom:0x446A5C b_area_kmr_part_2_kmr_05_clouds1 = 0x80225000; // type:data rom:0x446A90 b_area_kmr_part_2_kmr_05_clouds2 = 0x802250F8; // type:data rom:0x446B88 b_area_kmr_part_2_kmr_05_clouds3 = 0x80225230; // type:data rom:0x446CC0 -b_area_kmr_part_2_kmr_05_beforeBattle_80225388 = 0x80225388; // type:data rom:0x446E18 -b_area_kmr_part_2_kmr_05_afterBattle_802253BC = 0x802253BC; // type:data rom:0x446E4C -b_area_kmr_part_2_kmr_05_foregroundModelList_802253CC = 0x802253CC; // type:data rom:0x446E5C +b_area_kmr_part_2_kmr_05_EVS_PreBattle = 0x80225388; // type:data rom:0x446E18 +b_area_kmr_part_2_kmr_05_EVS_PostBattle = 0x802253BC; // type:data rom:0x446E4C +b_area_kmr_part_2_kmr_05_ForegroundModels = 0x802253CC; // type:data rom:0x446E5C b_area_kmr_part_2_kmr_05 = 0x802253D8; // type:data rom:0x446E68 b_area_kmr_part_2_kmr_06_clouds1 = 0x80225400; // type:data rom:0x446E90 b_area_kmr_part_2_kmr_06_clouds2 = 0x802254F8; // type:data rom:0x446F88 b_area_kmr_part_2_kmr_06_clouds3 = 0x80225630; // type:data rom:0x4470C0 -b_area_kmr_part_2_kmr_06_beforeBattle_80225788 = 0x80225788; // type:data rom:0x447218 -b_area_kmr_part_2_kmr_06_afterBattle_8022580C = 0x8022580C; // type:data rom:0x44729C -b_area_kmr_part_2_kmr_06_foregroundModelList_8022581C = 0x8022581C; // type:data rom:0x4472AC +b_area_kmr_part_2_kmr_06_EVS_PreBattle = 0x80225788; // type:data rom:0x447218 +b_area_kmr_part_2_kmr_06_EVS_PostBattle = 0x8022580C; // type:data rom:0x44729C +b_area_kmr_part_2_kmr_06_ForegroundModels = 0x8022581C; // type:data rom:0x4472AC b_area_kmr_part_2_kmr_06 = 0x8022582C; // type:data rom:0x4472BC b_area_kmr_part_3_spiked_goomba_ArcsinDeg = 0x80218000; // type:func rom:0x447440 b_area_kmr_part_3_spiked_goomba_CalculateRotationZ = 0x8021818C; // type:func rom:0x4475CC @@ -9835,65 +9835,65 @@ b_area_kmr_part_3_final_jr_troopa_802315F0 = 0x802315F0; // type:data rom:0x460A b_area_kmr_part_3_final_jr_troopa_802318F8 = 0x802318F8; // type:data rom:0x460D38 b_area_kmr_part_3_final_jr_troopa_80232040 = 0x80232040; // type:data rom:0x461480 b_area_kmr_part_3_final_jr_troopa_80232170 = 0x80232170; // type:data rom:0x4615B0 -b_area_kmr_part_3_kmr_02_beforeBattle_802322D0 = 0x802322D0; // type:data rom:0x461710 -b_area_kmr_part_3_kmr_02_afterBattle_802322F0 = 0x802322F0; // type:data rom:0x461730 +b_area_kmr_part_3_kmr_02_EVS_PreBattle = 0x802322D0; // type:data rom:0x461710 +b_area_kmr_part_3_kmr_02_EVS_PostBattle = 0x802322F0; // type:data rom:0x461730 b_area_kmr_part_3_kmr_02 = 0x80232300; // type:data rom:0x461740 b_area_kmr_part_3_kmr_03_clouds1 = 0x80232330; // type:data rom:0x461770 b_area_kmr_part_3_kmr_03_clouds2 = 0x80232428; // type:data rom:0x461868 b_area_kmr_part_3_kmr_03_clouds3 = 0x80232560; // type:data rom:0x4619A0 -b_area_kmr_part_3_kmr_03_beforeBattle_802326B8 = 0x802326B8; // type:data rom:0x461AF8 -b_area_kmr_part_3_kmr_03_afterBattle_80232730 = 0x80232730; // type:data rom:0x461B70 -b_area_kmr_part_3_kmr_03_foregroundModelList_80232740 = 0x80232740; // type:data rom:0x461B80 +b_area_kmr_part_3_kmr_03_EVS_PreBattle = 0x802326B8; // type:data rom:0x461AF8 +b_area_kmr_part_3_kmr_03_EVS_PostBattle = 0x80232730; // type:data rom:0x461B70 +b_area_kmr_part_3_kmr_03_ForegroundModels = 0x80232740; // type:data rom:0x461B80 b_area_kmr_part_3_kmr_03 = 0x8023274C; // type:data rom:0x461B8C b_area_kmr_part_3_kmr_04_clouds1 = 0x80232780; // type:data rom:0x461BC0 b_area_kmr_part_3_kmr_04_clouds2 = 0x80232878; // type:data rom:0x461CB8 b_area_kmr_part_3_kmr_04_clouds3 = 0x802329B0; // type:data rom:0x461DF0 -b_area_kmr_part_3_kmr_04_beforeBattle_80232B08 = 0x80232B08; // type:data rom:0x461F48 -b_area_kmr_part_3_kmr_04_afterBattle_80232B80 = 0x80232B80; // type:data rom:0x461FC0 -b_area_kmr_part_3_kmr_04_foregroundModelList_80232B90 = 0x80232B90; // type:data rom:0x461FD0 +b_area_kmr_part_3_kmr_04_EVS_PreBattle = 0x80232B08; // type:data rom:0x461F48 +b_area_kmr_part_3_kmr_04_EVS_PostBattle = 0x80232B80; // type:data rom:0x461FC0 +b_area_kmr_part_3_kmr_04_ForegroundModels = 0x80232B90; // type:data rom:0x461FD0 b_area_kmr_part_3_kmr_04 = 0x80232B9C; // type:data rom:0x461FDC b_area_kmr_part_3_kmr_05_clouds1 = 0x80232BD0; // type:data rom:0x462010 b_area_kmr_part_3_kmr_05_clouds2 = 0x80232CC8; // type:data rom:0x462108 b_area_kmr_part_3_kmr_05_clouds3 = 0x80232E00; // type:data rom:0x462240 -b_area_kmr_part_3_kmr_05_beforeBattle_80232F58 = 0x80232F58; // type:data rom:0x462398 -b_area_kmr_part_3_kmr_05_afterBattle_80232FA0 = 0x80232FA0; // type:data rom:0x4623E0 -b_area_kmr_part_3_kmr_05_foregroundModelList_80232FB0 = 0x80232FB0; // type:data rom:0x4623F0 +b_area_kmr_part_3_kmr_05_EVS_PreBattle = 0x80232F58; // type:data rom:0x462398 +b_area_kmr_part_3_kmr_05_EVS_PostBattle = 0x80232FA0; // type:data rom:0x4623E0 +b_area_kmr_part_3_kmr_05_ForegroundModels = 0x80232FB0; // type:data rom:0x4623F0 b_area_kmr_part_3_kmr_05 = 0x80232FBC; // type:data rom:0x4623FC b_area_kmr_part_3_kmr_06_clouds1 = 0x80232FF0; // type:data rom:0x462430 b_area_kmr_part_3_kmr_06_clouds2 = 0x802330E8; // type:data rom:0x462528 b_area_kmr_part_3_kmr_06_clouds3 = 0x80233220; // type:data rom:0x462660 -b_area_kmr_part_3_kmr_06_beforeBattle_80233378 = 0x80233378; // type:data rom:0x4627B8 -b_area_kmr_part_3_kmr_06_afterBattle_802333FC = 0x802333FC; // type:data rom:0x46283C -b_area_kmr_part_3_kmr_06_foregroundModelList_8023340C = 0x8023340C; // type:data rom:0x46284C +b_area_kmr_part_3_kmr_06_EVS_PreBattle = 0x80233378; // type:data rom:0x4627B8 +b_area_kmr_part_3_kmr_06_EVS_PostBattle = 0x802333FC; // type:data rom:0x46283C +b_area_kmr_part_3_kmr_06_ForegroundModels = 0x8023340C; // type:data rom:0x46284C b_area_kmr_part_3_kmr_06 = 0x8023341C; // type:data rom:0x46285C b_area_kmr_part_3_nok_01_80233450 = 0x80233450; // type:data rom:0x462890 -b_area_kmr_part_3_nok_01_beforeBattle_80233558 = 0x80233558; // type:data rom:0x462998 -b_area_kmr_part_3_nok_01_afterBattle_80233620 = 0x80233620; // type:data rom:0x462A60 -b_area_kmr_part_3_nok_01_foregroundModelList_80233630 = 0x80233630; // type:data rom:0x462A70 +b_area_kmr_part_3_nok_01_EVS_PreBattle = 0x80233558; // type:data rom:0x462998 +b_area_kmr_part_3_nok_01_EVS_PostBattle = 0x80233620; // type:data rom:0x462A60 +b_area_kmr_part_3_nok_01_ForegroundModels = 0x80233630; // type:data rom:0x462A70 b_area_kmr_part_3_nok_01 = 0x80233640; // type:data rom:0x462A80 -b_area_kmr_part_3_mim_01_beforeBattle_80233670 = 0x80233670; // type:data rom:0x462AB0 -b_area_kmr_part_3_mim_01_afterBattle_8023369C = 0x8023369C; // type:data rom:0x462ADC +b_area_kmr_part_3_mim_01_EVS_PreBattle = 0x80233670; // type:data rom:0x462AB0 +b_area_kmr_part_3_mim_01_EVS_PostBattle = 0x8023369C; // type:data rom:0x462ADC b_area_kmr_part_3_mim_01 = 0x802336AC; // type:data rom:0x462AEC b_area_kmr_part_3_sam_01_UnkModelStuff_array = 0x802336E0; // type:data rom:0x462B20 -b_area_kmr_part_3_sam_01_UnkModelStuffScript1 = 0x802336F0; // type:data rom:0x462B30 +b_area_kmr_part_3_sam_01_EVS_SpawnSnowfall = 0x802336F0; // type:data rom:0x462B30 b_area_kmr_part_3_sam_01_UnkModelStuffScript2 = 0x8023372C; // type:data rom:0x462B6C -b_area_kmr_part_3_sam_01_UnkModelStuffScript3 = 0x802337F4; // type:data rom:0x462C34 -b_area_kmr_part_3_sam_01_UnkModelStuffScript4 = 0x802338D4; // type:data rom:0x462D14 -b_area_kmr_part_3_sam_01_beforeBattle_80233998 = 0x80233998; // type:data rom:0x462DD8 -b_area_kmr_part_3_sam_01_afterBattle_80233AA8 = 0x80233AA8; // type:data rom:0x462EE8 -b_area_kmr_part_3_sam_01_foregroundModelList_80233AB8 = 0x80233AB8; // type:data rom:0x462EF8 +b_area_kmr_part_3_sam_01_EVS_AnimateHangingSnowflake_RandomSpin = 0x802337F4; // type:data rom:0x462C34 +b_area_kmr_part_3_sam_01_EVS_AnimateHangingSnowflake_NoSpin = 0x802338D4; // type:data rom:0x462D14 +b_area_kmr_part_3_sam_01_EVS_PreBattle = 0x80233998; // type:data rom:0x462DD8 +b_area_kmr_part_3_sam_01_EVS_PostBattle = 0x80233AA8; // type:data rom:0x462EE8 +b_area_kmr_part_3_sam_01_ForegroundModels = 0x80233AB8; // type:data rom:0x462EF8 b_area_kmr_part_3_sam_01 = 0x80233AC4; // type:data rom:0x462F04 b_area_kmr_part_3_mac_01_80233AF0 = 0x80233AF0; // type:data rom:0x462F30 b_area_kmr_part_3_mac_01_80234180 = 0x80234180; // type:data rom:0x4635C0 b_area_kmr_part_3_mac_01_intTable_80234524 = 0x80234524; // type:data rom:0x463964 b_area_kmr_part_3_mac_01_80234564 = 0x80234564; // type:data rom:0x4639A4 b_area_kmr_part_3_mac_01_802347D0 = 0x802347D0; // type:data rom:0x463C10 -b_area_kmr_part_3_mac_01_beforeBattle_80234B74 = 0x80234B74; // type:data rom:0x463FB4 -b_area_kmr_part_3_mac_01_afterBattle_80234C70 = 0x80234C70; // type:data rom:0x4640B0 +b_area_kmr_part_3_mac_01_EVS_PreBattle = 0x80234B74; // type:data rom:0x463FB4 +b_area_kmr_part_3_mac_01_EVS_PostBattle = 0x80234C70; // type:data rom:0x4640B0 b_area_kmr_part_3_mac_01 = 0x80234C80; // type:data rom:0x4640C0 b_area_kmr_part_3_kpa_01_80234CB0 = 0x80234CB0; // type:data rom:0x4640F0 -b_area_kmr_part_3_kpa_01_beforeBattle_80234D60 = 0x80234D60; // type:data rom:0x4641A0 -b_area_kmr_part_3_kpa_01_afterBattle_80234D9C = 0x80234D9C; // type:data rom:0x4641DC +b_area_kmr_part_3_kpa_01_EVS_PreBattle = 0x80234D60; // type:data rom:0x4641A0 +b_area_kmr_part_3_kpa_01_EVS_PostBattle = 0x80234D9C; // type:data rom:0x4641DC b_area_kmr_part_3_kpa_01 = 0x80234DAC; // type:data rom:0x4641EC b_area_mac_chan_UnkBattleFunc1 = 0x80218000; // type:func rom:0x464490 func_802180D0_464560 = 0x802180D0; // type:func rom:0x464560 @@ -10102,11 +10102,11 @@ b_area_mac_mac_01_80231E00 = 0x80231E00; // type:data rom:0x47E290 b_area_mac_mac_01_intTable_802321A4 = 0x802321A4; // type:data rom:0x47E634 b_area_mac_mac_01_802321E4 = 0x802321E4; // type:data rom:0x47E674 b_area_mac_mac_01_80232450 = 0x80232450; // type:data rom:0x47E8E0 -b_area_mac_mac_01_beforeBattle_802327F4 = 0x802327F4; // type:data rom:0x47EC84 -b_area_mac_mac_01_afterBattle_802328F0 = 0x802328F0; // type:data rom:0x47ED80 +b_area_mac_mac_01_EVS_PreBattle = 0x802327F4; // type:data rom:0x47EC84 +b_area_mac_mac_01_EVS_PostBattle = 0x802328F0; // type:data rom:0x47ED80 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_EVS_PreBattle = 0x80232930; // type:data rom:0x47EDC0 +b_area_mac_mac_02_EVS_PostBattle = 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 @@ -10205,17 +10205,17 @@ b_area_hos_magikoopa_electrify = 0x80222C50; // type:data rom:0x489D00 b_area_hos_magikoopa_vanish = 0x802233DC; // type:data rom:0x48A48C b_area_hos_magikoopa_takeTurn_80223B24 = 0x80223B24; // type:data rom:0x48ABD4 D_80224BB0_48BC60 = 0x80224BB0; // type:data rom:0x48BC60 -b_area_hos_hos_01_beforeBattle_80224BD0 = 0x80224BD0; // type:data rom:0x48BC80 -b_area_hos_hos_01_afterBattle_80225598 = 0x80225598; // type:data rom:0x48C648 -b_area_hos_hos_01_foregroundModelList_802255A8 = 0x802255A8; // type:data rom:0x48C658 +b_area_hos_hos_01_EVS_PreBattle = 0x80224BD0; // type:data rom:0x48BC80 +b_area_hos_hos_01_EVS_PostBattle = 0x80225598; // type:data rom:0x48C648 +b_area_hos_hos_01_ForegroundModels = 0x802255A8; // type:data rom:0x48C658 b_area_hos_hos_01 = 0x802255B0; // type:data rom:0x48C660 b_area_hos_hos_00_802255E0 = 0x802255E0; // type:data rom:0x48C690 -b_area_hos_hos_00_beforeBattle_802256E8 = 0x802256E8; // type:data rom:0x48C798 -b_area_hos_hos_00_afterBattle_8022589C = 0x8022589C; // type:data rom:0x48C94C -b_area_hos_hos_00_foregroundModelList_802258AC = 0x802258AC; // type:data rom:0x48C95C +b_area_hos_hos_00_EVS_PreBattle = 0x802256E8; // type:data rom:0x48C798 +b_area_hos_hos_00_EVS_PostBattle = 0x8022589C; // type:data rom:0x48C94C +b_area_hos_hos_00_ForegroundModels = 0x802258AC; // type:data rom:0x48C95C 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_EVS_PreBattle = 0x802258E0; // type:data rom:0x48C990 +b_area_hos_hos_02_EVS_PostBattle = 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 @@ -10392,22 +10392,22 @@ b_area_nok_kent_c_koopa_8022B204 = 0x8022B204; // type:data rom:0x4A03A4 b_area_nok_kent_c_koopa_8022B2E8 = 0x8022B2E8; // type:data rom:0x4A0488 b_area_nok_kent_c_koopa_8022B444 = 0x8022B444; // type:data rom:0x4A05E4 b_area_nok_nok_01_8022B5F0 = 0x8022B5F0; // type:data rom:0x4A0790 -b_area_nok_nok_01_beforeBattle_8022B6F8 = 0x8022B6F8; // type:data rom:0x4A0898 -b_area_nok_nok_01_afterBattle_8022B7C0 = 0x8022B7C0; // type:data rom:0x4A0960 -b_area_nok_nok_01_foregroundModelList_8022B7D0 = 0x8022B7D0; // type:data rom:0x4A0970 +b_area_nok_nok_01_EVS_PreBattle = 0x8022B6F8; // type:data rom:0x4A0898 +b_area_nok_nok_01_EVS_PostBattle = 0x8022B7C0; // type:data rom:0x4A0960 +b_area_nok_nok_01_ForegroundModels = 0x8022B7D0; // type:data rom:0x4A0970 b_area_nok_nok_01 = 0x8022B7E0; // type:data rom:0x4A0980 b_area_nok_nok_02_8022B810 = 0x8022B810; // type:data rom:0x4A09B0 -b_area_nok_nok_02_beforeBattle_8022B918 = 0x8022B918; // type:data rom:0x4A0AB8 -b_area_nok_nok_02_afterBattle_8022BACC = 0x8022BACC; // type:data rom:0x4A0C6C -b_area_nok_nok_02_foregroundModelList_8022BADC = 0x8022BADC; // type:data rom:0x4A0C7C +b_area_nok_nok_02_EVS_PreBattle = 0x8022B918; // type:data rom:0x4A0AB8 +b_area_nok_nok_02_EVS_PostBattle = 0x8022BACC; // type:data rom:0x4A0C6C +b_area_nok_nok_02_ForegroundModels = 0x8022BADC; // type:data rom:0x4A0C7C b_area_nok_nok_02 = 0x8022BAEC; // type:data rom:0x4A0C8C -b_area_nok_nok_03_beforeBattle_8022BB20 = 0x8022BB20; // type:data rom:0x4A0CC0 -b_area_nok_nok_03_afterBattle_8022BB40 = 0x8022BB40; // type:data rom:0x4A0CE0 -b_area_nok_nok_03_foregroundModelList_8022BB50 = 0x8022BB50; // type:data rom:0x4A0CF0 +b_area_nok_nok_03_EVS_PreBattle = 0x8022BB20; // type:data rom:0x4A0CC0 +b_area_nok_nok_03_EVS_PostBattle = 0x8022BB40; // type:data rom:0x4A0CE0 +b_area_nok_nok_03_ForegroundModels = 0x8022BB50; // type:data rom:0x4A0CF0 b_area_nok_nok_03 = 0x8022BB5C; // type:data rom:0x4A0CFC -b_area_nok_nok_04_beforeBattle_8022BB90 = 0x8022BB90; // type:data rom:0x4A0D30 -b_area_nok_nok_04_afterBattle_8022BBB0 = 0x8022BBB0; // type:data rom:0x4A0D50 -b_area_nok_nok_04_foregroundModelList_8022BBC0 = 0x8022BBC0; // type:data rom:0x4A0D60 +b_area_nok_nok_04_EVS_PreBattle = 0x8022BB90; // type:data rom:0x4A0D30 +b_area_nok_nok_04_EVS_PostBattle = 0x8022BBB0; // type:data rom:0x4A0D50 +b_area_nok_nok_04_ForegroundModels = 0x8022BBC0; // type:data rom:0x4A0D60 b_area_nok_nok_04 = 0x8022BBD8; // type:data rom:0x4A0D78 func_80218000_4A10A0 = 0x80218000; // type:func rom:0x4A10A0 b_area_trd_part_1_koopa_troopa_UnkBattleFunc1 = 0x80218020; // type:func rom:0x4A10C0 @@ -10529,77 +10529,77 @@ b_area_trd_part_1_paratroopa_idle_80220D40 = 0x80220D40; // type:data rom:0x4A9D b_area_trd_part_1_paratroopa_intTable_802211D0 = 0x802211D0; // type:data rom:0x4AA270 b_area_trd_part_1_paratroopa_handleEvent_80221228 = 0x80221228; // type:data rom:0x4AA2C8 b_area_trd_part_1_paratroopa_takeTurn_80221DAC = 0x80221DAC; // type:data rom:0x4AAE4C -b_area_trd_part_1_trd_01_beforeBattle_80222AE0 = 0x80222AE0; // type:data rom:0x4ABB80 -b_area_trd_part_1_trd_01_afterBattle_80222B1C = 0x80222B1C; // type:data rom:0x4ABBBC +b_area_trd_part_1_trd_01_EVS_PreBattle = 0x80222AE0; // type:data rom:0x4ABB80 +b_area_trd_part_1_trd_01_EVS_PostBattle = 0x80222B1C; // type:data rom:0x4ABBBC b_area_trd_part_1_trd_01 = 0x80222B2C; // type:data rom:0x4ABBCC b_area_trd_part_1_trd_02_80222B60 = 0x80222B60; // type:data rom:0x4ABC00 b_area_trd_part_1_trd_02_80222C78 = 0x80222C78; // type:data rom:0x4ABD18 -b_area_trd_part_1_trd_02_beforeBattle_80223224 = 0x80223224; // type:data rom:0x4AC2C4 -b_area_trd_part_1_trd_02_afterBattle_80223318 = 0x80223318; // type:data rom:0x4AC3B8 -b_area_trd_part_1_trd_02_foregroundModelList_80223328 = 0x80223328; // type:data rom:0x4AC3C8 +b_area_trd_part_1_trd_02_EVS_PreBattle = 0x80223224; // type:data rom:0x4AC2C4 +b_area_trd_part_1_trd_02_EVS_PostBattle = 0x80223318; // type:data rom:0x4AC3B8 +b_area_trd_part_1_trd_02_ForegroundModels = 0x80223328; // type:data rom:0x4AC3C8 b_area_trd_part_1_trd_02 = 0x80223330; // type:data rom:0x4AC3D0 b_area_trd_part_1_trd_02b_80223360 = 0x80223360; // type:data rom:0x4AC400 b_area_trd_part_1_trd_02b_80223478 = 0x80223478; // type:data rom:0x4AC518 -b_area_trd_part_1_trd_02b_beforeBattle_80223A24 = 0x80223A24; // type:data rom:0x4ACAC4 -b_area_trd_part_1_trd_02b_afterBattle_80223B40 = 0x80223B40; // type:data rom:0x4ACBE0 +b_area_trd_part_1_trd_02b_EVS_PreBattle = 0x80223A24; // type:data rom:0x4ACAC4 +b_area_trd_part_1_trd_02b_EVS_PostBattle = 0x80223B40; // type:data rom:0x4ACBE0 b_area_trd_part_1_trd_02b = 0x80223B50; // type:data rom:0x4ACBF0 b_area_trd_part_1_trd_03_clouds1 = 0x80223B80; // type:data rom:0x4ACC20 b_area_trd_part_1_trd_03_clouds2 = 0x80223C78; // type:data rom:0x4ACD18 b_area_trd_part_1_trd_03_clouds3 = 0x80223DB0; // type:data rom:0x4ACE50 -b_area_trd_part_1_trd_03_beforeBattle_80223F08 = 0x80223F08; // type:data rom:0x4ACFA8 -b_area_trd_part_1_trd_03_afterBattle_80223FA0 = 0x80223FA0; // type:data rom:0x4AD040 -b_area_trd_part_1_trd_03_foregroundModelList_80223FB0 = 0x80223FB0; // type:data rom:0x4AD050 +b_area_trd_part_1_trd_03_EVS_PreBattle = 0x80223F08; // type:data rom:0x4ACFA8 +b_area_trd_part_1_trd_03_EVS_PostBattle = 0x80223FA0; // type:data rom:0x4AD040 +b_area_trd_part_1_trd_03_ForegroundModels = 0x80223FB0; // type:data rom:0x4AD050 b_area_trd_part_1_trd_03 = 0x80223FC0; // type:data rom:0x4AD060 b_area_trd_part_1_trd_04_80223FF0 = 0x80223FF0; // type:data rom:0x4AD090 b_area_trd_part_1_trd_04_802240C0 = 0x802240C0; // type:data rom:0x4AD160 b_area_trd_part_1_trd_04_802241AC = 0x802241AC; // type:data rom:0x4AD24C -b_area_trd_part_1_trd_04_beforeBattle_80224298 = 0x80224298; // type:data rom:0x4AD338 -b_area_trd_part_1_trd_04_afterBattle_80224320 = 0x80224320; // type:data rom:0x4AD3C0 -b_area_trd_part_1_trd_04_foregroundModelList_80224330 = 0x80224330; // type:data rom:0x4AD3D0 +b_area_trd_part_1_trd_04_EVS_PreBattle = 0x80224298; // type:data rom:0x4AD338 +b_area_trd_part_1_trd_04_EVS_PostBattle = 0x80224320; // type:data rom:0x4AD3C0 +b_area_trd_part_1_trd_04_ForegroundModels = 0x80224330; // type:data rom:0x4AD3D0 b_area_trd_part_1_trd_04 = 0x80224338; // type:data rom:0x4AD3D8 b_area_trd_part_1_trd_05_80224360 = 0x80224360; // type:data rom:0x4AD400 b_area_trd_part_1_trd_05_80224478 = 0x80224478; // type:data rom:0x4AD518 -b_area_trd_part_1_trd_05_beforeBattle_80224A24 = 0x80224A24; // type:data rom:0x4ADAC4 -b_area_trd_part_1_trd_05_afterBattle_80224B30 = 0x80224B30; // type:data rom:0x4ADBD0 +b_area_trd_part_1_trd_05_EVS_PreBattle = 0x80224A24; // type:data rom:0x4ADAC4 +b_area_trd_part_1_trd_05_EVS_PostBattle = 0x80224B30; // type:data rom:0x4ADBD0 b_area_trd_part_1_trd_05 = 0x80224B40; // type:data rom:0x4ADBE0 -b_area_trd_part_1_trd_00_beforeBattle_80224B70 = 0x80224B70; // type:data rom:0x4ADC10 -b_area_trd_part_1_trd_00_afterBattle_80224BAC = 0x80224BAC; // type:data rom:0x4ADC4C -b_area_trd_part_1_trd_00_foregroundModelList_80224BBC = 0x80224BBC; // type:data rom:0x4ADC5C +b_area_trd_part_1_trd_00_EVS_PreBattle = 0x80224B70; // type:data rom:0x4ADC10 +b_area_trd_part_1_trd_00_EVS_PostBattle = 0x80224BAC; // type:data rom:0x4ADC4C +b_area_trd_part_1_trd_00_ForegroundModels = 0x80224BBC; // type:data rom:0x4ADC5C b_area_trd_part_1_trd_00 = 0x80224BC4; // type:data rom:0x4ADC64 -b_area_trd_part_1_trd_02c_beforeBattle_80224BF0 = 0x80224BF0; // type:data rom:0x4ADC90 -b_area_trd_part_1_trd_02c_afterBattle_80224C54 = 0x80224C54; // type:data rom:0x4ADCF4 -b_area_trd_part_1_trd_02c_foregroundModelList_80224C64 = 0x80224C64; // type:data rom:0x4ADD04 +b_area_trd_part_1_trd_02c_EVS_PreBattle = 0x80224BF0; // type:data rom:0x4ADC90 +b_area_trd_part_1_trd_02c_EVS_PostBattle = 0x80224C54; // type:data rom:0x4ADCF4 +b_area_trd_part_1_trd_02c_ForegroundModels = 0x80224C64; // type:data rom:0x4ADD04 b_area_trd_part_1_trd_02c = 0x80224C6C; // type:data rom:0x4ADD0C b_area_trd_part_1_trd_02d_80224CA0 = 0x80224CA0; // type:data rom:0x4ADD40 b_area_trd_part_1_trd_02d_80224DB8 = 0x80224DB8; // type:data rom:0x4ADE58 -b_area_trd_part_1_trd_02d_beforeBattle_80225364 = 0x80225364; // type:data rom:0x4AE404 -b_area_trd_part_1_trd_02d_afterBattle_80225418 = 0x80225418; // type:data rom:0x4AE4B8 -b_area_trd_part_1_trd_02d_foregroundModelList_80225428 = 0x80225428; // type:data rom:0x4AE4C8 +b_area_trd_part_1_trd_02d_EVS_PreBattle = 0x80225364; // type:data rom:0x4AE404 +b_area_trd_part_1_trd_02d_EVS_PostBattle = 0x80225418; // type:data rom:0x4AE4B8 +b_area_trd_part_1_trd_02d_ForegroundModels = 0x80225428; // type:data rom:0x4AE4C8 b_area_trd_part_1_trd_02d = 0x80225430; // type:data rom:0x4AE4D0 b_area_trd_part_1_trd_05b_80225460 = 0x80225460; // type:data rom:0x4AE500 b_area_trd_part_1_trd_05b_80225578 = 0x80225578; // type:data rom:0x4AE618 -b_area_trd_part_1_trd_05b_beforeBattle_80225B24 = 0x80225B24; // type:data rom:0x4AEBC4 -b_area_trd_part_1_trd_05b_afterBattle_80225C28 = 0x80225C28; // type:data rom:0x4AECC8 +b_area_trd_part_1_trd_05b_EVS_PreBattle = 0x80225B24; // type:data rom:0x4AEBC4 +b_area_trd_part_1_trd_05b_EVS_PostBattle = 0x80225C28; // type:data rom:0x4AECC8 b_area_trd_part_1_trd_05b = 0x80225C38; // type:data rom:0x4AECD8 b_area_trd_part_1_trd_05c_80225C60 = 0x80225C60; // type:data rom:0x4AED00 b_area_trd_part_1_trd_05c_80225D78 = 0x80225D78; // type:data rom:0x4AEE18 -b_area_trd_part_1_trd_05c_beforeBattle_80226324 = 0x80226324; // type:data rom:0x4AF3C4 -b_area_trd_part_1_trd_05c_afterBattle_80226470 = 0x80226470; // type:data rom:0x4AF510 +b_area_trd_part_1_trd_05c_EVS_PreBattle = 0x80226324; // type:data rom:0x4AF3C4 +b_area_trd_part_1_trd_05c_EVS_PostBattle = 0x80226470; // type:data rom:0x4AF510 b_area_trd_part_1_trd_05c = 0x80226480; // type:data rom:0x4AF520 b_area_trd_part_1_trd_05d_802264B0 = 0x802264B0; // type:data rom:0x4AF550 b_area_trd_part_1_trd_05d_802265C8 = 0x802265C8; // type:data rom:0x4AF668 -b_area_trd_part_1_trd_05d_beforeBattle_80226B74 = 0x80226B74; // type:data rom:0x4AFC14 -b_area_trd_part_1_trd_05d_afterBattle_80226CB8 = 0x80226CB8; // type:data rom:0x4AFD58 +b_area_trd_part_1_trd_05d_EVS_PreBattle = 0x80226B74; // type:data rom:0x4AFC14 +b_area_trd_part_1_trd_05d_EVS_PostBattle = 0x80226CB8; // type:data rom:0x4AFD58 b_area_trd_part_1_trd_05d = 0x80226CC8; // type:data rom:0x4AFD68 b_area_trd_part_1_trd_05e_80226CF0 = 0x80226CF0; // type:data rom:0x4AFD90 b_area_trd_part_1_trd_05e_80226E08 = 0x80226E08; // type:data rom:0x4AFEA8 -b_area_trd_part_1_trd_05e_beforeBattle_802273B4 = 0x802273B4; // type:data rom:0x4B0454 -b_area_trd_part_1_trd_05e_afterBattle_80227490 = 0x80227490; // type:data rom:0x4B0530 +b_area_trd_part_1_trd_05e_EVS_PreBattle = 0x802273B4; // type:data rom:0x4B0454 +b_area_trd_part_1_trd_05e_EVS_PostBattle = 0x80227490; // type:data rom:0x4B0530 b_area_trd_part_1_trd_05e = 0x802274A0; // type:data rom:0x4B0540 b_area_trd_part_1_trd_05f_802274D0 = 0x802274D0; // type:data rom:0x4B0570 b_area_trd_part_1_trd_05f_802275E8 = 0x802275E8; // type:data rom:0x4B0688 -b_area_trd_part_1_trd_05f_beforeBattle_80227B94 = 0x80227B94; // type:data rom:0x4B0C34 -b_area_trd_part_1_trd_05f_afterBattle_80227C8C = 0x80227C8C; // type:data rom:0x4B0D2C +b_area_trd_part_1_trd_05f_EVS_PreBattle = 0x80227B94; // type:data rom:0x4B0C34 +b_area_trd_part_1_trd_05f_EVS_PostBattle = 0x80227C8C; // type:data rom:0x4B0D2C b_area_trd_part_1_trd_05f = 0x80227C9C; // type:data rom:0x4B0D3C b_area_trd_part_2_fake_bowser_StartRumbleWithParams = 0x80218000; // type:func rom:0x4B11F0 b_area_trd_part_2_fake_bowser_UnkFunc27 = 0x80218058; // type:func rom:0x4B1248 @@ -10761,67 +10761,67 @@ b_area_trd_part_2_yellow_ninja_koopa_intTable_80230CD0 = 0x80230CD0; // type:dat b_area_trd_part_2_yellow_ninja_koopa_handleEvent_80230D28 = 0x80230D28; // type:data rom:0x4C9F18 b_area_trd_part_2_yellow_ninja_koopa_takeTurn_802313B4 = 0x802313B4; // type:data rom:0x4CA5A4 b_area_trd_part_2_yellow_ninja_koopa_nextTurn_802313C4 = 0x802313C4; // type:data rom:0x4CA5B4 -b_area_trd_part_2_trd_00_beforeBattle_802313E0 = 0x802313E0; // type:data rom:0x4CA5D0 -b_area_trd_part_2_trd_00_afterBattle_8023141C = 0x8023141C; // type:data rom:0x4CA60C -b_area_trd_part_2_trd_00_foregroundModelList_8023142C = 0x8023142C; // type:data rom:0x4CA61C +b_area_trd_part_2_trd_00_EVS_PreBattle = 0x802313E0; // type:data rom:0x4CA5D0 +b_area_trd_part_2_trd_00_EVS_PostBattle = 0x8023141C; // type:data rom:0x4CA60C +b_area_trd_part_2_trd_00_ForegroundModels = 0x8023142C; // type:data rom:0x4CA61C b_area_trd_part_2_trd_00 = 0x80231434; // type:data rom:0x4CA624 -b_area_trd_part_2_trd_01_beforeBattle_80231460 = 0x80231460; // type:data rom:0x4CA650 -b_area_trd_part_2_trd_01_afterBattle_8023149C = 0x8023149C; // type:data rom:0x4CA68C +b_area_trd_part_2_trd_01_EVS_PreBattle = 0x80231460; // type:data rom:0x4CA650 +b_area_trd_part_2_trd_01_EVS_PostBattle = 0x8023149C; // type:data rom:0x4CA68C b_area_trd_part_2_trd_01 = 0x802314AC; // type:data rom:0x4CA69C b_area_trd_part_2_trd_02_802314E0 = 0x802314E0; // type:data rom:0x4CA6D0 b_area_trd_part_2_trd_02_802315F8 = 0x802315F8; // type:data rom:0x4CA7E8 -b_area_trd_part_2_trd_02_beforeBattle_80231BA4 = 0x80231BA4; // type:data rom:0x4CAD94 -b_area_trd_part_2_trd_02_afterBattle_80231C98 = 0x80231C98; // type:data rom:0x4CAE88 -b_area_trd_part_2_trd_02_foregroundModelList_80231CA8 = 0x80231CA8; // type:data rom:0x4CAE98 +b_area_trd_part_2_trd_02_EVS_PreBattle = 0x80231BA4; // type:data rom:0x4CAD94 +b_area_trd_part_2_trd_02_EVS_PostBattle = 0x80231C98; // type:data rom:0x4CAE88 +b_area_trd_part_2_trd_02_ForegroundModels = 0x80231CA8; // type:data rom:0x4CAE98 b_area_trd_part_2_trd_02 = 0x80231CB0; // type:data rom:0x4CAEA0 b_area_trd_part_2_trd_02b_80231CE0 = 0x80231CE0; // type:data rom:0x4CAED0 b_area_trd_part_2_trd_02b_80231DF8 = 0x80231DF8; // type:data rom:0x4CAFE8 -b_area_trd_part_2_trd_02b_beforeBattle_802323A4 = 0x802323A4; // type:data rom:0x4CB594 -b_area_trd_part_2_trd_02b_afterBattle_802324C0 = 0x802324C0; // type:data rom:0x4CB6B0 +b_area_trd_part_2_trd_02b_EVS_PreBattle = 0x802323A4; // type:data rom:0x4CB594 +b_area_trd_part_2_trd_02b_EVS_PostBattle = 0x802324C0; // type:data rom:0x4CB6B0 b_area_trd_part_2_trd_02b = 0x802324D0; // type:data rom:0x4CB6C0 b_area_trd_part_2_trd_03_clouds1 = 0x80232500; // type:data rom:0x4CB6F0 b_area_trd_part_2_trd_03_clouds2 = 0x802325F8; // type:data rom:0x4CB7E8 b_area_trd_part_2_trd_03_clouds3 = 0x80232730; // type:data rom:0x4CB920 -b_area_trd_part_2_trd_03_beforeBattle_80232888 = 0x80232888; // type:data rom:0x4CBA78 -b_area_trd_part_2_trd_03_afterBattle_80232920 = 0x80232920; // type:data rom:0x4CBB10 -b_area_trd_part_2_trd_03_foregroundModelList_80232930 = 0x80232930; // type:data rom:0x4CBB20 +b_area_trd_part_2_trd_03_EVS_PreBattle = 0x80232888; // type:data rom:0x4CBA78 +b_area_trd_part_2_trd_03_EVS_PostBattle = 0x80232920; // type:data rom:0x4CBB10 +b_area_trd_part_2_trd_03_ForegroundModels = 0x80232930; // type:data rom:0x4CBB20 b_area_trd_part_2_trd_03 = 0x80232940; // type:data rom:0x4CBB30 b_area_trd_part_2_trd_04_80232970 = 0x80232970; // type:data rom:0x4CBB60 b_area_trd_part_2_trd_04_80232A40 = 0x80232A40; // type:data rom:0x4CBC30 b_area_trd_part_2_trd_04_80232B2C = 0x80232B2C; // type:data rom:0x4CBD1C -b_area_trd_part_2_trd_04_beforeBattle_80232C18 = 0x80232C18; // type:data rom:0x4CBE08 -b_area_trd_part_2_trd_04_afterBattle_80232CA0 = 0x80232CA0; // type:data rom:0x4CBE90 -b_area_trd_part_2_trd_04_foregroundModelList_80232CB0 = 0x80232CB0; // type:data rom:0x4CBEA0 +b_area_trd_part_2_trd_04_EVS_PreBattle = 0x80232C18; // type:data rom:0x4CBE08 +b_area_trd_part_2_trd_04_EVS_PostBattle = 0x80232CA0; // type:data rom:0x4CBE90 +b_area_trd_part_2_trd_04_ForegroundModels = 0x80232CB0; // type:data rom:0x4CBEA0 b_area_trd_part_2_trd_04 = 0x80232CB8; // type:data rom:0x4CBEA8 b_area_trd_part_2_trd_05_80232CE0 = 0x80232CE0; // type:data rom:0x4CBED0 b_area_trd_part_2_trd_05_80232DF8 = 0x80232DF8; // type:data rom:0x4CBFE8 -b_area_trd_part_2_trd_05_beforeBattle_802333A4 = 0x802333A4; // type:data rom:0x4CC594 -b_area_trd_part_2_trd_05_afterBattle_802334B0 = 0x802334B0; // type:data rom:0x4CC6A0 +b_area_trd_part_2_trd_05_EVS_PreBattle = 0x802333A4; // type:data rom:0x4CC594 +b_area_trd_part_2_trd_05_EVS_PostBattle = 0x802334B0; // type:data rom:0x4CC6A0 b_area_trd_part_2_trd_05 = 0x802334C0; // type:data rom:0x4CC6B0 b_area_trd_part_2_trd_05b_802334F0 = 0x802334F0; // type:data rom:0x4CC6E0 b_area_trd_part_2_trd_05b_80233608 = 0x80233608; // type:data rom:0x4CC7F8 -b_area_trd_part_2_trd_05b_beforeBattle_80233BB4 = 0x80233BB4; // type:data rom:0x4CCDA4 -b_area_trd_part_2_trd_05b_afterBattle_80233CB8 = 0x80233CB8; // type:data rom:0x4CCEA8 +b_area_trd_part_2_trd_05b_EVS_PreBattle = 0x80233BB4; // type:data rom:0x4CCDA4 +b_area_trd_part_2_trd_05b_EVS_PostBattle = 0x80233CB8; // type:data rom:0x4CCEA8 b_area_trd_part_2_trd_05b = 0x80233CC8; // type:data rom:0x4CCEB8 b_area_trd_part_2_trd_05c_80233CF0 = 0x80233CF0; // type:data rom:0x4CCEE0 b_area_trd_part_2_trd_05c_80233E08 = 0x80233E08; // type:data rom:0x4CCFF8 -b_area_trd_part_2_trd_05c_beforeBattle_802343B4 = 0x802343B4; // type:data rom:0x4CD5A4 -b_area_trd_part_2_trd_05c_afterBattle_80234500 = 0x80234500; // type:data rom:0x4CD6F0 +b_area_trd_part_2_trd_05c_EVS_PreBattle = 0x802343B4; // type:data rom:0x4CD5A4 +b_area_trd_part_2_trd_05c_EVS_PostBattle = 0x80234500; // type:data rom:0x4CD6F0 b_area_trd_part_2_trd_05c = 0x80234510; // type:data rom:0x4CD700 b_area_trd_part_2_trd_05d_80234540 = 0x80234540; // type:data rom:0x4CD730 b_area_trd_part_2_trd_05d_80234658 = 0x80234658; // type:data rom:0x4CD848 -b_area_trd_part_2_trd_05d_beforeBattle_80234C04 = 0x80234C04; // type:data rom:0x4CDDF4 -b_area_trd_part_2_trd_05d_afterBattle_80234D48 = 0x80234D48; // type:data rom:0x4CDF38 +b_area_trd_part_2_trd_05d_EVS_PreBattle = 0x80234C04; // type:data rom:0x4CDDF4 +b_area_trd_part_2_trd_05d_EVS_PostBattle = 0x80234D48; // type:data rom:0x4CDF38 b_area_trd_part_2_trd_05d = 0x80234D58; // type:data rom:0x4CDF48 b_area_trd_part_2_trd_05e_80234D80 = 0x80234D80; // type:data rom:0x4CDF70 b_area_trd_part_2_trd_05e_80234E98 = 0x80234E98; // type:data rom:0x4CE088 -b_area_trd_part_2_trd_05e_beforeBattle_80235444 = 0x80235444; // type:data rom:0x4CE634 -b_area_trd_part_2_trd_05e_afterBattle_80235520 = 0x80235520; // type:data rom:0x4CE710 +b_area_trd_part_2_trd_05e_EVS_PreBattle = 0x80235444; // type:data rom:0x4CE634 +b_area_trd_part_2_trd_05e_EVS_PostBattle = 0x80235520; // type:data rom:0x4CE710 b_area_trd_part_2_trd_05e = 0x80235530; // type:data rom:0x4CE720 b_area_trd_part_2_trd_05f_80235560 = 0x80235560; // type:data rom:0x4CE750 b_area_trd_part_2_trd_05f_80235678 = 0x80235678; // type:data rom:0x4CE868 -b_area_trd_part_2_trd_05f_beforeBattle_80235C24 = 0x80235C24; // type:data rom:0x4CEE14 -b_area_trd_part_2_trd_05f_afterBattle_80235D1C = 0x80235D1C; // type:data rom:0x4CEF0C +b_area_trd_part_2_trd_05f_EVS_PreBattle = 0x80235C24; // type:data rom:0x4CEE14 +b_area_trd_part_2_trd_05f_EVS_PostBattle = 0x80235D1C; // type:data rom:0x4CEF0C b_area_trd_part_2_trd_05f = 0x80235D2C; // type:data rom:0x4CEF1C D_80235FC0 = 0x80218000; // type:func rom:0x4CF1B0 b_area_trd_part_2_green_ninja_koopa_effectUnk = 0x80236040; // type:data rom:0x4CF230 @@ -10850,9 +10850,9 @@ b_area_trd_part_3_eldstar_80218424 = 0x80218424; // type:data rom:0x4CF5D4 b_area_trd_part_2_blue_ninja_koopa_effectUnk = 0x80236560; // type:data rom:0x4CF750 b_area_trd_part_2_yellow_ninja_koopa_effectUnk = 0x802367F0; // type:data rom:0x4CF9E0 b_area_trd_part_3_nok_01_80218DD0 = 0x80218DD0; // type:data rom:0x4CFF80 -b_area_trd_part_3_nok_01_beforeBattle_80218ED8 = 0x80218ED8; // type:data rom:0x4D0088 -b_area_trd_part_3_nok_01_afterBattle_80218FA0 = 0x80218FA0; // type:data rom:0x4D0150 -b_area_trd_part_3_nok_01_foregroundModelList_80218FB0 = 0x80218FB0; // type:data rom:0x4D0160 +b_area_trd_part_3_nok_01_EVS_PreBattle = 0x80218ED8; // type:data rom:0x4D0088 +b_area_trd_part_3_nok_01_EVS_PostBattle = 0x80218FA0; // type:data rom:0x4D0150 +b_area_trd_part_3_nok_01_ForegroundModels = 0x80218FB0; // type:data rom:0x4D0160 b_area_trd_part_3_nok_01 = 0x80218FC0; // type:data rom:0x4D0170 b_area_iwa_cleft_SetSpinSmashable = 0x80218000; // type:func rom:0x4D01F0 b_area_iwa_cleft_StartRumbleWithParams = 0x8021805C; // type:func rom:0x4D024C @@ -10942,9 +10942,9 @@ b_area_iwa_whacka_handleEvent_8021FE90 = 0x8021FE90; // type:data rom:0x4D8080 b_area_iwa_whacka_takeTurn_80220634 = 0x80220634; // type:data rom:0x4D8824 b_area_iwa_whacka_80220684 = 0x80220684; // type:data rom:0x4D8874 b_area_iwa_whacka_80220764 = 0x80220764; // type:data rom:0x4D8954 -b_area_iwa_iwa_01_beforeBattle_80220860 = 0x80220860; // type:data rom:0x4D8A50 -b_area_iwa_iwa_01_afterBattle_80220894 = 0x80220894; // type:data rom:0x4D8A84 -b_area_iwa_iwa_01_foregroundModelList_802208A4 = 0x802208A4; // type:data rom:0x4D8A94 +b_area_iwa_iwa_01_EVS_PreBattle = 0x80220860; // type:data rom:0x4D8A50 +b_area_iwa_iwa_01_EVS_PostBattle = 0x80220894; // type:data rom:0x4D8A84 +b_area_iwa_iwa_01_ForegroundModels = 0x802208A4; // type:data rom:0x4D8A94 b_area_iwa_iwa_01 = 0x802208B0; // type:data rom:0x4D8AA0 b_area_iwa_iwa_01_vector3D_802208D8 = 0x802208D8; // type:data rom:0x4D8AC8 b_area_iwa_iwa_01_specialFormation_802208E4 = 0x802208E4; // type:data rom:0x4D8AD4 @@ -10959,13 +10959,13 @@ b_area_iwa_iwa_01_handleEvent_80220B40 = 0x80220B40; // type:data rom:0x4D8D30 b_area_iwa_iwa_01_takeTurn_802212E4 = 0x802212E4; // type:data rom:0x4D94D4 b_area_iwa_iwa_01_80221334 = 0x80221334; // type:data rom:0x4D9524 b_area_iwa_iwa_01_80221414 = 0x80221414; // type:data rom:0x4D9604 -b_area_iwa_iwa_01b_beforeBattle_80221510 = 0x80221510; // type:data rom:0x4D9700 -b_area_iwa_iwa_01b_afterBattle_80221544 = 0x80221544; // type:data rom:0x4D9734 -b_area_iwa_iwa_01b_foregroundModelList_80221554 = 0x80221554; // type:data rom:0x4D9744 +b_area_iwa_iwa_01b_EVS_PreBattle = 0x80221510; // type:data rom:0x4D9700 +b_area_iwa_iwa_01b_EVS_PostBattle = 0x80221544; // type:data rom:0x4D9734 +b_area_iwa_iwa_01b_ForegroundModels = 0x80221554; // type:data rom:0x4D9744 b_area_iwa_iwa_01b = 0x80221560; // type:data rom:0x4D9750 -b_area_iwa_iwa_02_beforeBattle_80221590 = 0x80221590; // type:data rom:0x4D9780 -b_area_iwa_iwa_02_afterBattle_802215B0 = 0x802215B0; // type:data rom:0x4D97A0 -b_area_iwa_iwa_02_foregroundModelList_802215C0 = 0x802215C0; // type:data rom:0x4D97B0 +b_area_iwa_iwa_02_EVS_PreBattle = 0x80221590; // type:data rom:0x4D9780 +b_area_iwa_iwa_02_EVS_PostBattle = 0x802215B0; // type:data rom:0x4D97A0 +b_area_iwa_iwa_02_ForegroundModels = 0x802215C0; // type:data rom:0x4D97B0 b_area_iwa_iwa_02 = 0x802215CC; // type:data rom:0x4D97BC b_area_iwa_iwa_02_D_802215F4_4B17E4 = 0x802215F4; // type:data rom:0x4D97E4 b_area_iwa_iwa_02_specialFormation_whacka = 0x80221600; // type:data rom:0x4D97F0 @@ -10981,7 +10981,7 @@ b_area_iwa_iwa_02_takeTurn_80222000 = 0x80222000; // type:data rom:0x4DA1F0 b_area_iwa_iwa_02_80222050 = 0x80222050; // type:data rom:0x4DA240 b_area_iwa_iwa_02_80222130 = 0x80222130; // type:data rom:0x4DA320 b_area_sbk_pokey_UnkBattleFunc1 = 0x80218000; // type:func rom:0x4DA5E0 -b_area_sbk_sbk_02_UnkFloatFunc3 = 0x802180D0; // type:func rom:0x4DA6B0 +b_area_sbk_sbk_02_UpdateSunPos = 0x802180D0; // type:func rom:0x4DA6B0 b_area_sbk_sbk_02_GetModelPos = 0x80218220; // type:func rom:0x4DA800 b_area_sbk_pokey_defenseTable_80218280 = 0x80218280; // type:data rom:0x4DA860 b_area_sbk_pokey_statusTable_8021828C = 0x8021828C; // type:data rom:0x4DA86C @@ -11028,9 +11028,9 @@ b_area_sbk_bandit_8021D820 = 0x8021D820; // type:data rom:0x4DFE00 b_area_sbk_bandit_handleEvent_8021DF88 = 0x8021DF88; // type:data rom:0x4E0568 b_area_sbk_bandit_takeTurn_8021E900 = 0x8021E900; // type:data rom:0x4E0EE0 b_area_sbk_sbk_02_8021F720 = 0x8021F720; // type:data rom:0x4E1D00 -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_EVS_PreBattle = 0x8021F800; // type:data rom:0x4E1DE0 +b_area_sbk_sbk_02_EVS_PostBattle = 0x8021F8E8; // type:data rom:0x4E1EC8 +b_area_sbk_sbk_02_ForegroundModels = 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 @@ -11138,48 +11138,48 @@ b_area_isk_part_1_stone_chomp_idle_80221D00 = 0x80221D00; // type:data rom:0x4EC b_area_isk_part_1_stone_chomp_80222324 = 0x80222324; // type:data rom:0x4ECA64 b_area_isk_part_1_stone_chomp_handleEvent_80222364 = 0x80222364; // type:data rom:0x4ECAA4 b_area_isk_part_1_stone_chomp_takeTurn_80222ED0 = 0x80222ED0; // type:data rom:0x4ED610 -b_area_isk_part_1_isk_00_beforeBattle_802238B0 = 0x802238B0; // type:data rom:0x4EDFF0 -b_area_isk_part_1_isk_00_afterBattle_802238EC = 0x802238EC; // type:data rom:0x4EE02C +b_area_isk_part_1_isk_00_EVS_PreBattle = 0x802238B0; // type:data rom:0x4EDFF0 +b_area_isk_part_1_isk_00_EVS_PostBattle = 0x802238EC; // type:data rom:0x4EE02C b_area_isk_part_1_isk_00 = 0x802238FC; // type:data rom:0x4EE03C -b_area_isk_part_1_isk_01_beforeBattle_80223930 = 0x80223930; // type:data rom:0x4EE070 -b_area_isk_part_1_isk_01_afterBattle_8022396C = 0x8022396C; // type:data rom:0x4EE0AC +b_area_isk_part_1_isk_01_EVS_PreBattle = 0x80223930; // type:data rom:0x4EE070 +b_area_isk_part_1_isk_01_EVS_PostBattle = 0x8022396C; // type:data rom:0x4EE0AC b_area_isk_part_1_isk_01 = 0x8022397C; // type:data rom:0x4EE0BC -b_area_isk_part_1_isk_02_beforeBattle_802239B0 = 0x802239B0; // type:data rom:0x4EE0F0 -b_area_isk_part_1_isk_02_afterBattle_802239EC = 0x802239EC; // type:data rom:0x4EE12C -b_area_isk_part_1_isk_02_foregroundModelList_802239FC = 0x802239FC; // type:data rom:0x4EE13C +b_area_isk_part_1_isk_02_EVS_PreBattle = 0x802239B0; // type:data rom:0x4EE0F0 +b_area_isk_part_1_isk_02_EVS_PostBattle = 0x802239EC; // type:data rom:0x4EE12C +b_area_isk_part_1_isk_02_ForegroundModels = 0x802239FC; // type:data rom:0x4EE13C b_area_isk_part_1_isk_02 = 0x80223A0C; // type:data rom:0x4EE14C -b_area_isk_part_1_isk_03_beforeBattle_80223A40 = 0x80223A40; // type:data rom:0x4EE180 -b_area_isk_part_1_isk_03_afterBattle_80223A7C = 0x80223A7C; // type:data rom:0x4EE1BC +b_area_isk_part_1_isk_03_EVS_PreBattle = 0x80223A40; // type:data rom:0x4EE180 +b_area_isk_part_1_isk_03_EVS_PostBattle = 0x80223A7C; // type:data rom:0x4EE1BC b_area_isk_part_1_isk_03 = 0x80223A8C; // type:data rom:0x4EE1CC -b_area_isk_part_1_isk_04_beforeBattle_80223AC0 = 0x80223AC0; // type:data rom:0x4EE200 -b_area_isk_part_1_isk_04_afterBattle_80223B08 = 0x80223B08; // type:data rom:0x4EE248 -b_area_isk_part_1_isk_04_foregroundModelList_80223B24 = 0x80223B24; // type:data rom:0x4EE264 +b_area_isk_part_1_isk_04_EVS_PreBattle = 0x80223AC0; // type:data rom:0x4EE200 +b_area_isk_part_1_isk_04_EVS_PostBattle = 0x80223B08; // type:data rom:0x4EE248 +b_area_isk_part_1_isk_04_ForegroundModels = 0x80223B24; // type:data rom:0x4EE264 b_area_isk_part_1_isk_04 = 0x80223B30; // type:data rom:0x4EE270 -b_area_isk_part_1_isk_05_beforeBattle_80223B60 = 0x80223B60; // type:data rom:0x4EE2A0 -b_area_isk_part_1_isk_05_afterBattle_80223BA8 = 0x80223BA8; // type:data rom:0x4EE2E8 +b_area_isk_part_1_isk_05_EVS_PreBattle = 0x80223B60; // type:data rom:0x4EE2A0 +b_area_isk_part_1_isk_05_EVS_PostBattle = 0x80223BA8; // type:data rom:0x4EE2E8 b_area_isk_part_1_isk_05 = 0x80223BC4; // type:data rom:0x4EE304 -b_area_isk_part_1_isk_06_beforeBattle_80223BF0 = 0x80223BF0; // type:data rom:0x4EE330 -b_area_isk_part_1_isk_06_afterBattle_80223C38 = 0x80223C38; // type:data rom:0x4EE378 +b_area_isk_part_1_isk_06_EVS_PreBattle = 0x80223BF0; // type:data rom:0x4EE330 +b_area_isk_part_1_isk_06_EVS_PostBattle = 0x80223C38; // type:data rom:0x4EE378 b_area_isk_part_1_isk_06 = 0x80223C54; // type:data rom:0x4EE394 -b_area_isk_part_1_isk_07_beforeBattle_80223C80 = 0x80223C80; // type:data rom:0x4EE3C0 -b_area_isk_part_1_isk_07_afterBattle_80223CC8 = 0x80223CC8; // type:data rom:0x4EE408 +b_area_isk_part_1_isk_07_EVS_PreBattle = 0x80223C80; // type:data rom:0x4EE3C0 +b_area_isk_part_1_isk_07_EVS_PostBattle = 0x80223CC8; // type:data rom:0x4EE408 b_area_isk_part_1_isk_07 = 0x80223CE4; // type:data rom:0x4EE424 -b_area_isk_part_1_isk_03b_beforeBattle_80223D10 = 0x80223D10; // type:data rom:0x4EE450 -b_area_isk_part_1_isk_03b_afterBattle_80223D4C = 0x80223D4C; // type:data rom:0x4EE48C +b_area_isk_part_1_isk_03b_EVS_PreBattle = 0x80223D10; // type:data rom:0x4EE450 +b_area_isk_part_1_isk_03b_EVS_PostBattle = 0x80223D4C; // type:data rom:0x4EE48C b_area_isk_part_1_isk_03b = 0x80223D5C; // type:data rom:0x4EE49C -b_area_isk_part_1_isk_02b_beforeBattle_80223D90 = 0x80223D90; // type:data rom:0x4EE4D0 -b_area_isk_part_1_isk_02b_afterBattle_80223E44 = 0x80223E44; // type:data rom:0x4EE584 -b_area_isk_part_1_isk_02b_foregroundModelList_80223E54 = 0x80223E54; // type:data rom:0x4EE594 +b_area_isk_part_1_isk_02b_EVS_PreBattle = 0x80223D90; // type:data rom:0x4EE4D0 +b_area_isk_part_1_isk_02b_EVS_PostBattle = 0x80223E44; // type:data rom:0x4EE584 +b_area_isk_part_1_isk_02b_ForegroundModels = 0x80223E54; // type:data rom:0x4EE594 b_area_isk_part_1_isk_02b = 0x80223E64; // type:data rom:0x4EE5A4 -b_area_isk_part_1_isk_02c_beforeBattle_80223E90 = 0x80223E90; // type:data rom:0x4EE5D0 -b_area_isk_part_1_isk_02c_afterBattle_80223EF4 = 0x80223EF4; // type:data rom:0x4EE634 -b_area_isk_part_1_isk_02c_foregroundModelList_80223F04 = 0x80223F04; // type:data rom:0x4EE644 +b_area_isk_part_1_isk_02c_EVS_PreBattle = 0x80223E90; // type:data rom:0x4EE5D0 +b_area_isk_part_1_isk_02c_EVS_PostBattle = 0x80223EF4; // type:data rom:0x4EE634 +b_area_isk_part_1_isk_02c_ForegroundModels = 0x80223F04; // type:data rom:0x4EE644 b_area_isk_part_1_isk_02c = 0x80223F14; // type:data rom:0x4EE654 -b_area_isk_part_1_isk_06b_beforeBattle_80223F40 = 0x80223F40; // type:data rom:0x4EE680 -b_area_isk_part_1_isk_06b_afterBattle_80223F9C = 0x80223F9C; // type:data rom:0x4EE6DC +b_area_isk_part_1_isk_06b_EVS_PreBattle = 0x80223F40; // type:data rom:0x4EE680 +b_area_isk_part_1_isk_06b_EVS_PostBattle = 0x80223F9C; // type:data rom:0x4EE6DC b_area_isk_part_1_isk_06b = 0x80223FB8; // type:data rom:0x4EE6F8 -b_area_isk_part_1_isk_08_beforeBattle_80223FE0 = 0x80223FE0; // type:data rom:0x4EE720 -b_area_isk_part_1_isk_08_afterBattle_80224028 = 0x80224028; // type:data rom:0x4EE768 +b_area_isk_part_1_isk_08_EVS_PreBattle = 0x80223FE0; // type:data rom:0x4EE720 +b_area_isk_part_1_isk_08_EVS_PostBattle = 0x80224028; // type:data rom:0x4EE768 b_area_isk_part_1_isk_08 = 0x80224044; // type:data rom:0x4EE784 b_area_isk_part_1_vector3D_80224070 = 0x80224070; // type:data rom:0x4EE7B0 b_area_isk_part_1_vector3D_8022407C = 0x8022407C; // type:data rom:0x4EE7BC @@ -11293,45 +11293,45 @@ b_area_isk_part_2_tutankoopa_8021F5E8 = 0x8021F5E8; // type:data rom:0x4F6A88 b_area_isk_part_2_tutankoopa_8021F80C = 0x8021F80C; // type:data rom:0x4F6CAC b_area_isk_part_2_tutankoopa_nextTurn_8021F9C4 = 0x8021F9C4; // type:data rom:0x4F6E64 b_area_isk_part_2_tutankoopa_8021FA54 = 0x8021FA54; // type:data rom:0x4F6EF4 -b_area_isk_part_2_isk_00_beforeBattle_8021FCF0 = 0x8021FCF0; // type:data rom:0x4F7190 -b_area_isk_part_2_isk_00_afterBattle_8021FD2C = 0x8021FD2C; // type:data rom:0x4F71CC +b_area_isk_part_2_isk_00_EVS_PreBattle = 0x8021FCF0; // type:data rom:0x4F7190 +b_area_isk_part_2_isk_00_EVS_PostBattle = 0x8021FD2C; // type:data rom:0x4F71CC b_area_isk_part_2_isk_00 = 0x8021FD3C; // type:data rom:0x4F71DC -b_area_isk_part_2_isk_01_beforeBattle_8021FD70 = 0x8021FD70; // type:data rom:0x4F7210 -b_area_isk_part_2_isk_01_afterBattle_8021FDAC = 0x8021FDAC; // type:data rom:0x4F724C +b_area_isk_part_2_isk_01_EVS_PreBattle = 0x8021FD70; // type:data rom:0x4F7210 +b_area_isk_part_2_isk_01_EVS_PostBattle = 0x8021FDAC; // type:data rom:0x4F724C b_area_isk_part_2_isk_01 = 0x8021FDBC; // type:data rom:0x4F725C -b_area_isk_part_2_isk_02_beforeBattle_8021FDF0 = 0x8021FDF0; // type:data rom:0x4F7290 -b_area_isk_part_2_isk_02_afterBattle_8021FE2C = 0x8021FE2C; // type:data rom:0x4F72CC -b_area_isk_part_2_isk_02_foregroundModelList_8021FE3C = 0x8021FE3C; // type:data rom:0x4F72DC +b_area_isk_part_2_isk_02_EVS_PreBattle = 0x8021FDF0; // type:data rom:0x4F7290 +b_area_isk_part_2_isk_02_EVS_PostBattle = 0x8021FE2C; // type:data rom:0x4F72CC +b_area_isk_part_2_isk_02_ForegroundModels = 0x8021FE3C; // type:data rom:0x4F72DC b_area_isk_part_2_isk_02 = 0x8021FE4C; // type:data rom:0x4F72EC -b_area_isk_part_2_isk_02b_beforeBattle_8021FE80 = 0x8021FE80; // type:data rom:0x4F7320 -b_area_isk_part_2_isk_02b_afterBattle_8021FF34 = 0x8021FF34; // type:data rom:0x4F73D4 -b_area_isk_part_2_isk_02b_foregroundModelList_8021FF44 = 0x8021FF44; // type:data rom:0x4F73E4 +b_area_isk_part_2_isk_02b_EVS_PreBattle = 0x8021FE80; // type:data rom:0x4F7320 +b_area_isk_part_2_isk_02b_EVS_PostBattle = 0x8021FF34; // type:data rom:0x4F73D4 +b_area_isk_part_2_isk_02b_ForegroundModels = 0x8021FF44; // type:data rom:0x4F73E4 b_area_isk_part_2_isk_02b = 0x8021FF54; // type:data rom:0x4F73F4 -b_area_isk_part_2_isk_02c_beforeBattle_8021FF80 = 0x8021FF80; // type:data rom:0x4F7420 -b_area_isk_part_2_isk_02c_afterBattle_8021FFE4 = 0x8021FFE4; // type:data rom:0x4F7484 -b_area_isk_part_2_isk_02c_foregroundModelList_8021FFF4 = 0x8021FFF4; // type:data rom:0x4F7494 +b_area_isk_part_2_isk_02c_EVS_PreBattle = 0x8021FF80; // type:data rom:0x4F7420 +b_area_isk_part_2_isk_02c_EVS_PostBattle = 0x8021FFE4; // type:data rom:0x4F7484 +b_area_isk_part_2_isk_02c_ForegroundModels = 0x8021FFF4; // type:data rom:0x4F7494 b_area_isk_part_2_isk_02c = 0x80220004; // type:data rom:0x4F74A4 -b_area_isk_part_2_isk_03_beforeBattle_80220030 = 0x80220030; // type:data rom:0x4F74D0 -b_area_isk_part_2_isk_03_afterBattle_8022006C = 0x8022006C; // type:data rom:0x4F750C +b_area_isk_part_2_isk_03_EVS_PreBattle = 0x80220030; // type:data rom:0x4F74D0 +b_area_isk_part_2_isk_03_EVS_PostBattle = 0x8022006C; // type:data rom:0x4F750C b_area_isk_part_2_isk_03 = 0x8022007C; // type:data rom:0x4F751C -b_area_isk_part_2_isk_03b_beforeBattle_802200B0 = 0x802200B0; // type:data rom:0x4F7550 -b_area_isk_part_2_isk_03b_afterBattle_802200EC = 0x802200EC; // type:data rom:0x4F758C +b_area_isk_part_2_isk_03b_EVS_PreBattle = 0x802200B0; // type:data rom:0x4F7550 +b_area_isk_part_2_isk_03b_EVS_PostBattle = 0x802200EC; // type:data rom:0x4F758C b_area_isk_part_2_isk_03b = 0x802200FC; // type:data rom:0x4F759C -b_area_isk_part_2_isk_04_beforeBattle_80220130 = 0x80220130; // type:data rom:0x4F75D0 -b_area_isk_part_2_isk_04_afterBattle_80220178 = 0x80220178; // type:data rom:0x4F7618 -b_area_isk_part_2_isk_04_foregroundModelList_80220194 = 0x80220194; // type:data rom:0x4F7634 +b_area_isk_part_2_isk_04_EVS_PreBattle = 0x80220130; // type:data rom:0x4F75D0 +b_area_isk_part_2_isk_04_EVS_PostBattle = 0x80220178; // type:data rom:0x4F7618 +b_area_isk_part_2_isk_04_ForegroundModels = 0x80220194; // type:data rom:0x4F7634 b_area_isk_part_2_isk_04 = 0x802201A0; // type:data rom:0x4F7640 -b_area_isk_part_2_isk_05_beforeBattle_802201D0 = 0x802201D0; // type:data rom:0x4F7670 -b_area_isk_part_2_isk_05_afterBattle_80220218 = 0x80220218; // type:data rom:0x4F76B8 +b_area_isk_part_2_isk_05_EVS_PreBattle = 0x802201D0; // type:data rom:0x4F7670 +b_area_isk_part_2_isk_05_EVS_PostBattle = 0x80220218; // type:data rom:0x4F76B8 b_area_isk_part_2_isk_05 = 0x80220234; // type:data rom:0x4F76D4 -b_area_isk_part_2_isk_06_beforeBattle_80220260 = 0x80220260; // type:data rom:0x4F7700 -b_area_isk_part_2_isk_06_afterBattle_802202A8 = 0x802202A8; // type:data rom:0x4F7748 +b_area_isk_part_2_isk_06_EVS_PreBattle = 0x80220260; // type:data rom:0x4F7700 +b_area_isk_part_2_isk_06_EVS_PostBattle = 0x802202A8; // type:data rom:0x4F7748 b_area_isk_part_2_isk_06 = 0x802202C4; // type:data rom:0x4F7764 -b_area_isk_part_2_isk_06b_beforeBattle_802202F0 = 0x802202F0; // type:data rom:0x4F7790 -b_area_isk_part_2_isk_06b_afterBattle_8022034C = 0x8022034C; // type:data rom:0x4F77EC +b_area_isk_part_2_isk_06b_EVS_PreBattle = 0x802202F0; // type:data rom:0x4F7790 +b_area_isk_part_2_isk_06b_EVS_PostBattle = 0x8022034C; // type:data rom:0x4F77EC b_area_isk_part_2_isk_06b = 0x80220368; // type:data rom:0x4F7808 -b_area_isk_part_2_isk_07_beforeBattle_80220390 = 0x80220390; // type:data rom:0x4F7830 -b_area_isk_part_2_isk_07_afterBattle_802203D8 = 0x802203D8; // type:data rom:0x4F7878 +b_area_isk_part_2_isk_07_EVS_PreBattle = 0x80220390; // type:data rom:0x4F7830 +b_area_isk_part_2_isk_07_EVS_PostBattle = 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 @@ -11389,8 +11389,8 @@ b_area_mim_piranha_plant_idle_8021D4E4 = 0x8021D4E4; // type:data rom:0x4FD0C4 b_area_mim_piranha_plant_8021D4F4 = 0x8021D4F4; // type:data rom:0x4FD0D4 b_area_mim_piranha_plant_handleEvent_8021D60C = 0x8021D60C; // type:data rom:0x4FD1EC b_area_mim_piranha_plant_takeTurn_8021DCD4 = 0x8021DCD4; // type:data rom:0x4FD8B4 -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_EVS_PreBattle = 0x8021E450; // type:data rom:0x4FE030 +b_area_mim_mim_01_EVS_PostBattle = 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 @@ -11521,30 +11521,30 @@ b_area_arn_tubba_blubba_takeTurn_802264AC = 0x802264AC; // type:data rom:0x50CEF b_area_arn_tubba_blubba_80226558 = 0x80226558; // type:data rom:0x50CFA8 b_area_arn_tubba_blubba_80226B88 = 0x80226B88; // type:data rom:0x50D5D8 b_area_arn_tubba_blubba_80227878 = 0x80227878; // type:data rom:0x50E2C8 -b_area_arn_arn_01_beforeBattle_802278F0 = 0x802278F0; // type:data rom:0x50E340 -b_area_arn_arn_01_afterBattle_80227910 = 0x80227910; // type:data rom:0x50E360 -b_area_arn_arn_01_foregroundModelList_80227920 = 0x80227920; // type:data rom:0x50E370 +b_area_arn_arn_01_EVS_PreBattle = 0x802278F0; // type:data rom:0x50E340 +b_area_arn_arn_01_EVS_PostBattle = 0x80227910; // type:data rom:0x50E360 +b_area_arn_arn_01_ForegroundModels = 0x80227920; // type:data rom:0x50E370 b_area_arn_arn_01 = 0x8022792C; // type:data rom:0x50E37C b_area_arn_arn_02_80227960 = 0x80227960; // type:data rom:0x50E3B0 -b_area_arn_arn_02_beforeBattle_80227A0C = 0x80227A0C; // type:data rom:0x50E45C -b_area_arn_arn_02_afterBattle_80227A48 = 0x80227A48; // type:data rom:0x50E498 -b_area_arn_arn_02_foregroundModelList_80227A58 = 0x80227A58; // type:data rom:0x50E4A8 +b_area_arn_arn_02_EVS_PreBattle = 0x80227A0C; // type:data rom:0x50E45C +b_area_arn_arn_02_EVS_PostBattle = 0x80227A48; // type:data rom:0x50E498 +b_area_arn_arn_02_ForegroundModels = 0x80227A58; // type:data rom:0x50E4A8 b_area_arn_arn_02 = 0x80227A64; // type:data rom:0x50E4B4 -b_area_arn_arn_03_beforeBattle_80227A90 = 0x80227A90; // type:data rom:0x50E4E0 -b_area_arn_arn_03_afterBattle_80227AB0 = 0x80227AB0; // type:data rom:0x50E500 -b_area_arn_arn_03_foregroundModelList_80227AC0 = 0x80227AC0; // type:data rom:0x50E510 +b_area_arn_arn_03_EVS_PreBattle = 0x80227A90; // type:data rom:0x50E4E0 +b_area_arn_arn_03_EVS_PostBattle = 0x80227AB0; // type:data rom:0x50E500 +b_area_arn_arn_03_ForegroundModels = 0x80227AC0; // type:data rom:0x50E510 b_area_arn_arn_03 = 0x80227ACC; // type:data rom:0x50E51C -b_area_arn_arn_04_beforeBattle_80227B00 = 0x80227B00; // type:data rom:0x50E550 -b_area_arn_arn_04_afterBattle_80227B3C = 0x80227B3C; // type:data rom:0x50E58C -b_area_arn_arn_04_foregroundModelList_80227B4C = 0x80227B4C; // type:data rom:0x50E59C +b_area_arn_arn_04_EVS_PreBattle = 0x80227B00; // type:data rom:0x50E550 +b_area_arn_arn_04_EVS_PostBattle = 0x80227B3C; // type:data rom:0x50E58C +b_area_arn_arn_04_ForegroundModels = 0x80227B4C; // type:data rom:0x50E59C b_area_arn_arn_04 = 0x80227B54; // type:data rom:0x50E5A4 -b_area_arn_arn_05_beforeBattle_80227B80 = 0x80227B80; // type:data rom:0x50E5D0 -b_area_arn_arn_05_afterBattle_80227BBC = 0x80227BBC; // type:data rom:0x50E60C -b_area_arn_arn_05_foregroundModelList_80227BCC = 0x80227BCC; // type:data rom:0x50E61C +b_area_arn_arn_05_EVS_PreBattle = 0x80227B80; // type:data rom:0x50E5D0 +b_area_arn_arn_05_EVS_PostBattle = 0x80227BBC; // type:data rom:0x50E60C +b_area_arn_arn_05_ForegroundModels = 0x80227BCC; // type:data rom:0x50E61C b_area_arn_arn_05 = 0x80227BD4; // type:data rom:0x50E624 -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_EVS_PreBattle = 0x80227C00; // type:data rom:0x50E650 +b_area_arn_arn_06_EVS_PostBattle = 0x80227C20; // type:data rom:0x50E670 +b_area_arn_arn_06_ForegroundModels = 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 @@ -11591,21 +11591,21 @@ b_area_dgb_tubba_blubba_handleEvent_80219338 = 0x80219338; // type:data rom:0x51 b_area_dgb_tubba_blubba_takeTurn_80219750 = 0x80219750; // type:data rom:0x510770 b_area_dgb_tubba_blubba_80219D88 = 0x80219D88; // type:data rom:0x510DA8 b_area_dgb_tubba_blubba_8021A36C = 0x8021A36C; // type:data rom:0x51138C -b_area_dgb_dgb_01_beforeBattle_8021B050 = 0x8021B050; // type:data rom:0x512070 -b_area_dgb_dgb_01_afterBattle_8021B070 = 0x8021B070; // type:data rom:0x512090 +b_area_dgb_dgb_01_EVS_PreBattle = 0x8021B050; // type:data rom:0x512070 +b_area_dgb_dgb_01_EVS_PostBattle = 0x8021B070; // type:data rom:0x512090 b_area_dgb_dgb_01 = 0x8021B080; // type:data rom:0x5120A0 -b_area_dgb_dgb_02_beforeBattle_8021B0B0 = 0x8021B0B0; // type:data rom:0x5120D0 -b_area_dgb_dgb_02_afterBattle_8021B0D0 = 0x8021B0D0; // type:data rom:0x5120F0 +b_area_dgb_dgb_02_EVS_PreBattle = 0x8021B0B0; // type:data rom:0x5120D0 +b_area_dgb_dgb_02_EVS_PostBattle = 0x8021B0D0; // type:data rom:0x5120F0 b_area_dgb_dgb_02 = 0x8021B0E0; // type:data rom:0x512100 -b_area_dgb_dgb_03_beforeBattle_8021B110 = 0x8021B110; // type:data rom:0x512130 -b_area_dgb_dgb_03_afterBattle_8021B130 = 0x8021B130; // type:data rom:0x512150 +b_area_dgb_dgb_03_EVS_PreBattle = 0x8021B110; // type:data rom:0x512130 +b_area_dgb_dgb_03_EVS_PostBattle = 0x8021B130; // type:data rom:0x512150 b_area_dgb_dgb_03 = 0x8021B140; // type:data rom:0x512160 -b_area_dgb_dgb_04_beforeBattle_8021B170 = 0x8021B170; // type:data rom:0x512190 -b_area_dgb_dgb_04_afterBattle_8021B190 = 0x8021B190; // type:data rom:0x5121B0 -b_area_dgb_dgb_04_foregroundModelList_8021B1A0 = 0x8021B1A0; // type:data rom:0x5121C0 +b_area_dgb_dgb_04_EVS_PreBattle = 0x8021B170; // type:data rom:0x512190 +b_area_dgb_dgb_04_EVS_PostBattle = 0x8021B190; // type:data rom:0x5121B0 +b_area_dgb_dgb_04_ForegroundModels = 0x8021B1A0; // type:data rom:0x5121C0 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_EVS_PreBattle = 0x8021B1D0; // type:data rom:0x5121F0 +b_area_dgb_dgb_05_EVS_PostBattle = 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 @@ -11803,21 +11803,21 @@ b_area_omo_pyro_guy_handleEvent_8022CE60 = 0x8022CE60; // type:data rom:0x527430 b_area_omo_pyro_guy_takeTurn_8022D344 = 0x8022D344; // type:data rom:0x527914 D_8022DA30_528000 = 0x8022DA30; // type:data rom:0x528000 b_area_omo_omo_01_8022DA34 = 0x8022DA34; // type:data rom:0x528004 -b_area_omo_omo_01_beforeBattle_8022DA50 = 0x8022DA50; // type:data rom:0x528020 -b_area_omo_omo_01_afterBattle_8022DB68 = 0x8022DB68; // type:data rom:0x528138 +b_area_omo_omo_01_EVS_PreBattle = 0x8022DA50; // type:data rom:0x528020 +b_area_omo_omo_01_EVS_PostBattle = 0x8022DB68; // type:data rom:0x528138 b_area_omo_omo_01 = 0x8022DB78; // type:data rom:0x528148 -b_area_omo_omo_02_beforeBattle_8022DBA0 = 0x8022DBA0; // type:data rom:0x528170 -b_area_omo_omo_02_afterBattle_8022DBDC = 0x8022DBDC; // type:data rom:0x5281AC +b_area_omo_omo_02_EVS_PreBattle = 0x8022DBA0; // type:data rom:0x528170 +b_area_omo_omo_02_EVS_PostBattle = 0x8022DBDC; // type:data rom:0x5281AC b_area_omo_omo_02 = 0x8022DBEC; // type:data rom:0x5281BC -b_area_omo_omo_03_beforeBattle_8022DC20 = 0x8022DC20; // type:data rom:0x5281F0 -b_area_omo_omo_03_afterBattle_8022DC70 = 0x8022DC70; // type:data rom:0x528240 +b_area_omo_omo_03_EVS_PreBattle = 0x8022DC20; // type:data rom:0x5281F0 +b_area_omo_omo_03_EVS_PostBattle = 0x8022DC70; // type:data rom:0x528240 b_area_omo_omo_03 = 0x8022DC80; // type:data rom:0x528250 -b_area_omo_omo_03b_beforeBattle_8022DCB0 = 0x8022DCB0; // type:data rom:0x528280 -b_area_omo_omo_03b_afterBattle_8022DCEC = 0x8022DCEC; // type:data rom:0x5282BC +b_area_omo_omo_03b_EVS_PreBattle = 0x8022DCB0; // type:data rom:0x528280 +b_area_omo_omo_03b_EVS_PostBattle = 0x8022DCEC; // type:data rom:0x5282BC b_area_omo_omo_03b = 0x8022DCFC; // type:data rom:0x5282CC -b_area_omo_omo_04_beforeBattle_8022DD30 = 0x8022DD30; // type:data rom:0x528300 -b_area_omo_omo_04_afterBattle_8022DDEC = 0x8022DDEC; // type:data rom:0x5283BC -b_area_omo_omo_04_foregroundModelList_8022DDFC = 0x8022DDFC; // type:data rom:0x5283CC +b_area_omo_omo_04_EVS_PreBattle = 0x8022DD30; // type:data rom:0x528300 +b_area_omo_omo_04_EVS_PostBattle = 0x8022DDEC; // type:data rom:0x5283BC +b_area_omo_omo_04_ForegroundModels = 0x8022DDFC; // type:data rom:0x5283CC b_area_omo_omo_04 = 0x8022DE0C; // type:data rom:0x5283DC b_area_omo_omo_04_vector3D_8022DE34 = 0x8022DE34; // type:data rom:0x528404 b_area_omo_omo_04_vector3D_8022DE40 = 0x8022DE40; // type:data rom:0x528410 @@ -11836,21 +11836,21 @@ b_area_omo_omo_04_init_8022E060 = 0x8022E060; // type:data rom:0x528630 b_area_omo_omo_04_idle_8022E1F8 = 0x8022E1F8; // type:data rom:0x5287C8 b_area_omo_omo_04_handleEvent_8022ED54 = 0x8022ED54; // type:data rom:0x529324 b_area_omo_omo_04_takeTurn_8022F4A8 = 0x8022F4A8; // type:data rom:0x529A78 -b_area_omo_omo_05_beforeBattle_8022F4D0 = 0x8022F4D0; // type:data rom:0x529AA0 -b_area_omo_omo_05_afterBattle_8022F534 = 0x8022F534; // type:data rom:0x529B04 -b_area_omo_omo_05_foregroundModelList_8022F544 = 0x8022F544; // type:data rom:0x529B14 +b_area_omo_omo_05_EVS_PreBattle = 0x8022F4D0; // type:data rom:0x529AA0 +b_area_omo_omo_05_EVS_PostBattle = 0x8022F534; // type:data rom:0x529B04 +b_area_omo_omo_05_ForegroundModels = 0x8022F544; // type:data rom:0x529B14 b_area_omo_omo_05 = 0x8022F550; // type:data rom:0x529B20 -b_area_omo_omo_05b_beforeBattle_8022F580 = 0x8022F580; // type:data rom:0x529B50 -b_area_omo_omo_05b_afterBattle_8022F5E4 = 0x8022F5E4; // type:data rom:0x529BB4 -b_area_omo_omo_05b_foregroundModelList_8022F5F4 = 0x8022F5F4; // type:data rom:0x529BC4 +b_area_omo_omo_05b_EVS_PreBattle = 0x8022F580; // type:data rom:0x529B50 +b_area_omo_omo_05b_EVS_PostBattle = 0x8022F5E4; // type:data rom:0x529BB4 +b_area_omo_omo_05b_ForegroundModels = 0x8022F5F4; // type:data rom:0x529BC4 b_area_omo_omo_05b = 0x8022F5FC; // type:data rom:0x529BCC b_area_omo_omo_06_8022F630 = 0x8022F630; // type:data rom:0x529C00 -b_area_omo_omo_06_beforeBattle_8022F790 = 0x8022F790; // type:data rom:0x529D60 -b_area_omo_omo_06_afterBattle_8022F860 = 0x8022F860; // type:data rom:0x529E30 -b_area_omo_omo_06_foregroundModelList_8022F870 = 0x8022F870; // type:data rom:0x529E40 +b_area_omo_omo_06_EVS_PreBattle = 0x8022F790; // type:data rom:0x529D60 +b_area_omo_omo_06_EVS_PostBattle = 0x8022F860; // type:data rom:0x529E30 +b_area_omo_omo_06_ForegroundModels = 0x8022F870; // type:data rom:0x529E40 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_EVS_PreBattle = 0x8022F8B0; // type:data rom:0x529E80 +b_area_omo_omo_07_EVS_PostBattle = 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 @@ -11993,8 +11993,8 @@ b_area_omo2_light_bulb_takeTurn = 0x8022F9C8; // type:data rom:0x543068 b_area_omo2_light_bulb_onHit = 0x8022F9D8; // type:data rom:0x543078 b_area_omo2_light_bulb_shake_tank = 0x8022F9F4; // type:data rom:0x543094 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_EVS_PreBattle = 0x8022FB20; // type:data rom:0x5431C0 +b_area_omo2_omo_07_EVS_PostBattle = 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_Formations = 0x8022FBF4; // type:data rom:0x543294 @@ -12175,9 +12175,9 @@ b_area_kgr_kgr_01_8021C9C0 = 0x8021C9C0; // type:data rom:0x572C60 b_area_kgr_kgr_01_intTable_8021CD64 = 0x8021CD64; // type:data rom:0x573004 b_area_kgr_kgr_01_8021CDA4 = 0x8021CDA4; // type:data rom:0x573044 b_area_kgr_kgr_01_8021D010 = 0x8021D010; // type:data rom:0x5732B0 -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_EVS_PreBattle = 0x8021D3B4; // type:data rom:0x573654 +b_area_kgr_kgr_01_EVS_PostBattle = 0x8021D598; // type:data rom:0x573838 +b_area_kgr_kgr_01_ForegroundModels = 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_Formations = 0x8021D5FC; // type:data rom:0x57389C @@ -12292,40 +12292,40 @@ b_area_jan_spike_top_spikeTop_TakeTurn_Ceiling = 0x80225624; // type:data rom:0x b_area_jan_spike_top_spikeTop_TakeTurn_Floor = 0x802260DC; // type:data rom:0x5819FC b_area_jan_jan_00_80226B00 = 0x80226B00; // type:data rom:0x582420 b_area_jan_jan_00_80226C18 = 0x80226C18; // type:data rom:0x582538 -b_area_jan_jan_00_beforeBattle_802271C4 = 0x802271C4; // type:data rom:0x582AE4 -b_area_jan_jan_00_afterBattle_80227298 = 0x80227298; // type:data rom:0x582BB8 +b_area_jan_jan_00_EVS_PreBattle = 0x802271C4; // type:data rom:0x582AE4 +b_area_jan_jan_00_EVS_PostBattle = 0x80227298; // type:data rom:0x582BB8 b_area_jan_jan_00 = 0x802272A8; // type:data rom:0x582BC8 b_area_jan_jan_01_802272D0 = 0x802272D0; // type:data rom:0x582BF0 b_area_jan_jan_01_802273E8 = 0x802273E8; // type:data rom:0x582D08 -b_area_jan_jan_01_beforeBattle_80227994 = 0x80227994; // type:data rom:0x5832B4 -b_area_jan_jan_01_afterBattle_80227A6C = 0x80227A6C; // type:data rom:0x58338C -b_area_jan_jan_01_foregroundModelList_80227A7C = 0x80227A7C; // type:data rom:0x58339C +b_area_jan_jan_01_EVS_PreBattle = 0x80227994; // type:data rom:0x5832B4 +b_area_jan_jan_01_EVS_PostBattle = 0x80227A6C; // type:data rom:0x58338C +b_area_jan_jan_01_ForegroundModels = 0x80227A7C; // type:data rom:0x58339C b_area_jan_jan_01 = 0x80227A84; // type:data rom:0x5833A4 b_area_jan_jan_01b_80227AB0 = 0x80227AB0; // type:data rom:0x5833D0 b_area_jan_jan_01b_80227BC8 = 0x80227BC8; // type:data rom:0x5834E8 -b_area_jan_jan_01b_beforeBattle_80228174 = 0x80228174; // type:data rom:0x583A94 -b_area_jan_jan_01b_afterBattle_8022824C = 0x8022824C; // type:data rom:0x583B6C -b_area_jan_jan_01b_foregroundModelList_8022825C = 0x8022825C; // type:data rom:0x583B7C +b_area_jan_jan_01b_EVS_PreBattle = 0x80228174; // type:data rom:0x583A94 +b_area_jan_jan_01b_EVS_PostBattle = 0x8022824C; // type:data rom:0x583B6C +b_area_jan_jan_01b_ForegroundModels = 0x8022825C; // type:data rom:0x583B7C b_area_jan_jan_01b = 0x80228264; // type:data rom:0x583B84 -b_area_jan_jan_02_beforeBattle_80228290 = 0x80228290; // type:data rom:0x583BB0 -b_area_jan_jan_02_afterBattle_802282CC = 0x802282CC; // type:data rom:0x583BEC -b_area_jan_jan_02_foregroundModelList_802282DC = 0x802282DC; // type:data rom:0x583BFC +b_area_jan_jan_02_EVS_PreBattle = 0x80228290; // type:data rom:0x583BB0 +b_area_jan_jan_02_EVS_PostBattle = 0x802282CC; // type:data rom:0x583BEC +b_area_jan_jan_02_ForegroundModels = 0x802282DC; // type:data rom:0x583BFC b_area_jan_jan_02 = 0x802282EC; // type:data rom:0x583C0C -b_area_jan_jan_03_beforeBattle_80228320 = 0x80228320; // type:data rom:0x583C40 -b_area_jan_jan_03_afterBattle_80228370 = 0x80228370; // type:data rom:0x583C90 -b_area_jan_jan_03_foregroundModelList_80228380 = 0x80228380; // type:data rom:0x583CA0 +b_area_jan_jan_03_EVS_PreBattle = 0x80228320; // type:data rom:0x583C40 +b_area_jan_jan_03_EVS_PostBattle = 0x80228370; // type:data rom:0x583C90 +b_area_jan_jan_03_ForegroundModels = 0x80228380; // type:data rom:0x583CA0 b_area_jan_jan_03 = 0x80228390; // type:data rom:0x583CB0 -b_area_jan_jan_03b_beforeBattle_802283C0 = 0x802283C0; // type:data rom:0x583CE0 -b_area_jan_jan_03b_afterBattle_80228410 = 0x80228410; // type:data rom:0x583D30 -b_area_jan_jan_03b_foregroundModelList_80228420 = 0x80228420; // type:data rom:0x583D40 +b_area_jan_jan_03b_EVS_PreBattle = 0x802283C0; // type:data rom:0x583CE0 +b_area_jan_jan_03b_EVS_PostBattle = 0x80228410; // type:data rom:0x583D30 +b_area_jan_jan_03b_ForegroundModels = 0x80228420; // type:data rom:0x583D40 b_area_jan_jan_03b = 0x80228430; // type:data rom:0x583D50 -b_area_jan_jan_04_beforeBattle_80228460 = 0x80228460; // type:data rom:0x583D80 -b_area_jan_jan_04_afterBattle_802284B0 = 0x802284B0; // type:data rom:0x583DD0 -b_area_jan_jan_04_foregroundModelList_802284C0 = 0x802284C0; // type:data rom:0x583DE0 +b_area_jan_jan_04_EVS_PreBattle = 0x80228460; // type:data rom:0x583D80 +b_area_jan_jan_04_EVS_PostBattle = 0x802284B0; // type:data rom:0x583DD0 +b_area_jan_jan_04_ForegroundModels = 0x802284C0; // type:data rom:0x583DE0 b_area_jan_jan_04 = 0x802284C8; // type:data rom:0x583DE8 -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_EVS_PreBattle = 0x802284F0; // type:data rom:0x583E10 +b_area_jan_jan_04b_EVS_PostBattle = 0x80228540; // type:data rom:0x583E60 +b_area_jan_jan_04b_ForegroundModels = 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 @@ -12393,40 +12393,40 @@ b_area_jan2_white_magikoopa_healAll = 0x8021D1CC; // type:data rom:0x589B0C b_area_jan2_white_magikoopa_takeTurn_802274E4 = 0x8021D894; // type:data rom:0x58A1D4 b_area_jan2_jan_00_8021DB30 = 0x8021DB30; // type:data rom:0x58A470 b_area_jan2_jan_00_8021DC48 = 0x8021DC48; // type:data rom:0x58A588 -b_area_jan2_jan_00_beforeBattle_8021E1F4 = 0x8021E1F4; // type:data rom:0x58AB34 -b_area_jan2_jan_00_afterBattle_8021E2C8 = 0x8021E2C8; // type:data rom:0x58AC08 +b_area_jan2_jan_00_EVS_PreBattle = 0x8021E1F4; // type:data rom:0x58AB34 +b_area_jan2_jan_00_EVS_PostBattle = 0x8021E2C8; // type:data rom:0x58AC08 b_area_jan2_jan_00 = 0x8021E2D8; // type:data rom:0x58AC18 b_area_jan2_jan_01_8021E300 = 0x8021E300; // type:data rom:0x58AC40 b_area_jan2_jan_01_8021E418 = 0x8021E418; // type:data rom:0x58AD58 -b_area_jan2_jan_01_beforeBattle_8021E9C4 = 0x8021E9C4; // type:data rom:0x58B304 -b_area_jan2_jan_01_afterBattle_8021EA9C = 0x8021EA9C; // type:data rom:0x58B3DC -b_area_jan2_jan_01_foregroundModelList_8021EAAC = 0x8021EAAC; // type:data rom:0x58B3EC +b_area_jan2_jan_01_EVS_PreBattle = 0x8021E9C4; // type:data rom:0x58B304 +b_area_jan2_jan_01_EVS_PostBattle = 0x8021EA9C; // type:data rom:0x58B3DC +b_area_jan2_jan_01_ForegroundModels = 0x8021EAAC; // type:data rom:0x58B3EC b_area_jan2_jan_01 = 0x8021EAB4; // type:data rom:0x58B3F4 b_area_jan2_jan_01b_8021EAE0 = 0x8021EAE0; // type:data rom:0x58B420 b_area_jan2_jan_01b_8021EBF8 = 0x8021EBF8; // type:data rom:0x58B538 -b_area_jan2_jan_01b_beforeBattle_8021F1A4 = 0x8021F1A4; // type:data rom:0x58BAE4 -b_area_jan2_jan_01b_afterBattle_8021F27C = 0x8021F27C; // type:data rom:0x58BBBC -b_area_jan2_jan_01b_foregroundModelList_8021F28C = 0x8021F28C; // type:data rom:0x58BBCC +b_area_jan2_jan_01b_EVS_PreBattle = 0x8021F1A4; // type:data rom:0x58BAE4 +b_area_jan2_jan_01b_EVS_PostBattle = 0x8021F27C; // type:data rom:0x58BBBC +b_area_jan2_jan_01b_ForegroundModels = 0x8021F28C; // type:data rom:0x58BBCC b_area_jan2_jan_01b = 0x8021F294; // type:data rom:0x58BBD4 -b_area_jan2_jan_02_beforeBattle_8021F2C0 = 0x8021F2C0; // type:data rom:0x58BC00 -b_area_jan2_jan_02_afterBattle_8021F2FC = 0x8021F2FC; // type:data rom:0x58BC3C -b_area_jan2_jan_02_foregroundModelList_8021F30C = 0x8021F30C; // type:data rom:0x58BC4C +b_area_jan2_jan_02_EVS_PreBattle = 0x8021F2C0; // type:data rom:0x58BC00 +b_area_jan2_jan_02_EVS_PostBattle = 0x8021F2FC; // type:data rom:0x58BC3C +b_area_jan2_jan_02_ForegroundModels = 0x8021F30C; // type:data rom:0x58BC4C b_area_jan2_jan_02 = 0x8021F31C; // type:data rom:0x58BC5C -b_area_jan2_jan_03_beforeBattle_8021F350 = 0x8021F350; // type:data rom:0x58BC90 -b_area_jan2_jan_03_afterBattle_8021F3A0 = 0x8021F3A0; // type:data rom:0x58BCE0 -b_area_jan2_jan_03_foregroundModelList_8021F3B0 = 0x8021F3B0; // type:data rom:0x58BCF0 +b_area_jan2_jan_03_EVS_PreBattle = 0x8021F350; // type:data rom:0x58BC90 +b_area_jan2_jan_03_EVS_PostBattle = 0x8021F3A0; // type:data rom:0x58BCE0 +b_area_jan2_jan_03_ForegroundModels = 0x8021F3B0; // type:data rom:0x58BCF0 b_area_jan2_jan_03 = 0x8021F3C0; // type:data rom:0x58BD00 -b_area_jan2_jan_03b_beforeBattle_8021F3F0 = 0x8021F3F0; // type:data rom:0x58BD30 -b_area_jan2_jan_03b_afterBattle_8021F440 = 0x8021F440; // type:data rom:0x58BD80 -b_area_jan2_jan_03b_foregroundModelList_8021F450 = 0x8021F450; // type:data rom:0x58BD90 +b_area_jan2_jan_03b_EVS_PreBattle = 0x8021F3F0; // type:data rom:0x58BD30 +b_area_jan2_jan_03b_EVS_PostBattle = 0x8021F440; // type:data rom:0x58BD80 +b_area_jan2_jan_03b_ForegroundModels = 0x8021F450; // type:data rom:0x58BD90 b_area_jan2_jan_03b = 0x8021F460; // type:data rom:0x58BDA0 -b_area_jan2_jan_04_beforeBattle_8021F490 = 0x8021F490; // type:data rom:0x58BDD0 -b_area_jan2_jan_04_afterBattle_8021F4E0 = 0x8021F4E0; // type:data rom:0x58BE20 -b_area_jan2_jan_04_foregroundModelList_8021F4F0 = 0x8021F4F0; // type:data rom:0x58BE30 +b_area_jan2_jan_04_EVS_PreBattle = 0x8021F490; // type:data rom:0x58BDD0 +b_area_jan2_jan_04_EVS_PostBattle = 0x8021F4E0; // type:data rom:0x58BE20 +b_area_jan2_jan_04_ForegroundModels = 0x8021F4F0; // type:data rom:0x58BE30 b_area_jan2_jan_04 = 0x8021F4F8; // type:data rom:0x58BE38 -b_area_jan2_jan_04b_beforeBattle_8021F520 = 0x8021F520; // type:data rom:0x58BE60 -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_EVS_PreBattle = 0x8021F520; // type:data rom:0x58BE60 +b_area_jan2_jan_04b_EVS_PostBattle = 0x8021F570; // type:data rom:0x58BEB0 +b_area_jan2_jan_04b_ForegroundModels = 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 @@ -12556,47 +12556,47 @@ b_area_kzn_white_magikoopa_init_80225FBC = 0x80225FBC; // type:data rom:0x59A2AC b_area_kzn_white_magikoopa_healOne = 0x80226020; // type:data rom:0x59A310 b_area_kzn_white_magikoopa_healAll = 0x80226E1C; // type:data rom:0x59B10C b_area_kzn_white_magikoopa_takeTurn_802274E4 = 0x802274E4; // type:data rom:0x59B7D4 -b_area_kzn_kzn_01_beforeBattle_80227780 = 0x80227780; // type:data rom:0x59BA70 -b_area_kzn_kzn_01_afterBattle_802277D0 = 0x802277D0; // type:data rom:0x59BAC0 -b_area_kzn_kzn_01_foregroundModelList_802277E0 = 0x802277E0; // type:data rom:0x59BAD0 +b_area_kzn_kzn_01_EVS_PreBattle = 0x80227780; // type:data rom:0x59BA70 +b_area_kzn_kzn_01_EVS_PostBattle = 0x802277D0; // type:data rom:0x59BAC0 +b_area_kzn_kzn_01_ForegroundModels = 0x802277E0; // type:data rom:0x59BAD0 b_area_kzn_kzn_01 = 0x802277F8; // type:data rom:0x59BAE8 -b_area_kzn_kzn_01b_beforeBattle_80227820 = 0x80227820; // type:data rom:0x59BB10 -b_area_kzn_kzn_01b_afterBattle_8022785C = 0x8022785C; // type:data rom:0x59BB4C -b_area_kzn_kzn_01b_foregroundModelList_8022786C = 0x8022786C; // type:data rom:0x59BB5C +b_area_kzn_kzn_01b_EVS_PreBattle = 0x80227820; // type:data rom:0x59BB10 +b_area_kzn_kzn_01b_EVS_PostBattle = 0x8022785C; // type:data rom:0x59BB4C +b_area_kzn_kzn_01b_ForegroundModels = 0x8022786C; // type:data rom:0x59BB5C b_area_kzn_kzn_01b = 0x80227884; // type:data rom:0x59BB74 b_area_kzn_kzn_02_802278B0 = 0x802278B0; // type:data rom:0x59BBA0 b_area_kzn_kzn_02_8022797C = 0x8022797C; // type:data rom:0x59BC6C b_area_kzn_kzn_02_80227A2C = 0x80227A2C; // type:data rom:0x59BD1C -b_area_kzn_kzn_02_beforeBattle_80227BDC = 0x80227BDC; // type:data rom:0x59BECC -b_area_kzn_kzn_02_afterBattle_80227D98 = 0x80227D98; // type:data rom:0x59C088 -b_area_kzn_kzn_02_foregroundModelList_80227DA8 = 0x80227DA8; // type:data rom:0x59C098 +b_area_kzn_kzn_02_EVS_PreBattle = 0x80227BDC; // type:data rom:0x59BECC +b_area_kzn_kzn_02_EVS_PostBattle = 0x80227D98; // type:data rom:0x59C088 +b_area_kzn_kzn_02_ForegroundModels = 0x80227DA8; // type:data rom:0x59C098 b_area_kzn_kzn_02 = 0x80227DB8; // type:data rom:0x59C0A8 b_area_kzn_kzn_04_80227DE0 = 0x80227DE0; // type:data rom:0x59C0D0 b_area_kzn_kzn_04_80227EAC = 0x80227EAC; // type:data rom:0x59C19C b_area_kzn_kzn_04_80227F5C = 0x80227F5C; // type:data rom:0x59C24C -b_area_kzn_kzn_04_beforeBattle_8022810C = 0x8022810C; // type:data rom:0x59C3FC -b_area_kzn_kzn_04_afterBattle_80228328 = 0x80228328; // type:data rom:0x59C618 -b_area_kzn_kzn_04_foregroundModelList_80228338 = 0x80228338; // type:data rom:0x59C628 +b_area_kzn_kzn_04_EVS_PreBattle = 0x8022810C; // type:data rom:0x59C3FC +b_area_kzn_kzn_04_EVS_PostBattle = 0x80228328; // type:data rom:0x59C618 +b_area_kzn_kzn_04_ForegroundModels = 0x80228338; // type:data rom:0x59C628 b_area_kzn_kzn_04 = 0x80228348; // type:data rom:0x59C638 b_area_kzn_kzn_04b_80228370 = 0x80228370; // type:data rom:0x59C660 b_area_kzn_kzn_04b_8022843C = 0x8022843C; // type:data rom:0x59C72C b_area_kzn_kzn_04b_802284EC = 0x802284EC; // type:data rom:0x59C7DC -b_area_kzn_kzn_04b_beforeBattle_8022869C = 0x8022869C; // type:data rom:0x59C98C -b_area_kzn_kzn_04b_afterBattle_802288B8 = 0x802288B8; // type:data rom:0x59CBA8 -b_area_kzn_kzn_04b_foregroundModelList_802288C8 = 0x802288C8; // type:data rom:0x59CBB8 +b_area_kzn_kzn_04b_EVS_PreBattle = 0x8022869C; // type:data rom:0x59C98C +b_area_kzn_kzn_04b_EVS_PostBattle = 0x802288B8; // type:data rom:0x59CBA8 +b_area_kzn_kzn_04b_ForegroundModels = 0x802288C8; // type:data rom:0x59CBB8 b_area_kzn_kzn_04b = 0x802288D8; // type:data rom:0x59CBC8 b_area_kzn_kzn_04c_80228900 = 0x80228900; // type:data rom:0x59CBF0 b_area_kzn_kzn_04c_802289CC = 0x802289CC; // type:data rom:0x59CCBC b_area_kzn_kzn_04c_80228A7C = 0x80228A7C; // type:data rom:0x59CD6C -b_area_kzn_kzn_04c_beforeBattle_80228C2C = 0x80228C2C; // type:data rom:0x59CF1C -b_area_kzn_kzn_04c_afterBattle_80228DF0 = 0x80228DF0; // type:data rom:0x59D0E0 -b_area_kzn_kzn_04c_foregroundModelList_80228E00 = 0x80228E00; // type:data rom:0x59D0F0 +b_area_kzn_kzn_04c_EVS_PreBattle = 0x80228C2C; // type:data rom:0x59CF1C +b_area_kzn_kzn_04c_EVS_PostBattle = 0x80228DF0; // type:data rom:0x59D0E0 +b_area_kzn_kzn_04c_ForegroundModels = 0x80228E00; // type:data rom:0x59D0F0 b_area_kzn_kzn_04c = 0x80228E10; // type:data rom:0x59D100 b_area_kzn_kzn_05_80228E40 = 0x80228E40; // type:data rom:0x59D130 b_area_kzn_kzn_05_80228F0C = 0x80228F0C; // type:data rom:0x59D1FC 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_EVS_PreBattle = 0x8022916C; // type:data rom:0x59D45C +b_area_kzn_kzn_05_EVS_PostBattle = 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 @@ -12978,57 +12978,57 @@ b_area_sam_gray_magikoopa_init = 0x8022E748; // type:data rom:0x63A2E8 b_area_sam_gray_magikoopa_init_flying = 0x8022E7EC; // type:data rom:0x63A38C b_area_sam_gray_magikoopa_takeTurn = 0x8022E890; // type:data rom:0x63A430 b_area_sam_sam_01_UnkModelStuff_array = 0x8022EFD0; // type:data rom:0x63AB70 -b_area_sam_sam_01_UnkModelStuffScript1 = 0x8022EFE0; // type:data rom:0x63AB80 +b_area_sam_sam_01_EVS_SpawnSnowfall = 0x8022EFE0; // type:data rom:0x63AB80 b_area_sam_sam_01_UnkModelStuffScript2 = 0x8022F01C; // type:data rom:0x63ABBC -b_area_sam_sam_01_UnkModelStuffScript3 = 0x8022F0E4; // type:data rom:0x63AC84 -b_area_sam_sam_01_UnkModelStuffScript4 = 0x8022F1C4; // type:data rom:0x63AD64 -b_area_sam_sam_01_beforeBattle = 0x8022F288; // type:data rom:0x63AE28 -b_area_sam_sam_01_afterBattle = 0x8022F398; // type:data rom:0x63AF38 +b_area_sam_sam_01_EVS_AnimateHangingSnowflake_RandomSpin = 0x8022F0E4; // type:data rom:0x63AC84 +b_area_sam_sam_01_EVS_AnimateHangingSnowflake_NoSpin = 0x8022F1C4; // type:data rom:0x63AD64 +b_area_sam_sam_01_EVS_PreBattle = 0x8022F288; // type:data rom:0x63AE28 +b_area_sam_sam_01_EVS_PostBattle = 0x8022F398; // type:data rom:0x63AF38 b_area_sam_sam_01_foregroundModelList = 0x8022F3A8; // type:data rom:0x63AF48 b_area_sam_sam_01 = 0x8022F3B4; // type:data rom:0x63AF54 b_area_sam_sam_02_UnkModelStuff_array = 0x8022F3E0; // type:data rom:0x63AF80 -b_area_sam_sam_02_UnkModelStuffScript1 = 0x8022F3F0; // type:data rom:0x63AF90 +b_area_sam_sam_02_EVS_SpawnSnowfall = 0x8022F3F0; // type:data rom:0x63AF90 b_area_sam_sam_02_UnkModelStuffScript2 = 0x8022F42C; // type:data rom:0x63AFCC -b_area_sam_sam_02_UnkModelStuffScript3 = 0x8022F4F4; // type:data rom:0x63B094 -b_area_sam_sam_02_UnkModelStuffScript4 = 0x8022F5D4; // type:data rom:0x63B174 -b_area_sam_sam_02_beforeBattle = 0x8022F698; // type:data rom:0x63B238 -b_area_sam_sam_02_afterBattle = 0x8022F7D0; // type:data rom:0x63B370 +b_area_sam_sam_02_EVS_AnimateHangingSnowflake_RandomSpin = 0x8022F4F4; // type:data rom:0x63B094 +b_area_sam_sam_02_EVS_AnimateHangingSnowflake_NoSpin = 0x8022F5D4; // type:data rom:0x63B174 +b_area_sam_sam_02_EVS_PreBattle = 0x8022F698; // type:data rom:0x63B238 +b_area_sam_sam_02_EVS_PostBattle = 0x8022F7D0; // type:data rom:0x63B370 b_area_sam_sam_02_foregroundModelList = 0x8022F7E0; // type:data rom:0x63B380 b_area_sam_sam_02 = 0x8022F7EC; // type:data rom:0x63B38C b_area_sam_sam_02b_UnkModelStuff_array = 0x8022F820; // type:data rom:0x63B3C0 -b_area_sam_sam_02b_UnkModelStuffScript1 = 0x8022F830; // type:data rom:0x63B3D0 +b_area_sam_sam_02b_EVS_SpawnSnowfall = 0x8022F830; // type:data rom:0x63B3D0 b_area_sam_sam_02b_UnkModelStuffScript2 = 0x8022F86C; // type:data rom:0x63B40C -b_area_sam_sam_02b_UnkModelStuffScript3 = 0x8022F934; // type:data rom:0x63B4D4 -b_area_sam_sam_02b_UnkModelStuffScript4 = 0x8022FA14; // type:data rom:0x63B5B4 -b_area_sam_sam_02b_beforeBattle = 0x8022FAD8; // type:data rom:0x63B678 -b_area_sam_sam_02b_afterBattle = 0x8022FB2C; // type:data rom:0x63B6CC +b_area_sam_sam_02b_EVS_AnimateHangingSnowflake_RandomSpin = 0x8022F934; // type:data rom:0x63B4D4 +b_area_sam_sam_02b_EVS_AnimateHangingSnowflake_NoSpin = 0x8022FA14; // type:data rom:0x63B5B4 +b_area_sam_sam_02b_EVS_PreBattle = 0x8022FAD8; // type:data rom:0x63B678 +b_area_sam_sam_02b_EVS_PostBattle = 0x8022FB2C; // type:data rom:0x63B6CC b_area_sam_sam_02b_foregroundModelList = 0x8022FB3C; // type:data rom:0x63B6DC b_area_sam_sam_02b = 0x8022FB48; // type:data rom:0x63B6E8 b_area_sam_sam_02c_UnkModelStuff_array = 0x8022FB70; // type:data rom:0x63B710 -b_area_sam_sam_02c_UnkModelStuffScript1 = 0x8022FB80; // type:data rom:0x63B720 +b_area_sam_sam_02c_EVS_SpawnSnowfall = 0x8022FB80; // type:data rom:0x63B720 b_area_sam_sam_02c_UnkModelStuffScript2 = 0x8022FBBC; // type:data rom:0x63B75C -b_area_sam_sam_02c_UnkModelStuffScript3 = 0x8022FC84; // type:data rom:0x63B824 -b_area_sam_sam_02c_UnkModelStuffScript4 = 0x8022FD64; // type:data rom:0x63B904 -b_area_sam_sam_02c_beforeBattle = 0x8022FE28; // type:data rom:0x63B9C8 -b_area_sam_sam_02c_afterBattle = 0x8022FE90; // type:data rom:0x63BA30 +b_area_sam_sam_02c_EVS_AnimateHangingSnowflake_RandomSpin = 0x8022FC84; // type:data rom:0x63B824 +b_area_sam_sam_02c_EVS_AnimateHangingSnowflake_NoSpin = 0x8022FD64; // type:data rom:0x63B904 +b_area_sam_sam_02c_EVS_PreBattle = 0x8022FE28; // type:data rom:0x63B9C8 +b_area_sam_sam_02c_EVS_PostBattle = 0x8022FE90; // type:data rom:0x63BA30 b_area_sam_sam_02c_foregroundModelList = 0x8022FEA0; // type:data rom:0x63BA40 b_area_sam_sam_02c = 0x8022FEAC; // type:data rom:0x63BA4C b_area_sam_sam_02d_UnkModelStuff_array = 0x8022FEE0; // type:data rom:0x63BA80 -b_area_sam_sam_02d_UnkModelStuffScript1 = 0x8022FEF0; // type:data rom:0x63BA90 +b_area_sam_sam_02d_EVS_SpawnSnowfall = 0x8022FEF0; // type:data rom:0x63BA90 b_area_sam_sam_02d_UnkModelStuffScript2 = 0x8022FF2C; // type:data rom:0x63BACC -b_area_sam_sam_02d_UnkModelStuffScript3 = 0x8022FFF4; // type:data rom:0x63BB94 -b_area_sam_sam_02d_UnkModelStuffScript4 = 0x802300D4; // type:data rom:0x63BC74 -b_area_sam_sam_02d_beforeBattle = 0x80230198; // type:data rom:0x63BD38 -b_area_sam_sam_02d_afterBattle = 0x80230214; // type:data rom:0x63BDB4 +b_area_sam_sam_02d_EVS_AnimateHangingSnowflake_RandomSpin = 0x8022FFF4; // type:data rom:0x63BB94 +b_area_sam_sam_02d_EVS_AnimateHangingSnowflake_NoSpin = 0x802300D4; // type:data rom:0x63BC74 +b_area_sam_sam_02d_EVS_PreBattle = 0x80230198; // type:data rom:0x63BD38 +b_area_sam_sam_02d_EVS_PostBattle = 0x80230214; // type:data rom:0x63BDB4 b_area_sam_sam_02d_foregroundModelList = 0x80230224; // type:data rom:0x63BDC4 b_area_sam_sam_02d = 0x80230230; // type:data rom:0x63BDD0 b_area_sam_sam_03_UnkModelStuff_array = 0x80230260; // type:data rom:0x63BE00 -b_area_sam_sam_03_UnkModelStuffScript1 = 0x80230270; // type:data rom:0x63BE10 +b_area_sam_sam_03_EVS_SpawnSnowfall = 0x80230270; // type:data rom:0x63BE10 b_area_sam_sam_03_UnkModelStuffScript2 = 0x802302AC; // type:data rom:0x63BE4C -b_area_sam_sam_03_UnkModelStuffScript3 = 0x80230374; // type:data rom:0x63BF14 -b_area_sam_sam_03_UnkModelStuffScript4 = 0x80230454; // type:data rom:0x63BFF4 -b_area_sam_sam_03_beforeBattle = 0x80230518; // type:data rom:0x63C0B8 -b_area_sam_sam_03_afterBattle = 0x80230628; // type:data rom:0x63C1C8 +b_area_sam_sam_03_EVS_AnimateHangingSnowflake_RandomSpin = 0x80230374; // type:data rom:0x63BF14 +b_area_sam_sam_03_EVS_AnimateHangingSnowflake_NoSpin = 0x80230454; // type:data rom:0x63BFF4 +b_area_sam_sam_03_EVS_PreBattle = 0x80230518; // type:data rom:0x63C0B8 +b_area_sam_sam_03_EVS_PostBattle = 0x80230628; // type:data rom:0x63C1C8 b_area_sam_sam_03_foregroundModelList = 0x80230638; // type:data rom:0x63C1D8 b_area_sam_sam_03 = 0x80230644; // type:data rom:0x63C1E4 b_area_sam_pos_rocks_1 = 0x80230670; // type:data rom:0x63C210 @@ -13196,57 +13196,57 @@ b_area_sam2_gray_magikoopa_init = 0x80221568; // type:data rom:0x646748 b_area_sam2_gray_magikoopa_init_flying = 0x8022160C; // type:data rom:0x6467EC b_area_sam2_gray_magikoopa_takeTurn = 0x802216B0; // type:data rom:0x646890 b_area_sam2_sam_01_UnkModelStuff_array = 0x80221DF0; // type:data rom:0x646FD0 -b_area_sam2_sam_01_UnkModelStuffScript1 = 0x80221E00; // type:data rom:0x646FE0 +b_area_sam2_sam_01_EVS_SpawnSnowfall = 0x80221E00; // type:data rom:0x646FE0 b_area_sam2_sam_01_UnkModelStuffScript2 = 0x80221E3C; // type:data rom:0x64701C -b_area_sam2_sam_01_UnkModelStuffScript3 = 0x80221F04; // type:data rom:0x6470E4 -b_area_sam2_sam_01_UnkModelStuffScript4 = 0x80221FE4; // type:data rom:0x6471C4 -b_area_sam2_sam_01_beforeBattle = 0x802220A8; // type:data rom:0x647288 -b_area_sam2_sam_01_afterBattle = 0x802221B8; // type:data rom:0x647398 +b_area_sam2_sam_01_EVS_AnimateHangingSnowflake_RandomSpin = 0x80221F04; // type:data rom:0x6470E4 +b_area_sam2_sam_01_EVS_AnimateHangingSnowflake_NoSpin = 0x80221FE4; // type:data rom:0x6471C4 +b_area_sam2_sam_01_EVS_PreBattle = 0x802220A8; // type:data rom:0x647288 +b_area_sam2_sam_01_EVS_PostBattle = 0x802221B8; // type:data rom:0x647398 b_area_sam2_sam_01_foregroundModelList = 0x802221C8; // type:data rom:0x6473A8 b_area_sam2_sam_01 = 0x802221D4; // type:data rom:0x6473B4 b_area_sam2_sam_02_UnkModelStuff_array = 0x80222200; // type:data rom:0x6473E0 -b_area_sam2_sam_02_UnkModelStuffScript1 = 0x80222210; // type:data rom:0x6473F0 +b_area_sam2_sam_02_EVS_SpawnSnowfall = 0x80222210; // type:data rom:0x6473F0 b_area_sam2_sam_02_UnkModelStuffScript2 = 0x8022224C; // type:data rom:0x64742C -b_area_sam2_sam_02_UnkModelStuffScript3 = 0x80222314; // type:data rom:0x6474F4 -b_area_sam2_sam_02_UnkModelStuffScript4 = 0x802223F4; // type:data rom:0x6475D4 -b_area_sam2_sam_02_beforeBattle = 0x802224B8; // type:data rom:0x647698 -b_area_sam2_sam_02_afterBattle = 0x802225F0; // type:data rom:0x6477D0 +b_area_sam2_sam_02_EVS_AnimateHangingSnowflake_RandomSpin = 0x80222314; // type:data rom:0x6474F4 +b_area_sam2_sam_02_EVS_AnimateHangingSnowflake_NoSpin = 0x802223F4; // type:data rom:0x6475D4 +b_area_sam2_sam_02_EVS_PreBattle = 0x802224B8; // type:data rom:0x647698 +b_area_sam2_sam_02_EVS_PostBattle = 0x802225F0; // type:data rom:0x6477D0 b_area_sam2_sam_02_foregroundModelList = 0x80222600; // type:data rom:0x6477E0 b_area_sam2_sam_02 = 0x8022260C; // type:data rom:0x6477EC b_area_sam2_sam_02b_UnkModelStuff_array = 0x80222640; // type:data rom:0x647820 -b_area_sam2_sam_02b_UnkModelStuffScript1 = 0x80222650; // type:data rom:0x647830 +b_area_sam2_sam_02b_EVS_SpawnSnowfall = 0x80222650; // type:data rom:0x647830 b_area_sam2_sam_02b_UnkModelStuffScript2 = 0x8022268C; // type:data rom:0x64786C -b_area_sam2_sam_02b_UnkModelStuffScript3 = 0x80222754; // type:data rom:0x647934 -b_area_sam2_sam_02b_UnkModelStuffScript4 = 0x80222834; // type:data rom:0x647A14 -b_area_sam2_sam_02b_beforeBattle = 0x802228F8; // type:data rom:0x647AD8 -b_area_sam2_sam_02b_afterBattle = 0x8022294C; // type:data rom:0x647B2C +b_area_sam2_sam_02b_EVS_AnimateHangingSnowflake_RandomSpin = 0x80222754; // type:data rom:0x647934 +b_area_sam2_sam_02b_EVS_AnimateHangingSnowflake_NoSpin = 0x80222834; // type:data rom:0x647A14 +b_area_sam2_sam_02b_EVS_PreBattle = 0x802228F8; // type:data rom:0x647AD8 +b_area_sam2_sam_02b_EVS_PostBattle = 0x8022294C; // type:data rom:0x647B2C b_area_sam2_sam_02b_foregroundModelList = 0x8022295C; // type:data rom:0x647B3C b_area_sam2_sam_02b = 0x80222968; // type:data rom:0x647B48 b_area_sam2_sam_02c_UnkModelStuff_array = 0x80222990; // type:data rom:0x647B70 -b_area_sam2_sam_02c_UnkModelStuffScript1 = 0x802229A0; // type:data rom:0x647B80 +b_area_sam2_sam_02c_EVS_SpawnSnowfall = 0x802229A0; // type:data rom:0x647B80 b_area_sam2_sam_02c_UnkModelStuffScript2 = 0x802229DC; // type:data rom:0x647BBC -b_area_sam2_sam_02c_UnkModelStuffScript3 = 0x80222AA4; // type:data rom:0x647C84 -b_area_sam2_sam_02c_UnkModelStuffScript4 = 0x80222B84; // type:data rom:0x647D64 -b_area_sam2_sam_02c_beforeBattle = 0x80222C48; // type:data rom:0x647E28 -b_area_sam2_sam_02c_afterBattle = 0x80222CB0; // type:data rom:0x647E90 +b_area_sam2_sam_02c_EVS_AnimateHangingSnowflake_RandomSpin = 0x80222AA4; // type:data rom:0x647C84 +b_area_sam2_sam_02c_EVS_AnimateHangingSnowflake_NoSpin = 0x80222B84; // type:data rom:0x647D64 +b_area_sam2_sam_02c_EVS_PreBattle = 0x80222C48; // type:data rom:0x647E28 +b_area_sam2_sam_02c_EVS_PostBattle = 0x80222CB0; // type:data rom:0x647E90 b_area_sam2_sam_02c_foregroundModelList = 0x80222CC0; // type:data rom:0x647EA0 b_area_sam2_sam_02c = 0x80222CCC; // type:data rom:0x647EAC b_area_sam2_sam_02d_UnkModelStuff_array = 0x80222D00; // type:data rom:0x647EE0 -b_area_sam2_sam_02d_UnkModelStuffScript1 = 0x80222D10; // type:data rom:0x647EF0 +b_area_sam2_sam_02d_EVS_SpawnSnowfall = 0x80222D10; // type:data rom:0x647EF0 b_area_sam2_sam_02d_UnkModelStuffScript2 = 0x80222D4C; // type:data rom:0x647F2C -b_area_sam2_sam_02d_UnkModelStuffScript3 = 0x80222E14; // type:data rom:0x647FF4 -b_area_sam2_sam_02d_UnkModelStuffScript4 = 0x80222EF4; // type:data rom:0x6480D4 -b_area_sam2_sam_02d_beforeBattle = 0x80222FB8; // type:data rom:0x648198 -b_area_sam2_sam_02d_afterBattle = 0x80223034; // type:data rom:0x648214 +b_area_sam2_sam_02d_EVS_AnimateHangingSnowflake_RandomSpin = 0x80222E14; // type:data rom:0x647FF4 +b_area_sam2_sam_02d_EVS_AnimateHangingSnowflake_NoSpin = 0x80222EF4; // type:data rom:0x6480D4 +b_area_sam2_sam_02d_EVS_PreBattle = 0x80222FB8; // type:data rom:0x648198 +b_area_sam2_sam_02d_EVS_PostBattle = 0x80223034; // type:data rom:0x648214 b_area_sam2_sam_02d_foregroundModelList = 0x80223044; // type:data rom:0x648224 b_area_sam2_sam_02d = 0x80223050; // type:data rom:0x648230 b_area_sam2_sam_03_UnkModelStuff_array = 0x80223080; // type:data rom:0x648260 -b_area_sam2_sam_03_UnkModelStuffScript1 = 0x80223090; // type:data rom:0x648270 +b_area_sam2_sam_03_EVS_SpawnSnowfall = 0x80223090; // type:data rom:0x648270 b_area_sam2_sam_03_UnkModelStuffScript2 = 0x802230CC; // type:data rom:0x6482AC -b_area_sam2_sam_03_UnkModelStuffScript3 = 0x80223194; // type:data rom:0x648374 -b_area_sam2_sam_03_UnkModelStuffScript4 = 0x80223274; // type:data rom:0x648454 -b_area_sam2_sam_03_beforeBattle = 0x80223338; // type:data rom:0x648518 -b_area_sam2_sam_03_afterBattle = 0x80223448; // type:data rom:0x648628 +b_area_sam2_sam_03_EVS_AnimateHangingSnowflake_RandomSpin = 0x80223194; // type:data rom:0x648374 +b_area_sam2_sam_03_EVS_AnimateHangingSnowflake_NoSpin = 0x80223274; // type:data rom:0x648454 +b_area_sam2_sam_03_EVS_PreBattle = 0x80223338; // type:data rom:0x648518 +b_area_sam2_sam_03_EVS_PostBattle = 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 @@ -13353,12 +13353,12 @@ b_area_pra2_crystal_bit_handleEvent = 0x802207C8; // type:data rom:0x668F18 b_area_pra2_crystal_bit_takeTurn = 0x802211C0; // type:data rom:0x669910 b_area_pra2_crystal_bit_nextTurn = 0x802211D0; // type:data rom:0x669920 b_area_pra2_sam_04_UnkModelStuff_array = 0x802211E0; // type:data rom:0x669930 -b_area_pra2_sam_04_UnkModelStuffScript1 = 0x802211F0; // type:data rom:0x669940 +b_area_pra2_sam_04_EVS_SpawnSnowfall = 0x802211F0; // type:data rom:0x669940 b_area_pra2_sam_04_UnkModelStuffScript2 = 0x8022122C; // type:data rom:0x66997C -b_area_pra2_sam_04_UnkModelStuffScript3 = 0x802212F4; // type:data rom:0x669A44 -b_area_pra2_sam_04_UnkModelStuffScript4 = 0x802213D4; // type:data rom:0x669B24 -b_area_pra2_sam_04_beforeBattle = 0x80221498; // type:data rom:0x669BE8 -b_area_pra2_sam_04_afterBattle = 0x802214C4; // type:data rom:0x669C14 +b_area_pra2_sam_04_EVS_AnimateHangingSnowflake_RandomSpin = 0x802212F4; // type:data rom:0x669A44 +b_area_pra2_sam_04_EVS_AnimateHangingSnowflake_NoSpin = 0x802213D4; // type:data rom:0x669B24 +b_area_pra2_sam_04_EVS_PreBattle = 0x80221498; // type:data rom:0x669BE8 +b_area_pra2_sam_04_EVS_PostBattle = 0x802214C4; // type:data rom:0x669C14 b_area_pra2_sam_04 = 0x802214D4; // type:data rom:0x669C24 b_area_pra2_pos_crystal_king = 0x80221500; // type:data rom:0x669C50 b_area_pra2_pos_crystal_bit_1 = 0x8022150C; // type:data rom:0x669C5C @@ -13576,31 +13576,31 @@ b_area_pra3_gray_magikoopa_flee = 0x80230FF4; // type:data rom:0x682D74 b_area_pra3_gray_magikoopa_init = 0x80231218; // type:data rom:0x682F98 b_area_pra3_gray_magikoopa_init_flying = 0x802312BC; // type:data rom:0x68303C b_area_pra3_gray_magikoopa_takeTurn = 0x80231360; // type:data rom:0x6830E0 -b_area_pra3_pra_01_beforeBattle = 0x80231AA0; // type:data rom:0x683820 -b_area_pra3_pra_01_afterBattle = 0x80231AEC; // type:data rom:0x68386C +b_area_pra3_pra_01_EVS_PreBattle = 0x80231AA0; // type:data rom:0x683820 +b_area_pra3_pra_01_EVS_PostBattle = 0x80231AEC; // type:data rom:0x68386C b_area_pra3_pra_01_foregroundModelList = 0x80231AFC; // type:data rom:0x68387C b_area_pra3_pra_01 = 0x80231B0C; // type:data rom:0x68388C b_area_pra3_pra_02_80231B40 = 0x80231B40; // type:data rom:0x6838C0 b_area_pra3_pra_02_80231C10 = 0x80231C10; // type:data rom:0x683990 b_area_pra3_pra_02_80231CFC = 0x80231CFC; // type:data rom:0x683A7C -b_area_pra3_pra_02_beforeBattle = 0x80231DE8; // type:data rom:0x683B68 -b_area_pra3_pra_02_afterBattle = 0x80231ECC; // type:data rom:0x683C4C +b_area_pra3_pra_02_EVS_PreBattle = 0x80231DE8; // type:data rom:0x683B68 +b_area_pra3_pra_02_EVS_PostBattle = 0x80231ECC; // type:data rom:0x683C4C b_area_pra3_pra_02_foregroundModelList = 0x80231EDC; // type:data rom:0x683C5C b_area_pra3_pra_02 = 0x80231EEC; // type:data rom:0x683C6C -b_area_pra3_pra_03_beforeBattle = 0x80231F20; // type:data rom:0x683CA0 -b_area_pra3_pra_03_afterBattle = 0x80231F5C; // type:data rom:0x683CDC +b_area_pra3_pra_03_EVS_PreBattle = 0x80231F20; // type:data rom:0x683CA0 +b_area_pra3_pra_03_EVS_PostBattle = 0x80231F5C; // type:data rom:0x683CDC b_area_pra3_pra_03 = 0x80231F6C; // type:data rom:0x683CEC -b_area_pra3_pra_03b_beforeBattle = 0x80231FA0; // type:data rom:0x683D20 -b_area_pra3_pra_03b_afterBattle = 0x80231FF0; // type:data rom:0x683D70 +b_area_pra3_pra_03b_EVS_PreBattle = 0x80231FA0; // type:data rom:0x683D20 +b_area_pra3_pra_03b_EVS_PostBattle = 0x80231FF0; // type:data rom:0x683D70 b_area_pra3_pra_03b = 0x80232000; // type:data rom:0x683D80 -b_area_pra3_pra_03c_beforeBattle = 0x80232030; // type:data rom:0x683DB0 -b_area_pra3_pra_03c_afterBattle = 0x80232094; // type:data rom:0x683E14 +b_area_pra3_pra_03c_EVS_PreBattle = 0x80232030; // type:data rom:0x683DB0 +b_area_pra3_pra_03c_EVS_PostBattle = 0x80232094; // type:data rom:0x683E14 b_area_pra3_pra_03c = 0x802320A4; // type:data rom:0x683E24 b_area_pra3_pra_04_802320D0 = 0x802320D0; // type:data rom:0x683E50 b_area_pra3_pra_04_802321A0 = 0x802321A0; // type:data rom:0x683F20 b_area_pra3_pra_04_8023228C = 0x8023228C; // type:data rom:0x68400C -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_EVS_PreBattle = 0x80232378; // type:data rom:0x6840F8 +b_area_pra3_pra_04_EVS_PostBattle = 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 @@ -13832,16 +13832,16 @@ b_area_dig_UnkBattleFunc2_2 = 0x80218184; // type:func rom:0x6DDF44 dup_b_area_dig_UnkBattleFunc1 = 0x80218240; // type:func rom:0x6DE000 dup2_b_area_dig_UnkBattleFunc1 = 0x80218310; // type:func rom:0x6DE0D0 b_area_dig_IsSaveVar123 = 0x802183E0; // type:func rom:0x6DE1A0 -b_area_dig_UnkFloatFunc3 = 0x80218430; // type:func rom:0x6DE1F0 +b_area_dig_UpdateSunPos = 0x80218430; // type:func rom:0x6DE1F0 b_area_dig_GetModelPos = 0x80218580; // type:func rom:0x6DE340 b_area_dig_IsGameStatusUnkAA_1 = 0x802185E0; // type:func rom:0x6DE3A0 b_area_dig_Add1Coin = 0x80218608; // type:func rom:0x6DE3C8 -b_area_dig_Set80218630_Var0 = 0x80218630; // type:func rom:0x6DE3F0 +b_area_dig_SetDemoBattleBeginDelay = 0x80218630; // type:func rom:0x6DE3F0 func_80218644_6DE404 = 0x80218644; // type:func rom:0x6DE404 func_802186E0_6DE4A0 = 0x802186E0; // type:func rom:0x6DE4A0 func_80218770_6DE530 = 0x80218770; // type:func rom:0x6DE530 func_802187F0_6DE5B0 = 0x802187F0; // type:func rom:0x6DE5B0 -dup_b_area_dig_Set80218630_Var0 = 0x80218890; // type:func rom:0x6DE650 +dup_b_area_dig_SetDemoBattleBeginDelay = 0x80218890; // type:func rom:0x6DE650 battle_partner_goombario_idleAnimations_80238000 = 0x80238000; // type:data rom:0x6F0B30 battle_partner_goombario_defenseTable_8023800C = 0x8023800C; // type:data rom:0x6F0B3C battle_partner_goombario_statusTable_80238018 = 0x80238018; // type:data rom:0x6F0B48 @@ -26762,10 +26762,10 @@ D_80280000 = 0x80280000; // type:data D_80281104 = 0x80281104; // type:data bMarioHideAnims = 0x80283370; // type:data D_80283770 = 0x80283770; // type:data -ExecutePlayerAction = 0x8028505C; // -ExecutePeachAction = 0x80285174; // -PlayerFirstStrike = 0x802851FC; // -StartDefend = 0x802852B8; // +EVS_ExecuteMarioAction = 0x8028505C; // +EVS_ExecutePeachAction = 0x80285174; // +EVS_PlayerFirstStrike = 0x802851FC; // +EVS_StartDefend = 0x802852B8; // EnterWalk = 0x80285960; // EnterWalkShort = 0x80285A60; // EnterSavePoint = 0x80285CB0; // @@ -26783,17 +26783,17 @@ wShopSelectedItem = 0x80286530; // type:data wShopBuyResult = 0x80286534; // type:data D_80286538 = 0x80286538; // type:data D_80286540 = 0x80286540; // type:data -RunAwayStart = 0x802868BC; // -RunAwayFail = 0x80287078; // -RunAwayReset = 0x80287128; // -PlayEatFX = 0x802878D0; // -PlayDrinkFX = 0x80287948; // -UseLifeShroom = 0x802879C0; // -MerleeRunOut = 0x80288398; // -MerleeAttackBonus = 0x80288400; // -MerleeDefenseBonus = 0x8028870C; // -MerleeExpBonus = 0x80288A58; // -PlayerHappy = 0x80288D64; // +EVS_RunAwayStart = 0x802868BC; // +EVS_RunAwayFail = 0x80287078; // +EVS_RunAwayReset = 0x80287128; // +EVS_PlayEatFX = 0x802878D0; // +EVS_PlayDrinkFX = 0x80287948; // +EVS_UseLifeShroom = 0x802879C0; // +EVS_MerleeRunOut = 0x80288398; // +EVS_MerleeAttackBonus = 0x80288400; // +EVS_MerleeDefenseBonus = 0x8028870C; // +EVS_MerleeExpBonus = 0x80288A58; // +EVS_PlayerHappy = 0x80288D64; // gBattleItemTable = 0x80293C04; // type:data UseMystery = 0x80293E40; // actionCmdTableJump = 0x802941C0; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 0d8a7796d5..ec34c2f5ab 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -291,7 +291,7 @@ dead_SetTexPanner = SetTexPanner + 0xD480; dead_SetModelCustomGfx = SetModelCustomGfx + 0xD480; dead_EnableTexPanning = EnableTexPanning + 0xD480; dead_EnableModel = EnableModel + 0xD480; -dead_SetGroupEnabled = SetGroupEnabled + 0xD480; +dead_SetGroupVisibility = SetGroupVisibility + 0xD480; dead_SetTexPanOffset = SetTexPanOffset + 0xD480; dead_SetCustomGfxBuilders = SetCustomGfxBuilders + 0xD480; dead_TranslateGroup = TranslateGroup + 0xD4AC;